From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [RFC] glibc: update to 2.38.
Date: Wed, 20 Sep 2023 07:25:56 +0200 [thread overview]
Message-ID: <20230920052556.A3-tsyZaRctTCRpwrYVDBdl-X1i_7qTDtz1Ky3rLAqs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45501@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2855 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages glibc
https://github.com/void-linux/void-packages/pull/45501
[RFC] glibc: update to 2.38.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
The following packages must be removed from the repo before merging this PR:
- [ ] php8.0-apache-8.0.29_1: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
- [ ] php8.0-embed-8.0.29_1: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
- [ ] burp-client-1.4.40_12: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
- [ ] user-manager-5.19.5_1: libcrypt.so.1 (https://repo-default.voidlinux.org/current)
[ci skip]
https://sourceware.org/glibc/wiki/Release/2.38
glibc 2.38 disables libcrypt by default with a recommendation for distros to switch to [libxcrypt](https://github.com/besser82/libxcrypt) (as they intend to remove it entirely).
libxcrypt can be built as either libcrypt.so.1 or libcrypt.so.2.
Debian and SUSE only build libcrypt.so.1.
Arch Linux and Fedora build libcrypt.so.2 along with a libxcrypt-compat package.
The rationale for that decision is explained here:
https://fedoraproject.org/wiki/Changes/FullyRemoveDeprecatedAndUnsafeFunctionsFromLibcrypt
https://fedoraproject.org/wiki/Changes/libcrypt_so_1_Let_encrypt_encrypt_r_setkey_setkey_r_and_fcrypt_return_ENOSYS_instead_of_performing_any_real_operation
My inclination is to build libcrypt.so.2 with a libxcrypt-compat package without enosys but I am open to handling it differently.
Keep in mind that packages compiled against libxcrypt's libcrypt.so.1 will not run with glibc's libcrypt.so.1 (but applications compiled with glibc's libcrypt.so.1 will run with libxcrypt's libcrypt.so.1).
You can get the packages using libcrypt using `xbps-query -Rs libcrypt.so -p shlib-requires`.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45501.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-45501.patch --]
[-- Type: text/x-diff, Size: 121632 bytes --]
From 923027f7aa66ee07c5954b8d93d1b224029622e9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 ----------------
srcpkgs/glibc/template | 16 ++---
3 files changed, 35 insertions(+), 93 deletions(-)
delete mode 100644 srcpkgs/glibc/patches/0001-Revert-Do-not-use-hash-style-both-for-building-glibc.patch
diff --git a/common/shlibs b/common/shlibs
index c9d59ef3b97ca..6630f42ae4cdb 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 <oreo6391@gmail.com>
-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/template b/srcpkgs/glibc/template
index 452b55c127624..20805fb52e816 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,15 +1,14 @@
# Template file for 'glibc'
pkgname=glibc
-version=2.36
+version=2.38
revision=1
-_patchver="72-g0f90d6204d"
bootstrap=yes
short_desc="GNU C library"
maintainer="Enno Boland <gottox@voidlinux.org>"
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 b9f56a166e87f0903c2b19f89eba1eeb11821070 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 | 106 ++++++++++++++++++++++++++++++++
srcpkgs/perl-bootstrap/update | 1 +
3 files changed, 108 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..8549cde82c83a
--- /dev/null
+++ b/srcpkgs/perl-bootstrap/template
@@ -0,0 +1,106 @@
+# Template file for 'perl-bootstrap'
+# This is needed to prevent build cycle between libxcrypt and perl
+pkgname=perl-bootstrap
+version=5.36.1
+revision=1
+_perl_cross_version=1.4.1
+build_style=gnu-configure
+hostmakedepends="less"
+makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
+depends="less"
+short_desc="Practical Extraction and Report Language"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+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="68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1
+ 3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca"
+repository=bootstrap
+conflicts="perl"
+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 0a6a8db7e689927b7a4d948edd05c242b1a40dbc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 22:50:18 -0700
Subject: [PATCH 03/97] New package: libxcrypt-4.4.36
---
common/shlibs | 2 ++
srcpkgs/libxcrypt-compat | 1 +
srcpkgs/libxcrypt-devel | 1 +
srcpkgs/libxcrypt/template | 72 ++++++++++++++++++++++++++++++++++++++
4 files changed, 76 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 6630f42ae4cdb..bf678f07cbf12 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -42,6 +42,8 @@ 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.1 libxcrypt-compat-4.4.36_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 <oreo639@gmail.com>"
+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 a6806eeeadf5f1368ee34ec1c1a369833f3575ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:32:37 -0700
Subject: [PATCH 04/97] musl: provides libxcrypt-devel
---
srcpkgs/musl/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 6c98fac0962e9..ab010939c47fe 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -52,6 +52,7 @@ musl-devel_package() {
depends="kernel-libc-headers ${sourcepkg}-${version}_${revision}"
replaces="libssp-devel<=12.2.0_1"
conflicts="libssp-devel<=12.2.0_1"
+ provides="libxcrypt-devel-0_1"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From b062ba9ab0564240c1b4ed34cacc35bbff9cbbec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:32:49 -0700
Subject: [PATCH 05/97] perl: rebuild with libxcrypt
---
srcpkgs/perl/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index d507855d3d1f6..3f466c79caa32 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,11 +1,11 @@
# Template file for 'perl'
pkgname=perl
version=5.36.1
-revision=1
+revision=2
_perl_cross_version=1.4.1
build_style=gnu-configure
hostmakedepends="less"
-makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
+makedepends="zlib-devel bzip2-devel gdbm-devel db-devel libxcrypt-devel"
depends="less"
checkdepends="iana-etc perl-AnyEvent perl-Test-Pod procps-ng"
short_desc="Practical Extraction and Report Language"
@@ -16,6 +16,7 @@ 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="68203665d8ece02988fc77dc92fccbb297a83a4bb4b8d07558442f978da54cc1
3e14bb4f28c83586c668c5f9f6b4e57b138b4ec2fae0271086e29d4e352670ca"
+conflicts="perl-bootstrap"
skip_extraction=perl-cross-${_perl_cross_version}.tar.gz
From fcb7090b46366874668391566747e1c36348d4c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:33:23 -0700
Subject: [PATCH 06/97] python: rebuild with libxcrypt
---
srcpkgs/python/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 21739fcd4ff53..dbd6dce5b8633 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,12 +4,12 @@
#
pkgname=python
version=2.7.18.7
-revision=4
+revision=5
_commit=937f6fc83dc2f7f7156f69c993bc017a26e4f5bd
pycompile_dirs="usr/lib/python2.7"
hostmakedepends="pkg-config"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
+ sqlite-devel bzip2-devel zlib-devel libxcrypt-devel"
depends="ca-certificates"
short_desc="Interpreted, interactive, object-oriented programming language"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 91a5ca4c695524c20dc115eb179fc1dc954671e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 23:42:25 -0700
Subject: [PATCH 07/97] python3: rebuild for libxcrypt
---
srcpkgs/python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index a0e146d0e218a..ed7314d569410 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,7 +4,7 @@
#
pkgname=python3
version=3.11.5
-revision=1
+revision=2
build_style="gnu-configure"
configure_args="--enable-shared --enable-ipv6 --enable-optimizations
--enable-loadable-sqlite-extensions --with-computed-gotos
@@ -13,7 +13,7 @@ configure_args="--enable-shared --enable-ipv6 --enable-optimizations
pycompile_dirs="usr/lib/python${version%.*}"
hostmakedepends="pkgconf"
makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
- expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
+ expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel libxcrypt-devel"
depends="ca-certificates"
checkdepends="$depends iana-etc"
short_desc="Python programming language (${version%.*} series)"
From 2ae6d8f0ab0b354bd17e49e5dacb1eb5120ad1f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 11:43:37 -0700
Subject: [PATCH 08/97] ruby: rebuild for libxcrypt
---
srcpkgs/ruby/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 30039707619dd..7ab92833cf028 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,14 +3,14 @@ _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"
make_build_args="all capi"
hostmakedepends="pkg-config bison groff"
makedepends="zlib-devel readline-devel libffi-devel openssl-devel
- gdbm-devel libyaml-devel pango-devel"
+ gdbm-devel libyaml-devel pango-devel libxcrypt-devel"
short_desc="Ruby programming language"
homepage="http://www.ruby-lang.org/en/"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 03ebddd009a13d308d78d10edd1d0b4343a79af3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 14:51:38 -0700
Subject: [PATCH 09/97] mariadb: rebuild for libxcrypt
---
srcpkgs/mariadb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index ccaca61fdc3e6..5eaace93a6204 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.22
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
@@ -19,7 +19,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
-DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system"
hostmakedepends="bison perl flex pkg-config"
makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
- pcre2-devel"
+ pcre2-devel libxcrypt-devel"
depends="perl"
checkdepends="perl"
short_desc="Fast SQL database server, drop-in replacement for MySQL"
From ab0fd226543d915169451551574421866ef92b2c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 10:03:37 -0700
Subject: [PATCH 10/97] apr-util: rebuild for libxcrypt
---
srcpkgs/apr-util/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index bc216965d6f63..32911dced6422 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
@@ -12,7 +12,7 @@ configure_args="
hostmakedepends="libtool apr-devel automake"
makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
- postgresql-libs-devel sqlite-devel"
+ postgresql-libs-devel sqlite-devel libxcrypt-devel"
short_desc="Apache Portable Runtime Utility Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 79fc0954d4c5f2bddb14ce96620a5d9cba721586 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:05:07 -0700
Subject: [PATCH 11/97] php8.1: rebuild for libxcrypt
---
srcpkgs/php8.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..9bb603b7d4e01 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,14 +1,14 @@
# 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
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
+ libffi-devel oniguruma-devel gd-devel libxcrypt-devel"
short_desc="HTML-embedded scripting language"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="PHP-3.01"
From 515043b4117980baa006e1970d30b68573abee00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:07:16 -0700
Subject: [PATCH 12/97] accountsservice: rebuild for libxcrypt
---
srcpkgs/accountsservice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index f298248158312..a957926a5a564 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,13 +1,13 @@
# 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
$(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
hostmakedepends="glib-devel pkg-config polkit gettext"
-makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
+makedepends="polkit-devel $(vopt_if elogind elogind-devel) libxcrypt-devel"
short_desc="D-Bus interfaces for querying and manipulating user account information"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From e1125642bbddb5df730554504edc6f496a2e7a9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:54:09 -0700
Subject: [PATCH 13/97] pam: rebuild for libxcrypt
---
srcpkgs/pam/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 87a375699e7b3..f841abaeceb7e 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,14 +1,14 @@
# 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
--disable-nis --disable-audit --disable-selinux --enable-lastlog
--disable-regenerate-docu BUILD_CFLAGS=-Os BUILD_LDFLAGS="
hostmakedepends="gettext-devel pkg-config"
-makedepends="libfl-devel db-devel"
+makedepends="libfl-devel db-devel libxcrypt-devel"
# version of pam-base that doesn't include removed modules
depends="pam-base>=0.4_1"
checkdepends="pam-base"
From 3cd8ef4ee351dae56b4d0f097e65c945ae09e8dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 15:54:35 -0700
Subject: [PATCH 14/97] libpam-policycache: rebuild for libxcrypt
---
srcpkgs/libpam-policycache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template
index 6777b0856dd67..e454b0d564b07 100644
--- a/srcpkgs/libpam-policycache/template
+++ b/srcpkgs/libpam-policycache/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="glib-devel libscrypt-devel pam-devel libxcrypt-devel"
short_desc="Password caching module with advanced policies for PAM"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
From f49eb51b84111c39333ee6fa8eca9cf30a5f414b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:21:28 -0700
Subject: [PATCH 15/97] openssh: rebuild for libxcrypt
---
srcpkgs/openssh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 3739309a4e96e..753deec293cce 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.4p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
$(vopt_if fido2 --with-security-key-builtin)
LD=$CC ac_cv_header_sys_cdefs_h=false"
hostmakedepends="automake"
-makedepends="libedit-devel pam-devel zlib-devel
+makedepends="libedit-devel pam-devel zlib-devel libxcrypt-devel
$(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
$(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
@@ -44,7 +44,7 @@ if [ "$build_option_ldns" -a -z "$build_option_ssl" ]; then
broken="option 'ldns' requires option 'ssl'"
fi
-CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-deprecated-declarations"
+CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-use-after-free"
case $XBPS_TARGET_MACHINE in
i686-musl)
From 72fb04d0040c802eacaffeba57ae3db991fa2a4b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:24:55 -0700
Subject: [PATCH 16/97] util-linux: rebuild for libxcrypt
---
srcpkgs/util-linux/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 99819d02068b3..0e197014eceea 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
@@ -10,7 +10,7 @@ configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-
--with-udev --without-python --enable-write"
hostmakedepends="gettext pkg-config"
makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel
- eudev-libudev-devel"
+ eudev-libudev-devel libxcrypt-devel"
depends="libfdisk>=${version}_1<=${version}_9999
libblkid>=${version}_1<=${version}_9999
libmount>=${version}_1<=${version}_9999
From 28367a9194d11798cb8c2994dca3b44ec9f12c1c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:26:21 -0700
Subject: [PATCH 17/97] shadow: rebuild for libxcrypt
---
srcpkgs/shadow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index c59d92bfeb54a..6f41bc34c4858 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
@@ -9,7 +9,7 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/bin
--disable-nls --enable-subordinate-ids --disable-account-tools-setuid
--with-group-name-max-length=32"
hostmakedepends="libtool"
-makedepends="acl-devel pam-devel"
+makedepends="acl-devel pam-devel libxcrypt-devel"
depends="pam"
short_desc="Shadow password file utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 752f95859ce5b69cd465c73b1afc81d3eab9cb14 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:28:06 -0700
Subject: [PATCH 18/97] cups: rebuild for libxcrypt
---
srcpkgs/cups/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 584a12d0ebf0d..6431fe557530a 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,13 +1,14 @@
# Template file for 'cups'
pkgname=cups
version=2.4.6
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
$(vopt_if avahi avahi-libs-devel)"
makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
- zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)"
+ zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)
+ libxcrypt-devel"
depends="xdg-utils"
short_desc="Common Unix Printing System"
maintainer="Orphaned <orphan@voidlinux.org>"
From 986112c4450fd75ce6a487ff055a8eb5aaa14a23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:36:44 -0700
Subject: [PATCH 19/97] apache: rebuild for libxcrypt
---
srcpkgs/apache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index ad9b3e23a722c..ef4eed09cff2d 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
@@ -25,7 +25,7 @@ conf_files="
/etc/${pkgname}/magic
/etc/${pkgname}/mime.types"
hostmakedepends="pkg-config perl apr-util-devel"
-makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel
+makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel libxcrypt-devel
openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
depends="apache-htpasswd"
short_desc="Apache http server"
From 835f2a743c829f722e5ebd7437c5fd62e634218e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:51:04 -0700
Subject: [PATCH 20/97] plasma-workspace: rebuild for libxcrypt
---
srcpkgs/plasma-workspace/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 4b7bc217f7b83..d86a044b3edea 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.7
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -14,7 +14,7 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d
kcmutils-devel kidletime-devel kdelibs4support-devel libksysguard-devel
baloo5-devel ktexteditor-devel kwin-devel libxcb-devel libXtst-devel
libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel
- libXft-devel libkscreen-devel kactivities5-stats-devel
+ libXft-devel libkscreen-devel kactivities5-stats-devel libxcrypt-devel
$(vopt_if pipewire kpipewire-devel)"
depends="kactivitymanagerd kwin iso-codes milou plasma-integration
kquickcharts qt5-wayland xorg-server-xwayland"
From d6cf71bbdd6b71d63df219a1d84cfa572f26086c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:53:05 -0700
Subject: [PATCH 21/97] openldap: rebuild for libxcrypt
---
srcpkgs/openldap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index d10daef834a75..85da37e89fbd4 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
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
--enable-overlays=yes --enable-meta=yes
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff"
-makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel libxcrypt-devel"
depends="openldap-tools>=${version}_${revision}"
conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf /etc/openldap/slapd.ldif"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
From 72e8b8e2e3db68c08a31c9144d821013cb3d66d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 16:55:55 -0700
Subject: [PATCH 22/97] guile: rebuild for libxcrypt
---
srcpkgs/guile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template
index f0f917b1c4eea..115b2a07d4b7f 100644
--- a/srcpkgs/guile/template
+++ b/srcpkgs/guile/template
@@ -1,12 +1,12 @@
# 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"
makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
- libunistring-devel readline-devel"
+ libunistring-devel readline-devel libxcrypt-devel"
short_desc="Portable, embeddable Scheme implementation written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
From 26416e464e02bcb455b7a9f46a410690a421225c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:03:17 -0700
Subject: [PATCH 23/97] libfilezilla: rebuild for libxcrypt
---
srcpkgs/libfilezilla/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index a0685c505b46d..b80cba51f996d 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -2,11 +2,11 @@
# filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
pkgname=libfilezilla
version=0.44.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="gettext pkg-config"
-makedepends="nettle-devel gnutls-devel"
+makedepends="nettle-devel gnutls-devel libxcrypt-devel"
short_desc="Small and modern C++ library, which offers some basic functionalities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From bab74e634957eff50aed3fd9bc4a965e754557ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:04:32 -0700
Subject: [PATCH 24/97] x11vnc: rebuild for libxcrypt
---
srcpkgs/x11vnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 723f2e8a6e65c..2a2617429f5d5 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
# 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
- libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
+ libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel libxcrypt-devel"
short_desc="VNC server for real X displays"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later, x11vnc-openssl-exception"
From 89ba3f18ce0e0480b3d1e0c8c15c401164ed5225 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:05:16 -0700
Subject: [PATCH 25/97] tcsh: rebuild for libxcrypt
---
srcpkgs/tcsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index d736217b7e0b5..4a66d24fe9cf8 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="ncurses-devel automake libxcrypt-devel"
short_desc="Enhanced but compatible version of the Berkeley C shell"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From ac36ca01c9058669affe428e6ebe57d89ba5cb23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:49:09 -0700
Subject: [PATCH 26/97] xdm: rebuild for libxcrypt
---
srcpkgs/xdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 282b8fe7a5401..09f52e3c0eae9 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
@@ -15,7 +15,7 @@ conf_files="/etc/pam.d/xdm
/etc/X11/xdm/Xresources
/etc/X11/xdm/Xservers"
hostmakedepends="pkg-config"
-makedepends="pam-devel libXaw-devel libXft-devel"
+makedepends="pam-devel libXaw-devel libXft-devel libxcrypt-devel"
depends="sessreg xconsole xsm"
short_desc="X Display Manager"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 8e83b080ae5e884fbbd82e9440d0002b54bb3c14 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 8 Aug 2023 17:49:36 -0700
Subject: [PATCH 27/97] lua54-luaposix: rebuild for libxcrypt
---
srcpkgs/lua54-luaposix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lua54-luaposix/template b/srcpkgs/lua54-luaposix/template
index 04f5fb8477987..375887cdfe28c 100644
--- a/srcpkgs/lua54-luaposix/template
+++ b/srcpkgs/lua54-luaposix/template
@@ -1,9 +1,9 @@
# 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"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel libxcrypt-devel"
depends="lua54 lua54-stdlib-normalize"
_desc="POSIX library for Lua programming language"
short_desc="${_desc} (5.4.x)"
From c6de484bb66254026c06fd8367ae8e031decd180 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:01:47 -0700
Subject: [PATCH 28/97] FreeRADIUS: rebuild for libxcrypt
---
srcpkgs/FreeRADIUS/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 90a4c662bc994..e3102866b2521 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
# 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"
+ libmariadbclient-devel postgresql-libs-devel json-c-devel libxcrypt-devel"
short_desc="World's most popular RADIUS Server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From 27a3cd99dac501c336ac09b04e6e765a185fc7f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:03:50 -0700
Subject: [PATCH 29/97] Gauche: rebuild for libxcrypt
---
srcpkgs/Gauche/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template
index fd087256ff7a8..54bdfbd98d187 100644
--- a/srcpkgs/Gauche/template
+++ b/srcpkgs/Gauche/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="libticonv-devel libatomic_ops-devel libxcrypt-devel"
checkdepends="iana-etc"
short_desc="Practical Scheme R7RS implementation"
maintainer="rc-05 <rc23@email.it>"
From 7ac625075e75fa5623a7b982023cc48d7cc49a1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:05:00 -0700
Subject: [PATCH 30/97] alpine: rebuild for libxcrypt
---
srcpkgs/alpine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index ed46e3bf5b2e2..946d114ed69f1 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
@@ -10,7 +10,7 @@ configure_args="--with-passfile=.pine-passfile --without-tcl --disable-shared
--with-system-pinerc=/etc/${pkgname}.d/pine.conf
--with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed"
hostmakedepends="hunspell"
-makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel"
+makedepends="gettext-devel libldap-devel mit-krb5-devel ncurses-devel libxcrypt-devel"
short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0, BSD-4-Clause"
From a87d937faa88e87da5780d0ad2196422f8accf1a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:08:29 -0700
Subject: [PATCH 31/97] anjuta: rebuild for libxcrypt
---
srcpkgs/anjuta/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index 8a43a32673951..8b2168109acce 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
@@ -9,7 +9,7 @@ configure_args="--disable-compile-warnings --disable-schemas-compile
SVN_INCLUDES=$XBPS_CROSS_BASE/usr/include SVN_LIBS=$XBPS_CROSS_BASE/usr/lib
$(vopt_enable gir introspection)"
hostmakedepends="pkg-config intltool flex itstool python3 autogen glib-devel
- libtool automake gettext-devel yelp-tools gtk-doc
+ libtool automake gettext-devel yelp-tools gtk-doc libxcrypt-devel
vala-devel $(vopt_if gir gobject-introspection)"
makedepends="gtksourceview-devel libxml2-devel vte3-devel gjs-devel
libxslt-devel glade3-devel graphviz-devel vala-devel
From 2d6c81cae7022e716da0498d14a871975cfb2455 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:14:02 -0700
Subject: [PATCH 32/97] bacula-common: rebuild for libxcrypt
---
srcpkgs/bacula-common/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index b3064e54bd4ea..0c7e4db37d974 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,13 +1,13 @@
# 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
--with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- openssl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel libxcrypt-devel"
short_desc="Bacula - A Network Backup Tool (common libs)"
maintainer="Matthias Fulz <mfulz@olznet.de>"
license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"
From 24ade76987f612f4dbce103332079adcb552aefd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:15:27 -0700
Subject: [PATCH 33/97] bitchx: rebuild for libxcrypt
---
srcpkgs/bftpd/template | 4 ++--
srcpkgs/bitchx/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template
index 225438a341ac1..cb69616f4b847 100644
--- a/srcpkgs/bftpd/template
+++ b/srcpkgs/bftpd/template
@@ -1,10 +1,10 @@
# Template file for 'bftpd'
pkgname=bftpd
version=6.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-libz"
-makedepends="zlib-devel"
+makedepends="zlib-devel libxcrypt-devel"
short_desc="Simple FTP server"
maintainer="Norbert Vegh <vegh@norvegh.com>"
license="GPL-2.0-only"
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 1172d810d44ea..6d819792fcd66 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="openssl-devel ncurses-devel libxcrypt-devel"
short_desc="Simple IRC client (Internet Relay Chat)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 19a90cd6de5e016f19128dfe0e6ee85df427d547 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index 11678ac289ad2..45e5a78ddf366 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _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"
hostmakedepends="automake libtool pkg-config"
makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
- yajl-devel zlib-devel"
+ yajl-devel zlib-devel libxcrypt-devel"
# server depends on client (same binary)
depends="burp2-client"
checkdepends="check-devel"
From 847b8b0164a24612cc71a45a08454f50ae9049f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:19:16 -0700
Subject: [PATCH 35/97] busybox: rebuild for libxcrypt
---
srcpkgs/busybox/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index f647e3066b3ba..70fc70bb50c5b 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,8 +1,9 @@
# Template file for 'busybox'
pkgname=busybox
version=1.34.1
-revision=4
+revision=5
hostmakedepends="perl"
+makedepends="libxcrypt-devel"
checkdepends="tar which zip"
short_desc="Swiss Army Knife of Embedded Linux"
maintainer="Cameron Nemo <cam@nohom.org>"
From d36866b82904957cb7b0ebef72e541c559ddf028 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:20:45 -0700
Subject: [PATCH 36/97] ccrypt: rebuild for libxcrypt
---
srcpkgs/ccrypt/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ccrypt/template b/srcpkgs/ccrypt/template
index 94208eb831cd6..994dbb6c2b612 100644
--- a/srcpkgs/ccrypt/template
+++ b/srcpkgs/ccrypt/template
@@ -1,8 +1,9 @@
# Template file for 'ccrypt'
pkgname=ccrypt
version=1.11
-revision=1
+revision=2
build_style=gnu-configure
+makedepends="libxcrypt-devel"
short_desc="Symmetric encryption utility using Rijndael cipher"
maintainer="Evan Deaubl <evan@deaubl.name>"
license="GPL-2.0-or-later"
From 6282e3b49ae125286d7f290b1796db08772e4c4d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:22:05 -0700
Subject: [PATCH 37/97] clisp: rebuild for libxcrypt
---
srcpkgs/clisp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index af9546f7faa77..7475bd878ce66 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,12 +1,13 @@
# 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)"
hostmakedepends="ffcall"
-makedepends="libsigsegv-devel $(vopt_if readline readline-devel)"
+makedepends="libsigsegv-devel libxcrypt-devel
+ $(vopt_if readline readline-devel)"
short_desc="ANSI Common Lisp Interpreter, Compiler and Debugger"
maintainer="Martin Riese <grauehaare@gmx.de>"
license="GPL-2.0-only"
From bc8addd96bbabb9d71525aa5b5b88abcf3a54d92 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:23:06 -0700
Subject: [PATCH 38/97] collectd: rebuild for libxcrypt
---
srcpkgs/collectd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 21f7be22c3d02..41803a9418f41 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
# Template file for 'collectd'
pkgname=collectd
version=5.12.0
-revision=9
+revision=10
build_style=gnu-configure
configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable notify notify_desktop) --with-libiptc --enable-virt
@@ -13,7 +13,7 @@ conf_files="/etc/collectd.conf"
hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
- libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
+ libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel libxcrypt-devel
$(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
$(vopt_if prometheus 'protobuf-c-devel libmicrohttpd-devel')"
short_desc="Daemon which collects system performance statistics periodically"
From fd7adb386ee573d44a1f0d05fb62bfa326edbd6d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:24:42 -0700
Subject: [PATCH 39/97] cvm: rebuild for libxcrypt
---
srcpkgs/cvm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template
index e4663ecaf43ef..4f7899af5e06b 100644
--- a/srcpkgs/cvm/template
+++ b/srcpkgs/cvm/template
@@ -1,10 +1,10 @@
# Template file for 'cvm'
pkgname=cvm
version=0.97
-revision=3
+revision=4
build_style=gnu-makefile
hostmakedepends="libtool"
-makedepends="bglibs-devel"
+makedepends="bglibs-devel libxcrypt-devel"
short_desc="Credential Validation Modules"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From e49465bb1c042770ab73da33d5c2d336c15a9c8a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:27:28 -0700
Subject: [PATCH 40/97] cvs: rebuild for libxcrypt
---
srcpkgs/cvs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index c37384b543024..190a5d7776af2 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -1,12 +1,12 @@
# 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
hostmakedepends="nvi openssh"
-makedepends="mit-krb5-devel openssh"
+makedepends="mit-krb5-devel openssh libxcrypt-devel"
depends="openssh>=6.1p1"
short_desc="Concurrent Versions System"
maintainer="Orphaned <orphan@voidlinux.org>"
From ffe97cefc0a78c0905b9d6deb01a8f30963754d7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:27:54 -0700
Subject: [PATCH 41/97] cyrus-sasl: rebuild for libxcrypt
---
srcpkgs/cyrus-sasl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index e6c0ee16532ca..17e5f5475551d 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
@@ -16,7 +16,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
hostmakedepends="automake libtool groff pkg-config"
makedepends="libsasl-devel openssl-devel db-devel libldap-devel
mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
- libmariadbclient-devel"
+ libmariadbclient-devel libxcrypt-devel"
depends="libsasl>=${version}"
short_desc="Cyrus SASL - auth daemon and administration tools"
maintainer="Orphaned <orphan@voidlinux.org>"
From f98f8576b1438e649e429ea4e4ae21d1e4f5ad2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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..80ee82ee2aec0 100644
--- a/srcpkgs/dante/template
+++ b/srcpkgs/dante/template
@@ -1,9 +1,10 @@
# Template file for 'dante'
pkgname=dante
version=1.4.2
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="tar automake libtool"
+makedepends="libxcrypt-devel"
short_desc="SOCKS server and client"
maintainer="shtayerc <david.murko@mailbox.org>"
license="MIT-CMU"
From 7b12f6f6325ba3897b051095681289fa1e2ee86a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:30:07 -0700
Subject: [PATCH 43/97] dovecot: rebuild for libxcrypt
---
srcpkgs/dovecot/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 0b8f470c1723a..71aa82f21adc7 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
@@ -13,7 +13,7 @@ hostmakedepends="pkg-config perl"
makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
- libsodium-devel"
+ libsodium-devel libxcrypt-devel"
short_desc="IMAP and POP3 server written with security primarily in mind"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
From 99d9487a230c016ea77cdc89a7943cbeb0882c3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:31:06 -0700
Subject: [PATCH 44/97] dropbear: rebuild for libxcrypt
---
srcpkgs/dropbear/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 5a8f80c6c7e50..4cc20d8224e07 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,10 +1,11 @@
# 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"
+makedepends="zlib-devel libtommath-devel libtomcrypt-devel
+ libxcrypt-devel"
checkdepends="python3-pytest python3-parsing python3-psutil openssh"
short_desc="Small SSH server and client"
maintainer="Orphaned <orphan@voidlinux.org>"
From e5513a9e59397875f69e4077aaf424b7e35a3f87 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:34:41 -0700
Subject: [PATCH 45/97] fcron: rebuild for libxcrypt
---
srcpkgs/fcron/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template
index d3f8567f89274..5e20abe0c140b 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
@@ -23,7 +23,7 @@ make_dirs="
/etc/cron.monthly 0755 root root
/etc/cron.weekly 0755 root root"
hostmakedepends="autoconf perl"
-makedepends="pam-devel readline-devel"
+makedepends="pam-devel readline-devel libxcrypt-devel"
depends="run-parts"
short_desc="Feature-rich cron implementation"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 58edcd1a9b34eafe6d85fb84ded07102345100aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:34:52 -0700
Subject: [PATCH 46/97] frr: rebuild for libxcrypt
---
srcpkgs/frr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template
index b8e41646452b6..55e5e48b27920 100644
--- a/srcpkgs/frr/template
+++ b/srcpkgs/frr/template
@@ -1,7 +1,7 @@
# Template file for 'frr'
pkgname=frr
version=7.5
-revision=4
+revision=5
build_style=gnu-configure
# chroot-texinfo is not able to build frr's docs
configure_args="--disable-doc
@@ -14,7 +14,7 @@ make_dirs="/var/log/frr 0700 _frr _frr"
hostmakedepends="pkg-config flex bison autoconf automake libtool
python3 python3-Sphinx python3-devel libyang-tools"
makedepends="pcre-devel libcap-devel json-c-devel pam-devel c-ares-devel
- readline-devel python3-devel libyang-devel"
+ readline-devel python3-devel libyang-devel libxcrypt-devel"
checkdepends="python3-pytest"
short_desc="IP routing protocol suite"
maintainer="Cameron Nemo <cam@nohom.org>"
From f225e604915e2a912b4eab5e995fcd6010052ba6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:35:09 -0700
Subject: [PATCH 47/97] gatling: rebuild for libxcrypt
---
srcpkgs/gatling/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 13ae68e98b1c5..b59917c60251e 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="libowfat openssl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel libxcrypt-devel"
short_desc="High performance web server"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
From 956df1367f5585bbd8bc754d2f8497a6223c6b6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:37:15 -0700
Subject: [PATCH 48/97] haproxy: rebuild for libxcrypt
---
srcpkgs/haproxy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 8ff6d96d672b4..07dceb2de35dd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
# Template file for 'haproxy'
pkgname=haproxy
version=2.6.14
-revision=2
+revision=3
build_style=gnu-makefile
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
hostmakedepends="lua53-devel"
-makedepends="openssl-devel lua53-devel pcre2-devel"
+makedepends="openssl-devel lua53-devel pcre2-devel libxcrypt-devel"
checkdepends="curl varnish"
short_desc="Reliable, high performance TCP/HTTP load balancer"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
From dd1de84c75a1f1d5e4c3c9c829a164a7841bc147 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:37:29 -0700
Subject: [PATCH 49/97] hiawatha: rebuild for libxcrypt
---
srcpkgs/hiawatha/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 9c2500430dcb8..d4839142392fa 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,13 +1,13 @@
# 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
-DUSE_SYSTEM_MBEDTLS=ON -DUSE_SYSTEM_NGHTTP2=ON
-DCMAKE_INSTALL_SYSCONFDIR=/etc"
-makedepends="libxslt-devel mbedtls-devel nghttp2-devel"
+makedepends="libxslt-devel mbedtls-devel nghttp2-devel libxcrypt-devel"
short_desc="Advanced and secure webserver for Unix"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 85cd2211231c7264edf512562fb7a088e7ee4ece Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:38:34 -0700
Subject: [PATCH 50/97] inetutils: rebuild for libxcrypt
---
srcpkgs/inetutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index c45de47f30e39..685a44e4d732d 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="pam-devel readline-devel libxcrypt-devel"
checkdepends="iana-etc net-tools"
short_desc="GNU network utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
From 131b9ccbcdc1b6d1a833cee70de3bc9ba185f205 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:39:30 -0700
Subject: [PATCH 51/97] john: rebuild for libxcrypt
---
srcpkgs/john/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index b40b2250f1d19..929c0615ed80c 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,12 +1,13 @@
# Template file for 'john'
pkgname=john
version=1.9.0
-revision=6
+revision=7
_jumbover=1
build_wrksrc="src"
build_style=gnu-configure
configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel
+ zlib-devel libxcrypt-devel"
short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
maintainer="Piraty <mail@piraty.dev>"
license="custom:GPL-2.0-or-later with OpenSSL-exception"
From c8ad6333ba54624581487f60d4424edeba2f96dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:40:32 -0700
Subject: [PATCH 52/97] ldapvi: rebuild for libxcrypt
---
srcpkgs/ldapvi/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 14a5d12044dd5..95317d9d6bccf 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,11 +1,12 @@
# Template file for 'ldapvi'
pkgname=ldapvi
version=1.7
-revision=13
+revision=14
build_style=gnu-configure
configure_args="--with-sha"
hostmakedepends="pkg-config"
-makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel glib-devel"
+makedepends="ncurses-devel readline-devel libsasl-devel popt-devel libldap-devel
+ glib-devel libxcrypt-devel"
short_desc="Interactive LDAP client for Unix terminals"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From c5e64090643420c3575db511b450458517422bf0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:42:41 -0700
Subject: [PATCH 53/97] Ice: rebuild for libxcrypt
---
srcpkgs/Ice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 13163d9035d78..52d69795e5bfa 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,13 +1,13 @@
# 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"
make_install_args="LANGUAGES=cpp lib-suffix="
makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
- openssl-devel lmdb-devel editline-devel"
+ openssl-devel lmdb-devel editline-devel libxcrypt-devel"
short_desc="Internet Communications Engine (Ice)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, custom:ICE"
From 1ac03937882859617230a0d9891aa920caaa2db7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:43:39 -0700
Subject: [PATCH 54/97] libcli: rebuild for libxcrypt
---
srcpkgs/libcli/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libcli/template b/srcpkgs/libcli/template
index 0d6b769fd3b5c..42ef3a3d76894 100644
--- a/srcpkgs/libcli/template
+++ b/srcpkgs/libcli/template
@@ -2,8 +2,9 @@
pkgname=libcli
version=1.9.8.4
_distver="${version%.*}-${version##*.}"
-revision=1
+revision=2
build_style=gnu-makefile
+makedepends="libxcrypt-devel"
short_desc="Library for cisco style telnet interfaces"
maintainer="Robert Lowry <bobertlo@gmail.com>"
license="GPL-2.0-or-later"
From eecaba767dcf3f6315074c85caf0dd2a77b38807 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 13:46:38 -0700
Subject: [PATCH 55/97] lighttpd: rebuild for libxcrypt
---
srcpkgs/lighttpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 07875c1099eca..64e3a24e786c9 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
@@ -12,7 +12,7 @@ configure_args="-Dwith_brotli=disabled -Dwith_bzip=disabled
-Dwith_xattr=true -Dwith_zlib=enabled -Dwith_zstd=disabled -Dwith_dbi=disabled
-Dmoduledir=lib/lighttpd/modules"
hostmakedepends="pkg-config"
-makedepends="
+makedepends="libxcrypt-devel
libxml2-devel lua53-devel mit-krb5-devel pcre2-devel sqlite-devel"
checkdepends="perl"
short_desc="Secure, fast, compliant and very flexible web-server"
From 842961f3522b6d425fae38921100d11f55bfd059 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:02:42 -0700
Subject: [PATCH 56/97] whois: rebuild for libxcrypt
---
srcpkgs/whois/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 7ca891b9b7b27..dfaba201c5016 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,13 +1,13 @@
# Template file for 'whois'
pkgname=whois
version=5.5.18
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
make_install_args="BASEDIR=\${DESTDIR}"
make_install_target="install-whois"
hostmakedepends="perl pkg-config gettext"
-makedepends="libidn2-devel"
+makedepends="libidn2-devel libxcrypt-devel"
short_desc="Improved whois client"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From 9e216a8c190255778a7af4784fd6e78bd2e37b16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:04:19 -0700
Subject: [PATCH 57/97] mokutil: rebuild for libxcrypt
---
srcpkgs/mokutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
index db4a9c7d93c70..f7366a3a637d7 100644
--- a/srcpkgs/mokutil/template
+++ b/srcpkgs/mokutil/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="keyutils-devel libefivar-devel openssl-devel libxcrypt-devel"
short_desc="Utility to manipulate machine owner keys"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
From 6a86b35729c8e403b05c99ea68ef3cf6c23aac93 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:04:34 -0700
Subject: [PATCH 58/97] monit: rebuild for libxcrypt
---
srcpkgs/monit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 02cecde59bb8a..3ea4396505bc3 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
@@ -9,7 +9,7 @@ configure_args="
libmonit_cv_vsnprintf_c99_conformant=yes"
conf_files="/etc/monitrc"
hostmakedepends="automake libtool perl"
-makedepends="pam-devel openssl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel libxcrypt-devel"
short_desc="Utility for monitoring, processes, files, directories and devices"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="AGPL-3.0-only"
From ad3cfba1296a5392c3a13e6fba09824c664dc937 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:07:01 -0700
Subject: [PATCH 59/97] open-vm-tools: rebuild for libxcrypt
---
srcpkgs/open-vm-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index cd507b729bf6b..6fe30b815987b 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=1
+revision=2
archs="x86_64* i686* aarch64*"
build_wrksrc="open-vm-tools"
build_style=gnu-configure
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
$(vopt_with x11 x) $(vopt_with pam)"
hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
- libxerces-c-devel $(vopt_if pam 'pam-devel')
+ libxerces-c-devel libxcrypt-devel $(vopt_if pam 'pam-devel')
$(vopt_if x11 'gdk-pixbuf-xlib-devel gtkmm-devel libXtst-devel xmlsec1-devel')"
short_desc="Open source implementation of VMware Tools"
maintainer="Piraty <mail@piraty.dev>"
From 664c76335fbed62e545e212b790465d3d98b6299 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:08:11 -0700
Subject: [PATCH 60/97] nginx: rebuild for libxcrypt
---
srcpkgs/nginx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index cd013e729ebb8..d175ec21cc863 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=2
+revision=3
_tests_commit=36a4563f7f00
_njs_version=0.7.12
create_wrksrc=yes
@@ -53,7 +53,7 @@ configure_args="--prefix=${_cfgdir}
--with-threads
--add-dynamic-module=../njs-${_njs_version}/nginx"
hostmakedepends="geoip geoip-devel openssl-devel pcre2-devel perl libxslt-devel
- which"
+ which libxcrypt-devel"
makedepends="${hostmakedepends}"
checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which uwsgi uwsgi-python3"
short_desc="High performance web and reverse proxy server"
From 9322c16d68847d41acf7eec4d86262f6ca42711a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:08:29 -0700
Subject: [PATCH 61/97] opensmtpd: rebuild for libxcrypt
---
srcpkgs/opensmtpd/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 7dd513a118353..5906afad90b8a 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
# Template file for 'opensmtpd'
pkgname=opensmtpd
version=7.3.0p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
--with-path-socket=/run --with-path-pidfile=/run
@@ -14,7 +14,8 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
ac_cv_func_strlcat=no
ac_cv_func_strlcpy=no"
hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel
+ libxcrypt-devel"
depends="ca-certificates"
conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
short_desc="Free implementation of the server-side SMTP protocol"
From 2624a12944bd0dbd515ad75368113b657ef126d0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:13:42 -0700
Subject: [PATCH 62/97] otpw: rebuild for libxcrypt
---
srcpkgs/otpw/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/otpw/template b/srcpkgs/otpw/template
index 03c9c86d6a198..c42ed75a6f89a 100644
--- a/srcpkgs/otpw/template
+++ b/srcpkgs/otpw/template
@@ -1,9 +1,9 @@
# Template file for 'otpw'
pkgname=otpw
version=1.5
-revision=5
+revision=6
conf_files="/etc/pam.d/ssh-otpw"
-makedepends="pam-devel"
+makedepends="pam-devel libxcrypt-devel"
short_desc="A one-time password login package"
maintainer="Duncan Overbruck <mail@duncano.de>"
license="GPL-3"
From 52aaf54639e793b402a05196f41707682a9e6c8e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:15:19 -0700
Subject: [PATCH 63/97] parrot: rebuild for libxcrypt
---
srcpkgs/parrot/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/parrot/template b/srcpkgs/parrot/template
index ec36cbd2afdb4..aebad8d8eac77 100644
--- a/srcpkgs/parrot/template
+++ b/srcpkgs/parrot/template
@@ -1,16 +1,17 @@
-# 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"
+makedepends="libxcrypt-devel"
short_desc="Virtual machine designed for dynamic languages"
maintainer="pancake <pancake@nopcode.org>"
+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
From 796d7c732341d5d641dc7b986cf164a2ae7c5470 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:16:40 -0700
Subject: [PATCH 64/97] passwdqc: rebuild for libxcrypt
---
srcpkgs/passwdqc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index 180af752b570b..005ebd798c8eb 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,11 +1,11 @@
# 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"
-makedepends="pam-devel"
+makedepends="pam-devel libxcrypt-devel"
short_desc="Password strength checking and policy enforcement toolset"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause,0BSD"
From 594fd08b12389f9c5c7c0c4fc2a3c4c971666396 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:17:40 -0700
Subject: [PATCH 65/97] pounce: rebuild for libxcrypt
---
srcpkgs/pounce/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 1e14ef5b8431a..54794b88b2fed 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,12 +1,12 @@
# 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"
hostmakedepends="pkg-config"
-makedepends="libtls-devel libcurl-devel sqlite-devel"
+makedepends="libtls-devel libcurl-devel sqlite-devel libxcrypt-devel"
depends="openssl"
short_desc="Multi-client, TLS-only IRC bouncer"
maintainer="Orphaned <orphan@voidlinux.org>"
From b48bdca2369db42dcae2b21bd38548fda669caff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:18:52 -0700
Subject: [PATCH 66/97] ppp: rebuild for libxcrypt
---
srcpkgs/ppp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 7368879f494fc..76fa7dc7d6b66 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
# When update this package
pkgname=ppp
version=2.4.9
-revision=3
-makedepends="libpcap-devel openssl-devel"
+revision=4
+makedepends="libpcap-devel openssl-devel libxcrypt-devel"
short_desc="PPP (Point-to-Point Protocol) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"
From 0ce6c12af75722780277e24c2ed5ad42c082f05e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:20:08 -0700
Subject: [PATCH 67/97] proftpd: rebuild for libxcrypt
---
srcpkgs/proftpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/proftpd/template b/srcpkgs/proftpd/template
index 8e9985cc0b127..e81533bd8be7c 100644
--- a/srcpkgs/proftpd/template
+++ b/srcpkgs/proftpd/template
@@ -1,9 +1,9 @@
# Template file for 'proftpd'
pkgname=proftpd
version=1.3.7e
-revision=1
+revision=2
build_style=gnu-configure
-makedepends="libcap-devel"
+makedepends="libcap-devel libxcrypt-devel"
short_desc="Highly configurable GPL-licensed FTP server software"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
From b62a70fb38c736fe32a9754c4c49c901f91794d7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:24:23 -0700
Subject: [PATCH 68/97] xrootd: rebuild for libxcrypt
---
srcpkgs/xrootd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index ceff8fe182309..ce60f34024619 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,13 +1,13 @@
# 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"
makedepends="zlib-devel openssl-devel libuuid-devel readline-devel
libcurl-devel mit-krb5-devel libxml2-devel tinyxml-devel libcppunit-devel
- fuse-devel json-c-devel"
+ fuse-devel json-c-devel libxcrypt-devel"
short_desc="Low latency, scalable and fault tolerant access to data"
maintainer="Ben Jargowsky <benjar63@gmail.com>"
license="LGPL-3.0-or-later"
From 041ac3dabe34d55a0bb5bc67d4de5f0c616a36a5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:27:42 -0700
Subject: [PATCH 69/97] root: rebuild for libxcrypt
---
srcpkgs/root/patches/glibc-2.38.patch | 28 +++++++++++++++++++++++++++
srcpkgs/root/template | 4 ++--
2 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/root/patches/glibc-2.38.patch
diff --git a/srcpkgs/root/patches/glibc-2.38.patch b/srcpkgs/root/patches/glibc-2.38.patch
new file mode 100644
index 0000000000000..5221c022a84b3
--- /dev/null
+++ b/srcpkgs/root/patches/glibc-2.38.patch
@@ -0,0 +1,28 @@
+From 8fb0e35446ed67c9d56639b4708c8f05459b7f84 Mon Sep 17 00:00:00 2001
+From: Enrico Guiraud <enrico.guiraud@pm.me>
+Date: Thu, 3 Aug 2023 11:15:47 -0600
+Subject: [PATCH] [core] Do not provide our own strlcpy if glibc >= 2.38
+
+Since version 2.38, glibc provides strlcpy and strlcat.
+No need to provide our own.
+
+In fact ROOT's definitions clash with glibc's: the latter are
+marked `noexcept`.
+---
+ core/foundation/inc/ROOT/RConfig.hxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/core/foundation/inc/ROOT/RConfig.hxx b/core/foundation/inc/ROOT/RConfig.hxx
+index 5f53eb9f21c6..385c05da3e72 100644
+--- a/core/foundation/inc/ROOT/RConfig.hxx
++++ b/core/foundation/inc/ROOT/RConfig.hxx
+@@ -146,6 +146,9 @@
+ # define R__USESTHROW
+ # define R__SEEK64
+ # endif
++# if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38)
++# define HAS_STRLCPY
++# endif
+ #endif
+
+ #if defined(linux) && defined(__i386__)
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
index d35f0138ece2c..d37211ae95907 100644
--- a/srcpkgs/root/template
+++ b/srcpkgs/root/template
@@ -1,7 +1,7 @@
# Template file for 'root'
pkgname=root
version=6.28.04
-revision=2
+revision=3
# Only i686 and x86_64 seem to be officially supported
archs="i686* x86_64*"
build_style=cmake
@@ -20,7 +20,7 @@ makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel
openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel
pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel
libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside
- xrootd gtest-devel"
+ xrootd gtest-devel libxcrypt-devel"
depends="gcc"
short_desc="C++ framework for data processing created by CERN"
maintainer="Ben Jargowsky <benjar63@gmail.com>"
From 47bf0f41c77f44d4c3adf5fa9c8ae0530e861c90 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:30:30 -0700
Subject: [PATCH 70/97] screen: rebuild for libxcrypt
---
srcpkgs/screen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 607d2514e45ae..4c294c525dedd 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,13 +1,13 @@
# 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
--enable-use-locale --with-socket-dir=/run/screens --with-pty-group=5"
hostmakedepends="automake"
-makedepends="libutempter-devel ncurses-devel pam-devel"
+makedepends="libutempter-devel ncurses-devel pam-devel libxcrypt-devel"
conf_files="/etc/screenrc /etc/skel/.screenrc"
short_desc="GNU screen manager with VT100/ANSI terminal emulation"
maintainer="Frank Steinborn <steinex@nognu.de>"
From 79a2ddbf6fac5cc98d8a841815440e77c0a21f04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:31:11 -0700
Subject: [PATCH 71/97] slock: rebuild for libxcrypt
---
srcpkgs/slock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template
index aa7890a499735..3a85bb3c31204 100644
--- a/srcpkgs/slock/template
+++ b/srcpkgs/slock/template
@@ -1,9 +1,9 @@
# Template file for 'slock'
pkgname=slock
version=1.5
-revision=1
+revision=2
hostmakedepends="pkg-config"
-makedepends="libXrandr-devel"
+makedepends="libXrandr-devel libxcrypt-devel"
short_desc="Simple screen locker for X"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From dfebbe0db304928636a54c8df7e3f0316add25b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:32:02 -0700
Subject: [PATCH 72/97] sqmail: rebuild for libxcrypt
---
srcpkgs/sqmail/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index d10e1ba62772c..a005ff56a2df7 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="fehQlibs libidn2-devel ucspi-ssl-devel libxcrypt-devel"
depends="ucspi-ssl ucspi-tcp6"
short_desc="Fast, secure, and reliable email transmission (s/qmail)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 80c2c00c1869995ec7acf1278d894d4cc7cb9eea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:34:39 -0700
Subject: [PATCH 73/97] squid: rebuild for libxcrypt
---
srcpkgs/squid/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 58ef243c8c5f8..c8e01c2ca1b21 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
@@ -45,7 +45,7 @@ make_dirs="/var/log/squid 750 squid squid
/var/cache/squid 750 squid squid"
hostmakedepends="perl pkg-config"
makedepends="libldap-devel libnetfilter_conntrack-devel pam-devel
- libcap-devel libltdl-devel libxml2-devel"
+ libcap-devel libltdl-devel libxml2-devel libxcrypt-devel"
depends="perl"
checkdepends="libcppunit-devel"
short_desc="Caching proxy for the Web"
From ccebcbdeefc9723e5d0338c5817a053769358a43 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:34:53 -0700
Subject: [PATCH 74/97] stress-ng: rebuild for libxcrypt
---
srcpkgs/stress-ng/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 52667adf05ea5..b62bc597a9639 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,9 +1,10 @@
# Template file for 'stress-ng'
pkgname=stress-ng
version=0.16.05
-revision=1
+revision=2
build_style=gnu-makefile
make_use_env=1
+makedepends="libxcrypt-devel"
short_desc="Load and stress a computer system"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 94ec87a6fa96ffa8c0e8fdf8fdc5dd9e0d37f0f7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:36:16 -0700
Subject: [PATCH 75/97] swi-prolog: rebuild for libxcrypt
---
srcpkgs/swi-prolog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 416206e8d15f0..eeffdc0c4e380 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
# 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"
hostmakedepends="pkg-config"
makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
- unixodbc-devel zlib-devel pcre-devel libyaml-devel"
+ unixodbc-devel zlib-devel pcre-devel libyaml-devel libxcrypt-devel"
short_desc="Comprehensive free Prolog environment"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
From aa03bdc43663a50474571d5438945778b8956b61 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:37:35 -0700
Subject: [PATCH 76/97] tacacs: rebuild for libxcrypt
---
srcpkgs/tacacs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tacacs/template b/srcpkgs/tacacs/template
index 1cb4f17935297..a2c5e7dfa9e8b 100644
--- a/srcpkgs/tacacs/template
+++ b/srcpkgs/tacacs/template
@@ -1,11 +1,11 @@
# Template file for 'tacacs'
pkgname=tacacs
version=4.0.4.28
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-libwrap=no"
hostmakedepends="flex perl"
-makedepends="libnsl-devel"
+makedepends="libnsl-devel libxcrypt-devel"
short_desc="Modified version of Cisco's tacacs+ (tac_plus) developer's kit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:Cisco"
From 07a8d160bbba86bdbbc86112195ebc367f09f467 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:38:46 -0700
Subject: [PATCH 77/97] thttpd: rebuild for libxcrypt
---
srcpkgs/thttpd/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
index 13de3fbef35ef..66dbc9c4b517d 100644
--- a/srcpkgs/thttpd/template
+++ b/srcpkgs/thttpd/template
@@ -1,8 +1,9 @@
# Template file for 'thttpd'
pkgname=thttpd
version=2.29
-revision=2
+revision=3
build_style=gnu-configure
+makedepends="libxcrypt-devel"
short_desc="Tiny/turbo/throttling HTTP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 29980aca3b2bbae3aca7cb230677b6ff3583e3c1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:40:22 -0700
Subject: [PATCH 78/97] toybox: rebuild for libxcrypt
---
srcpkgs/toybox/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template
index 302abb234c6d3..56b56948ed543 100644
--- a/srcpkgs/toybox/template
+++ b/srcpkgs/toybox/template
@@ -1,8 +1,9 @@
# Template file for 'toybox'
pkgname=toybox
version=0.8.9
-revision=1
+revision=2
create_wrksrc=yes
+makedepends="libxcrypt-devel"
short_desc="BSD-licensed alternative to busybox"
maintainer="Orphaned <orphan@voidlinux.org>"
license="0BSD"
From f842b0ec6af431ab70f670e5094336a13311dd2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:40:34 -0700
Subject: [PATCH 79/97] txr: rebuild for libxcrypt
---
srcpkgs/txr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index d9b0e96ebe5ac..7d0f149a5f0d4 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,12 +1,12 @@
# 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"
make_check_target=tests
-makedepends="libffi-devel"
+makedepends="libffi-devel libxcrypt-devel"
short_desc="Programming language for convenient data munging"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 508a60b6be493264a71ecf629c7dc838f5b4a906 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:42:48 -0700
Subject: [PATCH 80/97] vile: rebuild for libxcrypt
---
srcpkgs/vile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vile/template b/srcpkgs/vile/template
index 03be247701fb9..5e24e7b58d30c 100644
--- a/srcpkgs/vile/template
+++ b/srcpkgs/vile/template
@@ -1,11 +1,11 @@
# Template file for 'vile'
pkgname=vile
version=9.8x
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-stripping"
hostmakedepends="flex"
-makedepends="ncurses-devel"
+makedepends="ncurses-devel libxcrypt-devel"
short_desc="Text editor which is extremely compatible with vi like emacs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From c609c2758ee61b346a8e1c5177528c85d94e9592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:43:27 -0700
Subject: [PATCH 81/97] vsftpd: rebuild for libxcrypt
---
srcpkgs/vsftpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 599b25bf6d24f..0971b2d61ba5b 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
# 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"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel libxcrypt-devel"
short_desc="FTP daemon with focus on security"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
From 85d9d9a00703700511c78993f06141a4cf86144e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:44:41 -0700
Subject: [PATCH 82/97] wvstreams: rebuild for libxcrypt
---
srcpkgs/wvstreams/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 515b160c9cfac..7ef176c2e33b9 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,10 +1,10 @@
# 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"
+makedepends="openssl-devel zlib-devel libxcrypt-devel"
short_desc="Library for doing network in C++"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-only"
From 2868c641371d0b3d2d201634b0b6e2d21529c854 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:45:16 -0700
Subject: [PATCH 83/97] xlockmore: rebuild for libxcrypt
---
srcpkgs/xlockmore/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index ff0f0000a8694..73c3b6f8c71cf 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,10 +1,10 @@
# Template file for 'xlockmore'
pkgname=xlockmore
version=5.72
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libxcrypt-devel"
makedepends="freetype-devel libXt-devel libXext-devel libXinerama-devel
$(vopt_if opengl 'MesaLib-devel glu-devel')"
short_desc="Provides the 'xlock' X screen locker"
From 6aa59f4ed3fefcedfaad5c7034d42c0e3ced5048 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 30 Aug 2023 14:46:27 -0700
Subject: [PATCH 84/97] xscreensaver: rebuild for libxcrypt
---
srcpkgs/xscreensaver/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 1ab3a9e8eb012..cf19a21a062b3 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,7 +1,7 @@
# Template file for 'xscreensaver'
pkgname=xscreensaver
version=6.07
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pam --with-login-manager
--includedir=${XBPS_CROSS_BASE}/include
@@ -9,7 +9,8 @@ configure_args="--with-pam --with-login-manager
conf_files="/etc/pam.d/xscreensaver"
hostmakedepends="bc glib-devel intltool pkg-config"
makedepends="glu-devel libXi-devel libXinerama-devel libXmu-devel libXpm-devel
- libXrandr-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel gtk+3-devel"
+ libXrandr-devel pam-devel gdk-pixbuf-xlib-devel elogind-devel gtk+3-devel
+ libxcrypt-devel"
depends="perl perl-LWP"
short_desc="Screen saver and locker for the X Window System"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From d81e30291e7def1aef4fb18ba7452a2dac89ef30 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 da8bdf4d1de9dfaef7ad28a053058a1e72bd84c9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 d8ba7d3cce1d2542e8100df47fc2bbaeaf19c1b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 51bdb7e7c62218609e72e1a2b9160760aa7730a6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 9a6785e6a427e8c87041f0051fb9fabbabb61d28 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 7fe7e3ce0c0800ddef075ee5150119798d2816ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 db2c5ecd9351fdade6b33567bb7c1d00d2ff5dfd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 1772eb58496342acb8eb5927555b34549a34dcf5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 8b7398eaef154d393311a673f814ac56019dc403 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 e25f90fe93ce3c8762cb3338c3b5c0e57db35a4f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 a0813e1f46d23e5116b3c668a779f9f408c0149c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 c8d276c5d4383216c3c1edbe3dc5c1c6f2708922 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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 0f38983fe5b0253dc21fbeae3a785a561d7f63f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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
next prev parent reply other threads:[~2023-09-20 5:25 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 0:09 [PR PATCH] " oreo639
2023-08-09 0:21 ` [PR PATCH] [Updated] " oreo639
2023-08-09 0:49 ` oreo639
2023-08-09 13:46 ` ahesford
2023-08-09 21:55 ` [PR PATCH] [Updated] " oreo639
2023-08-09 21:57 ` oreo639
2023-08-30 17:06 ` [PR PATCH] [Updated] " oreo639
2023-08-30 17:14 ` oreo639
2023-08-30 17:15 ` oreo639
2023-08-30 19:42 ` oreo639
2023-08-30 19:47 ` oreo639
2023-08-31 2:10 ` oreo639
2023-08-31 5:22 ` oreo639
2023-08-31 5:27 ` oreo639
2023-09-14 21:28 ` oreo639
2023-09-14 22:20 ` oreo639
2023-09-14 22:21 ` oreo639
2023-09-19 22:19 ` [PR PATCH] [Updated] " oreo639
2023-09-20 5:25 ` oreo639 [this message]
2023-09-20 17:29 ` oreo639
2023-09-27 17:13 ` oreo639
2023-09-27 17:28 ` oreo639
2023-09-29 19:59 ` oreo639
2023-10-04 17:36 ` oreo639
2023-10-05 21:07 ` oreo639
2023-10-08 18:54 ` oreo639
2023-10-09 21:15 ` oreo639
2023-10-09 21:15 ` oreo639
2023-10-11 18:23 ` oreo639
2023-10-14 21:16 ` oreo639
2023-10-16 17:29 ` oreo639
2023-10-20 21:28 ` oreo639
2023-10-27 23:35 ` oreo639
2023-10-28 3:17 ` [PR PATCH] [Updated] " oreo639
2023-10-28 3:48 ` oreo639
2023-10-28 3:48 ` oreo639
2023-10-31 2:43 ` oreo639
2023-11-01 19:57 ` oreo639
2023-11-03 23:06 ` oreo639
2023-11-06 6:32 ` oreo639
2023-11-13 19:29 ` oreo639
2023-11-14 2:32 ` oreo639
2023-11-14 22:19 ` oreo639
2023-11-25 0:16 ` oreo639
2023-11-29 18:29 ` oreo639
2023-12-02 22:03 ` oreo639
2023-12-06 20:47 ` oreo639
2023-12-07 4:49 ` oreo639
2023-12-11 9:26 ` classabbyamp
2023-12-11 9:26 ` classabbyamp
2023-12-11 9:30 ` oreo639
2023-12-11 9:31 ` oreo639
2023-12-11 9:31 ` oreo639
2023-12-11 9:32 ` oreo639
2023-12-11 9:46 ` classabbyamp
2023-12-11 9:50 ` oreo639
2023-12-11 12:39 ` oreo639
2023-12-11 13:02 ` [PR PATCH] [Updated] " oreo639
2023-12-11 13:02 ` oreo639
2023-12-11 13:59 ` leahneukirchen
2023-12-11 15:25 ` oreo639
2023-12-11 15:26 ` oreo639
2023-12-11 15:30 ` oreo639
2023-12-11 15:34 ` leahneukirchen
2023-12-11 15:36 ` oreo639
2023-12-20 0:32 ` [PR PATCH] [Updated] " oreo639
2023-12-21 3:24 ` oreo639
2023-12-22 2:10 ` oreo639
2023-12-23 11:37 ` [PR REVIEW] " leahneukirchen
2023-12-23 11:40 ` leahneukirchen
2023-12-23 22:10 ` oreo639
2023-12-23 22:12 ` oreo639
2023-12-23 22:15 ` oreo639
2023-12-23 22:17 ` oreo639
2023-12-23 22:19 ` oreo639
2023-12-23 22:21 ` oreo639
2023-12-24 2:02 ` oreo639
2023-12-25 3:03 ` [PR PATCH] [Updated] " oreo639
2023-12-25 3:32 ` [PR REVIEW] " oreo639
2023-12-25 3:33 ` oreo639
2023-12-25 19:09 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230920052556.A3-tsyZaRctTCRpwrYVDBdl-X1i_7qTDtz1Ky3rLAqs@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).