From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-fs/Manifest.gz | Bin 3516 -> 3511 bytes net-fs/btfs/Manifest | 2 + net-fs/btfs/btfs-2.24.ebuild | 39 +++ net-fs/cifs-utils/Manifest | 3 + net-fs/cifs-utils/cifs-utils-6.15.ebuild | 138 +++++++++ net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch | 80 +++++ net-fs/libnfs/Manifest | 4 +- net-fs/libnfs/libnfs-4.0.0.ebuild | 52 ---- net-fs/libnfs/libnfs-5.0.1.ebuild | 2 +- net-fs/nfs-utils/Manifest | 3 - .../files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch | 32 -- net-fs/nfs-utils/nfs-utils-2.5.4-r4.ebuild | 222 ------------- net-fs/nfs4-acl-tools/Manifest | 2 + .../files/nfs4-acl-tools-0.3.7-libtool.patch | 74 +++++ .../nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild | 27 ++ net-fs/samba/Manifest | 17 +- .../samba/files/samba-4.16.1-netdb-defines.patch | 23 ++ net-fs/samba/samba-4.14.12-r3.ebuild | 2 +- net-fs/samba/samba-4.14.13.ebuild | 4 +- net-fs/samba/samba-4.15.4-r3.ebuild | 2 +- net-fs/samba/samba-4.15.6-r1.ebuild | 2 +- net-fs/samba/samba-4.15.7.ebuild | 4 +- net-fs/samba/samba-4.16.0-r1.ebuild | 2 +- net-fs/samba/samba-4.16.1.ebuild | 3 +- net-fs/samba/samba-4.16.2.ebuild | 343 +++++++++++++++++++++ 25 files changed, 753 insertions(+), 329 deletions(-) create mode 100644 net-fs/btfs/btfs-2.24.ebuild create mode 100644 net-fs/cifs-utils/cifs-utils-6.15.ebuild create mode 100644 net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch delete mode 100644 net-fs/libnfs/libnfs-4.0.0.ebuild delete mode 100644 net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch delete mode 100644 net-fs/nfs-utils/nfs-utils-2.5.4-r4.ebuild create mode 100644 net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch create mode 100644 net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild create mode 100644 net-fs/samba/files/samba-4.16.1-netdb-defines.patch create mode 100644 net-fs/samba/samba-4.16.2.ebuild (limited to 'net-fs') diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index f786afa6e5a8..ebe4f2cf05c9 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest index 32bfe80bab2c..704f3c5ffdcb 100644 --- a/net-fs/btfs/Manifest +++ b/net-fs/btfs/Manifest @@ -1,3 +1,5 @@ DIST btfs-2.23.tar.gz 24292 BLAKE2B d834fe347a75ba9633464ef8d7952e557ade9d0008d2845bd72a0277c19fb83bb6aa59c2e97077f67c525fe7fb69509c2a1ba34a5fdfa9069f0915e2f3639a2e SHA512 f911b334367e619621677793342fe36247dc63a8bff6fcab65f0b64e1645bab2ede261a7e7c03c76e18ad75b9b485d8c422e99ffcbd6069ceeb5b5e590bf5f63 +DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c EBUILD btfs-2.23.ebuild 836 BLAKE2B a90b8c0b8b5872096161f733d58780a54e5af15efd1fd50188f4213d69dd9abc5f4614a3fcf29522dfa2b764f661f78475301d51bddfa5773f004cd063b6328c SHA512 381d5bdd0139f0a8b03fee699cda9e637f0382819bc1a765acbcf1bf53b24db535d60b36078dcf443eba8b3eb8bb74f88d47817d9bb77de2d23a50bae3a6ac59 +EBUILD btfs-2.24.ebuild 825 BLAKE2B 57eb12a7c93be3b9b572998ce68edde41e4952a2de4a4c36fb6ca9ea95733b1de4c5bc83aa8068b5006d4c6c39c647b39f25e9a476a71f4eaaaa8e3b1c6da80a SHA512 6de2fa4878e6905a91c7450630a5580342d63f0bc3a8a5ad26131507283aa4ca100be0b346634ebc8b237745f0c590f94d28b4e3edd3b7d10e510252d99a68a5 MISC metadata.xml 244 BLAKE2B 9f54ce24ff94456bd875b5386abf16c27313f10ba739afc1fc817f65fbf530a6562c2fc32caec6f1a976abab2715b98b674e167f23189653846fbb1f7352af5a SHA512 d3ddeeb221e464dfeb68c3ad361277c3711b9c1639246423454393c3158a6aae80757333d97698e938609fb21ef51f15fe1e8ecc6ebe7355c7a418df44f765c1 diff --git a/net-fs/btfs/btfs-2.24.ebuild b/net-fs/btfs/btfs-2.24.ebuild new file mode 100644 index 000000000000..bbf144bed74d --- /dev/null +++ b/net-fs/btfs/btfs-2.24.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit autotools python-r1 + +DESCRIPTION="a bittorrent filesystem based on FUSE" +HOMEPAGE="https://github.com/johang/btfs" +SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=">=sys-fs/fuse-2.8.0:0 + >=net-misc/curl-7.22.0 + dev-libs/boost:= + >=net-libs/libtorrent-rasterbar-0.16.0:=" +RDEPEND="${DEPEND} + ${PYTHON_DEPS}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Don't install btplay via make + sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die + + eautoreconf +} + +src_install() { + default + + python_foreach_impl python_doscript scripts/btplay +} diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index 86eecb69be52..188fc4c1a26a 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -1,6 +1,9 @@ AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26 +AUX cifs-utils-6.15-musl.patch 2215 BLAKE2B 251be73f341d4573aa509915e364680fc6d85ed720ad5682812cd6ba418a64bd7c397bd742cd999cea52fda0e07d668e796383f034c5ccb1639764f93d050e9e SHA512 902deb413bbc7f34d9933fcae9c48c73bb2fb2aaca22b5ef3efd394bb2d550456548c08087db41a96a60f3e1ed945127ba242dc980b286dbf3abad1b0694c605 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f815ee4fbb750bf8b7d7110a69a808682c239a7c9196468ecc4d55a26eed3b63f8d8539569e16131060f57de389ef92e1063283eb2f41e65be00ed21bb1 SHA512 13d1fb8ff7c31100bfa481e647e9d3b90d61633173b3a71683246d7bb4b68c7e147d21697a17b7ad60e1ac8da2d48d6f4b51762370536a32d14da6c9a6db7e5e DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de +DIST cifs-utils-6.15.tar.bz2 416592 BLAKE2B 8af926bf255c5b3a66bf52ccca99632aacb9ed1c83ad7db5543b32df2f3bcd4be9a9cd17b744ec115d1568d07084e2bd2d03849aa9ab97cff2862f39bcf137b8 SHA512 eedb8066563db584595a8ba7cb7a603e6b763ac2c1261430d605c327fcc5a831acd48b58ea55dd243af778dfdc827ab8c6daf4015764ff550dcffc2182773510 EBUILD cifs-utils-6.13-r1.ebuild 3606 BLAKE2B 398bc6c882a00d7cecb5315a2f2ea6f16b5a580f37f7d5759c25b35f52e314fd35502f4bbaadd0871905c87e4918e97cee728f4d36795d02981f88752686daac SHA512 be39a907aa792ae30603d8db37a08629a4719e8b2eef78603c47b94b464a0780e25b5bb6c40f6d128ddc0a7bca188267e3ba7a6fc180a0b6188c228ae9091c03 +EBUILD cifs-utils-6.15.ebuild 3462 BLAKE2B 26534380a4e18106dee5f08f7479dca69337c200a8302867900f4d0c8b9e397202fb628ec0ca8e39eec90e8b7959a38045ed1ee066d520eea58b201424457a03 SHA512 66832ae0562c98c77a8c011ade50bb33135e0b2cd8d2106e50923761444db6bc5fe6eab139bf3fd0694e274491c007d895c244051d5e6f446e7a2c512bbb06c0 MISC metadata.xml 967 BLAKE2B dc6654b412c77f2e95cad9cfa2d4e4465d3292b546d55ddc04ad1b3d5b8220bbe4ef0b0d1409fb2f5da99851d45567667935057f5d5c15dad4e2cf26e3ce0e00 SHA512 c6b0fbdd9d776695032cd4a3e109717dfa7cd07b1456da8264dc0688fcfa158d1f4a73758ee24ba318f14e7a321811bd24f688ca3c39156b304028566315b650 diff --git a/net-fs/cifs-utils/cifs-utils-6.15.ebuild b/net-fs/cifs-utils/cifs-utils-6.15.ebuild new file mode 100644 index 000000000000..47128fb754a5 --- /dev/null +++ b/net-fs/cifs-utils/cifs-utils-6.15.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit autotools bash-completion-r1 linux-info pam python-single-r1 + +DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" +HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" +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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="+acl +ads +caps creds pam +python systemd" + +RDEPEND=" + sys-apps/keyutils:= + ads? ( + sys-libs/talloc + virtual/krb5 + ) + caps? ( sys-libs/libcap-ng ) + pam? ( 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 + + 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() { + 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 + 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/cifs-utils/files/cifs-utils-6.15-musl.patch b/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch new file mode 100644 index 000000000000..f17cc68bdaca --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch @@ -0,0 +1,80 @@ +https://marc.info/?l=linux-cifs&m=165604639613381&w=2 + +From c267ecf6a1c2152e640897d30cc0e8f637a8ef76 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 24 Jun 2022 05:25:23 +0100 +Subject: [PATCH 1/2] getcifsacl, setcifsacl: add missing + include for XATTR_SIZE_MAX + +Needed to build on musl. It only works on glibc because of transitive includes +(which could break in future). + +Example failure: +``` +getcifsacl.c: In function 'getcifsacl': +getcifsacl.c:429:24: error: 'XATTR_SIZE_MAX' undeclared (first use in this function) + 429 | if (bufsize >= XATTR_SIZE_MAX) { + | ^~~~~~~~~~~~~~ +``` + +Bug: https://bugs.gentoo.org/842195 +Signed-off-by: Sam James +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include "cifsacl.h" + #include "idmap_plugin.h" +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + #include + + #include "cifsacl.h" +From d1a36cc4caa541d1f0f9a3426a5202b680cf7ff8 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 24 Jun 2022 05:26:54 +0100 +Subject: [PATCH 2/2] getcifsacl, setcifsacl: add missing include + for le32toh + +Needed to fix build on musl libc. It only works by chance on glibc +because of transitive includes (which could break at any time). + +Example failure: +``` +getcifsacl.c: In function 'print_ace': +getcifsacl.c:284:16: warning: implicit declaration of function 'le16toh' [-Wimplicit-function-declaration] + 284 | size = le16toh(pace->size); + | ^~~~~~~ +``` + +Bug: https://bugs.gentoo.org/842195 +Signed-off-by: Sam James +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -23,6 +23,7 @@ + #include "config.h" + #endif /* HAVE_CONFIG_H */ + ++#include + #include + #include + #include +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -38,6 +38,7 @@ + #include "config.h" + #endif /* HAVE_CONFIG_H */ + ++#include + #include + #include + #include diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest index 313e711daac6..4e12bd08fb5e 100644 --- a/net-fs/libnfs/Manifest +++ b/net-fs/libnfs/Manifest @@ -1,7 +1,5 @@ AUX libnfs-5.0.1-pthread-configure.patch 1220 BLAKE2B c8a21a2bd75aa60d890336bd398171687eab914b588060c2ded2fe2102bad1eb4c29370694889941b2c1d13a46d27e804efb37974e667036f461ee39104d0bc4 SHA512 c07cc4dd5923ecd5ee79e5353c20378d1752d47f34d57939d4db0dcfe0ac57e3e93ceb5834b8581533c7bcf0989cf0cab4ca62da6b2d59e0e9aa7b039e5db713 -DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf -EBUILD libnfs-4.0.0.ebuild 1223 BLAKE2B 85ef61529fb309a6c8bbb3da4ad17326d0191f99aaf44c617f6725c02a3d28110c185d81e4e15f2468cc4a9799789fc005c55f5c20f30f892745e15c953b0e40 SHA512 751cd29ef229f14c52336bfddcce70aceed788a6088b9ed8b6c1d6341b91a0edfacca4d81863c97b601e53f06aa14c899c8148863412eec1e0e7d682db7305dd -EBUILD libnfs-5.0.1.ebuild 1354 BLAKE2B cd06de29ae67e7bbb2fcb41465e0f6056c70e209fddd603215ab1ac5d2002fd8a5e9e8a4f63868df18a621e4d3b8e21bf8b94dc2c7810c51a8dc841c74efb932 SHA512 7e0efa2b85c0bb027943bf8f6bd6588bf78886bcbb05492e3b323bd9b9a1f38603ea5f6114882a5ce13eb930f5d26505193088231cb4b86466717dde07498882 +EBUILD libnfs-5.0.1.ebuild 1348 BLAKE2B 56e0e90b0cacca05e4b4f057c65cdc11c0ad97cface8d1abbe433d9127e5c7681a39f83204627b7680921a121c6388cd4ac66ecf6873130d7d6dc4aaab33a7d5 SHA512 9328194e0fea542124a1f300e0482eb7d0b8f8c7c2d13997732839dfb49ba4cbbb9a1d4098276e59113195ceb44cd21d4aee2bdc214f86b97f4b7e9437a5bd77 EBUILD libnfs-9999.ebuild 1289 BLAKE2B f82d438f3fb46371e0b76ab9ae6ef6d4e8ddba32bfd578cb9b44076d081e98ec525a17b39a174e4cbf3729e41cb6dee664dd6e8040b11cc0cf54f6493e576647 SHA512 5640c14b70b8d26faab56169c99ffd3c861d0f63303d8f47a41230227757c613fbe2c66c5d7d5dc937cdf82b3e12683c5cb7eb17a7ba3953dab4715315ea95ff MISC metadata.xml 417 BLAKE2B f9c2243fdec47c029b7e581f7e731889342332b5740973d261dd2e353db0cca2728c9b61bcf610204254ebee62bb1eb7cf51b37236d2959536807f6460343fd5 SHA512 f64ea69505b03c25f70e632645efbfcab90ae974ed3909dc90c9cb5df7aefa519a0a54b457df0b3a19b033b9d6c56155163db5b58244cae1f4e8eaa76beeecc7 diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild deleted file mode 100644 index dd9e9fd14f27..000000000000 --- a/net-fs/libnfs/libnfs-4.0.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" -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" - S="${WORKDIR}/${PN}-${P}" -fi - -DESCRIPTION="Client library for accessing NFS shares over a network" -HOMEPAGE="https://github.com/sahlberg/libnfs" - -LICENSE="LGPL-2.1 GPL-3" -SLOT="0/13" # sub-slot matches SONAME major -IUSE="examples static-libs utils" - -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-werror - $(use_enable static-libs static) - $(use_enable utils) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - if use examples; then - # --enable-examples configure switch just compiles them - # better install sources instead - exeinto /usr/share/doc/${PF}/examples/ - for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do - doexe examples/${program}.c - done - fi - find "${ED}" -name "*.la" -delete || die -} diff --git a/net-fs/libnfs/libnfs-5.0.1.ebuild b/net-fs/libnfs/libnfs-5.0.1.ebuild index 697b530e9448..04425c5f0208 100644 --- a/net-fs/libnfs/libnfs-5.0.1.ebuild +++ b/net-fs/libnfs/libnfs-5.0.1.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" 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 ~ia64 ~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 53e223058c05..d55d881860ff 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,6 +1,5 @@ AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3f4f25f7560c17ce72a62b489998e1d4d4875d574b27fe057388bcd7f0062703b812ce043b23dfe46fdabc9ba53591edcb SHA512 9cabbfa67d193c2c944c257089d67bc33230fb804d3a350ee2bcd5595594ff35ba6485c1ab240b956f5c08c40a41a0adc87c9ad9f967d2b7eb1d2dd51c9a6e9e -AUX nfs-utils-2.5.4-kernel-5.3-nfsv4.patch 1106 BLAKE2B 6b433e2e283f06947fd790153d5d1eeae4a4155f2af6a8ff14f25d60513a937393c15a2055b9e25147e57dfec1688bfb0a8cbb44e154390f3d74d32ff4428c26 SHA512 b144bf464c67fbbe63c00340d246db851d4ebed65caa9ada03f01134719fb106e0cd40fcd89e0bab71665e8a5e0a94c760daad74d32e5a873514884d62c17e9b AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 AUX nfs.initd 4018 BLAKE2B 87d9111c7961db63e6a2eba1788f2bd7113e14e96a203f2f0e2a551f64dd1e19b8f4ed6a62658f48bf88007c3e115916a4d24f3cd1983df25cd09f0a21cacf79 SHA512 840f62a16b3d4cf651011f49b76033c01033b18336b2798705449ed7b15c4e6f545fb318674868d6a223781a2752bdcef4c9c3435eddf11fd0416f2037591608 AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92 @@ -11,8 +10,6 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970 AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f -DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305 DIST nfs-utils-2.6.1.tar.bz2 946432 BLAKE2B fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d SHA512 5b8949b3d30ccd33c9bc68875ba0993a22e490234d5eeebc189b3da2b1df0c290cd27d58226ffa5f4fe8b9548234fadb1c432b9c7d9b297c10a39fd2887d2f7f -EBUILD nfs-utils-2.5.4-r4.ebuild 6129 BLAKE2B affb9b46c151e19d427e655f30c0228475dd1881571d7194a87d53e83398c6027a9d26e1f82f5b06aff6882c83df0ef3700431343fadc82dec7b043f301710c7 SHA512 0e193aec80bfee784f024ba300d7081850e9190f9210766c99d30307d9018583a303fe4d5382b8d81aa5f23c62ab8e0bdb576ff751cb22e7f64a662410d2bbbf EBUILD nfs-utils-2.6.1.ebuild 6003 BLAKE2B 0ea1788b3ecb0de6e01f00955bcfce4ddee8ccb57670561834c5952553a08249dd82a063a3cd7d663241db8327d7dd003480bf1eb9ad97fac957ca703f69ad06 SHA512 959ee5059c9dd459d3d5a3f818f2a3f6d68a2caaff2363d44426e7c2ce3b03f2cb2be667cc3d014bd96ab8776b592e85b8ac03569f9f14bb427c6b2dfe059d11 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch deleted file mode 100644 index c9a543191b5d..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.5.4-kernel-5.3-nfsv4.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=feb3dfc7127cf1337530ccb06ed90e818b026a07#patch1 -https://bugzilla.redhat.com/show_bug.cgi?id=1979816 -https://bugs.gentoo.org/808183 - -Slightly rebased by sam@ to account for version.h moving around. - -From feb3dfc7127cf1337530ccb06ed90e818b026a07 Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Wed, 22 Sep 2021 11:31:56 -0400 -Subject: [PATCH] mountd: only do NFSv4 logging on supported kernels. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1979816 -Signed-off-by: Steve Dickson ---- a/support/export/v4clients.c -+++ b/support/export/v4clients.c -@@ -10,6 +10,7 @@ - #include - #include - #include "export.h" -+#include "../../utils/mount/version.h" - - /* search.h declares 'struct entry' and nfs_prot.h - * does too. Easiest fix is to trick search.h into -@@ -23,6 +24,8 @@ static int clients_fd = -1; - - void v4clients_init(void) - { -+ if (linux_version_code() < MAKE_VERSION(5, 3, 0)) -+ return; - if (clients_fd >= 0) - return; - clients_fd = inotify_init1(IN_NONBLOCK); diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r4.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r4.ebuild deleted file mode 100644 index c06c0577e9ce..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.5.4-r4.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -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="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# 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:= - >=net-nds/rpcbind-0.2.4 - sys-fs/e2fsprogs - caps? ( sys-libs/libcap ) - ldap? ( - net-nds/openldap:= - sasl? ( - app-crypt/mit-krb5 - dev-libs/cyrus-sasl:2 - ) - ) - libmount? ( sys-apps/util-linux ) - nfsv4? ( - dev-db/sqlite:3 - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9:= - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - 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 - !net-nds/portmap - ! id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - - # 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 - - if systemd_is_booted; then - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 1.3.0; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - done - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs4-acl-tools/Manifest b/net-fs/nfs4-acl-tools/Manifest index 19d00b442333..8e1bec559bb0 100644 --- a/net-fs/nfs4-acl-tools/Manifest +++ b/net-fs/nfs4-acl-tools/Manifest @@ -1,4 +1,6 @@ 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 DIST nfs4-acl-tools-0.3.7.tar.gz 99139 BLAKE2B 5125fca65ee7b9dcea16e9b633bbfc26aa5c74202412119f138a5c47ae67d8f8e72fd4eb43182aaf3119858eb83fe6f24f6b53abc0b448aca04c3de4043ad9c1 SHA512 3922bced4e74891b0c4ea10a03eec0cc2e531de355776ba364a91bd656a78d19f9cfba026face34331841ee7c8609f12084fc10081601bc65aaf0fb008ca2fc6 +EBUILD nfs4-acl-tools-0.3.7-r1.ebuild 593 BLAKE2B dcf181bb5222a3b52796ca6bb8ef33aa89bf7cafc0cd5f180ff1337274079d3d45c9e0ec0bbb48710f719dab8684ed7415435b335b8086130176052aed667332 SHA512 f9101519474617af6827505a3b1721edadd9b8668469b452d92ff2be64815093419fe68f9865d486e9c46b70e55e65fdedab99c59ff9ac575883e30316310404 EBUILD nfs4-acl-tools-0.3.7.ebuild 552 BLAKE2B c29e1f554791deffe8739d551a3fae46403e86f0accdc6f99f58fb420c8f0b85da8087da583425d0c759534ee23da72f49f9221691893b9cc65b9e2a7e8b5cf6 SHA512 0f4145efb55e96385da56d71abfa4bda3ddadd4e2fb64133c3766cdfc22b23027025294ca8e2ccb71e438c75175435fd52692e90163559ccc1d9622122518355 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch new file mode 100644 index 000000000000..7eb4d67e552d --- /dev/null +++ b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch @@ -0,0 +1,74 @@ +https://bugs.gentoo.org/731162 + +From 2abd5015bf6bac1697ac4422d76fa121a49f2b24 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 17 Jun 2022 12:36:01 -0700 +Subject: [PATCH] configure: Add missing LT_INIT + +Otherwise it fails to generate libtool for the build breaking the build +when using a different toolchain than the system libtool. It also breaks +the build with rlibtool which depends on the generated libtool to +determine if it should build static or shared libraries. + +The existing make and libtool tests were removed as unnecessary and +problematic. +--- a/configure.ac ++++ b/configure.ac +@@ -9,6 +9,9 @@ AC_ARG_ENABLE(shared, + enable_shared=no) + AC_SUBST(enable_shared) + ++LT_INIT ++ ++AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_PROG_CC + +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -39,6 +39,8 @@ DEBUG = @debug_build@ + OPTIMIZER = @opt_build@ + MALLOCLIB = @malloc_lib@ + ++top_builddir = $(TOPDIR) ++ + LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la + LIBATTR = @libattr@ + +@@ -68,7 +70,6 @@ AWK = @awk@ + SED = @sed@ + TAR = @tar@ + ZIP = @zip@ +-MAKE = @make@ + ECHO = @echo@ + SORT = @sort@ + LN_S = @LN_S@ +--- a/m4/package_utilies.m4 ++++ b/m4/package_utilies.m4 +@@ -22,26 +22,6 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], + AC_SUBST(cc) + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) + +- if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin) +- fi +- if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, make,, /usr/bin) +- fi +- make=$MAKE +- AC_SUBST(make) +- AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) +- +- if test -z "$LIBTOOL"; then +- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) +- fi +- if test -z "$LIBTOOL"; then +- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi +- libtool=$LIBTOOL +- AC_SUBST(libtool) +- AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) +- + if test -z "$TAR"; then + AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) + fi diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild new file mode 100644 index 000000000000..d6a9c1322069 --- /dev/null +++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 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=bfields/nfs4-acl-tools.git;a=summary" +SRC_URI="https://linux-nfs.org/~bfields/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-apps/attr" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-libtool.patch # bug #731162 + "${FILESDIR}"/${PN}-0.3.5-jobserver-unavailable.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index c2affbafe692..f7be7d94d7f2 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,6 +1,7 @@ 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 samba-4.16.1-netdb-defines.patch 546 BLAKE2B eb42eb3429a221d700cc53381cda2a2dbff72cf43a0c3d5d8564d5e264a1ffaff15e3fd13f9647dd0a76e99323d656c07f26cf9c941f7407769c1a986c8c9025 SHA512 3802cf51d1dbcdf631ab4ffdc115ea58ad8d7bf1a23600e91eff2a70fcffb80161a3e87c360f7c961dae99c8f0267bf8f9feed739b388d012ece32bcf97c1dcf AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2 DIST samba-4.14.12.tar.gz 19145135 BLAKE2B 94ffc6dee4448e302591bf30bc34f75c5cdeab8acaa04b2d1105a0f0155ba13d366e61f2d0b38060fccb841febcc212d8ab7b6dfd860d784ae9299a375cb98c3 SHA512 6a021d61dc2a8894c646a9b6d85e38c9020b3c227f10d1820cbdf2ad6793c0beeacedd5fff5f75718d4083ec9169cb1fb58f65636e1a50e638fcefce355690d9 @@ -10,11 +11,13 @@ DIST samba-4.15.6.tar.gz 19290189 BLAKE2B 14a8d3cf03de303cce54e5b336f5866f5d3ded DIST samba-4.15.7.tar.gz 19290930 BLAKE2B 4a295f79d38212d4c6917ed61a22e4204b5ea3d5e26f30b65d1e7e81842e92405870dd40fd4d05ec1126a532bdb1ddea300848387a4c64370ba5c2c1354ee8e5 SHA512 beffb09b5bcd62991398d39c7a8aec5fed0c51d550e2f0fb42b2e0a09094f4c6a8f29adf708c4969db12329f5c7343d2debd04315107b79bef59e99a4a7e4ce4 DIST samba-4.16.0.tar.gz 30583390 BLAKE2B 6ea27634690d00779ec7f671e48b17246285c9576221d9b9b3f9238cd72310e8aaaeb646031212e65c239d2e959deef7bd9739932db0c716b7ea79cc11f2f7b8 SHA512 cea6bab64021779d217669e58612d192b907c2c481ef30e40e449bc6b8f8993a9b7b7b5bfcfebe54d8f70b8f720893cfa77a9d674ef8e07dd45a55a0fbc673e2 DIST samba-4.16.1.tar.gz 30590897 BLAKE2B 4e22b1a8bbef28116cad71c87da1aaaa39459d5eeb30e975aec6444369576ce716917d3ee89c0b328e457e2dcda17abe705d1f33d12b4205efcebdc54ba7f2fd SHA512 d82ab250e87cb64b083345b61da8c4edbb2185a13f8cef33232f823fd510822570ed27c7b260a1fefd3af3b2fc4b271257c2c3e6ab3241c8c147bebae6ab39fc -EBUILD samba-4.14.12-r3.ebuild 10040 BLAKE2B c9ad850fafba81c0d61f3e8e2bf674e40c1b3695410f90fd62e8f5416319fdc48965b4efa81855c37b7303bbfcbe491ec065b41d13a06e07417bea2f3170a51d SHA512 667e5d67cbb195d1a6f6af14aaf9a8015f2983db53015addb6552c95e03d411e54a0c612fe0fe473ed6187a53cb2ea4e0ed93cebdfe06dc715ef848b8ba6130e -EBUILD samba-4.14.13.ebuild 10048 BLAKE2B 2d98ae0c95466f5f4c5ac6983c84d8000076dc3181deeebec95afb3aa90ad813dc618a98700b4d25e6294b086905fd98806cb35de27f57622fb16bad77223782 SHA512 ae64e1813d29a03667b047a2f8e7d82b5cb03a3f9f7179f6a23c3845fc71e523533fd6f06591c0cb0e0fae288ead42796b5d4cd59d7072b6b0ab1eaa14a6ea8a -EBUILD samba-4.15.4-r3.ebuild 9973 BLAKE2B 002258983c24a5fb644cc01d5bfe67012deb1122c5f3b12a76302849ed5515f75519393bad108d8684adcbd72be1d4a6c3c01c90af4ea0c9062db7182dbf255d SHA512 af2a22067b6eef8a312950c0e0ae8c9b73d166c80dce110fab1f2a5e3d58beecfde44a40b5c4f9fd30d10eca96e6f3051879c7edb399317603185ae4c99bdc30 -EBUILD samba-4.15.6-r1.ebuild 10031 BLAKE2B 21b8bcbb2072b42dab3a4f34c5fc4e6d6a0d7ea3311be5b1d2b0b62dea40916babc0a3dd32ce480129a4425e1898dcf8030b4989bd59762c7f4366e2c1edbe6e SHA512 40d3bfb3083991d95eb7823a7797824a83ee63d1d4d4d825e4642942265adf56eb6a5c75047e1838d1aafa1d66507d03ca0fdd888e08e22cb6540e9beddad3f9 -EBUILD samba-4.15.7.ebuild 10031 BLAKE2B 21b8bcbb2072b42dab3a4f34c5fc4e6d6a0d7ea3311be5b1d2b0b62dea40916babc0a3dd32ce480129a4425e1898dcf8030b4989bd59762c7f4366e2c1edbe6e SHA512 40d3bfb3083991d95eb7823a7797824a83ee63d1d4d4d825e4642942265adf56eb6a5c75047e1838d1aafa1d66507d03ca0fdd888e08e22cb6540e9beddad3f9 -EBUILD samba-4.16.0-r1.ebuild 10046 BLAKE2B 958b65611340a78714225088146d0f6cc170dbe1c6d143a1d3c8d5f4c840d8a068a7b51d2d884876a9d1808187ff8ce3d0ca01a4703325d008fd11a7a1651465 SHA512 1f5b52ce26b4bc158c760822f85e537ff6193439adcfe84b07e58ef9ccdc8f1ebf5c3ccce7b0b666cdf9c43920ff78a567597059ce69b0b849fad39f8680869c -EBUILD samba-4.16.1.ebuild 10046 BLAKE2B 958b65611340a78714225088146d0f6cc170dbe1c6d143a1d3c8d5f4c840d8a068a7b51d2d884876a9d1808187ff8ce3d0ca01a4703325d008fd11a7a1651465 SHA512 1f5b52ce26b4bc158c760822f85e537ff6193439adcfe84b07e58ef9ccdc8f1ebf5c3ccce7b0b666cdf9c43920ff78a567597059ce69b0b849fad39f8680869c +DIST samba-4.16.2.tar.gz 30597031 BLAKE2B d1268cb34ef951a47bd6cd8b76fa8576f3db2a4faca1fdae90f096f25d5e90e9eaca49c73f7952a6c8cf48a200247fb9957b230efb9ec725c29a1af16d8aa37e SHA512 ed85acca0f23f9166530b600ae569f3259c2122d15e361fd3fe48a82921cd53bbb459d6c102bb60cc40b2dd811cde1262a3fb17ed6015a260432bffe5af83366 +EBUILD samba-4.14.12-r3.ebuild 10031 BLAKE2B ef98c98e96c6bc442ae917f5ea98eac20ad8b47e5cf95d629c3c057885a5e0d2b15c57d435c792b2a4edc5d8e75a76a4b0903d08efab1b9832e8a324c23d1357 SHA512 e73d8c96e32582e5c7fb80dfa89f4c1506106e8dc9bdb07e17ab676c1d8c2a9b319e1f4e5d2cf76046dfc5b78868484fca5c32b1835ca06701e6719be754b635 +EBUILD samba-4.14.13.ebuild 10033 BLAKE2B 55deafc994a7646b1d11bc3e7281be3c1feb620f7ea3657a9e6054ea3a27c0fa598cc29a38dd5063816a410122b73e15cce413e8c82c38b7fd9b875c48fc2810 SHA512 b04663ab851610b7cc3b2354ef9cdd5e7cd88699fe940da9706000e9a7376328c6e192b4fab15df826cd581587e778d1ed7ed359e5358ffccdb59bf7fc59390b +EBUILD samba-4.15.4-r3.ebuild 9964 BLAKE2B 33e95d71e3a5d3172fc8dae76807e198b2ef4100d32d5e8bee2964dd41b2a9f3396c3b9b9d2a93e75ec47b94365871c6005ceca35a153f42f5e143b8fe2c24aa SHA512 bacfa5b5a1c29f8eefaea6b5b31134ce8a0059b2365987453cf14994ae0122cca4e241445e600689072eab27ca1809347c0321515728da792a166aad37801fe1 +EBUILD samba-4.15.6-r1.ebuild 10022 BLAKE2B 0588e5c12f2c4d31bc8e34c50de2cc8894d7eb62df1d55f243f067e0938408fea6fa0cba01d47606ad132e560214a76f2771f2197318b2757c988255a18d0a3a SHA512 45f04624f8a88acbc4b3939d7192c38bc3e86495a4ce2e16095aeb66b7eda7ae68ff4f920fa50577cf27a16791edfa621497094f287c13bb758f5e0117bd9788 +EBUILD samba-4.15.7.ebuild 10016 BLAKE2B 1ef15a1dcc9b0e5b9b87778aba40664378167abf152b222f353e330e61d0720e23ea13c1c939bcf1d6af074b850dddf292343b2feafd8279e1228249ad2a66e5 SHA512 7a9990c63d6e4d2fc8f33f0a62c50700026353d5cc1ff99c65fa9abd8e768a541209c3ac6e3761db7caff70bccafd25e152262bf35d9efc5ceb3cba77eba11eb +EBUILD samba-4.16.0-r1.ebuild 10037 BLAKE2B 8679d1dbc9fe6a550eecfb86fb32ab26297c9b02eccc8a36621bcc13be96c70450e25759d9ffb810f87a43b6768e2bdbc459a990bbf4fbc261ff5bee5bac2ddf SHA512 75ff78eae02920315c40d74d7348a5ff98d5d20abc463a615e572602d2daf6e61f6fa66fbd910933c883ca9e7731360441d1fe575b2643926dace994fb59a549 +EBUILD samba-4.16.1.ebuild 10085 BLAKE2B e652f81751b0e4971ba0f1850cdf6a629732b998f0a97a91f4a623a28a6ef1e67cb0d949144bd8e62f46cf1b970d62b4d5db73deec39420b68e0b913c71dbe4d SHA512 82f77c0504b778265c346347b1f9ca1955fbb436c23cb285985f0271013a221c121aba707eb055ec4215137d7a998356d8199fef100a811fe5a4156d2f1224ee +EBUILD samba-4.16.2.ebuild 10058 BLAKE2B d371853ff17ad1cb56eceefb5bc1971ebedb92d35ac42232e7cd9c041ce43d5c1d6f2c5431a2420c3c52d779dc5a4edd1c8079d32cb6076a8ad3c343de14828f SHA512 6a9aea02a5500d8e2099a2eed9b170716b722fd2f9f22883521627e56aec818f9cc59dfba7ba3c069b913e61b2d2f2201daba3131ee00ba4c21e5fec5e5e222c MISC metadata.xml 2061 BLAKE2B b6232fb0408426e595b8569a26aba4938e2e0edd61cf4d73650ee4eed48725ca3181c212003515ef573a95bd73659fe482d964e26fef3ff61a66e06f0566b600 SHA512 301d931501a67d7189881fb269c31f75790b99c3c6c74caea963507ca5a60e5ae39bfd97f8d7e2f3096ae71645c8d7abea36d70ae621017c72cb20c9ec51d2d8 diff --git a/net-fs/samba/files/samba-4.16.1-netdb-defines.patch b/net-fs/samba/files/samba-4.16.1-netdb-defines.patch new file mode 100644 index 000000000000..b0f01e42acbb --- /dev/null +++ b/net-fs/samba/files/samba-4.16.1-netdb-defines.patch @@ -0,0 +1,23 @@ +https://gitlab.com/samba-team/samba/-/merge_requests/1025 + +# Define NETDB_INTERNAL and NETDB_SUCCESS if they are not defined +# +# Gentoo bug 832629 and 835017 + +--- a/nsswitch/wins.c ++++ b/nsswitch/wins.c +@@ -40,6 +40,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; + #define INADDRSZ 4 + #endif + ++#ifndef NETDB_INTERNAL ++#define NETDB_INTERNAL -1 ++#endif ++ ++#ifndef NETDB_SUCCESS ++#define NETDB_SUCCESS 0 ++#endif ++ + _PUBLIC_ON_LINUX_ + NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, + struct hostent *he, diff --git a/net-fs/samba/samba-4.14.12-r3.ebuild b/net-fs/samba/samba-4.14.12-r3.ebuild index 596a27073a1f..fbb716f96f4d 100644 --- a/net-fs/samba/samba-4.14.12-r3.ebuild +++ b/net-fs/samba/samba-4.14.12-r3.ebuild @@ -250,7 +250,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.14.13.ebuild b/net-fs/samba/samba-4.14.13.ebuild index 0b80891930e8..8e8b7156f29f 100644 --- a/net-fs/samba/samba-4.14.13.ebuild +++ b/net-fs/samba/samba-4.14.13.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then SRC_URI="mirror://samba/rc/${MY_P}.tar.gz" else SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86" fi S="${WORKDIR}/${MY_P}" @@ -250,7 +250,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.15.4-r3.ebuild b/net-fs/samba/samba-4.15.4-r3.ebuild index bf1ff5956d07..117c8a7ef117 100644 --- a/net-fs/samba/samba-4.15.4-r3.ebuild +++ b/net-fs/samba/samba-4.15.4-r3.ebuild @@ -246,7 +246,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.15.6-r1.ebuild b/net-fs/samba/samba-4.15.6-r1.ebuild index bfffbd68dc99..aa3c460800e1 100644 --- a/net-fs/samba/samba-4.15.6-r1.ebuild +++ b/net-fs/samba/samba-4.15.6-r1.ebuild @@ -246,7 +246,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.15.7.ebuild b/net-fs/samba/samba-4.15.7.ebuild index bfffbd68dc99..c23859866f3c 100644 --- a/net-fs/samba/samba-4.15.7.ebuild +++ b/net-fs/samba/samba-4.15.7.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} = *_rc* ]]; then SRC_URI="mirror://samba/rc/${MY_P}.tar.gz" else SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86" fi S="${WORKDIR}/${MY_P}" @@ -246,7 +246,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.16.0-r1.ebuild b/net-fs/samba/samba-4.16.0-r1.ebuild index dfb87123595c..a7d3fa8bb5d3 100644 --- a/net-fs/samba/samba-4.16.0-r1.ebuild +++ b/net-fs/samba/samba-4.16.0-r1.ebuild @@ -247,7 +247,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1.ebuild index dfb87123595c..8b16a80d66cb 100644 --- a/net-fs/samba/samba-4.16.1.ebuild +++ b/net-fs/samba/samba-4.16.1.ebuild @@ -141,6 +141,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" + "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -247,7 +248,7 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ + PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} } diff --git a/net-fs/samba/samba-4.16.2.ebuild b/net-fs/samba/samba-4.16.2.ebuild new file mode 100644 index 000000000000..090a59c32be1 --- /dev/null +++ b/net-fs/samba/samba-4.16.2.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 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="mirror://samba/rc/${MY_P}.tar.gz" +else + SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 iprint json ldap pam profiling-data python quota +regedit selinux +snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind +zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( python json 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 +) + +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.5.1[ldap(+)?,${MULTILIB_USEDEP}] + =sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.11.0[${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] + ) + ") + !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) + 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:0= ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + || ( + net-libs/rpcsvc-proto + =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.4.0-pam.patch" + "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" +) + +#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" +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="$(usex snapper '' '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +src_prepare() { + default + + # un-bundle 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:::' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # Friggin' WAF shit + 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 + + 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 winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usex 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 + + CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || 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 (#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 + + keepdir /var/cache/samba + keepdir /var/lib/ctdb + keepdir /var/lib/samba/{bind-dns,private} + keepdir /var/lock/samba + keepdir /var/log/samba +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "test failed" + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "Be aware that this release contains the best of all of Samba's" + elog "technology parts, both a file server (that you can reasonably expect" + elog "to upgrade existing Samba 3.x releases to) and the AD domain" + elog "controller work previously known as 'samba4'." + elog + fi + if [[ "${PV}" != *_rc* ]] ; then + elog "For further information and migration steps make sure to read " + elog "https://samba.org/samba/history/${P}.html " + elog "https://wiki.samba.org/index.php/Samba4/HOWTO " + fi +} -- cgit v1.2.3