diff options
Diffstat (limited to 'net-fs')
32 files changed, 1297 insertions, 462 deletions
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz Binary files differindex 801392f049b5..80e46a7a5aed 100644 --- a/net-fs/Manifest.gz +++ b/net-fs/Manifest.gz diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 8a71ae9340bf..d2dad2bbdc2e 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,13 +1,6 @@ -AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4 -AUX autofs-5.1.8-mount_conflict.patch 801 BLAKE2B a9c26656e04c2e9b3be849012c46008521111c922ea4ac40de8cd724a9defe3e8432f6919c808d165f8c45f7ccd46ec1d4fe694213879cd4763f648159d3f091 SHA512 e72cdafc793985af661633bc9c11a66b03c7dd68151a7fadefcd54039ad5a803307e6fe52a2ed178c7373f6e42747332e8b8f2b08b8b0b02005942fcde38da43 -AUX autofs-5.1.8-nfsv4-mount.patch 3512 BLAKE2B cee090bbdfc65a92ddf18ed3f34d0458c89c678520cb517aaf0d44bcd3324c1650055abeac9edd915c81bb69dd9245386e1d008aa9dc536f8777b5bd41ce7c69 SHA512 09d3a4715c2e05292c48874ab4f62ce15b3110a682bfe86986341b34b52db19d92d48ee38181072b17817dec9d180f161eb4598dcff44a3ac551d25d356ec62b AUX autofs-5.1.9-c99.patch 2057 BLAKE2B 520c81142472e8be9a5e2fe462f51ae75807209d3ffed34558a34bec0acfdb84269184cf80654d582c12be311c78de5394ec47d9d9e65613d11104cdcf719d21 SHA512 4476c5a1ff41931d9852cd16dc98c040845ac193ef22cca64d86c14eb52064e40a2042101602cc4ae8bac6eaaf71783f2157bd58882434df70ad10e10742f862 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa -DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24 -DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223 DIST autofs-5.1.9.tar.xz 331872 BLAKE2B baa2fd57fb4ac9f7390cad74d16ef6ef2e484d40061f4f894e5968277747b6852d98e089e904229d5fb08bef7e1810a7b5f14f0ea0adae8e40e317636c8a1f89 SHA512 81eb04270727c3fbf9dfb4b07a8dd39beac9068d6289f2f3bb0eabf723c14bec36860d3b2759c46b597bd77e8f3fa521646445e926c95ab63859a3a6c8588dcc -EBUILD autofs-5.1.8-r1.ebuild 3454 BLAKE2B 576471f4390927fdd494150694ff8b3add940dec28062d6a1257b5648b6661c62066a38ce57ce01948ece92b3a7ac6801157589fedcc28e4d15ae55c6ae60795 SHA512 0ba64b4ed9006877c964fc52252900fa658f2063db17d6176f25abb4369365fc7b6e6078ba3d6ab24045f5a7a0b7622bcbd7a17183a28fd7fbc2e2d0633d9975 -EBUILD autofs-5.1.9-r1.ebuild 3276 BLAKE2B caa18f7f634e3ae3bd576f5961a15b7434c595f796eefb3b8d83892af17be2104ce60a6129c317dec7ff9597702b69bb64e347f2424868fbd408f8410a2fa6b8 SHA512 9ec12e4c52b18653a4939e05b564bc34abcf1683314503c03664a0680417d97e2cd37b8a014fc7b872e285e00ddc5d10fb7b4a571bfe3cbabe80b59f618fba6e -EBUILD autofs-5.1.9.ebuild 3226 BLAKE2B 10262657be28d458b7a749e77f4cb43dec611e16b66c502f9e8e123a737dc721a07e5a1515074a48f04441df4028c18787d3eb84bdcf48805d589f77802d27e5 SHA512 e5063c76b5ab9c15c9aef1b46d3d05045497195db323ca10ab2301ceed2448559bcc9dfaee404ee0cc0c41516f35c8d3745c22e32178329cd36e5310be0b0506 +EBUILD autofs-5.1.9-r1.ebuild 3270 BLAKE2B e62cd102cda4e7970374837672bfe8bd2e541dc64c853831ee542406b35230ed6bc5a1a3d964f35c6684466b9f3e975acb320711b8263ac72506fe373f54eff1 SHA512 ae921c027e47a9abee276f2ad9bc2827ff7a0a3b50d8c97612a710516a7423aef6e1dcb9801f1f1e404b3438815458848680b7d105bc8ca25611102cd9e4343d MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild deleted file mode 100644 index 490ca32bfe1b..000000000000 --- a/net-fs/autofs/autofs-5.1.8-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info systemd toolchain-funcs - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git" -SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz - https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-0.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd" - -# currently, sasl code assumes the presence of kerberosV -RDEPEND=" - net-libs/libnsl:= - >=sys-apps/util-linux-2.20 - dmalloc? ( dev-libs/dmalloc[threads] ) - ldap? ( - >=net-nds/openldap-2.0:= - sasl? ( - dev-libs/cyrus-sasl - dev-libs/libxml2 - virtual/krb5 - ) - ) - systemd? ( sys-apps/systemd ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) -" -DEPEND="${RDEPEND} - libtirpc? ( net-libs/rpcsvc-proto ) -" -BDEPEND=" - app-alternatives/lex - virtual/pkgconfig - app-alternatives/yacc -" -RDEPEND+=" selinux? ( sec-policy/selinux-automount )" - -PATCHES=( - "${WORKDIR}"/${P}-patches/ - "${FILESDIR}/${P}-dmalloc.patch" - "${FILESDIR}/${P}-nfsv4-mount.patch" - "${FILESDIR}/${P}-mount_conflict.patch" -) - -pkg_setup() { - linux-info_pkg_setup - - local CONFIG_CHECK - - if kernel_is -ge 4 18; then - CONFIG_CHECK="~AUTOFS_FS" - else - CONFIG_CHECK="~AUTOFS4_FS" - fi - - check_extra_config -} - -src_prepare() { - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492 - sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334 - - # Install samples including autofs.service - sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die - - default -} - -src_configure() { - # bug #483716 - tc-export AR - # --with-confdir is for bug #361481 - # --with-mapdir is for bug #385113 - local myeconfargs=( - --with-confdir=/etc/conf.d - --with-mapdir=/etc/autofs - $(use_with dmalloc) - $(use_with ldap openldap) - $(use_with libtirpc) - $(use_with sasl) - $(use_enable mount-locking) - $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492 - --without-hesiod - --disable-ext-env - --enable-sloppy-mount # bug #453778 - --enable-force-shutdown - --enable-ignore-busy - RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 - ) - - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" -} - -src_compile() { - emake STRIP=: DONTSTRIP=1 -} - -src_install() { - default - rmdir "${D}"/run - - if kernel_is -lt 2 6 30; then - # kernel patches - docinto patches - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch - fi - newinitd "${FILESDIR}"/autofs5.initd autofs - insinto etc/autofs - newins "${FILESDIR}"/autofs5-auto.master auto.master -} - -pkg_postinst() { - if kernel_is -lt 2 6 30; then - elog "This version of ${PN} requires a kernel with autofs4 supporting" - elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" - elog "been installed into" - elog "${EROOT}/usr/share/doc/${P}/patches." - elog "For further instructions how to patch the kernel, please refer to" - elog "${EROOT}/usr/share/doc/${P}/INSTALL." - elog - fi - elog "If you plan on using autofs for automounting remote NFS mounts," - elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" - elog "are running." -} diff --git a/net-fs/autofs/autofs-5.1.9-r1.ebuild b/net-fs/autofs/autofs-5.1.9-r1.ebuild index efcc4e9ebb83..d23797ae4841 100644 --- a/net-fs/autofs/autofs-5.1.9-r1.ebuild +++ b/net-fs/autofs/autofs-5.1.9-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd" # currently, sasl code assumes the presence of kerberosV diff --git a/net-fs/autofs/autofs-5.1.9.ebuild b/net-fs/autofs/autofs-5.1.9.ebuild deleted file mode 100644 index f21b6430b76e..000000000000 --- a/net-fs/autofs/autofs-5.1.9.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info systemd toolchain-funcs - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git" -SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd" - -# currently, sasl code assumes the presence of kerberosV -RDEPEND=" - net-libs/libnsl:= - >=sys-apps/util-linux-2.20 - dmalloc? ( dev-libs/dmalloc[threads] ) - ldap? ( - >=net-nds/openldap-2.0:= - sasl? ( - dev-libs/cyrus-sasl - dev-libs/libxml2 - virtual/krb5 - ) - ) - systemd? ( sys-apps/systemd ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) -" -DEPEND="${RDEPEND} - libtirpc? ( net-libs/rpcsvc-proto ) -" -BDEPEND=" - app-alternatives/lex - virtual/pkgconfig - app-alternatives/yacc -" -RDEPEND+=" selinux? ( sec-policy/selinux-automount )" - -pkg_setup() { - linux-info_pkg_setup - - local CONFIG_CHECK - - if kernel_is -ge 4 18; then - CONFIG_CHECK="~AUTOFS_FS" - else - CONFIG_CHECK="~AUTOFS4_FS" - fi - - check_extra_config -} - -src_prepare() { - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492 - sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334 - - # Install samples including autofs.service - sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die - - default -} - -src_configure() { - # bug #483716 - tc-export AR - # --with-confdir is for bug #361481 - # --with-mapdir is for bug #385113 - local myeconfargs=( - --with-confdir=/etc/conf.d - --with-mapdir=/etc/autofs - $(use_with dmalloc) - $(use_with ldap openldap) - $(use_with libtirpc) - $(use_with sasl) - $(use_enable mount-locking) - $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492 - --without-hesiod - --disable-ext-env - --enable-sloppy-mount # bug #453778 - --enable-force-shutdown - --enable-ignore-busy - RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 - ) - - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" -} - -src_compile() { - emake STRIP=: DONTSTRIP=1 -} - -src_install() { - default - rmdir "${D}"/run - - if kernel_is -lt 2 6 30; then - # kernel patches - docinto patches - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch - fi - newinitd "${FILESDIR}"/autofs5.initd autofs - insinto etc/autofs - newins "${FILESDIR}"/autofs5-auto.master auto.master -} - -pkg_postinst() { - if kernel_is -lt 2 6 30; then - elog "This version of ${PN} requires a kernel with autofs4 supporting" - elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" - elog "been installed into" - elog "${EROOT}/usr/share/doc/${P}/patches." - elog "For further instructions how to patch the kernel, please refer to" - elog "${EROOT}/usr/share/doc/${P}/INSTALL." - elog - fi - elog "If you plan on using autofs for automounting remote NFS mounts," - elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" - elog "are running." -} diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch deleted file mode 100644 index e2ed58fb1766..000000000000 --- a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/include/mounts.h b/include/mounts.h -index ddb7e4c..854e1fb 100644 ---- a/include/mounts.h -+++ b/include/mounts.h -@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n); - struct tree_ops { - tree_new_t new; - tree_cmp_t cmp; -- tree_free_t free; -+ tree_free_t set_free; - }; - - typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr); -diff --git a/lib/mounts.c b/lib/mounts.c -index 4c86688..1e54a33 100644 ---- a/lib/mounts.c -+++ b/lib/mounts.c -@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n); - static struct tree_ops mnt_ops = { - .new = tree_mnt_new, - .cmp = tree_mnt_cmp, -- .free = tree_mnt_free, -+ .set_free = tree_mnt_free, - }; - static struct tree_ops *tree_mnt_ops = &mnt_ops; - -@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n); - static struct tree_ops host_ops = { - .new = tree_host_new, - .cmp = tree_host_cmp, -- .free = tree_host_free, -+ .set_free = tree_host_free, - }; - static struct tree_ops *tree_host_ops = &host_ops; - -@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n); - static struct tree_ops mapent_ops = { - .new = tree_mapent_new, - .cmp = tree_mapent_cmp, -- .free = tree_mapent_free, -+ .set_free = tree_mapent_free, - }; - static struct tree_ops *tree_mapent_ops = &mapent_ops; - -@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root) - tree_free(root->right); - if (root->left) - tree_free(root->left); -- ops->free(root); -+ ops->set_free(root); - } - - int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr) diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch deleted file mode 100644 index e2a94bf82542..000000000000 --- a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch +++ /dev/null @@ -1,30 +0,0 @@ -Avoid conflicts between sys/mount.h and linux/mount.h - -linux/fs.h includes linux/mount.h and this include file is unused so -do not include it and avoid conflict too with glibc 2.36+ see [1] - -[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/modules/parse_amd.c -+++ b/modules/parse_amd.c -@@ -27,7 +27,6 @@ - #include <sys/utsname.h> - #include <netinet/in.h> - #include <sys/mount.h> --#include <linux/fs.h> - - #define MODULE_PARSE - #include "automount.h" ---- a/modules/parse_sun.c -+++ b/modules/parse_sun.c -@@ -30,7 +30,6 @@ - #include <sys/utsname.h> - #include <netinet/in.h> - #include <sys/mount.h> --#include <linux/fs.h> - - #define MODULE_PARSE - #include "automount.h" diff --git a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch deleted file mode 100644 index eb1bc6cb4241..000000000000 --- a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch +++ /dev/null @@ -1,88 +0,0 @@ -autofs-5.1.8 - fix nfsv4 only mounts should not use rpcbind - -From: Ian Kent <raven@xxxxxxxxxx> - -Commit 606795ecfaa1 ("autofs-5.1.7 - also require TCP_REQUESTED when -setting NFS port" together with commit 26fb6b5408be) caused NFSv4 only -mounts to also use rpcbind to probe availability which breaks the -requirememt that this type of mount not use rpcbind at all. - -Fix this by treating fstype=nfs4 mounts as a special case which doesn't -use rpcbind. ---- - CHANGELOG | 1 + - include/replicated.h | 2 ++ - modules/mount_nfs.c | 13 +++++++------ - modules/replicated.c | 4 ++-- - 4 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/include/replicated.h b/include/replicated.h -index 95ff1f0d..f889a56a 100644 ---- a/include/replicated.h -+++ b/include/replicated.h -@@ -35,6 +35,8 @@ - #define NFS3_REQUESTED NFS3_SUPPORTED - #define NFS4_REQUESTED NFS4_SUPPORTED - -+#define NFS4_ONLY_REQUESTED 0x0800 -+ - #define TCP_SUPPORTED 0x0001 - #define UDP_SUPPORTED 0x0002 - #define TCP_REQUESTED TCP_SUPPORTED -diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c -index 0ab87dcf..feb5afcd 100644 ---- a/modules/mount_nfs.c -+++ b/modules/mount_nfs.c -@@ -92,7 +92,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int - mount_default_proto = defaults_get_mount_nfs_default_proto(); - vers = NFS_VERS_DEFAULT | NFS_PROTO_DEFAULT; - if (strcmp(fstype, "nfs4") == 0) -- vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED; -+ vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED | NFS4_ONLY_REQUESTED; - else if (mount_default_proto == 4) - vers = vers | NFS4_VERS_DEFAULT; - -@@ -157,15 +157,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int - } else { - /* Is any version of NFSv4 in the options */ - if (_strncmp("vers=4", cp, 6) == 0 || -- _strncmp("nfsvers=4", cp, 9) == 0) -- vers = NFS4_VERS_MASK | TCP_SUPPORTED; -- else if (_strncmp("vers=3", cp, o_len) == 0 || -+ _strncmp("nfsvers=4", cp, 9) == 0) { -+ vers &= ~(NFS_VERS_MASK); -+ vers |= NFS4_VERS_MASK | TCP_SUPPORTED | NFS4_ONLY_REQUESTED; -+ } else if (_strncmp("vers=3", cp, o_len) == 0 || - _strncmp("nfsvers=3", cp, o_len) == 0) { -- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); -+ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED); - vers |= NFS3_REQUESTED; - } else if (_strncmp("vers=2", cp, o_len) == 0 || - _strncmp("nfsvers=2", cp, o_len) == 0) { -- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); -+ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED); - vers |= NFS2_REQUESTED; - } else if (strstr(cp, "port=") == cp && - o_len - 5 < 25) { -diff --git a/modules/replicated.c b/modules/replicated.c -index 09075dd0..cdb7c617 100644 ---- a/modules/replicated.c -+++ b/modules/replicated.c -@@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, - - rpc_info->proto = proto; - if (port < 0) { -- if ((version & NFS4_REQUESTED) && (version & TCP_REQUESTED)) -+ if (version & NFS4_REQUESTED && (version & NFS4_ONLY_REQUESTED)) - rpc_info->port = NFS_PORT; - else - port = 0; -@@ -525,7 +525,7 @@ static int get_vers_and_cost(unsigned logopt, struct host *host, - { - struct conn_info pm_info, rpc_info; - time_t timeout = RPC_TIMEOUT; -- unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK); -+ unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK | NFS4_ONLY_REQUESTED); - int ret = 0; - - if (!check_address_proto(logopt, host, version)) diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest index f4653080fb94..33ebb086a501 100644 --- a/net-fs/btfs/Manifest +++ b/net-fs/btfs/Manifest @@ -1,3 +1,3 @@ DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c -EBUILD btfs-2.24.ebuild 832 BLAKE2B 6eed3a5c8ba9b2961fb31d4ad1c526515745362d9020d27e93c21adc8a0dfd6cf4f5aa8f671174f76555e3d2607afa91e8f4f6ef7c468506c033b083bf68cca2 SHA512 7bf99e1b46e81aba56f3714f7649c132aeb98a5b532e9be2be1c9676d17377c6d68a88ad3206343fea0fa7b5e67637e05ac2a093bf2a72ee1314adf6204e5d37 +EBUILD btfs-2.24.ebuild 839 BLAKE2B fc97a64b41af76393d6831fee9cd22b4b890fc919bea08d891f94a1ba4afb02a653704338dde6d38882d58c5826fd7dc4b089f05ce2113069f0ae5a4d9d618ce SHA512 3aab89e0edb664b032f385130e8bb0a105628fdd55644fa09abe77ab0fc7dd9364d6cb31063653fd9fc01d56cfad29a361c17bcfed9393d0572d86d67ba73a0b MISC metadata.xml 244 BLAKE2B 9f54ce24ff94456bd875b5386abf16c27313f10ba739afc1fc817f65fbf530a6562c2fc32caec6f1a976abab2715b98b674e167f23189653846fbb1f7352af5a SHA512 d3ddeeb221e464dfeb68c3ad361277c3711b9c1639246423454393c3158a6aae80757333d97698e938609fb21ef51f15fe1e8ecc6ebe7355c7a418df44f765c1 diff --git a/net-fs/btfs/btfs-2.24.ebuild b/net-fs/btfs/btfs-2.24.ebuild index 38bd3d6bbeba..0a84c213ddc8 100644 --- a/net-fs/btfs/btfs-2.24.ebuild +++ b/net-fs/btfs/btfs-2.24.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools python-r1 DESCRIPTION="a bittorrent filesystem based on FUSE" @@ -15,12 +15,16 @@ SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -DEPEND=">=sys-fs/fuse-2.8.0:0 +DEPEND=" + >=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= - >=net-libs/libtorrent-rasterbar-0.16.0:=" -RDEPEND="${DEPEND} - ${PYTHON_DEPS}" + >=net-libs/libtorrent-rasterbar-0.16.0:= +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} +" BDEPEND="virtual/pkgconfig" src_prepare() { diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index d37d584b6e74..8045449965d5 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1,4 +1,6 @@ AUX cvmfs-2.10.1-gentoo.patch 2835 BLAKE2B c87f24fece387faa48fa1f7ae46be6c0a8eb93ec2460a45abce26d1646948a9b0f606b4b174ef3a3fb1a36387dec943f2cae4f10bf4fa9aa825ba0d732e3ff71 SHA512 93e8e94da4cce7be896afd483a372bb164a803dea9cb035bdb5bfdce2089c250b2f6d857d1ac5d9769a0c53388f457adc5e215ce21bc1040d4cb269cc66262c9 -DIST cvmfs-2.11.2.tar.gz 76020587 BLAKE2B cb225647cf95c93c14a9a0dd7824aac14641f11ee1375c53fac3d5f5e8d29a1173521f82f3cbe18064c8a990ccefbf159c04e1b3d55db0599ec609d5e96391bb SHA512 c8070a10771e28d45a761fdb9083ecd15118bca02328227ca0516edcf3d14e7b338df2a4bb14edd2aa8cc20f3fc903be775fcc40ae80a7f5547340e55fa43211 -EBUILD cvmfs-2.11.2.ebuild 2300 BLAKE2B df5245274f2e64bac8031915a41f15862fcb3892f27f93e9cc1be219c4d08879fe1fc93c1d995a1205b9f4b77fd94433465323760d3e27568c17189a0f97c210 SHA512 2cc7811111139adac1b45acc3c2a984ebcc26a5fc58f6fc1843ea10f0c63cc205b2239d37400bacb6c170d415a726a7b96ee2b950608e29cabe70aeba29afce4 +DIST cvmfs-2.11.3.tar.gz 76021990 BLAKE2B 97b47b848159ef097f318152445278d0c6039719f0b25dbbe13c0a50ad98399b6ec432392e257be8731071c1645d3e698410435eed541bb9dafd133327b1e8d1 SHA512 51140b81fbad9f4cc1bd6206fc76b0d9585e81d884c7de44dc4819c388c8b71c4f50d1061b47bf8cd910aabd9f4e8bb1aaa127d34ccb4958ff2ba81894aae626 +DIST cvmfs-2.11.4.tar.gz 76767529 BLAKE2B dedc4aac1cc4bc96c5e3f79adce3bbbc7c71c389157915b827b74dd1569876d96537d88d241055afea72df166802836c4b195b4df0636037745a77d392f49e96 SHA512 250b92fcd11ca78e7064dbcb4674e9100fa001392e0f2bc399faad2278cf73d7ac25358f73387dda5a86601c1ad1638b863da9d0f5a1c46b27a9536419e2c1e0 +EBUILD cvmfs-2.11.3.ebuild 2349 BLAKE2B 15814d89dea818de0c577e538f458189009d93b3cdcab3b03de990b52ebc20f5b9e430d8406b75f4e8f6174bfdb478af7daa51d003d45e673cf9a987c9a247ae SHA512 9b85d779162ab14355980ddcb9d371b4466db9fb0792284806ff281ed55c03a1f65ab7ee1c0cbcb60429332dc6fd8b0bc59e70e0289907d952658c1664db6e14 +EBUILD cvmfs-2.11.4.ebuild 2351 BLAKE2B ecf0b4c755f7bdf86f859d25ca50a523fefcfaff5cf5d7883f97c7c6c93b7a626f3671c379183ddc5d9633da2ad23b211171f0d83e55c2b29e636850c33030e6 SHA512 a9d0476afb183293ed36bec985a990588069faefad5087cfd5e3b4b539fac2ae63af7330864dd476c8fe7d16db10b986fd540d3a40de6dfb4603a7f664cbd6e5 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7 diff --git a/net-fs/cvmfs/cvmfs-2.11.2.ebuild b/net-fs/cvmfs/cvmfs-2.11.3.ebuild index 1bfc46cba0b0..6e88d9aeea29 100644 --- a/net-fs/cvmfs/cvmfs-2.11.2.ebuild +++ b/net-fs/cvmfs/cvmfs-2.11.3.ebuild @@ -61,6 +61,7 @@ src_prepare() { # gentoo stuff rm bootstrap.sh || die sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" \ + -e "/^INSTALL_BASE/s:=.*\$:=${EPREFIX}/usr:" \ -e "s:/bin/pidof:/usr/bin/pidof:g" cvmfs/cvmfs_config || die sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ CMakeLists.txt || die diff --git a/net-fs/cvmfs/cvmfs-2.11.4.ebuild b/net-fs/cvmfs/cvmfs-2.11.4.ebuild new file mode 100644 index 000000000000..6859d25ce946 --- /dev/null +++ b/net-fs/cvmfs/cvmfs-2.11.4.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info bash-completion-r1 + +DESCRIPTION="HTTP read-only file system for distributing software" +HOMEPAGE="https://cernvm.cern.ch/fs/" +SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="server" + +CDEPEND=" + acct-group/cvmfs + acct-user/cvmfs + app-arch/libarchive + dev-cpp/gtest + dev-cpp/sparsehash + dev-db/sqlite:3= + dev-libs/leveldb:0= + dev-libs/openssl:0= + dev-libs/protobuf:0= + net-dns/c-ares:0= + net-libs/pacparser:0= + net-misc/curl:0[adns] + sys-apps/attr + sys-fs/fuse:0= + sys-fs/fuse:3= + sys-libs/libcap:0= + sys-libs/zlib:0= +" + +RDEPEND="${CDEPEND} + app-admin/sudo + net-fs/autofs +" + +DEPEND="${CDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.10.1-gentoo.patch +) + +pkg_setup() { + if use server; then + CONFIG_CHECK="~OVERLAY_FS" + ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set" + linux-info_pkg_setup + fi +} + +src_prepare() { + cmake_src_prepare + # gentoo stuff + rm bootstrap.sh || die + sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" \ + -e "/^INSTALL_BASE/s:=.*\$:=${EPREFIX}/usr:" \ + -e "s:/bin/pidof:/usr/bin/pidof:g" cvmfs/cvmfs_config || die + sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ + CMakeLists.txt || die + eapply_user +} + +src_configure() { + local mycmakeargs=( + -DBUILTIN_EXTERNALS=OFF + -DBUILD_CVMFS=ON + -DBUILD_LIBCVMFS=OFF # static library used only for development + -DBUILD_DOCUMENTATION=OFF + -DBUILD_GEOAPI=OFF # only used for stratum 1 servers + -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs + -DBUILD_PRELOADER=OFF # special purpose utility for HPCs + -DBUILD_RECEIVER=OFF # for distributed publishers only + -DBUILD_SERVER=$(usex server) + -DINSTALL_BASH_COMPLETION=OFF + -DINSTALL_MOUNT_SCRIPTS=ON + -DINSTALL_PUBLIC_KEYS=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config + bashcomp_alias cvmfs_config cvmfs_server + dodoc doc/*.md + keepdir /var/lib/cvmfs + use server && keepdir /var/lib/cvmfs-server +} + +pkg_config() { + einfo "Setting up CernVM-FS client" + cvmfs_config setup + einfo "Now edit ${EROOT}/etc/cvmfs/default.local" + einfo "and restart the autofs service" +} diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 48bc5cbede6c..88953f0cb509 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -12,4 +12,5 @@ AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c8621 AUX rpc.svcgssd.initd 476 BLAKE2B eeb4c7857c650490795a8347c0a3bf1df1e1446aa3b8bf05f4e08e20a83afd977be2a80a60a5d117b205e9af30a2e2c40b49c4c99276f72efed71f9ce1e22482 SHA512 5d1f7fd4090d05a68a6e1e172d619d5fddd1f5a956f9e6a68bf11330eaacf7c4e848387959ed4949b43127c13feb33d957b8ab4311a594e5e96cf9d4abef3f81 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533 EBUILD nfs-utils-2.6.4-r11.ebuild 5598 BLAKE2B 80c0def7dde9155ed55c45c9ac1807fc5300c1f007155ce74f6dbb5d5fff5b4707b1d9e99de166afca1b4d79972984c45b50349e4f99d526a5aae42f8c1c1bb2 SHA512 d65a425eb8f84e8b811d7574d548e8ef384654a014db87e6185fde7790367d1edcac1cd27cf68ab04cb71c7eb32e518f76118394914d94bc0abbfbd6c3041531 +EBUILD nfs-utils-2.6.4-r12.ebuild 5652 BLAKE2B befeb88928cae7d3e702a54b6dbf654a06727db5df188d4f28345f74ae318254056484332fd4774f752aaf6999c2fa729ea7377b91065faacdae0c3392a53a7b SHA512 ace36b2b518f054f78f8c3610b81b6a93ce73e20097b2826c0f607007faf637344b459fdb709e32c26c487fccd901cabca3248ac2d38e91c3d5bab5902c59bb2 MISC metadata.xml 791 BLAKE2B 485b8c79a2c3174f1f8e95a153c8aac2346f2018817f2d461d2b68a8c8584ee16de42686aba65532b7393cb479d358cd9c8e0e7cf1e0273422bbd4e734231dfd SHA512 1ff20e3a93976961db2b32ce32417826e83366ffac397206872f323048b0468852b90234dcb74a662fca3a18248a96def3a47d01cfdc9a51774cbfdc279bd421 diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild new file mode 100644 index 000000000000..ead93571698f --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info systemd + +DESCRIPTION="NFS client and server daemons" +HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git" + +if [[ ${PV} == *_rc* ]] ; then + MY_PV="$(ver_rs 1- -)" + SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${PN}-${MY_PV}" +else + SRC_URI="https://downloads.sourceforge.net/nfs/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd +uuid" +REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 )" +# bug #315573 +RESTRICT="test" + +# kth-krb doesn't provide the right include +# files, and nfs-utils doesn't build against heimdal either, +# so don't depend on virtual/krb. +# (04 Feb 2005 agriffis) +COMMON_DEPEND=" + dev-libs/libxml2 + net-libs/libtirpc:= + sys-fs/e2fsprogs + dev-db/sqlite:3 + dev-libs/libevent:= + caps? ( sys-libs/libcap ) + ldap? ( + net-nds/openldap:= + sasl? ( + app-crypt/mit-krb5 + dev-libs/cyrus-sasl:2 + ) + ) + libmount? ( sys-apps/util-linux ) + nfsv3? ( >=net-nds/rpcbind-0.2.4 ) + nfsv4? ( + >=sys-apps/keyutils-1.5.9:= + sys-fs/lvm2 + kerberos? ( + >=net-libs/libtirpc-0.2.4-r1[kerberos] + app-crypt/mit-krb5 + ) + ) + tcpd? ( sys-apps/tcp-wrappers ) + uuid? ( sys-apps/util-linux )" +DEPEND="${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" +RDEPEND="${COMMON_DEPEND} + !net-libs/libnfsidmap + selinux? ( + sec-policy/selinux-rpc + nfsv3? ( sec-policy/selinux-rpcbind ) + ) +" +BDEPEND=" + net-libs/rpcsvc-proto + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.2-no-werror.patch + "${FILESDIR}"/${PN}-udev-sysctl.patch + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-C99-inline.patch +) + +pkg_setup() { + linux-info_pkg_setup + + if use nfsv4 && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then + ewarn "Your NFS server will be unable to track clients across server restarts!" + ewarn "Please enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" + ewarn "support the legacy, in-kernel client tracker." + fi +} + +src_prepare() { + default + + sed \ + -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ + -i utils/*/Makefile.am || die + + eautoreconf +} + +src_configure() { + # Our DEPEND forces this. + export libsqlite3_cv_is_recent=yes + export ac_cv_header_keyutils_h=$(usex nfsv4) + + # SASL is consumed in a purely automagic way + export ac_cv_header_sasl_h=no + export ac_cv_header_sasl_sasl_h=$(usex sasl) + + local myeconfargs=( + --disable-static + --with-statedir="${EPREFIX}"/var/lib/nfs + --enable-tirpc + --with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/ + --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap + --with-rpcgen + --with-systemd="$(systemd_get_systemunitdir)" + --without-gssglue + $(use_enable caps) + --enable-ipv6 + $(use_enable junction) + $(use_enable kerberos gss) + $(use_enable kerberos svcgss) + $(use_enable ldap) + $(use_enable libmount libmount-mount) + $(use_enable nfsv4) + $(use_enable nfsv4 nfsdcld) + $(use_enable nfsv4 nfsdcltrack) + $(use_enable nfsv4 nfsv41) + $(use_enable nfsv4 nfsv4server) + $(use_enable uuid) + $(use_with kerberos krb5 "${ESYSROOT}"/usr) + $(use_with tcpd tcp-wrappers) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # Remove compiled files bundled in the tarball + emake clean + + default +} + +src_install() { + default + rm linux-nfs/Makefile* || die + dodoc -r linux-nfs README + + # Don't overwrite existing xtab/etab, install the original + # versions somewhere safe... more info in pkg_postinst + keepdir /var/lib/nfs/{,sm,sm.bak} + mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die + + # Install some client-side binaries in /sbin + dodir /sbin + mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die + + if use nfsv4 ; then + insinto /etc + doins support/nfsidmap/idmapd.conf + + # Install a config file for idmappers in newer kernels. bug #415625 + insinto /etc/request-key.d + echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf + doins id_resolver.conf + fi + + insinto /etc + doins "${FILESDIR}"/exports + keepdir /etc/exports.d + + local f list=() + if use nfsv4 ; then + list+=( rpc.idmapd rpc.pipefs ) + use kerberos && list+=( rpc.gssd rpc.svcgssd ) + fi + + local sedexp=( -e '#placehoder' ) + use nfsv3 || sedexp+=( -e '/need portmap/d' ) + + mkdir -p "${T}/init.d" || die + for f in nfs nfsclient rpc.statd "${list[@]}" ; do + sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die + doinitd "${T}/init.d/${f}" + done + + local systemd_systemunitdir="$(systemd_get_systemunitdir)" + sed -i \ + -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ + "${ED}${systemd_systemunitdir}"/* || die + + # Remove legacy service if not requested (as it will be broken without rpcbind) + if ! use nfsv3; then + rm "${ED}${systemd_systemunitdir}/nfs-server.service" || die + fi + + # bug #368505 + keepdir /var/lib/nfs + # bug #603628 + keepdir /var/lib/nfs/v4recovery + + # No static archives + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # Install default xtab and friends if there's none existing. In + # src_install we put them in /usr/lib/nfs for safe-keeping, but + # the daemons actually use the files in /var/lib/nfs. #30486 + local f + for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do + [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue + einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" + cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ + done +} diff --git a/net-fs/nfs4-acl-tools/Manifest b/net-fs/nfs4-acl-tools/Manifest index 3edb99ef8c16..27181814a6b7 100644 --- a/net-fs/nfs4-acl-tools/Manifest +++ b/net-fs/nfs4-acl-tools/Manifest @@ -1,5 +1,10 @@ AUX nfs4-acl-tools-0.3.5-jobserver-unavailable.patch 641 BLAKE2B 9b4976ff85927ca221360fe9ac8f8f55d9e2f47bd179ef13a2bb01f577d34f3ab705fcce4575b6ae8b797d26465573703634f3b2ce360984c71d98f4ca159598 SHA512 5f9518d62d26f06a40ef4b2cf494f42ccf75af47a349a83949c541382a11627f61cadec8914a7c4b1ca9d0d1a1063a22bf4c2eccaf310198c45c71b4d334b9b3 AUX nfs4-acl-tools-0.3.7-libtool.patch 2051 BLAKE2B 53eb3760da336b40173d930b893e3096e8c5ef3a440942e9708f5416e018a0cefc838891034b21a1f3e6a4d27499f72d2626b3fbfd207377f418b26319d40876 SHA512 5a8043637ea4d9d187f2bc7c214c6bb1802b9079ceea66e8bce272e8b136bf9c091c9f314d3c109dfe7c4570e4561b495facf7c24528921cf0b9b3657c8098a3 +AUX nfs4-acl-tools-0.4.2-libattr.patch 1172 BLAKE2B d48236dffe0f996064d164abf71a7cfc011f22a0b6762b9ea18ae1494e1bef43399d5a5200681e8f986ffe2ad22869b9ec7044a27d65e64ba15166c2fa591969 SHA512 4705137a33de884777740f733026e73222cedf7c9adf4f69d67718d3557c5e9d35b805ba9cbbdeb4d297eb89e11daa5c65532a9aedcc894f3bd4125661bd4991 DIST nfs4-acl-tools-0.3.7.tar.gz 99139 BLAKE2B 5125fca65ee7b9dcea16e9b633bbfc26aa5c74202412119f138a5c47ae67d8f8e72fd4eb43182aaf3119858eb83fe6f24f6b53abc0b448aca04c3de4043ad9c1 SHA512 3922bced4e74891b0c4ea10a03eec0cc2e531de355776ba364a91bd656a78d19f9cfba026face34331841ee7c8609f12084fc10081601bc65aaf0fb008ca2fc6 +DIST nfs4-acl-tools-0.4.2.tar.gz 171197 BLAKE2B 2722063ef020a0933e277de7e971a2e255a7cb8db8b074b07ae5186f7e1b55da56cbe27b9c1aaed090a1b44e0b7e4547fdce83e182b5c654d32cbe23e960d8fc SHA512 ba78f4efda513b50ca0191ff239d87eb595f56013d9310f492491ea7fd0a25eefaf5f5f48efdfbb7173771585bb2785aedfd44688575f47cf42ee3a9a0229544 +DIST nfs4-acl-tools-0.4.3_rc1.tar.gz 57832 BLAKE2B 4738a423b09a7b5f71b5f3bbab1c184d0361ff1bc4de3eab0b251113dc4728feba91360225eaf6d6f70fa0c1e322b084dc0e567e2c5ed25a05200ae4398e0b2f SHA512 7445e91f869abc928623ca9eddadedbaf4fd2086cbd85e55178dc6e14b5cac99ee89ffb71ba87628b5a905f9e6052530a1f4e8bb9a5546420319d4c3cc7e86da EBUILD nfs4-acl-tools-0.3.7-r1.ebuild 640 BLAKE2B 0e9b755a264ea48ebc98fc4a6205821057b4d46ad2e0de7a3eb3129d53c34451ce02e1478e9b9d92b07f9e99d58ed9f34e2de5f73aa0ddc5c3eebf8cd7333c30 SHA512 6023784d219b3760f32e22e7e1827f738b028877bb4b1a2a5b0e9aa57f7bf0656aa15d8ab1ec3ee1fb5fcb7e75084290a349300435afea8922b817bb3c481f82 +EBUILD nfs4-acl-tools-0.4.2.ebuild 908 BLAKE2B 9fca10285c01cc8d3bb3b4951b62b49bc1ab84a18a03ce79a6ba08488db5ad028b2c969a157e40127c572d33fd2fb4c517d0909665df9222a6a1e4e168291154 SHA512 90d3275af124bd4b5f4549930188fe2fc990c125e7accea56cec76a3bc7b5231114b6f91eed1b2c891d95eebaeb426410557063497fc30f95f26f67bc2c27cb5 +EBUILD nfs4-acl-tools-0.4.3_rc1.ebuild 1086 BLAKE2B 40a43a229bfff2c66305cf0066a88ee559f24277931bf7b79614a3d637fa964648b5274ea7a6a7aa752fe9e8a46e0c23ab17e8b0b8fc564ba5bfcb5037ce455c SHA512 e30ed1495666ed704a7568e559575445376dd7cec103bd1e89988bbf1f127f48296050a66a076da1c3e9edfa96dad4563f1b7a1e60f54536454368a90fdf1e99 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.4.2-libattr.patch b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.4.2-libattr.patch new file mode 100644 index 000000000000..f7ea55f8bfbc --- /dev/null +++ b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.4.2-libattr.patch @@ -0,0 +1,34 @@ +diff --git a/configure.ac b/configure.ac +index 3337575..3612f92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,7 @@ AC_PROG_INSTALL + AC_PROG_CC + + AC_CHECK_HEADERS([netinet/in.h stdlib.h string.h unistd.h]) +-AC_CHECK_HEADERS([attr/xattr.h sys/xattr.h]) ++AC_CHECK_HEADERS([sys/xattr.h]) + + AC_C_CONST + AC_TYPE_UID_T +diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4 +index eecdd34..4ec4f66 100644 +--- a/m4/package_attrdev.m4 ++++ b/m4/package_attrdev.m4 +@@ -9,7 +9,7 @@ AC_DEFUN([AC_PACKAGE_NEED_GETXATTR_LIBATTR], + libattr="-lattr" + test -f `pwd`/../attr/libattr/libattr.la && \ + libattr="`pwd`/../attr/libattr/libattr.la" +- test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la" ++ test -f ${libdir}/libattr.la && libattr="${libdir}/libattr.la" + AC_SUBST(libattr) + ]) + +@@ -24,6 +24,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRGET_LIBATTR], + libattr="-lattr" + test -f `pwd`/../attr/libattr/libattr.la && \ + libattr="`pwd`/../attr/libattr/libattr.la" +- test -f /usr/lib/libattr.la && libattr="/usr/lib/libattr.la" ++ test -f ${libdir}/libattr.la && libattr="${libdir}/libattr.la" + AC_SUBST(libattr) + ]) diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.2.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.2.ebuild new file mode 100644 index 000000000000..000cce8072fb --- /dev/null +++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs" +HOMEPAGE="https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=summary" +if [[ ${PV} != *_rc* ]] ; then + SRC_URI=" + https://linux-nfs.org/~steved/${PN}/${P}.tar.gz + " + KEYWORDS="~amd64 ~x86" +else + SRC_URI=" + https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=snapshot;h=refs/tags/${P/_/-};sf=tgz + -> ${P}.tar.gz + " + S="${WORKDIR}/${PN}-${P/_/-}" +fi + +LICENSE="GPL-2" +SLOT="0" + +RESTRICT="test" + +RDEPEND="sys-apps/attr" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.7-libtool.patch" # bug #731162 + "${FILESDIR}/${PN}-0.3.5-jobserver-unavailable.patch" + "${FILESDIR}/${PN}-0.4.2-libattr.patch" +) + +src_prepare() { + default + eautoreconf +} diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.3_rc1.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.3_rc1.ebuild new file mode 100644 index 000000000000..01732f05fadc --- /dev/null +++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.4.3_rc1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs" +HOMEPAGE="https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=summary" +if [[ ${PV} != *_rc* ]] ; then + SRC_URI=" + https://linux-nfs.org/~steved/${PN}/${P}.tar.gz + " + # KEYWORDS="~amd64 ~x86" +else + SRC_URI=" + https://git.linux-nfs.org/?p=steved/nfs4-acl-tools.git;a=snapshot;h=refs/tags/${P/_/-};sf=tgz + -> ${P}.tar.gz + " + S="${WORKDIR}/${PN}-${P/_/-}" +fi + +LICENSE="GPL-2" +SLOT="0" + +# TODO only for 0.4.3_rc1 +# - it has minimal changes compared to 0.4.2 +# - no new release since 2022-11-22 +# - so we might as well keyword this as well +KEYWORDS="~amd64 ~x86" + +RESTRICT="test" + +RDEPEND="sys-apps/attr" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.7-libtool.patch" # bug #731162 + "${FILESDIR}/${PN}-0.3.5-jobserver-unavailable.patch" + "${FILESDIR}/${PN}-0.4.2-libattr.patch" +) + +src_prepare() { + default + eautoreconf +} diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest index fc0aeca5621d..45dd89af4afb 100644 --- a/net-fs/openafs/Manifest +++ b/net-fs/openafs/Manifest @@ -4,6 +4,6 @@ DIST openafs-1.8.8.1-doc.tar.bz2 3770278 BLAKE2B 4d10c96f05190a71b8d7aa89557946d DIST openafs-1.8.8.1-src.tar.bz2 14866119 BLAKE2B ae58a1d30fc8d72b4487700203c03e62fc15d0034a03516d4ea5b52c33970e8d9954e6b3c812a4633910c512d283c11431abbcb3868569d8d5ced1a69585263e SHA512 fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384 DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007 DIST openafs-patches-20211212.tar.xz 13892 BLAKE2B 64582135ff3b81725cf0510d1157785b112f76197b8f50a947d22a82b8b55bebd163f2288b19d68a994f22c78bd90b6bfdad5f75383df1cac06d40feb72e8de8 SHA512 40a1a0d126ae194609da8a264c26b278b6081d95020bcbdb3a809952a70535fa551d1983e811e4ab9deaec06f061075906c2bbaf91e4354bff3520584e3fd336 -EBUILD openafs-1.8.7.ebuild 10613 BLAKE2B 9a7e08ff60167c154adc3b2c5218ae8f0e5055bceba5445b3a924a68457b991fdb838563fe6de94dee9ffac44c57fa9f07374827a10cff2a0deeb1ec7227bd4a SHA512 925e76c1187d6f1181dbbb7414d3b100d02dc9867179cdbc3ba0eb000fb3289706618173c1ccfe7c1384ca2b94eee69df70adb936a674e94b35806f3063a9cde -EBUILD openafs-1.8.8.1-r1.ebuild 10507 BLAKE2B 52f4f43a9686cfcf287b3aad6c4bd57be1c7f32f0a45e8716aef8b71815df1e44cf0caa03255bfbeeda81e89f576e9fa009b4123aa2f8855313b7e75a2c9f8c0 SHA512 26e225a1bce53424009556f8194c7176d86f5881f86f01178a106767e35e439d511e6ac564389c9ccc15ccf9182d5507f358f6230a3a1ff8ac83cc2a10a346ad +EBUILD openafs-1.8.7.ebuild 10613 BLAKE2B 243cf09efb3b53f74ac96c9b15a9f26ca84a3a76866e334594942ac23f450b3ae7b38c64aa784346dcb7035223a83a2260a3bcc94a07811fbae125a06e7b372a SHA512 486d21e1b917475a4cbd4b210be0d985203fdea1360cf3b0fe47d3bc2309791e7c980192ccf2359d0c699286a8b101fd318ae4d1f7a01c66a6b05d0a1965ed96 +EBUILD openafs-1.8.8.1-r1.ebuild 10507 BLAKE2B 1ab828bdc461825f568a88eaec29e0f0b73d4bfaf82c33139387f95543b8f0e7bf6b877429d9977ecea9c9a236e372d41b3d46dddaf45c4ecac16a4cd095dcf5 SHA512 0fe5be63c36eeb4e1ff9569e67c18e2cf2aef378256920851a83e22fde799c9d4328cc3dccbe58450e58d1807e111e62248143b11811f4d97fa4cf6c0ccba89d MISC metadata.xml 1276 BLAKE2B 64acb1928c14c6129ebba32dd004021a472bbcb9a00625fec7ac06a3f12d8a0d084e43f2deeabd72c0bb3f73b853cb7c133318b50d86b7bbc81be72ffe200f91 SHA512 d8ebcfb8df0eb80ade7bf55170fdc9a20062981fd82793a60984b6eaa04639e6bc86cb8a9f7cc2ab2d18fc6da70f2570ddd535b64a6754d322f055c01144afc8 diff --git a/net-fs/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild index 62bb91c024f5..14fcf5679111 100644 --- a/net-fs/openafs/openafs-1.8.7.ebuild +++ b/net-fs/openafs/openafs-1.8.7.ebuild @@ -74,7 +74,7 @@ pkg_pretend() { ewarn "Gentoo supports kernels which are supported by OpenAFS" ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}" ewarn "" - ewarn "You are free to utilize epatch_user to provide whatever" + ewarn "You are free to utilize eapply_user to provide whatever" ewarn "support you feel is appropriate, but will not receive" ewarn "support as a result of those changes." ewarn "" diff --git a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild index 8b891ceb331f..6dc1e1a99ab7 100644 --- a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild +++ b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild @@ -75,7 +75,7 @@ pkg_pretend() { ewarn "Gentoo supports kernels which are supported by OpenAFS" ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}" ewarn "" - ewarn "You are free to utilize epatch_user to provide whatever" + ewarn "You are free to utilize eapply_user to provide whatever" ewarn "support you feel is appropriate, but will not receive" ewarn "support as a result of those changes." ewarn "" diff --git a/net-fs/s3backer/Manifest b/net-fs/s3backer/Manifest index 5c9dde251b82..2428ecb30acc 100644 --- a/net-fs/s3backer/Manifest +++ b/net-fs/s3backer/Manifest @@ -1,5 +1,5 @@ -DIST s3backer-1.6.3.tar.gz 129742 BLAKE2B 05f8b94e9b5e6ffd11b20d5945a9705f1830f3f358c2777695d0c5066bb044bd314d65259ecde299a51288908fcd869b8c516b30b0fbf66975b46a021d4d5bd6 SHA512 f7db1d733a0426df22c1b7d9c1150f8dbfedd0ba2e9120bd61026a481ed52a16f7f09e9e4fcd072cb656da0536cf98472f369eec0195a03b3f105fb3c9a8ba99 DIST s3backer-2.1.2.tar.gz 156281 BLAKE2B 5891dbcecbd08b73d69218894d29ec56323d53ff9b594a853d42d6a621787392061895ae3168d6671b65db1b62cdca26959a122250e8878d740c2d806c9d305f SHA512 58e8bd5909b5f714ead7add9dcfe798d626628519e75f4f4347175c92fdf652e08f6ae00c2d9bf34fa859d46c111b846047ee4e613b94e81b7a7cdfc8e26fd9a -EBUILD s3backer-1.6.3.ebuild 723 BLAKE2B 4fa351ab240a2c20fd2344e0f3e062d57593b2410fca3652340d2db46385edac88829eec6d601b03afcd643a4661015f54770c92babe8767486b7d8346e13f8f SHA512 c231ec741d9df7340420a02347ee8c74ca484ea0a0761cc14e7f9ef2ada6999848d888bfe3599dee321e0ab9d520d9ea037b3b07f8d23af79f35b92a34125375 +DIST s3backer-2.1.3.tar.gz 156859 BLAKE2B 0a28f739f29e2d63a6626247a16d437696a0b3ce2a2b83ae5875f40005ca7f61a3117cf4ecd4646006372cf3eb0afd7a423dca8dfe3db7041c53fc9fffce6b2b SHA512 14e892e3b327ba1c1c164aec30689c0a63e9ede162d4e4a99f9b4fcc0a4a3ef9c81fbacf775cb78f3830ab504e1759bc162af30d1b09a761e97de7191c3e60c8 EBUILD s3backer-2.1.2.ebuild 1080 BLAKE2B 29f0d1aff4a18773ac08e51e2228f54c76fbb9b797d044d3bb4249214b0fbebb5293de40fd0a1f871bfab0fd5f015c1a721d6c1c262f32bec5320285d61506ee SHA512 ec66eb5195919816ace067f4ad420a1439b06acc0b8bf3cc4d7e661508ded77f2e2b53833edde0303e93fd4af6fb44cd987c71aab9cf5aba6bb6ec939bb098ff +EBUILD s3backer-2.1.3.ebuild 969 BLAKE2B 509415e1d7baf7620272dbb2add9f01353022691f5d62a3c6491c8f1667e1ffe2570a9fc0051fe16cf6f9b59a4d152bb799f5251fcdf546a769f80eea5edb03b SHA512 330a5c14f80650943a2ea090cb92e92106ccef82513394a8463ecea3d9324374b6fe791ce455140d85f1879f24530d6c3d23d72fd31c78514b71ce5d5abf7bf7 MISC metadata.xml 617 BLAKE2B f0284e03cc22243aebb1d1b5b4aa674be095554124a8873c4b7815dd7d3f9de17be4ca9953f5b581f33bf3659697dbc49fe4b0af6db3573010f533e6cb312f6d SHA512 ec98ed21a98c0356433bd510a9b547fc3e079edf416fa09c69d5b88e7e2b2f42703dc59866718f9c6eb5774b905ec8de7815b435a45e561c5795cb08908f3f17 diff --git a/net-fs/s3backer/s3backer-1.6.3.ebuild b/net-fs/s3backer/s3backer-2.1.3.ebuild index 5795b7fcbfd6..c24a5f9d506d 100644 --- a/net-fs/s3backer/s3backer-1.6.3.ebuild +++ b/net-fs/s3backer/s3backer-2.1.3.ebuild @@ -5,21 +5,30 @@ EAPI=8 inherit autotools -DESCRIPTION="FUSE-based single file backing store via Amazon S3" +DESCRIPTION="A filesystem that contains a single file backed by Amazon S3" HOMEPAGE="https://github.com/archiecobbs/s3backer" SRC_URI="https://github.com/archiecobbs/s3backer/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="nbd" -RDEPEND="dev-libs/expat +RDEPEND=" + app-arch/zstd:= + dev-libs/expat dev-libs/openssl:0= net-misc/curl sys-fs/fuse:0 - sys-libs/zlib" + sys-libs/zlib + nbd? ( sys-block/nbd sys-block/nbdkit ) +" DEPEND="${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone )" + elibc_musl? ( sys-libs/queue-standalone ) +" +BDEPEND=" + virtual/pkgconfig +" src_prepare() { default @@ -31,6 +40,14 @@ src_prepare() { eautoreconf } -src_compile() { - emake CFLAGS="${CFLAGS}" +src_configure() { + econf $(use_enable nbd) +} + +src_install() { + default + + if use nbd ; then + rm "${ED}/usr/$(get_libdir)/nbdkit/plugins/nbdkit-s3backer-plugin.la" || die + fi } diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index e3db619672fd..659b2f86a23a 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -11,14 +11,18 @@ DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92 DIST samba-4.18.9.tar.gz 41332779 BLAKE2B 8a0769c73d42b941b6f69d62243dd2b93d66748231465b853320cf1bf4b3dd8a912ac7bddfaa9c8b1941788951c2ccd630dabb23cf94965bc1d1e4cb5d74d123 SHA512 93a6c878bca583f59208df2a7865bbd453f7a65dc2f39a863797ef807bdeced4d632c5edd4579e341f8cf3b0b2fbe41e68a815a1510518bdd43e9a25a973c94c DIST samba-4.19.4.tar.gz 41839810 BLAKE2B b5916478d9385eff93d852b61eaa835e04eef7d813175b7011dfab518d3115707895a67f34fc4bb6afc2a1e3b2f60af8d30cd5a32b59d8ec48977c7eefd1b906 SHA512 9a66f685cb1b5b89c59c75ccb67292b3f792b40b30ca76dfc483e805f5bb680bac027117a28a117f42713452fca41c439bed1724ba7d436fe0b0cb30a34f5b45 DIST samba-4.19.6.tar.gz 41847853 BLAKE2B 42a1756f3cb1cd48da5abe043357e15b294148b88fdcb2502394372628a17a729ffb5ea070a967face2dfb76e319cdf6fa56d611c369baddf54e998164d782ca SHA512 23172f4393deb9c520182ffb1acb3cf3e53391d4276fffe98527f2f514f969c0952e6e59bcd90f11385dc51367a7bb9cd0534fa9fc3814f16bfb88f41609d0f5 +DIST samba-4.19.7.tar.gz 41851647 BLAKE2B 9bd58363d4cd30f900b286be7c7e172ed0308c4527308d15309a5f3881ba9b1d4c3dd2a37f19d63fdf80a36bd89c9b6001ab2a5aefb724f10721e3a0dc09fa94 SHA512 a837a6255be6268a48c9f41ccad5db040c69b596936a37b011a4c8e3ec68f27ebd1947b86d26b544a7b546ed426dadc450353dff9553698ca4e6e0a3af162ad3 DIST samba-4.20.0.tar.gz 42433302 BLAKE2B 97cdfdaf118fcd9b44aef0134d211e243a6e2468d90449b9c5ac55c9a8c4dc1e63bf9eb2be9878dc70609c830f90b08b4d1dbf80d7e947c10219043def970d24 SHA512 e820739706992ef3b4e3a7a771ad5d8efc6b87d5ccdcee7ebd41483d90fa3cc0420ba9680d059e71d7083c9c12b0d36deafcdce0224560f49bbfc3a277e7e77c DIST samba-4.20.1.tar.gz 42441898 BLAKE2B 5516b3d74705ee829971119d9931ccd339aaa857647dc46e40fda96f65ec5ba695db107f91075a46e1a7135cfdcc0a56ee67aa3475649b314260be03e4e44657 SHA512 bea2bacae5b3272045399057ddf88d8f38203dde04c718b0088fd45792cccd68047b413e66bca7418b19db8580879358b86531a8d6f2d76fbcd902c331050a84 +DIST samba-4.20.2.tar.gz 42458953 BLAKE2B dffa86c8f3abca45e0b9dd29e723fbc13c0dac6c2b50d6240151ec0ae261fa5d9f43cc57403fa0b35624fd05f8cb50e2945d26b5f5205be48ccb60db0e64c1f7 SHA512 ff2c24314c6a35cc42db36a9021241b1323e810bf746e3975bc103f26daf395cd3c32da72e7172e322dee480587bbb1daac939e9851ff65be493be6fb4fc3eda EBUILD samba-4.18.10.ebuild 11567 BLAKE2B afb26d8cdd341237007895a73c23055432b6b5633ea9bde4590f25d67939ddda463ab43c300dc0d359c309c292a979a2e6e38d1cd34f840a05095b2e05ac56e3 SHA512 7203db99d0fc6c3d40abf7de539ee397ebc156eb1f86fa16285787ace1dff4245c9ae27444f191761e944a4d15ea7b743185d45ec096a9bfc8be6a03b5179b19 EBUILD samba-4.18.11.ebuild 11611 BLAKE2B 746f2d33a6f13f40d53c2cf369aa13340893268011d15db6804551c9fcfaa42ef922bb73b663f9cc527e673a21e605786a74eb638c5d7d3ae860a0d7c28e6044 SHA512 5d3281a7f51e75c551f75bd4ede306a84212414b1aeaaa029cdf13f20e369eb326ad35d8f988eec3793ee1d9a4aee904c8f71eb60b19ff2d695ff9e3490fb33d EBUILD samba-4.18.8.ebuild 11560 BLAKE2B 3a6e88ff75b156a9705dcb28bb661c7f366f3e3db43b230cd77d09975a4313512b6f96aa5aea305f0e37e9c6ffcf4bc33d014ada9f04f1fc9c4311ad4fdddae7 SHA512 a6532ff47d70ec53bfeb47e68e5a02d457a8c8913dcf7f8de62f6f32e46a5ec6f27fc8637c8276532c3d904ec915885f5cbe2bac1a9641052c3767351b5c1c52 EBUILD samba-4.18.9.ebuild 11560 BLAKE2B 1ddbc87e90d55420344063d85156071519bb70b98bd729110bad1d11a4e6e91bd1fdd3f673fa46c42456f4d601447e34768ff38e11864a39351545b98cf1e601 SHA512 645e411e6c606ad1e592c915cd53e74799fd5857b7ffb52a980190356b01f3e0d91046fdd08812479915a1b1c3833d5803a7399540455e733ca464fd676f0cd6 EBUILD samba-4.19.4.ebuild 11493 BLAKE2B e4acd13264db64c9e461ae182849d6e917cc8cd11a1e907adc6296e0fb21d30c7a3bd9b410ad2e163ea5daceff7c28ab925ee9e5e9c1f18eff93d2e4804152dc SHA512 06e35bfca1ba9d8646cbc9e90eafd632ead6af922b7bd5587a35d711b57ffc84de5379270bfd2bade09a0308f60afe89faf0dd5dce48352da3a846c8315fbd5a -EBUILD samba-4.19.6.ebuild 11537 BLAKE2B f7c2b02003f3f01edc4c9c835599fc6acf890eaaad9ad8a5030956150bd582f03fcb3d16b0f6cdef57e74f0f29165231838f6585d7b3a42dde7794cc8c3bf40e SHA512 4eae578523a63dc3275fe494b5824f191c03c2ed959982e7b84dbc1f1e0e03ff5922f1b5d195017befa147b0e6e6c3058264e550ad28efd2b88067225c172030 +EBUILD samba-4.19.6.ebuild 11531 BLAKE2B 867db7108506eee5b360134444d605cf0e1cc8ad6db53c305db43ae1c1fd52ac10c29f7174e07c71f9ebdbc253504486d81a1f1509840b52c3c0eacc6ecefde0 SHA512 0701fa1571e7c859dcb536ade75ebf325f78404c23eb0fd73657ef7ea65f07b76d08088e90f6fbd330fa56aa0ab6196ea8cfacb1d76aa123dbfbeee384bcf5ae +EBUILD samba-4.19.7.ebuild 11537 BLAKE2B b0b7bcd220a49dfc4871747ceb3556ced9784f1b3517955a867ce4dc1d291a5a5fee3c28fa84ae600798b9d63ce2a6d38c49c2859a174ba4c190380bf197a8a7 SHA512 5a6b329ceb147883f2dfdca19975bf01026c3a0eaa723ff7273561cc516f0b7f5a59ba470e61e58e008b9b7ea3d57155bf33f478521d909610d6877cb14fb631 EBUILD samba-4.20.0.ebuild 11539 BLAKE2B 75ffb4a45bb86e440300b7b45911e555b988e081bf20378f2617dada3f832852e8fda50e83e108888ad158700e8b5bb4796eae8089560e793f19f7f38b252722 SHA512 793b560c2bab62a9b982736a2daa36395215564d2f8119bf4f08f0330975a56a8a80e9e8fd78ba04721672a0a0ee088686ca430272a27f8be987b50674667565 EBUILD samba-4.20.1.ebuild 11539 BLAKE2B 75ffb4a45bb86e440300b7b45911e555b988e081bf20378f2617dada3f832852e8fda50e83e108888ad158700e8b5bb4796eae8089560e793f19f7f38b252722 SHA512 793b560c2bab62a9b982736a2daa36395215564d2f8119bf4f08f0330975a56a8a80e9e8fd78ba04721672a0a0ee088686ca430272a27f8be987b50674667565 +EBUILD samba-4.20.2.ebuild 11555 BLAKE2B e7bbde2720c6ab5b388c9a73b7fc849c856ad84783c982d527ad4f0b2f8e645154e0deedbc9b42ed0557813df7427b6335b86ca7a179ab1d8a07c4b8f8c3a7c8 SHA512 e1f11cac2545d757ca8bb29d060f892ded55f2e8f3a777c893ac80ef783f9d7729729e669ca2a11ac318b8f794a232adae512b0e2390a3441580be38cea5b394 MISC metadata.xml 2066 BLAKE2B 1d3a5757c3226cede70b5fabb63b27bf0a5b86bf27643a30ebfe743d0758e57ce1e69b14ba6795de4c656b3d5da5b3f9d90d11074520c24d6459220f62723b04 SHA512 0a7963f9abddd4cc3b303c93dcd4b7dc30ca5660e64750d77bcd3bce0a95291c46208d9a1143303c168febb2d65cdad0018c475130dc04c16d79df2019d8e9aa diff --git a/net-fs/samba/samba-4.19.6.ebuild b/net-fs/samba/samba-4.19.6.ebuild index 24963862293b..119e2c01cff1 100644 --- a/net-fs/samba/samba-4.19.6.ebuild +++ b/net-fs/samba/samba-4.19.6.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *_rc* ]]; then SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86" fi S="${WORKDIR}/${MY_P}" diff --git a/net-fs/samba/samba-4.19.7.ebuild b/net-fs/samba/samba-4.19.7.ebuild new file mode 100644 index 000000000000..0911ede7e865 --- /dev/null +++ b/net-fs/samba/samba-4.19.7.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.1" +TDB_VERSION="1.4.9" +TEVENT_VERSION="0.15.0" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.1:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + !system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.20.2.ebuild b/net-fs/samba/samba-4.20.2.ebuild new file mode 100644 index 000000000000..55f811279821 --- /dev/null +++ b/net-fs/samba/samba-4.20.2.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.2" +TDB_VERSION="1.4.10" +TEVENT_VERSION="0.16.1" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.9.1:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + !system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 ${ESYSROOT}/usr $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest index b19e24d7dd1a..d5b43c44ab70 100644 --- a/net-fs/sshfs/Manifest +++ b/net-fs/sshfs/Manifest @@ -1,3 +1,3 @@ DIST sshfs-3.7.3.tar.xz 53596 BLAKE2B 9a229d0f11e7247e319af13245aeaf71082664409b0ca3fe1522bcdb679d402c574438be1931d5d73a16b9eda43daf20de6c1a016442ae53afa27a697e58c212 SHA512 ba0928f85819984a3eb83d2debab658b2cd4e958ed1c3ba9787e361f452687d42b82d478b7d95e7a7c5580bae5c1cdebe4cf3c9b6cb5eb6a570311f276903d99 -EBUILD sshfs-3.7.3-r1.ebuild 681 BLAKE2B 2929e403d531cf922e58492d5221108dc65d5787b063f39bf562c3ceb20b28434a3bd8bdbdbb5a6bb62e5c38bc90a0498263b057afad6f3f3624a3a1620cdb22 SHA512 1a2dc14905006c64292e5f972a7c7daca22a9489a2d9637229f1b9b8fe8fccb853185f49237957c30d927f05caa7c64f18ecd8f0de419447effea144bfd002d0 +EBUILD sshfs-3.7.3-r1.ebuild 688 BLAKE2B e88979aa29d7cba694ecc3d74efb21fb4ff941dba9575459f245cba84ae557fb8bab7b0f76541298e093f753357254174bbf5ade56f787b9173b23e506d90b39 SHA512 dffc09871b1c6af13197f07ee2c3c2f7153788b2dd7b4578a81d2881156388bf4e856ab918e1c78c5cc29577a15d62d4b8236efb2bbfcd953be4b2037a302a73 MISC metadata.xml 319 BLAKE2B 92a8ae2fc292b8121db08f15f68dcfb142f5dfb5fff5bdd9c12e53f56c081926c303ee8816bbd00d26c9c2b5553e4b82c0101572da0ed89e713fcdd53e7a4b70 SHA512 5cc70ac9b54aab37eb7a1411e85dadf5e0081b976048769f937e554518dbe0d74002bc75e90813dda9dde39e9ced8d317f6b46f6ae4b6b642ede1081a3702950 diff --git a/net-fs/sshfs/sshfs-3.7.3-r1.ebuild b/net-fs/sshfs/sshfs-3.7.3-r1.ebuild index 1ed1ef7dd04b..62a830a7c66d 100644 --- a/net-fs/sshfs/sshfs-3.7.3-r1.ebuild +++ b/net-fs/sshfs/sshfs-3.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs" SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" DEPEND=">=sys-fs/fuse-3.1.0:3 diff --git a/net-fs/wdfs/Manifest b/net-fs/wdfs/Manifest index f51b623a2a00..0d81f197a9d7 100644 --- a/net-fs/wdfs/Manifest +++ b/net-fs/wdfs/Manifest @@ -1,4 +1,5 @@ AUX wdfs-1.4.2-fix-Waddress.patch 1269 BLAKE2B 8ae89ff50d0feb200389f938c26586cce88bb67504aa30e4aac992ecf608f0478a0b36d5198cbb3e668f2b4207fd363549f67f2e044b2aef6d7ced0686224760 SHA512 e01f9a45cd045edf05b19ddd3b3a04bbf9a03dac4e032709a98396b024079bfb4856b91aa1c0aba8b1c3ce765ce9499f46102fafc87776ae5e0d57f8b71bc0e5 DIST wdfs-1.4.2.tar.gz 109315 BLAKE2B 7bfe32d0c957afc347b4280e909b8964e2cb736686833580072149f107aec908e9ce220fa18ccd998ae9bea5d34e0aa2349c6a832ed40dbfae3bf6cb353f9e4e SHA512 da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004 EBUILD wdfs-1.4.2-r2.ebuild 510 BLAKE2B 8997fc4098c89dde1b164b52949da5c0204400211cce091dea28576f58e43bd588a14cc950019a260f18ebf8919c0289170128f5fbfa8e53f9a956b32373dae8 SHA512 13e30c64c3620d401fff3b164f149105ac6b1a8166e38b5af5b6769edb1ee96661fb7d4ee06056e0512bbb60c2b5d2dcf05f2e4ccfcaf0f3eb18349240217585 +EBUILD wdfs-1.4.2-r3.ebuild 507 BLAKE2B a18558e09acdf3ea80b1aea4480617ec3b0b098ae171f70c2619616361ac9a415c51b65f5ece352e5cb0f8a26b0513031eeda709f6c185165157bf968a3e1731 SHA512 2619cbf18326deef0ae28eaa35663c67bd21320993a97d4b2531cfba83279ead8688298e5cc35e57b6a81b301762539b6620f342e624e0aba111ed111cad64c5 MISC metadata.xml 441 BLAKE2B d2579db75a4f8a7a55cccb5205265e1ed876dbee5a465d7fe8236903320466dea3c97fcf9ecd9e5244ee2257025dd60da75a965a26a98a15bc31f3d3d81f2ce7 SHA512 4e5ffaaaaf5be659507130578f8fbd93c218e9ac5623972ada69ca5cf5a4e1774102f51780d6612b3b6153ea902eeb8583ec59447ec937518e2fab23a14ef884 diff --git a/net-fs/wdfs/wdfs-1.4.2-r3.ebuild b/net-fs/wdfs/wdfs-1.4.2-r3.ebuild new file mode 100644 index 000000000000..46d56fff6992 --- /dev/null +++ b/net-fs/wdfs/wdfs-1.4.2-r3.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="WebDAV filesystem with special features for accessing subversion repositories" +HOMEPAGE="http://noedler.de/projekte/wdfs/" +SRC_URI="http://noedler.de/projekte/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" + +RDEPEND=" + dev-libs/glib:2 + >=net-libs/neon-0.24.7:= + >=sys-fs/fuse-2.5:0 +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-fix-Waddress.patch" +) |