From fd6faf36ae61533e0c9cf43f2c81f5987adf3d8b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 7 Aug 2023 22:48:15 -0700 Subject: [PATCH 01/97] glibc: update to 2.38. Remove obsolete flags. https://github.com/bminor/glibc/commit/92963737c4376bcfd65235d5c325fa7f48302f89 https://github.com/bminor/glibc/commit/644d38570a860f3ed7d478c4ed8965a91e4621a1 https://github.com/bminor/glibc/commit/07ed18d26a342741cb25a4739158c65ed9dd4d09 https://github.com/bminor/glibc/commit/f294306ba1385b096f4e4cac9146a989f1e6d1c0 --- common/shlibs | 61 ++-- ...e-hash-style-both-for-building-glibc.patch | 51 --- ...4f10b504bc4564e9f22f00907093f1ab9338.patch | 335 ++++++++++++++++++ ...08dd774b617f99419bdc3cf2ace4560cd2d6.patch | 192 ++++++++++ ...te-GLIBC_TUNABLES-in-setxid-binaries.patch | 33 +- srcpkgs/glibc/template | 18 +- 6 files changed, 576 insertions(+), 114 deletions(-) delete mode 100644 srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch create mode 100644 srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch create mode 100644 srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch diff --git a/common/shlibs b/common/shlibs index 9036a675c1ae5..c0b3be6c4c4f5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -17,39 +17,38 @@ # one (order top->bottom) is preferred over the next ones. # libc.so musl-1.1.24_7 -libc.so.6 glibc-2.36_1 -libm.so.6 glibc-2.36_1 -libpthread.so.0 glibc-2.36_1 -librt.so.1 glibc-2.36_1 -libdl.so.2 glibc-2.36_1 -ld-linux-x86-64.so.2 glibc-2.36_1 x86_64 -ld-linux.so.2 glibc-2.36_1 i686 -ld-linux.so.3 glibc-2.36_1 armv5tel -ld-linux-aarch64.so.1 glibc-2.36_1 aarch64 -ld-linux-riscv64-lp64d.so.1 glibc-2.36_1 riscv64 -ld64.so.2 glibc-2.36_1 ppc64 -ld.so.1 glibc-2.36_1 mips -ld.so.1 glibc-2.36_1 ppc -ld-linux-armhf.so.3 glibc-2.36_1 -libresolv.so.2 glibc-2.36_1 -libanl.so.1 glibc-2.36_1 -libthread_db.so.1 glibc-2.36_1 -libutil.so.1 glibc-2.36_1 -libnsl.so.1 glibc-2.36_1 -libnss_db.so.2 glibc-2.36_1 -libnss_files.so.2 glibc-2.36_1 -libnss_compat.so.2 glibc-2.36_1 -libnss_dns.so.2 glibc-2.36_1 -libnss_hesiod.so.2 glibc-2.36_1 -libcrypt.so.1 glibc-2.36_1 -libBrokenLocale.so.1 glibc-2.36_1 +libc.so.6 glibc-2.38_1 +libm.so.6 glibc-2.38_1 +libpthread.so.0 glibc-2.38_1 +librt.so.1 glibc-2.38_1 +libdl.so.2 glibc-2.38_1 +ld-linux-x86-64.so.2 glibc-2.38_1 x86_64 +ld-linux.so.2 glibc-2.38_1 i686 +ld-linux.so.3 glibc-2.38_1 armv5tel +ld-linux-aarch64.so.1 glibc-2.38_1 aarch64 +ld-linux-riscv64-lp64d.so.1 glibc-2.38_1 riscv64 +ld64.so.2 glibc-2.38_1 ppc64 +ld.so.1 glibc-2.38_1 mips +ld.so.1 glibc-2.38_1 ppc +ld-linux-armhf.so.3 glibc-2.38_1 +libresolv.so.2 glibc-2.38_1 +libanl.so.1 glibc-2.38_1 +libthread_db.so.1 glibc-2.38_1 +libutil.so.1 glibc-2.38_1 +libnsl.so.1 glibc-2.38_1 +libnss_db.so.2 glibc-2.38_1 +libnss_files.so.2 glibc-2.38_1 +libnss_compat.so.2 glibc-2.38_1 +libnss_dns.so.2 glibc-2.38_1 +libnss_hesiod.so.2 glibc-2.38_1 +libBrokenLocale.so.1 glibc-2.38_1 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1 -libmemusage.so glibc-2.36_1 -libSegFault.so glibc-2.36_1 -libpcprofile.so glibc-2.36_1 -libcidn.so.1 glibc-2.36_1 -libmvec.so.1 glibc-2.36_1 +libmemusage.so glibc-2.38_1 +libSegFault.so glibc-2.38_1 +libpcprofile.so glibc-2.38_1 +libcidn.so.1 glibc-2.38_1 +libmvec.so.1 glibc-2.3_1 libcddgmp.so.0 cddlib-0.94m_1 libcdd.so.0 cddlib-0.94m_1 libz.so.1 zlib-1.2.3_1 diff --git a/srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch b/srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch deleted file mode 100644 index 9c5553e92609d..0000000000000 --- a/srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch +++ /dev/null @@ -1,51 +0,0 @@ -Temporary workaround for EAC bug. - -See: https://sourceware.org/bugzilla/show_bug.cgi?id=29456 - -From 8e90e2cc5e57d7ca3a40602d278e9642a8b66716 Mon Sep 17 00:00:00 2001 -From: oreo639 -Date: Tue, 13 Sep 2022 14:30:35 -0700 -Subject: [PATCH] Revert "Do not use --hash-style=both for building glibc - shared objects" - -This reverts commit e47de5cb2d4dbecb58f569ed241e8e95c568f03c. ---- - Makeconfig | 9 +++++++++ - Makerules | 7 +++++++ - 5 files changed, 61 insertions(+) - -diff --git a/Makeconfig b/Makeconfig -index ba70321af1..e2131d4389 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -371,6 +371,13 @@ dt-relr-ldflag = - no-dt-relr-ldflag = - endif - -+# For the time being we unconditionally use 'both'. At some time we -+# should declare statically linked code as 'out of luck' and compile -+# with --hash-style=gnu only. -+hashstyle-LDFLAGS = -Wl,--hash-style=both -+LDFLAGS.so += $(hashstyle-LDFLAGS) -+LDFLAGS-rtld += $(hashstyle-LDFLAGS) -+ - ifeq (no,$(build-pie-default)) - pie-default = $(no-pie-ccflag) - else # build-pie-default -diff --git a/Makerules b/Makerules -index d1e139d03c..44134e37ce 100644 ---- a/Makerules -+++ b/Makerules -@@ -558,6 +558,9 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules - -Wl,--verbose 2>/dev/null | \ - sed > $@T \ - -e '/^=========/,/^=========/!d;/^=========/d' \ -+ -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ -+ -e '/DATA_SEGMENT_ALIGN/{H;g}' \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ --- -2.37.3 - diff --git a/srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch b/srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch new file mode 100644 index 0000000000000..ff538767809b8 --- /dev/null +++ b/srcpkgs/glibc/patches/00ae4f10b504bc4564e9f22f00907093f1ab9338.patch @@ -0,0 +1,335 @@ +From 00ae4f10b504bc4564e9f22f00907093f1ab9338 Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar +Date: Fri, 15 Sep 2023 13:51:12 -0400 +Subject: [PATCH] getaddrinfo: Fix use after free in getcanonname + (CVE-2023-4806) + +When an NSS plugin only implements the _gethostbyname2_r and +_getcanonname_r callbacks, getaddrinfo could use memory that was freed +during tmpbuf resizing, through h_name in a previous query response. + +The backing store for res->at->name when doing a query with +gethostbyname3_r or gethostbyname2_r is tmpbuf, which is reallocated in +gethosts during the query. For AF_INET6 lookup with AI_ALL | +AI_V4MAPPED, gethosts gets called twice, once for a v6 lookup and second +for a v4 lookup. In this case, if the first call reallocates tmpbuf +enough number of times, resulting in a malloc, th->h_name (that +res->at->name refers to) ends up on a heap allocated storage in tmpbuf. +Now if the second call to gethosts also causes the plugin callback to +return NSS_STATUS_TRYAGAIN, tmpbuf will get freed, resulting in a UAF +reference in res->at->name. This then gets dereferenced in the +getcanonname_r plugin call, resulting in the use after free. + +Fix this by copying h_name over and freeing it at the end. This +resolves BZ #30843, which is assigned CVE-2023-4806. + +Signed-off-by: Siddhesh Poyarekar +(cherry picked from commit 973fe93a5675c42798b2161c6f29c01b0e243994) +--- + nss/Makefile | 15 ++++- + nss/nss_test_gai_hv2_canonname.c | 56 +++++++++++++++++ + nss/tst-nss-gai-hv2-canonname.c | 63 +++++++++++++++++++ + nss/tst-nss-gai-hv2-canonname.h | 1 + + .../postclean.req | 0 + .../tst-nss-gai-hv2-canonname.script | 2 + + sysdeps/posix/getaddrinfo.c | 25 +++++--- + 7 files changed, 152 insertions(+), 10 deletions(-) + create mode 100644 nss/nss_test_gai_hv2_canonname.c + create mode 100644 nss/tst-nss-gai-hv2-canonname.c + create mode 100644 nss/tst-nss-gai-hv2-canonname.h + create mode 100644 nss/tst-nss-gai-hv2-canonname.root/postclean.req + create mode 100644 nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script + +diff --git a/nss/Makefile b/nss/Makefile +index 06fcdc450f1..8a5126ecf34 100644 +--- a/nss/Makefile ++++ b/nss/Makefile +@@ -82,6 +82,7 @@ tests-container := \ + tst-nss-test3 \ + tst-reload1 \ + tst-reload2 \ ++ tst-nss-gai-hv2-canonname \ + # tests-container + + # Tests which need libdl +@@ -145,7 +146,8 @@ libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes)) + ifeq ($(build-static-nss),yes) + tests-static += tst-nss-static + endif +-extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os ++extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os \ ++ nss_test_gai_hv2_canonname.os + + include ../Rules + +@@ -180,12 +182,16 @@ rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver + libof-nss_test1 = extramodules + libof-nss_test2 = extramodules + libof-nss_test_errno = extramodules ++libof-nss_test_gai_hv2_canonname = extramodules + $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) + $(build-module) + $(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps) + $(build-module) + $(objpfx)/libnss_test_errno.so: $(objpfx)nss_test_errno.os $(link-libc-deps) + $(build-module) ++$(objpfx)/libnss_test_gai_hv2_canonname.so: \ ++ $(objpfx)nss_test_gai_hv2_canonname.os $(link-libc-deps) ++ $(build-module) + $(objpfx)nss_test2.os : nss_test1.c + # Use the nss_files suffix for these objects as well. + $(objpfx)/libnss_test1.so$(libnss_files.so-version): $(objpfx)/libnss_test1.so +@@ -195,10 +201,14 @@ $(objpfx)/libnss_test2.so$(libnss_files.so-version): $(objpfx)/libnss_test2.so + $(objpfx)/libnss_test_errno.so$(libnss_files.so-version): \ + $(objpfx)/libnss_test_errno.so + $(make-link) ++$(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version): \ ++ $(objpfx)/libnss_test_gai_hv2_canonname.so ++ $(make-link) + $(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \ + $(objpfx)/libnss_test1.so$(libnss_files.so-version) \ + $(objpfx)/libnss_test2.so$(libnss_files.so-version) \ +- $(objpfx)/libnss_test_errno.so$(libnss_files.so-version) ++ $(objpfx)/libnss_test_errno.so$(libnss_files.so-version) \ ++ $(objpfx)/libnss_test_gai_hv2_canonname.so$(libnss_files.so-version) + + ifeq (yes,$(have-thread-library)) + $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library) +@@ -215,3 +225,4 @@ LDFLAGS-tst-nss-test3 = -Wl,--disable-new-dtags + LDFLAGS-tst-nss-test4 = -Wl,--disable-new-dtags + LDFLAGS-tst-nss-test5 = -Wl,--disable-new-dtags + LDFLAGS-tst-nss-test_errno = -Wl,--disable-new-dtags ++LDFLAGS-tst-nss-test_gai_hv2_canonname = -Wl,--disable-new-dtags +diff --git a/nss/nss_test_gai_hv2_canonname.c b/nss/nss_test_gai_hv2_canonname.c +new file mode 100644 +index 00000000000..4439c83c9f4 +--- /dev/null ++++ b/nss/nss_test_gai_hv2_canonname.c +@@ -0,0 +1,56 @@ ++/* NSS service provider that only provides gethostbyname2_r. ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include "nss/tst-nss-gai-hv2-canonname.h" ++ ++/* Catch misnamed and functions. */ ++#pragma GCC diagnostic error "-Wmissing-prototypes" ++NSS_DECLARE_MODULE_FUNCTIONS (test_gai_hv2_canonname) ++ ++extern enum nss_status _nss_files_gethostbyname2_r (const char *, int, ++ struct hostent *, char *, ++ size_t, int *, int *); ++ ++enum nss_status ++_nss_test_gai_hv2_canonname_gethostbyname2_r (const char *name, int af, ++ struct hostent *result, ++ char *buffer, size_t buflen, ++ int *errnop, int *herrnop) ++{ ++ return _nss_files_gethostbyname2_r (name, af, result, buffer, buflen, errnop, ++ herrnop); ++} ++ ++enum nss_status ++_nss_test_gai_hv2_canonname_getcanonname_r (const char *name, char *buffer, ++ size_t buflen, char **result, ++ int *errnop, int *h_errnop) ++{ ++ /* We expect QUERYNAME, which is a small enough string that it shouldn't fail ++ the test. */ ++ if (memcmp (QUERYNAME, name, sizeof (QUERYNAME)) ++ || buflen < sizeof (QUERYNAME)) ++ abort (); ++ ++ strncpy (buffer, name, buflen); ++ *result = buffer; ++ return NSS_STATUS_SUCCESS; ++} +diff --git a/nss/tst-nss-gai-hv2-canonname.c b/nss/tst-nss-gai-hv2-canonname.c +new file mode 100644 +index 00000000000..d5f10c07d6a +--- /dev/null ++++ b/nss/tst-nss-gai-hv2-canonname.c +@@ -0,0 +1,63 @@ ++/* Test NSS query path for plugins that only implement gethostbyname2 ++ (#30843). ++ Copyright The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include "nss/tst-nss-gai-hv2-canonname.h" ++ ++#define PREPARE do_prepare ++ ++static void do_prepare (int a, char **av) ++{ ++ FILE *hosts = xfopen ("/etc/hosts", "w"); ++ for (unsigned i = 2; i < 255; i++) ++ { ++ fprintf (hosts, "ff01::ff02:ff03:%u:2\ttest.example.com\n", i); ++ fprintf (hosts, "192.168.0.%u\ttest.example.com\n", i); ++ } ++ xfclose (hosts); ++} ++ ++static int ++do_test (void) ++{ ++ __nss_configure_lookup ("hosts", "test_gai_hv2_canonname"); ++ ++ struct addrinfo hints = {}; ++ struct addrinfo *result = NULL; ++ ++ hints.ai_family = AF_INET6; ++ hints.ai_flags = AI_ALL | AI_V4MAPPED | AI_CANONNAME; ++ ++ int ret = getaddrinfo (QUERYNAME, NULL, &hints, &result); ++ ++ if (ret != 0) ++ FAIL_EXIT1 ("getaddrinfo failed: %s\n", gai_strerror (ret)); ++ ++ TEST_COMPARE_STRING (result->ai_canonname, QUERYNAME); ++ ++ freeaddrinfo(result); ++ return 0; ++} ++ ++#include +diff --git a/nss/tst-nss-gai-hv2-canonname.h b/nss/tst-nss-gai-hv2-canonname.h +new file mode 100644 +index 00000000000..14f2a9cb086 +--- /dev/null ++++ b/nss/tst-nss-gai-hv2-canonname.h +@@ -0,0 +1 @@ ++#define QUERYNAME "test.example.com" +diff --git a/nss/tst-nss-gai-hv2-canonname.root/postclean.req b/nss/tst-nss-gai-hv2-canonname.root/postclean.req +new file mode 100644 +index 00000000000..e69de29bb2d +diff --git a/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script b/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script +new file mode 100644 +index 00000000000..31848b4a285 +--- /dev/null ++++ b/nss/tst-nss-gai-hv2-canonname.root/tst-nss-gai-hv2-canonname.script +@@ -0,0 +1,2 @@ ++cp $B/nss/libnss_test_gai_hv2_canonname.so $L/libnss_test_gai_hv2_canonname.so.2 ++su +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index 0356b622be6..b2236b105c1 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -120,6 +120,7 @@ struct gaih_result + { + struct gaih_addrtuple *at; + char *canon; ++ char *h_name; + bool free_at; + bool got_ipv6; + }; +@@ -165,6 +166,7 @@ gaih_result_reset (struct gaih_result *res) + if (res->free_at) + free (res->at); + free (res->canon); ++ free (res->h_name); + memset (res, 0, sizeof (*res)); + } + +@@ -203,9 +205,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, + return 0; + } + +-/* Convert struct hostent to a list of struct gaih_addrtuple objects. h_name +- is not copied, and the struct hostent object must not be deallocated +- prematurely. The new addresses are appended to the tuple array in RES. */ ++/* Convert struct hostent to a list of struct gaih_addrtuple objects. The new ++ addresses are appended to the tuple array in RES. */ + static bool + convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family, + struct hostent *h, struct gaih_result *res) +@@ -238,6 +239,15 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family, + res->at = array; + res->free_at = true; + ++ /* Duplicate h_name because it may get reclaimed when the underlying storage ++ is freed. */ ++ if (res->h_name == NULL) ++ { ++ res->h_name = __strdup (h->h_name); ++ if (res->h_name == NULL) ++ return false; ++ } ++ + /* Update the next pointers on reallocation. */ + for (size_t i = 0; i < old; i++) + array[i].next = array + i + 1; +@@ -262,7 +272,6 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, int family, + } + array[i].next = array + i + 1; + } +- array[0].name = h->h_name; + array[count - 1].next = NULL; + + return true; +@@ -324,15 +333,15 @@ gethosts (nss_gethostbyname3_r fct, int family, const char *name, + memory allocation failure. The returned string is allocated on the + heap; the caller has to free it. */ + static char * +-getcanonname (nss_action_list nip, struct gaih_addrtuple *at, const char *name) ++getcanonname (nss_action_list nip, const char *hname, const char *name) + { + nss_getcanonname_r *cfct = __nss_lookup_function (nip, "getcanonname_r"); + char *s = (char *) name; + if (cfct != NULL) + { + char buf[256]; +- if (DL_CALL_FCT (cfct, (at->name ?: name, buf, sizeof (buf), +- &s, &errno, &h_errno)) != NSS_STATUS_SUCCESS) ++ if (DL_CALL_FCT (cfct, (hname ?: name, buf, sizeof (buf), &s, &errno, ++ &h_errno)) != NSS_STATUS_SUCCESS) + /* If the canonical name cannot be determined, use the passed + string. */ + s = (char *) name; +@@ -771,7 +780,7 @@ get_nss_addresses (const char *name, const struct addrinfo *req, + if ((req->ai_flags & AI_CANONNAME) != 0 + && res->canon == NULL) + { +- char *canonbuf = getcanonname (nip, res->at, name); ++ char *canonbuf = getcanonname (nip, res->h_name, name); + if (canonbuf == NULL) + { + __resolv_context_put (res_ctx); diff --git a/srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch b/srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch new file mode 100644 index 0000000000000..039d7e9f04ba5 --- /dev/null +++ b/srcpkgs/glibc/patches/b25508dd774b617f99419bdc3cf2ace4560cd2d6.patch @@ -0,0 +1,192 @@ +From b25508dd774b617f99419bdc3cf2ace4560cd2d6 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Wed, 13 Sep 2023 14:10:56 +0200 +Subject: [PATCH] CVE-2023-4527: Stack read overflow with large TCP responses + in no-aaaa mode + +Without passing alt_dns_packet_buffer, __res_context_search can only +store 2048 bytes (what fits into dns_packet_buffer). However, +the function returns the total packet size, and the subsequent +DNS parsing code in _nss_dns_gethostbyname4_r reads beyond the end +of the stack-allocated buffer. + +Fixes commit f282cdbe7f436c75864e5640a4 ("resolv: Implement no-aaaa +stub resolver option") and bug 30842. + +(cherry picked from commit bd77dd7e73e3530203be1c52c8a29d08270cb25d) +--- + NEWS | 9 +++ + resolv/Makefile | 2 + + resolv/nss_dns/dns-host.c | 2 +- + resolv/tst-resolv-noaaaa-vc.c | 129 ++++++++++++++++++++++++++++++++++ + 4 files changed, 141 insertions(+), 1 deletion(-) + create mode 100644 resolv/tst-resolv-noaaaa-vc.c + +diff --git a/resolv/Makefile b/resolv/Makefile +index 054b1fa36c..2f99eb3862 100644 +--- a/resolv/Makefile ++++ b/resolv/Makefile +@@ -102,6 +102,7 @@ tests += \ + tst-resolv-invalid-cname \ + tst-resolv-network \ + tst-resolv-noaaaa \ ++ tst-resolv-noaaaa-vc \ + tst-resolv-nondecimal \ + tst-resolv-res_init-multi \ + tst-resolv-search \ +@@ -293,6 +294,7 @@ $(objpfx)tst-resolv-res_init-thread: $(objpfx)libresolv.so \ + $(objpfx)tst-resolv-invalid-cname: $(objpfx)libresolv.so \ + $(shared-thread-library) + $(objpfx)tst-resolv-noaaaa: $(objpfx)libresolv.so $(shared-thread-library) ++$(objpfx)tst-resolv-noaaaa-vc: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-nondecimal: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-qtypes: $(objpfx)libresolv.so $(shared-thread-library) + $(objpfx)tst-resolv-rotate: $(objpfx)libresolv.so $(shared-thread-library) +diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c +index 1d60c51f5e..5d0ab30de6 100644 +--- a/resolv/nss_dns/dns-host.c ++++ b/resolv/nss_dns/dns-host.c +@@ -427,7 +427,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, + { + n = __res_context_search (ctx, name, C_IN, T_A, + dns_packet_buffer, sizeof (dns_packet_buffer), +- NULL, NULL, NULL, NULL, NULL); ++ &alt_dns_packet_buffer, NULL, NULL, NULL, NULL); + if (n >= 0) + status = gaih_getanswer_noaaaa (alt_dns_packet_buffer, n, + &abuf, pat, errnop, herrnop, ttlp); +diff --git a/resolv/tst-resolv-noaaaa-vc.c b/resolv/tst-resolv-noaaaa-vc.c +new file mode 100644 +index 0000000000..9f5aebd99f +--- /dev/null ++++ b/resolv/tst-resolv-noaaaa-vc.c +@@ -0,0 +1,129 @@ ++/* Test the RES_NOAAAA resolver option with a large response. ++ Copyright (C) 2022-2023 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Used to keep track of the number of queries. */ ++static volatile unsigned int queries; ++ ++/* If true, add a large TXT record at the start of the answer section. */ ++static volatile bool stuff_txt; ++ ++static void ++response (const struct resolv_response_context *ctx, ++ struct resolv_response_builder *b, ++ const char *qname, uint16_t qclass, uint16_t qtype) ++{ ++ /* If not using TCP, just force its use. */ ++ if (!ctx->tcp) ++ { ++ struct resolv_response_flags flags = {.tc = true}; ++ resolv_response_init (b, flags); ++ resolv_response_add_question (b, qname, qclass, qtype); ++ return; ++ } ++ ++ /* The test needs to send four queries, the first three are used to ++ grow the NSS buffer via the ERANGE handshake. */ ++ ++queries; ++ TEST_VERIFY (queries <= 4); ++ ++ /* AAAA queries are supposed to be disabled. */ ++ TEST_COMPARE (qtype, T_A); ++ TEST_COMPARE (qclass, C_IN); ++ TEST_COMPARE_STRING (qname, "example.com"); ++ ++ struct resolv_response_flags flags = {}; ++ resolv_response_init (b, flags); ++ resolv_response_add_question (b, qname, qclass, qtype); ++ ++ resolv_response_section (b, ns_s_an); ++ ++ if (stuff_txt) ++ { ++ resolv_response_open_record (b, qname, qclass, T_TXT, 60); ++ int zero = 0; ++ for (int i = 0; i <= 15000; ++i) ++ resolv_response_add_data (b, &zero, sizeof (zero)); ++ resolv_response_close_record (b); ++ } ++ ++ for (int i = 0; i < 200; ++i) ++ { ++ resolv_response_open_record (b, qname, qclass, qtype, 60); ++ char ipv4[4] = {192, 0, 2, i + 1}; ++ resolv_response_add_data (b, &ipv4, sizeof (ipv4)); ++ resolv_response_close_record (b); ++ } ++} ++ ++static int ++do_test (void) ++{ ++ struct resolv_test *obj = resolv_test_start ++ ((struct resolv_redirect_config) ++ { ++ .response_callback = response ++ }); ++ ++ _res.options |= RES_NOAAAA; ++ ++ for (int do_stuff_txt = 0; do_stuff_txt < 2; ++do_stuff_txt) ++ { ++ queries = 0; ++ stuff_txt = do_stuff_txt; ++ ++ struct addrinfo *ai = NULL; ++ int ret; ++ ret = getaddrinfo ("example.com", "80", ++ &(struct addrinfo) ++ { ++ .ai_family = AF_UNSPEC, ++ .ai_socktype = SOCK_STREAM, ++ }, &ai); ++ ++ char *expected_result; ++ { ++ struct xmemstream mem; ++ xopen_memstream (&mem); ++ for (int i = 0; i < 200; ++i) ++ fprintf (mem.out, "address: STREAM/TCP 192.0.2.%d 80\n", i + 1); ++ xfclose_memstream (&mem); ++ expected_result = mem.buffer; ++ } ++ ++ check_addrinfo ("example.com", ai, ret, expected_result); ++ ++ free (expected_result); ++ freeaddrinfo (ai); ++ } ++ ++ resolv_test_end (obj); ++ return 0; ++} ++ ++#include diff --git a/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch b/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch index 31e1a2048eaf4..31dcbd03009ba 100644 --- a/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch +++ b/srcpkgs/glibc/patches/committed-1-2-Propagate-GLIBC_TUNABLES-in-setxid-binaries.patch @@ -1,6 +1,7 @@ +From 0d5f9ea97f1b39f2a855756078771673a68497e1 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar -Subject: [committed 1/2] Propagate GLIBC_TUNABLES in setxid binaries -Date: Tue, 3 Oct 2023 13:08:10 -0400 +Date: Tue, 19 Sep 2023 13:25:40 -0400 +Subject: [PATCH] Propagate GLIBC_TUNABLES in setxid binaries GLIBC_TUNABLES scrubbing happens earlier than envvar scrubbing and some tunables are required to propagate past setxid boundary, like their @@ -17,28 +18,20 @@ diff --git a/sysdeps/generic/unsecvars.h b/sysdeps/generic/unsecvars.h index 81397fb90b..8278c50a84 100644 --- a/sysdeps/generic/unsecvars.h +++ b/sysdeps/generic/unsecvars.h -@@ -1,16 +1,9 @@ --#if !HAVE_TUNABLES --# define GLIBC_TUNABLES_ENVVAR "GLIBC_TUNABLES\0" --#else --# define GLIBC_TUNABLES_ENVVAR --#endif -- - /* Environment variable to be removed for SUID programs. The names are - all stuffed in a single string which means they have to be terminated - with a '\0' explicitly. */ +@@ -4,7 +4,6 @@ #define UNSECURE_ENVVARS \ "GCONV_PATH\0" \ "GETCONF_DIR\0" \ -- GLIBC_TUNABLES_ENVVAR \ +- "GLIBC_TUNABLES\0" \ "HOSTALIASES\0" \ "LD_AUDIT\0" \ "LD_DEBUG\0" \ - +-- +From 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar -Subject: [committed 2/2] tunables: Terminate if end of input is reached +Date: Tue, 19 Sep 2023 18:39:32 -0400 +Subject: [PATCH] tunables: Terminate if end of input is reached (CVE-2023-4911) -Date: Tue, 3 Oct 2023 13:08:11 -0400 The string parsing routine may end up writing beyond bounds of tunestr if the input tunable string is malformed, of the form name=name=val. @@ -134,10 +127,10 @@ index 7dfb0e073a..f0b92c97e7 100644 "", "", "", -@@ -88,11 +88,18 @@ test_child (int off) +@@ -81,11 +85,18 @@ test_child (int off) + { const char *val = getenv ("GLIBC_TUNABLES"); - #if HAVE_TUNABLES + printf (" [%d] GLIBC_TUNABLES is %s\n", off, val); + fflush (stdout); if (val != NULL && strcmp (val, resultstrings[off]) == 0) @@ -146,14 +139,14 @@ index 7dfb0e073a..f0b92c97e7 100644 if (val != NULL) - printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val); + printf (" [%d] Unexpected GLIBC_TUNABLES VALUE %s, expected %s\n", -+ off, val, resultstrings[off]); ++ off, val, resultstrings[off]); + else + printf (" [%d] GLIBC_TUNABLES environment variable absent\n", off); + + fflush (stdout); return 1; - #else + } @@ -106,21 +117,26 @@ do_test (int argc, char **argv) if (ret != 0) exit (1); diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 98de6ad7412ed..20805fb52e816 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,15 +1,14 @@ # Template file for 'glibc' pkgname=glibc -version=2.36 -revision=2 -_patchver="72-g0f90d6204d" +version=2.38 +revision=1 bootstrap=yes short_desc="GNU C library" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" homepage="http://www.gnu.org/software/libc" -distfiles="https://vasilek.cz/paste/glibc-${version}-${_patchver}.tar.xz" -checksum=656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 +distfiles="${GNU_SITE}/libc/glibc-${version}.tar.xz" +checksum=fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 # Do not strip these files, objcopy errors out. nostrip_files=" XBS5_ILP32_OFFBIG @@ -29,7 +28,6 @@ nostrip_files=" ld.so.1 ld-linux-armhf.so.3 libresolv.so.2 - libcrypt.so.1 libm.so.6 libthread_db.so.1 libnsl.so.1 @@ -98,14 +96,10 @@ do_configure() { SHELL=/bin/bash ../configure ${configure_args} \ --bindir=/usr/bin --sbindir=/usr/bin \ --libdir=${_libdir} --libexecdir=${_libdir} \ - --enable-add-ons=libidn \ --enable-multi-arch --enable-bind-now \ - --disable-profile --enable-kernel=3.2.0 \ - --enable-stack-guard-randomization \ - --without-selinux --without-cvs --without-gd \ - --disable-lock-elision \ --enable-stack-protector=strong \ - --with-headers=${XBPS_CROSS_BASE}/usr/include \ + --disable-profile --enable-kernel=3.2.0 \ + --without-selinux --without-gd \ --disable-werror \ libc_cv_rootsbindir=/usr/bin \ libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir} From 3460851997b0d7724cf35330bd46a7fecfd84b26 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 7 Aug 2023 22:49:45 -0700 Subject: [PATCH 02/97] New package: perl-bootstrap-5.36.1 --- srcpkgs/perl-bootstrap/patches | 1 + srcpkgs/perl-bootstrap/template | 105 ++++++++++++++++++++++++++++++++ srcpkgs/perl-bootstrap/update | 1 + 3 files changed, 107 insertions(+) create mode 120000 srcpkgs/perl-bootstrap/patches create mode 100644 srcpkgs/perl-bootstrap/template create mode 100644 srcpkgs/perl-bootstrap/update diff --git a/srcpkgs/perl-bootstrap/patches b/srcpkgs/perl-bootstrap/patches new file mode 120000 index 0000000000000..7af8bac63558f --- /dev/null +++ b/srcpkgs/perl-bootstrap/patches @@ -0,0 +1 @@ +../perl/patches \ No newline at end of file diff --git a/srcpkgs/perl-bootstrap/template b/srcpkgs/perl-bootstrap/template new file mode 100644 index 0000000000000..8ccfcb025a2fa --- /dev/null +++ b/srcpkgs/perl-bootstrap/template @@ -0,0 +1,105 @@ +# Template file for 'perl-bootstrap' +# This is needed to prevent build cycle between libxcrypt and perl +pkgname=perl-bootstrap +version=5.38.0 +revision=1 +_perl_cross_version=1.5 +build_style=gnu-configure +makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" +depends="less" +short_desc="Practical Extraction and Report Language" +maintainer="Leah Neukirchen " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://www.perl.org" +distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz + https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" +checksum="213ef58089d2f2c972ea353517dc60ec3656f050dcc027666e118b508423e517 + d744a390939e2ebb9a12f6725b4d9c19255a141d90031eff90ea183fdfcbf211" +repository=bootstrap +conflicts="perl>=0" +skiprdeps="/usr/bin/perl" + +skip_extraction=perl-cross-${_perl_cross_version}.tar.gz + +post_extract() { + local TAR=$(command -v bsdtar || command -v tar) + $TAR --strip-components=1 -xf \ + ${XBPS_SRCDISTDIR}/${pkgname}-${version}/perl-cross-$_perl_cross_version.tar.gz + + [ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH patchlevel.h +} + +do_configure() { + local _args="-Dusethreads -Duseshrplib -Dusesoname -Dusevendorprefix + -Dprefix=/usr -Dvendorprefix=/usr + -Dprivlib=/usr/share/perl5/core_perl + -Darchlib=/usr/lib/perl5/core_perl + -Dsitelib=/usr/share/perl5/site_perl + -Dsitearch=/usr/lib/perl5/site_perl + -Dvendorlib=/usr/share/perl5/vendor_perl + -Dvendorarch=/usr/lib/perl5/vendor_perl + -Dscriptdir=/usr/bin -Dvendorscript=/usr/bin + -Dinc_version_list=none -Dman1ext=1p -Dman3ext=3p + -Dman1dir=/usr/share/man/man1 + -Dman3dir=/usr/share/man/man3 + -Dd_sockaddr_in6=define + -Dd_crypt=undef" + + if [ "$CROSS_BUILD" ]; then + _args+=" --target=$XBPS_CROSS_TRIPLET" + fi + + LDFLAGS+=" -Wl,-z,stack-size=2097152 -pthread" + export HOSTLDFLAGS+=" -pthread" + + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + export HOSTCFLAGS+=" -D_GNU_SOURCE" + export CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE" + else + export CFLAGS+=" -D_FILE_OFFSET_BITS=64 -DLARGE_FILE_SUPPORT64" + fi + + export LD="$CC" + ./configure --prefix=/usr $_args \ + -Dcccdlflags="-fPIC" \ + -Doptimize=" -Wall ${CFLAGS} " -Dccflags=" ${CFLAGS} " \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" \ + -Dperl_static_inline='static __inline__' -Dd_static_inline || + { + cat ./config.log + return 42 + } +} + +do_check() { + export LD="$CC" + export PERL_BUILD_PACKAGING=1 + TEST_JOBS=${XBPS_MAKEJOBS} make test +} + +post_install() { + find ${DESTDIR}/usr/share -type f -exec chmod 644 {} \; + find ${DESTDIR}/usr/lib -type f -exec chmod 644 {} \; + + # Make a symbolic link from perl to perl${version}. + ln -sf perl ${DESTDIR}/usr/bin/perl${version} + + # Remove all pod files *except* those under + # /usr/share/perl5/core_perl/pod/ (FS#16488) + rm -f ${DESTDIR}/usr/share/perl5/core_perl/*.pod + for d in ${DESTDIR}/usr/share/perl5/core_perl/*; do + if [ -d $d -a $(basename $d) != "pod" ]; then + find $d -name *.pod -delete + fi + done + find ${DESTDIR}/usr/lib -name *.pod -delete + find ${DESTDIR} -name .packlist -delete + + # Remove references to hardening -specs. + sed -e "s|-specs=.*hardened-ld||g" -e "s|-specs=.*hardened-cc1||g" \ + -i ${DESTDIR}/usr/lib/perl5/core_perl/Config_heavy.pl + + # HOTFIX + # ln -sfr ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so.${version} ${DESTDIR}/usr/lib/ + # ln -sfr ${DESTDIR}/usr/lib/perl5/core_perl/CORE/libperl.so.${version} ${DESTDIR}/usr/lib/libperl.so. +} diff --git a/srcpkgs/perl-bootstrap/update b/srcpkgs/perl-bootstrap/update new file mode 100644 index 0000000000000..2693e54070bef --- /dev/null +++ b/srcpkgs/perl-bootstrap/update @@ -0,0 +1 @@ +ignore="*.[13579].* *.[1-9][13579].*" From 96b3030fe9310d16ad44199043e28f7ea55d43d3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 7 Aug 2023 22:50:18 -0700 Subject: [PATCH 03/97] New package: libxcrypt-4.4.36 --- common/shlibs | 1 + srcpkgs/libxcrypt-compat | 1 + srcpkgs/libxcrypt-devel | 1 + srcpkgs/libxcrypt/template | 72 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 120000 srcpkgs/libxcrypt-compat create mode 120000 srcpkgs/libxcrypt-devel create mode 100644 srcpkgs/libxcrypt/template diff --git a/common/shlibs b/common/shlibs index c0b3be6c4c4f5..382e430776240 100644 --- a/common/shlibs +++ b/common/shlibs @@ -42,6 +42,7 @@ libnss_compat.so.2 glibc-2.38_1 libnss_dns.so.2 glibc-2.38_1 libnss_hesiod.so.2 glibc-2.38_1 libBrokenLocale.so.1 glibc-2.38_1 +libcrypt.so.2 libxcrypt-4.4.36_1 libSimGearCore.so.2020.3.17 simgear-2020.3.17_1 libSimGearScene.so.2020.3.17 simgear-2020.3.17_1 libmemusage.so glibc-2.38_1 diff --git a/srcpkgs/libxcrypt-compat b/srcpkgs/libxcrypt-compat new file mode 120000 index 0000000000000..4ed34b8a6a49e --- /dev/null +++ b/srcpkgs/libxcrypt-compat @@ -0,0 +1 @@ +libxcrypt \ No newline at end of file diff --git a/srcpkgs/libxcrypt-devel b/srcpkgs/libxcrypt-devel new file mode 120000 index 0000000000000..4ed34b8a6a49e --- /dev/null +++ b/srcpkgs/libxcrypt-devel @@ -0,0 +1 @@ +libxcrypt \ No newline at end of file diff --git a/srcpkgs/libxcrypt/template b/srcpkgs/libxcrypt/template new file mode 100644 index 0000000000000..0b7b6fc5bfdd3 --- /dev/null +++ b/srcpkgs/libxcrypt/template @@ -0,0 +1,72 @@ +# Template file for 'libxcrypt' +pkgname=libxcrypt +version=4.4.36 +revision=1 +archs="~*-musl" +build_style=gnu-configure +configure_args="--enable-hashes=all --disable-failure-tokens --enable-obsolete-api=no" +hostmakedepends="perl-bootstrap" +checkdepends="python3-passlib" +short_desc="Modern library for one-way hashing of passwords" +maintainer="oreo639 " +license="LGPL-2.1-or-later, BSD-3-Clause, BSD-2-Clause, 0BSD, Public Domain" +homepage="https://github.com/besser82/libxcrypt" +distfiles="https://github.com/besser82/libxcrypt/releases/download/v${version}/libxcrypt-${version}.tar.xz" +checksum=e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943 +make_cmd="make -C build" + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + broken="musl already provides libcrypt" +fi + +do_configure() { + [ ! -d ${configure_builddir:=build} ] && mkdir -p ${configure_builddir} + cd ${configure_builddir} + ../configure ${configure_args} +} + +post_configure() { + configure_args="${configure_args/--enable-obsolete-api=no/} --enable-obsolete-api=glibc" + configure_builddir="compat-build" + do_configure +} + +post_build() { + make_cmd="make -C compat-build" + do_build +} + +post_check() { + make_cmd="make -C compat-build" + do_check +} + +pre_install() { + make -C compat-build DESTDIR=${DESTDIR} install + + # Don't install development files from the compat library + rm -r ${DESTDIR}/usr/{include,lib/{lib*.so,pkgconfig},share} +} + +post_install() { + vlicense LICENSING +} + +libxcrypt-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/lib/pkgconfig + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/share + } +} + +libxcrypt-compat_package() { + short_desc+=" - legacy compatibility" + pkg_install() { + vmove usr/lib/libcrypt.so.1* + } +} From 26f426297f3cbaa9f486fcee943e67421fb6e880 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 7 Aug 2023 23:32:49 -0700 Subject: [PATCH 04/97] perl: rebuild with libxcrypt --- srcpkgs/perl/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index c8e0d113e429f..ca985210fd4a6 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,7 +1,7 @@ # Template file for 'perl' pkgname=perl version=5.38.0 -revision=1 +revision=2 _perl_cross_version=1.5 build_style=gnu-configure makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" @@ -18,6 +18,10 @@ checksum="213ef58089d2f2c972ea353517dc60ec3656f050dcc027666e118b508423e517 skip_extraction=perl-cross-${_perl_cross_version}.tar.gz +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + # Before updating this package to a new major version, run # ${FILESDIR}/update-perl-provides.pl ${wrksrc} perl/template # to find the list of built in packages. From 145bf0cf260a5a5ac584df56ec5bffe6724539b3 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 7 Aug 2023 23:33:23 -0700 Subject: [PATCH 05/97] python: rebuild with libxcrypt --- srcpkgs/python/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 21739fcd4ff53..99d9642e998ab 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -4,7 +4,7 @@ # pkgname=python version=2.7.18.7 -revision=4 +revision=5 _commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd pycompile_dirs="usr/lib/python2.7" hostmakedepends="pkg-config" @@ -25,6 +25,10 @@ alternatives=" python:python:/usr/bin/python2.7 python:python.1:/usr/share/man/man1/python2.7.1" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { # Ensure that internal copies of expat, libffi and zlib are not used. rm -r Modules/expat From 9720988c571d98e05438d094641eefeeb91fda53 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 7 Aug 2023 23:42:25 -0700 Subject: [PATCH 06/97] python3: rebuild for libxcrypt --- srcpkgs/python3/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 970eb5dbf96a4..9824de3229c14 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -4,7 +4,7 @@ # pkgname=python3 version=3.12.0 -revision=1 +revision=2 build_style="gnu-configure" configure_args="--enable-shared --enable-ipv6 --enable-optimizations --enable-loadable-sqlite-extensions --with-computed-gotos @@ -36,6 +36,10 @@ alternatives=" python:python:/usr/bin/python${version%.*} python:python.1:/usr/share/man/man1/python${version%.*}.1" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" configure_args+=" --with-build-python=python${py3_ver}" From 49f0b1b45fe5d3d7e066ce73f515efc3e203576c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 11:43:37 -0700 Subject: [PATCH 07/97] ruby: rebuild for libxcrypt --- srcpkgs/ruby/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 30039707619dd..38907c77c2f63 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -3,7 +3,7 @@ _ruby_abiver=3.2.0 pkgname=ruby version=3.2.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-shared --disable-rpath PKG_CONFIG=/usr/bin/pkg-config" @@ -18,6 +18,10 @@ license="Ruby, BSD-2-Clause" distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.xz" checksum=4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + case "$XBPS_TARGET_MACHINE" in *-musl) # Broken on the builders but successfully built locally # As a workaround disable all docs From ace76fb7447561680a46bee290e78ec0f1ab7745 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 14:51:38 -0700 Subject: [PATCH 08/97] mariadb: rebuild for libxcrypt --- srcpkgs/mariadb/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 4b3cb0ddf39c1..410f17b3ac58a 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -1,7 +1,7 @@ # Template file for 'mariadb' pkgname=mariadb version=11.1.2 -revision=1 +revision=2 build_style=cmake build_helper=qemu configure_args="-DBUILD_CONFIG=mysql_release @@ -38,6 +38,10 @@ make_dirs="/var/lib/mysql 0700 mysql mysql CFLAGS="-UNDEBUG" CXXFLAGS="-UNDEBUG" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DWITH_UNIT_TESTS=ON" else From 2c0dfcf99f300dcb55c5c04c9e7070e42e98eff9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 10:03:37 -0700 Subject: [PATCH 09/97] apr-util: rebuild for libxcrypt --- srcpkgs/apr-util/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index bc216965d6f63..82f91163c1591 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -1,7 +1,7 @@ # Template file for 'apr-util' pkgname=apr-util version=1.6.3 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr @@ -22,6 +22,10 @@ checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 # fails to build tests make_check=no +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { autoreconf -fi } From 84631ddf48b29d58c5f43c80a17b3a8513524ea0 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 15:05:07 -0700 Subject: [PATCH 10/97] php8.1: rebuild for libxcrypt --- srcpkgs/php8.1/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index 9e4cbfef1d4b9..900e57e4e4744 100644 --- a/srcpkgs/php8.1/template +++ b/srcpkgs/php8.1/template @@ -1,7 +1,7 @@ # Template file for 'php8.1' pkgname=php8.1 version=8.1.21 -revision=3 +revision=4 _php_version=8.1 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel @@ -23,6 +23,10 @@ conf_files="/etc/php${_php_version}/php.ini" lib32disabled=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ -n "$CROSS_BUILD" ]; then # phar and pear need php to build hostmakedepends+=" php${_php_version}" From 0b36b00e7659e33e992231095ce06d8fd7f2c95d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 15:07:16 -0700 Subject: [PATCH 11/97] accountsservice: rebuild for libxcrypt --- srcpkgs/accountsservice/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template index f298248158312..bd349b359d260 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -1,7 +1,7 @@ # Template file for 'accountsservice' pkgname=accountsservice version=0.6.55 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Dsystemdsystemunitdir=no -Duser_heuristics=false @@ -18,6 +18,10 @@ make_dirs=" /var/lib/AccountsService/users 755 root root /var/lib/AccountsService/icons 755 root root" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + # Package build options build_options="elogind gir" build_options_default="elogind gir" From 6136d4cf1a0a7e2882535837480fe86c9e0348af Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 15:54:09 -0700 Subject: [PATCH 12/97] pam: rebuild for libxcrypt --- srcpkgs/pam/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template index 87a375699e7b3..e3ccb048aa98f 100644 --- a/srcpkgs/pam/template +++ b/srcpkgs/pam/template @@ -1,7 +1,7 @@ # Template file for 'pam' pkgname=pam version=1.5.3 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --libdir=/usr/lib --sbindir=/usr/bin --docdir=/usr/share/doc/pam @@ -21,6 +21,10 @@ distfiles="${homepage}/releases/download/v${version}/Linux-PAM-${version}.tar.xz checksum=7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283 lib32disabled=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + conf_files=" /etc/environment /etc/security/access.conf From bd8a8eae9c991e4c07ae8ef0f678d3df1704c1cc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 15:54:35 -0700 Subject: [PATCH 13/97] libpam-policycache: rebuild for libxcrypt --- srcpkgs/libpam-policycache/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template index 6777b0856dd67..d7e1960df5666 100644 --- a/srcpkgs/libpam-policycache/template +++ b/srcpkgs/libpam-policycache/template @@ -1,7 +1,7 @@ # Template file for 'libpam-policycache' pkgname=libpam-policycache version=0.11 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf automake libtool pkg-config" makedepends="glib-devel libscrypt-devel pam-devel" @@ -13,6 +13,10 @@ distfiles="https://github.com/google/libpam-policycache/archive/v$version.tar.gz checksum=d1a074493d3a4076094a79093ec02c8fdd886069b9624d8b6765f7a1e840fae6 CFLAGS="-Wno-error=deprecated-declarations" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + make_dirs="/etc/libpam-policycache.d 0755 root root /var/cache/libpam-policycache 0700 root root" From 3d96a62005bcc201856d4ac232016abaaf772c18 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:21:28 -0700 Subject: [PATCH 14/97] openssh: rebuild for libxcrypt --- srcpkgs/openssh/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 875bd7d553675..afb4184623ef7 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh version=9.5p1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody @@ -31,6 +31,10 @@ make_dirs=" /var/chroot/ssh 0755 root root /etc/ssh/sshd_config.d 0755 root root" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + # Package build options build_options="fido2 gssapi ldns ssl" build_options_default="fido2 gssapi ldns ssl" From 447bffb4aa632b7554b40a986ac84b5aa4f6663a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:24:55 -0700 Subject: [PATCH 15/97] util-linux: rebuild for libxcrypt --- srcpkgs/util-linux/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 99819d02068b3..f048a9126cc20 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -2,7 +2,7 @@ # Keep this package sync with util-linux-common pkgname=util-linux version=2.38.1 -revision=4 +revision=5 build_style=gnu-configure configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin @@ -24,6 +24,10 @@ homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz" checksum=60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + # Create uuidd system account for uuidd. system_accounts="_uuidd" _uuidd_homedir="/var/empty" From a6db2f119848923f614161e051f06356b7c783ec Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:26:21 -0700 Subject: [PATCH 16/97] shadow: rebuild for libxcrypt --- srcpkgs/shadow/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index c59d92bfeb54a..c7ece33540c9a 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -1,7 +1,7 @@ # Template file for 'shadow' pkgname=shadow version=4.8.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--bindir=/usr/bin --sbindir=/usr/bin --enable-shared --disable-static @@ -19,6 +19,10 @@ distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz" checksum=a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 conf_files="/etc/pam.d/* /etc/default/* /etc/login.defs" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { case "$XBPS_TARGET_MACHINE" in # Completely disable unportable ruserok(). From 44ce65580779af2f6e9f677943205f6cad9f6015 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:28:06 -0700 Subject: [PATCH 17/97] cups: rebuild for libxcrypt --- srcpkgs/cups/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 510ef3dcbba4a..cb51254ed4d6e 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,7 +1,7 @@ # Template file for 'cups' pkgname=cups version=2.4.7 -revision=2 +revision=3 build_style=gnu-configure make_install_args="BUILDROOT=${DESTDIR}" hostmakedepends="gnutls-devel pkg-config @@ -16,6 +16,10 @@ homepage="https://github.com/OpenPrinting/cups" distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz" checksum=dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd" make_dirs=" /usr/lib/cups/driver 0755 root root From c5498b05a55c6f640f87e390c1e1152ee199ce78 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:36:44 -0700 Subject: [PATCH 18/97] apache: rebuild for libxcrypt --- srcpkgs/apache/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index ad9b3e23a722c..283f7c589fade 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.56 -revision=3 +revision=4 build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all --enable-mods-shared=all --enable-authn-dbm --enable-authn-anon @@ -36,6 +36,10 @@ changelog="https://www.apache.org/dist/httpd/CHANGES_2.4" distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2" checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + system_accounts="_apache" _apache_homedir="/srv/www/$pkgname" From d2f2f7d4c655ac7c59031a6dac0ffefd0d6444e1 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:51:04 -0700 Subject: [PATCH 19/97] plasma-workspace: rebuild for libxcrypt --- srcpkgs/plasma-workspace/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index 88cff0e6d6e0e..7160c20aab2c0 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,7 +1,7 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace version=5.27.8 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner @@ -28,6 +28,10 @@ checksum=a565d29851f28e0003018562c929b7d4ac8f00836923c12d199b4964d3b60ef0 build_options="pipewire" build_options_default="pipewire" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + kworkspace_package() { short_desc="Plasma Workspace Library for KF5" pkg_install() { From ca35ebc1c21b0dabdd1b4cd22d58164084a8b12f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:53:05 -0700 Subject: [PATCH 20/97] openldap: rebuild for libxcrypt --- srcpkgs/openldap/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template index d10daef834a75..b16d8126a745d 100644 --- a/srcpkgs/openldap/template +++ b/srcpkgs/openldap/template @@ -1,7 +1,7 @@ # Template file for 'openldap' pkgname=openldap version=2.6.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--prefix=/usr --libexecdir=/usr/libexec @@ -27,6 +27,10 @@ checksum=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0 system_accounts="ldap" ldap_homedir="/var/lib/openldap" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif} From e3e37951b82295349b3c92423c53c75bf8404a58 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 16:55:55 -0700 Subject: [PATCH 21/97] guile: rebuild for libxcrypt --- srcpkgs/guile/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template index f0f917b1c4eea..517b84e45bd2e 100644 --- a/srcpkgs/guile/template +++ b/srcpkgs/guile/template @@ -1,7 +1,7 @@ # Template file for 'guile' pkgname=guile version=2.2.7 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --disable-error-on-warning" hostmakedepends="pkg-config texinfo" @@ -19,6 +19,10 @@ if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then broken="opposite-endian host generates broken files" fi +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ "$CROSS_BUILD" ]; then # Need host guile to cross compile hostmakedepends+=" guile" From 89473e18a29120094f666e8f826be50ac88c1d8f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 17:03:17 -0700 Subject: [PATCH 22/97] libfilezilla: rebuild for libxcrypt --- srcpkgs/libfilezilla/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template index d37802b7a2c87..f9ccd3946ca7f 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -2,7 +2,7 @@ # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable pkgname=libfilezilla version=0.45.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="gettext pkg-config" @@ -15,6 +15,10 @@ changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?v distfiles="https://download.filezilla-project.org/libfilezilla/libfilezilla-${version}.tar.xz" checksum=3c1454bc1586d17776f62c7505d43a06d3abd2e2e35642cca477fa22f27d982f +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + libfilezilla-devel_package() { short_desc+=" - development files" depends="libfilezilla>=${version}_${revision}" From 8f45aeb45c3ad894941442a9f64f3b6253ca82bf Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 17:04:32 -0700 Subject: [PATCH 23/97] x11vnc: rebuild for libxcrypt --- srcpkgs/x11vnc/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template index 723f2e8a6e65c..188b66dfbbf75 100644 --- a/srcpkgs/x11vnc/template +++ b/srcpkgs/x11vnc/template @@ -1,7 +1,7 @@ # Template file for 'x11vnc' pkgname=x11vnc version=0.9.16 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel @@ -14,6 +14,10 @@ changelog="https://raw.githubusercontent.com/LibVNC/x11vnc/master/NEWS" distfiles="https://github.com/LibVNC/x11vnc/archive/${version}.tar.gz" checksum=885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + CFLAGS="-fcommon" pre_configure() { From 921e4b1daef2b3c80236b6e757e26f633dacbdc5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 17:05:16 -0700 Subject: [PATCH 24/97] tcsh: rebuild for libxcrypt --- srcpkgs/tcsh/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template index d736217b7e0b5..4c47602d7ef02 100644 --- a/srcpkgs/tcsh/template +++ b/srcpkgs/tcsh/template @@ -1,7 +1,7 @@ # Template file for 'tcsh' pkgname=tcsh version=6.24.10 -revision=1 +revision=2 build_style=gnu-configure conf_files="/etc/csh.login /etc/csh.cshrc" makedepends="ncurses-devel automake" @@ -13,6 +13,10 @@ distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz" checksum=13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664 register_shell="/bin/tcsh /bin/csh" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + post_extract() { sed -i '/define BSDWAIT/d' sh.proc.c } From ba8fabdfb6c84d567e2ca0422fa0174a9c1b9def Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 17:49:09 -0700 Subject: [PATCH 25/97] xdm: rebuild for libxcrypt --- srcpkgs/xdm/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template index 282b8fe7a5401..d262f9728ee55 100644 --- a/srcpkgs/xdm/template +++ b/srcpkgs/xdm/template @@ -1,7 +1,7 @@ # Template file for 'xdm' pkgname=xdm version=1.1.14 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-random-device=/dev/urandom --with-utmp-file=/var/run/utmp @@ -24,6 +24,10 @@ homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" checksum=3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { export DEF_USER_PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin } From 5ebebc561714629a0678256a1f271dbb375d453d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 8 Aug 2023 17:49:36 -0700 Subject: [PATCH 26/97] lua54-luaposix: rebuild for libxcrypt --- srcpkgs/lua54-luaposix/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lua54-luaposix/template b/srcpkgs/lua54-luaposix/template index 04f5fb8477987..d8bf07b07116d 100644 --- a/srcpkgs/lua54-luaposix/template +++ b/srcpkgs/lua54-luaposix/template @@ -1,7 +1,7 @@ # Template file for 'lua54-luaposix' pkgname=lua54-luaposix version=35.0 -revision=1 +revision=2 hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel" makedepends="lua51-devel lua52-devel lua53-devel lua54-devel" depends="lua54 lua54-stdlib-normalize" @@ -14,6 +14,10 @@ distfiles="https://github.com/luaposix/luaposix/archive/refs/tags/v${version}.ta checksum=a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809 lib32disabled=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + post_extract() { cd "${wrksrc}" mkdir -p lua5.1 From a33f677b21a591edd724ac4662f0867c48bc5934 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:01:47 -0700 Subject: [PATCH 27/97] FreeRADIUS: rebuild for libxcrypt --- srcpkgs/FreeRADIUS/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template index 90a4c662bc994..d438d91d7876b 100644 --- a/srcpkgs/FreeRADIUS/template +++ b/srcpkgs/FreeRADIUS/template @@ -1,7 +1,7 @@ # Template file for 'FreeRADIUS' pkgname=FreeRADIUS version=3.0.26 -revision=3 +revision=4 build_style=gnu-configure makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \ libmariadbclient-devel postgresql-libs-devel json-c-devel" @@ -15,6 +15,10 @@ nocross=yes # Not supported by upstream system_accounts="_freeradius" make_dirs="/etc/raddb 0750 _freeradius _freeradius" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_install() { # FreeRADIUS uses 'R' instead of 'DESTDIR' export R=${DESTDIR} From 9b6aea9d671ae83cf2931248a7a24445ac50d115 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:03:50 -0700 Subject: [PATCH 28/97] Gauche: rebuild for libxcrypt --- srcpkgs/Gauche/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template index fd087256ff7a8..1aabad37b946c 100644 --- a/srcpkgs/Gauche/template +++ b/srcpkgs/Gauche/template @@ -1,7 +1,7 @@ # Template file for 'Gauche' pkgname=Gauche version=0.9.12 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="texinfo" makedepends="libticonv-devel libatomic_ops-devel" @@ -17,6 +17,10 @@ alternatives=" scheme:scheme.1:/usr/share/man/man1/gosh.1 " +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ -n "$CROSS_BUILD" ]; then # Gauche needs itself to bootstrap for cross compilation. hostmakedepends+=" Gauche" From 3a3ed46abb61c2909f4a03bbe3a580708c7f0067 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:05:00 -0700 Subject: [PATCH 29/97] alpine: rebuild for libxcrypt --- srcpkgs/alpine/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index ed46e3bf5b2e2..2b23e2a7dd8af 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,7 +1,7 @@ # Template file for 'alpine' pkgname=alpine version=2.26 -revision=3 +revision=4 _githash=9726c098a739edfdca6218bc5dee104c310957e9 _gitshort="${_githash:0:7}" build_style=gnu-configure @@ -20,6 +20,10 @@ checksum=c8c377eab0f65b51283e0ad3144be143065dca4463d12ccf5092ae841515a431 # weird fail with openssl3 otherwise disable_parallel_build=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + post_extract() { sed -i -e '/run test program/s/^/: /' \ -e 's/linux-gnu/linux-/g' ${wrksrc}/configure From 5cb5e4697c6fb164b5947a6c800d23f62bfb6b0d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:08:29 -0700 Subject: [PATCH 30/97] anjuta: rebuild for libxcrypt --- srcpkgs/anjuta/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template index 8a43a32673951..11036b69abba8 100644 --- a/srcpkgs/anjuta/template +++ b/srcpkgs/anjuta/template @@ -1,7 +1,7 @@ # Template file for 'anjuta' pkgname=anjuta version=3.34.0 -revision=5 +revision=6 build_style=gnu-configure build_helper="gir qemu" configure_args="--disable-compile-warnings --disable-schemas-compile @@ -23,6 +23,10 @@ homepage="https://projects.gnome.org/anjuta" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + build_options="gir" build_options_default="gir" From 6b44fea8951144d2b14d2ae0bddfb292ac83b149 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:14:02 -0700 Subject: [PATCH 31/97] bacula-common: rebuild for libxcrypt --- srcpkgs/bacula-common/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index b3064e54bd4ea..552d238e8f3a4 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -1,7 +1,7 @@ # Template file for 'bacula-common' pkgname=bacula-common version=9.4.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql --enable-smartalloc --sysconfdir=/etc/bacula @@ -17,6 +17,10 @@ checksum=a40d04d2c48135972cecb6578405e835c4b9d798c0950017de0fad40ca94e8a0 alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-sqlite3-${version}.so" shlib_provides="libbaccats-${version}.so" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + CFLAGS="-Wno-narrowing" post_install() { From c8ead90de3165c4f9a5649ada0762099fbea6fdb Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:15:27 -0700 Subject: [PATCH 32/97] bitchx: rebuild for libxcrypt --- srcpkgs/bitchx/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template index 1172d810d44ea..0551c00f50ae3 100644 --- a/srcpkgs/bitchx/template +++ b/srcpkgs/bitchx/template @@ -1,7 +1,7 @@ # Template file for 'bitchx' pkgname=bitchx version=1.2.1 -revision=18 +revision=19 build_style=gnu-configure configure_args="--with-ssl --with-ipv6 --with-plugins" makedepends="openssl-devel ncurses-devel" @@ -12,6 +12,10 @@ homepage="http://bitchx.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + disable_parallel_build=yes CFLAGS="-fcommon" From 9f65d38f9fd6ebf60298e849be7fd17e496950ed Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 27 Oct 2023 19:57:33 -0700 Subject: [PATCH 33/97] bftpd: rebuild for libxcrypt --- srcpkgs/bftpd/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template index 225438a341ac1..ff24ddeefd0ab 100644 --- a/srcpkgs/bftpd/template +++ b/srcpkgs/bftpd/template @@ -1,7 +1,7 @@ # Template file for 'bftpd' pkgname=bftpd version=6.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-libz" makedepends="zlib-devel" @@ -12,6 +12,10 @@ homepage="https://bftpd.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz" checksum=9721d0614e1a5d0fe6b80c9a8a04ada8efd42cbdfddd239e95a8059ae283aa6f +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + CFLAGS="-fcommon" make_build_args=V=1 make_dirs="/var/run/bftpd 0755 root root" From 06754ed83bf367f0f6b2927e4f6df8155e3d9844 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:17:08 -0700 Subject: [PATCH 34/97] burp2-server: rebuild for libxcrypt --- srcpkgs/burp2-server/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template index 11678ac289ad2..48b5569a447c5 100644 --- a/srcpkgs/burp2-server/template +++ b/srcpkgs/burp2-server/template @@ -3,7 +3,7 @@ _desc="Network-based backup and restore program" pkgname=burp2-server version=2.4.0 -revision=2 +revision=3 build_style=gnu-configure make_install_target=install-all configure_args="--sysconfdir=/etc/burp" @@ -26,6 +26,8 @@ make_dirs="/var/spool/burp 0755 root root" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" +elif [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" fi pre_configure() { From aa6a658bdfb72bba40f5d961835ce146dbf47273 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:19:16 -0700 Subject: [PATCH 35/97] busybox: rebuild for libxcrypt --- srcpkgs/busybox/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index f647e3066b3ba..0b81f496c0769 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -1,7 +1,7 @@ # Template file for 'busybox' pkgname=busybox version=1.34.1 -revision=4 +revision=5 hostmakedepends="perl" checkdepends="tar which zip" short_desc="Swiss Army Knife of Embedded Linux" @@ -11,6 +11,10 @@ homepage="https://www.busybox.net" distfiles="${homepage}/downloads/busybox-${version}.tar.bz2" checksum=415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + _alternatives_core=" ash:ash:/usr/bin/busybox awk:awk:/usr/bin/busybox From 69b55cc4b9ba54f7ba3351eaaed6bf9dc4192f7b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:20:45 -0700 Subject: [PATCH 36/97] ccrypt: rebuild for libxcrypt --- srcpkgs/ccrypt/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ccrypt/template b/srcpkgs/ccrypt/template index 94208eb831cd6..ddddfeba6e99e 100644 --- a/srcpkgs/ccrypt/template +++ b/srcpkgs/ccrypt/template @@ -1,7 +1,7 @@ # Template file for 'ccrypt' pkgname=ccrypt version=1.11 -revision=1 +revision=2 build_style=gnu-configure short_desc="Symmetric encryption utility using Rijndael cipher" maintainer="Evan Deaubl " @@ -9,3 +9,7 @@ license="GPL-2.0-or-later" homepage="https://ccrypt.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/ccrypt/ccrypt-${version}.tar.gz" checksum=b19c47500a96ee5fbd820f704c912f6efcc42b638c0a6aa7a4e3dc0a6b51a44f + +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi From 14c4b8a3d5088230fe67ef919fba0568f7fff2f7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:22:05 -0700 Subject: [PATCH 37/97] clisp: rebuild for libxcrypt --- srcpkgs/clisp/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template index af9546f7faa77..4f2c474fbaa1c 100644 --- a/srcpkgs/clisp/template +++ b/srcpkgs/clisp/template @@ -1,7 +1,7 @@ # Template file for 'clisp' pkgname=clisp version=2.49.92 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --disable-mmap --disable-rpath --without-dynamic-modules $(vopt_with readline)" @@ -20,6 +20,10 @@ disable_parallel_build=yes build_options="readline" build_options_default="readline" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + case "$XBPS_TARGET_MACHINE" in i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";; esac From 61e8b7c4fedd3dd6ad0820f4601b13174504b362 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:23:06 -0700 Subject: [PATCH 38/97] collectd: rebuild for libxcrypt --- srcpkgs/collectd/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 91a10df4e308e..0cbb7c457fb9e 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.12.0 -revision=11 +revision=12 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt @@ -24,6 +24,10 @@ distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2" checksum=5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 LDFLAGS="-lgcrypt" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + build_options="rrdtool perl notify prometheus" desc_option_rrdtool="Enable support for RRDTool" desc_option_prometheus="Enable write_prometheus plugin" From a95e571e734eb0ac7d9f872732d2725d9891fb9e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:24:42 -0700 Subject: [PATCH 39/97] cvm: rebuild for libxcrypt --- srcpkgs/cvm/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template index e4663ecaf43ef..4939ad7c01153 100644 --- a/srcpkgs/cvm/template +++ b/srcpkgs/cvm/template @@ -1,7 +1,7 @@ # Template file for 'cvm' pkgname=cvm version=0.97 -revision=3 +revision=4 build_style=gnu-makefile hostmakedepends="libtool" makedepends="bglibs-devel" @@ -12,6 +12,10 @@ homepage="http://untroubled.org/cvm/" distfiles="http://untroubled.org/cvm/cvm-${version}.tar.gz" checksum=82e7751d63cc2ae91457e28b5326885beb1d082d4f0695f4fdaac5ffa70a0c47 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_build() { echo '/usr/bin' > conf-bin echo '/usr/include' > conf-include From efedd3026293ee3e7f8446fa14e523a53e930aca Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:27:28 -0700 Subject: [PATCH 40/97] cvs: rebuild for libxcrypt --- srcpkgs/cvs/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template index c37384b543024..803d3e420ef7b 100644 --- a/srcpkgs/cvs/template +++ b/srcpkgs/cvs/template @@ -1,7 +1,7 @@ # Template file for 'cvs' pkgname=cvs version=1.12.13 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-editor=/usr/bin/vi --with-external-zlib ac_cv_func_working_mktime=yes" # broken test upstream @@ -14,3 +14,7 @@ homepage="http://www.nongnu.org/cvs/" license="GPL-1, LGPL-2" distfiles="http://ftp.gnu.org/non-gnu/cvs/source/feature/$version/cvs-$version.tar.bz2" checksum=78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e + +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi From 82d21c624008db34a1a71853e83f9c2bfa51e31e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:27:54 -0700 Subject: [PATCH 41/97] cyrus-sasl: rebuild for libxcrypt --- srcpkgs/cyrus-sasl/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index e6c0ee16532ca..2a3a6e90b5541 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -2,7 +2,7 @@ # keep in sync with libsasl pkgname=cyrus-sasl version=2.1.28 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static --enable-shared --enable-checkapop --enable-cram --enable-digest --disable-otp --disable-srp @@ -25,6 +25,10 @@ homepage="https://www.cyrusimap.org/sasl/" distfiles="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${version}/cyrus-sasl-${version}.tar.gz" checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { autoreconf -fi } From d370ee0b77f11689febd9c1c3ce53b7b65f0b272 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:29:13 -0700 Subject: [PATCH 42/97] dante: rebuild for libxcrypt --- srcpkgs/dante/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template index 17fe0f69ae608..ca640b1fc9e0a 100644 --- a/srcpkgs/dante/template +++ b/srcpkgs/dante/template @@ -1,7 +1,7 @@ # Template file for 'dante' pkgname=dante version=1.4.2 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="tar automake libtool" short_desc="SOCKS server and client" @@ -13,6 +13,7 @@ checksum=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then configure_args="--with-libc=libc.so.6" + makedepends+=" libxcrypt-devel" else configure_args="ac_cv_func_sched_setscheduler=no" fi From 33c91d9d154cf9a298e0512a37cfeab9f4cfcbb4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:30:07 -0700 Subject: [PATCH 43/97] dovecot: rebuild for libxcrypt --- srcpkgs/dovecot/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 0b8f470c1723a..ce7f0418a87cd 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -2,7 +2,7 @@ # revbump dovecot-plugin-pigeonhole when updating dovecot! pkgname=dovecot version=2.3.21 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --disable-static --with-pam --with-mysql --with-pgsql --with-lucene @@ -22,6 +22,10 @@ distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz" checksum=05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d keep_libtool_archives=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ "$CROSS_BUILD" ]; then _tsize=${XBPS_TARGET_WORDSIZE} # FIXME: remove for time64 rebuild From 403bdad58b60396f6fecea5ba5cbd9a624a30109 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:31:06 -0700 Subject: [PATCH 44/97] dropbear: rebuild for libxcrypt --- srcpkgs/dropbear/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template index 5a8f80c6c7e50..f8daedc552ebf 100644 --- a/srcpkgs/dropbear/template +++ b/srcpkgs/dropbear/template @@ -1,7 +1,7 @@ # Template file for 'dropbear' pkgname=dropbear version=2022.83 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-zlib --disable-bundled-libtom" makedepends="zlib-devel libtommath-devel libtomcrypt-devel" @@ -15,6 +15,10 @@ distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar checksum=bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b make_dirs="/etc/dropbear 0755 root root" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + # These tests don't work from within xbps-src # and probably should not be run from there pre_check() { From 220e980df8159bf5ed6fa22a97ec5a709aaae4f4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:34:41 -0700 Subject: [PATCH 45/97] fcron: rebuild for libxcrypt --- srcpkgs/fcron/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template index d3f8567f89274..c1308d0a325d0 100644 --- a/srcpkgs/fcron/template +++ b/srcpkgs/fcron/template @@ -1,7 +1,7 @@ # Template file for 'fcron' pkgname=fcron version=3.3.1 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --sysconfdir=/etc/fcron @@ -32,6 +32,10 @@ homepage="http://fcron.free.fr" distfiles="$homepage/archives/$pkgname-$version.src.tar.gz" checksum=f359daa08a63ddfb7fe2f964bb3f5c52244c25aa36f9225a3cc54d36f4681106 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + alternatives=" crond:crond:/etc/sv/fcron crond:crontab:/usr/bin/fcrontab From 27158474ad754c9ea96ee23df52d4d5ae5db968f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:34:52 -0700 Subject: [PATCH 46/97] frr: rebuild for libxcrypt --- srcpkgs/frr/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template index 5ca26352fdc83..d5520d0a6c2a6 100644 --- a/srcpkgs/frr/template +++ b/srcpkgs/frr/template @@ -1,7 +1,7 @@ # Template file for 'frr' pkgname=frr version=7.5 -revision=5 +revision=6 build_style=gnu-configure # chroot-texinfo is not able to build frr's docs configure_args="--disable-doc @@ -32,6 +32,8 @@ _daemons="zebra staticd bgpd ospfd ospf6d ripd ripngd isisd pimd ldpd nhrpd if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" +elif [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" fi subpackages="libfrrospfapiclient libfrrospfapiclient-devel libfrr libfrr-devel frr-flush frr-reload" From e8f11de113277e89eae294dc694ab686afebf232 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:35:09 -0700 Subject: [PATCH 47/97] gatling: rebuild for libxcrypt --- srcpkgs/gatling/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index 13ae68e98b1c5..8e78242de4b27 100644 --- a/srcpkgs/gatling/template +++ b/srcpkgs/gatling/template @@ -1,7 +1,7 @@ # Template file for 'gatling' pkgname=gatling version=0.16 -revision=2 +revision=3 build_style=gnu-makefile make_build_target="gatling dl getlinks" make_install_args="MANDIR=/usr/share/man" @@ -13,6 +13,10 @@ homepage="http://www.fefe.de/gatling" distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz" checksum=5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + CFLAGS="-std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat -fcommon" pre_build() { From f016bc08116262898e296a5a0e2c6199a2a8e62a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:37:15 -0700 Subject: [PATCH 48/97] haproxy: rebuild for libxcrypt --- srcpkgs/haproxy/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index fba153e7b57a6..44f1643e07299 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -1,7 +1,7 @@ # Template file for 'haproxy' pkgname=haproxy version=2.6.15 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}" hostmakedepends="lua53-devel" @@ -15,6 +15,10 @@ changelog="https://www.haproxy.org/download/${version%.*}/src/CHANGELOG" distfiles="https://www.haproxy.org/download/${version%.*}/src/haproxy-${version}.tar.gz" checksum=41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + haproxy_homedir="/var/lib/${pkgname}" make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}" conf_files="/etc/${pkgname}/${pkgname}.cfg" From 9d3ba39ec7d3eb777a981ea10833064e88c18c1c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:37:29 -0700 Subject: [PATCH 49/97] hiawatha: rebuild for libxcrypt --- srcpkgs/hiawatha/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template index 9c2500430dcb8..ca3c57ef56587 100644 --- a/srcpkgs/hiawatha/template +++ b/srcpkgs/hiawatha/template @@ -1,7 +1,7 @@ # Template file for 'hiawatha' pkgname=hiawatha version=10.12 -revision=4 +revision=5 build_style=cmake configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run -DWEBROOT_DIR=/srv/www/$pkgname -DWORK_DIR=/var/lib/hiawatha @@ -17,6 +17,10 @@ checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt" make_dirs="/var/log/hiawatha 0755 root root" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + XBPS_DISTFILES_MIRROR+=" https://hiawatha-webserver.org/files/hiawatha-${version%%.*}/" post_install() { From ccc50aa327e4c97cd827cffc1227b739567456c0 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:38:34 -0700 Subject: [PATCH 50/97] inetutils: rebuild for libxcrypt --- srcpkgs/inetutils/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template index c45de47f30e39..072159bc6e3ce 100644 --- a/srcpkgs/inetutils/template +++ b/srcpkgs/inetutils/template @@ -1,7 +1,7 @@ # Template file for 'inetutils' pkgname=inetutils version=2.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-wrap --with-pam" makedepends="pam-devel readline-devel" @@ -23,6 +23,10 @@ CFLAGS="-fcommon" # hostname test can't run in CI make_check=ci-skip +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + case "$XBPS_TARGET_MACHINE" in *-musl) # Some packages don't build on musl, so explicitly disable them From b8630f69b8ede524218cff6565349d208a93f99e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:39:30 -0700 Subject: [PATCH 51/97] john: rebuild for libxcrypt --- srcpkgs/john/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/john/template b/srcpkgs/john/template index b40b2250f1d19..98ceeb2eca8d8 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -1,7 +1,7 @@ # Template file for 'john' pkgname=john version=1.9.0 -revision=6 +revision=7 _jumbover=1 build_wrksrc="src" build_style=gnu-configure @@ -15,6 +15,10 @@ distfiles="$homepage/k/$pkgname-${version}-jumbo-${_jumbover}.tar.xz" checksum=f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b python_version=3 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + build_options="simd" pre_configure() { From 41a64f2f9b59165d4a6049f0e658d73f0de95764 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:40:32 -0700 Subject: [PATCH 52/97] ldapvi: rebuild for libxcrypt --- srcpkgs/ldapvi/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 14a5d12044dd5..57bde4e2170c6 100644 --- a/srcpkgs/ldapvi/template +++ b/srcpkgs/ldapvi/template @@ -1,7 +1,7 @@ # Template file for 'ldapvi' pkgname=ldapvi version=1.7 -revision=13 +revision=14 build_style=gnu-configure configure_args="--with-sha" hostmakedepends="pkg-config" @@ -13,6 +13,10 @@ homepage="http://www.lichteblau.com/ldapvi/" distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz" checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + do_install() { vbin ldapvi vman ldapvi.1 From e2f0b8c0a8f596eb223570069374bf49c1535e68 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:42:41 -0700 Subject: [PATCH 53/97] Ice: rebuild for libxcrypt --- srcpkgs/Ice/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 13163d9035d78..d4318ea81c43a 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,7 +1,7 @@ # Template file for 'Ice' pkgname=Ice version=3.7.8 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="LANGUAGES=cpp OPTIMIZE=yes USR_DIR_INSTALL=yes CONFIGS=shared CONFIGS+=cpp11-shared" @@ -16,6 +16,10 @@ changelog="https://doc.zeroc.com/ice/latest/release-notes" distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz" checksum=f2ab6b151ab0418fab30bafc2524d9ba4c767a1014f102df88d735fc775f9824 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ "$CROSS_BUILD" ]; then # Cross build requires the host's slice2cpp hostmakedepends+=" Ice" From ac3e743baad013cca83138d39228e9435e752132 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:43:39 -0700 Subject: [PATCH 54/97] libcli: rebuild for libxcrypt --- srcpkgs/libcli/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libcli/template b/srcpkgs/libcli/template index 0d6b769fd3b5c..385bb3f834fca 100644 --- a/srcpkgs/libcli/template +++ b/srcpkgs/libcli/template @@ -2,7 +2,7 @@ pkgname=libcli version=1.9.8.4 _distver="${version%.*}-${version##*.}" -revision=1 +revision=2 build_style=gnu-makefile short_desc="Library for cisco style telnet interfaces" maintainer="Robert Lowry " @@ -11,6 +11,10 @@ homepage="https://github.com/dparrish/libcli" distfiles="https://github.com/dparrish/libcli/archive/v${_distver}.tar.gz" checksum=c80e268be48c7a52105877995e126034df281096d9785a394b7afcadc9d30e9a +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + libcli-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 6a546b49c61e32feeca225f70a5dbd1b3f169f59 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 13:46:38 -0700 Subject: [PATCH 55/97] lighttpd: rebuild for libxcrypt --- srcpkgs/lighttpd/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 07875c1099eca..10723a608902a 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,7 +1,7 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.71 -revision=3 +revision=4 build_style=meson configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled -Dwith_krb5=enabled -Dwith_ldap=enabled @@ -29,6 +29,8 @@ lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" musl-legacy-compat" +elif [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" fi make_dirs=" From 8951360dd3e1eb9b1cedf949d68d950e56449818 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:02:42 -0700 Subject: [PATCH 56/97] whois: rebuild for libxcrypt --- srcpkgs/whois/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template index 1466cc07d7db6..3da8b44074d7b 100644 --- a/srcpkgs/whois/template +++ b/srcpkgs/whois/template @@ -1,7 +1,7 @@ # Template file for 'whois' pkgname=whois version=5.5.19 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf" make_install_args="BASEDIR=\${DESTDIR}" @@ -16,6 +16,10 @@ changelog="https://raw.githubusercontent.com/rfc1036/whois/next/debian/changelog distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.tar.xz" checksum=f92817716e85e2e30851eab565d69c48ddbcb61ab92634a2a5fdff8ee7b26876 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + alternatives=" whois:whois:/usr/bin/gwhois whois:whois.1:/usr/share/man/man1/gwhois.1 From eb7db766bfbc33bd9f49760fb788fd3f3556e0fa Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:04:19 -0700 Subject: [PATCH 57/97] mokutil: rebuild for libxcrypt --- srcpkgs/mokutil/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template index db4a9c7d93c70..43af27184317a 100644 --- a/srcpkgs/mokutil/template +++ b/srcpkgs/mokutil/template @@ -1,7 +1,7 @@ # Template file for 'mokutil' pkgname=mokutil version=0.6.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config" makedepends="keyutils-devel libefivar-devel openssl-devel" @@ -12,6 +12,10 @@ homepage="https://github.com/lcp/mokutil" distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz" checksum=6cc4be216ac083ee19dc986e8a510e1d74f6f4080baa4b5fdc7c503eb483f569 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { autoreconf -fi } From 78e3d60c518d1a184c6b40f2d00498189d8e138f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:04:34 -0700 Subject: [PATCH 58/97] monit: rebuild for libxcrypt --- srcpkgs/monit/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 02cecde59bb8a..ede8813eadee4 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -1,7 +1,7 @@ # Template file for 'monit' pkgname=monit version=5.33.0 -revision=2 +revision=3 build_style=gnu-configure configure_args=" --with-ssl-dir=${XBPS_CROSS_BASE}/usr @@ -18,6 +18,10 @@ changelog="https://mmonit.com/monit/changes/" distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz" checksum=1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { ./bootstrap } From 57ed1c3ada5b7dc6a3d940063ca24e133a2b833f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:07:01 -0700 Subject: [PATCH 59/97] open-vm-tools: rebuild for libxcrypt --- srcpkgs/open-vm-tools/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template index c72ade7f06e16..2d993de61ff42 100644 --- a/srcpkgs/open-vm-tools/template +++ b/srcpkgs/open-vm-tools/template @@ -1,7 +1,7 @@ # Template file for 'open-vm-tools' pkgname=open-vm-tools version=12.3.0 -revision=2 +revision=3 archs="x86_64* i686* aarch64*" build_wrksrc="open-vm-tools" build_style=gnu-configure @@ -20,6 +20,10 @@ changelog="https://raw.githubusercontent.com/vmware/open-vm-tools/master/Release distfiles="https://github.com/vmware/open-vm-tools/archive/refs/tags/stable-${version}.tar.gz" checksum=c69f7bcd4262726758302d20e594b2f11012334c9e53c47dabf8f4d0fdd16fff +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + build_options="pam x11" build_options_default="pam x11" From cf24a09cc946c11dbde4b022c1210005ec6f152a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:08:11 -0700 Subject: [PATCH 60/97] nginx: rebuild for libxcrypt --- srcpkgs/nginx/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 1da8dd90f9db2..2bb25d35b2335 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -4,7 +4,7 @@ # See comments in mime-types template pkgname=nginx version=1.24.0 -revision=4 +revision=5 _tests_commit=36a4563f7f00 _njs_version=0.7.12 create_wrksrc=yes @@ -71,6 +71,10 @@ checksum="77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d # Tests fail when nginx run as root and there is no nginx user make_check=ci-skip +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + # NOTE: # On update, the pregenerated header file for ARM may need synchronization. # See srcpkgs/nginx/files/ngx_auto_config.h.armv6l.patch for more information. From 1b6157d1d90253049c8bb2534fe2193e2f182456 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:08:29 -0700 Subject: [PATCH 61/97] opensmtpd: rebuild for libxcrypt --- srcpkgs/opensmtpd/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 229345bebb65b..1f4979cebf21d 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,7 +1,7 @@ # Template file for 'opensmtpd' pkgname=opensmtpd version=7.4.0p0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-path-socket=/run --with-path-pidfile=/run @@ -29,6 +29,10 @@ system_accounts="_smtpd _smtpq" CFLAGS=-D_DEFAULT_SOURCE +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" --with-libfts=${XBPS_CROSS_BASE}/usr" From 524fcd02648ad6f464f57830606dc55a6e37064f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:13:42 -0700 Subject: [PATCH 62/97] otpw: rebuild for libxcrypt --- srcpkgs/otpw/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/otpw/template b/srcpkgs/otpw/template index 03c9c86d6a198..654940c0fcfed 100644 --- a/srcpkgs/otpw/template +++ b/srcpkgs/otpw/template @@ -1,7 +1,7 @@ # Template file for 'otpw' pkgname=otpw version=1.5 -revision=5 +revision=6 conf_files="/etc/pam.d/ssh-otpw" makedepends="pam-devel" short_desc="A one-time password login package" @@ -11,6 +11,10 @@ homepage="http://www.cl.cam.ac.uk/~mgk25/otpw.html" distfiles="https://www.cl.cam.ac.uk/%7Emgk25/download/otpw-${version}.tar.gz" checksum=98aca38a61c7713677b96f24426ca7053480c0fd077d91b1e99bc9f92ccb832a +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + do_build() { make CC=$CC LD=$LD CFLAGS="$CFLAGS -fPIC" LDFLAGS="$LDFLAGS" ${makejobs} } From dc92956c6247741f33685d64c9a53c8962c63d9f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:15:19 -0700 Subject: [PATCH 63/97] parrot: rebuild for libxcrypt --- srcpkgs/parrot/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/parrot/template b/srcpkgs/parrot/template index ec36cbd2afdb4..51b71868ae599 100644 --- a/srcpkgs/parrot/template +++ b/srcpkgs/parrot/template @@ -1,19 +1,23 @@ -# Template build file for 'parrot'. +# Template file for 'parrot' pkgname=parrot version=6.9.0 -revision=5 +revision=6 build_style=configure configure_args="--prefix=/usr --mandir=/usr/share/man" +configure_script="perl Configure.pl" +hostmakedepends="perl perl-Pod-Parser" short_desc="Virtual machine designed for dynamic languages" maintainer="pancake " +license="Artistic-2.0" homepage="http://www.parrot.org" -hostmakedepends="perl perl-Pod-Parser" -configure_script="perl Configure.pl" -license="Artistic" -distfiles="ftp://ftp.parrot.org/pub/parrot/releases/supported/${version}/parrot-${version}.tar.bz2" +distfiles="http://ftp.parrot.org/releases/supported/${version}/parrot-${version}.tar.bz2" checksum=ad5f3723c216675b9ebc2e3d3807d24fd13aa55e1eb3e7ffcad4062e0026f482 nopie=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + nocross="http://build.voidlinux.org:8010/builders/armv7l_builder/builds/8546/steps/shell_3/logs/stdio" parrot-devel_package() { From 0bfbc65d4c531ad65f0f4b930c3c4488d1b9046d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:16:40 -0700 Subject: [PATCH 64/97] passwdqc: rebuild for libxcrypt --- srcpkgs/passwdqc/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template index 180af752b570b..5f027b289c203 100644 --- a/srcpkgs/passwdqc/template +++ b/srcpkgs/passwdqc/template @@ -1,7 +1,7 @@ # Template file for 'passwdqc' pkgname=passwdqc version=2.0.3 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security" conf_files="/etc/passwdqc.conf" @@ -13,6 +13,10 @@ homepage="http://www.openwall.com/passwdqc/" distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz" checksum=53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + do_build() { make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ $make_install_args From b14d222a0d926a19ae06f6ae38caa1bff0be39af Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:17:40 -0700 Subject: [PATCH 65/97] pounce: rebuild for libxcrypt --- srcpkgs/pounce/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template index 1e14ef5b8431a..fd2d4bd7f9a32 100644 --- a/srcpkgs/pounce/template +++ b/srcpkgs/pounce/template @@ -1,7 +1,7 @@ # Template file for 'pounce' pkgname=pounce version=3.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-notify --enable-palaver" make_build_target="all" @@ -14,3 +14,7 @@ license="GPL-3.0-or-later" homepage="https://git.causal.agency/pounce/" distfiles="https://git.causal.agency/pounce/snapshot/pounce-$version.tar.gz" checksum=97f245556b1cc940553fca18f4d7d82692e6c11a30f612415e5e391e5d96604e + +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi From dcdcf5f9eb83440a36a775b4dba3123d19e3c513 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:18:52 -0700 Subject: [PATCH 66/97] ppp: rebuild for libxcrypt --- srcpkgs/ppp/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template index 7368879f494fc..013dd2a03b935 100644 --- a/srcpkgs/ppp/template +++ b/srcpkgs/ppp/template @@ -6,7 +6,7 @@ # When update this package pkgname=ppp version=2.4.9 -revision=3 +revision=4 makedepends="libpcap-devel openssl-devel" short_desc="PPP (Point-to-Point Protocol) daemon" maintainer="Orphaned " @@ -26,6 +26,10 @@ conf_files=" /etc/ppp/chap-secrets /etc/ppp/pap-secrets" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + do_configure() { ./configure --prefix=/usr --cc="${CC}" --cflags="${CFLAGS}" } From ff21839c2895e2a679f239cf01ab6b833c3fd763 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:20:08 -0700 Subject: [PATCH 67/97] proftpd: rebuild for libxcrypt --- srcpkgs/proftpd/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/proftpd/template b/srcpkgs/proftpd/template index 8e9985cc0b127..c2f625116491d 100644 --- a/srcpkgs/proftpd/template +++ b/srcpkgs/proftpd/template @@ -1,7 +1,7 @@ # Template file for 'proftpd' pkgname=proftpd version=1.3.7e -revision=1 +revision=2 build_style=gnu-configure makedepends="libcap-devel" short_desc="Highly configurable GPL-licensed FTP server software" @@ -13,6 +13,10 @@ distfiles="https://github.com/proftpd/proftpd/archive/v${version}.tar.gz" checksum=6e716a3b53ee069290399fce6dccf4c229fafe6ec2cb14db3778b7aa3f9a8c92 conf_files="/etc/proftpd.conf" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + proftpd-devel_package() { short_desc+=" - development files" depends="proftpd>=${version}_${revision}" From 03de6b3f6c7419bd35bb426199983ebeeef3f125 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:24:23 -0700 Subject: [PATCH 68/97] xrootd: rebuild for libxcrypt --- srcpkgs/xrootd/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template index ceff8fe182309..5fb1164c2eda8 100644 --- a/srcpkgs/xrootd/template +++ b/srcpkgs/xrootd/template @@ -1,7 +1,7 @@ # Template file for 'xrootd' pkgname=xrootd version=5.5.5 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release" hostmakedepends="pkgconf" @@ -18,4 +18,6 @@ checksum=0710caae527082e73d3bf8f9d1dffe95808afd3fcaaaa15ab0b937b8b226bc1f if [ "$XBPS_TARGET_LIBC" = musl ]; then configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" makedepends+=" libexecinfo-devel" +elif [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" fi From 550b44c05e7e98ee714cc4fe0b1474e039a1e951 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:27:42 -0700 Subject: [PATCH 69/97] root: rebuild for libxcrypt --- srcpkgs/root/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/root/template b/srcpkgs/root/template index 9652152b2980b..44b1591f62331 100644 --- a/srcpkgs/root/template +++ b/srcpkgs/root/template @@ -1,7 +1,7 @@ # Template file for 'root' pkgname=root version=6.28.06 -revision=2 +revision=3 # Only i686 and x86_64 seem to be officially supported archs="i686* x86_64*" build_style=cmake @@ -34,6 +34,10 @@ python_version=3 shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so libTMVA.so libMathCore.so" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -Dssl=OFF -Droot7=OFF" From d861d8f98acbc091ae72d1bbaf0c4cfa77192577 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:30:30 -0700 Subject: [PATCH 70/97] screen: rebuild for libxcrypt --- srcpkgs/screen/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template index 607d2514e45ae..774bcf843e2aa 100644 --- a/srcpkgs/screen/template +++ b/srcpkgs/screen/template @@ -1,7 +1,7 @@ # Template file for 'screen' pkgname=screen version=4.9.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam --enable-colors256 --enable-rxvt_osc --enable-telnet @@ -18,6 +18,10 @@ checksum=26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 build_options="multiuser" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { ./autogen.sh } From c5e1f23e37eb9abccc7332183cb3f2d6b2c58e18 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:31:11 -0700 Subject: [PATCH 71/97] slock: rebuild for libxcrypt --- srcpkgs/slock/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template index aa7890a499735..467169fbaee8d 100644 --- a/srcpkgs/slock/template +++ b/srcpkgs/slock/template @@ -1,7 +1,7 @@ # Template file for 'slock' pkgname=slock version=1.5 -revision=1 +revision=2 hostmakedepends="pkg-config" makedepends="libXrandr-devel" short_desc="Simple screen locker for X" @@ -11,6 +11,10 @@ homepage="http://tools.suckless.org/slock" distfiles="http://dl.suckless.org/tools/slock-${version}.tar.gz" checksum=aee1e3fbf6a277fb625a3838073b979b6483e7baca4ce82f56de1ff192db0e4d +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + do_build() { [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk From f0c84e4dfc71df6d47133d4df3a3d9f58f1cb5a6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:32:02 -0700 Subject: [PATCH 72/97] sqmail: rebuild for libxcrypt --- srcpkgs/sqmail/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template index d10e1ba62772c..14eac09070e5a 100644 --- a/srcpkgs/sqmail/template +++ b/srcpkgs/sqmail/template @@ -1,7 +1,7 @@ # Template file for 'sqmail' pkgname=sqmail version=4.0.10 -revision=5 +revision=6 create_wrksrc=yes build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src" makedepends="fehQlibs libidn2-devel ucspi-ssl-devel" @@ -17,6 +17,10 @@ provides="smtp-server-0_1" replaces="smtp-server>=0" conf_files="/etc/sv/*/run /etc/sv/*/log/run" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + system_groups="_nofiles:798 _sqmail:799" system_accounts+=" _alias:790" From a0496b3731eff95257f72442f00ed7544abfcc01 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:34:39 -0700 Subject: [PATCH 73/97] squid: rebuild for libxcrypt --- srcpkgs/squid/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 58ef243c8c5f8..1dff665cda342 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -1,7 +1,7 @@ # Template file for 'squid' pkgname=squid version=5.7 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --sysconfdir=/etc/squid @@ -59,6 +59,10 @@ system_accounts="squid" # squid-conf-tests requires a squid user in the system make_check=no +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { export BUILDCXX="${CXX_host}" export BUILDCXXFLAGS="-O2" From a797c60b2e9a328fa958b169ff85cf9c0082412e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:34:53 -0700 Subject: [PATCH 74/97] stress-ng: rebuild for libxcrypt --- srcpkgs/stress-ng/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 421094cd2cbff..3eb0da7d5e103 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,7 +1,7 @@ # Template file for 'stress-ng' pkgname=stress-ng version=0.17.00 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=1 short_desc="Load and stress a computer system" @@ -13,5 +13,6 @@ checksum=eca62128f4918edc6d1e309f426a223968f44b304b737275443ec9e62855d42e if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" +elif [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" fi - From fc9aba573397495d9db07eeaf22f57498287b92a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:36:16 -0700 Subject: [PATCH 75/97] swi-prolog: rebuild for libxcrypt --- srcpkgs/swi-prolog/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 416206e8d15f0..598bf9f5793cf 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,7 +1,7 @@ # Template file for 'swi-prolog' pkgname=swi-prolog version=9.0.4 -revision=2 +revision=3 build_style=cmake build_helper="qemu" configure_args="-DBUILD_TESTING=OFF" @@ -18,3 +18,7 @@ distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz checksum=feb2815a51d34fa81cb34e8149830405935a7e1d1c1950461239750baa8b49f0 CFLAGS=-D_FILE_OFFSET_BITS=64 CXXFLAGS=-D_FILE_OFFSET_BITS=64 + +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi From ad94ba7c6902e2ef4dd00e46d0b29f5fe663cee1 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:37:35 -0700 Subject: [PATCH 76/97] tacacs: rebuild for libxcrypt --- srcpkgs/tacacs/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template index 179fc1fa161ee..ac88e28bf491b 100644 --- a/srcpkgs/tacacs/template +++ b/srcpkgs/tacacs/template @@ -1,7 +1,7 @@ # Template file for 'tacacs' pkgname=tacacs version=4.0.4.28 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-libwrap=no" hostmakedepends="flex perl" @@ -15,6 +15,10 @@ checksum=147f2dc98d26d2f93f0aba76c988ced196ffe1c001dc2e91f788a1a2c747219e python_version=3 disable_parallel_build=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { if [ "$XBPS_TARGET_LIBC" = "musl" ]; then patch -Np0 -i ${FILESDIR}/no-reap-child-test-no-nsl.patch From 8f1a8fcee9fc25da428f46262facc5cd804f6cbc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:38:46 -0700 Subject: [PATCH 77/97] thttpd: rebuild for libxcrypt --- srcpkgs/thttpd/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template index 13de3fbef35ef..e0f393bca4b9d 100644 --- a/srcpkgs/thttpd/template +++ b/srcpkgs/thttpd/template @@ -1,7 +1,7 @@ # Template file for 'thttpd' pkgname=thttpd version=2.29 -revision=2 +revision=3 build_style=gnu-configure short_desc="Tiny/turbo/throttling HTTP server" maintainer="Orphaned " @@ -10,6 +10,10 @@ homepage="http://www.acme.com/software/thttpd/" distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz" checksum=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { vsed -i Makefile.in -e "s,-o bin -g bin,,g" } From d61739938eda2c6cff50ed81941ead23a6d99fda Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:40:22 -0700 Subject: [PATCH 78/97] toybox: rebuild for libxcrypt --- srcpkgs/toybox/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template index d3b984241038e..ec15606c41258 100644 --- a/srcpkgs/toybox/template +++ b/srcpkgs/toybox/template @@ -1,7 +1,7 @@ # Template file for 'toybox' pkgname=toybox version=0.8.10 -revision=1 +revision=2 create_wrksrc=yes short_desc="BSD-licensed alternative to busybox" maintainer="Orphaned " @@ -10,6 +10,10 @@ homepage="http://www.landley.net/toybox" distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz" checksum=d3afee05ca90bf425ced73f527e418fecd626c5340b5f58711a14531f8d7d108 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + post_extract() { mv toybox-${version} toybox cp -r toybox toybox-static From 240aae573a0a43bea2d540f712684e0bf6584b0c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:40:34 -0700 Subject: [PATCH 79/97] txr: rebuild for libxcrypt --- srcpkgs/txr/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index d9b0e96ebe5ac..0f60fe1d4d04e 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -1,7 +1,7 @@ # Template file for 'txr' pkgname=txr version=282 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm* ppc64* mips*" build_style=configure configure_args="--prefix=/usr" @@ -16,6 +16,10 @@ distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz checksum=5f10467610d8213be9af8a1fc9dafbd4902b7b473a82d8b2945cfa5ea6d2fee5 nopie=yes +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + if [ "$CROSS_BUILD" ]; then hostmakedepends+=" txr" fi From a58b2f0bb0c92ef39a967629ba50e06e31607d19 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:42:48 -0700 Subject: [PATCH 80/97] vile: rebuild for libxcrypt --- srcpkgs/vile/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/vile/template b/srcpkgs/vile/template index 03be247701fb9..166d0aa5b9c69 100644 --- a/srcpkgs/vile/template +++ b/srcpkgs/vile/template @@ -1,7 +1,7 @@ # Template file for 'vile' pkgname=vile version=9.8x -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-stripping" hostmakedepends="flex" @@ -14,6 +14,10 @@ changelog="https://invisible-island.net/vile/CHANGES.html" distfiles="https://invisible-mirror.net/archives/vile/current/vile-${version}.tgz" checksum=8fe0dfa60179d4b7dd2750f116cd4396d4cd3e07d8a54d142a36c84f4a82feef +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + post_extract() { vsed -e 's/\[\[//g' -i filters/sh-filt.l } From ef3795eea72b00d530dced6be0b24e10324c80a8 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:43:27 -0700 Subject: [PATCH 81/97] vsftpd: rebuild for libxcrypt --- srcpkgs/vsftpd/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template index 599b25bf6d24f..83c5b9a01dacf 100644 --- a/srcpkgs/vsftpd/template +++ b/srcpkgs/vsftpd/template @@ -1,7 +1,7 @@ # Template file for 'vsftpd' pkgname=vsftpd version=3.0.5 -revision=2 +revision=3 build_style=gnu-makefile makedepends="pam-devel libcap-devel libnsl-devel openssl-devel" short_desc="FTP daemon with focus on security" @@ -11,6 +11,10 @@ homepage="https://security.appspot.com/vsftpd.html" distfiles="https://security.appspot.com/downloads/${pkgname}-${version}.tar.gz" checksum=26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + system_accounts="ftp" ftp_pgroup=nogroup CFLAGS="-Wno-error" From c171ea5f4672ccf73df964501dafab97f9d67259 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:44:41 -0700 Subject: [PATCH 82/97] wvstreams: rebuild for libxcrypt --- srcpkgs/wvstreams/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template index 515b160c9cfac..e9195425891ae 100644 --- a/srcpkgs/wvstreams/template +++ b/srcpkgs/wvstreams/template @@ -1,7 +1,7 @@ # Template file for 'wvstreams' pkgname=wvstreams version=4.6.1 -revision=22 +revision=23 build_style=gnu-configure configure_args="--without-dbus --without-tcl --without-qt" makedepends="openssl-devel zlib-devel" @@ -14,6 +14,10 @@ checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 conf_files="/etc/uniconf.conf" replaces="uniconf>=0" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + CXXFLAGS="-Wno-narrowing" wvstreams-devel_package() { From 8abfd9dec56218264aedb0575faed3d234a0006f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:45:16 -0700 Subject: [PATCH 83/97] xlockmore: rebuild for libxcrypt --- srcpkgs/xlockmore/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template index 9439b0b02e54f..ad710ac44307a 100644 --- a/srcpkgs/xlockmore/template +++ b/srcpkgs/xlockmore/template @@ -1,7 +1,7 @@ # Template file for 'xlockmore' pkgname=xlockmore version=5.73 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')" hostmakedepends="pkg-config" @@ -16,6 +16,10 @@ distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz" checksum=30e1fce5ee4bfebf7d7d746af467f96b0bc8521fcd0b50b8561fd5b56deb875d CFLAGS="-D_DEFAULT_SOURCE" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + build_options="opengl" desc_option_opengl="Enable OpenGL modes" From 9f170bd9d03bbdc3a033c7f30ef57b7faabe0339 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 14:46:27 -0700 Subject: [PATCH 84/97] xscreensaver: rebuild for libxcrypt --- srcpkgs/xscreensaver/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template index e2cdb7eb95e26..c1cff95a1e833 100644 --- a/srcpkgs/xscreensaver/template +++ b/srcpkgs/xscreensaver/template @@ -1,7 +1,7 @@ # Template file for 'xscreensaver' pkgname=xscreensaver version=6.08 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-pam --with-login-manager --includedir=${XBPS_CROSS_BASE}/include @@ -19,6 +19,10 @@ changelog="https://www.jwz.org/xscreensaver/changelog.html" distfiles="https://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz" checksum=5cf52ba525ceecf94b2f2bd63485ebdf318e12fcc0f2adad7d4c106d855e76a3 +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { mkdir -p /usr/share/X11/app-defaults } From 80040e70b524ac87dee7b2e7f5c7528dc8432fa9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 22:22:09 -0700 Subject: [PATCH 85/97] build-style/void-cross.sh: fix building for glibc 2.38 --- common/build-style/void-cross.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 2e8ebb52ceaf9..9193b7cf64bad 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -264,9 +264,10 @@ _void_cross_build_glibc() { CC="${tgt}-gcc" CXX="${tgt}-g++" CPP="${tgt}-cpp" LD="${tgt}-ld" \ AR="${tgt}-ar" AS="${tgt}-as" NM="${tgt}-nm" \ + OBJDUMP="${tgt}-objdump" OBJCOPY="${tgt}-objcopy" \ CFLAGS="-pipe ${cross_glibc_cflags}" \ CXXFLAGS="-pipe ${cross_glibc_cflags}" \ - CPPFLAGS="${cross_glibc_cflags}" \ + CPPFLAGS="" \ LDFLAGS="${cross_glibc_ldflags}" \ ../glibc-${ver}/configure \ --prefix=/usr \ From 5611b4e547f88daaea6ae0e86afd5f8dfe7f26f2 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 15:04:59 -0700 Subject: [PATCH 86/97] cross-vpkg-dummy: glibc does not provide libcrypt anymore --- srcpkgs/cross-vpkg-dummy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template index 9325168acb4cd..feaccd4dc265d 100644 --- a/srcpkgs/cross-vpkg-dummy/template +++ b/srcpkgs/cross-vpkg-dummy/template @@ -1,7 +1,7 @@ # Template file for 'cross-vpkg-dummy' pkgname=cross-vpkg-dummy version=0.39 -revision=5 +revision=6 build_style=meta depends="base-files>=0.126" short_desc="Dummy meta-pkg for cross building packages with xbps-src" @@ -75,7 +75,7 @@ else provides+=" glibc-9999_1 glibc-devel-9999_1" conflicts+=" glibc>=0" shlib_provides+=" libc.so.6 libm.so.6 librt.so.1 libpthread.so.0" - shlib_provides+=" libcrypt.so.1 libdl.so.2 libresolv.so.2" + shlib_provides+=" libdl.so.2 libresolv.so.2" shlib_provides+=" libanl.so.1 libnsl.so.1 libutil.so.1" shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86-64.so.2" shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1" From 4c0f27a1708c476c181566b4675654b56b2c6a09 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 87/97] cross-aarch64-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-aarch64-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index 6d65a56033177..690e27b8adc15 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-aarch64-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-aarch64-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--with-arch=armv8-a" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" @@ -19,12 +18,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From 829f84dbbf502a5bed7768291fd886c7617fdd57 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 88/97] cross-arm-linux-gnueabi: rebuild for glibc 2.38 --- srcpkgs/cross-arm-linux-gnueabi/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index c11560ff2a223..7cf232218eedb 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -1,12 +1,11 @@ # Template file for 'cross-arm-linux-gnueabi' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-arm-linux-gnueabi version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--with-arch=armv5te --with-float=soft --enable-autolink-libatomic" @@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From f73cdb7de27a8bc828b7391248549a8c2863e0c8 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 89/97] cross-arm-linux-gnueabihf: rebuild for glibc 2.38 --- srcpkgs/cross-arm-linux-gnueabihf/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 2c055324e8524..6cd9d50f7f459 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -1,12 +1,11 @@ # Template file for 'cross-arm-linux-gnueabihf' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 +_glibc_version=2.38 _linux_version=5.10.4 -_glibc_patchver="72-g0f90d6204d" pkgname=cross-arm-linux-gnueabihf version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard --enable-autolink-libatomic" @@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From 2e75ab689b4baef483d7ab06791260710ca9d7b4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 90/97] cross-armv7l-linux-gnueabihf: rebuild for glibc 2.38 --- srcpkgs/cross-armv7l-linux-gnueabihf/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index 1bdaf59cf7421..e50363fcb4f75 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,12 +1,11 @@ # Template file for 'cross-armv7l-linux-gnueabihf' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-armv7l-linux-gnueabihf version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" @@ -19,12 +18,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From c14f7b6de8eb15c22eefd4d5ae59d9436fd19f06 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 91/97] cross-i686-pc-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-i686-pc-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 869501426cd29..c6b5319ac5d78 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-i686-pc-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-i686-pc-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel @@ -18,12 +17,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From 537efdf6d06924c887f6f8a5060b2b933ff40445 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 92/97] cross-powerpc-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-powerpc-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index 035dc50571a65..31578760f17e5 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-powerpc-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-powerpc-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --enable-autolink-libatomic" @@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From 514221c7dab6c2b912451fdd71c0dbccb7b20404 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:40 -0700 Subject: [PATCH 93/97] cross-powerpc64-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-powerpc64-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template index 0719663f235a0..cdbd1e26f725d 100644 --- a/srcpkgs/cross-powerpc64-linux-gnu/template +++ b/srcpkgs/cross-powerpc64-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-powerpc64-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-powerpc64-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2 --enable-targets=powerpc-linux --enable-autolink-libatomic" @@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From ff635853df32c0716c8b6b9a3179d45d337e67a6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:41 -0700 Subject: [PATCH 94/97] cross-powerpc64le-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-powerpc64le-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index 8e6967c4e2e1b..82dc196a247d5 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-powerpc64le-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-powerpc64le-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2 --enable-targets=powerpcle-linux --enable-autolink-libatomic" @@ -20,12 +19,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From c2594c39d27e59196012262458b9725a52469d17 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:41 -0700 Subject: [PATCH 95/97] cross-powerpcle-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-powerpcle-linux-gnu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template index 9e9d30b9faf98..7576278738d95 100644 --- a/srcpkgs/cross-powerpcle-linux-gnu/template +++ b/srcpkgs/cross-powerpcle-linux-gnu/template @@ -1,11 +1,11 @@ # Template file for 'cross-powerpcle-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-powerpcle-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross configure_args="--enable-secureplt --disable-vtable-verify --enable-autolink-libatomic" @@ -24,7 +24,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From 20709088bce6975ecc8ee5ca8d7721d75b001726 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:41 -0700 Subject: [PATCH 96/97] cross-riscv64-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-riscv64-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-riscv64-linux-gnu/template b/srcpkgs/cross-riscv64-linux-gnu/template index 2eb8a05eded18..5cd6da69c32e8 100644 --- a/srcpkgs/cross-riscv64-linux-gnu/template +++ b/srcpkgs/cross-riscv64-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-riscv64-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-riscv64-linux-gnu version=0.35 -revision=3 +revision=4 build_style=void-cross configure_args="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic --disable-multilib" hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" @@ -19,12 +18,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes From 15ba84630db1b3759a350495a2bd019c3e413872 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 30 Aug 2023 19:09:41 -0700 Subject: [PATCH 97/97] cross-x86_64-linux-gnu: rebuild for glibc 2.38 --- srcpkgs/cross-x86_64-linux-gnu/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template index becd902c84bf3..7eabe1625b23e 100644 --- a/srcpkgs/cross-x86_64-linux-gnu/template +++ b/srcpkgs/cross-x86_64-linux-gnu/template @@ -1,12 +1,11 @@ # Template file for 'cross-x86_64-linux-gnu' _binutils_version=2.39 _gcc_version=12.2.0 -_glibc_version=2.36 -_glibc_patchver="72-g0f90d6204d" +_glibc_version=2.38 _linux_version=5.10.4 pkgname=cross-x86_64-linux-gnu version=0.35 -revision=5 +revision=6 build_style=void-cross hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config" makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel @@ -18,12 +17,11 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz" distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz" -# distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" -distfiles+=" https://vasilek.cz/paste/glibc-${_glibc_version}-${_glibc_patchver}.tar.xz" +distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz" distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff - 656200722d5ba968b4888a2d2950719d72c86290fd0479f61897d25b7db2cb57 + fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes