diff options
Diffstat (limited to 'net-fs')
44 files changed, 2148 insertions, 986 deletions
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 364aa0a32804..4ca9807f25d5 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,2 +1,3 @@ DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223 +DIST autofs-5.1.9.tar.xz 331872 BLAKE2B baa2fd57fb4ac9f7390cad74d16ef6ef2e484d40061f4f894e5968277747b6852d98e089e904229d5fb08bef7e1810a7b5f14f0ea0adae8e40e317636c8a1f89 SHA512 81eb04270727c3fbf9dfb4b07a8dd39beac9068d6289f2f3bb0eabf723c14bec36860d3b2759c46b597bd77e8f3fa521646445e926c95ab63859a3a6c8588dcc diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild index c904304565b7..c329818c19ab 100644 --- a/net-fs/autofs/autofs-5.1.8-r1.ebuild +++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,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" -IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd" +IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd" # currently, sasl code assumes the presence of kerberosV RDEPEND=" @@ -40,6 +40,7 @@ BDEPEND=" virtual/pkgconfig app-alternatives/yacc " +RDEPEND+=" selinux? ( sec-policy/selinux-automount )" PATCHES=( "${WORKDIR}"/${P}-patches/ diff --git a/net-fs/autofs/autofs-5.1.9.ebuild b/net-fs/autofs/autofs-5.1.9.ebuild new file mode 100644 index 000000000000..d906d574b5f1 --- /dev/null +++ b/net-fs/autofs/autofs-5.1.9.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="Kernel based automounter" +HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git" +SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd" + +# currently, sasl code assumes the presence of kerberosV +RDEPEND=" + net-libs/libnsl:= + >=sys-apps/util-linux-2.20 + dmalloc? ( dev-libs/dmalloc[threads] ) + ldap? ( + >=net-nds/openldap-2.0:= + sasl? ( + dev-libs/cyrus-sasl + dev-libs/libxml2 + virtual/krb5 + ) + ) + systemd? ( sys-apps/systemd ) + libtirpc? ( net-libs/libtirpc:= ) + !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) +" +DEPEND="${RDEPEND} + libtirpc? ( net-libs/rpcsvc-proto ) +" +BDEPEND=" + sys-devel/flex + virtual/pkgconfig + app-alternatives/yacc +" +RDEPEND+=" selinux? ( sec-policy/selinux-automount )" + +pkg_setup() { + linux-info_pkg_setup + + local CONFIG_CHECK + + if kernel_is -ge 4 18; then + CONFIG_CHECK="~AUTOFS_FS" + else + CONFIG_CHECK="~AUTOFS4_FS" + fi + + check_extra_config +} + +src_prepare() { + sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492 + sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334 + + # Install samples including autofs.service + sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die + + default +} + +src_configure() { + # bug #483716 + tc-export AR + # --with-confdir is for bug #361481 + # --with-mapdir is for bug #385113 + local myeconfargs=( + --with-confdir=/etc/conf.d + --with-mapdir=/etc/autofs + $(use_with dmalloc) + $(use_with ldap openldap) + $(use_with libtirpc) + $(use_with sasl) + $(use_enable mount-locking) + $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492 + --without-hesiod + --disable-ext-env + --enable-sloppy-mount # bug #453778 + --enable-force-shutdown + --enable-ignore-busy + RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 + ) + + CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" +} + +src_compile() { + emake STRIP=: DONTSTRIP=1 +} + +src_install() { + default + rmdir "${D}"/run + + if kernel_is -lt 2 6 30; then + # kernel patches + docinto patches + dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch + fi + newinitd "${FILESDIR}"/autofs5.initd autofs + insinto etc/autofs + newins "${FILESDIR}"/autofs5-auto.master auto.master +} + +pkg_postinst() { + if kernel_is -lt 2 6 30; then + elog "This version of ${PN} requires a kernel with autofs4 supporting" + elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" + elog "been installed into" + elog "${EROOT}/usr/share/doc/${P}/patches." + elog "For further instructions how to patch the kernel, please refer to" + elog "${EROOT}/usr/share/doc/${P}/INSTALL." + elog + fi + elog "If you plan on using autofs for automounting remote NFS mounts," + elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" + elog "are running." +} diff --git a/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild new file mode 100644 index 000000000000..0dc48d00b48e --- /dev/null +++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..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 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" + "${FILESDIR}/${PN}-7.0-no-clobber-fortify-source.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() { + 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/cifs-utils/cifs-utils-7.0.ebuild b/net-fs/cifs-utils/cifs-utils-7.0.ebuild index 5cd601f109ec..9e39096264da 100644 --- a/net-fs/cifs-utils/cifs-utils-7.0.ebuild +++ b/net-fs/cifs-utils/cifs-utils-7.0.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 ~ia64 ~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/files/cifs-utils-7.0-no-clobber-fortify-source.patch b/net-fs/cifs-utils/files/cifs-utils-7.0-no-clobber-fortify-source.patch new file mode 100644 index 000000000000..07661cf9dd02 --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-7.0-no-clobber-fortify-source.patch @@ -0,0 +1,11 @@ +Don't clobber toolchain defaults. + +https://bugs.gentoo.org/890278 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -Wall -Wextra -D_FORTIFY_SOURCE=2 $(PIE_CFLAGS) $(RELRO_CFLAGS) ++AM_CFLAGS = -Wall -Wextra $(PIE_CFLAGS) $(RELRO_CFLAGS) + ACLOCAL_AMFLAGS = -I aclocal + + root_sbindir = $(ROOTSBINDIR) diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index b071ceed0309..097f4183491b 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1 +1,2 @@ DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f +DIST cvmfs-2.11.2.tar.gz 76020587 BLAKE2B cb225647cf95c93c14a9a0dd7824aac14641f11ee1375c53fac3d5f5e8d29a1173521f82f3cbe18064c8a990ccefbf159c04e1b3d55db0599ec609d5e96391bb SHA512 c8070a10771e28d45a761fdb9083ecd15118bca02328227ca0516edcf3d14e7b338df2a4bb14edd2aa8cc20f3fc903be775fcc40ae80a7f5547340e55fa43211 diff --git a/net-fs/cvmfs/cvmfs-2.11.2.ebuild b/net-fs/cvmfs/cvmfs-2.11.2.ebuild new file mode 100644 index 000000000000..37a64e0069e1 --- /dev/null +++ b/net-fs/cvmfs/cvmfs-2.11.2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake linux-info bash-completion-r1 + +DESCRIPTION="HTTP read-only file system for distributing software" +HOMEPAGE="https://cernvm.cern.ch/fs/" +SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" + +KEYWORDS="~amd64 ~x86" +IUSE="server" + +CDEPEND=" + acct-group/cvmfs + acct-user/cvmfs + app-arch/libarchive + dev-cpp/gtest + dev-cpp/sparsehash + dev-db/sqlite:3= + dev-libs/leveldb:0= + dev-libs/openssl:0= + dev-libs/protobuf:0= + net-dns/c-ares:0= + net-libs/pacparser:0= + net-misc/curl:0[adns] + sys-apps/attr + sys-fs/fuse:0= + sys-fs/fuse:3= + sys-libs/libcap:0= + sys-libs/zlib:0= +" + +RDEPEND="${CDEPEND} + app-admin/sudo + net-fs/autofs +" + +DEPEND="${CDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.10.1-gentoo.patch +) + +pkg_setup() { + if use server; then + CONFIG_CHECK="~OVERLAY_FS" + ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set" + linux-info_pkg_setup + fi +} + +src_prepare() { + cmake_src_prepare + # gentoo stuff + rm bootstrap.sh || die + sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die + sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ + CMakeLists.txt || die + eapply_user +} + +src_configure() { + local mycmakeargs=( + -DBUILTIN_EXTERNALS=OFF + -DBUILD_CVMFS=ON + -DBUILD_LIBCVMFS=OFF # static library used only for development + -DBUILD_DOCUMENTATION=OFF + -DBUILD_GEOAPI=OFF # only used for stratum 1 servers + -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs + -DBUILD_PRELOADER=OFF # special purpose utility for HPCs + -DBUILD_RECEIVER=OFF # for distributed publishers only + -DBUILD_SERVER=$(usex server) + -DINSTALL_BASH_COMPLETION=OFF + -DINSTALL_MOUNT_SCRIPTS=ON + -DINSTALL_PUBLIC_KEYS=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config + bashcomp_alias cvmfs_config cvmfs_server + dodoc doc/*.md + keepdir /var/lib/cvmfs + use server && keepdir /var/lib/cvmfs-server +} + +pkg_config() { + einfo "Setting up CernVM-FS client" + cvmfs_config setup + einfo "Now edit ${EROOT}/etc/cvmfs/default.local" + einfo "and restart the autofs service" +} diff --git a/net-fs/ksmbd-tools/Manifest b/net-fs/ksmbd-tools/Manifest index 659ef5c1c708..86efb4106a01 100644 --- a/net-fs/ksmbd-tools/Manifest +++ b/net-fs/ksmbd-tools/Manifest @@ -1,2 +1,3 @@ DIST ksmbd-tools-3.4.4.tar.gz 75481 BLAKE2B 84c215b0ccad01956185d42b858eb0de6a3407fc32c59628964ab38a2946fe5123fc73cc06cb04e8864199751f26e509ae5f6ebf6f5e7eb5f1fb8f21a4452a48 SHA512 b7be00e38eb126a0d5b8b3d9dde7c997b4012b29604d899a5f2fe3a77a3c30ac5d4bf00b7fc88d57150fd574af38bd2823c736d272a2cd596d40ccbe14a15320 DIST ksmbd-tools-3.4.6.tar.gz 86976 BLAKE2B 2f18d41a5ef84d1d5293cab2dc51147649d723117f31b4a0360ff314d98544624c6c0280b11ec2df260514981995bdbac598347063fb6576447c511e88134c4e SHA512 396423a43ccb02fafb721717a36ea1efdc8449414cf9f7737cf44bafd991cde0a5d31689b5f43f96924357df058c1b5fbf90369b9aec2b293ae1a7b68c256d27 +DIST ksmbd-tools-3.4.8.tar.gz 88898 BLAKE2B 4bd4fa77e7d89de4f48427e6867807b27a9be91e4f27079d4a5b231c4925aef73489bced1e4569361105fe7e04671fa8d6f3394154b36072f9d4ec77fded7466 SHA512 f5372ea7fd4b754482374cdeefa011bebe32c37a26acc180c34c61f37cf08125b5b4626128cae413cd517a74af326188f3f9e7cf459308e4305d86e7c6702436 diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.8.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.8.ebuild new file mode 100644 index 000000000000..b0ac39996c58 --- /dev/null +++ b/net-fs/ksmbd-tools/ksmbd-tools-3.4.8.ebuild @@ -0,0 +1,75 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info systemd + +DESCRIPTION="cifsd/ksmbd kernel server userspace utilities" +HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools" +SRC_URI="https://github.com/cifsd-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +DEPEND=" + dev-libs/glib:2 + dev-libs/libnl:3 +" + +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +pkg_setup() { + # we don't want to die() here to be able to build binpkgs + kernel_is -lt 5 15 && eerror "kernel >= 5.15 required for ${PN}" + CONFIG_CHECK="~SMB_SERVER" + ERROR_SMB_SERVER="CONFIG_SMB_SERVER is not set: ksmbd is not enabled in kernel, ${PN} will not work" + # use krb5 && CONFIG_CHECK+=" ~SMB_SERVER_KERBEROS5" + linux-info_pkg_setup +} + +src_prepare() { + eautoreconf + default +} + +src_configure() { + # TODO: add kerberos support, explicitly disable for now + # tools are expected to reside in /sbin, not /usr/sbin + econf \ + --prefix="${EPREFIX:-}" \ + --enable-krb5=no \ + --libexecdir="${EPREFIX}/usr/libexec" \ + --with-rundir="${EPREFIX}/run" \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" +} + +src_install() { + default + + local DOCS=( README.md ksmbd.conf.example ) + einstalldocs + + insinto /etc/ksmbd + doins ksmbd.conf.example + + newinitd "${FILESDIR}/ksmbd.initd" ksmbd + newconfd "${FILESDIR}/ksmbd.confd" ksmbd + + dosym ksmbd.addshare /sbin/smbshareadd + dosym ksmbd.adduser /sbin/smbuseradd +} + +pkg_postinst() { + local ver + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt 3.4.6; then + ewarn "Upgrade from version <${CATEGORY}/${PN}-3.4.6 detected" + ewarn "${PN} config file moved to ${EPREFIX}/etc/ksmbd/ksmbd.conf" + ewarn "Please migrate from old ${EPREFIX}/etc/ksmbd/smb.conf" + fi + done + unset ver +} diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest index 0bf4ddfe0aa6..fed37e954ab4 100644 --- a/net-fs/netatalk/Manifest +++ b/net-fs/netatalk/Manifest @@ -1 +1 @@ -DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759 +DIST netatalk-3.1.18.tar.xz 974852 BLAKE2B ba69e0bc08455dff46d8aa83fa1a2eda6eac60a0ab7a1b22bba8c47abb57ac70bd2879ec496c5e5f3da40a461e93fcecdf7c3e489daff18e995961f59d4fdc99 SHA512 06c56754afacbf9c71dc2ab7b80c231f5c25f522967e1d825b4e9e129233528bd1e7101144239b52636b9efe7f1f86a37749da8a8af611169155bca9711798d0 diff --git a/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch b/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch deleted file mode 100644 index 52a8cf3dce9a..000000000000 --- a/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch b/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch deleted file mode 100644 index 3b4ff99ec577..000000000000 --- a/net-fs/netatalk/files/netatalk-3.1.12-my_bool.patch +++ /dev/null @@ -1,16 +0,0 @@ -fix my_bool compilation issue due to newer MySQL removing the type - -https://bugs.gentoo.org/692560 -Patch by Kostiantyn Gorbunov - ---- a/libatalk/cnid/mysql/cnid_mysql.c 2016-03-10 10:06:20.000000000 +0200 -+++ b/libatalk/cnid/mysql/cnid_mysql.c 2019-09-02 19:55:04.361132422 +0300 -@@ -848,7 +848,7 @@ - - /* Initialize and connect to MySQL server */ - EC_NULL( db->cnid_mysql_con = mysql_init(NULL) ); -- my_bool my_recon = true; -+ bool my_recon = true; - EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_RECONNECT, &my_recon) ); - int my_timeout = 600; - EC_ZERO( mysql_options(db->cnid_mysql_con, MYSQL_OPT_CONNECT_TIMEOUT, &my_timeout) ); diff --git a/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch b/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch deleted file mode 100644 index bb946364f575..000000000000 --- a/net-fs/netatalk/files/netatalk-3.1.12-tracker3.patch +++ /dev/null @@ -1,136 +0,0 @@ -From a7ff155b4a907af0cb979863758137aa5f8dce3f Mon Sep 17 00:00:00 2001 -From: Andrew Bauer <zonexpertconsulting@outlook.com> -Date: Sat, 13 Mar 2021 13:16:36 -0600 -Subject: [PATCH] add support for tracker3 - ---- - etc/afpd/spotlight.c | 20 ++++++++++++++++++++ - etc/spotlight/sparql_parser.c | 2 +- - etc/spotlight/sparql_parser.y | 2 +- - include/atalk/spotlight.h | 2 ++ - macros/netatalk.m4 | 10 +++++++++- - 5 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/etc/afpd/spotlight.c b/etc/afpd/spotlight.c -index 9c8b4700..fa8f8083 100644 ---- a/etc/afpd/spotlight.c -+++ b/etc/afpd/spotlight.c -@@ -581,6 +581,7 @@ static void slq_dump(void) - * Tracker async callbacks - ************************************************/ - -+#ifndef HAVE_TRACKER3 - static void tracker_con_cb(GObject *object, - GAsyncResult *res, - gpointer user_data) -@@ -600,6 +601,7 @@ static void tracker_con_cb(GObject *object, - - LOG(log_info, logtype_sl, "connected to Tracker"); - } -+#endif - - static void tracker_cursor_cb(GObject *object, - GAsyncResult *res, -@@ -1312,6 +1314,9 @@ int spotlight_init(AFPObj *obj) - static bool initialized = false; - const char *attributes; - struct sl_ctx *sl_ctx; -+#ifdef HAVE_TRACKER3 -+ GError *error = NULL; -+#endif - - if (initialized) { - return 0; -@@ -1342,8 +1347,23 @@ int spotlight_init(AFPObj *obj) - setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0); - setenv("TRACKER_USE_LOG_FILES", "1", 0); - -+#ifdef HAVE_TRACKER3 -+ sl_ctx->tracker_con = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files", -+ NULL, NULL, &error); -+ -+ if (error) { -+ LOG(log_error, logtype_sl, "Could not connect to Tracker: %s", -+ error->message); -+ sl_ctx->tracker_con = NULL; -+ g_error_free(error); -+ return -1; -+ } -+ -+ LOG(log_info, logtype_sl, "connected to Tracker3"); -+#else - tracker_sparql_connection_get_async(sl_ctx->cancellable, - tracker_con_cb, sl_ctx); -+#endif - - initialized = true; - return 0; -diff --git a/etc/spotlight/sparql_parser.c b/etc/spotlight/sparql_parser.c -index d6f5d3be..88b868ef 100644 ---- a/etc/spotlight/sparql_parser.c -+++ b/etc/spotlight/sparql_parser.c -@@ -1455,7 +1455,7 @@ yyparse () - result_limit = ""; - ssp_result = talloc_asprintf(ssp_slq, - "SELECT ?url WHERE " -- "{ %s . ?obj nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s", -+ "{ %s . ?obj nie:isStoredAs ?file . ?file nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s", - (yyvsp[(1) - (1)].sval), ssp_slq->slq_scope, result_limit); - (yyval.sval) = ssp_result; - } -diff --git a/etc/spotlight/sparql_parser.y b/etc/spotlight/sparql_parser.y -index 9d609976..5201e3d3 100644 ---- a/etc/spotlight/sparql_parser.y -+++ b/etc/spotlight/sparql_parser.y -@@ -78,7 +78,7 @@ expr { - result_limit = ""; - ssp_result = talloc_asprintf(ssp_slq, - "SELECT ?url WHERE " -- "{ %s . ?obj nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s", -+ "{ %s . ?obj nie:isStoredAs ?file . ?file nie:url ?url . FILTER(tracker:uri-is-descendant('file://%s/', ?url)) } %s", - $1, ssp_slq->slq_scope, result_limit); - $$ = ssp_result; - } -diff --git a/include/atalk/spotlight.h b/include/atalk/spotlight.h -index 0e64b860..19d71009 100644 ---- a/include/atalk/spotlight.h -+++ b/include/atalk/spotlight.h -@@ -29,8 +29,10 @@ - #ifdef HAVE_TRACKER - #include <gio/gio.h> - #include <tracker-sparql.h> -+#ifndef HAVE_TRACKER3 - #include <libtracker-miner/tracker-miner.h> - #endif -+#endif - - /****************************************************************************** - * Spotlight RPC and marshalling stuff -diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 -index 3bd03ccb..33ba5575 100644 ---- a/macros/netatalk.m4 -+++ b/macros/netatalk.m4 -@@ -184,14 +184,22 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ - AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available]) - AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_install_prefix"], [Path to Tracker]) - AC_DEFINE_UNQUOTED([DBUS_DAEMON_PATH], ["$ac_cv_dbus_daemon"], [Path to dbus-daemon]) -+ -+ ac_cv_tracker_pkg_version_MAJOR=`echo $ac_cv_tracker_pkg_version | cut -d. -f1` -+ if test $ac_cv_tracker_pkg_version_MAJOR -ge 3 ; then -+ AC_DEFINE(HAVE_TRACKER3, 1, [Define if Tracker3 is used]) -+ fi - fi - - dnl Tracker Managing Command - if test x"$ac_cv_have_tracker" = x"yes" ; then -- AC_CHECK_PROGS(ac_cv_tracker_manage, tracker tracker-control, , ["$ac_cv_tracker_prefix"/bin]) -+ AC_CHECK_PROGS(ac_cv_tracker_manage, tracker tracker3 tracker-control, , ["$ac_cv_tracker_prefix"/bin]) - if test x"$ac_cv_tracker_manage" = x"tracker" ; then - TRACKER_MANAGING_COMMAND="tracker daemon" - AC_DEFINE(TRACKER_MANAGING_COMMAND, "tracker daemon", [tracker managing command]) -+ elif test x"$ac_cv_tracker_manage" = x"tracker3" ; then -+ TRACKER_MANAGING_COMMAND="tracker3 daemon" -+ AC_DEFINE(TRACKER_MANAGING_COMMAND, "tracker3 daemon", [tracker managing command]) - elif test x"$ac_cv_tracker_manage" = x"tracker-control" ; then - TRACKER_MANAGING_COMMAND="tracker-control" - AC_DEFINE(TRACKER_MANAGING_COMMAND, "tracker-control", [tracker managing command]) diff --git a/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch b/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch index 0335366b23b5..21cb119994fc 100644 --- a/net-fs/netatalk/files/netatalk-3.1.8-disable-ld-library-path.patch +++ b/net-fs/netatalk/files/netatalk-3.1.17-disable-ld-library-path.patch @@ -16,7 +16,7 @@ https://bugs.gentoo.org/564350 - dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly - dnl -- portable hopefully. Reference: - dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html -- eval export $shlibpath_var=$bdblibdir +- test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var @@ -26,7 +26,7 @@ https://bugs.gentoo.org/564350 CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" LDFLAGS="-L$bdblibdir $LDFLAGS" -- eval export $shlibpath_var=$bdblibdir +- test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var diff --git a/net-fs/netatalk/files/netatalk-3.1.7-gentoo.patch b/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch index 82dd788fc6d2..eada14a0d28e 100644 --- a/net-fs/netatalk/files/netatalk-3.1.7-gentoo.patch +++ b/net-fs/netatalk/files/netatalk-3.1.17-gentoo.patch @@ -11,7 +11,7 @@ diff --git a/Makefile.am b/Makefile.am index ec7f14d..b87fd8a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -11,12 +11,6 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION abigen.sh +@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION abigen.sh ACLOCAL_AMFLAGS = -I macros AUTOMAKE_OPTIONS = foreign @@ -21,30 +21,17 @@ index ec7f14d..b87fd8a 100644 - @-@NETA_LDCONFIG@ - @printf "done\n" -endif - - if DEVELOPER - abi-clean: diff --git a/etc/netatalk/Makefile.am b/etc/netatalk/Makefile.am index 5392b9d..3e62e2d 100644 --- a/etc/netatalk/Makefile.am +++ b/etc/netatalk/Makefile.am -@@ -18,6 +18,7 @@ netatalk_LDADD = \ - $(top_builddir)/libatalk/libatalk.la - - netatalk_LDFLAGS = -+netatalk_CPPFLAGS = +@@ -27,6 +28,5 @@ netatalk_CFLAGS += \ - if USE_BUILTIN_LIBEVENT - netatalk_CFLAGS += \ -@@ -27,8 +28,8 @@ netatalk_CFLAGS += \ - netatalk_LDADD += \ - $(top_builddir)/libevent/libevent.la - else +-netatalk_LDFLAGS = @LIBEVENT_LDFLAGS@ -levent +- -netatalk_CFLAGS += @LIBEVENT_CFLAGS@ --netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent -+netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@ ++netatalk_CPPFLAGS = @LIBEVENT_CFLAGS@ +netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent - endif noinst_HEADERS = afp_zeroconf.h afp_avahi.h afp_mdns.h diff --git a/etc/netatalk/afp_avahi.c b/etc/netatalk/afp_avahi.c @@ -96,14 +83,7 @@ diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am index 34fa76e..dbde336 100644 --- a/libatalk/dsi/Makefile.am +++ b/libatalk/dsi/Makefile.am -@@ -1,9 +1,10 @@ - # Makefile.am for libatalk/dsi/ - --INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys -+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys - - LIBS = @LIBS@ - +@@ -1,3 +1,4 @@ noinst_LTLIBRARIES = libdsi.la libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml index e3244d1d84f5..263e2e0c82d3 100644 --- a/net-fs/netatalk/metadata.xml +++ b/net-fs/netatalk/metadata.xml @@ -15,5 +15,6 @@ </use> <upstream> <remote-id type="sourceforge">netatalk</remote-id> + <remote-id type="github">Netatalk/netatalk</remote-id> </upstream> </pkgmetadata> diff --git a/net-fs/netatalk/netatalk-3.1.12-r7.ebuild b/net-fs/netatalk/netatalk-3.1.18.ebuild index fd4a73dcc4f4..e22103ae3d3d 100644 --- a/net-fs/netatalk/netatalk-3.1.12-r7.ebuild +++ b/net-fs/netatalk/netatalk-3.1.18.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic pam systemd DESCRIPTION="Open Source AFP server" HOMEPAGE="https://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2" +SRC_URI="https://github.com/Netatalk/netatalk/releases/download/netatalk-${PV//./-}/netatalk-${PV}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0/18.0" KEYWORDS="amd64 arm ~ppc ~ppc64 x86" -IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf" +IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota +shadow ssl tracker tcpd zeroconf" -CDEPEND=" +RDEPEND=" !app-editors/yudit - dev-libs/libevent:0= - >=dev-libs/libgcrypt-1.2.3:0= + dev-libs/libevent:= + >=dev-libs/libgcrypt-1.2.3:= sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb @@ -36,8 +36,8 @@ CDEPEND=" tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] ) " -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-alternatives/yacc sys-devel/flex " @@ -49,12 +49,8 @@ REQUIRED_USE=" tracker? ( dbus )" PATCHES=( - "${FILESDIR}"/${PN}-3.1.7-gentoo.patch - "${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350 - "${FILESDIR}"/${PN}-3.1.12-my_bool.patch #692560 - "${FILESDIR}"/${PN}-3.1.12-fno-common.patch #706852 - # https://sourceforge.net/p/netatalk/patches/147/ - "${FILESDIR}"/${PN}-3.1.12-tracker3.patch + "${FILESDIR}"/${PN}-3.1.17-gentoo.patch + "${FILESDIR}"/${PN}-3.1.17-disable-ld-library-path.patch # bug #564350 ) src_prepare() { @@ -74,12 +70,11 @@ src_configure() { # Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having # to sed the Makefiles to not do rc-update. # TODO: - # systemd : --with-init-style=systemd + # * systemd: --with-init-style=systemd myeconfargs+=( $(use_enable debug) $(use_enable debug debugging) $(use_enable pgp pgp-uam) - $(use_enable kerberos) $(use_enable kerberos krbV-uam) $(use_enable quota) $(use_enable tcpd tcp-wrappers) @@ -87,28 +82,24 @@ src_configure() { $(use_with acl acls) $(use_with cracklib) $(use_with dbus afpstats) + $(use_with kerberos) $(use_with ldap) $(use_with pam) - $(use_with samba smbsharemodes) $(use_with shadow) $(use_with ssl ssl-dir) - $(use_with tracker) $(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon") $(use_with tracker tracker-pkgconfig-version $(ver_cut 1 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')).0) --disable-static --enable-overwrite - --disable-krb4-uam --disable-afs - --with-libevent-header=/usr/include - --with-libevent-lib=/usr/$(get_libdir) --with-bdb=/usr --with-uams-path=/usr/$(get_libdir)/${PN} --with-init-style=gentoo-openrc - --without-libevent --without-tdb --with-lockfile=/run/lock/${PN} ) - econf ${myeconfargs[@]} + + econf "${myeconfargs[@]}" } src_install() { diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 7a7a441cf7c0..aebdda16d856 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,2 +1,3 @@ DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853 +DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533 diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild index ceb8a641de3b..93a79d1a257b 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then S="${WORKDIR}/${PN}-${PN}-${MY_PV}" else SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild new file mode 100644 index 000000000000..351ea4ee1f69 --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-2.6.4.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2023 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="mirror://sourceforge/nfs/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid" +REQUIRED_USE="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:= + >=net-nds/rpcbind-0.2.4 + 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 ) + nfsv4? ( + >=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 + selinux? ( + sec-policy/selinux-rpc + 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 +) + +pkg_setup() { + linux-info_pkg_setup + + if use nfsv4 && ! use nfsdcld && 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 the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode" + ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" + ewarn "support the legacy, in-kernel client tracker." + fi +} + +src_prepare() { + default + + sed \ + -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ + -i utils/*/Makefile.am || die + + eautoreconf +} + +src_configure() { + # Our DEPEND forces this. + export libsqlite3_cv_is_recent=yes + export ac_cv_header_keyutils_h=$(usex nfsidmap) + + # 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 nfsdcld nfsdcltrack) + $(use_enable nfsv4) + $(use_enable nfsv41) + $(use_enable uuid) + $(use_with tcpd tcp-wrappers) + # XXX: Remove this hack after 2.6.3 + # See bug #904718. + # Patch: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca + LIBS="-lsqlite3 -levent_core" + ) + 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 && use nfsidmap ; 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=() 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 + + # Nuke after 2015/08/01 + newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount + for f in nfs nfsclient ; do + newconfd "${FILESDIR}"/${f}.confd ${f} + done + + # bug #234132 + sed -i \ + -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ + "${ED}"/etc/conf.d/nfs || die + + local systemd_systemunitdir="$(systemd_get_systemunitdir)" + sed -i \ + -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ + "${ED}${systemd_systemunitdir}"/* || die + + # 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 + + 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/openafs/openafs-1.8.7.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild index d56c1e3f22b4..cd8f9d8dc2f3 100644 --- a/net-fs/openafs/openafs-1.8.7.ebuild +++ b/net-fs/openafs/openafs-1.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ SLOT="0" KEYWORDS="amd64 -riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei -ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write" +ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write" BDEPEND=" dev-lang/perl @@ -57,7 +57,9 @@ DEPEND=" kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= )" -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-afs )" S="${WORKDIR}/${MY_P}" @@ -67,9 +69,6 @@ CONFIG_CHECK="~!AFS_FS KEYS" ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!" ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled" -QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko" -QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko" - pkg_pretend() { if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then ewarn "Gentoo supports kernels which are supported by OpenAFS" diff --git a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild index 8e3c091a6aca..8ffa192c7914 100644 --- a/net-fs/openafs/openafs-1.8.8.1-r1.ebuild +++ b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ SLOT="0" KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei -ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write" +ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write" BDEPEND=" dev-lang/perl @@ -58,7 +58,9 @@ DEPEND=" kauth? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= )" -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-afs )" S="${WORKDIR}/${MY_P}" @@ -68,9 +70,6 @@ CONFIG_CHECK="~!AFS_FS KEYS" ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!" ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled" -QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko" -QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko" - pkg_pretend() { if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then ewarn "Gentoo supports kernels which are supported by OpenAFS" diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest index 698cf9099571..ac4163a3e955 100644 --- a/net-fs/s3fs/Manifest +++ b/net-fs/s3fs/Manifest @@ -1,2 +1,2 @@ -DIST s3fs-1.91.tar.gz 242590 BLAKE2B b65119f480b35a6325fa6d498e260309f65778abf97fc9f82bf423004e142f998a1c4b5c80c74a2932a6fa714956fd4f6a0b71e102061ff4f08ff0a82bdbb05c SHA512 5b57af18395f34885b4b8a98e93b0e3f9043c9af78e415a0a6c15489611d7e21ae619e69655737de369edee15762d8726b82bc2651b5b7f5c20e26fe866a96bc DIST s3fs-1.92.tar.gz 283295 BLAKE2B 7286d3c8a83d87252db1b18b063f6704b128abdd957a9baeb204834b534a16a09d60a46507ae03633ce789e8127c7a480fb1e81b1fc1a3c8c7b69a79541abf11 SHA512 375492d63626f0b71583e735e43985045dd5d4ccad2e66ae5d1c7ea9d8e5e881993bf00e31bae96d55aa441fae555bc71ebcfd47f3d189f6c322ba441853a95f +DIST s3fs-1.93.tar.gz 284353 BLAKE2B bae0d850f69f04b18327790406260721a0a2d981f5b2cbc8e6ebc059f4db83bd0810780b68d334a50cbba4654301a395683a778567ce3f08d4b9f69fef5ed282 SHA512 613ad713ac426236b471aa4b2f8292ee0558017f149bfe51aa7fad1bacd60fccf00c31404ebc14b692787e524704e9cd9111b84540f1309ba99900d42d03dc5d diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml index eb7977bc87e6..b9a262d42a8d 100644 --- a/net-fs/s3fs/metadata.xml +++ b/net-fs/s3fs/metadata.xml @@ -3,7 +3,6 @@ <pkgmetadata> <!-- maintainer-needed --> <use> - <flag name="openssl" restrict="<net-fs/s3fs-1.92">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag> <flag name="nss">Enable <pkg>dev-libs/nss</pkg> crypto backend</flag> <flag name="gnutls">Enable <pkg>net-libs/gnutls</pkg> crypto backend</flag> <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> network functions with GnuTLS.</flag> diff --git a/net-fs/s3fs/s3fs-1.92.ebuild b/net-fs/s3fs/s3fs-1.92.ebuild index 3cdc27601f27..4aa6fb399ff1 100644 --- a/net-fs/s3fs/s3fs-1.92.ebuild +++ b/net-fs/s3fs/s3fs-1.92.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="gnutls nettle nss" REQUIRED_USE="nettle? ( gnutls !nss )" diff --git a/net-fs/s3fs/s3fs-1.91.ebuild b/net-fs/s3fs/s3fs-1.93.ebuild index fded3ccf1ec6..1e5bed5d0932 100644 --- a/net-fs/s3fs/s3fs-1.91.ebuild +++ b/net-fs/s3fs/s3fs-1.93.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,22 +15,24 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~riscv x86" -IUSE="gnutls nettle nss +openssl test" -REQUIRED_USE=" - ^^ ( gnutls nss openssl ) - nettle? ( gnutls )" +IUSE="gnutls nettle nss" +REQUIRED_USE="nettle? ( gnutls !nss )" -# Requires active internet connection +# Requires active internet connection and it tries to download some binaries for later execution RESTRICT="test" DEPEND=" dev-libs/libxml2:2 net-misc/curl sys-fs/fuse:0 - gnutls? ( net-libs/gnutls:= ) - nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) - openssl? ( dev-libs/openssl:0= ) + !nss? ( + gnutls? ( + net-libs/gnutls:= + nettle? ( dev-libs/nettle:= ) + ) + !gnutls? ( dev-libs/openssl:0= ) + ) " RDEPEND="${DEPEND} @@ -43,15 +45,23 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default + + sed -i 's/ -D_FORTIFY_SOURCE=3//' configure.ac || die + eautoreconf } src_configure() { local myeconfargs=( - $(use_with gnutls) $(use_with nettle) - $(use_with nss) - $(use_with openssl) ) + if use nss; then + myeconfargs+=( $(use_with nss) ) + elif use gnutls; then + myeconfargs+=( $(use_with gnutls) ) + else + myeconfargs+=( --with-openssl ) + fi + econf "${myeconfargs[@]}" } diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 292e718fddba..2a3807e62cb5 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,7 +1,9 @@ -DIST samba-4.16.10.tar.gz 30695200 BLAKE2B 4cff5f6ab97e2b1d4e958f6348cf2a61d48441295c8ef4518ecd0a893aa2be2bdae9389297532965439cd9887b905186145a0cf30082e2456274994f277d3cfd SHA512 133bcaec853240041dc6e0d8dd086b3798a6aa81008e29e4e6f875f58bd47bb6e23516d572b763d7f2ed547cfe94a3f8f8f5dc978cc171401fe5ed228b85d000 -DIST samba-4.16.8.tar.gz 30682100 BLAKE2B bbb9a89a39cc0bae88ba350df38aae35df0bd18c27dd37b093eb023cf71274c12f14c44037e9704404ee3ba27ab930e866b3b951bcc7a5f4499cbc544f231e6b SHA512 55fa977e046de4470a9f1cb4c7956ca1368a21fc88e6bb6ae93d3cadb5400caaebd5b7d51a5ff1aaea884ec58d8abe6c90f448168aaa175d0f6c018f1a913c70 -DIST samba-4.16.9.tar.gz 30690610 BLAKE2B ce0bf19bff70cc1e174ea67a14c1acd2290d52bbad21ed491bb4a414286f8810ca342a5d9c14f69de0329f846d422e596572028a0c5a4e908a50c2384d9f1491 SHA512 209f3ae33a218279323a6b34f848e8b2c755d6826e7683753f2d8f63456216782786b8e01e3c5dee74a88c34094c6c8b5148a939ebf6caa0d632001dc2242126 -DIST samba-4.17.5.tar.gz 30846334 BLAKE2B f8d6cf3c0f5333c5a6b1ac16793d8fd443c517068211829f40ca2fbc08d80921de65a4f3e2c08775a5551a4f834f406208c0941a4eb496720cc45ecaeb6c173f SHA512 352ae8bc161fb07ac6c7330c6ebd02c27eb453ffc1c32c8437edc441ba3044cb2e9b31c8cf181664a2b47098c75a55f06c105f5397c57ce75826ef2af331afa9 -DIST samba-4.17.8.tar.gz 30874388 BLAKE2B c1a76071a5d823433cde4e357477d433ca3054f6bb2e75124579bd75d0d93d22dc96e169bb2a4ac0f8fb1be96b54add3a0cdb1c854fdc34450ffd589b89cd074 SHA512 60cd72cd40ef4a958d26926d51d9741d4d6c6a7fc8d275c6ba76d2c3ffc4c71aa7554943125c47575135df1271bc421dd57a0d1206708dfa8e25d1b6dc2661ba -DIST samba-4.18.0.tar.gz 41268802 BLAKE2B 9684990834f1593d66cc01e6f58d297a113e1b185aa16ce2f48887da041c745565b0ddbd953232019de0589a4afb954e87ce9fc76a4c5d7d4c95db1a3372d8fa SHA512 bc0eb8bc62fd2c4aa94b452a79e0a31fb3ad52bd46535b5f4c5eff4de8781419c3eb066a8394e704e7d4097c9651932a8de76d5b37cc05547d9a3ed48bf157ae -DIST samba-4.18.3.tar.gz 41294739 BLAKE2B 0e132591d97316a091b1503714fb3085d8bd055f7e286a96aecdc43f8b15e38068e5aaba3fcea68158a37151c5ea8ef13f5b1e245c54f40fc6c3a167497cf70c SHA512 b0980291ca124641bd03ba51d4b4e2e492facb3939f8edf491133be83a82beed66f68f00442cb02c211a9e76eb6ba08387136e30eb7df756c3c90c76034689c4 +DIST samba-4.18.4.tar.gz 41311410 BLAKE2B 1f1aab7eb933111b9b1c72af8c3dd379fe34014085129e9d5cc400b4e434742e1c08ad4fdf2a98291d6063ce9b2ddc811e9ab5dbb133a85e97f2158f83dd7c96 SHA512 bc8d792b510061556c07b6844a825801a4271eed45e01133a4718c1839d123e2908fa0e31e67af43098500e98a9082eb104052e711a8a034fac23d86e15c29ee +DIST samba-4.18.5.tar.gz 41315373 BLAKE2B 24c625372c6e4f7f4393777991221f7a7ad25513717436491ea3238c8d588e738eb1a64791606f691b3608362b3f3741f390f08975b2b0578c497984a4d44392 SHA512 c12b7cd7aba0941bf178c89604f926347bee4f5bb6ea651930cc93bcd8a2cfa983b1f10a0ccb55f99c5b34b9f158d1059d06d7f39f7bc261c7dd0d8c89c5a6f5 +DIST samba-4.18.6.tar.gz 41323359 BLAKE2B 0bdb81edb6a539a4466f97949325091a063ab0a1633c29e15296776f0adc41ee9e1949c94870c347a8dad689598ef1b2de4f0301cb7ce06cae045c68caffa5f4 SHA512 28e8e4e57db1f392dfe96387888e2771e08f1f8eedf860f688ea3b8bd2cee1d6bbe99b2e61c84dc9ed6ade6393baf629955bed93d6cdad5241a292a10d8a12b6 +DIST samba-4.18.7.tar.gz 41328101 BLAKE2B 41b148f72bfa02a8d04745a4d507e8846ffe9b1388b31fe11074c7d86db6509f35a93cce6a201727b37efb6d671f3059d01e26a72198ad67bd83d6238b07d636 SHA512 86baf5c76e92f4b194726441e1d0efe11dc3db4d399f141f76c1abb4f4a3ab05473dded3294d2019f7999305ca6d5e56961d71434e9e214b960895e53bedd7a9 +DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246 +DIST samba-4.19.0.tar.gz 41816190 BLAKE2B 4e0db41d7d06e195cee994c5ec02a37892c1a7dd99ea9defb845fe2fbf96446846c469007218b6b0d6077c0886f0d08b2a4376acba1ed455b641daacd9018f12 SHA512 908418c16e94cf8f87dd331fa4c0081e89d147706e4c85d0cd331327481cab49f6f17ed338c1d0e73475ef8da2398f80db18d63f2d37fc8cb4f053e3b3081af7 +DIST samba-4.19.1.tar.gz 41818285 BLAKE2B d0a6d9d1dfa9e4caacbbf3c9253d50553a5b91ed23a0f3b8871bb790888a6dbe73c4752f949a91263ccd6c5cf526fb8a47d3703403d44c4cea9b0670f2d2ef96 SHA512 838d1529c06bc636fbc3a1c10d5b6bea6389acf992d16c0fd44c51170a6c09de9ccc6e76b789740113851d8c9092bcbe974617b39bbae001e0395f7e127b1670 +DIST samba-4.19.2.tar.gz 41817924 BLAKE2B cb3747f1be6e712c6e68f3720e68aee7db2e4dcc48a9210d002337d6690ed8b027919f333dc4a7c1e74b716ebceeff1d8071463899513edfe51da967d71d8148 SHA512 d2fb64013e77d138a52b100377a042951c132884936b2b6dbf60506355e3f6882d5f3008a6bb855dd19b8981f7dc14da4f91ddbea7458978c1c4ab009608faf5 +DIST samba-4.19.3.tar.gz 41829749 BLAKE2B f83af3b50d795bdc4a250fe96040721150acc3b8effddd473e3cfa3ef6eeec99928b1307a18a472be45049e1d0b74650b9f6dd4bf5c434277c94ab88cb493b3b SHA512 1eacc6be2866ecc7cbb13c5d17a32ad14cc8148e811db9c730a11065ac3ed84a82e406e750dc97fbc884377346c4538a38d8031e63db6b09acd78fbd2c02d702 diff --git a/net-fs/samba/files/samba-4.15.12-configure-clang16.patch b/net-fs/samba/files/samba-4.15.12-configure-clang16.patch deleted file mode 100644 index 0d9c919bd9eb..000000000000 --- a/net-fs/samba/files/samba-4.15.12-configure-clang16.patch +++ /dev/null @@ -1,117 +0,0 @@ -https://bugs.gentoo.org/870043 -https://gitlab.com/samba-team/samba/-/merge_requests/2807 - -From afc5144819e0db141aa9c58de385e5829b952096 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Mon, 21 Nov 2022 13:37:41 +0100 -Subject: [PATCH 1/3] buildtools/wafsamba: Avoid calling lib_func without a - prototype - -This is a backport of commit f4c0a750d4adebcf2342a44e85f04526c34 -("WAF: Fix detection of linker features") -to buildtools/wafsamba/samba_conftests.py. It fixes the check for -rpath support with compilers in strict C99 mode. - -Signed-off-by: Florian Weimer <fweimer@redhat.com> ---- a/buildtools/wafsamba/samba_waf18.py -+++ b/buildtools/wafsamba/samba_waf18.py -@@ -209,7 +209,8 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None): - lib_node.parent.mkdir() - lib_node.write('int lib_func(void) { return 42; }\n', 'w') - main_node = bld.srcnode.make_node('main.c') -- main_node.write('int main(void) {return !(lib_func() == 42);}', 'w') -+ main_node.write('int lib_func(void);\n' -+ 'int main(void) {return !(lib_func() == 42);}', 'w') - linkflags = [] - if version_script: - script = bld.srcnode.make_node('ldscript') -GitLab -From d8c6a9e5558085dfdb144bb64365822415affe84 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Mon, 21 Nov 2022 13:53:17 +0100 -Subject: [PATCH 2/3] source3/wscript: Fix detection of major/minor macros - -These macros are only available via <sys/sysmacros.h> as of glibc -commit e16deca62e16f645213dffd4ecd1153c37765f17 ("[BZ #19239] Don't -include sys/sysmacros.h from sys/types.h."), which went into -glibc 2.28. - -This is different from the usual C99 cleanups because it changes -the configure check result with existing compilers that usually -accept implicit function declarations. - -Signed-off-by: Florian Weimer <fweimer@redhat.com> ---- a/source3/wscript -+++ b/source3/wscript -@@ -603,11 +603,11 @@ msg.msg_accrightslen = sizeof(fd); - conf.CHECK_HEADERS('asm/types.h') - - conf.CHECK_CODE('dev_t dev; int i = major(dev); return 0', "HAVE_DEVICE_MAJOR_FN", -- headers='unistd.h sys/types.h', -+ headers='sys/sysmacros.h unistd.h sys/types.h', - msg="Checking for major macro") - - conf.CHECK_CODE('dev_t dev; int i = minor(dev); return 0', "HAVE_DEVICE_MINOR_FN", -- headers='unistd.h sys/types.h', -+ headers='sys/sysmacros.h unistd.h sys/types.h', - msg="Checking for minor macro") - - conf.CHECK_STRUCTURE_MEMBER('struct dirent', 'd_off', -GitLab -From 1f5c44d982c112e21879b64911a4184c063ba4d4 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Mon, 21 Nov 2022 14:12:43 +0100 -Subject: [PATCH 3/3] source3/wscript: Remove implict int and implicit function - declarations - -This should fix the remaining C89isms in these configure checks. - -Signed-off-by: Florian Weimer <fweimer@redhat.com> ---- a/source3/wscript -+++ b/source3/wscript -@@ -1314,7 +1314,7 @@ syscall(SYS_initgroups, 16, NULL, NULL, 0); - - if conf.CHECK_CODE(''' - #include <time.h> --main() { -+int main() { - struct tm *tm; - if (sizeof(time_t) == 8) { - time_t max_time = 0x7fffffffffffffffll; -@@ -1345,7 +1345,7 @@ main() { - #if defined(HAVE_SYS_SYSMACROS_H) - #include <sys/sysmacros.h> - #endif --main() { dev_t dev = makedev(1,2); return 0; } -+int main() { dev_t dev = makedev(1,2); return 0; } - ''', - 'HAVE_MAKEDEV', - addmain=False, -@@ -1355,12 +1355,13 @@ main() { dev_t dev = makedev(1,2); return 0; } - #include <stdio.h> - #include <limits.h> - #include <signal.h> -+#include <stdlib.h> - - void exit_on_core(int ignored) { - exit(1); - } - --main() { -+int main() { - char *newpath; - signal(SIGSEGV, exit_on_core); - newpath = realpath("/tmp", NULL); -@@ -1517,9 +1518,9 @@ main() { - # Check for getcwd allowing a NULL arg. - conf.CHECK_CODE(''' - #include <unistd.h> --main() { -+int main() { - char *s = getcwd(NULL,0); -- exit(s != NULL ? 0 : 1); -+ return s != NULL ? 0 : 1; - }''', 'GETCWD_TAKES_NULL', addmain=False, execute=True, - msg="getcwd takes a NULL argument") - -GitLab diff --git a/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch b/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch deleted file mode 100644 index c3a2c802e6e9..000000000000 --- a/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch +++ /dev/null @@ -1,118 +0,0 @@ -https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd -https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f -https://bugs.gentoo.org/791349 - -From 14feb93d481011765f62614ab49b304e17e4f6fd Mon Sep 17 00:00:00 2001 -From: Andrew Bartlett <abartlet@samba.org> -Date: Tue, 7 Jun 2022 15:07:59 +1200 -Subject: [PATCH] lib/util: Prefer backtrace_symbols() for internal backtraces - -Backtraces when Samba is in PANIC state are better with -backtrace_symbols() than with libunwind on Ubuntu 20.04 x86_64 -so move libunwind to a off-by-default option, prompted for -if backtrace_symbols() is not available. - -Based on a request by Fco Javier Felix <ffelix@inode64.com> - -Signed-off-by: Andrew Bartlett <abartlet@samba.org> -Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz> ---- a/lib/util/fault.c -+++ b/lib/util/fault.c -@@ -222,9 +222,13 @@ _PUBLIC_ void smb_panic(const char *why) - void log_stack_trace(void) - { - #ifdef HAVE_LIBUNWIND -- /* Try to use libunwind before any other technique since on ia64 -- * libunwind correctly walks the stack in more circumstances than -- * backtrace. -+ /* -+ * --with-libunwind is required to use libunwind, the -+ * backtrace_symbols() code below is the default. -+ * -+ * This code is available because a previous version of this -+ * comment asserted that on ia64 libunwind correctly walks the -+ * stack in more circumstances than backtrace. - */ - unw_cursor_t cursor; - unw_context_t uc; ---- a/lib/util/wscript -+++ b/lib/util/wscript -@@ -2,6 +2,15 @@ def options(opt): - ''' This is a bit strange, but disable is the flag, not enable. ''' - opt.add_option('--disable-fault-handling', action='store_true', dest='disable_fault_handling', help=('disable the fault handlers'), default=False) - -+ # We do not want libunwind by default (backtrace_symbols() in -+ # glibc is better) but allow (eg) IA-64 to build with it where it -+ # might be better (per old comment in fault.c) -+ opt.samba_add_onoff_option('libunwind', -+ default=None, -+ help='''Use libunwind instead of the default backtrace_symbols() -+ from libc, for example on IA-64 where it might give a better -+ backtrace.''') -+ - opt.add_option('--with-systemd', - help=("Enable systemd integration"), - action='store_true', dest='enable_systemd') ---- a/lib/util/wscript_configure -+++ b/lib/util/wscript_configure -@@ -1,23 +1,35 @@ - #!/usr/bin/env python --from waflib import Logs, Options -+from waflib import Logs, Options, Errors - - import os, sys - - if Options.options.disable_fault_handling: - conf.DEFINE('HAVE_DISABLE_FAULT_HANDLING',1) - --# backtrace could be in libexecinfo or in libc -+# backtrace could be in libexecinfo or in libc. -+# This is our preferred backtrace handler (more useful output than libunwind as at Ubuntu 20.04 x86_64) - conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo', checklibc=True, headers='execinfo.h') - conf.CHECK_HEADERS('execinfo.h') - - conf.SET_TARGET_TYPE('LIBUNWIND', 'EMPTY') --if conf.check_cfg(package='libunwind-generic', -- args='--cflags --libs', -- msg='Checking for libunwind', -- uselib_store='LIBUNWIND', -- mandatory=False): -- if conf.CHECK_HEADERS('libunwind.h'): -- conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB') -+if Options.options.with_libunwind: -+ if conf.check_cfg(package='libunwind-generic', -+ args='--cflags --libs', -+ msg='Checking for libunwind', -+ uselib_store='LIBUNWIND', -+ mandatory=False): -+ if conf.CHECK_HEADERS('libunwind.h'): -+ conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB') -+ else: -+ raise Errors.WafError('--with-libunwind specified but libunwind not found') -+elif Options.options.with_libunwind == None: -+ if not conf.CONFIG_SET('HAVE_BACKTRACE_SYMBOLS') \ -+ and not Options.options.disable_fault_handling: -+ raise Errors.WafError( -+'''backtrace_symbols() not found but -+--with-libunwind not specified. -+Use --without-libunwind to build without internal backtrace support or -+--disable-fault-handling to totally defer fault handling to the OS.''') - - conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h') - ---- a/script/autobuild.py -+++ b/script/autobuild.py -@@ -480,10 +480,11 @@ tasks = { - # MIT Kerberos from the current system. Runtime behaviour is - # confirmed via the ktest (static ccache and keytab) environment - -+ # This environment also used to confirm we can still build with --with-libunwind - "samba-ktest-mit": { - "sequence": [ - ("random-sleep", random_sleep(300, 900)), -- ("configure", "./configure.developer --without-ad-dc --with-system-mitkrb5 " + samba_configure_params), -+ ("configure", "./configure.developer --without-ad-dc --with-libunwind --with-system-mitkrb5 " + samba_configure_params), - ("make", "make -j"), - ("test", make_test(include_envs=[ - "ktest", # ktest is also tested in fileserver, samba and -GitLab 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 deleted file mode 100644 index 6f5a82505f7e..000000000000 --- a/net-fs/samba/files/samba-4.16.1-netdb-defines.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://gitlab.com/samba-team/samba/-/commit/e13875601ff6f488b48e7de0f6838db3565401d4 -https://gitlab.com/samba-team/samba/-/merge_requests/2617 -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/files/samba-4.16.2-fix-musl-without-innetgr.patch b/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch deleted file mode 100644 index 19abe8ffbe33..000000000000 --- a/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://gitlab.com/samba-team/samba/-/commit/fb937ddc838043deb82b6a557dce8f29001d0a19 - -# Gentoo bug 855047 ---- a/lib/util/access.c -+++ b/lib/util/access.c -@@ -115,7 +115,7 @@ static bool string_match(const char *tok,const char *s) - return true; - } - } else if (tok[0] == '@') { /* netgroup: look it up */ --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - DATA_BLOB tmp; - char *mydomain = NULL; - char *hostname = NULL; ---- a/source3/auth/user_util.c -+++ b/source3/auth/user_util.c -@@ -135,7 +135,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char - - bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname) - { --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - char nis_domain_buf[256]; - const char *nis_domain = NULL; - char *lowercase_user = NULL; diff --git a/net-fs/samba/files/samba-4.18.4-bug-15418-windows-update-secure-channel.patch b/net-fs/samba/files/samba-4.18.4-bug-15418-windows-update-secure-channel.patch new file mode 100644 index 000000000000..1d0d9777fe19 --- /dev/null +++ b/net-fs/samba/files/samba-4.18.4-bug-15418-windows-update-secure-channel.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/910306 +https://bugzilla.samba.org/show_bug.cgi?id=15418 + + source3/rpc_server/netlogon/srv_netlog_nt.c | 9 +++++---- + source4/rpc_server/netlogon/dcerpc_netlogon.c | 8 ++++---- + 2 files changed, 9 insertions(+), 8 deletions(-) + +--- a/source3/rpc_server/netlogon/srv_netlog_nt.c ++++ b/source3/rpc_server/netlogon/srv_netlog_nt.c +@@ -2284,6 +2284,11 @@ NTSTATUS _netr_LogonGetCapabilities(struct pipes_struct *p, + struct netlogon_creds_CredentialState *creds; + NTSTATUS status; + ++ if (r->in.query_level != 1) { ++ p->fault_state = DCERPC_NCA_S_FAULT_INVALID_TAG; ++ return NT_STATUS_NOT_SUPPORTED; ++ } ++ + become_root(); + status = dcesrv_netr_creds_server_step_check(p->dce_call, + p->mem_ctx, +@@ -2296,10 +2301,6 @@ NTSTATUS _netr_LogonGetCapabilities(struct pipes_struct *p, + return status; + } + +- if (r->in.query_level != 1) { +- return NT_STATUS_NOT_SUPPORTED; +- } +- + r->out.capabilities->server_capabilities = creds->negotiate_flags; + + return NT_STATUS_OK; +--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c ++++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c +@@ -2364,6 +2364,10 @@ static NTSTATUS dcesrv_netr_LogonGetCapabilities(struct dcesrv_call_state *dce_c + struct netlogon_creds_CredentialState *creds; + NTSTATUS status; + ++ if (r->in.query_level != 1) { ++ DCESRV_FAULT(DCERPC_NCA_S_FAULT_INVALID_TAG); ++ } ++ + status = dcesrv_netr_creds_server_step_check(dce_call, + mem_ctx, + r->in.computer_name, +@@ -2375,10 +2379,6 @@ static NTSTATUS dcesrv_netr_LogonGetCapabilities(struct dcesrv_call_state *dce_c + } + NT_STATUS_NOT_OK_RETURN(status); + +- if (r->in.query_level != 1) { +- return NT_STATUS_NOT_SUPPORTED; +- } +- + r->out.capabilities->server_capabilities = creds->negotiate_flags; + + return NT_STATUS_OK; diff --git a/net-fs/samba/files/samba-4.4.0-pam.patch b/net-fs/samba/files/samba-4.18.4-pam.patch index 451601383d4b..381f77ccd32d 100644 --- a/net-fs/samba/files/samba-4.4.0-pam.patch +++ b/net-fs/samba/files/samba-4.18.4-pam.patch @@ -1,6 +1,6 @@ ---- samba-4.4.0rc2/source3/wscript -+++ samba-4.4.0rc2/source3/wscript -@@ -870,7 +870,7 @@ +--- a/source3/wscript ++++ b/source3/wscript +@@ -863,7 +863,7 @@ if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -9,9 +9,9 @@ use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -943,6 +943,17 @@ - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -940,6 +940,17 @@ + "or headers not found. Use --without-pam to disable " + "PAM support."); + else: + Logs.warn("PAM disabled") diff --git a/net-fs/samba/samba-4.16.9.ebuild b/net-fs/samba/samba-4.16.9.ebuild deleted file mode 100644 index 4de9815f7ff5..000000000000 --- a/net-fs/samba/samba-4.16.9.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..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="mirror://samba/rc/${MY_P}.tar.gz" -else - SRC_URI="mirror://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.3.3" -TDB_VERSION="1.4.6" -TEVENT_VERSION="0.11.0" - -COMMON_DEPEND=" - >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/icu:=[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/libtasn1:=[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - dev-perl/Parse-Yapp - >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] - >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] - >=sys-libs/ldb-2.5.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.6.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.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" - "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" - "${FILESDIR}/${PN}-4.15.12-configure-clang16.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 - - 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.4-r1.ebuild b/net-fs/samba/samba-4.18.4-r1.ebuild new file mode 100644 index 000000000000..50bd8a8ba337 --- /dev/null +++ b/net-fs/samba/samba-4.18.4-r1.ebuild @@ -0,0 +1,384 @@ +# 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}"/${PN}-4.18.4-bug-15418-windows-update-secure-channel.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.3.ebuild b/net-fs/samba/samba-4.18.5-r1.ebuild index dd6ebd54b02e..62e458b0c89d 100644 --- a/net-fs/samba/samba-4.18.3.ebuild +++ b/net-fs/samba/samba-4.18.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -13,9 +13,9 @@ 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" + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + 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}" @@ -108,7 +108,7 @@ COMMON_DEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) snapper? ( sys-apps/dbus ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) + 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? ( @@ -144,9 +144,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch ) CONFDIR="${FILESDIR}/4.4" @@ -230,6 +229,25 @@ multilib_src_configure() { 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" diff --git a/net-fs/samba/samba-4.18.0.ebuild b/net-fs/samba/samba-4.18.6-r1.ebuild index 0208efe7350f..62e458b0c89d 100644 --- a/net-fs/samba/samba-4.18.0.ebuild +++ b/net-fs/samba/samba-4.18.6-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -13,9 +13,9 @@ 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" + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + 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}" @@ -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.7.1:=[ldap(+)?,${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}] @@ -108,7 +108,7 @@ COMMON_DEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) snapper? ( sys-apps/dbus ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) + 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? ( @@ -144,9 +144,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch ) CONFDIR="${FILESDIR}/4.4" @@ -230,6 +229,25 @@ multilib_src_configure() { 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" diff --git a/net-fs/samba/samba-4.17.8.ebuild b/net-fs/samba/samba-4.18.7.ebuild index 64dc7ce9bf2c..62e458b0c89d 100644 --- a/net-fs/samba/samba-4.17.8.ebuild +++ b/net-fs/samba/samba-4.18.7.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -13,9 +13,9 @@ 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" + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + 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}" @@ -55,9 +55,9 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/ctdb_version.h ) -TALLOC_VERSION="2.3.4" -TDB_VERSION="1.4.7" -TEVENT_VERSION="0.13.0" +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}] @@ -69,8 +69,8 @@ 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.6.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.7.0:=[ldap(+)?,${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:= @@ -108,7 +108,7 @@ COMMON_DEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) snapper? ( sys-apps/dbus ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) + 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? ( @@ -144,9 +144,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch ) CONFDIR="${FILESDIR}/4.4" @@ -230,6 +229,25 @@ multilib_src_configure() { 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" diff --git a/net-fs/samba/samba-4.16.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild index 2f33091b53fb..8135362ec56e 100644 --- a/net-fs/samba/samba-4.16.8.ebuild +++ b/net-fs/samba/samba-4.18.8.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -13,9 +13,9 @@ 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" + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + 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}" @@ -55,9 +55,9 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/ctdb_version.h ) -TALLOC_VERSION="2.3.3" -TDB_VERSION="1.4.6" -TEVENT_VERSION="0.11.0" +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}] @@ -69,8 +69,8 @@ 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.5.2:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.6.0:=[ldap(+)?,${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:= @@ -108,7 +108,7 @@ COMMON_DEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) snapper? ( sys-apps/dbus ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) + 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? ( @@ -144,12 +144,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" - "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" - "${FILESDIR}/${PN}-4.15.12-configure-clang16.patch" + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch ) CONFDIR="${FILESDIR}/4.4" @@ -233,6 +229,25 @@ multilib_src_configure() { 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" diff --git a/net-fs/samba/samba-4.16.10.ebuild b/net-fs/samba/samba-4.19.0-r1.ebuild index 24d454925e9e..60a4f1bf20bd 100644 --- a/net-fs/samba/samba-4.16.10.ebuild +++ b/net-fs/samba/samba-4.19.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -13,16 +13,16 @@ 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" + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + 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="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" @@ -55,9 +55,9 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/ctdb_version.h ) -TALLOC_VERSION="2.3.3" -TDB_VERSION="1.4.6" -TEVENT_VERSION="0.11.0" +TALLOC_VERSION="2.4.1" +TDB_VERSION="1.4.9" +TEVENT_VERSION="0.15.0" COMMON_DEPEND=" >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] @@ -69,8 +69,8 @@ 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.5.3:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.6.0:=[ldap(+)?,${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}] sys-libs/liburing:=[${MULTILIB_USEDEP}] sys-libs/ncurses:= @@ -108,7 +108,7 @@ COMMON_DEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) snapper? ( sys-apps/dbus ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) + 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? ( @@ -144,12 +144,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" - "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" - "${FILESDIR}/${PN}-4.15.12-configure-clang16.patch" + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch ) CONFDIR="${FILESDIR}/4.4" @@ -233,6 +229,25 @@ multilib_src_configure() { 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" @@ -246,7 +261,6 @@ multilib_src_configure() { --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) diff --git a/net-fs/samba/samba-4.17.5.ebuild b/net-fs/samba/samba-4.19.1.ebuild index c12e3938fdf3..60a4f1bf20bd 100644 --- a/net-fs/samba/samba-4.17.5.ebuild +++ b/net-fs/samba/samba-4.19.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +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 @@ -13,16 +13,16 @@ 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" + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" else - SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" + 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="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" @@ -55,9 +55,9 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/ctdb_version.h ) -TALLOC_VERSION="2.3.4" -TDB_VERSION="1.4.7" -TEVENT_VERSION="0.13.0" +TALLOC_VERSION="2.4.1" +TDB_VERSION="1.4.9" +TEVENT_VERSION="0.15.0" COMMON_DEPEND=" >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] @@ -69,8 +69,8 @@ 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.6.1:=[ldap(+)?,${MULTILIB_USEDEP}] - <sys-libs/ldb-2.7.0:=[ldap(+)?,${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}] sys-libs/liburing:=[${MULTILIB_USEDEP}] sys-libs/ncurses:= @@ -108,7 +108,7 @@ COMMON_DEPEND=" sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] ) snapper? ( sys-apps/dbus ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) + 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? ( @@ -144,9 +144,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" - "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch ) CONFDIR="${FILESDIR}/4.4" @@ -230,6 +229,25 @@ multilib_src_configure() { 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" @@ -243,7 +261,6 @@ multilib_src_configure() { --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) diff --git a/net-fs/samba/samba-4.19.2.ebuild b/net-fs/samba/samba-4.19.2.ebuild new file mode 100644 index 000000000000..60a4f1bf20bd --- /dev/null +++ b/net-fs/samba/samba-4.19.2.ebuild @@ -0,0 +1,382 @@ +# 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 cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.1" +TDB_VERSION="1.4.9" +TEVENT_VERSION="0.15.0" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.19.3.ebuild b/net-fs/samba/samba-4.19.3.ebuild new file mode 100644 index 000000000000..60a4f1bf20bd --- /dev/null +++ b/net-fs/samba/samba-4.19.3.ebuild @@ -0,0 +1,382 @@ +# 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 cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.1" +TDB_VERSION="1.4.9" +TEVENT_VERSION="0.15.0" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} |