diff options
Diffstat (limited to 'net-fs')
37 files changed, 419 insertions, 1796 deletions
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz Binary files differindex 7365f3dccc41..39b5d986114d 100644 --- a/net-fs/Manifest.gz +++ b/net-fs/Manifest.gz diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index d2dad2bbdc2e..748b056ceae2 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -2,5 +2,5 @@ AUX autofs-5.1.9-c99.patch 2057 BLAKE2B 520c81142472e8be9a5e2fe462f51ae75807209d AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa DIST autofs-5.1.9.tar.xz 331872 BLAKE2B baa2fd57fb4ac9f7390cad74d16ef6ef2e484d40061f4f894e5968277747b6852d98e089e904229d5fb08bef7e1810a7b5f14f0ea0adae8e40e317636c8a1f89 SHA512 81eb04270727c3fbf9dfb4b07a8dd39beac9068d6289f2f3bb0eabf723c14bec36860d3b2759c46b597bd77e8f3fa521646445e926c95ab63859a3a6c8588dcc -EBUILD autofs-5.1.9-r1.ebuild 3270 BLAKE2B e62cd102cda4e7970374837672bfe8bd2e541dc64c853831ee542406b35230ed6bc5a1a3d964f35c6684466b9f3e975acb320711b8263ac72506fe373f54eff1 SHA512 ae921c027e47a9abee276f2ad9bc2827ff7a0a3b50d8c97612a710516a7423aef6e1dcb9801f1f1e404b3438815458848680b7d105bc8ca25611102cd9e4343d +EBUILD autofs-5.1.9-r1.ebuild 3264 BLAKE2B 06ca8dfd095378751454911ceea13b0901b853ea62378d0caf765cd59e74b695bdc253149cfe244ab77d615233b7b1d6a164b35f9bc14f6445f2062ad070a836 SHA512 fa7e92ca23218892350b6d29ff2ad8f896879932950df5cc3dede97fb61c4ad108a6f2393206eab6254149b31cee18e403d4d2872c535e1649a1c17815bde695 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d diff --git a/net-fs/autofs/autofs-5.1.9-r1.ebuild b/net-fs/autofs/autofs-5.1.9-r1.ebuild index d23797ae4841..288f8613b4e9 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 ~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/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index 12d4a6ea80ca..97ed1dc20458 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -3,6 +3,5 @@ AUX cifs-utils-6.15-musl.patch 2215 BLAKE2B 251be73f341d4573aa509915e364680fc6d8 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae AUX cifs-utils-7.0-no-clobber-fortify-source.patch 315 BLAKE2B e67a4ca264bbc4372b8a80b1da562ec31b6869c5dae065edc9e37a127de50e08e588bdcce1a5a1505df9b6bc128aee3bd34fd991a5330ae13e93880345a7a0d1 SHA512 75b729fb09df77ec77d2a028f15acbaea5e7ccec185dad72789d13c3dd0b8b48f6654e2f28b7f22f2117cf0b60d2b869a5c4f554d8d3ed4e83a0d3bd5e8abe40 DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774 SHA512 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb -EBUILD cifs-utils-7.0-r1.ebuild 3724 BLAKE2B 4b991faad65ff3bf418788762095df722038dbf8509747ff1ba0402d846da4a46a6a516a0d080f89794305d4df17a6a60b0099600813e06d689a1e9e74c30f11 SHA512 79103a140c39abe74abee5c7268c84927076dde0a89cd515a13628352d01a7d767c225d645b55b9d19e36f7eae7f5b369e40b8fade34f78c3c8c553269c24ca7 -EBUILD cifs-utils-7.0.ebuild 3676 BLAKE2B 596c7dd752fa33110c6f10c41f7b8c36de1bae1c00050ae4ec2dc1881b92d9fdf171ade6a798233e28cc25c76dc81f7e4efec04cfbaeeb7438c97edea9bda999 SHA512 1257bc3942b0bfae3aaf1676c437c3153c85d9bf2133400be60c6e734ea3fa3c33dd5eedcd9e9c030266169ad46d1a131926d27732e723ef22749d4778886ad3 +EBUILD cifs-utils-7.0-r1.ebuild 3713 BLAKE2B c099bc315734417439aea9d0e783530e6c11880ab196a095bbf9092f2d46100ed2ec906023aa0bcc78e98d2d463123afd9f8da2c37f5f62162a1d453c944e1b6 SHA512 9111ca4fe37cec4e345f7395a68f8bb27e0813453802aed9e9c97c1497fa38fe0a246eef1053bf54555844d3eca35f2c1b7514e0df804afa0ed67d988315e2c2 MISC metadata.xml 1052 BLAKE2B 58ff7162bfc8d4fa545f663a484a105fcbd52471e187b4b7f895b7906dfd5f87723927ef2cfaabd784026c5af4508b65b23921dac27e580671b318f3d16ce470 SHA512 74fd58db42397da01aedfeddd70c8a2552533c95a63e58c68a6dfbb22b04b86aa0321f23a9ecfebbf0896a3a06921ef7b583d4d246edefa65bca8a10c0ea4a89 diff --git a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild index aa0f9fee761f..0df6dfcc8af4 100644 --- a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild +++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" IUSE="+acl +ads +caps creds pam +python systemd" RDEPEND=" diff --git a/net-fs/cifs-utils/cifs-utils-7.0.ebuild b/net-fs/cifs-utils/cifs-utils-7.0.ebuild deleted file mode 100644 index 95cf49c09822..000000000000 --- a/net-fs/cifs-utils/cifs-utils-7.0.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) - -inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1 - -DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" -HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils https://git.samba.org/cifs-utils.git/?p=cifs-utils.git" -SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux" -IUSE="+acl +ads +caps creds pam +python systemd" - -RDEPEND=" - ads? ( - sys-apps/keyutils:= - sys-libs/talloc - virtual/krb5 - ) - caps? ( sys-libs/libcap-ng ) - creds? ( sys-apps/keyutils:= ) - pam? ( - sys-apps/keyutils:= - sys-libs/pam - ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-python/docutils" -PDEPEND=" - acl? ( >=net-fs/samba-4.0.0_alpha1 ) -" - -REQUIRED_USE=" - acl? ( ads ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -DOCS="doc/linux-cifs-client-guide.odt" - -PATCHES=( - "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594 - "${FILESDIR}/${PN}-6.15-musl.patch" -) - -pkg_setup() { - linux-info_pkg_setup - - if ! linux_config_exists || ! linux_chkconfig_present CIFS; then - ewarn "You must enable CIFS support in your kernel config, " - ewarn "to be able to mount samba shares. You can find it at" - ewarn - ewarn " File systems" - ewarn " Network File Systems" - ewarn " CIFS support" - ewarn - ewarn "and recompile your kernel ..." - fi - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - if has_version app-crypt/heimdal ; then - # https://bugs.gentoo.org/612584 - eapply "${FILESDIR}/${PN}-6.7-heimdal.patch" - fi - - eautoreconf -} - -src_configure() { - # bug #927809 - filter-flags -fno-semantic-interposition - - local myeconfargs=( - --enable-man - --enable-smbinfo - $(use_enable acl cifsacl cifsidmap) - $(use_enable ads cifsupcall) - $(use_with caps libcap) - $(use_enable creds cifscreds) - $(use_enable pam) - $(use_with pam pamdir $(getpam_mod_dir)) - $(use_enable python pythontools) - # mount.cifs can get passwords from systemd - $(use_enable systemd) - ) - ROOTSBINDIR="${EPREFIX}"/sbin \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # remove empty directories - find "${ED}" -type d -empty -delete || die - - if use acl ; then - dodir /etc/cifs-utils - dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \ - /etc/cifs-utils/idmap-plugin - dodir /etc/request-key.d - echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \ - > "${ED}/etc/request-key.d/cifs.idmap.conf" - fi - - if use ads ; then - dodir /etc/request-key.d - echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \ - > "${ED}/etc/request-key.d/cifs.upcall.conf" - echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \ - > "${ED}/etc/request-key.d/cifs.spnego.conf" - fi - - dobashcomp bash-completion/smbinfo - use python && python_fix_shebang "${ED}" -} - -pkg_postinst() { - # Inform about set-user-ID bit of mount.cifs - ewarn "setuid use flag was dropped due to multiple security implications" - ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586" - ewarn "You are free to set setuid flags by yourself" - - # Inform about upcall usage - if use acl ; then - einfo "The cifs.idmap utility has been enabled by creating the" - einfo "configuration file /etc/request-key.d/cifs.idmap.conf" - einfo "This enables you to get and set CIFS acls." - fi - - if use ads ; then - einfo "The cifs.upcall utility has been enabled by creating the" - einfo "configuration file /etc/request-key.d/cifs.upcall.conf" - einfo "This enables you to mount DFS shares." - fi -} diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index 8045449965d5..28db75dfdad5 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1,6 +1,6 @@ AUX cvmfs-2.10.1-gentoo.patch 2835 BLAKE2B c87f24fece387faa48fa1f7ae46be6c0a8eb93ec2460a45abce26d1646948a9b0f606b4b174ef3a3fb1a36387dec943f2cae4f10bf4fa9aa825ba0d732e3ff71 SHA512 93e8e94da4cce7be896afd483a372bb164a803dea9cb035bdb5bfdce2089c250b2f6d857d1ac5d9769a0c53388f457adc5e215ce21bc1040d4cb269cc66262c9 DIST cvmfs-2.11.3.tar.gz 76021990 BLAKE2B 97b47b848159ef097f318152445278d0c6039719f0b25dbbe13c0a50ad98399b6ec432392e257be8731071c1645d3e698410435eed541bb9dafd133327b1e8d1 SHA512 51140b81fbad9f4cc1bd6206fc76b0d9585e81d884c7de44dc4819c388c8b71c4f50d1061b47bf8cd910aabd9f4e8bb1aaa127d34ccb4958ff2ba81894aae626 -DIST cvmfs-2.11.4.tar.gz 76767529 BLAKE2B dedc4aac1cc4bc96c5e3f79adce3bbbc7c71c389157915b827b74dd1569876d96537d88d241055afea72df166802836c4b195b4df0636037745a77d392f49e96 SHA512 250b92fcd11ca78e7064dbcb4674e9100fa001392e0f2bc399faad2278cf73d7ac25358f73387dda5a86601c1ad1638b863da9d0f5a1c46b27a9536419e2c1e0 +DIST cvmfs-2.11.5.tar.gz 76761232 BLAKE2B ca665e0cdeab589d8cfcb4879b6e03a09330f9fa559aaa179cf7df10e9e92aa0a8ee215c3dc80eec6e2cc0912d7de80c759c2717303b94da8b2295fb3496d6b5 SHA512 fac61c59c9758d50f3ff1d90fbd60ea078c62f32aaba56ea02d1da11bfc2d304c340cc7ec539965bef3f0b7d6076502fdc5de8d8ed0f955289b77dcaa9d4de08 EBUILD cvmfs-2.11.3.ebuild 2349 BLAKE2B 15814d89dea818de0c577e538f458189009d93b3cdcab3b03de990b52ebc20f5b9e430d8406b75f4e8f6174bfdb478af7daa51d003d45e673cf9a987c9a247ae SHA512 9b85d779162ab14355980ddcb9d371b4466db9fb0792284806ff281ed55c03a1f65ab7ee1c0cbcb60429332dc6fd8b0bc59e70e0289907d952658c1664db6e14 -EBUILD cvmfs-2.11.4.ebuild 2351 BLAKE2B ecf0b4c755f7bdf86f859d25ca50a523fefcfaff5cf5d7883f97c7c6c93b7a626f3671c379183ddc5d9633da2ad23b211171f0d83e55c2b29e636850c33030e6 SHA512 a9d0476afb183293ed36bec985a990588069faefad5087cfd5e3b4b539fac2ae63af7330864dd476c8fe7d16db10b986fd540d3a40de6dfb4603a7f664cbd6e5 +EBUILD cvmfs-2.11.5.ebuild 2351 BLAKE2B ecf0b4c755f7bdf86f859d25ca50a523fefcfaff5cf5d7883f97c7c6c93b7a626f3671c379183ddc5d9633da2ad23b211171f0d83e55c2b29e636850c33030e6 SHA512 a9d0476afb183293ed36bec985a990588069faefad5087cfd5e3b4b539fac2ae63af7330864dd476c8fe7d16db10b986fd540d3a40de6dfb4603a7f664cbd6e5 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7 diff --git a/net-fs/cvmfs/cvmfs-2.11.4.ebuild b/net-fs/cvmfs/cvmfs-2.11.5.ebuild index 6859d25ce946..6859d25ce946 100644 --- a/net-fs/cvmfs/cvmfs-2.11.4.ebuild +++ b/net-fs/cvmfs/cvmfs-2.11.5.ebuild diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest index 92cad3f3f895..fd097c2f7a23 100644 --- a/net-fs/libnfs/Manifest +++ b/net-fs/libnfs/Manifest @@ -1,6 +1,6 @@ DIST libnfs-5.0.2.tar.gz 281154 BLAKE2B 9de3d02e5ae4d41eacda152678e6552708b33d4e88cc6fc5f7b16c887f911fc5a5e834952505438220c961f71a8b70540be3254d5889a4336200d5633dce313e SHA512 6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5 DIST libnfs-5.0.3.tar.gz 291079 BLAKE2B 4ce19c317bfd47110d9f42bb2dfb27bfba90bb9a11d1c3c5d63ce1188db3a08a97ffa82a31b0de04e59f41c570eef1eff96e80390ee78b0267e2a89d032c9c9c SHA512 1581c4a599e7b2a837553df2a4e1e4255a726907cd54ce3e82b0b725c79e2fd15d7ed921dbe9519d73204f5ca735d27b347888d3f1162c4c2144e9d72e327ff1 -EBUILD libnfs-5.0.2.ebuild 1291 BLAKE2B b49688a414498b0e22304f81e54f50d4d6dfe0d1f14beb216cafde7db862388cadac240f643b763dcf8982185f07b72285819611a24a19e337f9f671f4bdaf51 SHA512 0ad71902e95b8b77ba5e2b934b33f626513bc9faafa141e5fb09d914c1700d1b1bb986dbb1db63996fed9201bc3f3ee380989a6ec64014f3e9e6b2dd0c5e07c0 -EBUILD libnfs-5.0.3.ebuild 1294 BLAKE2B 31085db431359c0f8099a7bb4e88a63b28a35764916a3c8664ddc962e932130f518963ebe6182831c94c28570801780097b99d633b537b824cafd2e3ce08238f SHA512 eb441576e5af49100311b5a81659c935fc87ae9df755f863498aea2ff3fd98073cf55bfaf5387d878f74bc42b9e5bb1ce181e57a4efd089ce0f3516330be0d9c -EBUILD libnfs-9999.ebuild 1290 BLAKE2B 8285ae200d1b3b5401c0f4e29341b76f8b6f29b37f5c92054659e1fcf1ad736f5e27e71dddd33a2fc7f881892e4b259abcdb38250c9731c88de88209a68100d2 SHA512 b4ad81545e01f3dcc333e54d0dd4d4afc76b410045bd8bc582a642cc0ce583d025d4b8b0182ab3791fe96ae42d292ed8f5caef3250cc7adc5bb8003e9ccf0d53 +EBUILD libnfs-5.0.2.ebuild 1285 BLAKE2B 367a271dc0d4e5bd253a6f3c3c4c87760e3c9bfcedf0b75ef0cbb47ffdc8bdf1268e3e232c7bdba6790c8e6f9128d2707110f958dd9f02a948b004f1831b5bc0 SHA512 2d0b2c5994210be5db509a3957acaa3480abeca426e542b0ff17f44b99f60510fd53ea19e6fa361d108bccb4821dd52ef78da0bf14e82de6753f9e76dbb8f9e7 +EBUILD libnfs-5.0.3.ebuild 1288 BLAKE2B 7442ddfcf9ee839f601a5b32f203c0280ba0b220a80c3f3d6c5583a2ccf0ede90372b6f0e55bf0fc17bb49252ec5d3fddf7cd0c0083ff039f707aa3c542db64c SHA512 b2094628498211447ea29ff9368b105ef4f9ee443a5cb7584e62a286f179a1a38188f4b89e2706d000a583a738b520380fe8fcc8095ce642b0df8552783f9314 +EBUILD libnfs-9999.ebuild 1284 BLAKE2B 7eb5d01603054bea3b1dd3b5b0a221c4271f8efd721f7034c6f300eac7cd4580a69ef435167282b7dca419ac7f4ead0ed3feefa12ed6d7fe207f8d1784c02275 SHA512 e26d293a35f70a74f1f285b97645ae2784d94b718cee72c85c9a7f0c8a015cdda89462c6c4dcb2db30281e3b6f51c8e422147e4bbadfbc0de698101768e86f4f MISC metadata.xml 417 BLAKE2B f9c2243fdec47c029b7e581f7e731889342332b5740973d261dd2e353db0cca2728c9b61bcf610204254ebee62bb1eb7cf51b37236d2959536807f6460343fd5 SHA512 f64ea69505b03c25f70e632645efbfcab90ae974ed3909dc90c9cb5df7aefa519a0a54b457df0b3a19b033b9d6c56155163db5b58244cae1f4e8eaa76beeecc7 diff --git a/net-fs/libnfs/libnfs-5.0.2.ebuild b/net-fs/libnfs/libnfs-5.0.2.ebuild index cb3adf3e648f..ad0a7e94d965 100644 --- a/net-fs/libnfs/libnfs-5.0.2.ebuild +++ b/net-fs/libnfs/libnfs-5.0.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86" S="${WORKDIR}"/${PN}-${P} fi diff --git a/net-fs/libnfs/libnfs-5.0.3.ebuild b/net-fs/libnfs/libnfs-5.0.3.ebuild index f1f29dc19bc3..fdbc53bdb293 100644 --- a/net-fs/libnfs/libnfs-5.0.3.ebuild +++ b/net-fs/libnfs/libnfs-5.0.3.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86" S="${WORKDIR}"/${PN}-${P} fi diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild index 3c544aaa465a..954d8da6cd2d 100644 --- a/net-fs/libnfs/libnfs-9999.ebuild +++ b/net-fs/libnfs/libnfs-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86" S="${WORKDIR}"/${PN}-${P} fi diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 88953f0cb509..2790aa7a0ba9 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -11,6 +11,8 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac 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 +DIST nfs-utils-2.7.1.tar.bz2 1001424 BLAKE2B 176c5559c23c2761c1f2beed068fda8bdd39ac9fa09b4b223552c1455152c410d8925adf8d0023300d4355338e9dc8f6b2774ba71488e795945e5f1fee2b305c SHA512 9e55d4a0d672dbb0e20f8ea0213355a0bec054124c2a9437b3e4b81214c24ef5adb43914bd8606d4af14801ec8e6a4f849c9a97d76ae0879566792bbc960845a +EBUILD nfs-utils-2.6.4-r11.ebuild 5592 BLAKE2B 4cbda09dd996efc84b345655eab401da928a5b02af790ac46aebdc89a8b7fe0daf164149053422a8e229307fc9a4f2699d1a9463f6322a83829ee9dba9cdfd46 SHA512 2862d4ecc649da96dffec651bcbd41530d163c1cd3d71dd26c6970ffd643eab378acac35999a39759f05a2194216a332220e0b170979c878bb6e1f48fd75aad6 +EBUILD nfs-utils-2.6.4-r12.ebuild 5646 BLAKE2B 2fd03cf26c31d48818e31f61bf3a36b9cf4c60832b36f356f296a59d2b2b5ada66e94a440fe7e6ed00f02a93a0aab19baee18224da7b967c76f2c70c87e2db42 SHA512 32547c32e56ccd9d73bdadee83ed1ad478bd8b0609c2de2a193356d8628ebfa722a8c0fd867f9bd88392881c6fb408818f7a0b68bf11cbf29d51d956edc24009 +EBUILD nfs-utils-2.7.1.ebuild 5594 BLAKE2B a381e0e926f339702b6c144f5a24a22bdb7e3a87d53bc338b8efbcc9e8f2d8bef7ba465215c27d5f426f42bbedc6c9e8997bdf76d3a7a76ab6245e3e7ba5fa61 SHA512 65f5fdf556ebb8efc79ae316db131d41e043cc6ad3d96c17148837f9e0981ff64e91131fd2c66ee8c608753de4a779de9325cd5f226174cda468203bedaa31c4 MISC metadata.xml 791 BLAKE2B 485b8c79a2c3174f1f8e95a153c8aac2346f2018817f2d461d2b68a8c8584ee16de42686aba65532b7393cb479d358cd9c8e0e7cf1e0273422bbd4e734231dfd SHA512 1ff20e3a93976961db2b32ce32417826e83366ffac397206872f323048b0468852b90234dcb74a662fca3a18248a96def3a47d01cfdc9a51774cbfdc279bd421 diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild index f05dfd7a5a6c..99425764d734 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" 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 index ead93571698f..2b41f321ec76 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r12.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="GPL-2" diff --git a/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild new file mode 100644 index 000000000000..ea544770aaf9 --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-2.7.1.ebuild @@ -0,0 +1,214 @@ +# 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 ~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}"/${PN}-2.6.4-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 CONFIG_CRYPTO_MD5 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/samba/Manifest b/net-fs/samba/Manifest index 659b2f86a23a..11255c6590c1 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,28 +1,19 @@ AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696d8e933d90b385f0c958a493ab684436915630de2884383e24eb1c9955ebd2b526b0b8f30438d9204dcb57 SHA512 3bfa4c8e0d77994fbca25eb0e12617166909c4d6742d1800c73f5640a7c39ee760988a315d39ddf8a575097df3d3c6fe3f308e8ca1cd698018544a9060176f4e AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679 -AUX cmocka-config_h.patch 763 BLAKE2B 9f84366da43a9d353b0116361cf44302c2c9c1c2223bf19f4f9f9014f2af621332907dca5cdb85a9f277d8ee7fceb92021133f94fa4e98bfe620b384f08d001c SHA512 b38e7ea4cae0e678ce775cfb211afd5416dba219bec8735edc7decc1dbacf99a77f8abbbded444eb4252b778d8c07754a203f504b68f88578828ca5455bc9e0c AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8 AUX samba-4.18.4-pam.patch 900 BLAKE2B c2e07609d619a50086ac7727d714ae5bd9508b548f070b9c8193fa5ff4c2051b8f9ee8c3d636693746ae4b4a422add093a95bf3e713e7a4c9325fe6a8a2a2f4c SHA512 5cb997276a35ad6a188801deac7ccaad0e1b8c92f2070fcac62513ea371afc1d9d3414550d3c65726a4a813a4a619ada25063a6d7f145243873c1d9ed6d9690f AUX samba.conf 146 BLAKE2B d86e630dba5fcb3a0bb22ac6daf8b0f63d30903c31911353116bc7a63e3ba434f69fd2cbe7a854ab3dc994b95e630932dcbe556fdd6372d27cea5a15618aa816 SHA512 da9ae57a6740135745453e776040b1e54bb492b351a1aa700b8868ef2d1716c0d54b55400cd9b1b1877e065d896ca1569b5a617863c698676250d8ea29939a52 -DIST samba-4.18.10.tar.gz 41352009 BLAKE2B 191928a3b0b2ff203de83a208dd61ac047bc666b744b0ba16a8f9a7e2e072438e2980bf0096ac95cc44003526b2098e763a29b4317083a1e3192f7e3cae2ab85 SHA512 19fed2644b1cb5a5bddca6c7eb2da11b4faf224b060b52ac9131f321d194dc650ea3082051960253e2ce627cdc06ef396778fa0f95e3e9b79f74cd1422577d80 -DIST samba-4.18.11.tar.gz 41352059 BLAKE2B b2a39079286c5c0ca7beec99597ef6004c37eb81e7772b010c78b95b468b48d0370941717b8b919f0308e5313be4fc6a09374460eb2a0d2d7b26e3a8cea996d0 SHA512 7ae0f739070133c803fff3daf27ae2b0adff7336affb4898b07e5ca13bd6658228e8796565374e5a2c14e0b16ae84f404d3a62454096cacccc120520d379199f -DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246 -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 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 +DIST samba-4.19.8.tar.gz 41878540 BLAKE2B 8d0e720ad572b6c17d90b5f9822eae6bdbaedcc05397fb79a77fc3838a6c9fac852f7ef31d47433efe057b39d97652c7391c4d28b33c4b8f95503129e0bb8470 SHA512 90d5bc6f52d7905b00b846e024220c0eec999d83f0343522e1cf76038e7630280bd0c039ce553e3024f8ebf91ab9b5f18d9395bd46811e1a3bc97261d1f69ca7 +DIST samba-4.19.9.tar.gz 41877221 BLAKE2B 62c6fa2bca40edd8ff879aa34515532a9dc2620df6d6c9cc88677fbd5ff337a635a5ab7964df36d28a1c09748a343424100fa5d483005e9bb34706fa713f4d97 SHA512 c7345cbf2b756429cb7ae4e722f7e3389778711b64a943885b8fdb0e1db85ea93fff6098378d973f8a971faf05052c7f23a6a067e713680c5345b046d9a1fec1 +DIST samba-4.20.5.tar.gz 42503174 BLAKE2B c0e3eed4b7ee02697f379d2f1697ba05536885345fbd6a28959f167686176a2b228306c7a691a3f63940944dc219523a7683f9f41a0150bae94e691c6a89b6cc SHA512 a666fc76dad2d9a68e802454555d2e93f7f71c2781ca5d11cf2fe8af046990b4be6677bbc754298613173849efb4387c16c2fd5557d65ba8b5a1ac02bd8c542a +DIST samba-4.21.0.tar.gz 42625973 BLAKE2B 0889f2be3b78affee88250114397de87a77da77d9674815ec5605780a6bb3e2e28dbbae53b66695196408f4aef550acce793e6397045fbea4bb236fdd095ce1a SHA512 5d1d7f89d46f29a772bb56c060934e6868e5a3962915f3c5ab2daff3c3f49863af36c89f989066dd496cf5d0ed8cc63ad9c93f2cfe0b98797baa87b50bc5bf3f +DIST samba-4.21.1.tar.gz 42635617 BLAKE2B e99c6d45758d50195a634d2a2ebdbe324ca3f205d8013fb8fb2160c2581d7551bbff946f3413b2782648470e922d84d8a2f9c3d33e32c46db6391b749ba30000 SHA512 a3fb57d9dc72e7b924995cc59887535a75f4462d3afb68098321efeb15541e372071e3f8277006f9e792491e25a0f05127c2929fd2f22d9ee7dace3c13088cdb +EBUILD samba-4.19.7.ebuild 11557 BLAKE2B e84bdc07ee93888e9c96135c1362ea7583d8d523352fb601d985a39208a7baba329e389b0b0af647c576148fec9c16a1e04e106c8973d8c9b14fe3228a58671f SHA512 796d69d0772de646999e8d5929f7d1939e6a38c3e82cf68858750580f7ad742f344958f3e2e24988a28982a14e6ce9b474569931f429a4c3fa85594d2eceb939 +EBUILD samba-4.19.8.ebuild 11564 BLAKE2B 6e2eebc67174b5fc26d5ba90837808194f6062f85ab6bbbf860cd83120f6733dbf4988e777082341b5ccd9f891455e51816a436e85caea8f556c1712579447cb SHA512 00340aad873d29e7593d9bcdd444589754f60e914e09dda75649a183021b6c50b328400b83029efefd1a749a3d283ac303e482e8860e0df57074dcddc0c3f672 +EBUILD samba-4.19.9.ebuild 11564 BLAKE2B 64ca0da721862e93c44a463632a1acbdea03cc43109c355c104a6ef814fad6761304a1c6b091e6541a70538e274c939613b0864cc460f03f50225f1b5bfa4113 SHA512 f9993de03f43e06ed644e7825545afeacd0b69241a4a4038e634d5e7e35e1992703c60d7923ce2dd9c4e20ff29d76d425babb9ca3f538b057ad3cb0873f5171e +EBUILD samba-4.20.5.ebuild 11588 BLAKE2B f7bad7222dfe70434090f34edee90eb4069102deb864d75b8828bf85c0ceaf2e3b6b8ccf7620ef80c6a47d9a93827bc9640b9cad82f81e3735ef06e459501a08 SHA512 04bf31c57957efe4da843aa2859a8e5930beea870915f13a72aaef5230b989f3c2c008730ef3abe7ac64f89adcd0e3a61fa3f58ca13147b512c9f4badffae061 +EBUILD samba-4.21.0.ebuild 11486 BLAKE2B 7e7c7eab6407e08c71fe7c328e2da2adb01961df0bf2dcf1979febc3d6f125056f8ad81f653fb6c5ee18bba90a0a4d20e6b5caa45758095f3317994b91fe6d45 SHA512 111c3e9c9fd9982431d266790c7b677842e6f5fc0034660c8a7e9f448ded6d376bd3cc06e47160a0d159eb2dc897166e057f899a5cfe700ad42f3cc0febcd535 +EBUILD samba-4.21.1.ebuild 11582 BLAKE2B d6ef160384dd63b7f313ea384e29a80a10d31b1c4a723c1948c7d0df4dff58b834eef581e9b40fa88c41e613719cba82a18d39b58258040dc590f5b323c4f12c SHA512 1913b824d764b6a9fbef09b450a191a62fe9a005ea20d773ed38f30eb83361ad51bb17ecc5576c845e5b48a31203ac4740fc0c10792a13f8cc441e26960df30b +MISC metadata.xml 2129 BLAKE2B 22716cc1235dc573023fe31c941bf999916a73bd0de504703c9e9f66b4a1a776e47b74dafe951d0bf04911dfa5e3d8d6354dd8e532fecdf0d51b02cf5eb30da5 SHA512 a6927d5243e95f31a896befa759fea648dd16c19a0a35935da525283a22d314faf5d515f23810026eab94e3bd3cec6431eb5aa3168be8989418f7d66452d92fb diff --git a/net-fs/samba/files/cmocka-config_h.patch b/net-fs/samba/files/cmocka-config_h.patch deleted file mode 100644 index 124928450cd6..000000000000 --- a/net-fs/samba/files/cmocka-config_h.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ./third_party/cmocka/cmocka.h.orig 2024-03-26 10:23:03.378410042 +0100 -+++ ./third_party/cmocka/cmocka.h 2024-03-26 10:24:51.526922405 +0100 -@@ -14,6 +14,11 @@ - * See the License for the specific language governing permissions and - * limitations under the License. - */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #ifndef CMOCKA_H_ - #define CMOCKA_H_ - -@@ -111,7 +114,7 @@ - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml index 0839deab51b0..b2a746fcfc9b 100644 --- a/net-fs/samba/metadata.xml +++ b/net-fs/samba/metadata.xml @@ -16,8 +16,9 @@ <flag name="cluster">Enable support for clustering</flag> <flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag> <flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag> - <flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag> <flag name="iprint">Enabling iPrint technology by Novell</flag> + <flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag> + <flag name="lmdb">Enable LMDB backend for bundled ldb</flag> <flag name="profiling-data">Enables support for collecting profiling data</flag> <flag name="quota">Enables support for user quotas</flag> <flag name="regedit">Enable support for regedit command-line tool</flag> diff --git a/net-fs/samba/samba-4.18.10.ebuild b/net-fs/samba/samba-4.18.10.ebuild deleted file mode 100644 index be5091996562..000000000000 --- a/net-fs/samba/samba-4.18.10.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -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 cpu_flags_x86_aes 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.0" -TDB_VERSION="1.4.8" -TEVENT_VERSION="0.14.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.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.8.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}] ) - 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 - "${FILESDIR}"/cmocka-config_h.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 - --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) - $(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.18.11.ebuild b/net-fs/samba/samba-4.18.11.ebuild deleted file mode 100644 index 853948ccc18f..000000000000 --- a/net-fs/samba/samba-4.18.11.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# 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 cpu_flags_x86_aes 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.0" -TDB_VERSION="1.4.8" -TEVENT_VERSION="0.14.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.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.8.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 - --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) - $(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.18.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild deleted file mode 100644 index 6d1877fa6e7b..000000000000 --- a/net-fs/samba/samba-4.18.8.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -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 cpu_flags_x86_aes 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.0" -TDB_VERSION="1.4.8" -TEVENT_VERSION="0.14.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.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.8.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}] ) - 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 - "${FILESDIR}"/cmocka-config_h.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 - --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) - $(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.18.9.ebuild b/net-fs/samba/samba-4.18.9.ebuild deleted file mode 100644 index 1acb8412bd5c..000000000000 --- a/net-fs/samba/samba-4.18.9.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# 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 cpu_flags_x86_aes 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.0" -TDB_VERSION="1.4.8" -TEVENT_VERSION="0.14.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.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.8.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}] ) - 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 - "${FILESDIR}"/cmocka-config_h.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 - --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) - $(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.19.7.ebuild b/net-fs/samba/samba-4.19.7.ebuild index 0911ede7e865..c80c621228f4 100644 --- a/net-fs/samba/samba-4.19.7.ebuild +++ b/net-fs/samba/samba-4.19.7.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 ~loong ppc ppc64 ~riscv sparc x86" fi S="${WORKDIR}/${MY_P}" @@ -368,6 +368,8 @@ multilib_src_install() { dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + + use python && python_optimize fi if use pam && use winbind ; then diff --git a/net-fs/samba/samba-4.19.6.ebuild b/net-fs/samba/samba-4.19.8.ebuild index 119e2c01cff1..5035cef13434 100644 --- a/net-fs/samba/samba-4.19.6.ebuild +++ b/net-fs/samba/samba-4.19.8.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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -69,7 +69,7 @@ COMMON_DEPEND=" 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.0:=[ldap(+)?,${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}] @@ -368,6 +368,8 @@ multilib_src_install() { dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + + use python && python_optimize fi if use pam && use winbind ; then diff --git a/net-fs/samba/samba-4.19.4.ebuild b/net-fs/samba/samba-4.19.9.ebuild index 9903c474ab38..8348e938a80f 100644 --- a/net-fs/samba/samba-4.19.4.ebuild +++ b/net-fs/samba/samba-4.19.9.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +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 @@ -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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -69,7 +69,7 @@ COMMON_DEPEND=" 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.0:=[ldap(+)?,${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.2:=[ldap(+)?,${MULTILIB_USEDEP}] <sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}] sys-libs/liburing:=[${MULTILIB_USEDEP}] @@ -110,6 +110,7 @@ COMMON_DEPEND=" 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:= ) @@ -146,7 +147,6 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}"/${PN}-4.18.4-pam.patch "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch - "${FILESDIR}"/cmocka-config_h.patch ) CONFDIR="${FILESDIR}/4.4" @@ -368,6 +368,8 @@ multilib_src_install() { dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + + use python && python_optimize fi if use pam && use winbind ; then diff --git a/net-fs/samba/samba-4.20.2.ebuild b/net-fs/samba/samba-4.20.5.ebuild index 55f811279821..5bd9e9da5ca0 100644 --- a/net-fs/samba/samba-4.20.2.ebuild +++ b/net-fs/samba/samba-4.20.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles @@ -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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" @@ -368,6 +368,8 @@ multilib_src_install() { dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + + use python && python_optimize fi if use pam && use winbind ; then diff --git a/net-fs/samba/samba-4.20.1.ebuild b/net-fs/samba/samba-4.21.0.ebuild index 5cdececc5c61..e1985456f25d 100644 --- a/net-fs/samba/samba-4.20.1.ebuild +++ b/net-fs/samba/samba-4.21.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles @@ -16,12 +16,12 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" -SLOT="0" +SLOT="0/2.10.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" @@ -56,7 +56,7 @@ MULTILIB_WRAPPED_HEADERS=( ) TALLOC_VERSION="2.4.2" -TDB_VERSION="1.4.10" +TDB_VERSION="1.4.12" TEVENT_VERSION="0.16.1" COMMON_DEPEND=" @@ -69,8 +69,7 @@ COMMON_DEPEND=" 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.0:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}] + !sys-libs/ldb sys-libs/libcap[${MULTILIB_USEDEP}] sys-libs/liburing:=[${MULTILIB_USEDEP}] sys-libs/ncurses:= @@ -102,7 +101,6 @@ COMMON_DEPEND=" 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}] @@ -288,10 +286,11 @@ multilib_src_configure() { $(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 '')") + $(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) + --private-libraries='!ldb' # bug #683148 --jobs 1 ) @@ -368,6 +367,8 @@ multilib_src_install() { dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + + use python && python_optimize fi if use pam && use winbind ; then diff --git a/net-fs/samba/samba-4.20.0.ebuild b/net-fs/samba/samba-4.21.1.ebuild index 5cdececc5c61..b5be6bbfc3df 100644 --- a/net-fs/samba/samba-4.20.0.ebuild +++ b/net-fs/samba/samba-4.21.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles @@ -16,16 +16,16 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" fi S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" -SLOT="0" +SLOT="0/2.10.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" +IUSE+=" iprint json ldap llvm-libunwind lmdb pam profiling-data python quota" +IUSE+=" +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5" +IUSE+=" systemd test unwind winbind zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} addc? ( json python !system-mitkrb5 winbind ) @@ -56,7 +56,7 @@ MULTILIB_WRAPPED_HEADERS=( ) TALLOC_VERSION="2.4.2" -TDB_VERSION="1.4.10" +TDB_VERSION="1.4.12" TEVENT_VERSION="0.16.1" COMMON_DEPEND=" @@ -69,8 +69,7 @@ COMMON_DEPEND=" 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.0:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}] + !sys-libs/ldb sys-libs/libcap[${MULTILIB_USEDEP}] sys-libs/liburing:=[${MULTILIB_USEDEP}] sys-libs/ncurses:= @@ -100,9 +99,9 @@ COMMON_DEPEND=" gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${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}] @@ -288,10 +287,12 @@ multilib_src_configure() { $(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 '')") + $(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) + --private-libraries='!ldb' + $(usex lmdb '' --without-ldb-lmdb) # bug #683148 --jobs 1 ) @@ -368,6 +369,8 @@ multilib_src_install() { dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + + use python && python_optimize fi if use pam && use winbind ; then diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest index d5b43c44ab70..d9bd63e84759 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 688 BLAKE2B e88979aa29d7cba694ecc3d74efb21fb4ff941dba9575459f245cba84ae557fb8bab7b0f76541298e093f753357254174bbf5ade56f787b9173b23e506d90b39 SHA512 dffc09871b1c6af13197f07ee2c3c2f7153788b2dd7b4578a81d2881156388bf4e856ab918e1c78c5cc29577a15d62d4b8236efb2bbfcd953be4b2037a302a73 +EBUILD sshfs-3.7.3-r1.ebuild 682 BLAKE2B 3b0d464781b8bdcbcd5e6e69548532277dc1283cd18c6422cb4552a8fda17a18c529c9355b60b96724527167532f9c378df9063070c79786c7364055185eeac2 SHA512 b11fd8f04bacebb63d2656cd68dbba9ba3022351a71c27f7840882f98d15959db9a1e3fe67b260239388ae9d873cbc241fb3070f2268ed23182d902e235644b4 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 62a830a7c66d..8b831d8943a1 100644 --- a/net-fs/sshfs/sshfs-3.7.3-r1.ebuild +++ b/net-fs/sshfs/sshfs-3.7.3-r1.ebuild @@ -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 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~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 0d81f197a9d7..74cf86b5ee7a 100644 --- a/net-fs/wdfs/Manifest +++ b/net-fs/wdfs/Manifest @@ -1,5 +1,4 @@ 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-r2.ebuild b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild deleted file mode 100644 index 67ac495d22aa..000000000000 --- a/net-fs/wdfs/wdfs-1.4.2-r2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -IUSE="" - -RDEPEND=">=net-libs/neon-0.24.7 - >=sys-fs/fuse-2.5:0 - dev-libs/glib:2" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-fix-Waddress.patch" -) |