commit cff5d195adbd5fadc345d7fcc88d3a1d0df27759 parent cc4cc34e264e52325ede510377656079be8405ac Author: Jan Pobrislo <ccx@te2000.cz> Date: Tue, 16 Dec 2025 00:37:06 +0000 Import some zsh patches from Alpine aports Diffstat:
44 files changed, 759 insertions(+), 120 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1 @@ -2394,6 +2394,7 @@ fbf2cb0979fb1e2eb256d2f3b61b4450aab8abae sources/vis 491e39c8a9f41d74e52e038efaeb3bca0009195f sources/zsh 4a15ed83bc367df0c1e03bd63b3e425f0000b7f0 sources/zsh 4a63170c2ccc383fe7b9efb15944179e48ab4f91 sources/zsh +4a99cc266965774746c276abbb38fada813163c0 sources/zsh 4ad8d51ab9a5f30766707768c3e709710d58e4c2 sources/zsh 4c2807e313ea1376b10db3deb685c4eb115cbf8e sources/zsh 4c8d37250ea0a318ec13c7cb4b938d8132eb6452 sources/zsh @@ -2438,7 +2439,6 @@ fbf2cb0979fb1e2eb256d2f3b61b4450aab8abae sources/vis 72348f15d268d8dc4c73acf643216256e527c22e sources/zsh 7293813b4e97a1892e0deeb34fa2d01c388ade12 sources/zsh 72f7f904e8734c2ee73b77e35e60ecb86148bc60 sources/zsh -73d317384c9225e46d66444f93b46f0fbe7084ef sources/zsh 746f80b77e9d2419882f120fae278382ed401b38 sources/zsh 750ec0fe1b2e357cd8bb6054849bb656e96fa6d0 sources/zsh 77166e259ee91fde498347de7c3c807d7bff6f1f sources/zsh @@ -2472,6 +2472,7 @@ fbf2cb0979fb1e2eb256d2f3b61b4450aab8abae sources/vis 9d71f4c207fb34e8d64af0443c83231b1cc3b494 sources/zsh 9fcef71861b44cdc9dd298891616ed26de8d1788 sources/zsh 9ffe596f251b6b35d59da3b9e204b315d34fdfbf sources/zsh +a072373a4bab65d11ddd2f07efc1a33c8797c679 sources/zsh a2159285e80508bb682d90a71270fbddada8bd05 sources/zsh a3c3aba9e2224abc7755af685c294a7dc613203f sources/zsh a451f3058e3ccd49184e4ce7bb4c57687664ed10 sources/zsh @@ -2493,6 +2494,7 @@ b32d6325a58619ad1154fc13e00b87eb685cdb78 sources/zsh b4a5b9db8b528f9c9b6a9cbb00db381c95659380 sources/zsh b52f9da686a0b403a46d2d1274d3c07eb3f467e0 sources/zsh b5409e70ce575fd8eaef7254402a67dd6382c357 sources/zsh +b68002d927b1577bbed453d7bbbe39b55acf7bd0 sources/zsh b74e003f9cf9ae541869b3f6aab4a86a056c6cca sources/zsh b75b87c8d9b676fc6e274cffd97f9736daf270b4 sources/zsh b770c1f033269ffd9074632d20d07e959034c58d sources/zsh diff --git a/filelist.sha256 b/filelist.sha256 @@ -111,3 +111,6 @@ e0ea17940260f9c1fdd2d35f74eec141d21f09844eaea91131993cb950901a16 files/tree.h 07c3c30dab68c905d5608124e729592a30b2c087f24e7b76940f5321786128b1 files/update-links 664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df files/user-env 68140a82582ede938159630bca0fb13a93b4bf1cb2e85b08943c26242cf8f3a6 files/zpipe.c +637f1198129209e3546ce9b3d340be6a8fddda5a54e13b4d7ecddfb2058ac795 files/zsh-5.9-fix-gcc14-incompatible-pointer-types.patch +c2f1de94290969a07130559a6544be93ac3ab2034ccddffaa1c7873112d373f1 files/zsh-5.9-implicit.patch +02f8f8bc764f0bcb83c03675cd8bfd27ed7554563f01a1a96e567f8c1a517be7 files/zsh-5.9-skip-test-failing-on-musl.patch diff --git a/files/zsh-5.9-fix-gcc14-incompatible-pointer-types.patch b/files/zsh-5.9-fix-gcc14-incompatible-pointer-types.patch @@ -0,0 +1,38 @@ +diff --git a/configure.ac b/configure.ac +index 0760346..be5dbd9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1761,27 +1761,27 @@ if test x$zsh_cv_path_term_header != xnone; then + fi + + AC_MSG_CHECKING(if boolcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no]) + AC_MSG_RESULT($boolcodes) + + AC_MSG_CHECKING(if numcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no]) + AC_MSG_RESULT($numcodes) + + AC_MSG_CHECKING(if strcodes is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no]) + AC_MSG_RESULT($strcodes) + + AC_MSG_CHECKING(if boolnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no]) + AC_MSG_RESULT($boolnames) + + AC_MSG_CHECKING(if numnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no]) + AC_MSG_RESULT($numnames) + + AC_MSG_CHECKING(if strnames is available) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no]) + AC_MSG_RESULT($strnames) + + dnl There are apparently defective terminal library headers on some diff --git a/files/zsh-5.9-implicit.patch b/files/zsh-5.9-implicit.patch @@ -0,0 +1,550 @@ +https://bugs.gentoo.org/869539 +https://www.zsh.org/mla/workers/2022/msg00964.html +--- a/configure.ac ++++ b/configure.ac +@@ -583,11 +583,11 @@ if test x$zsh_cv_c_have_union_init = xye + fi + + dnl Checking if compiler correctly cast signed to unsigned. + AC_CACHE_CHECK(if signed to unsigned casting is broken, + zsh_cv_c_broken_signed_to_unsigned_casting, +-[AC_RUN_IFELSE([AC_LANG_SOURCE([[main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])]) ++[AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])]) + AH_TEMPLATE([BROKEN_SIGNED_TO_UNSIGNED_CASTING], + [Define to 1 if compiler incorrectly cast signed to unsigned.]) + if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then + AC_DEFINE(BROKEN_SIGNED_TO_UNSIGNED_CASTING) + fi +@@ -1044,21 +1044,21 @@ if test x$zsh_cv_long_is_64_bit = xyes; + else + AC_CACHE_CHECK(if off_t is 64 bit, zsh_cv_off_t_is_64_bit, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <sys/types.h> + +-main() { return sizeof(off_t) < 8; } ++int main() { return sizeof(off_t) < 8; } + ]])],[zsh_cv_off_t_is_64_bit=yes],[zsh_cv_off_t_is_64_bit=no],[zsh_cv_off_t_is_64_bit=no])]) + if test x$zsh_cv_off_t_is_64_bit = xyes; then + AC_DEFINE(OFF_T_IS_64_BIT) + fi + + AC_CACHE_CHECK(if ino_t is 64 bit, zsh_cv_ino_t_is_64_bit, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <sys/types.h> + +-main() { return sizeof(ino_t) < 8; } ++int main() { return sizeof(ino_t) < 8; } + ]])],[zsh_cv_ino_t_is_64_bit=yes],[zsh_cv_ino_t_is_64_bit=no],[zsh_cv_ino_t_is_64_bit=no])]) + if test x$zsh_cv_ino_t_is_64_bit = xyes; then + AC_DEFINE(INO_T_IS_64_BIT) + fi + +@@ -1394,22 +1394,22 @@ zsh_cv_func_tgetent_accepts_null, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <fcntl.h> + #include <stdlib.h> + int tgetent(char *, char *); + char *tgetstr(char *, char **); +-main() ++int main() + { + char buf[4096]; + int r1 = tgetent(buf, "vt100"); + int r2 = tgetent((char*)0,"vt100"); + if (r1 >= 0 && r1 == r2) { + char tbuf[1024], *u; + u = tbuf; + tgetstr("cl", &u); + creat("conftest.tgetent", 0640); + } +- exit((r1 != r2) || r2 == -1); ++ return((r1 != r2) || r2 == -1); + } + ]])],[if test -f conftest.tgetent; then + zsh_cv_func_tgetent_accepts_null=yes + else + zsh_cv_func_tgetent_accepts_null=no +@@ -1422,22 +1422,22 @@ zsh_cv_func_tgetent_zero_success, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <fcntl.h> + #include <stdlib.h> + int tgetent(char *, char*); + char *tgetstr(char *, char **); +-main() ++int main() + { + char buf[4096]; + int r1 = tgetent(buf, "!@#$%^&*"); + int r2 = tgetent(buf, "vt100"); + if (r1 < 0 && r2 == 0) { + char tbuf[1024], *u; + u = tbuf; + tgetstr("cl", &u); + creat("conftest.tgetent0", 0640); + } +- exit(r1 == r2); ++ return(r1 == r2); + } + ]])],[if test -f conftest.tgetent0; then + zsh_cv_func_tgetent_zero_success=yes + else + zsh_cv_func_tgetent_zero_success=no +@@ -1860,27 +1860,27 @@ zsh_cv_rlim_t_is_longer, + #ifdef HAVE_SYS_TIME_H + #include <sys/time.h> + #endif + #include <sys/resource.h> + #include <stdlib.h> +-main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])]) ++int main(){struct rlimit r;return(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])]) + if test x$zsh_cv_rlim_t_is_longer = xyes; then + AC_CACHE_CHECK(if rlim_t is a quad, + zsh_cv_rlim_t_is_quad_t, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #ifdef HAVE_SYS_TIME_H + #include <sys/time.h> + #endif + #include <stdio.h> + #include <sys/resource.h> + #include <stdlib.h> +-main() { ++int main() { + struct rlimit r; + char buf[20]; + r.rlim_cur = 0; + sprintf(buf, "%qd", r.rlim_cur); +- exit(strcmp(buf, "0")); ++ return(strcmp(buf, "0")); + }]])],[zsh_cv_rlim_t_is_quad_t=yes],[zsh_cv_rlim_t_is_quad_t=no],[zsh_cv_rlim_t_is_quad_t=no])]) + if test x$zsh_cv_rlim_t_is_quad_t = xyes; then + AC_DEFINE(RLIM_T_IS_QUAD_T) + DEFAULT_RLIM_T=quad_t + else +@@ -1894,11 +1894,11 @@ else + #ifdef HAVE_SYS_TIME_H + #include <sys/time.h> + #endif + #include <sys/resource.h> + #include <stdlib.h> +- main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])]) ++ int main(){struct rlimit r;r.rlim_cur=-1;return(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])]) + if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then + AC_DEFINE(RLIM_T_IS_UNSIGNED) + DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T" + fi + fi +@@ -2175,11 +2175,11 @@ zsh_cv_sys_fifo, + #include <fcntl.h> + #include <signal.h> + #include <unistd.h> + #include <stdlib.h> + #include <sys/stat.h> +-main() ++int main() + { + char c; + int fd; + int pid, ret; + unlink("/tmp/fifo$$"); +@@ -2189,19 +2189,19 @@ main() + if(mknod("/tmp/fifo$$", 0010600, 0) < 0) + #endif + exit(1); + pid = fork(); + if(pid < 0) +- exit(1); ++ return(1); + if(pid) { + fd = open("/tmp/fifo$$", O_RDONLY); +- exit(fd < 0 || read(fd, &c, 1) != 1 || c != 'x'); ++ return(fd < 0 || read(fd, &c, 1) != 1 || c != 'x'); + } + fd = open("/tmp/fifo$$", O_WRONLY); + ret = (fd < 0 || write(fd, "x", 1) < 1); + unlink("/tmp/fifo$$"); +- exit(ret); ++ return(ret); + } + ]])],[zsh_cv_sys_fifo=yes],[zsh_cv_sys_fifo=no],[zsh_cv_sys_fifo=yes]) + ]) + AH_TEMPLATE([HAVE_FIFOS], + [Define to 1 if system has working FIFOs.]) +@@ -2276,24 +2276,24 @@ AC_CACHE_CHECK(if link() works, + zsh_cv_sys_link, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <unistd.h> + #include <fcntl.h> + #include <stdlib.h> +-main() ++int main() + { + int ret; + char *tmpfile, *newfile; + tmpfile="/tmp/zsh.linktest$$"; + newfile="/tmp/zsh.linktest2$$"; + unlink(tmpfile); + unlink(newfile); + if(creat(tmpfile, 0644) < 0) +- exit(1); ++ return(1); + ret = link(tmpfile, newfile); + unlink(tmpfile); + unlink(newfile); +- exit(ret<0); ++ return(ret<0); + } + ]])],[zsh_cv_sys_link=yes],[zsh_cv_sys_link=no],[zsh_cv_sys_link=yes])]) + AH_TEMPLATE([HAVE_LINK], + [Define to 1 if system has working link().]) + if test x$zsh_cv_sys_link = xyes; then +@@ -2309,15 +2309,15 @@ zsh_cv_sys_killesrch, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <unistd.h> + #include <signal.h> + #include <errno.h> + #include <stdlib.h> +-main() ++int main() + { + int pid = (getpid() + 10000) & 0xffffff; + while (pid && (kill(pid, 0) == 0 || errno != ESRCH)) pid >>= 1; +- exit(errno!=ESRCH); ++ return(errno!=ESRCH); + } + ]])],[zsh_cv_sys_killesrch=yes],[zsh_cv_sys_killesrch=no],[zsh_cv_sys_killesrch=yes])]) + AH_TEMPLATE([BROKEN_KILL_ESRCH], + [Define to 1 if kill(pid, 0) doesn't return ESRCH, ie BeOS R4.51.]) + if test x$zsh_cv_sys_killesrch = xno; then +@@ -2339,11 +2339,11 @@ if test x$signals_style = xPOSIX_SIGNALS + #include <stdlib.h> + int child=0; + void handler(sig) + int sig; + {if(sig==SIGCHLD) child=1;} +-main() { ++int main() { + struct sigaction act; + sigset_t set; + int pid, ret; + act.sa_handler = &handler; + sigfillset(&act.sa_mask); +@@ -2354,11 +2354,11 @@ main() { + pid=fork(); + if(pid==0) return 0; + if(pid>0) { + sigemptyset(&set); + ret=sigsuspend(&set); +- exit(child==0); ++ return(child==0); + } + } + ]])],[zsh_cv_sys_sigsuspend=yes],[zsh_cv_sys_sigsuspend=no],[zsh_cv_sys_sigsuspend=yes])]) + if test x$zsh_cv_sys_sigsuspend = xno; then + AC_DEFINE(BROKEN_POSIX_SIGSUSPEND) +@@ -2387,18 +2387,18 @@ case "x$zsh_working_tcsetpgrp" in + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <sys/types.h> + #include <unistd.h> + #include <fcntl.h> + #include <stdlib.h> +-main() { ++int main() { + int fd; + int ret; + fd=open("/dev/tty", O_RDWR); + if (fd < 0) exit(2); + ret=tcsetpgrp(fd, tcgetpgrp(fd)); + if (ret < 0) exit(1); +- exit(0); ++ return(0); + } + ]])],[zsh_cv_sys_tcsetpgrp=yes],[ + case $? in + 1) zsh_cv_sys_tcsetpgrp=no;; + 2) zsh_cv_sys_tcsetpgrp=notty;; +@@ -2434,19 +2434,19 @@ if test x$ac_cv_func_getpwnam = xyes; th + #include <pwd.h> + #include <stdio.h> + #include <string.h> + #include <stdlib.h> + #include <unistd.h> +-main() { ++int main() { + struct passwd *pw1, *pw2; + char buf[1024], name[1024]; + sprintf(buf, "%d:%d", getpid(), rand()); + pw1=getpwnam(buf); + if (pw1) strcpy(name, pw1->pw_name); + sprintf(buf, "%d:%d", rand(), getpid()); + pw2=getpwnam(buf); +- exit(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name)); ++ return(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name)); + } + ]])],[zsh_cv_sys_getpwnam_faked=no],[zsh_cv_sys_getpwnam_faked=yes],[zsh_cv_sys_getpwnam_faked=no])]) + if test x$zsh_cv_sys_getpwnam_faked = xyes; then + AC_DEFINE(GETPWNAM_FAKED) + fi +@@ -2763,22 +2763,20 @@ elif test "x$dynamic" = xyes; then + zsh_cv_sys_elf, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[/* Test for whether ELF binaries are produced */ + #include <fcntl.h> + #include <stdlib.h> + #include <unistd.h> +-main(argc, argv) +-int argc; +-char *argv[]; ++int main(int argc, char *argv[]) + { + char b[4]; + int i = open(argv[0],O_RDONLY); + if(i == -1) + exit(1); /* fail */ + if(read(i,b,4)==4 && b[0]==127 && b[1]=='E' && b[2]=='L' && b[3]=='F') +- exit(0); /* succeed (yes, it's ELF) */ ++ return(0); /* succeed (yes, it's ELF) */ + else +- exit(1); /* fail */ ++ return(1); /* fail */ + }]])],[zsh_cv_sys_elf=yes],[zsh_cv_sys_elf=no],[zsh_cv_sys_elf=yes])]) + + # We use [0-9]* in case statements, so need to change quoting + changequote(, ) + +@@ -2908,11 +2908,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}"],[zsh_cvs_rdynamic_available=no]) + LDFLAGS="$old_LDFLAGS") + AC_CACHE_CHECK(if your dlsym() needs a leading underscore, + zsh_cv_func_dlsym_needs_underscore, + [echo failed >conftestval && cat >conftest.c <<EOM +-fred () { } ++void fred () { } + EOM + AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest.c 1>&AS_MESSAGE_LOG_FD) && + AC_TRY_COMMAND($DLLD $LDFLAGS $DLLDFLAGS -o conftest.$DL_EXT conftest.o 1>&AS_MESSAGE_LOG_FD) && + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <stdio.h> +@@ -2943,34 +2941,34 @@ char *zsh_gl_sym_addr ; + #define RTLD_LAZY 1 + #endif + + extern int fred() ; + +-main() ++int main() + { + void * handle ; + void * symbol ; + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + handle = dlopen("./conftest.$DL_EXT", RTLD_LAZY) ; + if (handle == NULL) { + fprintf (f, "dlopen failed") ; +- exit(1); ++ return(1); + } + symbol = dlsym(handle, "fred") ; + if (symbol == NULL) { + /* try putting a leading underscore */ + symbol = dlsym(handle, "_fred") ; + if (symbol == NULL) { + fprintf (f, "dlsym failed") ; +- exit(1); ++ return(1); + } + fprintf (f, "yes") ; + } + else + fprintf (f, "no") ; +- exit(0); ++ return(0); + }]])],[zsh_cv_func_dlsym_needs_underscore=`cat conftestval`],[zsh_cv_func_dlsym_needs_underscore=failed + dynamic=no],[zsh_cv_func_dlsym_needs_underscore=no])]) + if test "x$zsh_cv_func_dlsym_needs_underscore" = xyes; then + AC_DEFINE(DLSYM_NEEDS_UNDERSCORE) + elif test "x$zsh_cv_func_dlsym_needs_underscore" != xno; then +--- a/aczsh.m4.old ++++ b/aczsh.m4 +@@ -42,10 +42,11 @@ AC_DEFUN(zsh_64_BIT_TYPE, + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif + ++int + main() + { + $1 foo = 0; + int bar = (int) foo; + return sizeof($1) != 8; +@@ -144,33 +145,34 @@ char *zsh_gl_sym_addr ; + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + ++int + main() + { + void *handle1, *handle2; + void *(*zsh_getaddr1)(), *(*zsh_getaddr2)(); + void *sym1, *sym2; + handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle1) exit(1); ++ if(!handle1) return(1); + handle2 = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle2) exit(1); ++ if(!handle2) return(1); + zsh_getaddr1 = (void *(*)()) dlsym(handle1, "${us}zsh_getaddr1"); + zsh_getaddr2 = (void *(*)()) dlsym(handle2, "${us}zsh_getaddr2"); + sym1 = zsh_getaddr1(); + sym2 = zsh_getaddr2(); +- if(!sym1 || !sym2) exit(1); +- if(sym1 != sym2) exit(1); ++ if(!sym1 || !sym2) return(1); ++ if(sym1 != sym2) return(1); + dlclose(handle1); + handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle1) exit(1); ++ if(!handle1) return(1); + zsh_getaddr1 = (void *(*)()) dlsym(handle1, "${us}zsh_getaddr1"); + sym1 = zsh_getaddr1(); +- if(!sym1) exit(1); +- if(sym1 != sym2) exit(1); +- exit(0); ++ if(!sym1) return(1); ++ if(sym1 != sym2) return(1); ++ return(0); + } + ]])],[zsh_cv_shared_$1=yes], + [zsh_cv_shared_$1=no], + [zsh_cv_shared_$1=no] + ) +@@ -226,23 +228,23 @@ char *zsh_gl_sym_addr ; + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + +- ++int + main() + { + void *handle1, *handle2; + int (*fred1)(), (*fred2)(); + handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle1) exit(1); ++ if(!handle1) return(1); + handle2 = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle2) exit(1); ++ if(!handle2) return(1); + fred1 = (int (*)()) dlsym(handle1, "${us}fred"); + fred2 = (int (*)()) dlsym(handle2, "${us}fred"); +- if(!fred1 || !fred2) exit(1); +- exit((*fred1)() != 42 || (*fred2)() != 69); ++ if(!fred1 || !fred2) return(1); ++ return((*fred1)() != 42 || (*fred2)() != 69); + } + ]])],[zsh_cv_sys_dynamic_clash_ok=yes], + [zsh_cv_sys_dynamic_clash_ok=no], + [zsh_cv_sys_dynamic_clash_ok=no] + ) +@@ -302,21 +304,22 @@ char *zsh_gl_sym_addr ; + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + ++int + main() + { + void *handle; + int (*barneysym)(); + handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle) exit(1); ++ if(!handle) return(1); + handle = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle) exit(1); ++ if(!handle) return(1); + barneysym = (int (*)()) dlsym(handle, "${us}barney"); +- if(!barneysym) exit(1); +- exit((*barneysym)() != 69); ++ if(!barneysym) return(1); ++ return((*barneysym)() != 69); + } + ]])],[zsh_cv_sys_dynamic_rtld_global=yes], + [zsh_cv_sys_dynamic_rtld_global=no], + [zsh_cv_sys_dynamic_rtld_global=no] + ) +@@ -372,19 +375,20 @@ char *zsh_gl_sym_addr ; + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + ++int + main() + { + void *handle; + int (*barneysym)(); + handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle) exit(1); ++ if(!handle) return(1); + barneysym = (int (*)()) dlsym(handle, "${us}barney"); +- if(!barneysym) exit(1); +- exit((*barneysym)() != 69); ++ if(!barneysym) return(1); ++ return((*barneysym)() != 69); + } + + int fred () { return 42; } + ]])],[zsh_cv_sys_dynamic_execsyms=yes], + [zsh_cv_sys_dynamic_execsyms=no], +@@ -446,19 +450,20 @@ char *zsh_gl_sym_addr ; + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + ++int + main() + { + void *handle; + int (*barneysym)(); + handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle) exit(1); ++ if(!handle) return(1); + barneysym = (int (*)()) dlsym(handle, "${us}barney"); +- if(!barneysym) exit(1); +- exit((*barneysym)() != 69); ++ if(!barneysym) return(1); ++ return((*barneysym)() != 69); + } + + int fred () { return 42; } + ]])],[zsh_cv_sys_dynamic_strip_exe=yes], + [zsh_cv_sys_dynamic_strip_exe=no], +@@ -514,19 +519,20 @@ char *zsh_gl_sym_addr ; + #endif + #ifndef RTLD_GLOBAL + #define RTLD_GLOBAL 0 + #endif + ++int + main() + { + void *handle; + int (*fredsym)(); + handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL); +- if(!handle) exit(1); ++ if(!handle) return(1); + fredsym = (int (*)()) dlsym(handle, "${us}fred"); +- if(!fredsym) exit(1); +- exit((*fredsym)() != 42); ++ if(!fredsym) return(1); ++ return((*fredsym)() != 42); + } + ]])],[zsh_cv_sys_dynamic_strip_lib=yes], + [zsh_cv_sys_dynamic_strip_lib=no], + [zsh_cv_sys_dynamic_strip_lib=no] + ) + diff --git a/files/zsh-5.9-skip-test-failing-on-musl.patch b/files/zsh-5.9-skip-test-failing-on-musl.patch @@ -0,0 +1,25 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Sun, 03 Jul 2022 01:52:19 +0200 +Subject: Skip test case in E02xtrace failing on musl + +--- a/Test/E02xtrace.ztst ++++ b/Test/E02xtrace.ztst +@@ -150,7 +150,6 @@ + test_cases=( + f # baseline + foo-bar # Dash +- ヌ # Meta (the UTF-8 representation of this character has an 0x83 byte) + \$\'ba\\0z\' # Nul, escaped as though by ${(qqqq)} + ) + for 1 in "$test_cases[@]"; do +@@ -172,10 +171,6 @@ + > # traced + > echo inner + >} +->$'\M-c\M-\C-C\M-\C-L' () { +-> # traced +-> echo inner +->} + >$'ba\C-@z' () { + > # traced + > echo inner diff --git a/templates/pkg/zsh b/templates/pkg/zsh @@ -6,7 +6,16 @@ #+{{pkg_install_name("netbsd-curses")}} #+{{pkg_install_name("libbsd")}} #@git:{{submodule.current["zsh_config"]}}:zsh_config -{% endblock %} +#@sha256:{{files["zsh-"~pkg_version~"-skip-test-failing-on-musl.patch"]}}:skip-test-failing-on-musl.patch +#@sha256:{{files["zsh-"~pkg_version~"-fix-gcc14-incompatible-pointer-types.patch"]}}:fix-gcc14-incompatible-pointer-types.patch +#@sha256:{{files["zsh-"~pkg_version~"-implicit.patch"]}}:implicit.patch +{% endblock package_deps %} +{%- block prepare %} +{{- super() -}} +patch -p1 <../skip-test-failing-on-musl.patch +patch -p1 <../fix-gcc14-incompatible-pointer-types.patch +patch -p1 <../implicit.patch +{% endblock prepare %} {%- block configure %} export CPATH=$pthbs_build_environment/{{includedir|shesc}} export LIBRARY_PATH=$pthbs_build_environment/{{libdir|shesc}} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+alpine-keys.4d60a079202a5b94391f2a3ed914cfa31845df7c92cf6f05099c57632f2c3f3e #+apk-tools.eb39312a3fb2e8414e26202242515b8713fdd35483f6503d426bd951840ddadb diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -48,15 +48,15 @@ #+s6.f9a0c2f670e50dea1946f24633e7accee58edde9714af1f72aa6e1fd04db0486 #+s6-portable-utils.1796c72f15cf939402618d7743934203f32b5abc88cbc5089a44a35073254019 #+s6-linux-utils.d1865a98af7940ca8b5fd72a7d076cfad8ed1c82aad1e4daa6529649bf888f71 -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+confz.cbc53054f3d37697c1e333c61c84ddc17b68228ff646e71fdb8a5d8ed9f4c661 -#+containers.d67555dc43601107221fee4567c48ae9a51fe84bfdec7171022d6e2f393de073 +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+confz.2b64c5372784c1846ba587bb31372d261c00687df1d8b0b78e7d02d0e1857102 +#+containers.bd0bb705f669f2993bb7b617cfdf520ccdcf4ad98150e706e836bc3ece0e478e #+xbps.4e2f4ea5c069b243fd183bb43a2b20ae1625f332315b89d1f55f4eec7008fadc #+zstd.9f5c1c4efbf89f176ac088d2951e687936dd6a52a6fc0de93d5c22a6eea95165 #+apk-tools.eb39312a3fb2e8414e26202242515b8713fdd35483f6503d426bd951840ddadb #+alpine-keys.4d60a079202a5b94391f2a3ed914cfa31845df7c92cf6f05099c57632f2c3f3e #+getent.86c869c75fab5245dcdc92e0dcbb178a7303d82d954b3b668d0987848d698833 -#+fileset.3999362907386a0db3de530398228e4bfbadd309b898e8516f6ed608d39f4e64 +#+fileset.32a13234f7b70daee68cf19c7676486c31e47a75cabfe4b75d6d5212ab3fd00c #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d #+easyseccomp.85c8976bdef1e5140e0db0ef0dd8a43b2b9d3229af5c58ca2a41875292765a52 #+findutils.821fd3ba4dd7c936362cac192f3f20c46dc8fa35e7ec996d6c6ad7f0e1860e2b diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -61,14 +61,14 @@ #+s6-dns.91e0124146faaa10d333e32a42c0d7d5f45840e3566584530e8730cb644790d7 #+libressl.69bcfd75d05aab2621b5509053ea9b038b5e930a3dc1704829be4451c3f92209 #+s6-networking.3f957c3e8f1ec71354b0e0402c662d7f9ff650191929836764cf506216a862b6 -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd -#+aat.5a7590220f94896d3e7ec2d4d9bd60538459e0773ad8fcc46fbb57fd20e5da18 -#+confz.cbc53054f3d37697c1e333c61c84ddc17b68228ff646e71fdb8a5d8ed9f4c661 -#+containers.d67555dc43601107221fee4567c48ae9a51fe84bfdec7171022d6e2f393de073 -#+fileset.3999362907386a0db3de530398228e4bfbadd309b898e8516f6ed608d39f4e64 -#+logincaps.78e00b0e4ed919e322a9d16b948c41e46c7ce02b017977a668a20e157f603b46 -#+snaprep.04c70f9aee6fbbcf365fc28648afcc45d5ccf14358aadaae58d1dcca318b922a +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 +#+aat.603b09a65ab0a64c4676cc7f59fe2c59b5d9780c98ae03b6ee5813adc9e439ab +#+confz.2b64c5372784c1846ba587bb31372d261c00687df1d8b0b78e7d02d0e1857102 +#+containers.bd0bb705f669f2993bb7b617cfdf520ccdcf4ad98150e706e836bc3ece0e478e +#+fileset.32a13234f7b70daee68cf19c7676486c31e47a75cabfe4b75d6d5212ab3fd00c +#+logincaps.902a8de591d2b75b551b3e48894c13533dafa2cfc396c22b078db96c422e2d7e +#+snaprep.2c54b9d9a47611cdec35887ae712f5952ae5dac7724304f34a4a3a18e99184e5 #+curl.0e65db5bb39f6bb4486d6402140328039310815f379850d5c6ed90c5ae072fa9 #+git.f5f8f4c7ca3a777ef1607367fd98a61f674fed3b0f986ad17ecbae7f57c253a3 #+xbps.4e2f4ea5c069b243fd183bb43a2b20ae1625f332315b89d1f55f4eec7008fadc @@ -79,7 +79,7 @@ #+libcap.3bbce58edcc50c830ab9a39964d09cfe4e47aea694a03756210e84f7f9fc226d #+applyuidgid-caps.69fbc89fd6a8912c86ef5c4394db75e406d5a98474255a0fde0d9eeb4d6b25ee #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d -#+user-env.726d42cfe17574fbe43e3a04b28567399766b176f7c9eed2570adf6f865d6886 +#+user-env.de7adf0f9b36ce697a4cf88fd07f626a4856f29ba33c8f091341c4ac9fa70a93 #+mlog.5ddb8f9b9e8ab343d6218d162cf435967694138fdc2a8691637738e64b0c2d46 #+findutils.821fd3ba4dd7c936362cac192f3f20c46dc8fa35e7ec996d6c6ad7f0e1860e2b #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f @@ -87,9 +87,9 @@ #+squashfs-tools.1b32395a427ffeb9dbcd13098bc31d885cc2fc14c7a77fc32597d1c09868096f #+mandoc.099a08af56c6fe54e24432816a7bae11dff399d0a0b0eaee384245507cf11245 #+tinyssh.4a62259081d3cb66c5d84a43e21937aef91ee0a9615ddc0dc002058b9f126ede -#+system-config.2278ae9d44ea86aeb067337fcaa57210171acf27d3ec9ddf60a189e5d2b857d3 -#+system-config-rc.5de734882a1505362436ed5be30e078e35339475a8c472c22cace83d2466edfb -#+system-config-scripts.34e6224695c422c70d05082c0c488edf276865fbbf21368c68cbafcf7b02a875 -#+system-config-init.b3cbd7063a8203d71e458670ac4f653ce41c74c8af5a428c2a29b9f036579375 -#+system-config-zsh.0e30f465ff012406872e10242d84d0be2182bb2027b943280282eaf26729a99b +#+system-config.5f549254c760cc99c53d2dc49b738754431022b8f4438b90e06adbaa3103cc88 +#+system-config-rc.9b327a934f1b79818a3825df76bb41a457872e48ed805c15f3de304e868e1970 +#+system-config-scripts.5e340f9e8769c6f8dec53ad8d96f0a570cd0229175233bdf89e73706ea6b8b2d +#+system-config-init.84b2217b173b7f649d5c39edab950264001927d999b1f6d23d9e4ee126b6a12d +#+system-config-zsh.90e51768467bbf1630bad5ac1047ef46b48f4d1822a35111e8514638509d9175 #+busybox.2ce453a8111e476e4d172ae26de49f8f79d8c0b9bb7b83eed53fe7c7a0c203d2 \ No newline at end of file diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+musl-cross-make.c3441fbe0e30140d774335b945fab76d703905dc4a5f0660f109084d6dec9b94 #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -45,6 +45,6 @@ #+busybox-cron.e33735df25412afb66cf4f2d0f3548b85c35a3a567210a42e4268a794b3e2975 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+s6.f9a0c2f670e50dea1946f24633e7accee58edde9714af1f72aa6e1fd04db0486 -#+mdev-scripts.fb6815f6f75db844ac238cd09ffad6b78d26bfd489971c4c4d283b9b713a9fe8 +#+mdev-scripts.49ebddbc568c05592ab0ad70a114f5c4e62bca095e8ac35d251581a09c431fcf #+mdevd.c16acf759740427f5c49b4fc52ca69481a0a411d4cef7af1714b77c7831ae391 #+busybox.2ce453a8111e476e4d172ae26de49f8f79d8c0b9bb7b83eed53fe7c7a0c203d2 \ No newline at end of file diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c #@sha256:577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715:pthbs-banginstall diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f #+diffutils.61d804a97b23b50137fc9e38e1cdcd0bf9d37832139edfdaa921b305f3f1fd7a #+gnu-make.d80534c0fc3649445dd60c4d82154c8bd9cf4eb57f5cf53f70b1fd63d90ae544 -#+aat.5a7590220f94896d3e7ec2d4d9bd60538459e0773ad8fcc46fbb57fd20e5da18 -#+fileset.3999362907386a0db3de530398228e4bfbadd309b898e8516f6ed608d39f4e64 +#+aat.603b09a65ab0a64c4676cc7f59fe2c59b5d9780c98ae03b6ee5813adc9e439ab +#+fileset.32a13234f7b70daee68cf19c7676486c31e47a75cabfe4b75d6d5212ab3fd00c #+rsync.e3fad078ac173272e180ecd9a133b92b3eceb3ae311e68796c6161f85b8f3907 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 #+kbd.aed3da60e482cce0cb3841872228f9c59a7fb20a5103845a02671b5b8517636b @@ -56,10 +56,10 @@ #+s6-linux-utils.d1865a98af7940ca8b5fd72a7d076cfad8ed1c82aad1e4daa6529649bf888f71 #+s6-rc.fd611fea84d68724e6ed8543d310e29b02b383f4f4335021e64e6638423e196d #+s6.f9a0c2f670e50dea1946f24633e7accee58edde9714af1f72aa6e1fd04db0486 -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c #+libcgroup.be4f083a75c52754c9f5043824d1cee88bf8856c7f59f0610d524e57d33870d6 -#+system-config-scripts.34e6224695c422c70d05082c0c488edf276865fbbf21368c68cbafcf7b02a875 -#+logincaps.78e00b0e4ed919e322a9d16b948c41e46c7ce02b017977a668a20e157f603b46 +#+system-config-scripts.5e340f9e8769c6f8dec53ad8d96f0a570cd0229175233bdf89e73706ea6b8b2d +#+logincaps.902a8de591d2b75b551b3e48894c13533dafa2cfc396c22b078db96c422e2d7e #+busybox.2ce453a8111e476e4d172ae26de49f8f79d8c0b9bb7b83eed53fe7c7a0c203d2 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,8 +97,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/home/ccx/versions/env.f8efed4dbcee4ed087eb2ce52c65c355b18a96a2c64b02379adeb24dae0cd146' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.8edcab9f395dd2b4f39bea5bb513162f7bfc52b2bac0dbd26c9a0d3059192bb5' \ + 'pthbs_path_containers=/home/ccx/versions/env.5614f198b0c9adc71f435ec2eff5a1f068150049f63dc5aa83b106aa0eb787d7' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.af32511eb9b5ccf319223c0579504c63b75817815fff5e6842706114f9c86a49' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.1796c72f15cf939402618d7743934203f32b5abc88cbc5089a44a35073254019 #+s6-linux-init.5dd53210945f7cd550a27c30892a4305888e6dde1c30a3c072ee3a4a2b82c2a8 #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 -#+system-config-rc.5de734882a1505362436ed5be30e078e35339475a8c472c22cace83d2466edfb +#+system-config-rc.9b327a934f1b79818a3825df76bb41a457872e48ed805c15f3de304e868e1970 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.5de734882a1505362436ed5be30e078e35339475a8c472c22cace83d2466edfb/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.9b327a934f1b79818a3825df76bb41a457872e48ed805c15f3de304e868e1970/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -29,8 +29,8 @@ #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f #+busybox-diffutils.89a8c63d9a07390f09f31562e27cd4b0d711110bae836a27376131b427b7e442 #+s6-rc.fd611fea84d68724e6ed8543d310e29b02b383f4f4335021e64e6638423e196d -#+fileset.3999362907386a0db3de530398228e4bfbadd309b898e8516f6ed608d39f4e64 -#+system-config.2278ae9d44ea86aeb067337fcaa57210171acf27d3ec9ddf60a189e5d2b857d3 +#+fileset.32a13234f7b70daee68cf19c7676486c31e47a75cabfe4b75d6d5212ab3fd00c +#+system-config.5f549254c760cc99c53d2dc49b738754431022b8f4438b90e06adbaa3103cc88 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.2278ae9d44ea86aeb067337fcaa57210171acf27d3ec9ddf60a189e5d2b857d3/config/s6-rc-source +src=/home/ccx/versions/system-config.5f549254c760cc99c53d2dc49b738754431022b8f4438b90e06adbaa3103cc88/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.370044141852967f1cdbbdf39224ce7217602131ef2c7767a67a30d97ec789cc #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.5a33e1b6f693a01e7ab05992ce8cc749da07509e391418bc8d53796d1aeaf98e #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f #+execline.88e76844a30419b26b2f1de188eed4d9cb0cbaf1d0dce7d437b84370e3e8edc0 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -61,14 +61,14 @@ #+s6-dns.91e0124146faaa10d333e32a42c0d7d5f45840e3566584530e8730cb644790d7 #+libressl.69bcfd75d05aab2621b5509053ea9b038b5e930a3dc1704829be4451c3f92209 #+s6-networking.3f957c3e8f1ec71354b0e0402c662d7f9ff650191929836764cf506216a862b6 -#+zsh.5d4b45ebcf92c17839ec80e41f8b9f4ab96380147fb721e2be0ce13570e92474 -#+pthbs-banginstall.c13d5d4f4a0852456f71fcb191545f5e4a3cbcd8a397986bfa7fcbe5fe1568dd -#+aat.5a7590220f94896d3e7ec2d4d9bd60538459e0773ad8fcc46fbb57fd20e5da18 -#+confz.cbc53054f3d37697c1e333c61c84ddc17b68228ff646e71fdb8a5d8ed9f4c661 -#+containers.d67555dc43601107221fee4567c48ae9a51fe84bfdec7171022d6e2f393de073 -#+fileset.3999362907386a0db3de530398228e4bfbadd309b898e8516f6ed608d39f4e64 -#+logincaps.78e00b0e4ed919e322a9d16b948c41e46c7ce02b017977a668a20e157f603b46 -#+snaprep.04c70f9aee6fbbcf365fc28648afcc45d5ccf14358aadaae58d1dcca318b922a +#+zsh.e16b8ce4ba41e416575f47e5a114b7899e41c45a6d8262335b55d1247737303c +#+pthbs-banginstall.a59dbdad79dfa85bd3fd4f901f03e3e7e45be50971ce5f98141d80aad94e50b5 +#+aat.603b09a65ab0a64c4676cc7f59fe2c59b5d9780c98ae03b6ee5813adc9e439ab +#+confz.2b64c5372784c1846ba587bb31372d261c00687df1d8b0b78e7d02d0e1857102 +#+containers.bd0bb705f669f2993bb7b617cfdf520ccdcf4ad98150e706e836bc3ece0e478e +#+fileset.32a13234f7b70daee68cf19c7676486c31e47a75cabfe4b75d6d5212ab3fd00c +#+logincaps.902a8de591d2b75b551b3e48894c13533dafa2cfc396c22b078db96c422e2d7e +#+snaprep.2c54b9d9a47611cdec35887ae712f5952ae5dac7724304f34a4a3a18e99184e5 #+curl.0e65db5bb39f6bb4486d6402140328039310815f379850d5c6ed90c5ae072fa9 #+git.f5f8f4c7ca3a777ef1607367fd98a61f674fed3b0f986ad17ecbae7f57c253a3 #+xbps.4e2f4ea5c069b243fd183bb43a2b20ae1625f332315b89d1f55f4eec7008fadc @@ -79,7 +79,7 @@ #+libcap.3bbce58edcc50c830ab9a39964d09cfe4e47aea694a03756210e84f7f9fc226d #+applyuidgid-caps.69fbc89fd6a8912c86ef5c4394db75e406d5a98474255a0fde0d9eeb4d6b25ee #+ccx-utils.72ed047d6ddd5ce8fd4eb6d1515f53b7c4aeabc7b224af7b5b44973cdf8a155d -#+user-env.726d42cfe17574fbe43e3a04b28567399766b176f7c9eed2570adf6f865d6886 +#+user-env.de7adf0f9b36ce697a4cf88fd07f626a4856f29ba33c8f091341c4ac9fa70a93 #+mlog.5ddb8f9b9e8ab343d6218d162cf435967694138fdc2a8691637738e64b0c2d46 #+findutils.821fd3ba4dd7c936362cac192f3f20c46dc8fa35e7ec996d6c6ad7f0e1860e2b #+nawk.5cf6bfe4c093ceee7a66685561bb0a6b6d0d8b0939a73da4818e316541b2bc4f diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -34,6 +34,9 @@ #+netbsd-curses.dc9f080095fea8cd15d5113f48ecc0b56eec7ae5b0214a533140dbd3f934f994 #+libbsd.db82d72f85a3af3e8f881881c09f6ff51d3fb20ce6847013397243eabd33d53f #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config +#@sha256:02f8f8bc764f0bcb83c03675cd8bfd27ed7554563f01a1a96e567f8c1a517be7:skip-test-failing-on-musl.patch +#@sha256:637f1198129209e3546ce9b3d340be6a8fddda5a54e13b4d7ecddfb2058ac795:fix-gcc14-incompatible-pointer-types.patch +#@sha256:c2f1de94290969a07130559a6544be93ac3ab2034ccddffaa1c7873112d373f1:implicit.patch #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -86,6 +89,9 @@ check_static() { prefix=/home/ccx/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zsh-5.9' +patch -p1 <../skip-test-failing-on-musl.patch +patch -p1 <../fix-gcc14-incompatible-pointer-types.patch +patch -p1 <../implicit.patch export CPATH=$pthbs_build_environment/'include' diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+alpine-keys.6d4bacf41a7227e0dd7324e542dfccc638f4c62a1e49d3bec531cd242ba23c40 #+apk-tools.21aa724553ff28021a474791357765d9818e6aab2dd2d8e2eef2f56ccc339fd1 diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -48,15 +48,15 @@ #+s6.56ff669c701d5de606e58c38bf8135f8e64d3217ba96cbcf8a1856d8463dfa45 #+s6-portable-utils.de6bd725492abae2a88540fc19b915f74967ca77e71f074f76c4d71bb1f78ded #+s6-linux-utils.a7c2dbb5495230005406024ed4111e2fc42741e49a77f57c4028947dc63eed48 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+confz.a61097fc467f562cff6fdf9792b567f187d71f0e750c1642425efa072678cec0 -#+containers.7c8951ab599f084352d652ee898099378d40aecc71e75b13fb6ca354c9b3ce43 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+confz.ebc93a3ce51301cb97a400894dcf405a6bc93c72a47134ef882a8b1013c4dcc6 +#+containers.12f4386592f1a61b56464936292c1f4169c23381c0282d6dc238ab25bda9cdc4 #+xbps.2f0f75d783403363b5f1df490715d40d14a0599d3f79026eb1812c36a48c9bc2 #+zstd.bef9f00e9c205f0cc38e30b3f88bae3a16d725a2791f6db24ae11ed5d73ff7f4 #+apk-tools.21aa724553ff28021a474791357765d9818e6aab2dd2d8e2eef2f56ccc339fd1 #+alpine-keys.6d4bacf41a7227e0dd7324e542dfccc638f4c62a1e49d3bec531cd242ba23c40 #+getent.0936ed103e469c1452520dd8db14e0de421d79edd562df2324bb6220d2593346 -#+fileset.f86d21f54073da77c4e80626e170b780bb887d6a041be25f0b57c72e46d044f3 +#+fileset.25e4f231c777bbbd1f348543140f712b53c4a875f09ee068a2f2aa792a1aee89 #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee #+easyseccomp.c47e12257692dc203285b8093a275de33cd874362a7a38c5fde1d31340f5acad #+findutils.6e1c11dd369b6af8598bb021a609cea553bd6dd3888f39a3f032f3122e6dc752 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -61,14 +61,14 @@ #+s6-dns.098fa9d6563b4377376269b3efc07cba279f227af48726802a89635b0cab5270 #+libressl.027ad93b75fe650b2d6df50f160dfc68ce0894fa543b4459aa8e0c003e4bf950 #+s6-networking.f3a482f5988c22c18dd95d71a183cce811d86bab49d7503812487c094d2c04a0 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 -#+aat.85eafff426bb1d225d74b332fd3c124932b75288f0730c020e11e54def17802e -#+confz.a61097fc467f562cff6fdf9792b567f187d71f0e750c1642425efa072678cec0 -#+containers.7c8951ab599f084352d652ee898099378d40aecc71e75b13fb6ca354c9b3ce43 -#+fileset.f86d21f54073da77c4e80626e170b780bb887d6a041be25f0b57c72e46d044f3 -#+logincaps.1c7e9e86987fa44f72c747bb72b193190abc6d55a41af88342f12827b8fa4e0a -#+snaprep.bda8a5940b5820c5a8164218253ffecb498714615ec607183d039abcff5733c4 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 +#+aat.4bb69fc427ebbfca7f6ef41953f4f0f4aa71e600b88f30d3a109cb80dca77178 +#+confz.ebc93a3ce51301cb97a400894dcf405a6bc93c72a47134ef882a8b1013c4dcc6 +#+containers.12f4386592f1a61b56464936292c1f4169c23381c0282d6dc238ab25bda9cdc4 +#+fileset.25e4f231c777bbbd1f348543140f712b53c4a875f09ee068a2f2aa792a1aee89 +#+logincaps.4a6a3cd5475f1537ec0680144bd331cb5b3a81e8f17f08f475cef807bed563c3 +#+snaprep.f372749eab938862c54908ab73fad7e379e1628066945cda640c47a7635a06cb #+curl.8619a4c494e022953bebe64abe725a9e7c56bfbec2c8cd259cf7c8e9beeb6d42 #+git.af468fbc90368a5ce00837bea508ab60f7fc9154e1ce836bfd013502ca010872 #+xbps.2f0f75d783403363b5f1df490715d40d14a0599d3f79026eb1812c36a48c9bc2 @@ -79,7 +79,7 @@ #+libcap.c7f63e1f43c6ecb4eb53f37df98d86588e50bc796de116b114d1073e6b18c80e #+applyuidgid-caps.4b553a40253e50b2feeea8a1953c310df0012693fed64f731ffd90cc3aca3d5a #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee -#+user-env.4865bf71bf54bf30119fd3230cb39bde0f2cd0f35d0257cb586e912e6e68aabb +#+user-env.b2e07d3af5011be9a3451d3809d2207f5dd462971f9d34b0cb032b1b16201dc7 #+mlog.0b224ab6f19b71888dde9fcac11161a3dfabb5c7c76499faad3c8b4c15ccd222 #+findutils.6e1c11dd369b6af8598bb021a609cea553bd6dd3888f39a3f032f3122e6dc752 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 @@ -87,9 +87,9 @@ #+squashfs-tools.d260ec95b9c4fd9785a2b5cc18396a3bac41d784f661d8ef798d0cfb8082bebf #+mandoc.39761c2ffd4043932efc37327208a2d642eed793d788ef68d254445528d26ea1 #+tinyssh.467e70e862010c83ab6c915451821b7f53b60da2745ec9e05ac781fe7b725ecc -#+system-config.4f1fce32676f811acd8a24f5b4648fe40847f14b723b1efeffecc25f5248453a -#+system-config-rc.5f462f8a721876fff5714178d0f3b669532952ae094bde85ff0bdcb3df2d73d6 -#+system-config-scripts.585946dd7742301e02a4f7cfe7e748c4ff5d6f273bee833666e1801691882192 -#+system-config-init.f3b54daf3eeb80f3dc6433dbe03cd267d490eb680fdb2d1c39054068bd03599b -#+system-config-zsh.a86f2c31cc2f877c88dcecf8cdf37f15dad6b2c9eb0564b8009acfbee6576d96 +#+system-config.66b3a5d515cf9f949ff8bd1ab9f1591513f3f65b73de90cae4fb3a5b56c62ef9 +#+system-config-rc.1c7784dd1ce3c2ec8cdedf0eaa5048cea8d65f7d63814d3dd6c8964284efa7d4 +#+system-config-scripts.636b40d2d3149053a53f885064f7b68edb271cae77ea4f7beb2e8c9c689db9f4 +#+system-config-init.4b88645cb45240bf818ebebaabdf8ce6ebf17c2e412c983ed6c27e475c29081b +#+system-config-zsh.1b7c1c77390ce580d1f8dd37411c31f10bf46f6a2b333a5f618389e16e8ec2a2 #+busybox-modutils.f523c9c2d657e3375ca7b081ebb659bf606b103db8865c728be5956079255ed0 \ No newline at end of file diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+musl-cross-make.cd12e9d331fd3f602f554602ef6eae95ee92dee8a9d1e3d9e668d2e890b61156 #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -45,6 +45,6 @@ #+busybox-cron.2aafad4cee8c900ff3536339dae42bfe8ff11bbb258aa2a7fc1f1e75ecee0632 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+s6.56ff669c701d5de606e58c38bf8135f8e64d3217ba96cbcf8a1856d8463dfa45 -#+mdev-scripts.531302eeda6537e533f6deddb0153520717d1fb65730ef89f99d0b665b26264e +#+mdev-scripts.3d9903b70444bc1dd5103ee10e193f13638293798aadf3892ddd56b0a7a6fa02 #+mdevd.7122c304421366d0569204e6bad60b2052f2dcc89aa08b35babf701c5907a8b6 #+busybox-modutils.f523c9c2d657e3375ca7b081ebb659bf606b103db8865c728be5956079255ed0 \ No newline at end of file diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 #@sha256:577cbaf04486ebc113d1c0b9dabd9a8eb29506dbfbdb5824d1e0601df4262715:pthbs-banginstall diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -47,8 +47,8 @@ #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 #+diffutils.582822692039a355c7d278e9fc099ff3655da434458a8b3e69214fb15b408f32 #+gnu-make.0cd32abcb147224ce13b28cb5726f928c1269666569a65649cfff0b566a20ecd -#+aat.85eafff426bb1d225d74b332fd3c124932b75288f0730c020e11e54def17802e -#+fileset.f86d21f54073da77c4e80626e170b780bb887d6a041be25f0b57c72e46d044f3 +#+aat.4bb69fc427ebbfca7f6ef41953f4f0f4aa71e600b88f30d3a109cb80dca77178 +#+fileset.25e4f231c777bbbd1f348543140f712b53c4a875f09ee068a2f2aa792a1aee89 #+rsync.e94935064dfee96fd9d56361b98387a76231718db009996065bc4a07d3b55ff0 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a #+kbd.ddebd7ad90e262071e43c3451f52b1fb0a8193e83a7c65f2ea312d9b57c90bda @@ -56,10 +56,10 @@ #+s6-linux-utils.a7c2dbb5495230005406024ed4111e2fc42741e49a77f57c4028947dc63eed48 #+s6-rc.5d4d0a4afffa7579cd840e68e5616703803bd020d0541897b21e2b89027ddf0c #+s6.56ff669c701d5de606e58c38bf8135f8e64d3217ba96cbcf8a1856d8463dfa45 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 #+libcgroup.1f2f76896f984e27b169a1220e6b148d6ba3b0bc46cd784e4e7f7e1813c98b40 -#+system-config-scripts.585946dd7742301e02a4f7cfe7e748c4ff5d6f273bee833666e1801691882192 -#+logincaps.1c7e9e86987fa44f72c747bb72b193190abc6d55a41af88342f12827b8fa4e0a +#+system-config-scripts.636b40d2d3149053a53f885064f7b68edb271cae77ea4f7beb2e8c9c689db9f4 +#+logincaps.4a6a3cd5475f1537ec0680144bd331cb5b3a81e8f17f08f475cef807bed563c3 #+busybox-modutils.f523c9c2d657e3375ca7b081ebb659bf606b103db8865c728be5956079255ed0 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,8 +97,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.6c30a22fb681fe3a39667dfb8aa419e8a4796b0f0cb983f558be415cb065a18b' \ - 'pthbs_path_mdevd=/versions/env.f7098eeb7dfae4c099488399a4e4e8161d82807e207d0c166f7f5046d65d7d72' \ + 'pthbs_path_containers=/versions/env.0b458388acf4994b3a5ad1cc66d6770da476447b9a3b7ee094d47fd236c0a279' \ + 'pthbs_path_mdevd=/versions/env.fd407a8de94bcb2c65b76ca7bada4fa698ccf691e2f421bf44f06faa048e756f' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.de6bd725492abae2a88540fc19b915f74967ca77e71f074f76c4d71bb1f78ded #+s6-linux-init.58fc58cdec1ca2460fba9ef0c4e86972ec1f73a6f5cc2b7f350e3573f650669f #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a -#+system-config-rc.5f462f8a721876fff5714178d0f3b669532952ae094bde85ff0bdcb3df2d73d6 +#+system-config-rc.1c7784dd1ce3c2ec8cdedf0eaa5048cea8d65f7d63814d3dd6c8964284efa7d4 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.5f462f8a721876fff5714178d0f3b669532952ae094bde85ff0bdcb3df2d73d6/config/s6-rc-db +s6rcdb=/versions/system-config-rc.1c7784dd1ce3c2ec8cdedf0eaa5048cea8d65f7d63814d3dd6c8964284efa7d4/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -29,8 +29,8 @@ #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 #+busybox-diffutils.6c40cfac430f81e28c210960ed2ce0917cbb08974b985c2c22fc4f0fd870854e #+s6-rc.5d4d0a4afffa7579cd840e68e5616703803bd020d0541897b21e2b89027ddf0c -#+fileset.f86d21f54073da77c4e80626e170b780bb887d6a041be25f0b57c72e46d044f3 -#+system-config.4f1fce32676f811acd8a24f5b4648fe40847f14b723b1efeffecc25f5248453a +#+fileset.25e4f231c777bbbd1f348543140f712b53c4a875f09ee068a2f2aa792a1aee89 +#+system-config.66b3a5d515cf9f949ff8bd1ab9f1591513f3f65b73de90cae4fb3a5b56c62ef9 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.4f1fce32676f811acd8a24f5b4648fe40847f14b723b1efeffecc25f5248453a/config/s6-rc-source +src=/versions/system-config.66b3a5d515cf9f949ff8bd1ab9f1591513f3f65b73de90cae4fb3a5b56c62ef9/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -27,8 +27,8 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.c6e613696f4aef8e9f0808575ea2b6f8628a6705c7a0bac7c4aa1692b4e84c25 #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -28,7 +28,7 @@ #+busybox-findutils.226fd4feb599b908f64314668b54e07a6eb0bad68355205b28af698c942bdc48 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 #+execline.67203c458bf7acff865509a59d8601930cd9d0b762796198f8cc658f25e85a3a -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -61,14 +61,14 @@ #+s6-dns.098fa9d6563b4377376269b3efc07cba279f227af48726802a89635b0cab5270 #+libressl.027ad93b75fe650b2d6df50f160dfc68ce0894fa543b4459aa8e0c003e4bf950 #+s6-networking.f3a482f5988c22c18dd95d71a183cce811d86bab49d7503812487c094d2c04a0 -#+zsh.9e8f8033f05bfd5c9fbf59698848392145f3fe8c69e37046b4c3dc4ac18435cf -#+pthbs-banginstall.64da0a26d9e69305f07e2917d011a1e7ff378dac51b15fd756074ffaa59a6cd5 -#+aat.85eafff426bb1d225d74b332fd3c124932b75288f0730c020e11e54def17802e -#+confz.a61097fc467f562cff6fdf9792b567f187d71f0e750c1642425efa072678cec0 -#+containers.7c8951ab599f084352d652ee898099378d40aecc71e75b13fb6ca354c9b3ce43 -#+fileset.f86d21f54073da77c4e80626e170b780bb887d6a041be25f0b57c72e46d044f3 -#+logincaps.1c7e9e86987fa44f72c747bb72b193190abc6d55a41af88342f12827b8fa4e0a -#+snaprep.bda8a5940b5820c5a8164218253ffecb498714615ec607183d039abcff5733c4 +#+zsh.459b70ac1ea5d847e06767f55ed7337e1f4d55ca4daf3187b2d7271005012a22 +#+pthbs-banginstall.fe53b2063ecd99399443e3b727de3c6824bb5bd51a30add6ae343a00769d7226 +#+aat.4bb69fc427ebbfca7f6ef41953f4f0f4aa71e600b88f30d3a109cb80dca77178 +#+confz.ebc93a3ce51301cb97a400894dcf405a6bc93c72a47134ef882a8b1013c4dcc6 +#+containers.12f4386592f1a61b56464936292c1f4169c23381c0282d6dc238ab25bda9cdc4 +#+fileset.25e4f231c777bbbd1f348543140f712b53c4a875f09ee068a2f2aa792a1aee89 +#+logincaps.4a6a3cd5475f1537ec0680144bd331cb5b3a81e8f17f08f475cef807bed563c3 +#+snaprep.f372749eab938862c54908ab73fad7e379e1628066945cda640c47a7635a06cb #+curl.8619a4c494e022953bebe64abe725a9e7c56bfbec2c8cd259cf7c8e9beeb6d42 #+git.af468fbc90368a5ce00837bea508ab60f7fc9154e1ce836bfd013502ca010872 #+xbps.2f0f75d783403363b5f1df490715d40d14a0599d3f79026eb1812c36a48c9bc2 @@ -79,7 +79,7 @@ #+libcap.c7f63e1f43c6ecb4eb53f37df98d86588e50bc796de116b114d1073e6b18c80e #+applyuidgid-caps.4b553a40253e50b2feeea8a1953c310df0012693fed64f731ffd90cc3aca3d5a #+ccx-utils.4cc69559cc7197bc4c7f2b829b17d019637304658c7faa6361027bd1a6b7e9ee -#+user-env.4865bf71bf54bf30119fd3230cb39bde0f2cd0f35d0257cb586e912e6e68aabb +#+user-env.b2e07d3af5011be9a3451d3809d2207f5dd462971f9d34b0cb032b1b16201dc7 #+mlog.0b224ab6f19b71888dde9fcac11161a3dfabb5c7c76499faad3c8b4c15ccd222 #+findutils.6e1c11dd369b6af8598bb021a609cea553bd6dd3888f39a3f032f3122e6dc752 #+nawk.0f3392f9ef786a40a03cc521e29bc7900dca789a2cdd22011177d11b5e01a4e6 diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -34,6 +34,9 @@ #+netbsd-curses.f9ffdae25fbf850b960dbfc366147ed7dbb448e06bf50530297e3f8feb27a7ae #+libbsd.2d1c37b1dbd5a7608bf15cf6e62938a20830464c055aae3244c9d11af583999b #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config +#@sha256:02f8f8bc764f0bcb83c03675cd8bfd27ed7554563f01a1a96e567f8c1a517be7:skip-test-failing-on-musl.patch +#@sha256:637f1198129209e3546ce9b3d340be6a8fddda5a54e13b4d7ecddfb2058ac795:fix-gcc14-incompatible-pointer-types.patch +#@sha256:c2f1de94290969a07130559a6544be93ac3ab2034ccddffaa1c7873112d373f1:implicit.patch #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -86,6 +89,9 @@ check_static() { prefix=/versions/$pthbs_package dest=${pthbs_destdir%/}${prefix} cd 'zsh-5.9' +patch -p1 <../skip-test-failing-on-musl.patch +patch -p1 <../fix-gcc14-incompatible-pointer-types.patch +patch -p1 <../implicit.patch export CPATH=$pthbs_build_environment/'include'