From 874c2effd9ff70bbd7b406de9c82affd021422f5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 Jan 2025 21:56:40 -0500 Subject: [PATCH 1/2] pam_zfscrypt: remove package archived for 3 years, popcorn reports no installs --- .../patches/zfs-encrypt-enum.patch | 23 --------------- srcpkgs/pam_zfscrypt/template | 29 ------------------- srcpkgs/removed-packages/template | 19 ++++++------ 3 files changed, 10 insertions(+), 61 deletions(-) delete mode 100644 srcpkgs/pam_zfscrypt/patches/zfs-encrypt-enum.patch delete mode 100644 srcpkgs/pam_zfscrypt/template diff --git a/srcpkgs/pam_zfscrypt/patches/zfs-encrypt-enum.patch b/srcpkgs/pam_zfscrypt/patches/zfs-encrypt-enum.patch deleted file mode 100644 index 01bd2cfac1eb6a..00000000000000 --- a/srcpkgs/pam_zfscrypt/patches/zfs-encrypt-enum.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: pam_zfscrypt-0.2.0/include/zfscrypt_dataset.h -=================================================================== ---- pam_zfscrypt-0.2.0.orig/include/zfscrypt_dataset.h -+++ pam_zfscrypt-0.2.0/include/zfscrypt_dataset.h -@@ -71,18 +71,3 @@ zfscrypt_err_t zfscrypt_dataset_iter(zfs - // private constants - - extern const char ZFSCRYPT_USER_PROPERTY[]; -- --// FIXME Copied from /usr/include/libzfs/sys/zio.h because including results in --// compiler error about unknown type rlim64_t. --enum zio_encrypt { -- ZIO_CRYPT_INHERIT = 0, -- ZIO_CRYPT_ON, -- ZIO_CRYPT_OFF, -- ZIO_CRYPT_AES_128_CCM, -- ZIO_CRYPT_AES_192_CCM, -- ZIO_CRYPT_AES_256_CCM, -- ZIO_CRYPT_AES_128_GCM, -- ZIO_CRYPT_AES_192_GCM, -- ZIO_CRYPT_AES_256_GCM, -- ZIO_CRYPT_FUNCTIONS --}; diff --git a/srcpkgs/pam_zfscrypt/template b/srcpkgs/pam_zfscrypt/template deleted file mode 100644 index 6e2a524a7f48f9..00000000000000 --- a/srcpkgs/pam_zfscrypt/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'pam_zfscrypt' -pkgname=pam_zfscrypt -version=0.2.0 -revision=3 -build_style=gnu-makefile -makedepends="pam-devel zfs-devel" -depends="pam" -short_desc="Automatically decrypt and mount encrypted ZFS home directories" -maintainer="Zach Dykstra " -license="MIT" -homepage="https://github.com/project-trident/zfscrypt" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=73244e7e97ab5a47a9ea4a24ac490f07bfe7c1eb0c920e03df202494ea61b650 -# Makefile is racy, build sequentially -disable_parallel_build=yes - -CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -Iinclude" - -post_patch() { - if [ "${CROSS_BUILD}" ]; then - vsed -i Makefile \ - -e "/ZFSINC :=/s,-isystem/usr/,-I${XBPS_CROSS_BASE}/usr/,g" - fi -} - -do_install() { - vinstall build/pam_zfscrypt.so 0755 usr/lib/security - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a5ca51952f9741..616ea6db5309f9 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20250110 +version=0.1.20250113 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -23,6 +23,7 @@ replaces=" PolyMC<=7.2_1 PrusaSlicer<=2.5.2_5 Pyrex<=0.9.9_5 + Rocket.Chat-Desktop<=3.8.7_3 SMC<=1.9_9 Slic3rPE<=2.5.2_5 Twisted<=17.9.0_2 @@ -335,11 +336,9 @@ replaces=" kmediaplayer<=5.115.0_1 kmime<=23.08.5_1 kpty<=5.115.0_1 - ksanecore<=24.08.3_1 - ksanecore-devel<=24.08.3_1 - libksane<=24.08.3_1 - libksane-devel<=24.08.3_1 kquickcharts<=5.115.0_1 + ksanecore-devel<=24.08.3_1 + ksanecore<=24.08.3_1 kxmlrpcclient<5.115.0_1 ladish-devel<=1_11 ladish<=1_11 @@ -405,6 +404,8 @@ replaces=" libgnome-keyring<=3.12.0_5 libgroff<=1.22.4_3 libgtkhtml<=4.10.0_1 + libksane-devel<=24.08.3_1 + libksane<=24.08.3_1 libkscreen<=5.27.11_3 libllvm10<=10.0.0_8 libllvm11<=11.0.0_2 @@ -547,6 +548,7 @@ replaces=" openlierox<=0.58.rc5_2 opentmpfiles<=0.3.1_1 orage<=4.12.1_7 + pam_zfscrypt<=0.2.0_3 parallel-rust<=0.11.3_2 paraview<=5.8.1_3 pcb<=4.3.0_1 @@ -736,8 +738,8 @@ replaces=" python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 python3-lockfile<=0.12.2_7 - python3-nose<=1.3.7_10 python3-nose-random<=1.0.0_6 + python3-nose<=1.3.7_10 python3-pgpdump<=1.5_10 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 @@ -783,9 +785,9 @@ replaces=" qucs<=0.0.19_2 qupzilla1<=1.8.9_16 qupzilla<=3.0.1_1 - rand48_r<=0.2_1 - rand48_r-devel<=0.2_1 r2-bindings<=1.0.1_2 + rand48_r-devel<=0.2_1 + rand48_r<=0.2_1 raul-devel<=0.8.0_6 raul<=0.8.0_6 redkite<=1.3.1_1 @@ -798,7 +800,6 @@ replaces=" rkt-stage1-fly<=1.30.0_3 rkt<=1.30.0_3 rmapi<=0.0.25_4 - Rocket.Chat-Desktop<=3.8.7_3 rpi-userland-devel<=20230920_1 rundird<=0.2.0_1 scantailor<=0.9.12.1_2 From 12261190f19b55c3dc500d5f8634b4b34dee2892 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 13 Jan 2025 21:57:56 -0500 Subject: [PATCH 2/2] zfs: update to 2.3.0. --- common/shlibs | 6 ++++-- srcpkgs/zfs/template | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index e0bba1a4f23171..78c4f0048e2dc4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3968,9 +3968,11 @@ libtss2-rc.so.0 tpm2-tss-2.3.1_1 libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1 libtss2-tctildr.so.0 tpm2-tss-2.3.1_1 libzfsbootenv.so.1 libzfs-2.1.7_1 -libzfs.so.4 libzfs-2.1.7_1 +libzfs.so.6 libzfs-2.3.0_1 +libzpool.so.6 libzfs-2.3.0_1 +libzfs.so.4 libzfs-lts-2.1.7_1 libuutil.so.3 libzfs-2.1.7_1 -libzpool.so.5 libzfs-2.1.7_1 +libzpool.so.5 libzfs-lts-2.1.7_1 libzfs_core.so.3 libzfs-2.1.7_1 libnvpair.so.3 libzfs-2.1.7_1 libgmio.so gmio-0.4.1_1 diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 3485a15afb49a9..f4e702face6e4a 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,6 +1,6 @@ # Template file for 'zfs' pkgname=zfs -version=2.2.7 +version=2.3.0 revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin @@ -16,7 +16,7 @@ maintainer="Toyam Cox " license="CDDL-1.0" homepage="https://openzfs.github.io/openzfs-docs/" distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz" -checksum=b2b8e3bfabf2a6407a0132243726cb6762547a5bd095b1b1f37eaf2a9d8f7672 +checksum=6e8787eab55f24c6b9c317f3fe9b0da9a665eb34c31df88ff368d9a92e9356a6 # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}"