diff options
Diffstat (limited to 'net-fs')
254 files changed, 4917 insertions, 11687 deletions
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 0fcd312e462d..4ca9807f25d5 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,4 +1,3 @@ -DIST autofs-5.1.2.tar.xz 294792 BLAKE2B eeecac768726a1b2d336908b48222c53b1ffbc9eeff7b7f597ccbf55214d35f0d99eaeaa1c065509fffa31ec86729bdd51be873e003aa1fb7d88a9e2ab04f4c8 SHA512 435bcb41c9d467947c194d879e46692b5976131b8e923793bdeac34f70420ede740c4d70ec393413fff0b1010495ac7fe5fa8b45a59d15a2430ecae9ec3fe7e1 -DIST autofs-5.1.3.tar.xz 300632 BLAKE2B 500325ec790304442e896208e94e25cf862621fc2354fa3c31fbf277dcc570d0b2b27894728d9f881efdcca262b1ef6e2c957cd23e2aea1d5b3cd2cd822c813b SHA512 d5363f4442be5258465140920a32cb63340c5da060ef2e66678f003d6a0c00579880837f0a04f59c7bce57d1cbc0f42bdd26546a2195f87e7bd46334c9e32e35 -DIST autofs-5.1.4.tar.xz 304864 BLAKE2B 7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f SHA512 1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589 -DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a79f89cdf3ffa0ed234b83c932db1646fc5591269000372dbfb95ce1b9ded040f0724a7eb4b3888caf20f56a20 SHA512 c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898 +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.4.ebuild b/net-fs/autofs/autofs-5.1.4.ebuild deleted file mode 100644 index c09dd3334e1f..000000000000 --- a/net-fs/autofs/autofs-5.1.4.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info multilib systemd toolchain-funcs - -PATCH_VER= -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" - -DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI=" - mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz - ${PATCHSET_URI}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="-dmalloc ldap +libtirpc mount-locking sasl" - -# USE="sasl" adds SASL support to the LDAP module which will not be build. If -# SASL support should be available, please add "ldap" to the USE flags. -REQUIRED_USE="sasl? ( ldap )" - -# currently, sasl code assumes the presence of kerberosV -RDEPEND=">=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 - ) - ) - libtirpc? ( net-libs/libtirpc ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) -" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc - libtirpc? ( net-libs/rpcsvc-proto ) -" - -CONFIG_CHECK="~AUTOFS4_FS" - -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches - fi - - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 - 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) - --without-hesiod - --disable-ext-env - --enable-sloppy-mount # bug #453778 - --enable-force-shutdown - --enable-ignore-busy - --with-systemd="$(systemd_get_systemunitdir)" #bug #479492 - RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if kernel_is -lt 2 6 30; then - # kernel patches - docinto patches - dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch - fi - newinitd "${FILESDIR}"/autofs5.initd autofs - insinto etc/autofs - newins "${FILESDIR}"/autofs5-auto.master auto.master -} - -pkg_postinst() { - if kernel_is -lt 2 6 30; then - elog "This version of ${PN} requires a kernel with autofs4 supporting" - elog "protocol version 5.00. Patches for kernels older than 2.6.30 have" - elog "been installed into" - elog "${EROOT}usr/share/doc/${P}/patches." - elog "For further instructions how to patch the kernel, please refer to" - elog "${EROOT}usr/share/doc/${P}/INSTALL." - elog - fi - elog "If you plan on using autofs for automounting remote NFS mounts," - elog "please check that both portmap (or rpcbind) and rpc.statd/lockd" - elog "are running." -} diff --git a/net-fs/autofs/autofs-5.1.3.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild index c09dd3334e1f..490ca32bfe1b 100644 --- a/net-fs/autofs/autofs-5.1.3.ebuild +++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild @@ -1,58 +1,75 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit linux-info multilib systemd toolchain-funcs - -PATCH_VER= -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" +inherit linux-info systemd toolchain-funcs DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI=" - mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz - ${PATCHSET_URI}" +HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git" +SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz + https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-0.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="-dmalloc ldap +libtirpc mount-locking sasl" - -# USE="sasl" adds SASL support to the LDAP module which will not be build. If -# SASL support should be available, please add "ldap" to the USE flags. -REQUIRED_USE="sasl? ( ldap )" +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=">=sys-apps/util-linux-2.20 +RDEPEND=" + net-libs/libnsl:= + >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) - ldap? ( >=net-nds/openldap-2.0 + ldap? ( + >=net-nds/openldap-2.0:= sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) - libtirpc? ( net-libs/libtirpc ) + systemd? ( sys-apps/systemd ) + libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) " DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) " +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + app-alternatives/yacc +" +RDEPEND+=" selinux? ( sec-policy/selinux-automount )" -CONFIG_CHECK="~AUTOFS4_FS" +PATCHES=( + "${WORKDIR}"/${P}-patches/ + "${FILESDIR}/${P}-dmalloc.patch" + "${FILESDIR}/${P}-nfsv4-mount.patch" + "${FILESDIR}/${P}-mount_conflict.patch" +) -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches +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 - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + 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 } @@ -69,19 +86,25 @@ src_configure() { $(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 - --with-systemd="$(systemd_get_systemunitdir)" #bug #479492 RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 ) - econf "${myeconfargs[@]}" + + 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 @@ -98,9 +121,9 @@ pkg_postinst() { 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 "${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 "${EROOT}/usr/share/doc/${P}/INSTALL." elog fi elog "If you plan on using autofs for automounting remote NFS mounts," diff --git a/net-fs/autofs/autofs-5.1.2.ebuild b/net-fs/autofs/autofs-5.1.9-r1.ebuild index 902979caabdf..efcc4e9ebb83 100644 --- a/net-fs/autofs/autofs-5.1.2.ebuild +++ b/net-fs/autofs/autofs-5.1.9-r1.ebuild @@ -1,67 +1,72 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -AUTOTOOLS_AUTORECONF=true -AUTOTOOLS_IN_SOURCE_BUILD=true - -inherit autotools-utils linux-info multilib systemd toolchain-funcs - -PATCH_VER= -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" +inherit linux-info systemd toolchain-funcs DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI=" - mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz - ${PATCHSET_URI}" +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 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="-dmalloc ldap +libtirpc mount-locking sasl" - -# USE="sasl" adds SASL support to the LDAP module which will not be build. If -# SASL support should be available, please add "ldap" to the USE flags. -REQUIRED_USE="sasl? ( ldap )" +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=">=sys-apps/util-linux-2.20 +RDEPEND=" + net-libs/libnsl:= + >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) - ldap? ( >=net-nds/openldap-2.0 + ldap? ( + >=net-nds/openldap-2.0:= sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) - libtirpc? ( net-libs/libtirpc ) + systemd? ( sys-apps/systemd ) + libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) " - DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) " - -CONFIG_CHECK="~AUTOFS4_FS" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + app-alternatives/yacc +" +RDEPEND+=" selinux? ( sec-policy/selinux-automount )" PATCHES=( - "${FILESDIR}"/${P}-libtirpc-as-need.patch + "${FILESDIR}"/${PN}-5.1.9-c99.patch ) -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches +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 - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 - autotools-utils_src_prepare + 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() { @@ -77,23 +82,25 @@ src_configure() { $(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 - --with-systemd="$(systemd_get_unitdir)" #bug #479492 RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 ) - autotools-utils_src_configure + + CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" } src_compile() { - autotools-utils_src_compile DONTSTRIP=1 + emake STRIP=: DONTSTRIP=1 } src_install() { - autotools-utils_src_install + default + rmdir "${D}"/run if kernel_is -lt 2 6 30; then # kernel patches @@ -110,9 +117,9 @@ pkg_postinst() { 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 "${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 "${EROOT}/usr/share/doc/${P}/INSTALL." elog fi elog "If you plan on using autofs for automounting remote NFS mounts," diff --git a/net-fs/autofs/autofs-5.1.5-r1.ebuild b/net-fs/autofs/autofs-5.1.9.ebuild index 79c538dd1e1c..f21b6430b76e 100644 --- a/net-fs/autofs/autofs-5.1.5-r1.ebuild +++ b/net-fs/autofs/autofs-5.1.9.ebuild @@ -1,33 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit linux-info multilib systemd toolchain-funcs - -PATCH_VER= -[[ -n ${PATCH_VER} ]] && \ - PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma" +inherit linux-info systemd toolchain-funcs DESCRIPTION="Kernel based automounter" -HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html" -SRC_URI=" - mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz - ${PATCHSET_URI}" +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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd" - -# USE="sasl" adds SASL support to the LDAP module which will not be build. If -# SASL support should be available, please add "ldap" to the USE flags. -REQUIRED_USE="sasl? ( ldap )" +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=">=sys-apps/util-linux-2.20 +RDEPEND=" + net-libs/libnsl:= + >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) - ldap? ( >=net-nds/openldap-2.0 + ldap? ( + >=net-nds/openldap-2.0:= sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 @@ -35,27 +28,38 @@ RDEPEND=">=sys-apps/util-linux-2.20 ) ) systemd? ( sys-apps/systemd ) - libtirpc? ( net-libs/libtirpc ) + libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) " DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc libtirpc? ( net-libs/rpcsvc-proto ) " +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + app-alternatives/yacc +" +RDEPEND+=" selinux? ( sec-policy/selinux-automount )" -CONFIG_CHECK="~AUTOFS4_FS" +pkg_setup() { + linux-info_pkg_setup -src_prepare() { - # Upstream's patchset - if [[ -n ${PATCH_VER} ]]; then - EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}"/patches + local CONFIG_CHECK + + if kernel_is -ge 4 18; then + CONFIG_CHECK="~AUTOFS_FS" + else + CONFIG_CHECK="~AUTOFS4_FS" fi - sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492 + check_extra_config +} - # need for install autofs.service +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 @@ -74,7 +78,7 @@ src_configure() { $(use_with libtirpc) $(use_with sasl) $(use_enable mount-locking) - $(use_with systemd systemd $(systemd_get_systemunitdir)) #bug #479492 + $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492 --without-hesiod --disable-ext-env --enable-sloppy-mount # bug #453778 @@ -82,11 +86,17 @@ src_configure() { --enable-ignore-busy RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716 ) - econf "${myeconfargs[@]}" + + 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 @@ -103,9 +113,9 @@ pkg_postinst() { 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 "${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 "${EROOT}/usr/share/doc/${P}/INSTALL." elog fi elog "If you plan on using autofs for automounting remote NFS mounts," diff --git a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch b/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch deleted file mode 100644 index f6e176978164..000000000000 --- a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch +++ /dev/null @@ -1,28 +0,0 @@ -Make configure compatible with -Wl,--as-needed following -https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure - -2016-07-05 Martin von Gagern - ---- autofs-5.1.2.orig/aclocal.m4 -+++ autofs-5.1.2/aclocal.m4 -@@ -413,9 +413,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC], - [ - # save current flags - af_check_libtirpc_save_cflags="$CFLAGS" --af_check_libtirpc_save_ldflags="$LDFLAGS" -+af_check_libtirpc_save_libs="$LIBS" - CFLAGS="$CFLAGS -I/usr/include/tirpc" --LDFLAGS="$LDFLAGS -ltirpc" -+LIBS="$LIBS -ltirpc" - - AC_TRY_LINK( - [ #include <rpc/rpc.h> ], -@@ -438,7 +438,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna - - # restore flags - CFLAGS="$af_check_libtirpc_save_cflags" --LDFLAGS="$af_check_libtirpc_save_ldflags" -+LIBS="$af_check_libtirpc_save_libs" - ]) - - AC_DEFUN([AF_WITH_LIBTIRPC], diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch new file mode 100644 index 000000000000..e2ed58fb1766 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch @@ -0,0 +1,53 @@ +diff --git a/include/mounts.h b/include/mounts.h +index ddb7e4c..854e1fb 100644 +--- a/include/mounts.h ++++ b/include/mounts.h +@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n); + struct tree_ops { + tree_new_t new; + tree_cmp_t cmp; +- tree_free_t free; ++ tree_free_t set_free; + }; + + typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr); +diff --git a/lib/mounts.c b/lib/mounts.c +index 4c86688..1e54a33 100644 +--- a/lib/mounts.c ++++ b/lib/mounts.c +@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n); + static struct tree_ops mnt_ops = { + .new = tree_mnt_new, + .cmp = tree_mnt_cmp, +- .free = tree_mnt_free, ++ .set_free = tree_mnt_free, + }; + static struct tree_ops *tree_mnt_ops = &mnt_ops; + +@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n); + static struct tree_ops host_ops = { + .new = tree_host_new, + .cmp = tree_host_cmp, +- .free = tree_host_free, ++ .set_free = tree_host_free, + }; + static struct tree_ops *tree_host_ops = &host_ops; + +@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n); + static struct tree_ops mapent_ops = { + .new = tree_mapent_new, + .cmp = tree_mapent_cmp, +- .free = tree_mapent_free, ++ .set_free = tree_mapent_free, + }; + static struct tree_ops *tree_mapent_ops = &mapent_ops; + +@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root) + tree_free(root->right); + if (root->left) + tree_free(root->left); +- ops->free(root); ++ ops->set_free(root); + } + + int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr) diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch new file mode 100644 index 000000000000..e2a94bf82542 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch @@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" diff --git a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch new file mode 100644 index 000000000000..eb1bc6cb4241 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch @@ -0,0 +1,88 @@ +autofs-5.1.8 - fix nfsv4 only mounts should not use rpcbind + +From: Ian Kent <raven@xxxxxxxxxx> + +Commit 606795ecfaa1 ("autofs-5.1.7 - also require TCP_REQUESTED when +setting NFS port" together with commit 26fb6b5408be) caused NFSv4 only +mounts to also use rpcbind to probe availability which breaks the +requirememt that this type of mount not use rpcbind at all. + +Fix this by treating fstype=nfs4 mounts as a special case which doesn't +use rpcbind. +--- + CHANGELOG | 1 + + include/replicated.h | 2 ++ + modules/mount_nfs.c | 13 +++++++------ + modules/replicated.c | 4 ++-- + 4 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/include/replicated.h b/include/replicated.h +index 95ff1f0d..f889a56a 100644 +--- a/include/replicated.h ++++ b/include/replicated.h +@@ -35,6 +35,8 @@ + #define NFS3_REQUESTED NFS3_SUPPORTED + #define NFS4_REQUESTED NFS4_SUPPORTED + ++#define NFS4_ONLY_REQUESTED 0x0800 ++ + #define TCP_SUPPORTED 0x0001 + #define UDP_SUPPORTED 0x0002 + #define TCP_REQUESTED TCP_SUPPORTED +diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c +index 0ab87dcf..feb5afcd 100644 +--- a/modules/mount_nfs.c ++++ b/modules/mount_nfs.c +@@ -92,7 +92,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + mount_default_proto = defaults_get_mount_nfs_default_proto(); + vers = NFS_VERS_DEFAULT | NFS_PROTO_DEFAULT; + if (strcmp(fstype, "nfs4") == 0) +- vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED; ++ vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED | NFS4_ONLY_REQUESTED; + else if (mount_default_proto == 4) + vers = vers | NFS4_VERS_DEFAULT; + +@@ -157,15 +157,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + } else { + /* Is any version of NFSv4 in the options */ + if (_strncmp("vers=4", cp, 6) == 0 || +- _strncmp("nfsvers=4", cp, 9) == 0) +- vers = NFS4_VERS_MASK | TCP_SUPPORTED; +- else if (_strncmp("vers=3", cp, o_len) == 0 || ++ _strncmp("nfsvers=4", cp, 9) == 0) { ++ vers &= ~(NFS_VERS_MASK); ++ vers |= NFS4_VERS_MASK | TCP_SUPPORTED | NFS4_ONLY_REQUESTED; ++ } else if (_strncmp("vers=3", cp, o_len) == 0 || + _strncmp("nfsvers=3", cp, o_len) == 0) { +- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); ++ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED); + vers |= NFS3_REQUESTED; + } else if (_strncmp("vers=2", cp, o_len) == 0 || + _strncmp("nfsvers=2", cp, o_len) == 0) { +- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); ++ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED); + vers |= NFS2_REQUESTED; + } else if (strstr(cp, "port=") == cp && + o_len - 5 < 25) { +diff --git a/modules/replicated.c b/modules/replicated.c +index 09075dd0..cdb7c617 100644 +--- a/modules/replicated.c ++++ b/modules/replicated.c +@@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, + + rpc_info->proto = proto; + if (port < 0) { +- if ((version & NFS4_REQUESTED) && (version & TCP_REQUESTED)) ++ if (version & NFS4_REQUESTED && (version & NFS4_ONLY_REQUESTED)) + rpc_info->port = NFS_PORT; + else + port = 0; +@@ -525,7 +525,7 @@ static int get_vers_and_cost(unsigned logopt, struct host *host, + { + struct conn_info pm_info, rpc_info; + time_t timeout = RPC_TIMEOUT; +- unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK); ++ unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK | NFS4_ONLY_REQUESTED); + int ret = 0; + + if (!check_address_proto(logopt, host, version)) diff --git a/net-fs/autofs/files/autofs-5.1.9-c99.patch b/net-fs/autofs/files/autofs-5.1.9-c99.patch new file mode 100644 index 000000000000..e218f52a96f1 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.9-c99.patch @@ -0,0 +1,57 @@ +https://src.fedoraproject.org/rpms/autofs/c/787a553722ec9aecf0c5108065bef9ef110d7639?branch=rawhide +https://lore.kernel.org/autofs/874jgf4qwu.fsf@oldenburg.str.redhat.com/ +https://lore.kernel.org/autofs/878r5r4qy5.fsf@oldenburg.str.redhat.com/ + +Fix argument type for ldap_parse_page_control in configure probe, +to suppress an incompatible-pointer-types error. + +Submitted upstream: + + <https://lore.kernel.org/autofs/874jgf4qwu.fsf@oldenburg.str.redhat.com/> + +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -427,7 +427,7 @@ AC_LINK_IFELSE( + struct berval *c; + int ret; + LDAPControl **clp; +- ret = ldap_parse_page_control(ld,clp,ct,c); ]])], ++ ret = ldap_parse_page_control(ld,clp,ct,&c); ]])], + [ af_have_ldap_parse_page_control=yes + AC_MSG_RESULT(yes) ], + [ AC_MSG_RESULT(no) ]) + +Add casts to SASL callbacks to avoid incompatible-pointer-types +errors. + +Submitted upstream: + + <https://lore.kernel.org/autofs/878r5r4qy5.fsf@oldenburg.str.redhat.com/> + +--- a/modules/cyrus-sasl.c ++++ b/modules/cyrus-sasl.c +@@ -109,17 +109,17 @@ static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **); + static int getuser_func(void *, int, const char **, unsigned *); + + static sasl_callback_t callbacks[] = { +- { SASL_CB_USER, &getuser_func, NULL }, +- { SASL_CB_AUTHNAME, &getuser_func, NULL }, +- { SASL_CB_PASS, &getpass_func, NULL }, ++ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + + static sasl_callback_t debug_callbacks[] = { +- { SASL_CB_LOG, &sasl_log_func, NULL }, +- { SASL_CB_USER, &getuser_func, NULL }, +- { SASL_CB_AUTHNAME, &getuser_func, NULL }, +- { SASL_CB_PASS, &getpass_func, NULL }, ++ { SASL_CB_LOG, (int(*)(void)) &sasl_log_func, NULL }, ++ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + diff --git a/net-fs/autofs/files/autofs5.initd b/net-fs/autofs/files/autofs5.initd index 119585c995e0..1b9b0fadd8bb 100644 --- a/net-fs/autofs/files/autofs5.initd +++ b/net-fs/autofs/files/autofs5.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 DAEMON=/usr/sbin/automount @@ -8,7 +8,7 @@ DEVICE=autofs depend() { need localmount - use ypbind nfs slapd portmap net + use ypbind nfsclient slapd net } extra_started_commands="reload" diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml index f36813693b70..fac959b9f41b 100644 --- a/net-fs/autofs/metadata.xml +++ b/net-fs/autofs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dlan@gentoo.org</email> @@ -17,4 +17,7 @@ </flag> <flag name="sasl">Enable SASL support in the LDAP module</flag> </use> + <upstream> + <remote-id type="cpe">cpe:/a:ibm:autofs</remote-id> + </upstream> </pkgmetadata> diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest index ac214314a208..1f944b2285e4 100644 --- a/net-fs/btfs/Manifest +++ b/net-fs/btfs/Manifest @@ -1,3 +1 @@ -DIST btfs-2.17.tar.gz 24231 BLAKE2B 2a66ce18e907f1a905c6d93e12bdf7963561d7dad6861168606e500102afe98de48d9d609af5a9a8955edbfe96b20b26822300aecf2869169a6bbf924c2faf2d SHA512 e4fae52e46581ca382ac4ddd64d80217a9bc0c18cd6317bb4780734c193dcdd9cfed210073b5fd2d8514be2922bb3f0481b13695411e97bb67b7d793f071c3e1 -DIST btfs-2.18.tar.gz 24185 BLAKE2B e9e8ca472b3231db66e859cbe28e6a664255aca456e6a0bdd5dd7d4e093b83d0322709c79d00b4d54d73adfdbf8f6d0487ad4ae69357a2f554ac899095416ac2 SHA512 d29f3816527c1eed105b45da559d025d61c8652144358227ed0ca3e516582cd8186fdcdf730b19fde6e7e9db1477690237444d2efe7c740f81f91032f1a12f86 -DIST btfs-2.19.tar.gz 24217 BLAKE2B 19e298fc4629e8292ed87aa817ed78da75df4c90cf1c437c967288a77355efcfee641d65d0d2732a88a78a40574144d06254f2fc4b04be6d0980f683d42552f9 SHA512 e890b25605808dbf09f70d4ad8703a4beafb098af39a872a6b98f6959eb30e1ba9be8ae420be0797ba8f2774b487f2434252e93eac599094a824ba411441fdd6 +DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c diff --git a/net-fs/btfs/btfs-2.18.ebuild b/net-fs/btfs/btfs-2.18.ebuild deleted file mode 100644 index 4b07e384e01d..000000000000 --- a/net-fs/btfs/btfs-2.18.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit autotools python-r1 - -DESCRIPTION="a bittorrent filesystem based on FUSE" -HOMEPAGE="https://github.com/johang/btfs" -SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -CDEPEND=">=sys-fs/fuse-2.8.0:0 - >=net-misc/curl-7.22.0 - dev-libs/boost:= - >=net-libs/libtorrent-rasterbar-0.16.0:=" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - ${PYTHON_DEPS}" - -src_prepare() { - default - - # don't install btplay via make - sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die - - eautoreconf -} - -src_install() { - default - python_foreach_impl python_doscript scripts/btplay -} diff --git a/net-fs/btfs/btfs-2.19.ebuild b/net-fs/btfs/btfs-2.19.ebuild deleted file mode 100644 index c984674ed5dd..000000000000 --- a/net-fs/btfs/btfs-2.19.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) - -inherit autotools python-r1 - -DESCRIPTION="a bittorrent filesystem based on FUSE" -HOMEPAGE="https://github.com/johang/btfs" -SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -CDEPEND=">=sys-fs/fuse-2.8.0:0 - >=net-misc/curl-7.22.0 - dev-libs/boost:= - >=net-libs/libtorrent-rasterbar-0.16.0:=" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - ${PYTHON_DEPS}" - -src_prepare() { - default - - # don't install btplay via make - sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die - - eautoreconf -} - -src_install() { - default - python_foreach_impl python_doscript scripts/btplay -} diff --git a/net-fs/btfs/btfs-2.17.ebuild b/net-fs/btfs/btfs-2.24.ebuild index 4b07e384e01d..38bd3d6bbeba 100644 --- a/net-fs/btfs/btfs-2.17.ebuild +++ b/net-fs/btfs/btfs-2.24.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools python-r1 DESCRIPTION="a bittorrent filesystem based on FUSE" @@ -12,22 +12,21 @@ SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -CDEPEND=">=sys-fs/fuse-2.8.0:0 +DEPEND=">=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:=" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} ${PYTHON_DEPS}" +BDEPEND="virtual/pkgconfig" src_prepare() { default - # don't install btplay via make + # Don't install btplay via make sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die eautoreconf @@ -35,5 +34,6 @@ src_prepare() { src_install() { default + python_foreach_impl python_doscript scripts/btplay } diff --git a/net-fs/btfs/metadata.xml b/net-fs/btfs/metadata.xml index 21630ede97af..d4b61e591cba 100644 --- a/net-fs/btfs/metadata.xml +++ b/net-fs/btfs/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>radhermit@gentoo.org</email> - <name>Tim Harder</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">johang/btfs</remote-id> </upstream> diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index dbd5aeb88d8f..16707337f470 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -1,3 +1 @@ -DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e -DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 -DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a +DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d2856d491d56aa469e8e3919b4030cb920a7f60d08851b0a23d28a020d1ddf7daa8b9ac412f1567a0a60d2f6ee6774 SHA512 4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild deleted file mode 100644 index 48c64bc1af54..000000000000 --- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils linux-info multilib pam - -DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" -HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" -SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux" -IUSE="+acl +ads +caps +caps-ng creds pam" - -RDEPEND=" - !net-fs/mount-cifs - !<net-fs/samba-3.6_rc1 - sys-apps/keyutils - ads? ( - sys-libs/talloc - virtual/krb5 - ) - caps? ( !caps-ng? ( sys-libs/libcap ) ) - caps? ( caps-ng? ( sys-libs/libcap-ng ) ) - pam? ( virtual/pam ) -" -DEPEND="${RDEPEND}" -PDEPEND=" - acl? ( >=net-fs/samba-4.0.0_alpha1 ) -" - -REQUIRED_USE="acl? ( ads )" - -DOCS="doc/linux-cifs-client-guide.odt" - -PATCHES=( - "${FILESDIR}/${P}-talloc.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 -} - -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() { - ROOTSBINDIR="${EPREFIX}"/sbin \ - econf \ - $(use_enable acl cifsacl cifsidmap) \ - $(use_enable ads cifsupcall) \ - $(use caps && use_with !caps-ng libcap || echo --without-libcap) \ - $(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \ - $(use_enable creds cifscreds) \ - $(use_enable pam) \ - $(use_with pam pamdir $(getpam_mod_dir)) -} - -src_install() { - default - - # remove empty directories - find "${ED}" -type d -print0 | xargs --null rmdir \ - --ignore-fail-on-non-empty &>/dev/null - - 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 -} - -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-6.8-r1.ebuild b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild index 15032dc76fbc..aa0f9fee761f 100644 --- a/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild +++ b/net-fs/cifs-utils/cifs-utils-7.0-r1.ebuild @@ -1,39 +1,53 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info multilib pam +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" -HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" +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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="+acl +ads +caps creds pam" +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=" - !net-fs/mount-cifs - !<net-fs/samba-3.6_rc1 - sys-apps/keyutils ads? ( + sys-apps/keyutils:= sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) - pam? ( virtual/pam ) + 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 )" +REQUIRED_USE=" + 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 @@ -47,6 +61,8 @@ pkg_setup() { ewarn ewarn "and recompile your kernel ..." fi + + use python && python-single-r1_pkg_setup } src_prepare() { @@ -61,13 +77,21 @@ src_prepare() { } src_configure() { + # bug #927809 + filter-flags -fno-semantic-interposition + local myeconfargs=( + --enable-man + --enable-smbinfo $(use_enable acl cifsacl cifsidmap) $(use_enable ads cifsupcall) $(use_with caps libcap) $(use_enable creds cifscreds) $(use_enable pam) $(use_with pam pamdir $(getpam_mod_dir)) + $(use_enable python pythontools) + # mount.cifs can get passwords from systemd + $(use_enable systemd) ) ROOTSBINDIR="${EPREFIX}"/sbin \ econf "${myeconfargs[@]}" @@ -77,8 +101,7 @@ src_install() { default # remove empty directories - find "${ED}" -type d -print0 | xargs --null rmdir \ - --ignore-fail-on-non-empty &>/dev/null + find "${ED}" -type d -empty -delete || die if use acl ; then dodir /etc/cifs-utils @@ -96,6 +119,9 @@ src_install() { 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() { diff --git a/net-fs/cifs-utils/cifs-utils-6.9.ebuild b/net-fs/cifs-utils/cifs-utils-7.0.ebuild index c757b0aed04f..95cf49c09822 100644 --- a/net-fs/cifs-utils/cifs-utils-6.9.ebuild +++ b/net-fs/cifs-utils/cifs-utils-7.0.ebuild @@ -1,39 +1,53 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools linux-info multilib pam +PYTHON_COMPAT=( python3_{9..12} ) + +inherit autotools bash-completion-r1 flag-o-matic linux-info pam python-single-r1 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" -HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" +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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="+acl +ads +caps creds pam" +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=" - !net-fs/mount-cifs - !<net-fs/samba-3.6_rc1 - sys-apps/keyutils ads? ( + sys-apps/keyutils:= sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) - pam? ( virtual/pam ) + 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 )" +REQUIRED_USE=" + acl? ( ads ) + python? ( ${PYTHON_REQUIRED_USE} ) +" DOCS="doc/linux-cifs-client-guide.odt" +PATCHES=( + "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594 + "${FILESDIR}/${PN}-6.15-musl.patch" +) + pkg_setup() { linux-info_pkg_setup @@ -47,6 +61,8 @@ pkg_setup() { ewarn ewarn "and recompile your kernel ..." fi + + use python && python-single-r1_pkg_setup } src_prepare() { @@ -61,7 +77,11 @@ src_prepare() { } src_configure() { + # bug #927809 + filter-flags -fno-semantic-interposition + local myeconfargs=( + --enable-man --enable-smbinfo $(use_enable acl cifsacl cifsidmap) $(use_enable ads cifsupcall) @@ -69,6 +89,9 @@ src_configure() { $(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[@]}" @@ -96,6 +119,9 @@ src_install() { 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() { diff --git a/net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch b/net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch new file mode 100644 index 000000000000..a5f7be668ac3 --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch @@ -0,0 +1,22 @@ +Fixed an inverted race condition when installing with MAKEOPTS="-j1" + +jer found this: + install-root_sbinPROGRAMS is called from install-data-am but + install-exec-hook is called from install-exec-am + +So moving the failing ln call into install-data-hook for now... + +--- cifs-utils-6.12/Makefile.am ++++ cifs-utils-6.12/Makefile.am +@@ -117,10 +117,8 @@ + + SUBDIRS = contrib + +-install-exec-hook: install-sbinPROGRAMS ++install-data-hook: install-sbinPROGRAMS + (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) +- +-install-data-hook: + if CONFIG_MAN + ( cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) + endif diff --git a/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch b/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch new file mode 100644 index 000000000000..f17cc68bdaca --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-6.15-musl.patch @@ -0,0 +1,80 @@ +https://marc.info/?l=linux-cifs&m=165604639613381&w=2 + +From c267ecf6a1c2152e640897d30cc0e8f637a8ef76 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 24 Jun 2022 05:25:23 +0100 +Subject: [PATCH 1/2] getcifsacl, setcifsacl: add missing <linux/limits.h> + include for XATTR_SIZE_MAX + +Needed to build on musl. It only works on glibc because of transitive includes +(which could break in future). + +Example failure: +``` +getcifsacl.c: In function 'getcifsacl': +getcifsacl.c:429:24: error: 'XATTR_SIZE_MAX' undeclared (first use in this function) + 429 | if (bufsize >= XATTR_SIZE_MAX) { + | ^~~~~~~~~~~~~~ +``` + +Bug: https://bugs.gentoo.org/842195 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -34,6 +34,7 @@ + #include <errno.h> + #include <limits.h> + #include <ctype.h> ++#include <linux/limits.h> + #include <sys/xattr.h> + #include "cifsacl.h" + #include "idmap_plugin.h" +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -48,6 +48,7 @@ + #include <errno.h> + #include <limits.h> + #include <ctype.h> ++#include <linux/limits.h> + #include <sys/xattr.h> + + #include "cifsacl.h" +From d1a36cc4caa541d1f0f9a3426a5202b680cf7ff8 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 24 Jun 2022 05:26:54 +0100 +Subject: [PATCH 2/2] getcifsacl, setcifsacl: add missing <endian.h> include + for le32toh + +Needed to fix build on musl libc. It only works by chance on glibc +because of transitive includes (which could break at any time). + +Example failure: +``` +getcifsacl.c: In function 'print_ace': +getcifsacl.c:284:16: warning: implicit declaration of function 'le16toh' [-Wimplicit-function-declaration] + 284 | size = le16toh(pace->size); + | ^~~~~~~ +``` + +Bug: https://bugs.gentoo.org/842195 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -23,6 +23,7 @@ + #include "config.h" + #endif /* HAVE_CONFIG_H */ + ++#include <endian.h> + #include <string.h> + #include <getopt.h> + #include <stdint.h> +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -38,6 +38,7 @@ + #include "config.h" + #endif /* HAVE_CONFIG_H */ + ++#include <endian.h> + #include <string.h> + #include <getopt.h> + #include <stdint.h> diff --git a/net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch b/net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch deleted file mode 100644 index 7e3418631bd4..000000000000 --- a/net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=612018 - -From: Thomas Witt <pyromaniac@exherbo.org> -Date: Wed, 15 Mar 2017 20:20:44 +0000 (+0000) -Subject: mount.cifs: Remove data_blob.h include -X-Git-Url: https://git.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=272d523a57a4e8791d625a479128613be5e401f5 - -mount.cifs: Remove data_blob.h include - -data_blob.h includes talloc.h from libtalloc, but that is only marked as -a dependency for cifs.upcall. No symbols from that header are used by -cifs.mount, so remove it to avoid the libtalloc dependency - -Signed-off-by: Thomas Witt <pyromaniac@exherbo.org> ---- - -diff --git a/mount.cifs.c b/mount.cifs.c -index 13b71ef..2612feb 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -61,7 +61,6 @@ - #include "mount.h" - #include "util.h" - #include "resolve_host.h" --#include "data_blob.h" - - #ifndef MS_MOVE - #define MS_MOVE 8192 - 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/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml index d5117586f46c..8ae7effff581 100644 --- a/net-fs/cifs-utils/metadata.xml +++ b/net-fs/cifs-utils/metadata.xml @@ -1,15 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>samba@gentoo.org</email> <name>Samba Team</name> </maintainer> - <longdescription>The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package</longdescription> + <longdescription> + The in-kernel CIFS filesystem relies on a set of user-space + tools. That package of tools is called cifs-utils. Although not + really part of Samba proper, these tools were originally part of + the Samba package. For several reasons, shipping these tools as + part of Samba was problematic and it was deemed better to split + them off into their own package + </longdescription> + <upstream> + <remote-id type="cpe">cpe:/a:samba:cifs-utils</remote-id> + </upstream> <use> <flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag> - <flag name="caps">libcap support</flag> - <flag name="caps-ng">libcap-ng support</flag> + <flag name="caps">Enable <pkg>sys-libs/libcap-ng</pkg> support</flag> <flag name="creds">cifs credentials support</flag> + <flag name="python">Enable support for python and install python tools</flag> </use> </pkgmetadata> diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild deleted file mode 100644 index c6a181e880b1..000000000000 --- a/net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools - -DESCRIPTION="File system for accessing ftp hosts based on FUSE" -HOMEPAGE="http://curlftpfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="" -RESTRICT="test" # bug 258460 - -RDEPEND=">=net-misc/curl-7.17.0 - >=sys-fs/fuse-2.2 - >=dev-libs/glib-2.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${P}-64bit_filesize.patch - epatch "${FILESDIR}"/${PN}-0.9.2-darwin.patch - epatch "${FILESDIR}"/${PN}-0.9.2-memleak.patch - epatch "${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch - epatch "${FILESDIR}"/${PN}-0.9.2-fix-escaping.patch - - # automake-1.13.1 obsoletes AM_* bit #469818 - sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die - - epatch_user - - eautoreconf -} - -src_install() { - default - dodoc README -} diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild new file mode 100644 index 000000000000..c291639f1821 --- /dev/null +++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r5.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="File system for accessing ftp hosts based on FUSE" +HOMEPAGE="https://curlftpfs.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux" +RESTRICT="test" # bug 258460 + +RDEPEND=" + >=net-misc/curl-7.17.0 + >=sys-fs/fuse-2.2:0= + >=dev-libs/glib-2.0 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-64bit_filesize.patch + "${FILESDIR}"/${PN}-0.9.2-darwin.patch + "${FILESDIR}"/${PN}-0.9.2-memleak.patch + "${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch + "${FILESDIR}"/${PN}-0.9.2-fix-escaping.patch + "${FILESDIR}"/${PN}-0.9.2-__off_t.patch +) + +src_prepare() { + default + + # automake-1.13.1 obsoletes AM_* bit #469818 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die + + eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861299 + # https://sourceforge.net/p/curlftpfs/bugs/76/ + filter-lto + + default +} + +src_install() { + default + dodoc README +} diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch index 38b6f33a2ba5..256c74923708 100644 --- a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch +++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch @@ -1,5 +1,5 @@ ---- ftpfs.c.old 2009-11-28 14:28:05.000000000 +0300 -+++ ftpfs.c 2009-11-28 14:28:19.000000000 +0300 +--- a/ftpfs.c 2009-11-28 14:28:05.000000000 +0300 ++++ b/ftpfs.c 2009-11-28 14:28:19.000000000 +0300 @@ -503,7 +503,7 @@ curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch new file mode 100644 index 000000000000..796acf09155c --- /dev/null +++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-__off_t.patch @@ -0,0 +1,15 @@ +musl targetsdon't define __foo_t + +https://bugs.gentoo.org/716764 +--- a/configure.ac ++++ b/configure.ac +@@ -22,6 +22,9 @@ case $host_os in + darwin*) + CFLAGS="$CFLAGS -D__off_t=off_t" + ;; ++ *musl*) ++ CFLAGS="$CFLAGS -D__off_t=off_t" ++ ;; + esac + CFLAGS="$CFLAGS -Wall -W -Wno-sign-compare -D_REENTRANT $GLIB_CFLAGS $FUSE_CFLAGS $LIBCURL_CPPFLAGS" + LIBS="$GLIB_LIBS $FUSE_LIBS $LIBCURL" diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch index fd0bd1f0cfe5..81265920531b 100644 --- a/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch +++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch @@ -1,8 +1,7 @@ https://sourceforge.net/tracker/?func=detail&atid=816359&aid=2799820&group_id=160565 -diff -ur configure.ac configure.ac ---- configure.ac 2008-04-23 15:37:42 +0400 -+++ configure.ac 2009-06-02 09:46:05 +0400 +--- a/configure.ac 2008-04-23 15:37:42 +0400 ++++ b/configure.ac 2009-06-02 09:46:05 +0400 @@ -18,6 +18,11 @@ AC_MSG_ERROR(["We need libcurl with support for FTP protocol."]) fi diff --git a/net-fs/curlftpfs/metadata.xml b/net-fs/curlftpfs/metadata.xml index d18ff5806215..65da072a10f6 100644 --- a/net-fs/curlftpfs/metadata.xml +++ b/net-fs/curlftpfs/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">curlftpfs</remote-id> </upstream> diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index a6cc53c24f94..9a871a5a2dfb 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1 +1 @@ -DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b +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..1bfc46cba0b0 --- /dev/null +++ b/net-fs/cvmfs/cvmfs-2.11.2.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake linux-info bash-completion-r1 + +DESCRIPTION="HTTP read-only file system for distributing software" +HOMEPAGE="https://cernvm.cern.ch/fs/" +SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" + +KEYWORDS="amd64 x86" +IUSE="server" + +CDEPEND=" + acct-group/cvmfs + acct-user/cvmfs + app-arch/libarchive + dev-cpp/gtest + dev-cpp/sparsehash + dev-db/sqlite:3= + dev-libs/leveldb:0= + dev-libs/openssl:0= + dev-libs/protobuf:0= + net-dns/c-ares:0= + net-libs/pacparser:0= + net-misc/curl:0[adns] + sys-apps/attr + sys-fs/fuse:0= + sys-fs/fuse:3= + sys-libs/libcap:0= + sys-libs/zlib:0= +" + +RDEPEND="${CDEPEND} + app-admin/sudo + net-fs/autofs +" + +DEPEND="${CDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.10.1-gentoo.patch +) + +pkg_setup() { + if use server; then + CONFIG_CHECK="~OVERLAY_FS" + ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set" + linux-info_pkg_setup + fi +} + +src_prepare() { + cmake_src_prepare + # gentoo stuff + rm bootstrap.sh || die + sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" \ + -e "s:/bin/pidof:/usr/bin/pidof:g" cvmfs/cvmfs_config || die + sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ + CMakeLists.txt || die + eapply_user +} + +src_configure() { + local mycmakeargs=( + -DBUILTIN_EXTERNALS=OFF + -DBUILD_CVMFS=ON + -DBUILD_LIBCVMFS=OFF # static library used only for development + -DBUILD_DOCUMENTATION=OFF + -DBUILD_GEOAPI=OFF # only used for stratum 1 servers + -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs + -DBUILD_PRELOADER=OFF # special purpose utility for HPCs + -DBUILD_RECEIVER=OFF # for distributed publishers only + -DBUILD_SERVER=$(usex server) + -DINSTALL_BASH_COMPLETION=OFF + -DINSTALL_MOUNT_SCRIPTS=ON + -DINSTALL_PUBLIC_KEYS=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config + bashcomp_alias cvmfs_config cvmfs_server + dodoc doc/*.md + keepdir /var/lib/cvmfs + use server && keepdir /var/lib/cvmfs-server +} + +pkg_config() { + einfo "Setting up CernVM-FS client" + cvmfs_config setup + einfo "Now edit ${EROOT}/etc/cvmfs/default.local" + einfo "and restart the autofs service" +} diff --git a/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild b/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild deleted file mode 100644 index 393df3a15fde..000000000000 --- a/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils linux-info bash-completion-r1 - -MYP=${PN}-${PV/_p/-fix} - -DESCRIPTION="HTTP read-only file system for distributing software" -HOMEPAGE="http://cernvm.cern.ch/portal/filesystem" -SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz" - -LICENSE="BSD" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="aufs bash-completion debug doc preload server test test-programs" - -CDEPEND=" - dev-cpp/gtest - >=dev-cpp/sparsehash-1.12 - dev-db/sqlite:3= - dev-libs/leveldb:0= - dev-libs/openssl:0 - net-libs/pacparser:0= - net-misc/curl:0[adns] - sys-apps/attr - sys-fs/fuse:0= - sys-libs/libcap:0= - sys-libs/zlib:0= - preload? ( >=dev-cpp/tbb-4.4:0=[debug?] ) - server? ( - >=dev-cpp/tbb-4.4:0=[debug?] - dev-python/geoip-python - ) -" - -RDEPEND="${CDEPEND} - app-admin/sudo - net-fs/autofs - server? ( - aufs? ( sys-kernel/aufs-sources ) - www-servers/apache - ) -" - -DEPEND="${CDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - test? ( - dev-python/geoip-python - >=dev-cpp/tbb-4.4:0= - || ( sys-devel/gdb dev-util/lldb ) - ) -" - -REQUIRED_USE="test-programs? ( server )" - -S="${WORKDIR}/${PN}-${MYP}" - -pkg_setup() { - if use server; then - if use aufs; then - CONFIG_CHECK="~AUFS_FS" - ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set with the aufs flag" - else - CONFIG_CHECK="~OVERLAY_FS" - ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set" - fi - linux-info_pkg_setup - fi -} - -src_prepare() { - cmake-utils_src_prepare - # gentoo stuff - sed -i -e 's/COPYING//' CMakeLists.txt || die - rm bootstrap.sh || die - sed -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ - -i CMakeLists.txt || die - - # hack for bundled packages - # not worth unbundling upstreams are flaky/dead - local pkg - for pkg in vjson sha2 sha3; do - # respect toolchain variables - sed -e 's/g++/$(CXX)/g' \ - -e 's/gcc/$(CC)/g' \ - -e 's/CFLAGS/MYCFLAGS/g' \ - -e 's/-O2/$(CFLAGS)/g' \ - -e 's/-O2/$(CXXFLAGS)/g' \ - -e 's/ar/$(AR)/' \ - -e 's/ranlib/$(RANLIB)/' \ - -i externals/${pkg}/src/Makefile || die - mkdir -p "${WORKDIR}/${P}_build"/externals/build_${pkg} - cp -r externals/${pkg}/src/* \ - "${WORKDIR}/${P}_build"/externals/build_${pkg}/ || die - done -} - -src_configure() { - local mycmakeargs=( - -DGEOIP_BUILTIN=OFF - -DGOOGLETEST_BUILTIN=OFF - -DLEVELDB_BUILTIN=OFF - -DLIBCURL_BUILTIN=OFF - -DPACPARSER_BUILTIN=OFF - -DSPARSEHASH_BUILTIN=OFF - -DSQLITE3_BUILTIN=OFF - -DTBB_PRIVATE_LIB=OFF - -DZLIB_BUILTIN=OFF - -DBUILD_CVMFS=ON - -DBUILD_LIBCVMFS=ON - -DINSTALL_MOUNT_SCRIPTS=ON - -DINSTALL_PUBLIC_KEYS=ON - -DINSTALL_BASH_COMPLETION=OFF - -DBUILD_DOCUMENTATION="$(usex doc)" - -DBUILD_PRELOADER="$(usex preload)" - -DBUILD_SERVER="$(usex server)" - ) - if use test || use test-programs; then - mycmakeargs+=( -DBUILD_UNITTESTS=ON ) - fi - use test-programs && mycmakeargs+=( -DINSTALL_UNITTESTS=ON ) - if use debug; then - mycmakeargs+=( - $(cmake-utils_use server BUILD_SERVER_DEBUG) - $(cmake-utils_use test BUILD_UNITTESTS_DEBUG) - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use doc && cmake-utils_src_compile doc -} - -src_install() { - cmake-utils_src_install - use bash-completion && \ - newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs - dodoc doc/*.md - if use doc; then - insinto /usr/share/doc/${PF} - doins -r "${BUILD_DIR}"/html - docompress -x /usr/share/doc/${PF}/html - fi -} - -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/cvmfs/files/cvmfs-2.10.1-gentoo.patch b/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch new file mode 100644 index 000000000000..d988b6e67313 --- /dev/null +++ b/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch @@ -0,0 +1,85 @@ + +Patch to unbundle dependencies to build in Gentoo. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96d509739..1b214f5a6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -337,6 +337,10 @@ endif () + find_package (OpenSSL REQUIRED) + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR}) + ++set(Libcrypto_LIBRARIES OpenSSL::Crypto) ++set(Libcrypto_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) ++add_definitions(-DLIBRESSL_VERSION_NUMBER=1) ++ + find_package (Libcrypto REQUIRED) + # We do not add the Libcrypto include directories to INCLUDE_DIRECTORIES + # to avoid a clash with the system openssl. We only use it for libcvmfs_crypto +-- + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -343,7 +343,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS}) + find_package (GMock REQUIRED) + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS}) + +-find_package (VJSON REQUIRED) ++add_subdirectory(externals/vjson) + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS}) + + find_package (LibArchive REQUIRED) +diff --git a/externals/vjson/CMakeLists.txt b/externals/vjson/CMakeLists.txt +new file mode 100644 +index 000000000..c1f82ce03 +--- /dev/null ++++ b/externals/vjson/CMakeLists.txt +@@ -0,0 +1,8 @@ ++project(VJSON) ++ ++add_library(cvmfs_vjson STATIC src/block_allocator.cpp src/json.cpp) ++set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE) ++target_include_directories(cvmfs_vjson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) ++set(VJSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src PARENT_SCOPE) ++set(VJSON_LIBRARY $<TARGET_FILE:cvmfs_vjson> PARENT_SCOPE) ++set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE) +-- + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -356,7 +356,7 @@ if (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR + find_package (ZLIB REQUIRED) + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS}) + +- find_package (SHA3 REQUIRED) ++ add_subdirectory(externals/sha3) + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS}) + endif () + +diff --git a/externals/sha3/CMakeLists.txt b/externals/sha3/CMakeLists.txt +new file mode 100644 +index 000000000..7efa79b65 +--- /dev/null ++++ b/externals/sha3/CMakeLists.txt +@@ -0,0 +1,19 @@ ++project(SHA3) ++ ++add_library(cvmfs_sha3 STATIC ++ src/64opt/KeccakF-1600-opt64.c ++ src/KeccakHash.c ++ src/KeccakSponge.c ++ src/SnP-FBWL-default.c ++) ++ ++set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE) ++ ++target_include_directories(cvmfs_sha3 PUBLIC ++ ${CMAKE_CURRENT_SOURCE_DIR}/src ++ ${CMAKE_CURRENT_SOURCE_DIR}/src/64opt ++) ++ ++set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/64opt PARENT_SCOPE) ++set(SHA3_LIBRARY $<TARGET_FILE:cvmfs_sha3> PARENT_SCOPE) ++set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE) +-- + diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml index 74533529685d..a48d2699f689 100644 --- a/net-fs/cvmfs/metadata.xml +++ b/net-fs/cvmfs/metadata.xml @@ -1,23 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>amadio@gentoo.org</email> + <name>Guilherme Amadio</name> + </maintainer> <longdescription lang="en"> - The CernVM File System is a client-server file system developed to - deliver software stacks onto virtual machines in a fast, scalable, - and reliable way. CernVM-FS is implemented as a FUSE module. It - makes a specially prepared directory tree stored on a web server - look like a local read-only file system on the virtual - machine. CernVM-FS uses outgoing HTTP connections only, thereby it - avoids most of the firewall issues of other network file systems. It - transfers data file by file on demand, verifying the content by - SHA-1 keys. + The CernVM-File System (CernVM-FS) provides a scalable, reliable and low- + maintenance software distribution service. It was developed to assist High + Energy Physics (HEP) collaborations to deploy software on the worldwide- + distributed computing infrastructure used to run data processing applications. + CernVM-FS is implemented as a POSIX read-only file system in user space (a + FUSE module). Files and directories are hosted on standard web servers and + mounted in the universal namespace /cvmfs. Internally, CernVM-FS uses content- + addressable storage and Merkle trees in order to maintain file data and + meta-data. CernVM-FS uses outgoing HTTP connections only, thereby it avoids + most of the firewall issues of other network file systems. It transfers data + and meta-data on demand and verifies data integrity by cryptographic hashes. </longdescription> <use> - <flag name="aufs">Use AUFS instead of OverlayFS for the server</flag> - <flag name="preload">Install the cvmfs cache preloader for distributed file systems</flag> <flag name="server">Install the cvmfsd program and init script</flag> - <flag name="test-programs">Install unit test programs</flag> </use> <upstream> <remote-id type="github">cvmfs/cvmfs</remote-id> diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest index 3854955c8eec..996f227204d5 100644 --- a/net-fs/davfs2/Manifest +++ b/net-fs/davfs2/Manifest @@ -1,2 +1,3 @@ -DIST davfs2-1.5.4.tar.gz 478377 BLAKE2B 25c7dba1a6cda384a60c8ce2e0a56d5c805f5c30f35f086bfe1f55ee4eb79b8228beca2e7214e9858a1c49c8f782c6de8f4f0631cf0e2090991a0e35ba5d8ed2 SHA512 08550f171f4b196f55f3fb71c6c75ed24063f8a5afc31c52502d0c911cf7aca4da01f7a123269d410dadc497c44ef5a3573e455aca6eafe48eb86f18429b94b2 -DIST davfs2-1.5.5.tar.gz 481021 BLAKE2B bff2f1a48caa74009209ea1422b20d46022358339f650228584ed1d7b8218be9fd360666cdd3f12a9e110af36caadc7de2daf4134ed4a34f498999ff09f6327a SHA512 3a660b29eab15226acf3cc896ec387beb96cb4a94beae40d5970d8d4f7f370afb7da2b637584d953b5dc342d81454d9a954990b04f3cb032fb2a0a469fd7983c +DIST davfs2-1.6.0.tar.gz 472511 BLAKE2B aed1ec060d5639fb90a58257038a75c25c2f77a7d6393130ffa3b4d36b92433654b8396dfe4615e4f2ea06d5c6d961d5de27b0347e62d730a22eddd003db71e1 SHA512 e016eb847152b7d0c20abfdafd36f43fcff29339362be6765202a45692a186c70b1c33d3566ed8ca695c399a7f0ca1aef7b05d378cdda33d892cb684da34de33 +DIST davfs2-1.6.1.tar.gz 472426 BLAKE2B b24a3f17604838e763cbcf86f62719ee41b5569e58732441a621d210dd0c2e619d4f363d90e9b13d1616e84a3da940da941a15ad6eadfa2b339d14a6e26c75a2 SHA512 12f9eadd2049741b7cb61c5583be6c6982559e702e5cbd4767c655110187524d7afad0a6ff8ad00d457e194ad75b3ce391f5fe566fb4a0bbaed0a705caa3f163 +DIST davfs2-1.7.0.tar.gz 476244 BLAKE2B 671d473bc94c2a0cfc3d2cfb47b6eb558fee0e834ed4de9c3670279643f8903568d9fb077b6fbc2f81e848d076ff02ea5b07d885f16e89331393a28df62055a6 SHA512 6ee5820b60ed28ad100949bb4db65ea07bbae1ad0128cd35e7bb69f7f6bdde99606e8cf704ddb197f1400abadc3934d34ab85f298f9100b6ea9e60813c2345f2 diff --git a/net-fs/davfs2/davfs2-1.5.4.ebuild b/net-fs/davfs2/davfs2-1.5.4.ebuild deleted file mode 100644 index 40f41a2c4a0a..000000000000 --- a/net-fs/davfs2/davfs2-1.5.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user - -DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" -HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="nls" -RESTRICT="test" - -RDEPEND="dev-libs/libxml2 - net-libs/neon - sys-libs/zlib - nls? ( virtual/libintl virtual/libiconv ) -" -DEPEND="${REPEND} - nls? ( sys-devel/gettext ) -" - -pkg_setup() { - enewgroup davfs2 -} - -src_configure() { - econf dav_user=nobody --enable-largefile $(use_enable nls) -} - -pkg_postinst() { - elog - elog "Quick setup:" - elog " (as root)" - elog " # gpasswd -a \${your_user} davfs2" - elog " # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" - elog " (as user)" - elog " \$ mkdir -p ~/dav" - elog " \$ mount ~/dav" - elog -} diff --git a/net-fs/davfs2/davfs2-1.6.0-r2.ebuild b/net-fs/davfs2/davfs2-1.6.0-r2.ebuild new file mode 100644 index 000000000000..2f0191604584 --- /dev/null +++ b/net-fs/davfs2/davfs2-1.6.0-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" +HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" +IUSE="nls" +RESTRICT="test" + +RDEPEND="dev-libs/libxml2 + <net-libs/neon-0.33.0 + sys-libs/zlib + nls? ( virtual/libintl virtual/libiconv ) +" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) +" +RDEPEND="${RDEPEND} + acct-group/davfs2 + acct-user/davfs2 +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-neon-0.32-support.patch +) + +src_prepare() { + local f + + # Let the package manager handle man page compression + while IFS="" read -d $'\0' -r f ; do + sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die + done < <(find "${S}"/man -type f -name 'Makefile.in' -print0) + + default + eautoreconf +} + +src_configure() { + econf --enable-largefile $(use_enable nls) ssbindir="${EPREFIX}/usr/sbin" +} + +pkg_postinst() { + elog + elog "Quick setup:" + elog " (as root)" + elog " # gpasswd -a \${your_user} davfs2" + elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" + elog " (as user)" + elog " \$ mkdir -p ~/dav" + elog " \$ mount ~/dav" + elog +} diff --git a/net-fs/davfs2/davfs2-1.6.1-r3.ebuild b/net-fs/davfs2/davfs2-1.6.1-r3.ebuild new file mode 100644 index 000000000000..4685ec7210b8 --- /dev/null +++ b/net-fs/davfs2/davfs2-1.6.1-r3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" +HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="nls" +RESTRICT="test" + +RDEPEND="dev-libs/libxml2 + acct-group/davfs2 + acct-user/davfs2 + net-libs/neon:0/27 + sys-libs/zlib + nls? ( virtual/libintl virtual/libiconv ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-neon-version-support.patch +) + +src_prepare() { + local f + + # Let the package manager handle man page compression + while IFS="" read -d $'\0' -r f ; do + sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die + done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) + + default + eautoreconf +} + +src_configure() { + econf --enable-largefile $(use_enable nls) ssbindir="${EPREFIX}/usr/sbin" +} + +pkg_postinst() { + elog + elog "Quick setup:" + elog " (as root)" + elog " # gpasswd -a \${your_user} davfs2" + elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" + elog " (as user)" + elog " \$ mkdir -p ~/dav" + elog " \$ mount ~/dav" + elog +} diff --git a/net-fs/davfs2/davfs2-1.5.5.ebuild b/net-fs/davfs2/davfs2-1.7.0-r1.ebuild index 3ef5dd25f003..16f1eca17df8 100644 --- a/net-fs/davfs2/davfs2-1.5.5.ebuild +++ b/net-fs/davfs2/davfs2-1.7.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit user +inherit autotools DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" @@ -11,33 +11,39 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="nls" RESTRICT="test" RDEPEND="dev-libs/libxml2 - net-libs/neon + acct-group/davfs2 + acct-user/davfs2 + net-libs/neon:0/27 sys-libs/zlib nls? ( virtual/libintl virtual/libiconv ) " -DEPEND="${REPEND} +BDEPEND=" nls? ( sys-devel/gettext ) " -pkg_setup() { - enewgroup davfs2 -} +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-neon-version-support.patch +) src_prepare() { + local f + # Let the package manager handle man page compression - sed -e '/^manual[58]_DATA/ s/\.gz//g' \ - -i "${S}"/man/Makefile.in || die + while IFS="" read -d $'\0' -r f ; do + sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die + done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) default + eautoreconf } src_configure() { - econf dav_user=nobody --enable-largefile $(use_enable nls) + econf --enable-largefile $(use_enable nls) } pkg_postinst() { @@ -45,7 +51,7 @@ pkg_postinst() { elog "Quick setup:" elog " (as root)" elog " # gpasswd -a \${your_user} davfs2" - elog " # echo 'http://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" + elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" elog " (as user)" elog " \$ mkdir -p ~/dav" elog " \$ mount ~/dav" diff --git a/net-fs/davfs2/files/davfs2-1.6.0-neon-0.32-support.patch b/net-fs/davfs2/files/davfs2-1.6.0-neon-0.32-support.patch new file mode 100644 index 000000000000..3a7c316e374b --- /dev/null +++ b/net-fs/davfs2/files/davfs2-1.6.0-neon-0.32-support.patch @@ -0,0 +1,13 @@ +# Gentoo bug https://bugs.gentoo.org/816294 + +--- a/configure.ac ++++ b/configure.ac +@@ -36,7 +36,7 @@ AC_PROG_LN_S + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) + DAV_CHECK_NEON + + # Checks for header files. diff --git a/net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch b/net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch new file mode 100644 index 000000000000..b002b49be6d3 --- /dev/null +++ b/net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch @@ -0,0 +1,14 @@ +# Gentoo bug https://bugs.gentoo.org/925705 + +diff -Naur davfs2-1.7.0-orig/configure.ac davfs2-1.7.0/configure.ac +--- davfs2-1.7.0-orig/configure.ac 2022-09-08 13:17:15.000000000 -0700 ++++ davfs2-1.7.0/configure.ac 2024-04-05 03:39:20.044039872 -0700 +@@ -36,7 +36,7 @@ + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + DAV_CHECK_NEON + + # Checks for header files. diff --git a/net-fs/davfs2/metadata.xml b/net-fs/davfs2/metadata.xml index 4d7a21128d94..6fdc1414aeb9 100644 --- a/net-fs/davfs2/metadata.xml +++ b/net-fs/davfs2/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gokturk@gentoo.org</email> - <name>Göktürk Yüksek</name> - </maintainer> + <maintainer type="person"> + <email>gokturk@gentoo.org</email> + <name>Göktürk Yüksek</name> + </maintainer> + <upstream> + <remote-id type="savannah-nongnu">davfs2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-fs/docker-volume-netshare/Manifest b/net-fs/docker-volume-netshare/Manifest deleted file mode 100644 index fef83b047866..000000000000 --- a/net-fs/docker-volume-netshare/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -DIST docker-volume-netshare-0.35.tar.gz 18874 BLAKE2B 5d165b04014743cf4bf3bcdc7aab4d2d8c71906f21c7c6254b164fd92a935f4d806b7486a18bcba158c830a378237a07c8ef24d4f2704deab221fe5b97ea1ea6 SHA512 b1cc165b11d97d649b2d15cdc97888916ca6824b9a6206668b41e28ece977ec7b2f5e59664a1a618996d63c0645976315e3f7353eca370b4881f3412e9fed521 -DIST github.com-Sirupsen-logrus-8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz 28679 BLAKE2B 47127a7f53db13bcb4977f21b7faaaccc1aa23b8adb94ce1a97196ffe430f4a3241d72e1c5a4861c7bcf2787e027a907e9fcf8405a98fe37547f5dcba8efaf10 SHA512 2f096d0e55c5debeb50b56905702b2a5b37b2b4dc35f08e303ee4c8c449473b3cd4aa776f23598785c1667b7a64af525c6f0696089b0b9c31214eb3e3a9af192 -DIST github.com-coreos-go-systemd-25fe332a900022d06a189ce01108392854c59df1.tar.gz 59314 BLAKE2B 4538ec89eb7386ac9d978b34c2372ec65ed16f3a4c32abdbd7c8b2e820eecf3fd958aab967e7ad7b06a2798b34e0db812f2bfbc7ee3f7859e5721bfdf0ef6662 SHA512 a7a666f36aa14b2de3026fb1509a39c519864f456992f3b2b82753e239422897e0aaa2646313693e0a0731e78cb58135b7a6d9a435db1a7e178e2f303807daa1 -DIST github.com-dickeyxxx-netrc-e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz 5936 BLAKE2B f739f764d1bba5d5745280aa7f390f6ddc9cbdcb8d00a0845884624dc1cc1e3e85a916e561c949c28ec8535a4a1ffa5d91e8d3e097c9b80fc521cec98116dc79 SHA512 1a4d29c41c987d5c4d2fbd91b22cc3e0b11b6db6208cb38f2a03d0a91b85450e6895787c0c2e96e7dd67d11f9c742af3a80472517faa4cc49e7165b005b0d5fb -DIST github.com-docker-go-connections-7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz 30766 BLAKE2B c0c2b70e16341d95f5a7b99280833c8775c5c25e4b7d646dea8cc750cb12d2fd0105dc17794c74f6f983d2747a96b61ec70a35c7aa2f2b874205b4cf8f9af082 SHA512 dc3f44c94030b3ce1f4a9cac15d7f5c70bca2c8e535ed5581f128e5ce520a47d006d3776bf78c8faa2ac899e202fca272806ee6e8c9d23da76f1e1d964169a14 -DIST github.com-docker-go-plugins-helpers-61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz 26117 BLAKE2B 41337898be01f7fe0e8e819163884281eed9a77804241f741b1c833ace8d9f8df211a3238be2b8cd544b50e9d920123ed5aaf70725d77cf3077e11d795081e7c SHA512 44a1661dc3ca5e5262153a62702a4944cfa41d2925f735b79208e78837e9144e32801ded6af80c69a70d0b4eba367c59b2fb3bada18adfb374820a0ac82ba7b5 -DIST github.com-golang-crypto-432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz 1451209 BLAKE2B bef38d2cd606eaa06ca8fb226ba7ac0f1078df1232428c868fcc1ceaaeba1b781b1152747a6f92a0a40cda67b07fddf091d70fd28abb7b40028884d1a2a8c9f0 SHA512 97ebc686dfdf17d3887485063f2f808c041cbecd78fd8b6285fde2c22c8f0059c1b70eccdc4353b20d55902bc8c199edc53c564368c1ff4aed65ef534dc8b9f3 -DIST github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c -DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6 -DIST github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz 2517679 BLAKE2B ad17feb9fe826f84d65e6fe85f10cf6cf901bc6cf593d9e44a02edce72e399b0184a29617cb67f38b2fb0278ffa46d872c32f997c3facc2154a23cceec046bdd SHA512 d4f6709e2c20a3d639b167c0d0e7f987cd2e2d849899460ed26cc7e7f4ce682b45eb3be59a4be91e872a9eea29130f72a7de4f3c1006d99449c6f762f993b9bb -DIST github.com-spf13-cobra-be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz 100452 BLAKE2B 921b681489b620c626ecdc112b20e45cd0a424d6a1088c1b45e4a3339e7645d9a29154c6fcb341af6e3d80750bc8a89aec837d8a3741b9665ab065526e1188b0 SHA512 81edc5080eba62c58766597d3e1e02779eeb1ee578d7d3fd36cd38c725d58e02300960f311cb4cf1713127ef3ccbe16d581399e2bd7e20f2e37fee7a68dcbf15 -DIST github.com-spf13-pflag-ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz 41039 BLAKE2B 1dae2f35f0f165c94b3477cf853126cd7c3a9171bbfa639b505936c6ec495a27f99d2c69b34cdf09641959ada6559b5d707cca808069eb4dae20ac4a5443fc89 SHA512 4b5ed5c08f08f347be1832ea5bb8b8ea4ca7b5c5fc8aff2a08dfe667e0c8c0bc1a55ade7ebe83d68746a10af317eec3e8053d2d63a3e24caf437eff7405e719c diff --git a/net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild b/net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild deleted file mode 100644 index fed0fcf4d248..000000000000 --- a/net-fs/docker-volume-netshare/docker-volume-netshare-0.35.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/ContainX/docker-volume-netshare" -EGIT_COMMIT="v${PV}" - -EGO_VENDOR=( "github.com/Sirupsen/logrus 8c0189d9f6bbf301e5d055d34268156b317016af" - "github.com/dickeyxxx/netrc e1a19c977509b96a5c76996dec63ab5aac67c38c" - "github.com/docker/go-plugins-helpers 61cb8e2334204460162c8bd2417cd43cb71da66f" - "github.com/coreos/go-systemd 25fe332a900022d06a189ce01108392854c59df1" - "github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6" - "github.com/miekg/dns 5364553f1ee9cddc7ac8b62dce148309c386695b" - "github.com/spf13/cobra be77323fc05148ef091e83b3866c0d47c8e74a8b" - "github.com/spf13/pflag ee5fd03fd6acfd43e44aea0b4135958546ed8e73" - "golang.org/x/net cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb github.com/golang/net" - "golang.org/x/crypto 432090b8f568c018896cd8a0fb0345872bbac6ce github.com/golang/crypto" - "golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys" -) - -inherit golang-vcs-snapshot systemd user - -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" -DESCRIPTION="Docker NFS, AWS EFS, Ceph & Samba/CIFS Volume Plugin" -HOMEPAGE="https://github.com/ContainX/docker-volume-netshare" -LICENSE="Apache-2.0" -KEYWORDS="~amd64" -SLOT="0" -IUSE="" - -src_prepare() { - default - sed -i -e "s/dmaj/ContainX/" -e "s/VERSION string = \"\"/VERSION string =\"${PV}\"/" src/${EGO_PN}/main.go || die -} - -src_compile() { - pushd src/${EGO_PN} || die - CGO_LDFLAGS="-fno-PIC" GOPATH="${S}" go build || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dobin ${PN} - dodoc README.md - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} diff --git a/net-fs/docker-volume-netshare/files/docker-volume-netshare.confd b/net-fs/docker-volume-netshare/files/docker-volume-netshare.confd deleted file mode 100644 index a8a88debb293..000000000000 --- a/net-fs/docker-volume-netshare/files/docker-volume-netshare.confd +++ /dev/null @@ -1,2 +0,0 @@ -# arguments for docker-volume-netshare plugin -command_args="nfs -o nolock" diff --git a/net-fs/docker-volume-netshare/files/docker-volume-netshare.initd b/net-fs/docker-volume-netshare/files/docker-volume-netshare.initd deleted file mode 100644 index d80b7be94841..000000000000 --- a/net-fs/docker-volume-netshare/files/docker-volume-netshare.initd +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2016-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Docker Volume Netshare plugin" -pidfile=${pidfile:-"/run/${SVCNAME}.pid"} -command="/usr/bin/docker-volume-netshare" -command_args="${command_args:nfs}" -command_background="true" -start_stop_daemon_args="--stdout /var/log/${SVCNAME}.log \ - --stderr /var/log/${SVCNAME}.log" diff --git a/net-fs/docker-volume-netshare/metadata.xml b/net-fs/docker-volume-netshare/metadata.xml deleted file mode 100644 index 75ff92f73e6a..000000000000 --- a/net-fs/docker-volume-netshare/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">ContainX/docker-volume-netshare</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-fs/ksmbd-tools/Manifest b/net-fs/ksmbd-tools/Manifest new file mode 100644 index 000000000000..0f98fa9569f0 --- /dev/null +++ b/net-fs/ksmbd-tools/Manifest @@ -0,0 +1,2 @@ +DIST ksmbd-tools-3.4.8.tar.gz 88898 BLAKE2B 4bd4fa77e7d89de4f48427e6867807b27a9be91e4f27079d4a5b231c4925aef73489bced1e4569361105fe7e04671fa8d6f3394154b36072f9d4ec77fded7466 SHA512 f5372ea7fd4b754482374cdeefa011bebe32c37a26acc180c34c61f37cf08125b5b4626128cae413cd517a74af326188f3f9e7cf459308e4305d86e7c6702436 +DIST ksmbd-tools-3.5.2.tar.gz 463604 BLAKE2B f54ff13719dd7e7167d065a7aaf5393fc18f67611be0a22fc4914e6d2afd25e751db85c27ff3adde482e1d9c4192161b76dc92f9c066dcc41cae7c820510483c SHA512 20035501e63798f5a23d3d9502ff4a50b04f74a03154bc4bfdfabb37dcf106410cd1355c2612cc46a0e52742f8e213dad4862790661781691e77760c56f40386 diff --git a/net-fs/ksmbd-tools/files/confd b/net-fs/ksmbd-tools/files/confd new file mode 100644 index 000000000000..81248468d530 --- /dev/null +++ b/net-fs/ksmbd-tools/files/confd @@ -0,0 +1,5 @@ +# /etc/conf.d/ksmbd: config file for /etc/init.d/ksmbd +# + +# Full path to config file. /etc/ksmbd/smb.conf is default if not set. +#KSMBD_CONF="/etc/ksmbd/smb.conf" diff --git a/net-fs/ksmbd-tools/files/initd b/net-fs/ksmbd-tools/files/initd new file mode 100644 index 000000000000..f65770ed44c6 --- /dev/null +++ b/net-fs/ksmbd-tools/files/initd @@ -0,0 +1,32 @@ +#!/sbin/openrc-run +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/smb.conf}" + +depend() { + need localmount + use net +} + +description="ksmbd userspace daemon" + +command="/sbin/ksmbd.mountd" +command_control="/sbin/ksmbd.control" +command_args="-s" + +required_files="${KSMBD_CONF}" + +start_pre() { + /sbin/modprobe ksmbd || return 1 +} + +stop() { + ebegin "Stopping ${RC_SVCNAME}" + "${command_control}" -s + eend $? +} + +stop_post() { + /sbin/modprobe -r -q ksmbd || return 0 +} diff --git a/net-fs/ksmbd-tools/files/ksmbd.confd b/net-fs/ksmbd-tools/files/ksmbd.confd new file mode 100644 index 000000000000..cc014a04559d --- /dev/null +++ b/net-fs/ksmbd-tools/files/ksmbd.confd @@ -0,0 +1,8 @@ +# /etc/conf.d/ksmbd: config file for /etc/init.d/ksmbd +# + +# Full path to config file. /etc/ksmbd/ksmbd.conf is default if not set. +#KSMBD_CONF="/etc/ksmbd/ksmbd.conf" + +# Extra options to pass to ksmbd.mountd(8) at startup +#KSMBD_OPTS="" diff --git a/net-fs/ksmbd-tools/files/ksmbd.initd b/net-fs/ksmbd-tools/files/ksmbd.initd new file mode 100644 index 000000000000..86feb90b8da1 --- /dev/null +++ b/net-fs/ksmbd-tools/files/ksmbd.initd @@ -0,0 +1,41 @@ +#!/sbin/openrc-run +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/ksmbd.conf}" +KSMBD_OPTS="${KSMBD_OPTS:-}" + +depend() { + need localmount + use net +} + +description="ksmbd userspace daemon" + +command="/sbin/ksmbd.mountd" +command_control="/sbin/ksmbd.control" +command_args="--config=${KSMBD_CONF} ${KSMBD_OPTS}" + +extra_started_commands="reload" + +required_files="${KSMBD_CONF}" + +reload() { + ebegin "Reloading ${RC_SVCNAME}" + "${command_control}" --reload + eend $? +} + +start_pre() { + /sbin/modprobe -q ksmbd || return 0 +} + +stop() { + ebegin "Stopping ${RC_SVCNAME}" + "${command_control}" --shutdown + eend $? +} + +stop_post() { + /sbin/modprobe -r -q ksmbd || return 0 +} diff --git a/net-fs/ksmbd-tools/files/ksmbd.initd-r1 b/net-fs/ksmbd-tools/files/ksmbd.initd-r1 new file mode 100644 index 000000000000..82375f1ad8d3 --- /dev/null +++ b/net-fs/ksmbd-tools/files/ksmbd.initd-r1 @@ -0,0 +1,41 @@ +#!/sbin/openrc-run +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/ksmbd.conf}" +KSMBD_OPTS="${KSMBD_OPTS:-}" + +depend() { + need localmount + use net +} + +description="ksmbd userspace daemon" + +command="/usr/sbin/ksmbd.mountd" +command_control="/usr/sbin/ksmbd.control" +command_args="--config=${KSMBD_CONF} ${KSMBD_OPTS}" + +extra_started_commands="reload" + +required_files="${KSMBD_CONF}" + +reload() { + ebegin "Reloading ${RC_SVCNAME}" + "${command_control}" --reload + eend $? +} + +start_pre() { + /sbin/modprobe -q ksmbd || return 0 +} + +stop() { + ebegin "Stopping ${RC_SVCNAME}" + "${command_control}" --shutdown + eend $? +} + +stop_post() { + /sbin/modprobe -r -q ksmbd || return 0 +} 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/ksmbd-tools/ksmbd-tools-3.5.2.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild new file mode 100644 index 000000000000..c8ff8da17db4 --- /dev/null +++ b/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info meson systemd + +DESCRIPTION="cifsd/ksmbd kernel server userspace utilities" +HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools" +SRC_URI="https://github.com/cifsd-team/ksmbd-tools/releases/download/${PV}/${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_configure() { + local emesonargs=( + -Drundir="${EPREFIX}"/run + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + # TODO: add kerberos support, explicitly disable for now + -Dkrb5=disabled + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + local DOCS=( README.md ksmbd.conf.example ) + einstalldocs + + insinto /etc/ksmbd + doins ksmbd.conf.example + + newinitd "${FILESDIR}/ksmbd.initd-r1" ksmbd + newconfd "${FILESDIR}/ksmbd.confd" ksmbd + + dosym ksmbd.addshare /usr/sbin/smbshareadd + dosym ksmbd.adduser /usr/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/ksmbd-tools/metadata.xml b/net-fs/ksmbd-tools/metadata.xml new file mode 100644 index 000000000000..d59653d6e70c --- /dev/null +++ b/net-fs/ksmbd-tools/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">cifsd-team/ksmbd-tools</remote-id> + </upstream> + <longdescription lang="en"> + KSMBD is a linux kernel server which implements SMB3 protocol in kernel space for sharing files over network. + ksmbd.mountd is userspace process to transfer user account and password that are registered using ksmbd.adduser (part of this package). + Further it allows sharing information parameters that parsed from smb.conf to ksmbd in kernel. + </longdescription> +</pkgmetadata> diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest index 7b2a8831f6f9..d846fae3408c 100644 --- a/net-fs/libnfs/Manifest +++ b/net-fs/libnfs/Manifest @@ -1,3 +1,2 @@ -DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7 -DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b -DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa +DIST libnfs-5.0.2.tar.gz 281154 BLAKE2B 9de3d02e5ae4d41eacda152678e6552708b33d4e88cc6fc5f7b16c887f911fc5a5e834952505438220c961f71a8b70540be3254d5889a4336200d5633dce313e SHA512 6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5 +DIST libnfs-5.0.3.tar.gz 291079 BLAKE2B 4ce19c317bfd47110d9f42bb2dfb27bfba90bb9a11d1c3c5d63ce1188db3a08a97ffa82a31b0de04e59f41c570eef1eff96e80390ee78b0267e2a89d032c9c9c SHA512 1581c4a599e7b2a837553df2a4e1e4255a726907cd54ce3e82b0b725c79e2fd15d7ed921dbe9519d73204f5ca735d27b347888d3f1162c4c2144e9d72e327ff1 diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch deleted file mode 100644 index b26716158b59..000000000000 --- a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a1f51d0..f96879a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -25,11 +25,13 @@ fi - AC_SYS_LARGEFILE - - #option: utils -+MAYBE_UTILS="utils" - AC_ARG_ENABLE([utils], - [AC_HELP_STRING([--enable-utils], - [Build util programs])], -- [MAYBE_UTILS=""], -- [MAYBE_UTILS="utils"]) -+ [if test $enableval = no ; then -+ MAYBE_UTILS="" -+ fi]) - AC_SUBST(MAYBE_UTILS) - - #option: examples diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild deleted file mode 100644 index 894937592457..000000000000 --- a/net-fs/libnfs/libnfs-2.0.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF="1" - -inherit autotools autotools-utils eutils -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86" -fi - -DESCRIPTION="Client library for accessing NFS shares over a network" -HOMEPAGE="https://github.com/sahlberg/libnfs" - -LICENSE="LGPL-2.1 GPL-3" -SLOT="0/11" # sub-slot matches SONAME major -IUSE="examples static-libs" - -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${P}" - -src_prepare() { - default - - epatch_user - - eautoreconf -} - -src_install() { - autotools-utils_src_install - if use examples; then - # --enable-examples configure switch just compiles them - # better install sources instead - exeinto /usr/share/doc/${PF}/examples/ - for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do - doexe examples/${program}.c - done - fi -} diff --git a/net-fs/libnfs/libnfs-3.0.0.ebuild b/net-fs/libnfs/libnfs-5.0.2.ebuild index 96606a99d49c..cb3adf3e648f 100644 --- a/net-fs/libnfs/libnfs-3.0.0.ebuild +++ b/net-fs/libnfs/libnfs-5.0.2.ebuild @@ -1,48 +1,49 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 else SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86" - S="${WORKDIR}/${PN}-${P}" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86" + S="${WORKDIR}"/${PN}-${P} fi DESCRIPTION="Client library for accessing NFS shares over a network" HOMEPAGE="https://github.com/sahlberg/libnfs" LICENSE="LGPL-2.1 GPL-3" -SLOT="0/12" # sub-slot matches SONAME major +SLOT="0/14" # sub-slot matches SONAME major IUSE="examples static-libs utils" -RDEPEND="" -DEPEND="${RDEPEND} +# net-libs/rpcsvc-proto for rpcgen called in build system +BDEPEND="net-libs/rpcsvc-proto virtual/pkgconfig" -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-utils.patch" -) - src_prepare() { default + eautoreconf } src_configure() { local myeconfargs=( + --disable-werror $(use_enable static-libs static) $(use_enable utils) ) + econf "${myeconfargs[@]}" } src_install() { default + if use examples; then # --enable-examples configure switch just compiles them # better install sources instead @@ -51,5 +52,6 @@ src_install() { doexe examples/${program}.c done fi + find "${ED}" -name "*.la" -delete || die } diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-5.0.3.ebuild index 66c1685f1207..f1f29dc19bc3 100644 --- a/net-fs/libnfs/libnfs-4.0.0.ebuild +++ b/net-fs/libnfs/libnfs-5.0.3.ebuild @@ -1,44 +1,51 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 else SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86" - S="${WORKDIR}/${PN}-${P}" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 x86" + S="${WORKDIR}"/${PN}-${P} fi DESCRIPTION="Client library for accessing NFS shares over a network" HOMEPAGE="https://github.com/sahlberg/libnfs" LICENSE="LGPL-2.1 GPL-3" -SLOT="0/13" # sub-slot matches SONAME major +SLOT="0/14" # sub-slot matches SONAME major IUSE="examples static-libs utils" -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig" +# net-libs/rpcsvc-proto for rpcgen called in build system +BDEPEND=" + net-libs/rpcsvc-proto + virtual/pkgconfig +" src_prepare() { default + eautoreconf } src_configure() { local myeconfargs=( + --disable-werror $(use_enable static-libs static) $(use_enable utils) ) + econf "${myeconfargs[@]}" } src_install() { default + if use examples; then # --enable-examples configure switch just compiles them # better install sources instead @@ -47,5 +54,6 @@ src_install() { doexe examples/${program}.c done fi + find "${ED}" -name "*.la" -delete || die } diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild index 66c1685f1207..3c544aaa465a 100644 --- a/net-fs/libnfs/libnfs-9999.ebuild +++ b/net-fs/libnfs/libnfs-9999.ebuild @@ -1,44 +1,49 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git" + inherit git-r3 else SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86" - S="${WORKDIR}/${PN}-${P}" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86" + S="${WORKDIR}"/${PN}-${P} fi DESCRIPTION="Client library for accessing NFS shares over a network" HOMEPAGE="https://github.com/sahlberg/libnfs" LICENSE="LGPL-2.1 GPL-3" -SLOT="0/13" # sub-slot matches SONAME major +SLOT="0/14" # sub-slot matches SONAME major IUSE="examples static-libs utils" -RDEPEND="" -DEPEND="${RDEPEND} +# net-libs/rpcsvc-proto for rpcgen called in build system +BDEPEND="net-libs/rpcsvc-proto virtual/pkgconfig" src_prepare() { default + eautoreconf } src_configure() { local myeconfargs=( + --disable-werror $(use_enable static-libs static) $(use_enable utils) ) + econf "${myeconfargs[@]}" } src_install() { default + if use examples; then # --enable-examples configure switch just compiles them # better install sources instead @@ -47,5 +52,6 @@ src_install() { doexe examples/${program}.c done fi + find "${ED}" -name "*.la" -delete || die } diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml index bdbf712883c6..bf9e0ef24654 100644 --- a/net-fs/libnfs/metadata.xml +++ b/net-fs/libnfs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest index b5402d875683..5d665be21c35 100644 --- a/net-fs/mc/Manifest +++ b/net-fs/mc/Manifest @@ -1,40 +1,2 @@ -DIST github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz 11788 BLAKE2B c7726ecd41c5d8909e157a38db429327d09873b4a4661cb7607893067c362487339b33eb24f122df7ea98e81bd4556884b831014a6948a108b74c71f521f1296 SHA512 47f0985138603631d59915b01fc99b4d4fc44ea964e1ad50b472cabec0fdf57f6235dc05ad32629bc086bc3f1fe25c2a3a31be064f91d398fdf37799fe4aa8db -DIST github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz 17263 BLAKE2B 6915367735a060d873947d805b49b1a6900080019cd5c21183c11850a0fb5292ea6c93576d7bbc8939e6b0f1e31501c44b38e5c97c09fb5685053b50142de092 SHA512 713ed1188affab7954efd4a6656d0bc82368b2c71e5604afbdcf9ea1ead401b821c443d5cd1c634964139d76fcf69d9a4b0efec4079f0b2335b1c15ca042d0b2 -DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d -DIST github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz 35081 BLAKE2B 7adf1e84f4fb23632f9bbeaa53e3d5b6a12244999cc5b744f12439459be4921a271d85e3e2dfbec08fa12b1dec27016e78805c600d7d4798bb84aaef5756e49b SHA512 b2758ad40b532e30581f41b2cf609042388acfb037848858c394c0edf444181942061fceba6be76aa7913e62954cc14552ace7b4634d731a6bbe473275655aee -DIST github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz 1656797 BLAKE2B 6b7e3f776b396786125582332fcf90e6b2452a06856a8b13cb2d84a882c5c563af79b8c37232f15410ae90b309e93044dcb6e0a5948d4e25b9730cc541534d16 SHA512 57a9606845a27459703d3757e001303d2f67c88efa4d021d4aa09314ddcc85fe95c9db2ff4aa08639b6be49cc751d82c35134a587987a896f64bb103af89adee -DIST github.com-golang-net-b630fd6fe46bcfc98f989005d8b8ec1400e60a6e.tar.gz 976663 BLAKE2B 6eadc2d2da8ae01bc77d896ea8073377190366bacc5da127bd4c93fd2e2163493ca0222d58ce6133444daba89bba328a12d557b2a5b395c3d05a701d037c5f07 SHA512 c0ebb41e39f0289d935dbbc196080e5c9d7d6f25901e47d8a23e8a63a22b89a6539ea1b4e85ecff7e2fc930654f7f1a85096fb18b1a9d6a9dd86fa6b134f154a -DIST github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz 1262962 BLAKE2B 082ce1d2924efe2090c735b5338b4afb24cee1109d445ad12241fba95413fdbb5a1b5ed3425d4822a610b38cdf2fad7d3fa5af2d306ab396746fa38d1d11195a SHA512 04cda320e2c5c5dad102657725d3c94289937194836c28c4633b150fcb691123b12f8eeeb8538f76e747c5626ccb9dc12667fce362b96448195a9cc332045db2 -DIST github.com-golang-text-6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2.tar.gz 6585336 BLAKE2B 1650f1389b0f31a9177f203fc1c4eeb4fe734f5c21713223cd76bd556b21a6ba4c35295f1997051ec3936f56bef51012a8aac592f5ffe7c43f6bc7fb2d755adb SHA512 92031dc6e2ad393926e5b65e9bdd494735159d13821ec6f7642414b9ae023b08838af277ef648c35353e8c2950f0a21bc418af144291aa8b69e099aecdc42241 -DIST github.com-h2non-filetype-cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb.tar.gz 686090 BLAKE2B bc657b96f624b5f189603d052cea2fd3ae781009639db200d486a3e0e63b6de888db5fd9673b9e772b7215ebaf7a195cd5cb3275472bcc0ab84cfd9a82e7081d SHA512 6355a944ed19c254112c90f1e2048bdcdf9e63b59a59ba51288e729484538b2bab7f4ebe80e629df993456431ce2aec5502cc1cc3273919e023da3da651430a6 -DIST github.com-hashicorp-errwrap-8a6fb523712970c966eefc6b39ed2c5e74880354.tar.gz 8348 BLAKE2B 1c6dc8b0cd7ba0daa33df47056af538fd289b05c0efd72684d088f0043ef057ef6c5a6089d62bd99d17c57bf840370c319cd1201df54cac395d589322f7ce60b SHA512 f2b676d8728965e320f99444e2ab8ed3aa609f0714d7424ee576548260c2d5be5f6ea09397554d7dbfae73b51b23a4d14ff6d9385e6b25ac68fd40e8f535780b -DIST github.com-hashicorp-go-multierror-886a7fbe3eb1c874d46f623bfa70af45f425b3d1.tar.gz 10070 BLAKE2B 93839f82ee11d020e0ce586c2bc1b2e5d3294dc03b6faa3e62e2ed67c3126e7f96330c358dc54d91ccb9b0351946bb114763ecb38a02176d2844b2d8df3fc96e SHA512 d65e7210502081f927035dfa61b099e67b94a3271f479921c1a48ca079f3ba759f5598d19b5ce9c30c07085fd180d77cacbb1627fde391f49eb0f3ed30c5a35a -DIST github.com-hashicorp-go-version-d40cf49b3a77bba84a7afdbd7f1dc295d114efb1.tar.gz 12769 BLAKE2B ec65b37a122c3cd7aa220e980618b7697a9b9aae56febfe025a0df3064f5819c999c36be627bd2c70fd6a96d55ed4071bb79339f30e62cde74ae224200dec8fc SHA512 343a8bb8c7b5d540dfc4dce78dd0681a5f5d24e85de62488fff08e3feb74fb5a5a3827f25a3ec0c1be191e9dcb07969732d34ab7452f4a57e9db05d1eac8524b -DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c -DIST github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz 27126 BLAKE2B 0972b3af87057486bbb85bf79ed5894eb6531ee9966b8048f0f35baa750a868a697c2103d0f26e5040d96a24ce5a9c4ee0f6ed27e262f4618e2d60165cbdba13 SHA512 6343652b5c8e5056240cc0eafae7c37772a24fd791b8cea44036af502257e403ec374bf224437391da3b596cfe6d6aa1f3889d24e5b62d42e3ddc2fbe66d696e -DIST github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz 8518 BLAKE2B e0c475aa8ca1a8c3488fe676f547f40a4f2cf6e655262c0c5875074d907509ff45d56c969240b9b43b4aca1dc58340a5828c7b8bddcd26428663eae399ff1905 SHA512 ec88288aa9d0c3a6e1b38f74e0c44ab8e8a7dfab49bd1ed83d9cb3b4019a7651555e07003bc70eae5a18ee213870538015bdb81646f43bb09815585f3dd0d25d -DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421 -DIST github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz 19845 BLAKE2B 5512128da165241ee85c1761d86d8a780f5bb57474c66c49ff796a1a7bd3b59ce1dfc2dae04bf8b032f1939fbceacc60355a0eb9ae1fa4619418ed7b934153c7 SHA512 456bb5314164373c8589109f8333e29c397c44e4d9882b544e86b2870a44d75ba397dfb58287908d305c6928b098097decec753701eba5c17192479c900366ac -DIST github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz 57326 BLAKE2B 9e82904f852ff05d3809770762f1137116e6e4a421a5b4a9ba483f48b24287a4dfaeaca90bbe738a694b44f010d86c6fe33a2383e9c60bac728b5619071f1bf4 SHA512 e2aeb507392d34fb2908c3426de6b6b5b662ac88534d46a392a463f1447fc9c21945064482c22b02cc2ecc2c889a30e38c37d37b50117a05959b258f60c6de54 -DIST github.com-minio-minio-0250f7de678bbca5ad8bbfd50e2f65133feb06e2.tar.gz 9261525 BLAKE2B 9f5c122a3199dd809f8a555c9f2f91a2a7fb0a9a2ea19c57dc3b6bb24a83583ff3f6e3846ca0c9902d8b482e8a51d8895de73a5f2b66339b3fcf7f906898e719 SHA512 e66d1403e97b1b120dc502e715f3c9aa546956973827a9fed26c01d8ae5210ba2969f66957f387fb9876d7a3e55b9350baf32d7fb205a943ae06cf9a034ae5fe -DIST github.com-minio-minio-go-5d20267d970d9e514bbcb88b37b059bb5321ff60.tar.gz 190339 BLAKE2B 1a119a8f57742c1336a110458b0c114a618c07dfdc0d70749a7800b101e252da4b58a1103e2bf16ffc5445987a235ea9d57045f08b001ec92df5991725dd9707 SHA512 b1ad2961977572c2195982d170ec93d250304594720d9e4bc8052fd13cd2e3eaa838198d983050dc5e28cc46fbe39b6bbe44be5a1300fed30a7ed1abc5740679 -DIST github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz 64938 BLAKE2B 0e36ec0383b136b0471bfc71dfb5062c7cd1b1d0708f2f5a58ece02a45b819bcd3691d85f35c66ed8a90cb4d362b86182a185916fc29e0c16f39c602fb9894eb SHA512 36330af07ffec389c92f0769bf01188de7156f2d73eeedc03280a1b4000f3a0fed156737c3b1e6554579a7570f156dcd16f52a895b661da51628496221b9b593 -DIST github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz 3362 BLAKE2B 6b6381ba8b7bfa05b0ca04b8492d9f66d0a5c76c41db3476fd0f1fac01ff38f50465953b64f48b00859e28a5725feb056f3c1bfe1234376d00e2e37fd2d71a73 SHA512 049d31e1ebe03ad0f7312819414aefac9958cce3ef14704af32104af6140f31a62a23579a12bed80e8514147ec4a93bec8eaf0f8cba8cceaeecd05d577273b3a -DIST github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz 5838 BLAKE2B dd40dd8ee0cd6b9c7f4d48a9cd4dfb351fb229bbb9dfdb7f1583eb950cf846f3000064dfb7df2766a7d65fc2e2bbcfa6e065ea0fbf8dd8f7911a534c08eb9919 SHA512 87249685beb8a5bbdf0b9761347ea1095ff67c7bbabf3f60f3b0eac49f607d138237dd21fe04680174666a12d135daa03261ca08bc348797ec2fc68ad6aad957 -DIST github.com-pkg-xattr-dd870b5cfebab49617ea0c1da6176474e8a52bf4.tar.gz 8305 BLAKE2B 0868ffd67db0b3a09137968163b71efdc792d8ae9966b1237c85d0e9c6fad9d145099c237c617ea8fd99aa50c903e8bf32ccd8c9caaa72006eb7387104bbe371 SHA512 ee8a75ba7b25c62007c5b3149a89f25fd92343c2220e1445374d9c75e9ff96387ed8b7443b8fd77019e07a727362aedc3149f6439e0132a27d78694debbea31d -DIST github.com-posener-complete-3ef9b31a6a0613ae832e7ecf208374027c3b2343.tar.gz 20837 BLAKE2B fc698ecd8e975949bfd29132f3352918fd7dc6b7b4e12be1eb160206edf6212b5908909714bbdad94d83fe207bcc660a9d71a76ccbf393d79060d4f65064d9eb SHA512 f21716802458621c4b10637fd13191725311d21c9f676da1b811ae0d9eda48f4dd2fb977d30b596c73be2c11f9bab702e178af2fe70bbdfc45a2e3344b535711 -DIST github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz 56861 BLAKE2B a9573260bbe408c7726992937cebb254e5f488e7b879c84efdf2103bd97bc7a21ab7acf80d565226680b8022a5dc1d4c3a2e8d85a6b139d39bf249eef94f2ddc SHA512 5723d8bcc40b34727167cfe8c4fb7ffdb45837885638c392078755240b0ae46de6243ff83530bafe379e332e2a6797412552ae8d2d0abbb3a00cb61ec122d876 -DIST github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz 1735 BLAKE2B 129b813439dc2c15e6ed6b74cabacf8f4d59f3301b1530788dd2f0da6add921780993f72d5292d22ada44ad1dedfa95c29b2505f33463e9afb85d86ddc64dcd6 SHA512 745223f0370248a9233fa1940bcae461c3810353876441b5d0a81fef021ec426611628debde6a41b1973d1f7c3d2dff1600b5180ebff97b121027734c0bce8e2 -DIST mc-2019.01.10.00.38.22.tar.gz 1791858 BLAKE2B ae89c935634190e347be8c2f0a3dfff12872b4eca7aa17b79b5e05d7cb9be6fe39ff7b0ccbb6ddf5851ae3ee84a89eebf289d801340519e91470b3f5c60f7c37 SHA512 626e5adf5a3dcda0945e5fb37394097550f2976626da50e795b389d1d78545b1a2907c9b9fded5ce26823694e7e3981a69fa18ed00ae21d5c405c69c165ae1ce -DIST mc-2019.01.24.01.40.23.tar.gz 1791330 BLAKE2B a3fb0cb2cc199f4fe21c7770d58a3278d6a89a90916bd604293a5845064e337d36a5ac2e565d785a440803b6deefd84f114115a8f06dfc38d234225daa66a55e SHA512 215f91a8f4f325ffb8714d92a8030c36ada5251df4b24cb1d9b82d7f8d6c0f1188dfc2fdc36b1dcf8d842a805ccba3965977908a01e39e7893e05b131eb3b9b9 -DIST mc-2019.01.30.19.57.22.tar.gz 1792065 BLAKE2B bb4a43549f5ff520c944a057fdecb80e892b03d9bdcce918613221357049e7ffcd77d51dce44b1253a3c912762749515d823cc8fe14a2dc8fb72060ff3943bd6 SHA512 14892985cdeba341c71bb93e41d468cae1f763fa7eb7489e0172a9bdb19e0f65efe41af0c2022e4c30c4018c6ee511bd992dc2b8906275c25896f084621ce96a -DIST mc-2019.02.06.20.26.56.tar.gz 1855021 BLAKE2B 22d684e44e8ca8b6915fbcc05d734e522c3b3e37d8a05b7745f1255c7cc9d186513a2713f4b53afbe7613dcc7d61f5423df83afbafa700bf17398615aad57058 SHA512 4b0f7e14506eea6c7b2a44656b040775cff33686e03415d489696c3402deb7e41dfd5e6609f201902e5c6a42e39ece1cfd57cc2f934f796bd610a555eacd692d -DIST mc-2019.02.13.19.48.27.tar.gz 2983136 BLAKE2B 60958cd80e5315993e36fa03acf0291efcb8e1e92cbf104c97f97d5ba606c6f3dc4a18a4f79aca7fed4bd224e1cbbf5d880d19eba3cc1338fcb1ef14d2399c55 SHA512 93a46891ce2d539e23a09c8ee807ec868dbae4b97673ce6eed5845658dedb2c3007d982ed5883abae349a0df1c4aa2275130b9ed7172354761ce5dd0c4d91479 -DIST mc-2019.02.20.22.21.50.tar.gz 3007023 BLAKE2B 0cb7d1ab4a9314e951204e6710aa81652327d45d6c0b0083f15baa48d0edbbaf81c8fb76f30bdc706b43126f1ef4fa9ba44edeafea8fa124ece43ee61741bd10 SHA512 d52365873ff35c33e859b7d9b860d4ac7971169cdfe1e12286cfaf60bca5acbe80bf4670a5aa56fbe9cc60fd115e97a97b46a172a507e5853d962ce7cb391760 -DIST mc-2019.02.27.18.44.28.tar.gz 3007123 BLAKE2B bbb382f48b5744e0ebef6848d2d419096f2aa40fe1a7ede4cf692befac83c2df20bade05605d2aee59d50267e67993c8cd69c7b99d677c733af9aa3ca29e047a SHA512 00b97009e8f69a24f8222c47af3dadf2d8750e7247afe6ea89aecd9e97994cac256aac9e5226f815e228912ee6fe92ab78ef64b2b87edd6cf4eb0c6f236cf72f -DIST mc-2019.03.06.18.41.35.tar.gz 3060998 BLAKE2B 8ce267ebeb132aae1ab2681d7fcaeb557f7822cc518153cb001dfbde9d968ab0056ed52b01cdeb44d1112ea2ce233877751f205661cd7d53c6640bea533b131c SHA512 b0b5aa99aaaf8858fcf2884154bc7e293a618e88a13a8ea4c3671c4d187d8628a1ce9b190895db09520a0af452be1125e7cd5158373467f14e7fbe771199c9db -DIST mc-2019.03.09.00.30.31.tar.gz 3061079 BLAKE2B 528c3e8b20af8c77c256dbb25cee0c79691e6575f9739788927bd8b023fb2fe492fb1186f144f3abf1132b3b7375c649940b40c63f59dcbc7436cff9603fdd6d SHA512 28aa906be58afd85a5d5afd8458f5a200270d8bf4caad90484ee6335ce5033c910369a212f47272d6f7bcbb6aaa78fc35f3307da5e8bad3268ba737f8791f4c6 -DIST mc-2019.03.20.21.29.03.tar.gz 3068226 BLAKE2B 9659aa05931c28f054d639a8850692a77e81d75c1a86af9e7887fc492bdcb30c0e3582d42495a443945f1c89f691989d8e67d479cef4f1c1ebc82fde63b3f444 SHA512 ce4aad970b6f41bf06423a414ffc3396257c37654b9f7e10d6994e4adbacb0ba5b5fc94412e1d420429333e341ff2f76172d1a6ce978612f09f7ff37547d8d06 -DIST mc-2019.03.28.20.43.56.tar.gz 268089 BLAKE2B dda5b3186360ab917031423e1532a72da8005978b6c1e8f363bd97f1e1575399ee9d319c01aa2e7097e0b57723c8def849838ea99876b476d021bb8a787ca8dd SHA512 160054070e412c420b2c75e0d6f5b7b78dc20f07d695b46fb3141b3428c7a9391205810d9edd720b35b35e4901fcfe801277d4bc6ec7ff2a840ccc776f329bfd -DIST mc-2019.04.03.17.59.57.tar.gz 268507 BLAKE2B 9a427dd206b06d2adc47ba430e708584250fdd43def2598b589b5b6d9fd1a761d5edde4370fd627b9eb337c24de22393dd1e2a732a74655f301fa89ca2eae6ff SHA512 ef234116ee49b0348e1fc28bb6265b1b45f835dfb90adb0c6008057fdf423e5ad68e8eb4aed83b780d3cbc06162a4e95866bc49275c8cceda4d42ccea094ac92 -DIST mc-2019.04.10.22.11.28.tar.gz 268793 BLAKE2B b71c351cebaa48928152729e8540f5d78ed42c1370ce70044d2ead9144581ba4dee348d3e8725762fc1bb37336c32be229ae90bc049e402cc66c46d9be8b0f94 SHA512 f2499aeb4d6cbe8c8585629a880dbce04a6c3c13dc55c0629440a6fc37f43da03a24dc2894808b55bab8fa2c87dbfaac675da1065f3840bda588817c1ac8deac +DIST mc-2021.03.23.05.46.11-deps.tar.xz 400078460 BLAKE2B 849fef6e2ecbdbc06745a5245f40658988931a46f2d905da2158bb0e8481c3c2aaa1eeef0a83fbb2b360b27fc91c02aee1765b27d2a4baee732fb60766e5770d SHA512 5970f19d563eb948fbef64e82677a8c29b35b925d41ae1682241771adc2153096de57ecb6bb2b3e7e21aa800158a8dc68922e1b177df6f96882adba658f80e6b +DIST mc-2021.03.23.05.46.11.tar.gz 438008 BLAKE2B 80c415b1d25c8381615c11565935e2d1a1e4efd37c9681ea22577338d2763a13660d32c83a3dd85dd0fbc65a515e1dde5ecc49a6496fd96b6ebdee946753fba2 SHA512 34dcb4d5c8c98ba9edf3791a01914bef0bce29c5939a7486d79e1c7949e3169897c7db4c718cd7329e507cd9402dd6cdf142fe1c426ea5fb5d6aadd0cc248f7c diff --git a/net-fs/mc/mc-2019.01.10.00.38.22.ebuild b/net-fs/mc/mc-2019.01.10.00.38.22.ebuild deleted file mode 100644 index 331eaa0e04af..000000000000 --- a/net-fs/mc/mc-2019.01.10.00.38.22.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - newbashcomp autocomplete/bash_autocomplete ${PN} - popd || die -} diff --git a/net-fs/mc/mc-2019.01.24.01.40.23.ebuild b/net-fs/mc/mc-2019.01.24.01.40.23.ebuild deleted file mode 100644 index 331eaa0e04af..000000000000 --- a/net-fs/mc/mc-2019.01.24.01.40.23.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - newbashcomp autocomplete/bash_autocomplete ${PN} - popd || die -} diff --git a/net-fs/mc/mc-2019.01.30.19.57.22.ebuild b/net-fs/mc/mc-2019.01.30.19.57.22.ebuild deleted file mode 100644 index 331eaa0e04af..000000000000 --- a/net-fs/mc/mc-2019.01.30.19.57.22.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - newbashcomp autocomplete/bash_autocomplete ${PN} - popd || die -} diff --git a/net-fs/mc/mc-2019.02.06.20.26.56.ebuild b/net-fs/mc/mc-2019.02.06.20.26.56.ebuild deleted file mode 100644 index 331eaa0e04af..000000000000 --- a/net-fs/mc/mc-2019.02.06.20.26.56.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - newbashcomp autocomplete/bash_autocomplete ${PN} - popd || die -} diff --git a/net-fs/mc/mc-2019.02.13.19.48.27.ebuild b/net-fs/mc/mc-2019.02.13.19.48.27.ebuild deleted file mode 100644 index 331eaa0e04af..000000000000 --- a/net-fs/mc/mc-2019.02.13.19.48.27.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - newbashcomp autocomplete/bash_autocomplete ${PN} - popd || die -} diff --git a/net-fs/mc/mc-2019.02.20.22.21.50.ebuild b/net-fs/mc/mc-2019.02.20.22.21.50.ebuild deleted file mode 100644 index 927f40765b1c..000000000000 --- a/net-fs/mc/mc-2019.02.20.22.21.50.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.02.27.18.44.28.ebuild b/net-fs/mc/mc-2019.02.27.18.44.28.ebuild deleted file mode 100644 index 927f40765b1c..000000000000 --- a/net-fs/mc/mc-2019.02.27.18.44.28.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.03.06.18.41.35.ebuild b/net-fs/mc/mc-2019.03.06.18.41.35.ebuild deleted file mode 100644 index 927f40765b1c..000000000000 --- a/net-fs/mc/mc-2019.03.06.18.41.35.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.03.09.00.30.31.ebuild b/net-fs/mc/mc-2019.03.09.00.30.31.ebuild deleted file mode 100644 index 927f40765b1c..000000000000 --- a/net-fs/mc/mc-2019.03.09.00.30.31.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.03.20.21.29.03.ebuild b/net-fs/mc/mc-2019.03.20.21.29.03.ebuild deleted file mode 100644 index 927f40765b1c..000000000000 --- a/net-fs/mc/mc-2019.03.20.21.29.03.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eapi7-ver golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.03.28.20.43.56.ebuild b/net-fs/mc/mc-2019.03.28.20.43.56.ebuild deleted file mode 100644 index d15b0813a634..000000000000 --- a/net-fs/mc/mc-2019.03.28.20.43.56.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "gopkg.in/h2non/filetype.v1 cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb github.com/h2non/filetype" - "gopkg.in/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty" - "github.com/pkg/xattr dd870b5cfebab49617ea0c1da6176474e8a52bf4" - "golang.org/x/text 6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2 github.com/golang/text" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/hashicorp/go-version d40cf49b3a77bba84a7afdbd7f1dc295d114efb1" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" - "golang.org/x/net b630fd6fe46bcfc98f989005d8b8ec1400e60a6e github.com/golang/net" - "golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/posener/complete 3ef9b31a6a0613ae832e7ecf208374027c3b2343" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1" - "github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/minio-go 5d20267d970d9e514bbcb88b37b059bb5321ff60" - "github.com/minio/minio 0250f7de678bbca5ad8bbfd50e2f65133feb06e2" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" ) - -inherit golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - - pushd src/${EGO_PN} || die - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.04.03.17.59.57.ebuild b/net-fs/mc/mc-2019.04.03.17.59.57.ebuild deleted file mode 100644 index d15b0813a634..000000000000 --- a/net-fs/mc/mc-2019.04.03.17.59.57.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "gopkg.in/h2non/filetype.v1 cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb github.com/h2non/filetype" - "gopkg.in/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty" - "github.com/pkg/xattr dd870b5cfebab49617ea0c1da6176474e8a52bf4" - "golang.org/x/text 6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2 github.com/golang/text" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/hashicorp/go-version d40cf49b3a77bba84a7afdbd7f1dc295d114efb1" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" - "golang.org/x/net b630fd6fe46bcfc98f989005d8b8ec1400e60a6e github.com/golang/net" - "golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/posener/complete 3ef9b31a6a0613ae832e7ecf208374027c3b2343" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1" - "github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/minio-go 5d20267d970d9e514bbcb88b37b059bb5321ff60" - "github.com/minio/minio 0250f7de678bbca5ad8bbfd50e2f65133feb06e2" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" ) - -inherit golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - - pushd src/${EGO_PN} || die - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2019.04.10.22.11.28.ebuild b/net-fs/mc/mc-2019.04.10.22.11.28.ebuild deleted file mode 100644 index d15b0813a634..000000000000 --- a/net-fs/mc/mc-2019.04.10.22.11.28.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "gopkg.in/h2non/filetype.v1 cc14fdc9ca0e4c2bafad7458f6ff79fd3947cfbb github.com/h2non/filetype" - "gopkg.in/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty" - "github.com/pkg/xattr dd870b5cfebab49617ea0c1da6176474e8a52bf4" - "golang.org/x/text 6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2 github.com/golang/text" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/hashicorp/go-version d40cf49b3a77bba84a7afdbd7f1dc295d114efb1" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" - "golang.org/x/net b630fd6fe46bcfc98f989005d8b8ec1400e60a6e github.com/golang/net" - "golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/posener/complete 3ef9b31a6a0613ae832e7ecf208374027c3b2343" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1" - "github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/minio-go 5d20267d970d9e514bbcb88b37b059bb5321ff60" - "github.com/minio/minio 0250f7de678bbca5ad8bbfd50e2f65133feb06e2" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" ) - -inherit golang-build golang-vcs-snapshot - -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} - -EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f" - -EGO_PN="github.com/minio/mc" - -DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" -HOMEPAGE="https://github.com/minio/mc" -SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="!!app-misc/mc" - -src_prepare() { - default - - pushd src/${EGO_PN} || die - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die - -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - - MC_RELEASE="${MY_PV}" - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die - -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md docs - dobin mc - popd || die -} diff --git a/net-fs/mc/mc-2021.03.23.05.46.11.ebuild b/net-fs/mc/mc-2021.03.23.05.46.11.ebuild new file mode 100644 index 000000000000..9a161be5820d --- /dev/null +++ b/net-fs/mc/mc-2021.03.23.05.46.11.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module + +MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" +MY_PV=${MY_PV//./-} +EGIT_COMMIT=1513d76ca9d3a2cddda40d0e6e50be164b894889 + +DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems" +HOMEPAGE="https://github.com/minio/mc" +SRC_URI="https://github.com/minio/mc/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="!!app-misc/mc" + +S="${WORKDIR}/${PN}-RELEASE.${MY_PV}" + +src_prepare() { + default + sed -i \ + -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/" \ + -e "s/-s -w//" \ + -e "/time/d" \ + -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/" \ + buildscripts/gen-ldflags.go || die +} + +src_compile() { + MC_RELEASE="${MY_PV}" \ + go build -trimpath --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die +} + +src_install() { + dobin mc + dodoc -r README.md CONTRIBUTING.md docs +} diff --git a/net-fs/mc/metadata.xml b/net-fs/mc/metadata.xml index a64ea8aca8bc..de0f24514533 100644 --- a/net-fs/mc/metadata.xml +++ b/net-fs/mc/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> -</maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">minio/mc</remote-id> </upstream> diff --git a/net-fs/metadata.xml b/net-fs/metadata.xml index e419bebd83ba..688c254b3bce 100644 --- a/net-fs/metadata.xml +++ b/net-fs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The net-fs category contains network filesystem packages. @@ -31,4 +31,3 @@ plików. </longdescription> </catmetadata> - diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest deleted file mode 100644 index 8fa369417777..000000000000 --- a/net-fs/minio/Manifest +++ /dev/null @@ -1,132 +0,0 @@ -DIST github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz 14883858 BLAKE2B dcc2f5fc0878c8f47cf04af727825ee42e51eeb0e1eb8695f404a92aa572b83cec8684e9a6e59d20acf8a354cdd2eaf07d257907a852aea93d1331dadc3b2752 SHA512 0852cb1e2f9996e42a0206a0457fa6f95d35fc1e31041f37b413e2605adea40f4001bc0100a1cebf5c2af3baeb8c0621f1fed587fbd0e7a4abd54c985e03abe4 -DIST github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz 134957 BLAKE2B 758a94be9ebe23e8184aa5f80f3bd9dec41ef8cecf7e28d051bf5082fd5a77be477bb2391f0b7c730b38435ed5762a989502896b561c8d48463cf53bdf4fa7c7 SHA512 bb689f2a70680d0cd9c0f3337c45b93fba6329b03aba31a2737f4888d8460d5f1614b78e54bf9b277ec47d1daa368c637c8a0b6d61133ee07296d964d4943230 -DIST github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz 445833 BLAKE2B ebe3bf82d8c0839ef62be90223cc8052a5ecb700b1a8e8ee543d347589e1c26210e613d6fd9d6692c7b2f83728aba151734fe0ce849e68516fd291e78fdfcb09 SHA512 3405efb05ad33a04a78f7c5807c512bfef4d43103d912ff36746d6f64a12b02a5fb864d35555eecd1ff8e8cc91b961a47ee61c540ad42bccf30523ada9c89c89 -DIST github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz 187136 BLAKE2B d9bc4330dc2a1eac3db6aafb79837f7a2c6173b53c9d07947643d66791814db970adfb26654952378d137bfca6cd53b805545e4a8016ea917fdf2e60249e362b SHA512 1c1fde4982161b69897d88e825d1baa23a57157ffeec741c6ff55990140ef496f1e3394a09988fbb158ff2dbd058b66c3cea935d4ba64029cceed5f38cd37c65 -DIST github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz 53386 BLAKE2B 709989e25fbc217390d291911b7074bd9b03c379e43379eb83f9af1f22335310b4dd9516bb1785d1186c914d6aa6234478f9399dcee26b42ced7b49f3d59286a SHA512 fef6820aa36033bdabeb28e832a9828eeaddb1ba162defd9e35eea0fbe0882ffbdd1759439fc668474831dcaf4670099e239f8106a64d3a6df846c9837cff525 -DIST github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz 608124 BLAKE2B 15b99b58204dc9e74df1397993a59d5d2459e6f28b4782fb4614701ae39f3843df7ece1816495aabd156830599eeaf7f09ed29c731c2155a6a8e1898e32a0c84 SHA512 1da4cddb57506dd5ae33738a15a396b0b0c90f854ad16c2d942daf40182e7d1b375b27c1b9f994cacca33303d9943e0e86dec221313ad0a5905af719c96d7183 -DIST github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz 3162819 BLAKE2B 141a4fc18876d11e01d6ce47660b050e0c3654d9a02e1158370b156d8c2d4202437a9a5c36b279ae23fd33358004a05669d7b1a54ecfa322ddaf577111d1e443 SHA512 9c2fef780d85ae1a01138af16f4e87179254da416186d609bf74c326c49c586616d12b6eebd8e615ce9ba78e93602f860a2ff4c8d54eea0b9b7c55f111094d7c -DIST github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz 42510 BLAKE2B 61cb8ac82c072f9929a2df6f77b7c10d08028e8d2886925dd0bc7973791ec1ab0cc0f0c2f78409f2ef58ac420778160df3dfbd2028a0ca9063975be84211d057 SHA512 eccd9319a479e77dfa8ac902236991bb418cea77d50350a4ba1142bfbea29dc25d7b0a8f262ee271281eb9ce630bf26d42f508e1f834c80a93fdc7dcbd96353a -DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277 -DIST github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz 31045 BLAKE2B 50fc3c30930a365e163052bddfb4af5c8b2cd217a11006962ae805d98778c813226711e10c4e2fdace40a8156422cfa7e5dbd3bad30fd7cd66095b5682df0447 SHA512 e1e21c04345b26497751d7fa6474ec4f916f4b2bf8710f43fcf2771cb9d3b7ecffe6e40957414399659e38ad95980bc830e3d53137d605a76770f5ea7c5f3142 -DIST github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz 220937 BLAKE2B ea099d34a0e869128227b8ad99977e8b7bae6386f32eeefefb7d36477d2d1e1b4e18c00e0e5db7d811adc04478a23aa745a8b89d59c95b863ab3f3aaee084935 SHA512 b2d85e2b86fd7940d8cf434f1140eae8c03cb2b77a2f46553e9d9cad9e2b913cb235a5d7da2852d75827d80b1f242a1a678490c13bfcdb6c7120338b3be43b3a -DIST github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz 124003 BLAKE2B 9d3389514431c986d7f3f9e4386ce1a45f3ea7e5365ce7bbaf1ef3681fed5e393a3964c8bdb1d03477174a2d566ed36ec9b098b5eaaaf62c7a9fdb3f53d59717 SHA512 994143820296e09db5d8436309da35822f94c33f186e3c826c6c7a3905def8cc1d2bfdaaa36cf9ece517ad820699659727aada83d37a191d8936ee7076e4c618 -DIST github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz 11788 BLAKE2B c7726ecd41c5d8909e157a38db429327d09873b4a4661cb7607893067c362487339b33eb24f122df7ea98e81bd4556884b831014a6948a108b74c71f521f1296 SHA512 47f0985138603631d59915b01fc99b4d4fc44ea964e1ad50b472cabec0fdf57f6235dc05ad32629bc086bc3f1fe25c2a3a31be064f91d398fdf37799fe4aa8db -DIST github.com-colinmarc-hdfs-fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz 674760 BLAKE2B c86e93d1a78cb36e69f18a2de823b472711cd9faa1223cabbab8980bb48f7545eab7b074de9b83bcff1a80c237e121cf7ce5367a9ddcafe269e3fc19857bb3cb SHA512 d481afc275c2fe351e7df23fd89e3699640bdfacbca499d2b65dff67d6f0dd1382918c8399b088df66833cbfc75bd9cb609bcde9b351e580833ac6c88b3bff75 -DIST github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz 5777191 BLAKE2B 82c0c3346cd9713ae5376686dc1b528c9ab7d07145b669bd76b26f1d7a8a34300bb45a8aad382c4bd83cab8e6408e7078c7ae6bcb2ee9aed2d885e5de9cc485e SHA512 d182d4de26fa68176e480a532e1ec4083503486a4713fd1df7ea0a1162b6b105ad55e3a3225cef984d05982afbc03247198abd4833f36a3fb42a9b6948587147 -DIST github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz 3528884 BLAKE2B 5e5d799ed7cc2d242eee12f06f1a7dcc8dd8501b19d4fa61b53191c68693a9c7aa1ba8a61a1353a2fca9c1d783ab5400fd1e3a0833b0f1b0f3e5b8a8e67781a5 SHA512 b702701ba789927dbad2955fbe1d75248b6a6e4c0c127fa22f6495821aad68eab8c7377bce2ab52a20df7ab52c8de299994785434c13583638d23cc930b98f9a -DIST github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz 42224 BLAKE2B d731756ad71937d6616f45eb172cd5122524b12ef14d653fdc9248b6da1aa103604f6493fc93b186bf0d6b8c301c9eaccf9e8abb54a001427d9edc0fa2185c35 SHA512 9ecd1d77675ba7080945f68053e37450d003d8307c9ab507c7d64566f88a3d8b61fb9c9486ca3ee0f23c0d4e1a2e93391d1fac0a0882f351f21a118e221925a4 -DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732 -DIST github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz 2914 BLAKE2B f1ede351b08a92a58a7daf97060c8b71ba6f36bf8017b1ee8dfa4ac505beea2bb254640f25b78050d2d896c5cea2eef2dd7a96eb030ef7a06186cf9c20390198 SHA512 b08b9d929b8e7357581a2748edde9817aaac3ebe713e407b800b318e8c75d7f97d487c7563cd0a82a95f551b42f093acfe2d458658c6d0c38e864635bac9c448 -DIST github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz 17263 BLAKE2B 6915367735a060d873947d805b49b1a6900080019cd5c21183c11850a0fb5292ea6c93576d7bbc8939e6b0f1e31501c44b38e5c97c09fb5685053b50142de092 SHA512 713ed1188affab7954efd4a6656d0bc82368b2c71e5604afbdcf9ea1ead401b821c443d5cd1c634964139d76fcf69d9a4b0efec4079f0b2335b1c15ca042d0b2 -DIST github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz 10215 BLAKE2B 3300b6f0d28da44b8f96b5b129f9faa46f4015096ac6d66842c816a0c0db98ec7b393c703153f577b5a5c249e20d019821f9180fa887780547afe343cb288c2e SHA512 9d801e0252710ae6368c1ccad3997eb4d61bd4f4d937bc683bbce2554474cc317b297ae0a2a2f95260644fddad72b91b8aa8802c9e10876e53e6e3f4f2a9c57c -DIST github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz 7841 BLAKE2B 033e8657f43bfc921558ecb0caa1f68c3c00d04912146437b19d1ed1de5fe57d128fdc85d14280e74dda3c642183b9eb1bb459bd68f9954e874fa5df47552f03 SHA512 17a34fa71d2ab18db970ce945489aa73bb64580423ae1e048cf7635a6f91075d2b7714c835b29999e2639ab68acd6f308ac4473cb3e00006d50f7002954e3985 -DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162 -DIST github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz 71809 BLAKE2B 7e53baa1e7a5ef73225ce0e85f7668a642065c12b41de4f9a9a3aca3c09c8dc843c18386334f3c01c146c8ad0c7a4cabc08baa72f422236fba588d1d12bc7f12 SHA512 17668f10839e946cb6f57569a62ab846af36e1fc341155465fdf15d517a981772e3a39d85cd37a3f5ebcd09ce9ac7b4c37c2b5e375add655cd7036b46a2ed82c -DIST github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz 3810 BLAKE2B d013b29bcce86a2ad0f41fb95292c571bd79f50061900b20d62564fa5ed295bf523f5bdac75e7eac8ce6a546b9f965a06ce3b4921591ba1f2a7671045a93df2a SHA512 1972312843339e0cebd59f0b1886ce79a755b5594b74ae20b3cbe127d6c379eb2df0391d73e495f83ec7ac007fd1be9a9d5d51ccef693eb883b5cfc06279b0ee -DIST github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz 818356 BLAKE2B 8b9fb3b45ad4af90c26a0f197d9cb07ee22484006a396218d617e7992cc0e65dc3d3c8dab894e692eecad75d8aeaf6e5c8a34849e4d7892a10fecae3a8ecbf2f SHA512 4966b347777fb41f23c26a35511083886d67bf79ce74944a888ab29bacf6e33a753ade90df37321751167df054301fb4276452c3722dd0120cce9f4757ebec2d -DIST github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz 14445 BLAKE2B 8094dd5813096fae5770a47d2f9184ae0322731d2eec49ab3f044bb4e5c4dd1691a4b20a3fb17d8cc8fe69fe7befd0f122ec28ac6005f8e776eea718dcdcac6a SHA512 7a349c5caf684915d3e1c0b9868802683e46f97868120aa3b48037a3c75b9155f5694f3a153a28e017d6d8ffb7dcfec8568691f4a66151ec51866e231897ee88 -DIST github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz 35081 BLAKE2B 7adf1e84f4fb23632f9bbeaa53e3d5b6a12244999cc5b744f12439459be4921a271d85e3e2dfbec08fa12b1dec27016e78805c600d7d4798bb84aaef5756e49b SHA512 b2758ad40b532e30581f41b2cf609042388acfb037848858c394c0edf444181942061fceba6be76aa7913e62954cc14552ace7b4634d731a6bbe473275655aee -DIST github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz 83591 BLAKE2B 906f8a152c184e8173c9f9361d48a4d8cdfc5f8688d749ba43a7ef14e94496689a0e5bb99bd22a62904ca5a8491434e417732bb2211314708efa4ff4b278eda9 SHA512 a4e131ed4f0aa3c4da424d53b290258d696836c5870ae4ad868ccd347118c811855cf0a878e18ecde190327d7f7178a920065d722b70226f6afc326f5d510dc1 -DIST github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz 70766 BLAKE2B 3ea4412e259626b25145feacbe68b529d2bcf353bd098899c3a906d01f75bac5f93ec20967f7261feb388356d7b12fa945ec73822e21e029e38ce7c0b27855e7 SHA512 dec54681845fb5cdb159d44bf91cb703bb38a6af1821566d7b11a0668ee50247f542e3b7bfc21571198f9bda8ff31ce32cf67f98a8c906dee7ea9194643699f9 -DIST github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz 2040041 BLAKE2B ea3604ac69e703728d52a958ea016ff6bd61b4340da273db8865e264bbf524eacdc3bf82fe329f7894de1b4616b3ae131d1cec821c6138a338bdf9b394eb5d95 SHA512 6541a92724d1349d100ef6905d42dc9ce322a2c1d4080a6a1128db5d8759b4200a4247889853302bf683b4c3ff3af4c798a585cba33c6536d5f29f13e55cc81f -DIST github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz 1656765 BLAKE2B ce9b5ba9772c436a9134894bd9e93de6ad27ad0679b406c67c81dfa6d420e690c8caaa88f14c7015cde1fd642e581c7d9918c73d68f2bb1580286dcabd275792 SHA512 274a47b08129912488639c5cfcf59bc17ac0d863afc1d25b80596801022b5317f780aaf1ae8cbee6b6ef42979c22c9e1514a4aff2f62d3d1e6cace59016e0286 -DIST github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz 977441 BLAKE2B c4e3fada087341595861671b8c0d1b23a53296852d335fb4acb7f6cf6c72a4fcaa56027bedf3582a48c26aac3102ab5f146ab983c42642fe6b72a0d344ad1be7 SHA512 af5b53755d68d85313fa0c1438e4df98b077e4f4c1035b7772932593ee9ed9750108aa93be2453df723f7f008053d9f892ce565e8a9c65883f6c519c4a6cb8fe -DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d -DIST github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz 312302 BLAKE2B c36832d29979178442712e9e90d9db2f65d7664170a7aa9d387932f1238921904c3702d8f875a8e4213d58bc99eb2ce1a301bbe41b1635c705aa7c2d592302d0 SHA512 2d85f8767c44848e19f4883d7dbbe3d1ec36935a9c9ea7de45660b4dd0cf6b212ff034cced81d8d98e15ca87c26229c15fc262626d621d920739296d272ae1b7 -DIST github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz 62641 BLAKE2B 985efd86569c3c01cc108afa841cc147b090eb6448932a39831772ec775403dde9d7763570ae88e1a7759738680fec50a603264d1f70bd681067b84265086752 SHA512 8b8c5f5902815b8ae620b33a94dde3df2ae6688a6fcfa6615658bc33b5a08c85d83bb1af5896a87a8840d62b31ca8143e4b2843d6dae070f89c23f8f92b81d21 -DIST github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz 16285 BLAKE2B e42c9d05fb223eb7f3caaef4ceb0e476a4467f8a88553982b2115b3c2581025ceb3ba4b8a3783bc311c307e3d6b2bc6f54989ad447662400d9488c915dd3c44d SHA512 8f006b9178c70fbf66744aa91d964c7c349b513f013753df804d6fcf7b727e35871cbd606c551ea310545ac36aadb6febe3af59091ca38425ff703c02e555e7f -DIST github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz 1262962 BLAKE2B 082ce1d2924efe2090c735b5338b4afb24cee1109d445ad12241fba95413fdbb5a1b5ed3425d4822a610b38cdf2fad7d3fa5af2d306ab396746fa38d1d11195a SHA512 04cda320e2c5c5dad102657725d3c94289937194836c28c4633b150fcb691123b12f8eeeb8538f76e747c5626ccb9dc12667fce362b96448195a9cc332045db2 -DIST github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz 6593234 BLAKE2B 356acbe3ae6e16fe02bfcc83aa12bbf9e7b72b17f7120c511a7ca31b8764ec0fe52275d489bd288035b963e179952077d5702651f9d34e1e2ce5f7c1ebc8fd9a SHA512 9c369041f7f6655940c71debd7de195c17bb302438a44e3f2c7db57505634b9a9a9beae3ed239bda994ba2da062565d885a36954f371525a59de4f7a45ba6480 -DIST github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6 -DIST github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz 42978 BLAKE2B d07f49e9c9d5965b30c84383042ce3581a7aef40a410b0cd1febacf09cf3598654e5f651a3defdd5e7d1bc007fb04b703fd280aedb83ee2f5c0906ce78d811a8 SHA512 86521a448fd20e5bcd29ef1a4f2748e34db188100a1733f1b2425e42e6a4962e449af417279664017f95891b29670961514e2fe4c0010486c52fd95888df4e3a -DIST github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz 4779898 BLAKE2B 733632bcce17c341498df4813e7bf2fc5f25c9a82fbfd6f3637ba05ee6c6dc9e231226d826fc34a85b035713d38ce0c70534e67150324ee6ca7725dbcf66d73c SHA512 ed5fed4410f579954330ffb3347aba2e072bab5bb95166bfbc606170feb4f9be48ce74b428ece527df405399f1c0c2e65cf5e9e23e8911fbb163da5a2636fcf7 -DIST github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz 14330 BLAKE2B 06c7116c76f32399449bc2729ea98b66fa662cc4cf51b8cec6a9254bba9cc240eb5369168d1393818fb8dc19f966ca0d431462b68d4b57a04f13328221f0004e SHA512 606aa0c72c0e6fcca594332d678a8120ef3cfc506a734a973424dc429ca273a85486deca4c642a7892af698f8a6df70fdb26663af8abe8a7604874fb735dd188 -DIST github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz 11460249 BLAKE2B a4aa80a912eda428e4e106b819806e0edc9e78b3a455303aeb36582a9f59b6c7098837da536f76331a827813b4c36b9e3c1155a8b4900d893a749a11361aaacd SHA512 3cb1a5ef7258753f2ddfc7bf48df3ebd1e61927998a7c15a4ea8e74f5b7c701435a7f40b697dc9c99ef6a09aa2386e4aa93128b6d67423b5adbb410b76d9cace -DIST github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz 1924238 BLAKE2B b85dca126c17864a38a3745e03b9c95e5ed4491351d97fcad755830ac1618237abdf5a4ac5f93382fb00e30aa60d18c05e796b45f48834463e1c278a0db67c64 SHA512 ada3360422033b8a7143c047e7c01c97ca305567b1658238d04291ed88815cae352040b4db68f862961239b2da48f577041d4b4b344fe3ac210d8329c8dfe0ca -DIST github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz 1933640 BLAKE2B 4089b43ce5841d64f0e3c3886940f1f3bad1293240eb5b462b34e14a577a48117154e10e4d6c5401c942acecc3d1eb236fbcdbf72c9de39b888d8e5f26182cab SHA512 82613cb7af26002c879d3fa084781552b6aa1b3487d0dcda0e111e8ea8a9c9407906b0b552cd0074714fddee85c9acd1fc4ed353125209e99df58670ac547621 -DIST github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz 18390 BLAKE2B 40a9f09aa256ea8ce2c3080daf84667813e441b7bc1ee80dbef9589b43499d7bf4c3a6230e3771bf6fef790b9ec19aca512624ac4766eec5db1940f2fa7cb794 SHA512 04675c1f434b3631bc67bcc8899f36c59dc17bab8f186c937d2f7487f3e7885de6fa1c0da922add2179b04af9d5d1a5f13ce5fb4f3d767692089aaea06e6cc9f -DIST github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz 40828 BLAKE2B f919f2c7abbf80aba5c716b5a7cfb9e3521b4ade2c080c7c403e89a85ac955f3d9ac03ee60f9d569534446c032f3a3bffcc40e18f6dacb7d9dc2a60b29ce3ded SHA512 d472ae5092987b539529fe8e97bf59176948f24a32973d0e457790fa0ef630b118bc462ccaff8c9404462015aaa04acb2c174ef9364d6bd9332d2e02a5bd7589 -DIST github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz 27334 BLAKE2B e037414ff5fa9ab181d0d743cd2176db71be9005a8461cfc769360e94cb2e45a03d232dd3b6f932052a7db0a8cb28b40ec6fb427d666db53a5e9e42ab44991de SHA512 a7a6bbb4520af8f31f57b8685bbcdc7e57db0d2f2bb48397ba33ca3ed238d1323d8b96d73b04447e19fb32c966454f8922dde7ed3dcdd868b07cca41068b7f1e -DIST github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz 295171 BLAKE2B 9b3dcf0b64548c62421d6498e33388d24f168550169f598fda3861676bd79375cb6eb684570401f5330e9a69e3963f982b219528a3abfd0bc1b2952dfca7b897 SHA512 3f96959e273bf70acf2b3b3d32afc051eb01c5cf6e25e89fc69250fe725802205ca88daa5977a77e8f87ab29bf682dc9689e31a7251024e7b162da91798b1d84 -DIST github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz 600679 BLAKE2B a959574b779c031406031581c9bb8767a948a510d3e6e5242982ca6fb19eda047277f8620300970690d090c3391eef18d6a07c8f67889a202fa7e3de2c36f4d7 SHA512 2c715f1610fb39c40ddc93cfeb874232ac74cfc649305a43de7ab200ca7a72e9e2725c91a3acada6a4ee511e442bcb1b95ae6e29462e8d158fbbb08cb61ca80c -DIST github.com-hashicorp-go-uuid-4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz 6852 BLAKE2B d04c7e0351ce0884e3a1a8d8e37da5f4183f4c0819a6b81a279ff2ada0b70bb07c80b26ec7c81decdf0968c9f715aa2416159f1326aadbb297f7c876d0bd1cf6 SHA512 f5eb03a17b9bb1ee31cc47612d41dd2ce6e797bf960f7528e65386a03f59429604e101b6f70db688a414575ff510782f8dfdf237c42dbe365bb4abcb62aa10f7 -DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308 -DIST github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz 25953593 BLAKE2B b644e45e177605ea922261700eaecbe6089f548fc2a2d680a90cb708d9b5cc80c9b5242aeedea38dde15eac6db640444b772e64f1e318261e08596ac7bc21a4f SHA512 a0e9d8c6d48aee34dbff84d159569561bb5e299e4b084080fdb7ad51cc8b9182d7b2f94d8bff8b6e76ee56fad708959e621fcf7df9645f6cc7521282f8e85d5b -DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c -DIST github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz 27126 BLAKE2B 0972b3af87057486bbb85bf79ed5894eb6531ee9966b8048f0f35baa750a868a697c2103d0f26e5040d96a24ce5a9c4ee0f6ed27e262f4618e2d60165cbdba13 SHA512 6343652b5c8e5056240cc0eafae7c37772a24fd791b8cea44036af502257e403ec374bf224437391da3b596cfe6d6aa1f3889d24e5b62d42e3ddc2fbe66d696e -DIST github.com-jcmturner-aescts-f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz 7318 BLAKE2B e79d1ea8e27e1c456a67fa46ba932b9e0f90256dd183e53e97c8a5214616a3938acf3ea342faa934ad1f740e0c55a1ac4f691873018bd7d91ef75260726583bd SHA512 7ea5edab2e4e14d1d901911d55915e2097ad0b0f04bb7a58a6158bfc21d078f4a5da371f1960c80e1b1635dbee2909d671eb168969abbe7be65be4c1f509bd15 -DIST github.com-jcmturner-dnsutils-13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz 6345 BLAKE2B b72bea16a743c4967018f6a50a78b2db09202ad2308701a3f672bc3454f580d4c163c654295b96339094a80c8a1e0ac9a1df18b84d4bcd5eb3540f83f1d40e0b SHA512 453b1c9c90b5d6c7a1ee429c5f6ae4e127948b405c5c97dfa3d44141fee48265451867525a0ef555ce4116bd70790ac1c045f541b8cf4bebf93213a155f45492 -DIST github.com-jcmturner-gofork-dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz 27059 BLAKE2B f8b316235a85d5e5f8884f99f84569e7cb919eb73796bcb6d25328725921b891ff662682f80b7949a4238fa98135d5806cacce97ccea25e246fa5d31920e2c8d SHA512 1995ea7b3c6bbedeaa04177a6463121c594dce41db47242f02a31ede17e8bb3865a71309a019638c2899b99e67b2557d0ea5587df012eaa3aa2cecb250fe76a4 -DIST github.com-jcmturner-gokrb5-32ba44ca5b42f17a4a9f33ff4305e70665a1bc0f.tar.gz 55016499 BLAKE2B c2229cc3df4cf07f19511d73afff06f30d933a2cca44da4a051ee42c7d26f782474c12e08dad82098021c45a8f250a17007c04cc0fdb23ddc36e14ae710d3557 SHA512 0a3b3fc14c244946b43c8f412c8326d9b4ab34f5d366589982f80c3f4323775071f10a2a051fb122f0a8f6a2d3715f99a3a174ad311d8d29a30a28fa96009f99 -DIST github.com-jcmturner-rpc-4480c480c9cd343b54b0acb5b62261cbd33d7adf.tar.gz 9132 BLAKE2B b675004a70907b6af87d58dac805fa9d3046b2f489396cb111ea6c5ad825e8a47dfd2cb7cfea9ceada0545c096dc494702e8c7d4f0fb7071a7ebd307c6044ae7 SHA512 425a67e163ac21e7c2e80a04fd884ceb7b30b62fe9fae004996702debf7b5a516def2427480f6d81d5490752f521dbbe3afa3fb0586cd129e5df8579d9a42593 -DIST github.com-json-iterator-go-0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz 76813 BLAKE2B 27292de3568732b0ec50d0404207662919ccebb3f54fba9d2ef268dc02f9ae60f339ab6b6516947bb5c33e07a44ea7d06e5609fb1c04fac91d77e1a11202ffb6 SHA512 b601fe52f56928f900dfb53587a0594523583d44a9e6ed6836ffc9fb647082c05201719291b1b3fbe0c76eec1efb418ee8093cfef0f18466792167c246bc7ce4 -DIST github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz 3443307 BLAKE2B 926690823f0288f1d2566c6eb61320b53fa0182d10848752cd3c216cb71e7bde8694f7cd77456f5c0727367e81a14b95546edfe2cd204f55adbdf41fe5f3c0c5 SHA512 b4a8e5a8ce57dc80b518523f677baf7b5f24a2f6906fd49478c87b917cb904c60e5e89d8cec5e382959c739ed3a3647821ef928d93265920d0b44f47de66ce02 -DIST github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz 278906 BLAKE2B 3a9e67372a01ff8aa51a4de50a40f7ed9a6ebfce22bd11849771c306a911909f0900902cf9cb3e4117576fed221af5f578ee9a69100cab0c6083566866676a7b SHA512 d5b6184709e4f5fe25e81b172ed40ee98f1cb87d38763235b6df399c71ebc4207e12c6c465c1051471d1aa3587adb15140017d9866e9d26e5f16822cb6a903ab -DIST github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz 121645 BLAKE2B 8414a1cd97c510a50a12bfa724da4f79d27d00f671da38047bb11718414a117197f02ad71b70dc50e7fc37401425ba318cf06afe80dc26eb1616e988670a644c SHA512 3cddaa134b65646e922e76ebd25791a9006fb90e5e6b0aaba3f94e41a2f7874aec9ea6df5f218d091a8ef8508ca4e99ea4bdf0102a646f932f33a08327383c83 -DIST github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz 159438 BLAKE2B c249fe3e40c6e93dbc45673e059969c399c8f84247dc2cd7f6eeea9ab0fc6a12c522aff9353f030b913f9f1483a0e17bd4cbf214a7fb8608fd28b9c491624784 SHA512 11c12861c1c4a065b3345a19f8e6f5f5e605fc8af19e1d16dc2288ebe066f972816c021c3a30a96d0b2216f4fb337a6ca978d98cb8ae67e556d4fc0e65e161b5 -DIST github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz 91534 BLAKE2B bde0d514ed2d699b5032c9b8126c5b5183dc3b7ff47436519579428bd98126f60fab92f58d410cb5b6114d5edb84a689e2b33532cc584b0fbd8d5e8a96343599 SHA512 576983fc6cc55c69a76254d392a1cd4a36e922d23274bb9abbef0666884b30a8c1e67915acc8e0175c82eb5392900891597176929b332775c80f1ab47d6828c3 -DIST github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz 75507 BLAKE2B 8ba7b2b4eb3ea47bc151fe7c573719290dae1230c5ff187f1301850c6a711c53f0be23c2c3c4d310d6832676ad6a8035b867bab4ddf9bd934342870502d25967 SHA512 092f98935e1c31f6f041d1a63f635c414f0d0db6a5485b61a57284e45705848e04bf94776c1deddf3687195df487de2117a150123894c9058978d43cfbae4e4a -DIST github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz 6590 BLAKE2B 9beaee9b00ff8f847370e044ce98afc4d369b6d1a6d4bd9966fd98bc631bcaf12faa93181266367fc3c4610a1c76dca83ef762189e769d04769eccd4101f7aaa SHA512 64b180cc4ea4bd57310b6519248491e1c6873b28e7e29958b217091fddcbaf323b940c840414d6bcbc4babec32dcb41a986b7a64c31add4da8655c8e8c7e99bc -DIST github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz 8518 BLAKE2B e0c475aa8ca1a8c3488fe676f547f40a4f2cf6e655262c0c5875074d907509ff45d56c969240b9b43b4aca1dc58340a5828c7b8bddcd26428663eae399ff1905 SHA512 ec88288aa9d0c3a6e1b38f74e0c44ab8e8a7dfab49bd1ed83d9cb3b4019a7651555e07003bc70eae5a18ee213870538015bdb81646f43bb09815585f3dd0d25d -DIST github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz 3567 BLAKE2B c5c1b883ea583a24aaf7e207461ea54bb56e536695b9a7de1fc7e8376fbbdacd1600d0b59fbc1b96d765493f2db9a8a11fd1d069da5c108cbe89470c0e9190a9 SHA512 aa01330c30691e984586278ba64b9990bfb811c3d9fd66a98cd593e46f3a8e39675fc8ed0892dd03a4f3850e9f03fd9f4b75b2506737c4cc67850eaa1bbd2c93 -DIST github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz 19845 BLAKE2B 5512128da165241ee85c1761d86d8a780f5bb57474c66c49ff796a1a7bd3b59ce1dfc2dae04bf8b032f1939fbceacc60355a0eb9ae1fa4619418ed7b934153c7 SHA512 456bb5314164373c8589109f8333e29c397c44e4d9882b544e86b2870a44d75ba397dfb58287908d305c6928b098097decec753701eba5c17192479c900366ac -DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580 -DIST github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz 3889172 BLAKE2B 55e399833ba395e1a7acd85c59e8d34ad30c6b2742deb600d5eb7ff91203f447d9318362b6a52a0a81b41b8a734493acc393013ec5d510f5656ad3fa21121fb2 SHA512 d13d3d9c939240f6015b10f6d64d2904271c863c7f375272d070b789a6ff5dbf8d7587ee0203db8552a7e0f6e3f46911aa7457328aa831a6bfa7d2edec468b6c -DIST github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz 46678 BLAKE2B a36914128c00b2dc6a331847ea7aefaf7bd3e832f4626f0499387ca1ade8b54670b29ac587a0b1e2db4d5d50ac44c9a93f1a72b3beceb3c08b00985992aeaabe SHA512 1039138e7b1518dddba43eee4e6454e14be04c1dbcf0339281127bfddd933430e2b92c2c60e41ee7fb1f42d2062aee1c4c690af2f334221d8addd5091c336b74 -DIST github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz 57326 BLAKE2B 9e82904f852ff05d3809770762f1137116e6e4a421a5b4a9ba483f48b24287a4dfaeaca90bbe738a694b44f010d86c6fe33a2383e9c60bac728b5619071f1bf4 SHA512 e2aeb507392d34fb2908c3426de6b6b5b662ac88534d46a392a463f1447fc9c21945064482c22b02cc2ecc2c889a30e38c37d37b50117a05959b258f60c6de54 -DIST github.com-minio-dsync-fb604afd87b2a095432c17af2dda742960ef111e.tar.gz 35380 BLAKE2B e622d00ea6d59fc8acf3d00e145626c9112a6ad46aca61f0e0cb405f59756021587385a79c03d010991fcbaa7ccf6a32702d018637a94a908fbc9fb6351cdaf8 SHA512 d8657ccc0e2a91fcf9111a427c19cbf0e24efcd7065e8a76165462d1486de26bb961bd7799f1a1a53bfa4b3978cd430693fea564e7cc9abb5b948936e4145832 -DIST github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz 17866 BLAKE2B 964c9194816814433dad2214c66b3a2cb14a95b97009ceecc4a05d46b73206fee8eb0b98c128bfa202cb1f024f2ba59d761ffb55c197675bf56cd2f6bca1cf30 SHA512 0e9b9fe87e9d46b356d92c7d8c8c7d534e1e0dc8867b78ae3ff09e3b8884f6491c087a6cfdda3a3b639d05ceb28d7c5d296c1376ed7c2a17901f27b482154000 -DIST github.com-minio-lsync-a4e43e3d0887e88d151bb3f90f678178b4ec0c5f.tar.gz 8185 BLAKE2B 4f2cd7f8a1663e2605629283a2163dcf01daba123052e22d65d6a756bae404c57aaf4b4de197bc953ff2b43cfa3d1c429e3a2e55da78d29feb9644d1b0f3ad17 SHA512 ad55fe2904e40449ec4da4556d6eccf75a0d23d0950e1e7cba29b4cd4b7ca641662d38bf30566d256422ee4f0783d4461f4be82b91d05c85721b98d3511d0cea -DIST github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz 268431 BLAKE2B bf518e050b7fe442cf59c4a23c997c5e2c13223ca0dc11eb6db13ba4d6a301f3f86d47074f3bd9f4697375291dda7e9e1d74a2f6b1db13c93c2b27998a9219ba SHA512 7031f7978a8a8aaddb31fb140b49ec29ad82c64970115555a633e97038a989c3db00bc45a18428a400f67457375995e9f1b6ec76f48e93621b9e94ef0af6b9f5 -DIST github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz 190652 BLAKE2B edeeb2327e0428fc82f1c31b9826285303ae4bfc1c6f20e2fd94a3760b816c538b6da42c3f8a93d366c11d068b8fd23b2ae913c29ab4f9413641026e17b58fac SHA512 099b05c20d597eb506d68b2c8c256ed0085d058e43bf089db0b90d1cbaf0bc1f1ead1ee8b7a50e3810199d6adaed11a0bd488ac6693a7d0db4f9ae7dea198246 -DIST github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz 64834 BLAKE2B 75c349b550487891e252ed98ef577e235bddf9a9a7e82bc85049ba29019c904686669d121cef56450a55f60eefe895da57e4f4e8ca4aab0bc6d0ceb7fef9f64d SHA512 1df1aec6eb7c1aa21f9fde7ff08160d3fa118518644ee9f669092a7226bdf54dddf9bcaf3c77a4cb5ed30239b31bf524f76d3e60713e60614505bf1c6fa4af7c -DIST github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz 64938 BLAKE2B 0e36ec0383b136b0471bfc71dfb5062c7cd1b1d0708f2f5a58ece02a45b819bcd3691d85f35c66ed8a90cb4d362b86182a185916fc29e0c16f39c602fb9894eb SHA512 36330af07ffec389c92f0769bf01188de7156f2d73eeedc03280a1b4000f3a0fed156737c3b1e6554579a7570f156dcd16f52a895b661da51628496221b9b593 -DIST github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz 53790 BLAKE2B ab22baa995c78639aa8cf1d38b675dfb18c64534f2b48815187750ef4182d761fdedc7e12308a15fcbf27af98a1054f3a94f3891968d5766205bdf16fa71ee30 SHA512 7a154aba1ace8687ddb05719de1da2c60e451bb0a00a242560e2abb8c0ecc838771bf966cc8328be0a575e3a5b8b7366348aa14f9548d9b741dc7876077417ab -DIST github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz 3362 BLAKE2B 6b6381ba8b7bfa05b0ca04b8492d9f66d0a5c76c41db3476fd0f1fac01ff38f50465953b64f48b00859e28a5725feb056f3c1bfe1234376d00e2e37fd2d71a73 SHA512 049d31e1ebe03ad0f7312819414aefac9958cce3ef14704af32104af6140f31a62a23579a12bed80e8514147ec4a93bec8eaf0f8cba8cceaeecd05d577273b3a -DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36 -DIST github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz 14404 BLAKE2B fcf261bf39415ab06f03df46887f6373386007cab1c439733039a00eee7f3d430323f1589b422c458435809c38039d4440a537845ed0e4d49193b1448cca63c8 SHA512 1e622f71b935169c463b2cdb970c6f9c142e746a40daf760430f6a24a1e938a905d84793a7ef241a32cfcd7cbeca701714b69791b2117c46fb90490c39fe1ecc -DIST github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz 121996 BLAKE2B 9e20eda1172c1f6ff5a57ebb2e7548f4c34af8f51e892bbea44802ac8a59e94169466dfa8abe393de35bf8f53603ca448a128d6ca040fa6d549a153701425a91 SHA512 ef643a3bd97e405ea95af44435997cd1c6c34136cb4e4507ebfbecd3f79c11beef205fff9cb61c5f99c995d21dbb69753edc6e66ef0026d936a6395ace84efb2 -DIST github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz 47499 BLAKE2B 1b6d9979ff523cbeed728b3ad28c1a72f6ea5907c41111d4ff42addd7e1cc537b3362b0a4fd2a7c3509de0265857c2f3ed10a8f9187812ee20d40ee20cf6ce4e SHA512 3f9b9cad5b36571ef593adecb45d7fd6a83673e35a5e3d9e7b5e5ad67111e6403b547ec48bbfb3e0916440d12121e647cb9c758e2f16f094d07fd7df8b2d0c16 -DIST github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz 121996 BLAKE2B 9e20eda1172c1f6ff5a57ebb2e7548f4c34af8f51e892bbea44802ac8a59e94169466dfa8abe393de35bf8f53603ca448a128d6ca040fa6d549a153701425a91 SHA512 ef643a3bd97e405ea95af44435997cd1c6c34136cb4e4507ebfbecd3f79c11beef205fff9cb61c5f99c995d21dbb69753edc6e66ef0026d936a6395ace84efb2 -DIST github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz 17271 BLAKE2B 28f276071c5b1921645522302c280ac13253be83e96818071762bc3401a8c8191912a80c6d85e4401fd14b26748eba80a913b3192d3ff8beb84ce7f9f5d2b856 SHA512 ba1dafde47a8a14278c985ef56e3e9c19a8d610135e3847e9c6a47477178db64c0ac41f7240a2afc95e7cd20a51cd08450cdddde8577f5b4abb891ef9db57d97 -DIST github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz 7533 BLAKE2B 8adf4385c7d2bbbaa22d7dd71436bcd17150e4c9db4579aef94b83cfa71ff053f3838b1de286ac61c1a6d1f8a9ac4cd7900e9032a53bf7b14e6b5327b4cedf9e SHA512 652c2f06153cf8c3e4ed5fa2338ddef3165f82cd21f27293327551aac2d03010fe736d0c2ec0ec8b3106c78b79f809e9a81cb1912eb01879bac53f87de70d028 -DIST github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz 44818 BLAKE2B ab4e74b319f50708ecf95365873bf3b49a940716af731acf5467b845b5a9c92e9ccc8312f3ae54c3f63738101582448ad4d9293a2e9a1174f06376b1a3f7350a SHA512 93aa5fae0b51e8149728523df0393a12f8387b0c08417acaf3224b3ce61265f96bdfc5296a4add19f7eda5e5a2e4896830f959e1b30c299eacfc24dafa80d501 -DIST github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz 314237 BLAKE2B 526186fd4a593708caf9b0ccf4cfb0efab6e883074238f6993d1f844c5de747ad3713fb95a6bd98810dafb7021a163207a24754e46ddaa52854ecbe7f9cb9451 SHA512 2c3c191189f6ebb28f4042aac921936bbfc08c2194c22986a6689aa26515b9b7eda51dfddab241c252bc8cc459119c63330b1ea827bc83886b6d388d3149db11 -DIST github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz 7465869 BLAKE2B e5a15dae50a9499efe45303f69b9b343024b24b6fc1808324ce436b4b2b6a1960bc789204e30886b270bfbc990133ae8f455c00d6db628b1994beeb360ae766e SHA512 218766ef534f5409f93ef6a221493b295a0b89aafb5bf1ae072c68363a0d4b42ef32dca689e1ee143b769309795860d5de56dbb280edade4d9a8122662f11527 -DIST github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz 11015 BLAKE2B 6ac1c39b0dd047a40fbaced603295ebd957af6e91620e8a3aef64e922f733cf5573394cb8e1966e660e7cc1acdd485ced1cab473d46ef7578167495cd50db601 SHA512 73eaab1397cb5a8a0735edda27994b069f97486023ba95d8ee0d620d16c0b955f608365ad0cd46ec8ed59b4389c0b4320075ea0e28c8d63f7a62dcdf2251fc93 -DIST github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz 5838 BLAKE2B dd40dd8ee0cd6b9c7f4d48a9cd4dfb351fb229bbb9dfdb7f1583eb950cf846f3000064dfb7df2766a7d65fc2e2bbcfa6e065ea0fbf8dd8f7911a534c08eb9919 SHA512 87249685beb8a5bbdf0b9761347ea1095ff67c7bbabf3f60f3b0eac49f607d138237dd21fe04680174666a12d135daa03261ca08bc348797ec2fc68ad6aad957 -DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62 -DIST github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz 57542 BLAKE2B 16f73bf9a1dfde0dd3152e11ab4d3a49271209b02541951471664a1226c9211f1b77ef4a32faf3e184888b080d0c76e3d02d03e21d688399d7e3c14629df738f SHA512 bee4b4ffdb56633ac763dd624d03db5b0dae433e2a2d1e4ff925e34444d62cbdb879d68574c7f8133f11d718cce3bdc1d686508acfb470e7dea0109c98266b1d -DIST github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz 97633 BLAKE2B e0457947dad793ab73480d65e93d06f50a01577b0cf00fbf0f56ade4b6c7a791c391ea4609ea0ad937242b7f07eeb3af8c1b0322158961d355927f940463cc77 SHA512 fdeb351e26dd89526485764f667253edf0e64b3c1a1e16150171e43d86080d1045bab0c057fe74360331d965310f1fe265463011a8bd89b8ffd27bd07e041b2c -DIST github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz 70986 BLAKE2B 8c0580381440197a9e6a50ac686ea7d9b134790786ce2175fb2b98288c9ae194585cae7650fee6a5d262439b01648d1aee494d2eb6183ff9edd33e6fb40e3880 SHA512 4d7e2576eba78643a806e25021e5d440a8a606e44a153428d99387a6dd8d3f745492818e0b46bc0ecf5fe834dbc781c94720f2d46af5a15a6a1d4ce5807077d6 -DIST github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz 36745 BLAKE2B f5313bdf8173c5ee0f0eb8a63b68d5a9c66c18b3a2164428200a599f12afd67af7ad1148766fdcc7d17601121f357d20afc707f57dab1f5d38a8c96e146d3521 SHA512 956bb23138464aa09045fc4927a5eb6d0ab53f93e89b8ffbbafde6ff0aff1a2ff80b302a98560d9b86ab7f6a845b1dc7bcdbc43ea4cd0e5ed4d712233af32eb9 -DIST github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz 56861 BLAKE2B a9573260bbe408c7726992937cebb254e5f488e7b879c84efdf2103bd97bc7a21ab7acf80d565226680b8022a5dc1d4c3a2e8d85a6b139d39bf249eef94f2ddc SHA512 5723d8bcc40b34727167cfe8c4fb7ffdb45837885638c392078755240b0ae46de6243ff83530bafe379e332e2a6797412552ae8d2d0abbb3a00cb61ec122d876 -DIST github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz 12086 BLAKE2B 284fb8aa183977f2408e88daf44596d2660e66d8ab353d5154f4e7aa495a8da51825d257627491658a9112c39565cc88df56ab5309f7f3f1fecde840c0842e08 SHA512 3e6c12c17a0fc717b169ac09fb51d5ac2f60ceb2f1f5af9041f15d56918c4f9855ddadcc178b11610483492d939656295ac18ea9367cffc05a49ad81f56a15f1 -DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2 -DIST github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz 1735 BLAKE2B 129b813439dc2c15e6ed6b74cabacf8f4d59f3301b1530788dd2f0da6add921780993f72d5292d22ada44ad1dedfa95c29b2505f33463e9afb85d86ddc64dcd6 SHA512 745223f0370248a9233fa1940bcae461c3810353876441b5d0a81fef021ec426611628debde6a41b1973d1f7c3d2dff1600b5180ebff97b121027734c0bce8e2 -DIST github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz 2195796 BLAKE2B 141442d016912c250e1e8521502be6841fe62a1570c2f339add6ee47c81f4875381afeada6fd27e564a133853145d32ec024600b7f9c2764aef60a1a94b36c03 SHA512 25c68e3ea88deb873d82fc6b168795a737a27646d897256455bae59d4649a571faf0aa1053bf653136902bc461b66a358dc5afee0047b778c2a2b9375491a87b -DIST github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz 88119 BLAKE2B 754a2827ed68bb3292cb88600e1e1a0b9b8cbef5cba4429a7ebcc9f56df9d26ae5e66f5b0e7b23a882a8837d9aaa79989db7f47044b114608bb9869ce3933e3b SHA512 b45a178d9fb82094ec478a95b83c835363faa44fda4b75d606b47e900c321c86160892955ac60cf085f8c3b865668d737287eb220c066ca85ee7f9744bc416ba -DIST github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz 43193 BLAKE2B d8b3e59a7d17998ab50bb03c5c70a3fa06d8c52b8cc87c33a8397e1a7e2d45ec1242fda6b6060f82389c53350b1f7deb2ae01aab7328033e14fd5244aa91de89 SHA512 02dc20ad73431c688b4dec492e4015dd94a0d2dad7b16fe9c05ac537da47cf9f74713d1802bb4095721b20e8d7cfc669b1ab720993c776bc4513338e8ea074b5 -DIST github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz 4367 BLAKE2B f3f818845cf29b9800d370ed6dab67123fc1a45e52fa3aee4f80ddc728559da61864f9e72c6f402b9dc6b0e6d67370f88bcca26ec7a481f8ed1d43706f880ec8 SHA512 357e4a22c8b796169e901e73b5e783fde6b7ec2f2954cc2da6cd75f4c3bef46ff58d57eb03ea07267e6951e313ca54246448ffb64398889c9e72e56d78097767 -DIST github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz 8823 BLAKE2B 6470a0221efb65e13d22e7cb8c5c5e43065d2980511b3972e22dfedb77b374879e4be055cae64fe9e95ca7dd0fc89c99159dd49651d43db8466f0b18e8128f4e SHA512 3a3820a4029a310e69d997dcd2a378fae2e8c0c0f76c9e2eef87bf43754832999ab4dc4c506a75e3b788ff855842b62fde8b1782ea7259a6c640a0de99a3921f -DIST github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz 26764 BLAKE2B 1756704c32c465c7368f7947ec0c7f257dcc007a0a4eaa3b18c3a3dbcebc5bd952d128dd92010bb04a4ad55a0a1e2e3e3c6524bd18ef082671d39fb9225eb0b6 SHA512 314d63ad24d9b5c4133f8a2f603a19e09f73958a61c8b10b758f760825a411fd478ab47a1fa0e95c1c5156e7b2aa0ad611ba2ca91bf0b10f6bf2b9608bbc8f4a -DIST github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz 8055 BLAKE2B 89cd909922bf9e565cd01e86b5970dfd55e0f4cbb3109ac052080013aa9a1dfef79761b5f3e08f6c2f2fe1cbcc99d7148e129461b7f95e266ff8253b38124732 SHA512 1455ebfeb0457da779eda76de3bdd5ef8aa18aa440563b3933d2013bff5b3742f245dd396cc9e93bbb343d166d048877b192b159b23b41c630128ac2e2ab26a5 -DIST github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz 4579 BLAKE2B d1c4bdac60073d25e0d953c2f48820c72e0da13b730f439abff498ff9fe09165ee006b021df4d6c925e9d364f5565025dd0fb8f10cad20d16db3e14aa32ddafd SHA512 69f9afd7e71c9dabb851b2592f99d565d83be9dea2ff55ee0208401debf6445e92d74973079f369d4028c64bcf6e9156a9144ba536cef8b6f72685762f28197e -DIST minio-2019.01.10.00.21.20.tar.gz 9272639 BLAKE2B e8d64c436795894ad6e20cfc5acc193598312a6c1d7e20b58a1250f0bcc4791f004afd1dfed4d0e2d506f4690290d0d29596a263853c216456555792e84da5b2 SHA512 fe68bbd56f131ba4e189114b45fbf2f95925cce3a11384503c67debdc9eb04cf1c034f28f792adbcca373783cf74f3f57853a6e61241a5864898e19946c31e6f -DIST minio-2019.01.16.21.44.08.tar.gz 9284989 BLAKE2B f54ecdd5892375c2bc8c3f2c8dc0144ee61c4e94342e12a27d8c55e1745b74c82a480a5562274553d2a5c968fc252ec8b95d0c708405089304b63520eb10405a SHA512 457c2adfe15a70c39fba8e8c7ac6dfa3dccc7265a725c932f57d4e45b5285859ce45701c8c7fa953300ad28322a46d1083f27e668ada5c3616c62337cdaf006c -DIST minio-2019.01.23.23.18.58.tar.gz 9154650 BLAKE2B 4dd2f34edef4b994af25b1bc83fadc5993522f9ee9e54ef620fe54b43076f0fe147fe1343375343d6cc6c47ca31f762e9a033dfc2b3de76cfd55307f6fe36912 SHA512 49cb40f5eaccc2dd76aeb699ce8376d9d665860f38c93748b97cbd589dfeaf4301964659a32fe20a7174be3462c6269446810b9443a1688874c95a95acf5b22e -DIST minio-2019.01.31.00.31.19.tar.gz 9109493 BLAKE2B 8d39e4edb0bc47b31e26fcd981be260ab90dbcb92e85700f9be691deda40d5ffb33003cfa59307647ab606d547ef461689b41e174ba3ed5ac6416bdc23d033d3 SHA512 f5f064c7a45f2844d445b955884764dce0bfcd37be469dc4a3b7fc17697dcee46415f0f17fa125b161c73cac076409e9a16f572020b82765d9ebf23d4bfba5e5 -DIST minio-2019.02.06.21.16.36.tar.gz 9112498 BLAKE2B 76d320dc8476dd8e7b938b02e1854ec81a5017d523374dce4fa2ea68c4b18de960e15f99238643787dc1c59608280d271841e56f4396dea10599a12335e4adf6 SHA512 bdb879c893c3e19c3995225a4323276cdb01ca503dd8a8a6f7faaebd39e73deb17e8c8cda09e3d70bd95573dd258dd7ddcee0d845e34c73e2816671ed234d83f -DIST minio-2019.02.12.21.58.47.tar.gz 9143558 BLAKE2B dbec949490bb74272b82533c750630473184d848cc104c302a5f4e9a15ac2c289384ac3ceb75e7c2554352fe88c59473dd1d42c9ac803a877f9a2a95a4d6bd0a SHA512 55c00b6bd56ec17e09ee01ee15ae81365e09c224848b27f32b7b6df8d2f074c9aa60965141544fcc97a1a2a26e6fa520c4054c8d3d2702421dd0c94037b151a6 -DIST minio-2019.02.14.00.21.45.tar.gz 9143268 BLAKE2B 3c39147378e5f9d5352980cf7213a9977ccabea719d8cc625bcb317a1d853f64f99d114af957a6fe13683afefde3497536d10fce465757b704ebdcf0eab0e6af SHA512 7e547d4a0e80d8ce22ff51af359de79c10e266adc8a5649ac8950b8dcda8c21bbd04d7d4dc801e8f66804fa4f6dc8ea38853a8bec82fcb2bc87e0adbf65e6502 -DIST minio-2019.02.20.22.44.29.tar.gz 9139158 BLAKE2B 16924809cf3ab8961891cddd06d7b7ec75fc9e4920f15bbacd60165a31bc0499b0ca854a3436bd75dd9caa02e196f6151757d5da609c89aff16091790a3ee41c SHA512 c3c57093386e4b70b4890114149932741a8e5c9b6a4ecdf12b101d3b53d3d5601559a41b7d27e61e5aaa16d05497ee086150be98d80616cef98836848a6af33a -DIST minio-2019.02.26.19.51.46.tar.gz 9146652 BLAKE2B a132d2a06648e49bc71282cf6b1f0c2cff68f188f035461a0d9c135fbc40caba50cb365dfa170027b82a6086214a9c17567de55173bc1910ec6283a7d89a7813 SHA512 6ddb452b951ec60b1b30da3059b36db896478a5dc1d9ac60f8de3fb36fa4d9a149e08193af47837ccea9621490daf234ac8c5ecb462e234e5609132e4c61749a -DIST minio-2019.03.06.22.47.10.tar.gz 9197298 BLAKE2B 3b74e2958d876e5c409290dfc0b4b6b1997c06f34d188c9e9357db7c6bcf75af1402acf111b8cfda17cb86a41e9e3e5643dce7bfe2ab40a2f6d06b783c54c719 SHA512 09c1ec200320f0843fd41711a2fe1596af906c84d82dfa080a15fa8e98713601adbc21b91d4c82d436f128cc00fe75575f88ddefc25e1ce5ed72bd2d65dfce12 -DIST minio-2019.03.13.21.59.47.tar.gz 9200988 BLAKE2B 56b2e6e3e4a7643d1e79c6038937b77dfaae632e38cd4049d79076920ee1c84ec75b738d5d069eb0c9c2b219cd2e39b129422191ab8f771386fde25338585edb SHA512 daa76f2e79acea86594189e3df5336d2bc29a5da21ebe36bc6de2fcf68135e4ea7529351a3878609adb9118553fa10088ac0fb1c746d23890b886fe7885a1b2c -DIST minio-2019.03.20.22.38.47.tar.gz 9249505 BLAKE2B c3b5173575c266bf4a86276eafa1faecdcee7411fafb497452d0265c81d75adb06c2e2e05ed17dc6fec8b367ac8e389798ff4f98e4177eec8bbf786af05f7109 SHA512 33790bae9d2b33c53bf98bc20dc2f5d2653bcad2263f75d99523a9140d029adb16068eb8b376966ddaf96aad8eaf540bf4c8cc9d5c3fbb14c2aa0b63ac9fdefb -DIST minio-2019.03.27.22.35.21.tar.gz 9261176 BLAKE2B 896162800b156d6cc04733fb80a4a0adf90b9bb5ff3561108e136e953dc60d4356c28fd6f28865977060d854f3887c23396139433e4a6c46fe9036a2b2e01336 SHA512 1fce454f0cbbb90bd8fff48c20a3a93cac464ea8dda1acb5687a566a5db641e912ff57a9b8e73192df5a7eb896f265945da734f89cf6c57dc9e2a0c8554f8d10 -DIST minio-2019.04.04.18.31.46.tar.gz 4814395 BLAKE2B 0f8d4f73092f9d51cf49f3e085511f2005deb2df153d803b845cdf0ea25cdff3fa2e2acd480be59ebe1b83f5ca87b6c665dccd72e36a4ca98a1837bf4aef5996 SHA512 edd646be6bb24d5a1afd10417bdd75a4f1290099d9eda99c6b6303442c8badd3cb376ca1e78b0fea18f3cb2421c229d651fe4c9c756fe0376979517b1d7ba005 -DIST minio-2019.04.09.01.22.30.tar.gz 4816060 BLAKE2B f70e60601523e2a9498a20afe3122a4bee3157070aae43d42e7d8a4036008de1fe4323be0852096a3d44317a6fa1dd8f4adedb769934f6029cde1fffbe3aa0aa SHA512 dd056bc5317911a49b6fcf1442c94fad0aca1b699605c0d4346aa164cb330b7cb3863f5d68197c453af8c6d3c8541ba92e0b382914dc5a4829ffd8e2db4e9c7d -DIST minio-2019.04.18.01.15.57.tar.gz 4823773 BLAKE2B c439f51843ef266227237a6b2d8cf46869559e1ac0a7365d1e221c2f2b784a54cb5af3f4d96b0adff06eb8761d12cd76f6e7c69cb476d954b888a1528406841b SHA512 45ce69a073b758710c5a5a8853857b3e7aada3fb536bb4e129b88eed8c43b77ab5d012e1299101d6b918c582030ea9bcb9170ac41135952cc628e461819c9574 -DIST minio-2019.04.18.21.44.59.tar.gz 4816682 BLAKE2B 63a43028f3f8af24674ff494907a81566c716b4bc7b41b2419d39df8dc1630b596037466b6efad1d8867bdbf43244af048c1b9b14b149fcd6182237f27beadb4 SHA512 a53856860189dae66ab970895db10ade8c1857e190bcb68060e4c403c060e91c2db659574329855dc16c49998407402981b7ab331bc93ec814ccdcfce6458d8d -DIST minio-2019.04.23.23.50.36.tar.gz 4816780 BLAKE2B 9591e8938d2f67a507d1b60dab0fd534d6770d37c3fa839b2da22b4d15c04335ce3c6fdeb22a76504072844d17ed7afca1826cb6e653398befaee67e0f9406f4 SHA512 a98e1a46443d9afa8ddc2a04273870440b2a5f4a04dd0fb7b21335471dbdfbe2a30c68da332e66a1d94bb9ad6326acfdd859e25f818ad8d84df869c93cf6ac05 diff --git a/net-fs/minio/files/minio.initd b/net-fs/minio/files/minio.initd deleted file mode 100644 index 3e64ba16f75e..000000000000 --- a/net-fs/minio/files/minio.initd +++ /dev/null @@ -1,11 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2016-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Minio Object Storage Server" -pidfile=${pidfile:-"/run/${SVCNAME}.pid"} -command="/usr/bin/minio" -command_args="${command_args:-server /var/lib/minio}" -command_background="true" -start_stop_daemon_args="--stdout /var/log/${SVCNAME}.log \ - --stderr /var/log/${SVCNAME}.log" diff --git a/net-fs/minio/metadata.xml b/net-fs/minio/metadata.xml deleted file mode 100644 index ec2aee6bb477..000000000000 --- a/net-fs/minio/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <upstream> - <remote-id type="github">minio/minio</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-fs/minio/minio-2019.01.10.00.21.20.ebuild b/net-fs/minio/minio-2019.01.10.00.21.20.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.01.10.00.21.20.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.01.16.21.44.08.ebuild b/net-fs/minio/minio-2019.01.16.21.44.08.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.01.16.21.44.08.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.01.23.23.18.58.ebuild b/net-fs/minio/minio-2019.01.23.23.18.58.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.01.23.23.18.58.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.01.31.00.31.19.ebuild b/net-fs/minio/minio-2019.01.31.00.31.19.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.01.31.00.31.19.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.02.06.21.16.36.ebuild b/net-fs/minio/minio-2019.02.06.21.16.36.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.02.06.21.16.36.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.02.12.21.58.47.ebuild b/net-fs/minio/minio-2019.02.12.21.58.47.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.02.12.21.58.47.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.02.14.00.21.45.ebuild b/net-fs/minio/minio-2019.02.14.00.21.45.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.02.14.00.21.45.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.02.20.22.44.29.ebuild b/net-fs/minio/minio-2019.02.20.22.44.29.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.02.20.22.44.29.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.02.26.19.51.46.ebuild b/net-fs/minio/minio-2019.02.26.19.51.46.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.02.26.19.51.46.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.03.06.22.47.10.ebuild b/net-fs/minio/minio-2019.03.06.22.47.10.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.03.06.22.47.10.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.03.13.21.59.47.ebuild b/net-fs/minio/minio-2019.03.13.21.59.47.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.03.13.21.59.47.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.03.20.22.38.47.ebuild b/net-fs/minio/minio-2019.03.20.22.38.47.ebuild deleted file mode 100644 index 07c4e7897644..000000000000 --- a/net-fs/minio/minio-2019.03.20.22.38.47.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user golang-build golang-vcs-snapshot eapi7-ver - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.03.27.22.35.21.ebuild b/net-fs/minio/minio-2019.03.27.22.35.21.ebuild deleted file mode 100644 index 434b3afcb56d..000000000000 --- a/net-fs/minio/minio-2019.03.27.22.35.21.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - src/${EGO_PN}/buildscripts/gen-ldflags.go || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.04.04.18.31.46.ebuild b/net-fs/minio/minio-2019.04.04.18.31.46.ebuild deleted file mode 100644 index 275580fb0ffb..000000000000 --- a/net-fs/minio/minio-2019.04.04.18.31.46.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" - "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic" - "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama" - "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net" - "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text" - "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto" - "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic" - "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55" - "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go" - "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084" - "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8" - "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b" - "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed" - "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688" - "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd" - "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50" - "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352" - "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f" - "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8" - "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4" - "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230" - "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5" - "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48" - "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d" - "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a" - "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2" - "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249" - "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89" - "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf" - "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d" - "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19" - "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14" - "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b" - "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906" - "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998" - "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b" - "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b" - "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f" - "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9" - "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16" - "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0" - "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d" - "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb" - "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047" - "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" - "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go" - "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto" - "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go" - "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift" - "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43" - "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f" - "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574" - "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e" - "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c" - "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121" - "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e" - "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" - "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a" - "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db" - "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent" - "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341" - "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe" - "github.com/minio/dsync fb604afd87b2a095432c17af2dda742960ef111e" - "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98" - "github.com/minio/lsync a4e43e3d0887e88d151bb3f90f678178b4ec0c5f" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c" - "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync" - "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2" - "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go" - "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2" - "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" ) - -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - - pushd src/${EGO_PN} || die - - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.04.09.01.22.30.ebuild b/net-fs/minio/minio-2019.04.09.01.22.30.ebuild deleted file mode 100644 index 275580fb0ffb..000000000000 --- a/net-fs/minio/minio-2019.04.09.01.22.30.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" - "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic" - "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama" - "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net" - "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text" - "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto" - "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic" - "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55" - "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go" - "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084" - "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8" - "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b" - "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed" - "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688" - "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd" - "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50" - "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352" - "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f" - "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8" - "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4" - "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230" - "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5" - "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48" - "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d" - "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a" - "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2" - "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249" - "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89" - "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf" - "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d" - "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19" - "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14" - "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b" - "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906" - "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998" - "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b" - "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b" - "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f" - "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9" - "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16" - "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0" - "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d" - "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb" - "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047" - "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" - "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go" - "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto" - "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go" - "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift" - "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43" - "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f" - "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574" - "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e" - "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c" - "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121" - "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e" - "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" - "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a" - "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db" - "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent" - "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341" - "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe" - "github.com/minio/dsync fb604afd87b2a095432c17af2dda742960ef111e" - "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98" - "github.com/minio/lsync a4e43e3d0887e88d151bb3f90f678178b4ec0c5f" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c" - "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync" - "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2" - "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go" - "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2" - "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" ) - -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - - pushd src/${EGO_PN} || die - - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.04.18.01.15.57.ebuild b/net-fs/minio/minio-2019.04.18.01.15.57.ebuild deleted file mode 100644 index 275580fb0ffb..000000000000 --- a/net-fs/minio/minio-2019.04.18.01.15.57.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" - "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic" - "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama" - "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net" - "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text" - "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto" - "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic" - "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55" - "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go" - "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084" - "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8" - "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b" - "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed" - "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688" - "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd" - "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50" - "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352" - "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f" - "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8" - "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4" - "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230" - "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5" - "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48" - "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d" - "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a" - "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2" - "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249" - "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89" - "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf" - "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d" - "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19" - "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14" - "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b" - "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906" - "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998" - "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b" - "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b" - "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f" - "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9" - "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16" - "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0" - "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d" - "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb" - "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047" - "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" - "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go" - "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto" - "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go" - "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift" - "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43" - "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f" - "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574" - "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e" - "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c" - "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121" - "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e" - "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" - "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a" - "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db" - "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent" - "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341" - "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe" - "github.com/minio/dsync fb604afd87b2a095432c17af2dda742960ef111e" - "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98" - "github.com/minio/lsync a4e43e3d0887e88d151bb3f90f678178b4ec0c5f" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c" - "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync" - "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2" - "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go" - "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2" - "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" ) - -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - - pushd src/${EGO_PN} || die - - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.04.18.21.44.59.ebuild b/net-fs/minio/minio-2019.04.18.21.44.59.ebuild deleted file mode 100644 index 275580fb0ffb..000000000000 --- a/net-fs/minio/minio-2019.04.18.21.44.59.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" - "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic" - "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama" - "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net" - "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text" - "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto" - "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic" - "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55" - "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go" - "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084" - "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8" - "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b" - "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed" - "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688" - "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd" - "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50" - "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352" - "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f" - "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8" - "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4" - "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230" - "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5" - "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48" - "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d" - "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a" - "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2" - "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249" - "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89" - "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf" - "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d" - "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19" - "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14" - "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b" - "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906" - "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998" - "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b" - "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b" - "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f" - "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9" - "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16" - "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0" - "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d" - "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb" - "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047" - "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" - "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go" - "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto" - "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go" - "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift" - "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43" - "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f" - "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574" - "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e" - "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c" - "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121" - "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e" - "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" - "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a" - "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db" - "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent" - "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341" - "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe" - "github.com/minio/dsync fb604afd87b2a095432c17af2dda742960ef111e" - "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98" - "github.com/minio/lsync a4e43e3d0887e88d151bb3f90f678178b4ec0c5f" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c" - "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync" - "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2" - "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go" - "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2" - "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" ) - -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - - pushd src/${EGO_PN} || die - - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/minio/minio-2019.04.23.23.50.36.ebuild b/net-fs/minio/minio-2019.04.23.23.50.36.ebuild deleted file mode 100644 index 392f3b6ff907..000000000000 --- a/net-fs/minio/minio-2019.04.23.23.50.36.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml" - "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic" - "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama" - "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time" - "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys" - "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net" - "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text" - "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto" - "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic" - "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55" - "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go" - "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084" - "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8" - "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b" - "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed" - "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688" - "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e" - "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2" - "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb" - "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7" - "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd" - "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50" - "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352" - "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f" - "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8" - "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee" - "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4" - "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230" - "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5" - "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228" - "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48" - "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d" - "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a" - "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2" - "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249" - "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89" - "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf" - "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d" - "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19" - "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14" - "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b" - "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906" - "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998" - "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" - "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11" - "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b" - "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d" - "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad" - "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" - "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727" - "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b" - "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f" - "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9" - "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16" - "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30" - "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e" - "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0" - "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d" - "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb" - "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047" - "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77" - "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini" - "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go" - "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto" - "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go" - "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift" - "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43" - "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f" - "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574" - "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd" - "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e" - "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c" - "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121" - "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e" - "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7" - "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a" - "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db" - "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent" - "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79" - "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249" - "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee" - "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341" - "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client" - "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea" - "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045" - "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe" - "github.com/minio/dsync fb604afd87b2a095432c17af2dda742960ef111e" - "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98" - "github.com/minio/lsync a4e43e3d0887e88d151bb3f90f678178b4ec0c5f" - "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261" - "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c" - "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync" - "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2" - "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go" - "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2" - "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c" - "github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29" - "github.com/colinmarc/hdfs/v2 fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50 github.com/colinmarc/hdfs" - "gopkg.in/jcmturner/gokrb5.v5 32ba44ca5b42f17a4a9f33ff4305e70665a1bc0f github.com/jcmturner/gokrb5" - "github.com/hashicorp/go-uuid 4f571afc59f3043a65f8fe6bf46d887b10a01d43" - "github.com/jcmturner/gofork dc7c13fece037a4a36e2b3c69db4991498d30692" - "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" - "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8" - "gopkg.in/jcmturner/aescts.v1 f6abebb3171c4c1b1fea279cb7c7325020a26290 github.com/jcmturner/aescts" - "gopkg.in/jcmturner/dnsutils.v1 13eeb8d49ffb74d7a75784c35e4d900607a3943c github.com/jcmturner/dnsutils" - "gopkg.in/jcmturner/rpc.v0 4480c480c9cd343b54b0acb5b62261cbd33d7adf github.com/jcmturner/rpc" -) - -inherit user golang-build golang-vcs-snapshot - -EGO_PN="github.com/minio/minio" -MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z" -MY_PV=${MY_PV//./-} -EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5" -ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -KEYWORDS="~amd64 ~amd64-linux" - -DESCRIPTION="An Amazon S3 compatible object storage server" -HOMEPAGE="https://github.com/minio/minio" -SRC_URI="${ARCHIVE_URI}" -LICENSE="Apache-2.0" -SLOT="0" - -RESTRICT="test" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} -} - -src_prepare() { - default - - pushd src/${EGO_PN} || die - - rm go.mod || die - - sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\ - -e "s/-s //"\ - -e "/time/d"\ - -e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\ - buildscripts/gen-ldflags.go || die - - popd || die -} - -src_compile() { - unset XDG_CACHE_HOME - - pushd src/${EGO_PN} || die - MINIO_RELEASE="${MY_PV}" - go run buildscripts/gen-ldflags.go - GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs - dobin minio - popd || die - newinitd "${FILESDIR}"/${PN}.initd ${PN} - keepdir /var/{lib,log}/${PN} - fowners ${PN}:${PN} /var/{lib,log}/${PN} -} diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest deleted file mode 100644 index a5eaec967625..000000000000 --- a/net-fs/ncpfs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602 diff --git a/net-fs/ncpfs/files/ipx.confd b/net-fs/ncpfs/files/ipx.confd deleted file mode 100644 index ca778f4e286a..000000000000 --- a/net-fs/ncpfs/files/ipx.confd +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Config file for /etc/init.d/ipx - -# Automatically selecting a primary interface. -IPX_AUTO_PRIMARY=on - -# Automatically creating interfaces. -IPX_AUTO_INTERFACE=on - -# Interface to which IPX sockets are bound. -IPX_DEVICE=eth0 - -# The IPX frame type to use. -# Valid values are: 802.2, 802.3, SNAP, & EtherII. -IPX_FRAME=802.2 - -# Create a special kind of IPX interface that does not -# have a physical device or frame type. -IPX_INTERNAL_NET=no - -# Network number -IPX_NETNUM=1 - -# Node number -IPX_NODENUM=1 diff --git a/net-fs/ncpfs/files/ipx.init b/net-fs/ncpfs/files/ipx.init deleted file mode 100644 index e4aa25716c5d..000000000000 --- a/net-fs/ncpfs/files/ipx.init +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -#NB: Config is in /etc/conf.d/ipx - -depend() { - need net netmount -} - -start() { - local retval=0 - - ebegin "Bringing IPX up" - if [ ${IPX_INTERNAL_NET} = "yes" ] - then - /usr/bin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM} - retval=$? - else - /usr/bin/ipx_interface add -p ${IPX_DEVICE} \ - ${IPX_FRAME} ${IPX_NETNUM} - retval=$? - fi - - /usr/bin/ipx_configure \ - --auto_primary=${IPX_AUTO_PRIMARY} \ - --auto_interface=${IPX_AUTO_INTERFACE} - retval=$(( $retval + $? )) - eend ${retval} "Failed to bring IPX up" -} - -stop() { - local retval=0 - - ebegin "Bringing IPX down" - /usr/bin/ipx_configure --auto_primary=off --auto_interface=off - retval=$? - /usr/bin/ipx_interface delall - retval=$(( $retval + $? )) - eend ${retval} "Failed to down IPX" -} diff --git a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch b/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch deleted file mode 100644 index 81908acd6c0b..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/contrib/php/build/rules.mk.orig 2004-12-09 13:01:04.417854240 +0000 -+++ b/contrib/php/build/rules.mk 2004-12-09 13:01:42.460070944 +0000 -@@ -63,10 +63,10 @@ - - install-modules: - @test -d modules && \ -- $(mkinstalldirs) $(moduledir) && \ -- echo "installing shared modules into $(moduledir)" && \ -+ $(mkinstalldirs) $(DESTDIR)/$(moduledir) && \ -+ echo "installing shared modules into $(DESTDIR)/$(moduledir)" && \ - rm -f modules/*.la && \ -- cp modules/* $(moduledir) || true -+ cp modules/* $(DESTDIR)/$(moduledir) || true - - include $(builddir)/.deps - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch deleted file mode 100644 index 49d3c386d5a1..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-align-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/lib/ndslib.c ncpfs-2.2.6/lib/ndslib.c ---- a/lib/ndslib.c.orig 2005-01-27 12:35:59.000000000 -0500 -+++ b/lib/ndslib.c 2014-08-12 21:07:35.559190454 -0400 -@@ -957,7 +957,7 @@ static NWDSCCODE nds_beginauth2( - NWDSCCODE err; - int n1, n3; - u_int16_t n3a; -- char rpb_b[DEFAULT_MESSAGE_LEN]; -+ char rpb_b[DEFAULT_MESSAGE_LEN] __attribute__ ((aligned (4))); - Buf_T rpb; - size_t k1tl; - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch deleted file mode 100644 index 9348c08536e4..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-kernel-check.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Drop kernel version check -Author: Bastian Blank <waldi@debian.org> -Bug-Debian: http://bugs.debian.org/692472 - ---- a/sutil/ncpm_common.c.orig -+++ b/sutil/ncpm_common.c -@@ -243,23 +243,6 @@ static int load_ncpfs(void) - #endif /* MOUNT2 */ - - static int getmountver(void) { -- struct utsname name; -- int maj, mid, rev; -- int ver; -- -- if (uname(&name)) { -- errexit(1, _("Cannot get kernel release\n")); -- } -- if (sscanf(name.release, "%d.%d.%d", &maj, &mid, &rev) != 3) { -- errexit(2, _("Cannot convert kernel release \"%s\" to number\n"), name.release); -- } -- ver = maj*0x10000 + mid*0x100 + rev; -- if (ver < 0x20100) -- return 2; -- if (ver < 0x20328) -- return 3; -- if (ver < 0x2051F) -- return 4; - return 5; - } - - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch deleted file mode 100644 index b9c39f51e4ed..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-drop-mtab-support.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c ---- a/sutil/ncplogin.c.orig 2014-08-13 02:52:56.859067273 -0400 -+++ b/sutil/ncplogin.c 2014-08-13 02:53:42.699067001 -0400 -@@ -111,7 +111,6 @@ - #include <stdlib.h> - #include <stdarg.h> - #include <sys/mount.h> --#include <mntent.h> - #include <ncp/kernel/ipx.h> - #include <sys/ioctl.h> - #ifdef CONFIG_NATIVE_UNIX -@@ -935,12 +934,6 @@ ncpipx:; - } - NWCCCloseConn(conn); - NWDSFreeContext(ctx); -- /* ncpmap, ncplogin must write in /etc/mtab */ -- { -- block_sigs(); -- add_mnt_entry(mount_name, mount_point, info.flags); -- unblock_sigs(); -- } - free(mount_name); - if (info.echo_mnt_pnt) { - printf(_("mounted on:%s\n"),mount_point); -diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c ---- ncpfs-2.2.6.orig/sutil/ncpm_common.c 2014-08-13 02:52:56.959067273 -0400 -+++ ncpfs-2.2.6/sutil/ncpm_common.c 2014-08-13 02:55:38.349066313 -0400 -@@ -104,7 +104,6 @@ - #include <stdlib.h> - #include <stdarg.h> - #include <sys/mount.h> --#include <mntent.h> - #include <ncp/kernel/ipx.h> - #include <sys/ioctl.h> - #if MOUNT3 -@@ -1423,68 +1422,6 @@ static const struct smntflags { - {MS_NODIRATIME, "nodiratime"}, - {0, NULL}}; - --void add_mnt_entry(char* mount_name, char* mpnt, unsigned long flags) { -- const struct smntflags* sf; -- char mnt_opts[80]; -- char* p; -- struct mntent ment; -- int fd; -- FILE* mtab; -- -- if (check_name(mount_name) == -1 || check_name(mpnt) == -1) -- errexit(107, _("Illegal character in mount entry\n")); -- -- ment.mnt_fsname = mount_name; -- ment.mnt_dir = mpnt; -- ment.mnt_type = (char*)"ncpfs"; -- ment.mnt_opts = mnt_opts; -- ment.mnt_freq = 0; -- ment.mnt_passno = 0; -- -- p = mnt_opts; -- *p++ = 'r'; -- *p++ = (flags & MS_RDONLY)?'o':'w'; -- for (sf = mntflags; sf->flag; sf++) { -- if (flags & sf->flag) { -- *p++ = ','; -- strcpy(p, sf->name); -- p += strlen(p); -- } -- } -- *p = 0; -- -- if (ncpm_suser()) { -- errexit(91, _("Cannot switch to superuser: %s\n"), strerror(errno)); -- } -- if ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) -- { -- errexit(58, _("Can't get %s~ lock file\n"), MOUNTED); -- } -- close(fd); -- -- if ((mtab = setmntent(MOUNTED, "a+")) == NULL) -- { -- errexit(59, _("Can't open %s\n"), MOUNTED); -- } -- if (addmntent(mtab, &ment) == 1) -- { -- errexit(60, _("Can't write mount entry\n")); -- } -- if (fchmod(fileno(mtab), 0644) == -1) -- { -- errexit(61, _("Can't set perms on %s\n"), MOUNTED); -- } -- endmntent(mtab); -- -- if (unlink(MOUNTED "~") == -1) -- { -- errexit(62, _("Can't remove %s~\n"), MOUNTED); -- } -- if (ncpm_normal()) { -- errexit(90, _("Cannot relinquish superuser rights: %s\n"), strerror(EPERM)); -- } --} -- - static int __proc_option(const struct optinfo* opts, struct ncp_mount_info* info, const char* opt, const char* param) { - const struct optinfo* optr; - -diff -Naurp ncpfs-2.2.6.orig/sutil/ncpm_common.h ncpfs-2.2.6/sutil/ncpm_common.h ---- ncpfs-2.2.6.orig/sutil/ncpm_common.h 2014-08-13 02:52:56.749067274 -0400 -+++ ncpfs-2.2.6/sutil/ncpm_common.h 2014-08-13 02:53:42.699067001 -0400 -@@ -60,7 +60,6 @@ void verify_argv(int argc, char* argv[]) - int ncp_mount_specific(struct ncp_conn* conn, int pathNS, const unsigned char* NWpath, int pathlen); - int mount_ok(struct stat *st); - void mycom_err(int, const char*, ...); --void add_mnt_entry(char* mount_name, char* mpoint, unsigned long flags); - - struct ncp_mount_info { - struct ncp_mount_data_independent mdata; -diff -Naurp ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c ---- ncpfs-2.2.6.orig/sutil/ncpmount.c 2014-08-13 02:52:56.749067274 -0400 -+++ ncpfs-2.2.6/sutil/ncpmount.c 2014-08-13 02:53:42.699067001 -0400 -@@ -114,7 +114,6 @@ - #include <stdlib.h> - #include <stdarg.h> - #include <sys/mount.h> --#include <mntent.h> - #include <ncp/kernel/ipx.h> - #include <ncp/nwclient.h> - #include <sys/ioctl.h> -@@ -719,11 +718,6 @@ ncpipx:; - } - ncp_close(conn); - -- if (!opt_n) { -- block_sigs(); -- add_mnt_entry(mount_name, mount_point, info.flags); -- unblock_sigs(); -- } - return 0; - } - -diff -Naurp ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c ---- ncpfs-2.2.6.orig/sutil/ncpumount.c 2014-08-13 02:52:56.749067274 -0400 -+++ ncpfs-2.2.6/sutil/ncpumount.c 2014-08-13 02:55:10.369066480 -0400 -@@ -179,108 +179,6 @@ static void enableAlarm(void) { - sigprocmask(SIG_UNBLOCK, &sa.sa_mask, NULL); - } - --static int __clearMtab (const char* mount_points[], unsigned int numEntries) { --// main logic from ncpumount.c -- struct mntent *mnt; -- FILE *mtab; -- FILE *new_mtab; -- --#define MOUNTED_TMP MOUNTED".tmp" -- -- if ((mtab = setmntent(MOUNTED, "r")) == NULL){ -- eprintf(_("Can't open %s: %s\n"), MOUNTED, -- strerror(errno)); -- return 1; -- } -- -- if ((new_mtab = setmntent(MOUNTED_TMP, "w")) == NULL){ -- eprintf(_("Can't open %s: %s\n"), MOUNTED_TMP, -- strerror(errno)); -- endmntent(mtab); -- return 1; -- } -- while ((mnt = getmntent(mtab)) != NULL) { -- unsigned int i=0; -- int found=0; -- -- while (i<numEntries && !found) { -- found=!strcmp(mnt->mnt_dir, mount_points[i]); -- i++; -- } -- if (!found) { -- addmntent(new_mtab, mnt); -- } -- } -- -- endmntent(mtab); -- -- if (fchmod(fileno(new_mtab), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0){ -- eprintf(_("Error changing mode of %s: %s\n"), -- MOUNTED_TMP, strerror(errno)); -- return 1; -- } -- endmntent(new_mtab); -- -- if (rename(MOUNTED_TMP, MOUNTED) < 0){ -- eprintf(_("Cannot rename %s to %s: %s\n"), -- MOUNTED, MOUNTED_TMP, strerror(errno)); -- return 1; -- } -- return 0; --} -- --static int clearMtab (const char* mount_points[], unsigned int numEntries) { -- int fd; -- int err; -- int retries = 10; -- -- if (!numEntries) -- return 0; /* don't waste time ! */ -- -- block_sigs(); -- -- while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) { -- struct timespec tm; -- -- if (errno != EEXIST || retries == 0) { -- unblock_sigs(); -- eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno)); -- return 1; -- } -- fd = open(MOUNTED "~", O_RDWR); -- if (fd != -1) { -- alarm(10); -- err = lockf(fd, F_LOCK, 0); -- alarm(0); -- close(fd); -- if (err) { -- unblock_sigs(); -- eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out")); -- return 1; -- } -- tm.tv_sec = 0; -- tm.tv_nsec = 20000000; -- nanosleep(&tm, NULL); -- } -- retries--; -- } -- alarm(1); -- lockf(fd, F_LOCK, 0); -- alarm(0); -- close(fd); -- -- err = __clearMtab(mount_points, numEntries); -- -- if ((unlink(MOUNTED "~") == -1) && (err == 0)){ -- unblock_sigs(); -- eprintf(_("Can't remove %s~"), MOUNTED); -- return 1; -- } -- unblock_sigs(); -- return err; --} -- -- - int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt) - { - if (umount(rel_mnt) != 0) { -@@ -617,10 +515,6 @@ static int old_ncpumount(int argc, char - ret = 1; - continue; - } -- if (clearMtab(&mount_point, 1)) { -- ret = 1; -- continue; -- } - } - return ret; - } -@@ -739,7 +633,6 @@ main(int argc, char *argv[]) - if (serverName || allConns) { - processBindServers(conns,curEntries,serverName,umountTable,&mountEntries); - } -- clearMtab(umountTable, mountEntries); - } else if (treeName) { - eprintf(_("No NCP connections to tree %s.\n"),treeName); - } else if (serverName) { diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch deleted file mode 100644 index 793aca6cbccd..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur ncpfs-2.2.6-orig/lib/ncplib.c ncpfs-2.2.6/lib/ncplib.c ---- a/lib/ncplib.c.orig 2006-01-13 16:55:05.000000000 -0500 -+++ b/lib/ncplib.c 2006-01-13 16:56:08.000000000 -0500 -@@ -2421,7 +2421,7 @@ - int i = 1; - NWCCODE nwerr; - -- static int get_argument(int arg_no, const char **target) { -+ int get_argument(int arg_no, const char **target) { - int count = 1; - - if (target != NULL) { -diff -ur ncpfs-2.2.6-orig/util/nwpjmv.c ncpfs-2.2.6/util/nwpjmv.c ---- ncpfs-2.2.6-orig/util/nwpjmv.c 2006-01-13 16:55:05.000000000 -0500 -+++ ncpfs-2.2.6/util/nwpjmv.c 2006-01-13 16:55:50.000000000 -0500 -@@ -131,7 +131,7 @@ - char *s = q->command; - char *target_end = target + target_size; - -- static void add_string(const char *str) -+ void add_string(const char *str) - { - int len = strlen(str); - if (target + len + 1 > target_end) -diff -ur ncpfs-2.2.6-orig/util/pserver.c ncpfs-2.2.6/util/pserver.c ---- ncpfs-2.2.6-orig/util/pserver.c 2006-01-13 16:55:05.000000000 -0500 -+++ ncpfs-2.2.6/util/pserver.c 2006-01-13 16:55:36.000000000 -0500 -@@ -153,7 +153,7 @@ - char *s = q->command; - char *target_end = target + target_size; - -- static void add_string(const char *str) -+ void add_string(const char *str) - { - int len = strlen(str); - if (target + len + 1 > target_end) diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch deleted file mode 100644 index 64193c22d052..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-getuid-fix.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/chgpwd.c ncpfs-2.2.6/contrib/tcl-utils/chgpwd.c ---- a/contrib/tcl-utils/chgpwd.c.orig 2005-01-27 12:35:59.000000000 -0500 -+++ b/contrib/tcl-utils/chgpwd.c 2014-08-12 21:08:25.779190155 -0400 -@@ -292,12 +292,12 @@ int main(int argc, char *argv[]) { - } - } else { - if (!treeName[0]) { -- NWCXGetPreferredDSTree(treeName,sizeof(treeName)); -+ dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName)); - - } - if (!treeName[0]) { - fprintf(stderr,"failed: You must specify a server or a tree\n"); -- dserr=114; -+ /*dserr=114;*/ - goto finished; - } - -diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncplist.c ncpfs-2.2.6/contrib/tcl-utils/ncplist.c ---- ncpfs-2.2.6.orig/contrib/tcl-utils/ncplist.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/contrib/tcl-utils/ncplist.c 2014-08-12 21:08:25.779190155 -0400 -@@ -299,7 +299,12 @@ int main(int argc, char *argv[]) { - }else { - - if (!treeName[0]) { -- NWCXGetPreferredDSTree(treeName,sizeof(treeName)); -+ dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName)); -+ if (dserr){ -+ fprintf(stderr, "failed: Cannot get preffered DS tree: %s\n", -+ strnwerror(dserr); -+ exit(106); -+ } - - } - if (!treeName[0]) { -diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprop.c ncpfs-2.2.6/contrib/tcl-utils/ncpreadprop.c ---- ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprop.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/contrib/tcl-utils/ncpreadprop.c 2014-08-12 21:08:25.779190155 -0400 -@@ -470,7 +470,7 @@ main(int argc, char *argv[]) - } - } else { - if (!treeName[0]) { -- NWCXGetPreferredDSTree(treeName,sizeof(treeName)); -+ dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName)); - - } - if (!treeName[0]) { -diff -Naurp ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprops.c ncpfs-2.2.6/contrib/tcl-utils/ncpreadprops.c ---- ncpfs-2.2.6.orig/contrib/tcl-utils/ncpreadprops.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/contrib/tcl-utils/ncpreadprops.c 2014-08-12 21:08:25.779190155 -0400 -@@ -507,7 +507,7 @@ main(int argc, char *argv[]) - } - } else { - if (!treeName[0]) { -- NWCXGetPreferredDSTree(treeName,sizeof(treeName)); -+ dserr=NWCXGetPreferredDSTree(treeName,sizeof(treeName)); - - } - if (!treeName[0]) { -diff -Naurp ncpfs-2.2.6.orig/lib/nwclient.c ncpfs-2.2.6/lib/nwclient.c ---- ncpfs-2.2.6.orig/lib/nwclient.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/lib/nwclient.c 2014-08-12 21:08:25.779190155 -0400 -@@ -481,6 +481,10 @@ static char* readnwinfosfile (char * use - *err = EACCES; - return NULL; - } -+ if (st.st_uid != getuid()) { -+ *err = EACCES; -+ return NULL; -+ } - if ((st.st_mode & (S_IRWXO | S_IRWXG)) != 0) { - *err = NCPLIB_INVALID_MODE; - return NULL; -@@ -560,7 +564,7 @@ NWDSCCODE NWCXGetPreferredDSTree (NWD - if (!res) - res=readnwinfosfile (NULL,NDS_PREFERRED_TREE,NULL, &err); - if (!res) -- return -1; -+ return err; - if (strlen (res)+1 >maxLen) - return NWE_BUFFER_OVERFLOW; - strcpy(preferTree,res); -@@ -581,7 +585,7 @@ NWDSCCODE NWCXGetDefaultNameContext (con - if (!res) - res=readnwinfosfile (NULL,NDS_PREFERRED_NAME_CTX,forTree,&err); - if (!res) -- return -1; -+ return err; - if (strlen (res)+1 >maxLen) - return NWE_BUFFER_OVERFLOW; - strcpy(nameContext,res); -@@ -603,7 +607,7 @@ NWDSCCODE NWCXGetPreferredServer (con - - res=readnwinfosfile (NULL, NDS_PREFERRED_SERVER, forTree, &err); - if (!res) { -- return -1; -+ return err; - } - } - /* test that this server DO belongs to tree forTree*/ -@@ -644,7 +648,7 @@ NWDSCCODE NWCXGetDefaultUserName (const - if (!res) - res=readnwinfosfile (NULL,NDS_USER,forTree, &err); - if (!res) -- return -1; -+ return err; - if (strlen (res)+1 >maxLen) - return NWE_BUFFER_OVERFLOW; - strcpy(defaultName,res); -diff -Naurp ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c ---- ncpfs-2.2.6.orig/sutil/ncplogin.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/sutil/ncplogin.c 2014-08-12 21:08:25.779190155 -0400 -@@ -588,7 +588,10 @@ main(int argc, char *argv[]) - int flags = 0; - - if (!info.tree) { -- NWCXGetPreferredDSTree(ntree, sizeof(ntree)); -+ err=NWCXGetPreferredDSTree(ntree, sizeof(ntree)); -+ if (err){ -+ errexit(104, _("Cannot get preffered DS tree: %s\n"),strnwerror(err)); -+ } - info.tree = ntree; - } - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch deleted file mode 100644 index 111e780ff520..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-ldflags-support.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/contrib/pam/Makefile.in ncpfs-2.2.6/contrib/pam/Makefile.in ---- a/contrib/pam/Makefile.in.orig 2005-01-27 12:35:59.000000000 -0500 -+++ b/contrib/pam/Makefile.in 2014-08-12 21:06:42.369190770 -0400 -@@ -17,6 +17,7 @@ PAM_LIBRARY = pam_ncp_auth.so - PAM_OBJECTS = pam_ncp_auth.do support.do - - CFLAGS_pam_ncp_auth.do := -DNCPMOUNT_PATH=\"$(bindir)/ncpmount\" -DNCPUMOUNT_PATH=\"$(bindir)/ncpumount\" -+LDFLAGS = @LDFLAGS@ - - .PHONY : all install install-dev dep clean mrproper distclean - .PHONY : default -@@ -45,7 +46,7 @@ $(PAM_OBJECTS): %.do: %.c - - - $(PAM_LIBRARY): $(PAM_OBJECTS) -- $(CC) $(CFLAGS) -shared -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS} -+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS} - - dep: - -diff -Naurp ncpfs-2.2.6.orig/ipx-1.0/Makefile.in ncpfs-2.2.6/ipx-1.0/Makefile.in ---- ncpfs-2.2.6.orig/ipx-1.0/Makefile.in 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/ipx-1.0/Makefile.in 2014-08-12 21:06:42.369190770 -0400 -@@ -9,6 +9,7 @@ vpath %.c ${this_srcdir} - vpath %.8 ${this_srcdir} - - LIBS = @INTLLIBS@ @LIBS@ -+LDFLAGS = @LDFLAGS@ - - O_UTILS = ipx_configure.o ipx_cmd.o - O_UTIIPX = ipx_interface.o ipx_internal_net.o ipx_route.o -@@ -33,7 +34,7 @@ $(ALL_OBJECTS): %.o: %.c - [ -s $@ ] || rm -f $@ - - $(UTIIPX): %: %.o ipxutil.o -- $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS} -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS} - - $(UTILS): %: %.o - $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ${LIBS} -diff -Naurp ncpfs-2.2.6.orig/ipxdump/Makefile.in ncpfs-2.2.6/ipxdump/Makefile.in ---- ncpfs-2.2.6.orig/ipxdump/Makefile.in 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/ipxdump/Makefile.in 2014-08-12 21:06:42.369190770 -0400 -@@ -11,6 +11,7 @@ ncp_if_ether_support = @ncp_if_ether_sup - OBJECTS= ipxutil.o - - ALL_OBJECTS := $(EXEC:%=%.o) $(OBJECTS) -+LDFLAGS = @LDFLAGS@ - - .PHONY : all install dep clean mrproper distclean - .PHONY : dist tgz -@@ -24,7 +25,7 @@ install: $(EXEC) - ifeq ($(ncp_if_ether_support),yes) - - $(EXEC): %: %.o $(OBJECTS) -- $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS) - - else - .PHONY ipxdump ipxparse -diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in ---- ncpfs-2.2.6.orig/lib/Makefile.in 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/lib/Makefile.in 2014-08-12 21:06:42.369190770 -0400 -@@ -23,6 +23,7 @@ STATIC_NCPLIB_BIN := $(STATIC_NCPLIB) - CCFLAGS += -I. - PIC_FLAGS := -fPIC - NWCOMPAT := 1 -+LDFLAGS := @LDFLAGS@ - - SHARED_VLINK := - SHARED_VLINK_CFLAGS := -@@ -122,7 +123,7 @@ $(SHARED_NCPLIB): $(SHARED_NCPLIB_BIN) - ln -sf $< $@ - - $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers -- $(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc -+ $(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(LDFLAGS) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} -lc - - install_static: $(STATIC_NCPLIB_BIN) - $(INSTALL) -d $(DESTDIR)$(libadir) -diff -Naurp ncpfs-2.2.6.orig/Make.rules.in ncpfs-2.2.6/Make.rules.in ---- ncpfs-2.2.6.orig/Make.rules.in 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/Make.rules.in 2014-08-12 21:06:42.369190770 -0400 -@@ -42,6 +42,7 @@ CFLAGS_OPTIONS += $(CWARN) - CFLAGS_DEFINES := -DN_PLAT_LINUX -DLOCALEDIR=\"${localedir}\" -DNCPFS_VERSION=\"${VERSION}\" -DNCPFS_PACKAGE=\"${PACKAGE}\" - - CCFLAGS := $(CFLAGS_DEFINES) $(CFLAGS_OPTIONS) $(INCLUDES) -+LDFLAGS := @LDFLAGS@ - - # If your system is ELF, either also do a 'make install', or append the util/ - # directory where the dynamic library resides to the environment -diff -Naurp ncpfs-2.2.6.orig/sutil/Makefile.in ncpfs-2.2.6/sutil/Makefile.in ---- ncpfs-2.2.6.orig/sutil/Makefile.in 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/sutil/Makefile.in 2014-08-12 21:06:42.369190770 -0400 -@@ -14,6 +14,7 @@ USE_KERNEL = @USE_KERNEL@ - NDS_SUPPORT = @NDS_SUPPORT@ - - LIBS = @INTLLIBS@ @LIBS@ -+LDFLAGS := @LDFLAGS@ - - # environ in ncpmount - CCFLAGS += -D_GNU_SOURCE -@@ -69,7 +70,7 @@ $(O_UTILS:.o=.d): %.d: %.c - [ -s $@ ] || rm -f $@ - - ncpmap.o: %.o: ncplogin.c -- $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< -+ $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< - - ncpmap.d: %.d: ncplogin.c - set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ -@@ -85,7 +86,7 @@ ncpm_common.d mount_login.d: %.d: %.c - [ -s $@ ] || rm -f $@ - - $(UTILS): %: %.o ../lib/libncp.a ncpm_common.o mount_login.o -- $(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS} -+ $(CC) @GC_SECTIONS@-o $@ $(addsuffix .o,$@) $(LDFLAGS) $(LDFLAGS_$@) ../lib/libncp.a ${LIBS} - - ../lib/libncp.a: - make -C ../lib libncp.a -diff -Naurp ncpfs-2.2.6.orig/util/Makefile.in ncpfs-2.2.6/util/Makefile.in ---- ncpfs-2.2.6.orig/util/Makefile.in 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/util/Makefile.in 2014-08-12 21:06:42.369190770 -0400 -@@ -15,6 +15,7 @@ NDS_SUPPORT = @NDS_SUPPORT@ - MOUNT2 = @MOUNT2@ - - LIBS = @INTLLIBS@ @LIBS@ -+LDFLAGS = @LDFLAGS@ - - O_OTHER = dsqueue.o - O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \ -@@ -83,7 +84,7 @@ install-dev: - make -C ../lib libncp.so - - $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c -- $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< -+ $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< - - %.d: %.c - set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ -@@ -94,10 +95,10 @@ $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) - pqstat nwpqjob nprint: dsqueue.o - - $(UTILS): %: %.o $(LIBDEP) -- $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS} -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS} - - ipx_probe: ipx_probe.c -- $(CC) $(CFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS} -+ $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS} - - dep: - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch deleted file mode 100644 index ece9fc720db6..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-makefile-fix-soname-link.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in ---- a/lib/Makefile.in.orig 2014-08-12 23:23:27.149141996 -0400 -+++ b/lib/Makefile.in 2014-08-12 23:23:55.969141824 -0400 -@@ -99,9 +99,10 @@ distclean: mrproper - install_shared: $(SHARED_NCPLIB_BIN) - $(INSTALL) -d $(DESTDIR)$(libsodir) - $(INSTALL) $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir) -+ ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB) -+ ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB_SONAME) - - install-dev: install_shared install_static -- ln -sf $(SHARED_NCPLIB_SONAME) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB) - $(INSTALL) -d $(DESTDIR)$(includedir)/ncp - $(INSTALL) -d $(DESTDIR)$(includedir)/ncp/ext - $(INSTALL) -d $(DESTDIR)$(includedir)/ncp/kernel diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch deleted file mode 100644 index 11258253af91..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-missing-includes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6-fixed/contrib/pam/pam_ncp_auth.c ---- a/contrib/pam/pam_ncp_auth.c.orig 2005-01-27 18:35:59.000000000 +0100 -+++ a/contrib/pam/pam_ncp_auth.c 2007-05-11 21:38:05.143474750 +0200 -@@ -257,6 +257,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -+#include <syslog.h> - #include <unistd.h> - #include <pwd.h> - #include <grp.h> -diff -ruN ncpfs-2.2.6/sutil/ncpm_common.c ncpfs-2.2.6-fixed/sutil/ncpm_common.c ---- ncpfs-2.2.6/sutil/ncpm_common.c 2005-01-27 18:35:59.000000000 +0100 -+++ ncpfs-2.2.6-fixed/sutil/ncpm_common.c 2007-05-11 21:38:29.609003750 +0200 -@@ -82,6 +82,7 @@ - - #include "ncpm_common.h" - -+#include <stddef.h> - #include <stdio.h> - #include <string.h> - #include <signal.h> diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch deleted file mode 100644 index def49a5fad65..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-multiple-vulns.patch +++ /dev/null @@ -1,557 +0,0 @@ -From: Dan Rosenberg <dan.j.rosenberg () gmail com> -Date: Fri, 5 Mar 2010 12:06:01 -0500 - -============================================ - ncpfs, Multiple Vulnerabilities - March 5, 2010 - CVE-2010-0788, CVE-2010-0790, CVE-2010-0791 -============================================ - -==Description== - -The ncpmount, ncpumount, and ncplogin utilities, installed as part of the ncpfs -package, contain several vulnerabilities. - -1. ncpmount, ncpumount, and ncplogin are vulnerable to race conditions that -allow a local attacker to unmount arbitrary mountpoints, causing -denial-of-service, or mount Netware shares to arbitrary directories, -potentially leading to root compromise. This issue was formerly assigned -CVE-2009-3297, but has since been re-assigned CVE-2010-0788 to avoid overlap -with related bugs in other packages. - -2. ncpumount is vulnerable to an information disclosure vulnerability that -allows a local attacker to verify the existence of arbitrary files, violating -directory permissions. This issue has been assigned CVE-2010-0790. - -3. ncpmount, ncpumount, and ncplogin create lockfiles insecurely, allowing a -local attacker to leave a stale lockfile at /etc/mtab~, causing other mount -utilities to fail and creating denial-of-service conditions. This issue has -been assigned CVE-2010-0791. - -==Workaround== - -If unprivileged users do not need the ability to mount and unmount Netware -shares, then the suid bit should be removed from these utilities. - -==Solution== - -A patch has been released that resolves these issues (attached to this -advisory). ncpfs-2.2.6.partial.patch is intended for ncpfs releases that have -already been patched against the first vulnerability in this report -(CVE-2010-0788, formerly CVE-2009-3297). It has been tested against the latest -ncpfs packages distributed by Fedora, Red Hat, and Mandriva. -ncpfs-2.2.6.full.patch is intended for ncpfs releases that have not been -patched against any of these vulnerabilities. It has been tested against the -latest ncpfs packages distributed by Debian, Ubuntu, and the upstream release -(ftp://platan.vc.cvut.cz/pub/linux/ncpfs/). - -Users are advised to recompile from source, or request updated packages from -downstream distributors. - -==Credits== - -These vulnerabilities were discovered by Dan Rosenberg -(dan.j.rosenberg () gmail com). -Thanks to Vitezslav Crhonek for the patch against the first issue. - -==References== - -CVE identifiers CVE-2010-0788, CVE-2010-0790, and CVE-2010-0791 have been -assigned to these issues. - -http://seclists.org/fulldisclosure/2010/Mar/122 - - -diff -ur ncpfs-2.2.6.orig/sutil/ncplogin.c ncpfs-2.2.6/sutil/ncplogin.c ---- a/sutil/ncplogin.c.orig 2010-03-03 16:18:59.000000000 -0500 -+++ b/sutil/ncplogin.c 2010-03-03 16:17:41.000000000 -0500 -@@ -934,7 +934,9 @@ - NWDSFreeContext(ctx); - /* ncpmap, ncplogin must write in /etc/mtab */ - { -+ block_sigs(); - add_mnt_entry(mount_name, mount_point, info.flags); -+ unblock_sigs(); - } - free(mount_name); - if (info.echo_mnt_pnt) { -diff -ur ncpfs-2.2.6.orig/sutil/ncpm_common.c ncpfs-2.2.6/sutil/ncpm_common.c ---- ncpfs-2.2.6.orig/sutil/ncpm_common.c 2010-03-03 16:18:59.000000000 -0500 -+++ ncpfs-2.2.6/sutil/ncpm_common.c 2010-03-03 16:17:41.000000000 -0500 -@@ -360,7 +360,7 @@ - #endif - - static inline int ncpm_suser(void) { -- return setreuid(-1, 0); -+ return setresuid(0, 0, myuid); - } - - static int ncpm_normal(void) { -@@ -368,11 +368,31 @@ - int v; - - e = errno; -- v = setreuid(-1, myuid); -+ v = setresuid(myuid, myuid, 0); - errno = e; - return v; - } - -+void block_sigs(void) { -+ -+ sigset_t mask, orig_mask; -+ sigfillset(&mask); -+ -+ if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { -+ errexit(-1, _("Blocking signals failed.\n")); -+ } -+} -+ -+void unblock_sigs(void) { -+ -+ sigset_t mask, orig_mask; -+ sigemptyset(&mask); -+ -+ if (sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { -+ errexit(-1, _("Un-blocking signals failed.\n")); -+ } -+} -+ - static int proc_ncpm_mount(const char* source, const char* target, const char* filesystem, unsigned long mountflags, const void* data) { - int v; - int e; -@@ -444,7 +464,7 @@ - } - datav2.file_mode = data->file_mode; - datav2.dir_mode = data->dir_mode; -- err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav2); -+ err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav2); - if (err) - return errno; - return 0; -@@ -508,7 +528,7 @@ - exit(0); /* Should not return from process_connection */ - } - close(pp[0]); -- err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*) &datav3); -+ err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*) &datav3); - if (err) { - err = errno; - /* Mount unsuccesful so we have to kill daemon */ -@@ -559,7 +579,7 @@ - sprintf(mountopts, "version=%u,flags=%u,owner=%u,uid=%u,gid=%u,mode=%u,dirmode=%u,timeout=%u,retry=%u,wdogpid=%u,ncpfd=%u,infofd=%u", - NCP_MOUNT_VERSION_V5, ncpflags, data->mounted_uid, data->uid, data->gid, data->file_mode, - data->dir_mode, data->time_out, data->retry_count, wdog_pid, data->ncp_fd, pp[1]); -- err=proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, mountopts); -+ err=proc_ncpm_mount(mount_name, ".", "ncpfs", flags, mountopts); - } else { - err=-1; - } -@@ -577,7 +597,7 @@ - datav4.file_mode = data->file_mode; - datav4.dir_mode = data->dir_mode; - datav4.wdog_pid = wdog_pid; -- err = proc_ncpm_mount(mount_name, data->mount_point, "ncpfs", flags, (void*)&datav4); -+ err = proc_ncpm_mount(mount_name, ".", "ncpfs", flags, (void*)&datav4); - if (err) { - err = errno; - /* Mount unsuccesful so we have to kill daemon */ -@@ -1395,6 +1415,17 @@ - } - #endif /* MOUNT3 */ - -+static int check_name(const char *name) -+{ -+ char *s; -+ for (s = "\n\t\\"; *s; s++) { -+ if (strchr(name, *s)) { -+ return -1; -+ } -+ } -+ return 0; -+} -+ - static const struct smntflags { - unsigned int flag; - const char* name; -@@ -1416,6 +1447,9 @@ - int fd; - FILE* mtab; - -+ if (check_name(mount_name) == -1 || check_name(mpnt) == -1) -+ errexit(107, _("Illegal character in mount entry\n")); -+ - ment.mnt_fsname = mount_name; - ment.mnt_dir = mpnt; - ment.mnt_type = (char*)"ncpfs"; -diff -ur ncpfs-2.2.6.orig/sutil/ncpm_common.h ncpfs-2.2.6/sutil/ncpm_common.h ---- ncpfs-2.2.6.orig/sutil/ncpm_common.h 2010-03-03 16:18:59.000000000 -0500 -+++ ncpfs-2.2.6/sutil/ncpm_common.h 2010-03-03 16:17:41.000000000 -0500 -@@ -121,6 +121,9 @@ - int proc_aftermount(const struct ncp_mount_info* info, NWCONN_HANDLE* conn); - int proc_ncpm_umount(const char* dir); - -+void block_sigs(void); -+void unblock_sigs(void); -+ - #define UNUSED(x) x __attribute__((unused)) - - #endif /* __NCPM_COMMON_H__ */ -diff -ur ncpfs-2.2.6.orig/sutil/ncpmount.c ncpfs-2.2.6/sutil/ncpmount.c ---- ncpfs-2.2.6.orig/sutil/ncpmount.c 2010-03-03 16:18:59.000000000 -0500 -+++ ncpfs-2.2.6/sutil/ncpmount.c 2010-03-03 16:17:41.000000000 -0500 -@@ -359,11 +359,17 @@ - usage(); - return -1; - } -+ - realpath(argv[optind], mount_point); - -- if (stat(mount_point, &st) == -1) -+ if (chdir(mount_point)) -+ { -+ errexit(31, _("Could not change directory into mount target %s: %s\n"), -+ mount_point, strerror(errno)); -+ } -+ if (stat(".", &st) == -1) - { -- errexit(31, _("Could not find mount point %s: %s\n"), -+ errexit(31, _("Mount point %s does not exist: %s\n"), - mount_point, strerror(errno)); - } - if (mount_ok(&st) != 0) -@@ -714,7 +720,9 @@ - ncp_close(conn); - - if (!opt_n) { -+ block_sigs(); - add_mnt_entry(mount_name, mount_point, info.flags); -+ unblock_sigs(); - } - return 0; - } -diff -ur ncpfs-2.2.6.orig/sutil/ncpumount.c ncpfs-2.2.6/sutil/ncpumount.c ---- ncpfs-2.2.6.orig/sutil/ncpumount.c 2010-03-03 16:18:59.000000000 -0500 -+++ ncpfs-2.2.6/sutil/ncpumount.c 2010-03-03 16:17:41.000000000 -0500 -@@ -70,13 +70,24 @@ - #include <mntent.h> - #include <pwd.h> - -+#include <sched.h> -+ - #include "private/libintl.h" - - #define _(X) X - -+#ifndef MS_REC -+#define MS_REC 16384 -+#endif -+#ifndef MS_SLAVE -+#define MS_SLAVE (1<<19) -+#endif -+ - static char *progname; - static int is_ncplogout = 0; - -+uid_t uid; -+ - static void - usage(void) - { -@@ -117,6 +128,40 @@ - va_end(ap); - } - -+/* Mostly copied from ncpm_common.c */ -+void block_sigs(void) { -+ -+ sigset_t mask, orig_mask; -+ sigfillset(&mask); -+ sigdelset(&mask, SIGALRM); /* Need SIGALRM for ncpumount */ -+ -+ if(setresuid(0, 0, uid) < 0) { -+ eprintf("Failed to raise privileges.\n"); -+ exit(-1); -+ } -+ -+ if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { -+ eprintf("Blocking signals failed.\n"); -+ exit(-1); -+ } -+} -+ -+void unblock_sigs(void) { -+ -+ sigset_t mask, orig_mask; -+ sigemptyset(&mask); -+ -+ if(setresuid(uid, uid, 0) < 0) { -+ eprintf("Failed to drop privileges.\n"); -+ exit(-1); -+ } -+ -+ if(sigprocmask(SIG_SETMASK, &mask, &orig_mask) < 0) { -+ eprintf("Un-blocking signals failed.\n"); -+ exit(-1); -+ } -+} -+ - static void alarmSignal(int sig) { - (void)sig; - } -@@ -192,10 +237,13 @@ - if (!numEntries) - return 0; /* don't waste time ! */ - -+ block_sigs(); -+ - while ((fd = open(MOUNTED "~", O_RDWR | O_CREAT | O_EXCL, 0600)) == -1) { - struct timespec tm; - - if (errno != EEXIST || retries == 0) { -+ unblock_sigs(); - eprintf(_("Can't get %s~ lock file: %s\n"), MOUNTED, strerror(errno)); - return 1; - } -@@ -206,6 +254,7 @@ - alarm(0); - close(fd); - if (err) { -+ unblock_sigs(); - eprintf(_("Can't lock lock file %s~: %s\n"), MOUNTED, _("Lock timed out")); - return 1; - } -@@ -223,26 +272,205 @@ - err = __clearMtab(mount_points, numEntries); - - if ((unlink(MOUNTED "~") == -1) && (err == 0)){ -+ unblock_sigs(); - eprintf(_("Can't remove %s~"), MOUNTED); - return 1; - } -+ unblock_sigs(); - return err; - } - -+ -+int ncp_mnt_umount(const char *abs_mnt, const char *rel_mnt) -+{ -+ if (umount(rel_mnt) != 0) { -+ eprintf(_("Could not umount %s: %s\n"), -+ abs_mnt, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+ -+static int check_is_mount_child(void *p) -+{ -+ const char **a = p; -+ const char *last = a[0]; -+ const char *mnt = a[1]; -+ int res; -+ const char *procmounts = "/proc/mounts"; -+ int found; -+ FILE *fp; -+ struct mntent *entp; -+ -+ res = mount("", "/", "", MS_SLAVE | MS_REC, NULL); -+ if (res == -1) { -+ eprintf(_("Failed to mark mounts slave: %s\n"), -+ strerror(errno)); -+ return 1; -+ } -+ -+ res = mount(".", "/tmp", "", MS_BIND | MS_REC, NULL); -+ if (res == -1) { -+ eprintf(_("Failed to bind parent to /tmp: %s\n"), -+ strerror(errno)); -+ return 1; -+ } -+ -+ fp = setmntent(procmounts, "r"); -+ if (fp == NULL) { -+ eprintf(_("Failed to open %s: %s\n"), -+ procmounts, strerror(errno)); -+ return 1; -+ } -+ -+ found = 0; -+ while ((entp = getmntent(fp)) != NULL) { -+ if (strncmp(entp->mnt_dir, "/tmp/", 5) == 0 && -+ strcmp(entp->mnt_dir + 5, last) == 0) { -+ found = 1; -+ break; -+ } -+ } -+ endmntent(fp); -+ -+ if (!found) { -+ eprintf(_("%s not mounted\n"), mnt); -+ return 1; -+ } -+ -+ return 0; -+} -+ -+ -+static int check_is_mount(const char *last, const char *mnt) -+{ -+ char buf[131072]; -+ pid_t pid, p; -+ int status; -+ const char *a[2] = { last, mnt }; -+ -+ pid = clone(check_is_mount_child, buf + 65536, CLONE_NEWNS, (void *) a); -+ if (pid == (pid_t) -1) { -+ eprintf(_("Failed to clone namespace: %s\n"), -+ strerror(errno)); -+ return -1; -+ } -+ p = waitpid(pid, &status, __WCLONE); -+ if (p == (pid_t) -1) { -+ eprintf(_("Waitpid failed: %s\n"), -+ strerror(errno)); -+ return -1; -+ } -+ if (!WIFEXITED(status)) { -+ eprintf(_("Child terminated abnormally (status %i)\n"), -+ status); -+ return -1; -+ } -+ if (WEXITSTATUS(status) != 0) -+ return -1; -+ -+ return 0; -+} -+ -+ -+static int chdir_to_parent(char *copy, const char **lastp, int *currdir_fd) -+{ -+ char *tmp; -+ const char *parent; -+ char buf[PATH_MAX]; -+ int res; -+ -+ tmp = strrchr(copy, '/'); -+ if (tmp == NULL || tmp[1] == '\0') { -+ eprintf(_("Internal error: invalid abs path: <%s>\n"), -+ copy); -+ return -1; -+ } -+ if (tmp != copy) { -+ *tmp = '\0'; -+ parent = copy; -+ *lastp = tmp + 1; -+ } else if (tmp[1] != '\0') { -+ *lastp = tmp + 1; -+ parent = "/"; -+ } else { -+ *lastp = "."; -+ parent = "/"; -+ } -+ *currdir_fd = open(".", O_RDONLY); -+ if (*currdir_fd == -1) { -+ eprintf(_("Failed to open current directory: %s\n"), -+ strerror(errno)); -+ return -1; -+ } -+ res = chdir(parent); -+ if (res == -1) { -+ eprintf(_("Failed to chdir to %s: %s\n"), -+ parent, strerror(errno)); -+ return -1; -+ } -+ if (getcwd(buf, sizeof(buf)) == NULL) { -+ eprintf(_("Failed to obtain current directory: %s\n"), -+ strerror(errno)); -+ return -1; -+ } -+ if (strcmp(buf, parent) != 0) { -+ eprintf(_("Mountpoint moved (%s -> %s)\n"), -+ parent, buf); -+ return -1; -+ -+ } -+ -+ return 0; -+} -+ -+ -+static int unmount_ncp(const char *mount_point) -+{ -+ int currdir_fd = -1; -+ char *copy; -+ const char *last; -+ int res; -+ -+ copy = strdup(mount_point); -+ if (copy == NULL) { -+ eprintf(_("Failed to allocate memory\n")); -+ return -1; -+ } -+ res = chdir_to_parent(copy, &last, &currdir_fd); -+ if (res == -1) -+ goto out; -+ res = check_is_mount(last, mount_point); -+ if (res == -1) -+ goto out; -+ res = ncp_mnt_umount(mount_point, last); -+ -+out: -+ free(copy); -+ if (currdir_fd != -1) { -+ fchdir(currdir_fd); -+ close(currdir_fd); -+ } -+ -+ return res; -+} -+ - static int - do_umount(const char *mount_point) - { - int fid = open(mount_point, O_RDONLY, 0); - uid_t mount_uid; -+ int res; - - if (fid == -1) { -- eprintf(_("Could not open %s: %s\n"), -- mount_point, strerror(errno)); -+ eprintf(_("Invalid or unauthorized mountpoint %s\n"), -+ mount_point); - return -1; - } - if (ncp_get_mount_uid(fid, &mount_uid) != 0) { - close(fid); -- eprintf(_("%s probably not ncp-filesystem\n"), -+ eprintf(_("Invalid or unauthorized mountpoint %s\n"), - mount_point); - return -1; - } -@@ -253,12 +481,8 @@ - return -1; - } - close(fid); -- if (umount(mount_point) != 0) { -- eprintf(_("Could not umount %s: %s\n"), -- mount_point, strerror(errno)); -- return -1; -- } -- return 0; -+ res = unmount_ncp(mount_point); -+ return res; - } - - -@@ -409,7 +633,8 @@ - int allConns = 0; - const char *serverName = NULL; - const char *treeName = NULL; -- uid_t uid = getuid(); -+ -+ uid = getuid(); - - progname = strrchr(argv[0], '/'); - if (progname) { diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch deleted file mode 100644 index 050de30b86b0..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-no-suid-root.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Don't install utils as suid root -Author: Bastian Blank <waldi@debian.org> -Bug-Debian: http://bugs.debian.org/692929 - ---- ncpfs-2.2.6.orig/sutil/Makefile.in -+++ ncpfs-2.2.6/sutil/Makefile.in -@@ -51,7 +51,7 @@ all: $(UTILS) - install: all - ${INSTALL} -d $(DESTDIR)$(bindir) - ${INSTALL} -d $(DESTDIR)/sbin -- ${INSTALL} -m 4755 $(UTILS) $(DESTDIR)$(bindir) -+ ${INSTALL} $(UTILS) $(DESTDIR)$(bindir) - ifeq ($(USE_KERNEL),1) - ln -sf $(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncp - ln -sf $(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncpfs - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch deleted file mode 100644 index 2a9e0edd4b22..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-pam_ncp_auth-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c ---- ncpfs-2.2.6.orig/contrib/pam/pam_ncp_auth.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/contrib/pam/pam_ncp_auth.c 2014-08-12 21:02:33.229192251 -0400 -@@ -2534,7 +2534,7 @@ nw_retrieve_nds_user_info(struct nw_user - bailoutctx:; - NWDSFreeContext(ctx); - bailout:; -- if (!err & (ui->qflag & QF_DEBUG)) -+ if ((!err) && (ui->qflag & QF_DEBUG)) - syslog(LOG_NOTICE, "%u %u %s %s %s\n", ui->uid, ui->gid, ui->dir, ui->gecos, ui->shell); - return err; - } diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch deleted file mode 100644 index 22768817045c..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-libncp_atomic-header.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Remove another generated file -Author: Bastian Blank <waldi@debian.org> -Bug-Debian: http://bugs.debian.org/692471 - ---- ncpfs-2.2.6.orig/Makefile.in -+++ ncpfs-2.2.6/Makefile.in -@@ -71,6 +71,7 @@ distclean: - rm -f intl/Makefile po/Makefile po/Makefile.in - rm -f lib/Makefile man/Makefile sutil/Makefile util/Makefile - rm -f include/config.h -+ rm -f include/private/libncp-atomic.h - rm -f include/ncp/ext/socket.h include/ncp/ext/stdint.h - rm -f include/ncp/kernel/fs.h - rm -f include/ncp/kernel/if.h include/ncp/kernel/route.h include/ncp/kernel/types.h - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch deleted file mode 100644 index 40267c728710..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-remove-packed-attrib.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig//include/ncp/ipxlib.h ncpfs-2.2.6//include/ncp/ipxlib.h ---- ncpfs-2.2.6.orig//include/ncp/ipxlib.h 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6//include/ncp/ipxlib.h 2011-02-10 02:38:18.822076000 -0500 -@@ -64,12 +64,12 @@ struct sap_query - struct sap_server_ident - { - u_int16_t server_type __attribute__((packed)); -- char server_name[48] __attribute__((packed)); -+ char server_name[48]; - IPXNet server_network __attribute__((packed)); - #ifdef SWIG - u_int8_t server_node[6] __attribute__((packed)); - #else -- IPXNode server_node __attribute__((packed)); -+ IPXNode server_node; - #endif - IPXPort server_port __attribute__((packed)); - u_int16_t intermediate_network __attribute__((packed)); -@@ -87,7 +87,7 @@ struct ipx_rt_def { - struct ipx_rip_packet - { - u_int16_t operation __attribute__((packed)); -- struct ipx_rt_def rt[1] __attribute__((packed)); -+ struct ipx_rt_def rt[1]; - }; - - #ifdef SWIG -diff -Naurp ncpfs-2.2.6.orig//include/ncp/kernel/ncp.h ncpfs-2.2.6//include/ncp/kernel/ncp.h ---- ncpfs-2.2.6.orig//include/ncp/kernel/ncp.h 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6//include/ncp/kernel/ncp.h 2011-02-10 02:38:18.822076000 -0500 -@@ -53,12 +53,12 @@ - - struct ncp_request_header { - u_int16_t type __attribute__((packed)); -- u_int8_t sequence __attribute__((packed)); -- u_int8_t conn_low __attribute__((packed)); -- u_int8_t task __attribute__((packed)); -- u_int8_t conn_high __attribute__((packed)); -- u_int8_t function __attribute__((packed)); -- u_int8_t data[0] __attribute__((packed)); -+ u_int8_t sequence; -+ u_int8_t conn_low; -+ u_int8_t task; -+ u_int8_t conn_high; -+ u_int8_t function; -+ u_int8_t data[0]; - }; - - #define NCP_REPLY (0x3333) -@@ -66,13 +66,13 @@ struct ncp_request_header { - - struct ncp_reply_header { - u_int16_t type __attribute__((packed)); -- u_int8_t sequence __attribute__((packed)); -- u_int8_t conn_low __attribute__((packed)); -- u_int8_t task __attribute__((packed)); -- u_int8_t conn_high __attribute__((packed)); -- u_int8_t completion_code __attribute__((packed)); -- u_int8_t connection_state __attribute__((packed)); -- u_int8_t data[0] __attribute__((packed)); -+ u_int8_t sequence; -+ u_int8_t conn_low; -+ u_int8_t task; -+ u_int8_t conn_high; -+ u_int8_t completion_code; -+ u_int8_t connection_state; -+ u_int8_t data[0]; - }; - - #define NCP_VOLNAME_LEN (16) -@@ -230,8 +230,8 @@ struct nw_info_struct { - u_int32_t EAKeyCount __attribute__((packed)); - u_int32_t EAKeySize __attribute__((packed)); - u_int32_t NSCreator __attribute__((packed)); -- u_int8_t nameLen __attribute__((packed)); -- u_int8_t entryName[256] __attribute__((packed)); -+ u_int8_t nameLen; -+ u_int8_t entryName[256]; - }; - #endif - -@@ -282,13 +282,13 @@ struct nw_file_info { - int opened; - int access; - u_int32_t server_file_handle __attribute__((packed)); -- u_int8_t open_create_action __attribute__((packed)); -- u_int8_t file_handle[6] __attribute__((packed)); -+ u_int8_t open_create_action; -+ u_int8_t file_handle[6]; - }; - #endif - - struct nw_search_sequence { -- u_int8_t volNumber __attribute__((packed)); -+ u_int8_t volNumber; - u_int32_t dirBase __attribute__((packed)); - u_int32_t sequence __attribute__((packed)); - }; -diff -Naurp ncpfs-2.2.6.orig//include/ncp/ncp.h ncpfs-2.2.6//include/ncp/ncp.h ---- ncpfs-2.2.6.orig//include/ncp/ncp.h 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6//include/ncp/ncp.h 2011-02-10 02:38:18.822076000 -0500 -@@ -95,7 +95,7 @@ struct prop_net_address { - #ifdef SWIG - fixedArray node[IPX_NODE_LEN]; - #else -- u_int8_t node[IPX_NODE_LEN] __attribute__((packed)); -+ u_int8_t node[IPX_NODE_LEN]; - #endif - u_int16_t port __attribute__((packed)); - }; -@@ -163,20 +163,20 @@ struct nw_queue_job_entry { - u_int32_t ClientTask __attribute__((packed)); - u_int32_t ClientObjectID __attribute__((packed)); - u_int32_t TargetServerID __attribute__((packed)); -- u_int8_t TargetExecTime[6] __attribute__((packed)); -- u_int8_t JobEntryTime[6] __attribute__((packed)); -+ u_int8_t TargetExecTime[6]; -+ u_int8_t JobEntryTime[6]; - u_int32_t JobNumber __attribute__((packed)); - u_int16_t JobType __attribute__((packed)); - u_int16_t JobPosition __attribute__((packed)); - u_int16_t JobControlFlags __attribute__((packed)); -- u_int8_t FileNameLen __attribute__((packed)); -- char JobFileName[13] __attribute__((packed)); -+ u_int8_t FileNameLen; -+ char JobFileName[13]; - u_int32_t JobFileHandle __attribute__((packed)); - u_int32_t ServerStation __attribute__((packed)); - u_int32_t ServerTaskNumber __attribute__((packed)); - u_int32_t ServerObjectID __attribute__((packed)); -- char JobTextDescription[50] __attribute__((packed)); -- char ClientRecordArea[152] __attribute__((packed)); -+ char JobTextDescription[50]; -+ char ClientRecordArea[152]; - }; - - struct queue_job { -@@ -217,18 +217,18 @@ struct print_job_record { - }; - #else - struct print_job_record { -- u_int8_t Version __attribute__((packed)); -- u_int8_t TabSize __attribute__((packed)); -+ u_int8_t Version; -+ u_int8_t TabSize; - u_int16_t Copies __attribute__((packed)); - u_int16_t CtrlFlags __attribute__((packed)); - u_int16_t Lines __attribute__((packed)); - u_int16_t Rows __attribute__((packed)); -- char FormName[16] __attribute__((packed)); -- u_int8_t Reserved[6] __attribute__((packed)); -- char BannerName[13] __attribute__((packed)); -- char FnameBanner[13] __attribute__((packed)); -- char FnameHeader[14] __attribute__((packed)); -- char Path[80] __attribute__((packed)); -+ char FormName[16]; -+ u_int8_t Reserved[6]; -+ char BannerName[13]; -+ char FnameBanner[13]; -+ char FnameHeader[14]; -+ char Path[80]; - }; - #endif - -diff -Naurp ncpfs-2.2.6.orig//include/ncp/ncplib.h ncpfs-2.2.6//include/ncp/ncplib.h ---- ncpfs-2.2.6.orig//include/ncp/ncplib.h 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6//include/ncp/ncplib.h 2011-02-10 02:38:18.822076000 -0500 -@@ -462,24 +462,24 @@ struct ncp_file_server_info - #else - struct ncp_file_server_info - { -- u_int8_t ServerName[48] __attribute__((packed)); -- u_int8_t FileServiceVersion __attribute__((packed)); -- u_int8_t FileServiceSubVersion __attribute__((packed)); -+ u_int8_t ServerName[48]; -+ u_int8_t FileServiceVersion; -+ u_int8_t FileServiceSubVersion; - u_int16_t MaximumServiceConnections __attribute__((packed)); - u_int16_t ConnectionsInUse __attribute__((packed)); - u_int16_t NumberMountedVolumes __attribute__((packed)); -- u_int8_t Revision __attribute__((packed)); -- u_int8_t SFTLevel __attribute__((packed)); -- u_int8_t TTSLevel __attribute__((packed)); -+ u_int8_t Revision; -+ u_int8_t SFTLevel; -+ u_int8_t TTSLevel; - u_int16_t MaxConnectionsEverUsed __attribute__((packed)); -- u_int8_t AccountVersion __attribute__((packed)); -- u_int8_t VAPVersion __attribute__((packed)); -- u_int8_t QueueVersion __attribute__((packed)); -- u_int8_t PrintVersion __attribute__((packed)); -- u_int8_t VirtualConsoleVersion __attribute__((packed)); -- u_int8_t RestrictionLevel __attribute__((packed)); -- u_int8_t InternetBridge __attribute__((packed)); -- u_int8_t Reserved[60] __attribute__((packed)); -+ u_int8_t AccountVersion; -+ u_int8_t VAPVersion; -+ u_int8_t QueueVersion; -+ u_int8_t PrintVersion; -+ u_int8_t VirtualConsoleVersion; -+ u_int8_t RestrictionLevel; -+ u_int8_t InternetBridge; -+ u_int8_t Reserved[60]; - }; - #endif - -@@ -592,7 +592,7 @@ struct ncp_station_addr - #ifdef SWIG - fixedArray Node[6]; - #else -- u_int8_t Node[6] __attribute__((packed)); -+ u_int8_t Node[6]; - #endif - u_int16_t Socket __attribute__((packed)); - }; -@@ -602,32 +602,32 @@ struct ncp_prop_login_control - #ifdef SWIG - fixedArray AccountExpireDate[3]; - #else -- u_int8_t AccountExpireDate[3] __attribute__((packed)); -+ u_int8_t AccountExpireDate[3]; - #endif -- u_int8_t Disabled __attribute__((packed)); -+ u_int8_t Disabled; - #ifdef SWIG - fixedArray PasswordExpireDate[3]; - #else -- u_int8_t PasswordExpireDate[3] __attribute__((packed)); -+ u_int8_t PasswordExpireDate[3]; - #endif -- u_int8_t GraceLogins __attribute__((packed)); -+ u_int8_t GraceLogins; - u_int16_t PasswordExpireInterval __attribute__((packed)); -- u_int8_t MaxGraceLogins __attribute__((packed)); -- u_int8_t MinPasswordLength __attribute__((packed)); -+ u_int8_t MaxGraceLogins; -+ u_int8_t MinPasswordLength; - u_int16_t MaxConnections __attribute__((packed)); - #ifdef SWIG - fixedArray ConnectionTimeMask[42] __attribute__((packed)); - fixedArray LastLogin[6] __attribute__((packed)); - #else -- u_int8_t ConnectionTimeMask[42] __attribute__((packed)); -- u_int8_t LastLogin[6] __attribute__((packed)); -+ u_int8_t ConnectionTimeMask[42]; -+ u_int8_t LastLogin[6]; - #endif -- u_int8_t RestrictionMask __attribute__((packed)); -- u_int8_t reserved __attribute__((packed)); -+ u_int8_t RestrictionMask; -+ u_int8_t reserved; - u_int32_t MaxDiskUsage __attribute__((packed)); - u_int16_t BadLoginCount __attribute__((packed)); - u_int32_t BadLoginCountDown __attribute__((packed)); -- struct ncp_station_addr LastIntruder __attribute__((packed)); -+ struct ncp_station_addr LastIntruder; - }; - - NWCCODE NWReadPropertyValue(NWCONN_HANDLE conn, const char *objName, -diff -Naurp ncpfs-2.2.6.orig//ipx-1.0/ipx_cmd.c ncpfs-2.2.6//ipx-1.0/ipx_cmd.c ---- ncpfs-2.2.6.orig//ipx-1.0/ipx_cmd.c 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6//ipx-1.0/ipx_cmd.c 2011-02-10 02:40:19.222076002 -0500 -@@ -63,8 +63,8 @@ - /* we are doing EthernetII... Any objections? */ - struct { - u_int16_t unknown __attribute__((packed)); -- u_int8_t dst[6] __attribute__((packed)); -- u_int8_t src[6] __attribute__((packed)); -+ u_int8_t dst[6]; -+ u_int8_t src[6]; - u_int16_t type __attribute__((packed)); - u_int8_t ipx[16384]; - } buffer; -diff -Naurp ncpfs-2.2.6.orig//lib/ncplib.c ncpfs-2.2.6//lib/ncplib.c ---- ncpfs-2.2.6.orig//lib/ncplib.c 2011-02-10 02:38:05.000000000 -0500 -+++ ncpfs-2.2.6//lib/ncplib.c 2011-02-10 02:38:18.822076000 -0500 -@@ -2584,13 +2584,13 @@ ncp_request(struct ncp_conn *conn, int f - - struct nw_time_buffer - { -- u_int8_t year __attribute__((packed)); -- u_int8_t month __attribute__((packed)); -- u_int8_t day __attribute__((packed)); -- u_int8_t hour __attribute__((packed)); -- u_int8_t minute __attribute__((packed)); -- u_int8_t second __attribute__((packed)); -- u_int8_t wday __attribute__((packed)); -+ u_int8_t year; -+ u_int8_t month; -+ u_int8_t day; -+ u_int8_t hour; -+ u_int8_t minute; -+ u_int8_t second; -+ u_int8_t wday; - }; - - static time_t diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch deleted file mode 100644 index 3e96aac5b364..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-servername-array-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naurp ncpfs-2.2.6.orig/include/ncp/ncplib.h ncpfs-2.2.6/include/ncp/ncplib.h ---- ncpfs-2.2.6.orig/include/ncp/ncplib.h 2005-01-27 12:35:59.000000000 -0500 -+++ ncpfs-2.2.6/include/ncp/ncplib.h 2014-08-12 21:01:01.159192798 -0400 -@@ -485,9 +485,9 @@ struct ncp_file_server_info - - struct ncp_file_server_info_2 { - #ifdef SWIG -- fixedArray ServerName[49]; -+ fixedArray ServerName[50]; - #else -- u_int8_t ServerName[49]; -+ u_int8_t ServerName[50]; - #endif - u_int8_t FileServiceVersion; - u_int8_t FileServiceSubVersion; diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch deleted file mode 100644 index 648cb8f7f770..000000000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-zend_function_entry.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/contrib/php/php_auth_nds.c -+++ b/contrib/php/php_auth_nds.c -@@ -1102,7 +1102,7 @@ - php_info_print_table_end(); - } - --function_entry auth_nds_functions[] = { -+zend_function_entry auth_nds_functions[] = { - PHP_FE(auth_bindery, NULL) - PHP_FE(auth_nds, NULL) - PHP_FE(auth_tree, NULL) diff --git a/net-fs/ncpfs/metadata.xml b/net-fs/ncpfs/metadata.xml deleted file mode 100644 index 494dcfa44647..000000000000 --- a/net-fs/ncpfs/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>kumba@gentoo.org</email> - <name>Joshua Kinard</name> - </maintainer> - <longdescription>Provides Access to Netware services using the NCP protocol (Kernel support must be activated!)</longdescription> -</pkgmetadata> diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild deleted file mode 100644 index f66a06347b88..000000000000 --- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils pam - -DESCRIPTION="Provides Access to Netware services using the NCP protocol" -HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/" -SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ppc ppc64 x86" -IUSE="nls pam php" - -DEPEND="nls? ( sys-devel/gettext ) - pam? ( virtual/pam ) - php? ( || ( dev-lang/php virtual/httpd-php ) )" - -RDEPEND="${DEPEND}" - -src_prepare() { - # Add patch for PHP extension sandbox violation - epatch "${FILESDIR}"/${PN}-2.2.5-php.patch - epatch "${FILESDIR}"/${P}-gcc4.patch - epatch "${FILESDIR}"/${P}-missing-includes.patch - - # Add a patch to fix multiple vulnerabilities. - # CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791. - # http://seclists.org/fulldisclosure/2010/Mar/122 - epatch "${FILESDIR}"/${P}-multiple-vulns.patch - - # Add a patch that removes the __attribute__((packed)); directive - # from several struct members in include/ncp/ncplib.h. This will - # cut down on a large number of compile warnings generated by modern - # gcc releases. - epatch "${FILESDIR}"/${P}-remove-packed-attrib.patch - - # Misc patches borrowed from Mageia. - epatch "${FILESDIR}"/${P}-align-fix.patch - epatch "${FILESDIR}"/${P}-getuid-fix.patch - epatch "${FILESDIR}"/${P}-pam_ncp_auth-fix.patch - epatch "${FILESDIR}"/${P}-servername-array-fix.patch - - # Misc patches borrowed from Debian. - # Fixes Bug #497278 - epatch "${FILESDIR}"/${P}-drop-kernel-check.patch - epatch "${FILESDIR}"/${P}-drop-mtab-support.patch - epatch "${FILESDIR}"/${P}-no-suid-root.patch - epatch "${FILESDIR}"/${P}-remove-libncp_atomic-header.patch - - # Bug #273484. - sed -i '/ldconfig/d' lib/Makefile.in - - # Support LDFLAGS. - epatch "${FILESDIR}"/${P}-ldflags-support.patch - - # Bug 446696. This might need re-diffing if additional Makefile - # fixes are added. - epatch "${FILESDIR}"/${P}-makefile-fix-soname-link.patch - - # bug 522444 - epatch "${FILESDIR}"/${P}-zend_function_entry.patch -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam pam "$(getpam_mod_dir)") \ - $(use_enable php) -} - -src_install() { - dodir $(getpam_mod_dir) /usr/sbin /sbin - - # Bug #446696. - #ln -s "${D}"/usr/lib64/libncp.so.2.3 "${D}"/libncp.so.2.3.0 - - # Install the main programs, then the headers. - emake DESTDIR="${D}" install || die - emake DESTDIR="${D}" install-dev || die - - # Install a startup script in /etc/init.d and a conf file in /etc/conf.d - newconfd "${FILESDIR}"/ipx.confd ipx - newinitd "${FILESDIR}"/ipx.init ipx - - # Docs - dodoc FAQ README -} diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild deleted file mode 100644 index 481e43c3474f..000000000000 --- a/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam - -DESCRIPTION="Provides access to Netware services using the NCP protocol" -HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/" -SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" -IUSE="nls pam php" - -DEPEND=" - nls? ( sys-devel/gettext ) - pam? ( virtual/pam ) - php? ( || ( dev-lang/php:* virtual/httpd-php:* ) )" - -RDEPEND="${DEPEND}" - -MY_PATCHES=( - # PHP extension sandbox violation. - "${FILESDIR}"/${PN}-2.2.5-php.patch - "${FILESDIR}"/${P}-gcc4.patch - "${FILESDIR}"/${P}-missing-includes.patch - - # Add a patch to fix multiple vulnerabilities. - # CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791. - # http://seclists.org/fulldisclosure/2010/Mar/122 - "${FILESDIR}"/${P}-multiple-vulns.patch - - # Add a patch that removes the __attribute__((packed)); directive - # from several struct members in include/ncp/ncplib.h. This will - # cut down on a large number of compile warnings generated by modern - # gcc releases. - "${FILESDIR}"/${P}-remove-packed-attrib.patch - - # Misc patches borrowed from Mageia. - "${FILESDIR}"/${P}-align-fix.patch - "${FILESDIR}"/${P}-getuid-fix.patch - "${FILESDIR}"/${P}-pam_ncp_auth-fix.patch - "${FILESDIR}"/${P}-servername-array-fix.patch - - # Misc patches borrowed from Debian. - # Fixes Bug #497278 - "${FILESDIR}"/${P}-drop-kernel-check.patch - "${FILESDIR}"/${P}-drop-mtab-support.patch - "${FILESDIR}"/${P}-no-suid-root.patch - "${FILESDIR}"/${P}-remove-libncp_atomic-header.patch - - # Support LDFLAGS. - "${FILESDIR}"/${P}-ldflags-support.patch - - # Bug 446696. This might need re-diffing if additional Makefile - # fixes are added. - "${FILESDIR}"/${P}-makefile-fix-soname-link.patch - - # bug 522444 - "${FILESDIR}"/${P}-zend_function_entry.patch -) - -DOCS=( FAQ README ) - -src_prepare() { - default - - # Bug #273484. - sed -i '/ldconfig/d' lib/Makefile.in || die - - epatch "${MY_PATCHES[@]}" -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam pam "$(getpam_mod_dir)") \ - $(use_enable php) -} - -src_install() { - dodir $(getpam_mod_dir) /usr/sbin /sbin - - # Install main software and headers. - emake DESTDIR="${D}" install - emake DESTDIR="${D}" install-dev - - # Install a startup script in /etc/init.d and a conf file in /etc/conf.d - newconfd "${FILESDIR}"/ipx.confd ipx - newinitd "${FILESDIR}"/ipx.init ipx - - einstalldocs -} diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild deleted file mode 100644 index a024decda07f..000000000000 --- a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam - -DESCRIPTION="Provides access to Netware services using the NCP protocol" -HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/" -SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86" -IUSE="nls pam" - -DEPEND=" - nls? ( sys-devel/gettext ) - pam? ( virtual/pam )" - -RDEPEND="${DEPEND}" - -PATCHES=( - # Build fixes. - "${FILESDIR}"/${P}-gcc4.patch - "${FILESDIR}"/${P}-missing-includes.patch - - # Add a patch to fix multiple vulnerabilities. - # CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791. - # http://seclists.org/fulldisclosure/2010/Mar/122 - "${FILESDIR}"/${P}-multiple-vulns.patch - - # Add a patch that removes the __attribute__((packed)); directive - # from several struct members in include/ncp/ncplib.h. This will - # cut down on a large number of compile warnings generated by modern - # gcc releases. - "${FILESDIR}"/${P}-remove-packed-attrib.patch - - # Misc patches borrowed from Mageia. - "${FILESDIR}"/${P}-align-fix.patch - "${FILESDIR}"/${P}-getuid-fix.patch - "${FILESDIR}"/${P}-pam_ncp_auth-fix.patch - "${FILESDIR}"/${P}-servername-array-fix.patch - - # Misc patches borrowed from Debian. - # Fixes Bug #497278 - "${FILESDIR}"/${P}-drop-kernel-check.patch - "${FILESDIR}"/${P}-drop-mtab-support.patch - "${FILESDIR}"/${P}-no-suid-root.patch - "${FILESDIR}"/${P}-remove-libncp_atomic-header.patch - - # Support LDFLAGS. - "${FILESDIR}"/${P}-ldflags-support.patch - - # Bug 446696. This might need re-diffing if additional Makefile - # fixes are added. - "${FILESDIR}"/${P}-makefile-fix-soname-link.patch -) - -DOCS=( FAQ README ) - -src_prepare() { - # Bug #273484. - sed -i '/ldconfig/d' lib/Makefile.in || die - - default -} - -src_configure() { - # PHP integration no longer supported in Gentoo, per Bug #582516. - econf \ - $(use_enable nls) \ - $(use_enable pam pam "$(getpam_mod_dir)") \ - --disable-php -} - -src_install() { - dodir $(getpam_mod_dir) /usr/sbin /sbin - - # Install main software and headers. - emake DESTDIR="${D}" install - emake DESTDIR="${D}" install-dev - - # Install a startup script in /etc/init.d and a conf file in /etc/conf.d - newconfd "${FILESDIR}"/ipx.confd ipx - newinitd "${FILESDIR}"/ipx.init ipx - - einstalldocs -} diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest index 2672236988fc..fed37e954ab4 100644 --- a/net-fs/netatalk/Manifest +++ b/net-fs/netatalk/Manifest @@ -1,2 +1 @@ -DIST netatalk-3.1.10.tar.bz2 1811929 BLAKE2B 9249b6e32ae8a5c3cefd461e182fa4972c3b65c19cc8f25f3eeaa00b8f2694ee2e03d1adf702e59a7a8da5d3f53d047c18f99a13bbfbc6d4b29b888ee20f1906 SHA512 dd1f49307b5298a784e2b487c0da94459632bab8353cf505cd4b104f4c0b55bbb77caf73e8b4c60af64018b345df78337accac3b5ed6cb5620309b163a86d32b -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.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 75b09776908d..263e2e0c82d3 100644 --- a/net-fs/netatalk/metadata.xml +++ b/net-fs/netatalk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <use> @@ -7,7 +7,6 @@ <flag name="quota">Add support for user quota on various filesystems</flag> <flag name="shadow">Add shadow support</flag> <flag name="tracker">Add support for spotlight like tracker</flag> - <flag name="utils">Install afpstats script</flag> <flag name="ssl"> Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access Modules. These are not used with most recent versions of OS X @@ -16,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.10.ebuild b/net-fs/netatalk/netatalk-3.1.10.ebuild deleted file mode 100644 index 60690c4d7c87..000000000000 --- a/net-fs/netatalk/netatalk-3.1.10.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils eapi7-ver flag-o-matic multilib pam python-r1 systemd versionator - -DESCRIPTION="Open Source AFP server" -HOMEPAGE="http://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2" - -LICENSE="GPL-2 BSD" -SLOT="0/17.0" -KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd" -IUSE="acl cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf" - -CDEPEND=" - !app-editors/yudit - dev-libs/libevent:0= - >=dev-libs/libgcrypt-1.2.3:0 - sys-apps/coreutils - >=sys-libs/db-4.2.52:= - sys-libs/tdb - acl? ( - sys-apps/attr - sys-apps/acl - ) - cracklib? ( sys-libs/cracklib ) - dbus? ( sys-apps/dbus dev-libs/dbus-glib ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) - ssl? ( dev-libs/openssl:0 ) - tcpd? ( sys-apps/tcp-wrappers ) - tracker? ( app-misc/tracker ) - utils? ( ${PYTHON_DEPS} ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${CDEPEND} - utils? ( - dev-lang/perl - dev-python/dbus-python[${PYTHON_USEDEP}] - )" -DEPEND="${CDEPEND} - virtual/yacc - sys-devel/flex" - -RESTRICT="test" - -REQUIRED_USE=" - ldap? ( acl ) - tracker? ( dbus ) - utils? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.7-gentoo.patch - "${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350 -) - -src_prepare() { - if ! use utils; then - sed \ - -e "s:shell_utils::g" \ - -i contrib/Makefile.am || die - fi - autotools-utils_src_prepare -} - -src_configure() { - local myeconfargs=() - - append-flags -fno-strict-aliasing - - # 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 - 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) - $(use_enable zeroconf) - $(use_with acl acls) - $(use_with cracklib) - $(use_with dbus afpstats) - $(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) - --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} - --disable-silent-rules - --with-init-style=gentoo-openrc - --without-libevent - --without-tdb - --with-lockfile=/run/lock/${PN} - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - if use zeroconf; then - sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die - else - sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die - fi - - # The pamd file isn't what we need, use pamd_mimic_system - rm -rf "${ED}/etc/pam.d" || die - pamd_mimic_system netatalk auth account password session - - sed \ - -e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \ - -e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \ - distrib/initscripts/service.systemd.tmpl \ - > "${T}"/service.systemd || die - systemd_newunit "${T}"/service.systemd ${PN}.service - - use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats -} - -pkg_postinst() { - local fle v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 3 ${v}; then - for fle in afp_signature.conf afp_voluuid.conf; do - if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then - if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then - mv \ - "${ROOT}"etc/netatalk/${fle} \ - "${ROOT}"var/lib/netatalk/ - fi - fi - done - - echo "" - elog "Starting from version 3.0 only uses a single init script again" - elog "Please update your runlevels accordingly" - echo "" - elog "Dependencies should be resolved automatically depending on settings" - elog "but please report issues with this on https://bugs.gentoo.org/ if" - elog "you find any." - echo "" - elog "Following config files are obsolete now:" - elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf" - elog "in favour of" - elog "/etc/afp.conf" - echo "" - elog "Please convert your existing configs before you restart your daemon" - echo "" - elog "The new AppleDouble default backend is appledouble = ea" - elog "Existing entries will be updated on access, but can do an offline" - elog "conversion with" - elog "dbd -ruve /path/to/Volume" - echo "" - elog "For general notes on the upgrade, please visit" - elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html" - echo "" - break - fi - done -} diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.18.ebuild index 472a18240ee4..5d5a3fcf8c37 100644 --- a/net-fs/netatalk/netatalk-3.1.12.ebuild +++ b/net-fs/netatalk/netatalk-3.1.18.ebuild @@ -1,30 +1,27 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python2_7 ) - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools flag-o-matic multilib pam python-r1 systemd +inherit autotools flag-o-matic pam systemd DESCRIPTION="Open Source AFP server" -HOMEPAGE="http://netatalk.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2" +HOMEPAGE="https://netatalk.sourceforge.net/" +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 ~x86-fbsd" -IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf" +KEYWORDS="amd64 arm ~ppc ~ppc64 x86" +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 + virtual/libcrypt:= acl? ( sys-apps/attr sys-apps/acl @@ -32,44 +29,38 @@ CDEPEND=" cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) + ldap? ( net-nds/openldap:= ) + pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) - tracker? ( app-misc/tracker ) - utils? ( ${PYTHON_DEPS} ) + tracker? ( app-misc/tracker:3= ) zeroconf? ( net-dns/avahi[dbus] ) " -RDEPEND="${CDEPEND} - utils? ( - dev-lang/perl - dev-python/dbus-python[${PYTHON_USEDEP}] - )" -DEPEND="${CDEPEND} - virtual/yacc - sys-devel/flex" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex +" RESTRICT="test" REQUIRED_USE=" ldap? ( acl ) - tracker? ( dbus ) - utils? ( ${PYTHON_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.17-gentoo.patch + "${FILESDIR}"/${PN}-3.1.17-disable-ld-library-path.patch # bug #564350 ) src_prepare() { default append-flags -fno-strict-aliasing - if ! use utils; then - sed \ - -e "s:shell_utils::g" \ - -i contrib/Makefile.am || die - fi + sed \ + -e "s:shell_utils::g" \ + -i contrib/Makefile.am || die + eautoreconf } @@ -79,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) @@ -92,42 +82,41 @@ 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} - --disable-silent-rules --with-init-style=gentoo-openrc - --without-libevent --without-tdb --with-lockfile=/run/lock/${PN} ) - econf ${myeconfargs[@]} + + econf "${myeconfargs[@]}" } src_install() { default if use zeroconf; then - sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die + sed -i -e '/avahi-daemon/s:use:need:g' "${ED}"/etc/init.d/${PN} || die else - sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die + sed -i -e '/avahi-daemon/d' "${ED}"/etc/init.d/${PN} || die fi # The pamd file isn't what we need, use pamd_mimic_system rm -rf "${ED}/etc/pam.d" || die - pamd_mimic_system netatalk auth account password session + + if use pam; then + pamd_mimic_system netatalk auth account password session + fi sed \ -e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \ @@ -136,7 +125,8 @@ src_install() { > "${T}"/service.systemd || die systemd_newunit "${T}"/service.systemd ${PN}.service - use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats + # no static archives + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { @@ -144,38 +134,38 @@ pkg_postinst() { for v in ${REPLACING_VERSIONS}; do if [[ $(ver_test ${v} -lt 3) ]]; then for fle in afp_signature.conf afp_voluuid.conf; do - if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then - if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then + if [[ -f "${ROOT}"/etc/netatalk/${fle} ]]; then + if [[ ! -f "${ROOT}"/var/lib/netatalk/${fle} ]]; then mv \ - "${ROOT}"etc/netatalk/${fle} \ - "${ROOT}"var/lib/netatalk/ + "${ROOT}"/etc/netatalk/${fle} \ + "${ROOT}"/var/lib/netatalk/ fi fi done - echo "" + elog elog "Starting from version 3.0 only uses a single init script again" elog "Please update your runlevels accordingly" - echo "" + elog elog "Dependencies should be resolved automatically depending on settings" elog "but please report issues with this on https://bugs.gentoo.org/ if" elog "you find any." - echo "" + elog elog "Following config files are obsolete now:" elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf" elog "in favour of" elog "/etc/afp.conf" - echo "" + elog elog "Please convert your existing configs before you restart your daemon" - echo "" + elog elog "The new AppleDouble default backend is appledouble = ea" elog "Existing entries will be updated on access, but can do an offline" elog "conversion with" elog "dbd -ruve /path/to/Volume" - echo "" + elog elog "For general notes on the upgrade, please visit" elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html" - echo "" + elog break fi done diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index ec46a4b5e435..d340d6b46336 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,3 +1 @@ -DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba -DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5 -DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540 +DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533 diff --git a/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch b/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc74d2..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch deleted file mode 100644 index 7317115a0e18..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch +++ /dev/null @@ -1,48 +0,0 @@ -this is kind of hacky, but automake doesn't make this easy -for us atm, so hack away :( - -(recent autotools will always add $(CFLAGS)/etc... to the compile) - ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,12 +1,11 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = testlk - testlk_SOURCES = testlk.c --testlk_CFLAGS=$(CFLAGS_FOR_BUILD) --testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) --testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,7 +1,9 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = rpcgen - rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ -@@ -9,10 +11,6 @@ - rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ - rpc_scan.h rpc_util.h - --rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) --rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) --rpcgen_LDADD=$(LIBTIRPC) - - MAINTAINERCLEANFILES = Makefile.in - - EXTRA_DIST = rpcgen.new.1 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch deleted file mode 100644 index b322b6fb17ce..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch +++ /dev/null @@ -1,105 +0,0 @@ -Required for successful build on musl -https://bugs.gentoo.org/651080#c5 - -Thanks-to: Robert Bridge <robert@robbieab.com> - ---- nfs-utils-2.3.1/support/export/export.c -+++ nfs-utils-2.3.1/support/export/export.c -@@ -17,6 +17,7 @@ - #include <stdlib.h> - #include <dirent.h> - #include <errno.h> -+#include <limits.h> - #include "xmalloc.h" - #include "nfslib.h" - #include "exportfs.h" ---- nfs-utils-2.3.1/support/export/xtab.c -+++ nfs-utils-2.3.1/support/export/xtab.c -@@ -18,6 +18,7 @@ - #include <sys/stat.h> - #include <errno.h> - #include <libgen.h> -+#include <limits.h> - - #include "nfslib.h" - #include "exportfs.h" ---- nfs-utils-2.3.1/support/misc/file.c -+++ nfs-utils-2.3.1/support/misc/file.c -@@ -27,6 +27,7 @@ - #include <dirent.h> - #include <stdlib.h> - #include <stdbool.h> -+#include <limits.h> - - #include "xlog.h" - #include "misc.h" ---- nfs-utils-2.3.1/support/nfs/xcommon.c -+++ nfs-utils-2.3.1/support/nfs/xcommon.c -@@ -16,6 +16,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - - #include "xcommon.h" - #include "nls.h" /* _() */ ---- nfs-utils-2.3.1/support/nsm/file.c -+++ nfs-utils-2.3.1/support/nsm/file.c -@@ -85,6 +85,7 @@ - #include <fcntl.h> - #include <dirent.h> - #include <grp.h> -+#include <limits.h> - - #include "xlog.h" - #include "nsm.h" ---- nfs-utils-2.3.1/utils/blkmapd/device-discovery.c -+++ nfs-utils-2.3.1/utils/blkmapd/device-discovery.c -@@ -49,6 +49,7 @@ - #include <unistd.h> - #include <libgen.h> - #include <errno.h> -+#include <limits.h> - #include <libdevmapper.h> - - #ifdef HAVE_CONFIG_H ---- nfs-utils-2.3.1/utils/gssd/krb5_util.c -+++ nfs-utils-2.3.1/utils/gssd/krb5_util.c -@@ -120,6 +120,7 @@ - #endif - #include <krb5.h> - #include <rpc/auth_gss.h> -+#include <limits.h> - - #include "gssd.h" - #include "err_util.h" ---- nfs-utils-2.3.1/utils/mountd/cache.c -+++ nfs-utils-2.3.1/utils/mountd/cache.c -@@ -26,6 +26,7 @@ - #include <pwd.h> - #include <grp.h> - #include <mntent.h> -+#include <limits.h> - #include "misc.h" - #include "nfslib.h" - #include "exportfs.h" ---- nfs-utils-2.3.1/utils/mountd/mountd.c -+++ nfs-utils-2.3.1/utils/mountd/mountd.c -@@ -22,6 +22,7 @@ - #include <fcntl.h> - #include <sys/resource.h> - #include <sys/wait.h> -+#include <limits.h> - - #include "conffile.h" - #include "xmalloc.h" ---- nfs-utils-2.3.1/utils/mountd/rmtab.c -+++ nfs-utils-2.3.1/utils/mountd/rmtab.c -@@ -16,6 +16,7 @@ - #include <netinet/in.h> - #include <arpa/inet.h> - #include <netdb.h> -+#include <limits.h> - - #include "misc.h" - #include "exportfs.h" diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch deleted file mode 100644 index f13f07a4c81f..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 28 May 2018 12:13:10 +0200 -Subject: [PATCH] Fix undefined references and bad include when build with - junction support - ---- - support/junction/Makefile.am | 2 +- - utils/nfsref/Makefile.am | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am -index 97e7426..89cb532 100644 ---- a/support/junction/Makefile.am -+++ b/support/junction/Makefile.am -@@ -31,4 +31,4 @@ libjunction_la_SOURCES = display.c export-cache.c junction.c \ - - MAINTAINERCLEANFILES = Makefile.in - --AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 -+AM_CPPFLAGS = -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@ -diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am -index 2b2bb53..a652b03 100644 ---- a/utils/nfsref/Makefile.am -+++ b/utils/nfsref/Makefile.am -@@ -27,13 +27,13 @@ noinst_HEADERS = nfsref.h - - sbin_PROGRAMS = nfsref - nfsref_SOURCES = add.c lookup.c nfsref.c remove.c --LDADD = $(LIBXML2) $(LIBCAP) \ -- ../../support/nfs/libnfs.la \ -+LIBS += $(LIBXML2) $(LIBCAP) -+LDADD = ../../support/nfs/libnfs.la \ - ../../support/junction/libjunction.la - - man8_MANS = nfsref.man - - MAINTAINERCLEANFILES = Makefile.in - --AM_CPPFLAGS = -I. -I../../support/include -+AM_CPPFLAGS = -I. -I../../support/include @TIRPC_CFLAGS@ - ##AM_LDFLAGS = -Wl,--as-needed --- -2.17.0 - diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch deleted file mode 100644 index d06fc4ce8b8b..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://bugs.gentoo.org/656984 - -Don't build with -Werror flags. - ---- a/configure.ac -+++ b/configure.ac -@@ -544,45 +544,11 @@ - AC_SUBST(LDFLAGS_FOR_BUILD) - - my_am_cflags="\ -- -pipe \ - -Wall \ - -Wextra \ -- -Werror=strict-prototypes \ -- -Werror=missing-prototypes \ -- -Werror=missing-declarations \ -- -Werror=format=2 \ -- -Werror=undef \ -- -Werror=missing-include-dirs \ -- -Werror=strict-aliasing=2 \ -- -Werror=init-self \ -- -Werror=implicit-function-declaration \ -- -Werror=return-type \ -- -Werror=switch \ -- -Werror=overflow \ -- -Werror=parentheses \ -- -Werror=aggregate-return \ -- -Werror=unused-result \ - -fno-strict-aliasing \ - " -- --AC_DEFUN([CHECK_CCSUPPORT], [ -- my_save_cflags="$CFLAGS" -- CFLAGS=$1 -- AC_MSG_CHECKING([whether CC supports $1]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], -- [AC_MSG_RESULT([yes])] -- [$2+=$1], -- [AC_MSG_RESULT([no])] -- ) -- CFLAGS="$my_save_cflags" --]) -- --CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) --CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) --CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3]) --CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4]) -- --AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"]) -+AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) - - # Make sure that $ACLOCAL_FLAGS are used during a rebuild - AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch deleted file mode 100644 index 787a96fe89d8..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4f91877bb313a35ade44d9dde1fd219035ba1fd9 Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt <ps@pks.im> -Date: Wed, 27 Feb 2019 11:58:47 -0500 -Subject: [PATCH] configure.ac: more carefully detect availability of - res_querydomain(3) - -Since glibc 2.2, the function res_querydomain(3) is implemented as a -define to `__res_querydomain`. Due to this implementation detail, using -`AC_CHECK_LIB` with a symbol name of "res_querydomain" will cause a -linking failure and thus fail to detect its availability. This is why -right now, we try to detect availability of `__res_querydomain` instead. - -Unfortunately, this may break on other platforms where there is no -`__res_querydomain` but only the function without leading underscores. -To fix this, we can perform another `AC_CHECK_LIB([resolv], -[res_querydomain], ...)` call in case where the other one was not found -and only raise an error if both symbols weren't found. - -Signed-off-by: Patrick Steinhardt <ps@pks.im> -Signed-off-by: Steve Dickson <steved@redhat.com> ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4bf5aea..cb9d921 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -411,7 +411,8 @@ if test "$enable_gss" = yes; then - fi - - dnl libdnsidmap specific checks --AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) -+AC_CHECK_LIB([resolv], [__res_querydomain], , -+ AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))) - - AC_ARG_ENABLE([ldap], - [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) --- -1.8.3.1 - diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch index 7fc0dd1c7249..a7226db24920 100644 --- a/net-fs/nfs-utils/files/nfs-utils-2.3.4-no-werror.patch +++ b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch @@ -1,6 +1,6 @@ -From 04c9e3cc26dd330d9cb524c02de610c3bccd4b7b Mon Sep 17 00:00:00 2001 +From 6ab8c7c186bd4a547a0ca435ecabe10ee50039c5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 11 May 2019 22:51:35 +0200 +Date: Thu, 22 Oct 2020 19:44:34 +0200 Subject: [PATCH] Don't build with -Werror flags https://bugs.gentoo.org/656984 @@ -11,10 +11,10 @@ Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac -index 4d70961..e6e709c 100644 +index 50847d8a..6bc18e93 100644 --- a/configure.ac +++ b/configure.ac -@@ -574,46 +574,14 @@ AC_SUBST(CPPFLAGS_FOR_BUILD) +@@ -631,47 +631,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD) AC_SUBST(LDFLAGS_FOR_BUILD) my_am_cflags="\ @@ -36,13 +36,12 @@ index 4d70961..e6e709c 100644 - -Werror=parentheses \ - -Werror=aggregate-return \ - -Werror=unused-result \ - -Wno-cast-function-type \ -fno-strict-aliasing \ " -AC_DEFUN([CHECK_CCSUPPORT], [ - my_save_cflags="$CFLAGS" -- CFLAGS=$1 +- CFLAGS="-Werror $1" - AC_MSG_CHECKING([whether CC supports $1]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes])] @@ -56,12 +55,14 @@ index 4d70961..e6e709c 100644 -CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) -CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3]) -CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4]) -- --AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"]) +-CHECK_CCSUPPORT([-Wno-cast-function-type], [flg5]) + AX_GCC_FUNC_ATTRIBUTE([format]) + +-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4 $flg5"]) +AC_SUBST([AM_CFLAGS], ["$my_am_cflags"]) # Make sure that $ACLOCAL_FLAGS are used during a rebuild AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"]) -- -2.21.0 +2.29.0 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch new file mode 100644 index 000000000000..2797249523f6 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch @@ -0,0 +1,26 @@ +C99 `inline` is not guaranteed to emit an external definition +https://www.greenend.org.uk/rjk/tech/inline.html +Bug: https://bugs.gentoo.org/922958 + +--- a/utils/exportd/exportd.c ++++ b/utils/exportd/exportd.c +@@ -53,7 +53,7 @@ + */ + inline static void set_signals(void); + +-inline void ++inline static void + cleanup_lockfiles (void) + { + unlink(etab.lockfn); +--- a/utils/mountd/mountd.c ++++ b/utils/mountd/mountd.c +@@ -111,7 +111,7 @@ + nfs_svc_unregister(MOUNTPROG, MOUNTVERS_NFSV3); + } + +-static void ++inline static void + cleanup_lockfiles (void) + { + unlink(etab.lockfn); diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch new file mode 100644 index 000000000000..0312ac1a8b37 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.6.4-includes.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/922373 +https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bb25f3f594ddf85e5826e931eaaa35874f6a4204 + +From bb25f3f594ddf85e5826e931eaaa35874f6a4204 Mon Sep 17 00:00:00 2001 +From: Petr Vorel <pvorel@suse.cz> +Date: Wed, 3 Jan 2024 19:07:43 -0500 +Subject: [PATCH] reexport/{fsidd,reexport}.c: Re-add missing includes + +Older uClibc-ng requires <unistd.h> for close(2), unlink(2) and write(2), +<sys/un.h> for struct sockaddr_un. + +Fixes: 1a4edb2a ("reexport/fsidd.c: Remove unused headers") +Fixes: bdc79f02 ("support/reexport.c: Remove unused headers") + +Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com> +Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com> +Signed-off-by: Petr Vorel <pvorel@suse.cz> +Signed-off-by: Steve Dickson <steved@redhat.com> +--- a/support/reexport/fsidd.c ++++ b/support/reexport/fsidd.c +@@ -7,6 +7,8 @@ + #include <dlfcn.h> + #endif + #include <event2/event.h> ++#include <sys/un.h> ++#include <unistd.h> + + #include "conffile.h" + #include "reexport_backend.h" +--- a/support/reexport/reexport.c ++++ b/support/reexport/reexport.c +@@ -7,6 +7,7 @@ + #endif + #include <sys/types.h> + #include <sys/vfs.h> ++#include <unistd.h> + #include <errno.h> + + #include "nfsd_path.h" +-- +1.8.3.1 diff --git a/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch b/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch new file mode 100644 index 000000000000..156a3067bb3c --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch @@ -0,0 +1,32 @@ +Gentoo installs sysctl in /usr/sbin + +https://bugs.gentoo.org/907688 + +--- a/systemd/60-nfs.rules ++++ b/systemd/60-nfs.rules +@@ -2,20 +2,20 @@ + + # sunrpc module supports "sunrpc.*" sysctls + ACTION=="add", SUBSYSTEM=="module", KERNEL=="sunrpc", \ +- RUN+="/sbin/sysctl -q --pattern ^sunrpc --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^sunrpc --system" + + # rpcrdma module supports sunrpc.svc_rdma.* + ACTION=="add", SUBSYSTEM=="module", KERNEL=="rpcrdma", \ +- RUN+="/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system" + + # lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls + ACTION=="add", SUBSYSTEM=="module", KERNEL=="lockd", \ +- RUN+="/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system" + + # nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout) + ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfsv4", \ +- RUN+="/sbin/sysctl -q --pattern ^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system" + + # nfs module supports "fs.nfs.*" sysctls + ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfs", \ +- RUN+="/sbin/sysctl -q --pattern ^fs.nfs --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs --system" diff --git a/net-fs/nfs-utils/files/nfs-utils.conf b/net-fs/nfs-utils/files/nfs-utils.conf deleted file mode 100644 index b9b586c2ac07..000000000000 --- a/net-fs/nfs-utils/files/nfs-utils.conf +++ /dev/null @@ -1,3 +0,0 @@ -d /var/lib/nfs/rpc_pipefs -d /var/lib/nfs/v4recovery -d /var/lib/nfs/v4root diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd deleted file mode 100644 index 9dc14058c1fe..000000000000 --- a/net-fs/nfs-utils/files/nfs.confd +++ /dev/null @@ -1,38 +0,0 @@ -# /etc/conf.d/nfs - -# If you wish to set the port numbers for lockd, -# please see /etc/sysctl.conf - -# Optional services to include in default `/etc/init.d/nfs start` -# For NFSv4 users, you'll want to add "rpc.idmapd" here. -NFS_NEEDED_SERVICES="" - -# Options to pass to rpc.nfsd -OPTS_RPC_NFSD="8" - -# Options to pass to rpc.mountd -# ex. OPTS_RPC_MOUNTD="-p 32767" -OPTS_RPC_MOUNTD="" - -# Options to pass to rpc.statd -# ex. OPTS_RPC_STATD="-p 32765 -o 32766" -OPTS_RPC_STATD="" - -# Options to pass to rpc.idmapd -OPTS_RPC_IDMAPD="" - -# Options to pass to rpc.gssd -OPTS_RPC_GSSD="" - -# Options to pass to rpc.svcgssd -OPTS_RPC_SVCGSSD="" - -# Options to pass to rpc.rquotad (requires sys-fs/quota) -OPTS_RPC_RQUOTAD="" - -# Timeout (in seconds) for exportfs -EXPORTFS_TIMEOUT=30 - -# Options to set in the nfsd filesystem (/proc/fs/nfsd/). -# Format is <option>=<value>. Multiple options are allowed. -#OPTS_NFSD="nfsv4leasetime=30 max_block_size=4096" diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 4b572fc2e5ed..88a13a85db38 100644 --- a/net-fs/nfs-utils/files/nfs.initd +++ b/net-fs/nfs-utils/files/nfs.initd @@ -1,17 +1,13 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" -# This variable is used for controlling whether or not to run exportfs -ua; -# see stop() for more information -restarting=no - # The binary locations exportfs=/usr/sbin/exportfs - mountd=/usr/sbin/rpc.mountd - nfsd=/usr/sbin/rpc.nfsd +mountd=/usr/sbin/rpc.mountd +nfsd=/usr/sbin/rpc.nfsd smnotify=/usr/sbin/sm-notify depend() { @@ -28,7 +24,8 @@ depend() { }' /etc/exports /etc/exports.d/*.exports 2>/dev/null )" config /etc/exports /etc/exports.d/*.exports - need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} + need portmap + need rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd after quota } @@ -55,7 +52,7 @@ mount_nfsd() { fi # Restart idmapd if needed #220747 if grep -qs nfsd /proc/modules ; then - killall -q -HUP rpc.idmapd + killall -q --signal=HUP rpc.idmapd fi fi @@ -88,7 +85,7 @@ start() { # Exportfs likes to hang if networking isn't working. # If that's the case, then try to kill it so the # bootup process can continue. - if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then + if grep -qs '^[[:space:]]*"\?/' /etc/exports /etc/exports.d/*.exports ; then ebegin "Exporting NFS directories" ${exportfs} -r & waitfor_exportfs $! @@ -110,13 +107,11 @@ stop() { eend $? ret=$((ret + $?)) - # nfsd sets its process name to [nfsd] so don't look for $nfsd ebegin "Stopping NFS daemon" - start-stop-daemon --stop --name nfsd --user root --signal 2 + # Do not attempt to signal kernel nfsd threads directly, #924309 + ${nfsd} 0 eend $? ret=$((ret + $?)) - # in case things don't work out ... #228127 - rpc.nfsd 0 # When restarting the NFS server, running "exportfs -ua" probably # isn't what the user wants. Running it causes all entries listed @@ -131,7 +126,7 @@ stop() { # then "exportfs -r" will reread the xtab, and all the current # clients will be able to resume NFS activity, *without* needing # to umount/(re)mount the filesystem. - if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then + if [ "${RC_CMD}" != "restart" ] ; then ebegin "Unexporting NFS directories" # Exportfs likes to hang if networking isn't working. # If that's the case, then try to kill it so the @@ -155,8 +150,6 @@ reload() { } restart() { - # See long comment in stop() regarding "restarting" and exportfs -ua - restarting=yes svc_stop svc_start } diff --git a/net-fs/nfs-utils/files/nfsclient.confd b/net-fs/nfs-utils/files/nfsclient.confd deleted file mode 100644 index 8a995571e1b8..000000000000 --- a/net-fs/nfs-utils/files/nfsclient.confd +++ /dev/null @@ -1,18 +0,0 @@ -# You need to decide which nfs protocol version you want to use. -# If you are unsure, leave these alone. -# -# If you are using only nfsv4, uncomment this line: -# -#rc_need="!rpc.statd" -# -# If you are using only nfsv3, uncomment this line: -# -#rc_need="!rpc.idmapd" -# -# You will need to set the dependencies in the nfsclient script to match -# the network configuration tools you are using. This should be done in -# this file by following the examples below, and not by changing the -# service script itself. See /etc/conf.d/netmount for more examples. -# -# This is a safe default. -rc_after="net" diff --git a/net-fs/nfs-utils/files/nfsclient.initd b/net-fs/nfs-utils/files/nfsclient.initd index 6724e913d10f..e278cbde0539 100644 --- a/net-fs/nfs-utils/files/nfsclient.initd +++ b/net-fs/nfs-utils/files/nfsclient.initd @@ -14,7 +14,8 @@ depend() { done fi config /etc/fstab - need portmap rpc.statd rpc.idmapd ${myneed} + need portmap + need rpc.statd rpc.idmapd ${myneed} use ypbind dns } diff --git a/net-fs/nfs-utils/files/nfsmount.confd b/net-fs/nfs-utils/files/nfsmount.confd deleted file mode 100644 index 418353668f97..000000000000 --- a/net-fs/nfs-utils/files/nfsmount.confd +++ /dev/null @@ -1,7 +0,0 @@ -# You will need to set the dependencies in the nfsmount script to match -# the network configuration tools you are using. This should be done in -# this file by following the examples below, and not by changing the -# service script itself. See /etc/conf.d/netmount for more examples. -# -# This is a safe default. -rc_after="net" diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd deleted file mode 100644 index 12c7d786a0ff..000000000000 --- a/net-fs/nfs-utils/files/nfsmount.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -depend() { - local myneed="" - if [ -e /etc/fstab ] ; then - myneed="${myneed} $( - awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") { - if ($3 == "nfs4") - idmapd = "rpc.idmapd" - if ($4 ~ /sec=(krb|spkm)/) - gssd = "rpc.gssd" - } - END { print idmapd " " gssd } - ' /etc/fstab - )" - fi - config /etc/fstab - need portmap rpc.statd ${myneed} - use ypbind dns rpc.idmapd rpc.gssd -} - -start() { - if [ -x /usr/sbin/sm-notify ] ; then - ebegin "Starting NFS sm-notify" - /usr/sbin/sm-notify ${OPTS_SMNOTIFY} - eend $? - fi - - # Make sure nfs support is loaded in the kernel #64709 - if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then - modprobe -q nfs - fi - - ebegin "Mounting NFS filesystems" - mount -a -t nfs,nfs4 - eend $? -} - -stop() { - ebegin "Unmounting NFS filesystems" - umount -a -t nfs,nfs4 - eend $? -} diff --git a/net-fs/nfs-utils/files/nfsmount.initd-1.3.1 b/net-fs/nfs-utils/files/nfsmount.initd-1.3.1 deleted file mode 100644 index 68007ca11939..000000000000 --- a/net-fs/nfs-utils/files/nfsmount.initd-1.3.1 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This is mostly as a fix for bug #537996, to avoid breaking existing users -# with nfsmount in their runlevels. -# If neither nfsclient nor netmount are in your runlevels, and you manually -# start netmount before nfsclient, then this will break. A real solution is -# forthcoming, but requires feature development, see bug #406021 for soft -# dependencies -depend() { - need nfsclient netmount -} - -msg() { - ewarn "nfsmount is deprecated, please migrate as described in the news item: 2015-02-02-nfs-service-changes" - ewarn "This migration script will be removed after 01 Aug 2015." -} - -start() { - msg -} - -stop() { - msg -} diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd index 445d44c44473..7bfe920b3d54 100644 --- a/net-fs/nfs-utils/files/rpc.gssd.initd +++ b/net-fs/nfs-utils/files/rpc.gssd.initd @@ -6,7 +6,8 @@ depend() { use ypbind net - need portmap rpc.pipefs + need portmap + need rpc.pipefs after quota } diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd b/net-fs/nfs-utils/files/rpc.idmapd.initd index 61cfd4de2e73..9cb36000b5ed 100644 --- a/net-fs/nfs-utils/files/rpc.idmapd.initd +++ b/net-fs/nfs-utils/files/rpc.idmapd.initd @@ -8,7 +8,8 @@ rpc_bin=/usr/sbin/rpc.idmapd depend() { use ypbind net - need portmap rpc.pipefs + need portmap + need rpc.pipefs after quota } diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd b/net-fs/nfs-utils/files/rpc.svcgssd.initd index c714e36076f4..11bc4265eddd 100644 --- a/net-fs/nfs-utils/files/rpc.svcgssd.initd +++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd @@ -6,7 +6,8 @@ depend() { use ypbind net - need portmap rpc.pipefs + need portmap + need rpc.pipefs after quota } diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml index 45351e446376..d2ea9df1b5c2 100644 --- a/net-fs/nfs-utils/metadata.xml +++ b/net-fs/nfs-utils/metadata.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> - <longdescription>NFS client and server daemons</longdescription> - <use> - <flag name="junction">Enable NFS junction support in nfsref</flag> - <flag name="ldap">Add ldap support</flag> - <flag name="libmount">Link mount.nfs with libmount</flag> - <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag> - <flag name="nfsidmap">Enable support for newer nfsidmap helper</flag> - <flag name="nfsv4">Enable support for NFSv4</flag> - <flag name="nfsv41">Enable support for NFSv4.1</flag> - <flag name="uuid">Support UUID lookups in rpc.mountd</flag> - </use> - <upstream> - <remote-id type="sourceforge">nfs</remote-id> - </upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="junction">Enable NFS junction support in nfsref</flag> + <flag name="ldap">Add ldap support</flag> + <flag name="libmount">Link mount.nfs with libmount</flag> + <flag name="nfsv3">Enable support for NFSv2 and NFSv3</flag> + <flag name="nfsv4">Enable support for NFSv4 (includes NFSv4.1 and NFSv4.2)</flag> + <flag name="uuid">Support UUID lookups in rpc.mountd</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:linux-nfs:nfs-utils</remote-id> + <remote-id type="sourceforge">nfs</remote-id> + </upstream> </pkgmetadata> diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild deleted file mode 100644 index b98297ce0b07..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - inherit versionator - MY_PV="$(replace_all_version_separators -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" -else - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON=" - dev-libs/libxml2 - net-libs/libtirpc:= - >=net-nds/rpcbind-0.2.4 - sys-libs/e2fsprogs-libs - caps? ( sys-libs/libcap ) - ldap? ( net-nds/openldap ) - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - tcpd? ( sys-apps/tcp-wrappers ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-libs/libnfsidmap - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -DEPEND="${DEPEND_COMMON} - net-libs/rpcsvc-proto - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - "${FILESDIR}"/${PN}-2.3.2-junction_libs.patch - "${FILESDIR}"/${PN}-2.3.2-no-werror.patch - "${FILESDIR}"/${PN}-2.3.1-limits.patch #651080 - "${FILESDIR}"/${PN}-2.3.4_rc2-improved_res_querydomain_check.patch #651080 -) - -src_prepare() { - default - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - local myeconfargs=( - --with-statedir="${EPREFIX%/}"/var/lib/nfs - --enable-tirpc - --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap - --with-rpcgen - --with-systemd="$(systemd_get_systemunitdir)" - --without-gssglue - $(use_enable caps) - $(use_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) - ) - 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 - # Install a config file for idmappers in newer kernels. #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 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED%/}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED%/}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - -} - -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 - if [[ ${REPLACING_VERSIONS} < 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 - 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/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild deleted file mode 100644 index dafe5f83ce34..000000000000 --- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" - -if [[ "${PV}" = *_rc* ]] ; then - MY_PV="$(ver_rs 1- -)" - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${PN}-${MY_PV}" -else - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND=" - >=dev-db/sqlite-3.3 - dev-libs/libxml2 - net-libs/libtirpc:= - >=net-nds/rpcbind-0.2.4 - sys-libs/e2fsprogs-libs - caps? ( sys-libs/libcap ) - ldap? ( net-nds/openldap ) - libmount? ( sys-apps/util-linux ) - nfsv4? ( - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - tcpd? ( sys-apps/tcp-wrappers ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND} - !net-libs/libnfsidmap - !net-nds/portmap - !<sys-apps/openrc-0.13.9 - selinux? ( - sec-policy/selinux-rpc - sec-policy/selinux-rpcbind - ) -" -BDEPEND=" - net-libs/rpcsvc-proto - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - "${FILESDIR}"/${PN}-2.3.4-no-werror.patch -) - -src_prepare() { - default - - sed \ - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ - -i utils/*/Makefile.am || die - - eautoreconf -} - -src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) - local myeconfargs=( - --with-statedir="${EPREFIX%/}"/var/lib/nfs - --enable-tirpc - --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap - --with-rpcgen - --with-systemd="$(systemd_get_systemunitdir)" - --without-gssglue - $(use_enable caps) - $(use_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) - ) - 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 - # Install a config file for idmappers in newer kernels. #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 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - local systemd_systemunitdir="$(systemd_get_systemunitdir)" - sed -i \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${ED}${systemd_systemunitdir}"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 - -} - -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 - if [[ ${REPLACING_VERSIONS} < 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 - 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/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild index 2691baaa27ff..f05dfd7a5a6c 100644 --- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild @@ -1,61 +1,67 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic multilib systemd +inherit autotools linux-info systemd DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" +HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git" -if [[ "${PV}" = *_rc* ]] ; then +if [[ ${PV} == *_rc* ]] ; then MY_PV="$(ver_rs 1- -)" SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${PN}-${MY_PV}" else - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + SRC_URI="https://downloads.sourceforge.net/nfs/${P}.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" SLOT="0" -IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 +IUSE="caps junction kerberos ldap +libmount +nfsv3 +nfsv4 sasl selinux tcpd +uuid" +REQUIRED_USE="|| ( nfsv3 nfsv4 ) kerberos? ( nfsv4 )" +# bug #315573 +RESTRICT="test" # kth-krb doesn't provide the right include # files, and nfs-utils doesn't build against heimdal either, # so don't depend on virtual/krb. # (04 Feb 2005 agriffis) -DEPEND=" - >=dev-db/sqlite-3.3 +COMMON_DEPEND=" dev-libs/libxml2 net-libs/libtirpc:= - >=net-nds/rpcbind-0.2.4 - sys-libs/e2fsprogs-libs + sys-fs/e2fsprogs + dev-db/sqlite:3 + dev-libs/libevent:= caps? ( sys-libs/libcap ) - ldap? ( net-nds/openldap ) + ldap? ( + net-nds/openldap:= + sasl? ( + app-crypt/mit-krb5 + dev-libs/cyrus-sasl:2 + ) + ) libmount? ( sys-apps/util-linux ) + nfsv3? ( >=net-nds/rpcbind-0.2.4 ) nfsv4? ( - dev-libs/libevent:= - >=sys-apps/keyutils-1.5.9 + >=sys-apps/keyutils-1.5.9:= + sys-fs/lvm2 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 )" -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" +RDEPEND="${COMMON_DEPEND} !net-libs/libnfsidmap - !net-nds/portmap - !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc - sec-policy/selinux-rpcbind + nfsv3? ( sec-policy/selinux-rpcbind ) ) " BDEPEND=" @@ -64,11 +70,22 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch - "${FILESDIR}"/${PN}-2.3.4-no-werror.patch + "${FILESDIR}"/${PN}-2.5.2-no-werror.patch + "${FILESDIR}"/${PN}-udev-sysctl.patch + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-C99-inline.patch ) +pkg_setup() { + linux-info_pkg_setup + + if use nfsv4 && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then + ewarn "Your NFS server will be unable to track clients across server restarts!" + ewarn "Please enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to" + ewarn "support the legacy, in-kernel client tracker." + fi +} + src_prepare() { default @@ -80,35 +97,45 @@ src_prepare() { } src_configure() { - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. - export ac_cv_header_keyutils_h=$(usex nfsidmap) + # Our DEPEND forces this. + export libsqlite3_cv_is_recent=yes + export ac_cv_header_keyutils_h=$(usex nfsv4) + + # SASL is consumed in a purely automagic way + export ac_cv_header_sasl_h=no + export ac_cv_header_sasl_sasl_h=$(usex sasl) + local myeconfargs=( - --with-statedir="${EPREFIX%/}"/var/lib/nfs + --disable-static + --with-statedir="${EPREFIX}"/var/lib/nfs --enable-tirpc - --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/ - --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap + --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) - $(use_enable ipv6) + --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 nfsv4 nfsdcld) + $(use_enable nfsv4 nfsdcltrack) + $(use_enable nfsv4 nfsv41) + $(use_enable nfsv4 nfsv4server) $(use_enable uuid) $(use_with tcpd tcp-wrappers) ) econf "${myeconfargs[@]}" } -src_compile(){ - # remove compiled files bundled in the tarball +src_compile() { + # Remove compiled files bundled in the tarball emake clean + default } @@ -126,8 +153,11 @@ src_install() { dodir /sbin mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die - if use nfsv4 && use nfsidmap ; then - # Install a config file for idmappers in newer kernels. #415625 + if use nfsv4 ; then + insinto /etc + doins support/nfsidmap/idmapd.conf + + # Install a config file for idmappers in newer kernels. bug #415625 insinto /etc/request-key.d echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf doins id_resolver.conf @@ -137,31 +167,38 @@ src_install() { doins "${FILESDIR}"/exports keepdir /etc/exports.d - local f list=() opt_need="" + local f list=() if use nfsv4 ; then - opt_need="rpc.idmapd" list+=( rpc.idmapd rpc.pipefs ) use kerberos && list+=( rpc.gssd rpc.svcgssd ) fi + + local sedexp=( -e '#placehoder' ) + use nfsv3 || sedexp+=( -e '/need portmap/d' ) + + mkdir -p "${T}/init.d" || die for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} + sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die + doinitd "${T}/init.d/${f}" done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 local systemd_systemunitdir="$(systemd_get_systemunitdir)" sed -i \ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ "${ED}${systemd_systemunitdir}"/* || die - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 + # Remove legacy service if not requested (as it will be broken without rpcbind) + if ! use nfsv3; then + rm "${ED}${systemd_systemunitdir}/nfs-server.service" || die + fi + + # bug #368505 + keepdir /var/lib/nfs + # bug #603628 + keepdir /var/lib/nfs/v4recovery + # No static archives + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { @@ -174,17 +211,4 @@ pkg_postinst() { 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 - if [[ ${REPLACING_VERSIONS} < 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 - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi } diff --git a/net-fs/nfs4-acl-tools/Manifest b/net-fs/nfs4-acl-tools/Manifest index d893bf620d9d..e419b9652c74 100644 --- a/net-fs/nfs4-acl-tools/Manifest +++ b/net-fs/nfs4-acl-tools/Manifest @@ -1,2 +1 @@ -DIST nfs4-acl-tools-0.3.3.tar.gz 176018 BLAKE2B d9788af56f4ce5d2ebb8cef95287227a646ec2ec60a7a2ff24c4c26158383271bed0a3aedd5c851dd1182f98ea32a57338d9b7bd68d24525cfab16dc4b401b6a SHA512 8efa67c9f8a2f360c96b0df4e4aad55c044544188ebacd2e23b5f1c8a2c6c03d06cb8ffa434b03f502351a3403e98f4013bf6e6d9c85909995747b5489ea22d7 -DIST nfs4-acl-tools-0.3.5.tar.gz 99113 BLAKE2B a51e7a1ab3c43d5844697ccb8afb3dbef19d72b688c1aa9af334d9ccd9e0b70c2d5c7fc762ef80d69b9b4038c2fc83d9edc26e6f6119c05525cd13d4b7e5ea1b SHA512 c23d5c5c676c03cbb8016de32e384086525df6f181c85b36331f42b9bab023ab5158c4e01096f837da5d59c64d8a247cc7e92c9d37bd6bb38fc2aed960705618 +DIST nfs4-acl-tools-0.3.7.tar.gz 99139 BLAKE2B 5125fca65ee7b9dcea16e9b633bbfc26aa5c74202412119f138a5c47ae67d8f8e72fd4eb43182aaf3119858eb83fe6f24f6b53abc0b448aca04c3de4043ad9c1 SHA512 3922bced4e74891b0c4ea10a03eec0cc2e531de355776ba364a91bd656a78d19f9cfba026face34331841ee7c8609f12084fc10081601bc65aaf0fb008ca2fc6 diff --git a/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch new file mode 100644 index 000000000000..7eb4d67e552d --- /dev/null +++ b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch @@ -0,0 +1,74 @@ +https://bugs.gentoo.org/731162 + +From 2abd5015bf6bac1697ac4422d76fa121a49f2b24 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 17 Jun 2022 12:36:01 -0700 +Subject: [PATCH] configure: Add missing LT_INIT + +Otherwise it fails to generate libtool for the build breaking the build +when using a different toolchain than the system libtool. It also breaks +the build with rlibtool which depends on the generated libtool to +determine if it should build static or shared libraries. + +The existing make and libtool tests were removed as unnecessary and +problematic. +--- a/configure.ac ++++ b/configure.ac +@@ -9,6 +9,9 @@ AC_ARG_ENABLE(shared, + enable_shared=no) + AC_SUBST(enable_shared) + ++LT_INIT ++ ++AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_PROG_CC + +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -39,6 +39,8 @@ DEBUG = @debug_build@ + OPTIMIZER = @opt_build@ + MALLOCLIB = @malloc_lib@ + ++top_builddir = $(TOPDIR) ++ + LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la + LIBATTR = @libattr@ + +@@ -68,7 +70,6 @@ AWK = @awk@ + SED = @sed@ + TAR = @tar@ + ZIP = @zip@ +-MAKE = @make@ + ECHO = @echo@ + SORT = @sort@ + LN_S = @LN_S@ +--- a/m4/package_utilies.m4 ++++ b/m4/package_utilies.m4 +@@ -22,26 +22,6 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], + AC_SUBST(cc) + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) + +- if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin) +- fi +- if test -z "$MAKE"; then +- AC_PATH_PROG(MAKE, make,, /usr/bin) +- fi +- make=$MAKE +- AC_SUBST(make) +- AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) +- +- if test -z "$LIBTOOL"; then +- AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) +- fi +- if test -z "$LIBTOOL"; then +- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) +- fi +- libtool=$LIBTOOL +- AC_SUBST(libtool) +- AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) +- + if test -z "$TAR"; then + AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) + fi diff --git a/net-fs/nfs4-acl-tools/metadata.xml b/net-fs/nfs4-acl-tools/metadata.xml index 56c124413057..73dda144f9ac 100644 --- a/net-fs/nfs4-acl-tools/metadata.xml +++ b/net-fs/nfs4-acl-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.3.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.3.ebuild deleted file mode 100644 index c96fe8ae670a..000000000000 --- a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.3.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs" -HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/" -SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-apps/attr" -RDEPEND="${DEPEND}" diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild index d0bf66fbac80..7ae1f656f761 100644 --- a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild +++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit autotools @@ -12,15 +12,19 @@ SRC_URI="https://linux-nfs.org/~bfields/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="sys-apps/attr" -RDEPEND="${DEPEND}" +RDEPEND="sys-apps/attr" +DEPEND=" + ${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone ) +" -PATCHES=( "${FILESDIR}"/${PN}-0.3.5-jobserver-unavailable.patch ) +PATCHES=( + "${FILESDIR}"/${P}-libtool.patch # bug #731162 + "${FILESDIR}"/${PN}-0.3.5-jobserver-unavailable.patch +) src_prepare() { default - eautoreconf } diff --git a/net-fs/nfstest/Manifest b/net-fs/nfstest/Manifest deleted file mode 100644 index c08174329cd8..000000000000 --- a/net-fs/nfstest/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST NFStest-1.0.2.tar.gz 214840 BLAKE2B 67397fdc13116074917c1158f931896c7d376fec0d29db07713a33d47f47dc4eb7b670fe6d926971f2ea8e78634a1ee9a43aae7eaea4c714bbd2fc1ac109a48f SHA512 3758f6af8c3959274a3dfdc33a3c9e76451bd46c85b779ce7352ec4b4d616273ff2b409598fb31dbaf4663b8a2d743f9e0a1cc3a0c4eabcd918d6d5fbed2f09e -DIST NFStest-2.1.2.tar.gz 357049 BLAKE2B a50743d17938405bf1fd84bb5a70a6012325b584ede31445eb6be122c3370f2a433ed24580dcd4e4ebe88ff023e2a08438bf6da088ec3d7afd717508a4e52a48 SHA512 83d77bd94bb325d1a7badfc48d55fe200c6f53749d13f622c918b2fd6d8a7d279fda5f59e725f86d41b3f573881a14c677556c8b1b36d1a0b5e20d7d9b7639e9 diff --git a/net-fs/nfstest/metadata.xml b/net-fs/nfstest/metadata.xml deleted file mode 100644 index 97fa5b04edcd..000000000000 --- a/net-fs/nfstest/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/net-fs/nfstest/nfstest-1.0.2.ebuild b/net-fs/nfstest/nfstest-1.0.2.ebuild deleted file mode 100644 index 697a421617a6..000000000000 --- a/net-fs/nfstest/nfstest-1.0.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="NFStest" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Tools for testing either the NFS client or the NFS server" -HOMEPAGE="http://wiki.linux-nfs.org/wiki/index.php/NFStest" -SRC_URI="http://www.linux-nfs.org/~mora/nfstest/releases/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="net-fs/nfs-utils" -DEPEND="" - -S="${WORKDIR}"/${MY_P} diff --git a/net-fs/nfstest/nfstest-2.1.2.ebuild b/net-fs/nfstest/nfstest-2.1.2.ebuild deleted file mode 100644 index 51b29530b7d6..000000000000 --- a/net-fs/nfstest/nfstest-2.1.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="NFStest" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Tools for testing either the NFS client or the NFS server" -HOMEPAGE="http://wiki.linux-nfs.org/wiki/index.php/NFStest" -SRC_URI="http://www.linux-nfs.org/~mora/nfstest/releases/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="net-fs/nfs-utils" -DEPEND="" - -S="${WORKDIR}"/${MY_P} diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest deleted file mode 100644 index 34c6a22cc329..000000000000 --- a/net-fs/openafs-kernel/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e -DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c -DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml deleted file mode 100644 index e76fe2c4c443..000000000000 --- a/net-fs/openafs-kernel/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> -</maintainer> -<maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> -</maintainer> -</pkgmetadata> diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild deleted file mode 100644 index 4dd3b12d469d..000000000000 --- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools linux-mod multilib toolchain-funcs versionator - -MY_PV=$(delete_version_separator '_') -MY_PN="${PN/-kernel}" -MY_P="${MY_PN}-${MY_PV}" -PVER="20170822" - -DESCRIPTION="The OpenAFS distributed file system kernel module" -HOMEPAGE="https://www.openafs.org/" -# We always d/l the doc tarball as man pages are not USE=doc material -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE="" -SRC_URI=" - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz -" - -LICENSE="IBM BSD openafs-krb5-a APSL-2" -SLOT="0" -KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="debug" - -S=${WORKDIR}/${MY_P} - -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" - -PATCHES=( "${WORKDIR}/gentoo/patches" ) - -pkg_pretend() { - if use kernel_linux && kernel_is ge 4 15 ; then - ewarn "Gentoo supports kernels which are supported by OpenAFS" - ewarn "which are limited to the kernel versions: < 4.15" - ewarn "" - ewarn "You are free to utilize epatch_user to provide whatever" - ewarn "support you feel is appropriate, but will not receive" - ewarn "support as a result of those changes." - ewarn "" - ewarn "Please do not file a bug report about this." - fi -} - -pkg_setup() { - if use kernel_linux; then - linux-mod_pkg_setup - fi -} - -src_prepare() { - default - - # packaging is f-ed up, so we can't run eautoreconf - # run autotools commands based on what is listed in regen.sh - eaclocal -I src/cf - eautoconf - eautoconf -o configure-libafs configure-libafs.ac - eautoheader - einfo "Deleting autom4te.cache directory" - rm -rf autom4te.cache -} - -src_configure() { - local myconf="" - # OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option - if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then - myconf="--enable-linux-d_splice_alias-extra-iput" - fi - - local ARCH="$(tc-arch-kernel)" - local MY_ARCH="$(tc-arch)" - local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC" - - if use kernel_linux; then - myconf+=( --with-linux-kernel-headers="${KV_DIR}" \ - --with-linux-kernel-build="${KV_OUT_DIR}" - ) - elif use kernel_FreeBSD; then - myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" ) - fi - econf \ - $(use_enable debug debug-kernel) \ - "${myconf[@]}" -} - -src_compile() { - ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs -} - -src_install() { - if use kernel_linux; then - local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*) - [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module" - - MODULE_NAMES="libafs(fs/openafs:${srcdir})" - - linux-mod_src_install - elif use kernel_FreeBSD; then - insinto /boot/modules - doins "${S}"/src/libafs/MODLOAD/libafs.ko - fi -} - -pkg_postinst() { - # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" - use kernel_linux && linux-mod_pkg_postinst - - if use kernel_linux; then - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.6.18.2 ${v}; then - ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires" - ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config." - ewarn "If you only turned this option off for OpenAFS, please re-enable" - ewarn "it, as keeping it turned off is a security risk." - break - fi - done - fi -} - -pkg_postrm() { - # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" - use kernel_linux && linux-mod_pkg_postrm -} diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild deleted file mode 100644 index 772d026fd5e4..000000000000 --- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools linux-mod multilib toolchain-funcs versionator - -MY_PV=$(delete_version_separator '_') -MY_PN="${PN/-kernel}" -MY_P="${MY_PN}-${MY_PV}" -PVER="20170822" - -DESCRIPTION="The OpenAFS distributed file system kernel module" -HOMEPAGE="https://www.openafs.org/" -# We always d/l the doc tarball as man pages are not USE=doc material -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE="" -SRC_URI=" - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz -" - -LICENSE="IBM BSD openafs-krb5-a APSL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="debug" - -S=${WORKDIR}/${MY_P} - -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" - -PATCHES=( "${WORKDIR}/gentoo/patches" ) - -pkg_pretend() { - if use kernel_linux && kernel_is ge 4 16 ; then - ewarn "Gentoo supports kernels which are supported by OpenAFS" - ewarn "which are limited to the kernel versions: < 4.16" - ewarn "" - ewarn "You are free to utilize epatch_user to provide whatever" - ewarn "support you feel is appropriate, but will not receive" - ewarn "support as a result of those changes." - ewarn "" - ewarn "Please do not file a bug report about this." - fi -} - -pkg_setup() { - if use kernel_linux; then - linux-mod_pkg_setup - fi -} - -src_prepare() { - default - - # packaging is f-ed up, so we can't run eautoreconf - # run autotools commands based on what is listed in regen.sh - eaclocal -I src/cf - eautoconf - eautoconf -o configure-libafs configure-libafs.ac - eautoheader - einfo "Deleting autom4te.cache directory" - rm -rf autom4te.cache -} - -src_configure() { - local myconf="" - # OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option - if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then - myconf="--enable-linux-d_splice_alias-extra-iput" - fi - - local ARCH="$(tc-arch-kernel)" - local MY_ARCH="$(tc-arch)" - local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC" - - if use kernel_linux; then - myconf+=( --with-linux-kernel-headers="${KV_DIR}" \ - --with-linux-kernel-build="${KV_OUT_DIR}" - ) - elif use kernel_FreeBSD; then - myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" ) - fi - econf \ - $(use_enable debug debug-kernel) \ - "${myconf[@]}" -} - -src_compile() { - ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs -} - -src_install() { - if use kernel_linux; then - local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*) - [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module" - - MODULE_NAMES="libafs(fs/openafs:${srcdir})" - - linux-mod_src_install - elif use kernel_FreeBSD; then - insinto /boot/modules - doins "${S}"/src/libafs/MODLOAD/libafs.ko - fi -} - -pkg_postinst() { - # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" - use kernel_linux && linux-mod_pkg_postinst - - if use kernel_linux; then - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.6.18.2 ${v}; then - ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires" - ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config." - ewarn "If you only turned this option off for OpenAFS, please re-enable" - ewarn "it, as keeping it turned off is a security risk." - break - fi - done - fi -} - -pkg_postrm() { - # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" - use kernel_linux && linux-mod_pkg_postrm -} diff --git a/net-fs/openafs-legacy/metadata.xml b/net-fs/openafs-legacy/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/net-fs/openafs-legacy/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild b/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild deleted file mode 100644 index 5ad939b711b2..000000000000 --- a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Legacy path symlinks to access FHS-compliant OpenAFS installation" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-apps/baselayout" -RDEPEND="${DEPEND}" -PDEPEND="net-fs/openafs" - -S="${WORKDIR}" - -# As a guide for these links, acinclude.m4 from the openafs package was -# used. A README file exists as well, but at the time of writing, the -# afsbosserver-variable was inaccurately described. - -src_install() { - # some basenames for FHS paths - sysconfdir=/etc - libexecdir=/usr/libexec - localstatedir=/var/lib - sbindir=/usr/sbin - - # create parent directories for Transarc mode - dodir /usr/{vice,afs} - - # viceetcdir - viceetcdir=${sysconfdir}/openafs - dosym ${viceetcdir} /usr/vice/etc - - # afssrvdir - afssrvbindir=${libexecdir}/openafs - dosym ${afssrvbindir} /usr/afs/bin - - # afsconfdir - afsconfdir=${sysconfdir}/openafs/server - dosym ${afsconfdir} /usr/afs/etc - - # afslocaldir - afslocaldir=${localstatedir}/openafs - dosym ${afslocaldir} /usr/afs/local - - # afsdbdir - afsdbdir=${localstatedir}/openafs/db - dosym ${afsdbdir} /usr/afs/db - - # afslogdir - afslogdir=${localstatedir}/openafs/logs - dosym ${afslogdir} /usr/afs/logs - - # afsbosconfig - dodir ${afslocaldir} - dosym ${viceetcdir}/BosConfig ${afslocaldir}/BosConfig - - # afsbosserver - dodir ${afssrvbindir} - dosym ${sbindir}/bosserver ${afssrvbindir}/bosserver -} - -pkg_prerm() { - ewarn "It is recommended to remove this package AFTER removing openafs" - ewarn "This way there will be no dead links left lying around" -} diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest index 4626148ccc84..a5e32ac409ab 100644 --- a/net-fs/openafs/Manifest +++ b/net-fs/openafs/Manifest @@ -1,8 +1,6 @@ -DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74 SHA512 1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c -DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e -DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1 -DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c -DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 321af6f0b97cfe195b18a7fb55208981158f23671dec35c0462167d3ebddd245e3aabefbc13f3caddbd6d4556c448f137acfd70be768dbeb843bedf2acfe8e2b SHA512 99bf052f7128e920766efaafc930fa33b7d3615f7c61c1182fd93159fd477d88da05f88fd9f39896c44d80a3687142367613adc2d7bd73d069dc5820b4cf8653 -DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601 SHA512 8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92 -DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a -DIST openafs-patches-20190106.tar.xz 29712 BLAKE2B 6377ffc6afa147f47e57e94c7c18c17c42f70c3c8d578ca7e53a4577918be0e6e6d3fbe427c5c460df8a5abb3e4f707beb27fda5e919b95285c4ce02484cd89d SHA512 bc35e422ffb3b231a3ba80f5408ebbec7b1220b8be56bf4a84024a2554060ca1c0e2ea97af989bcafade3629d40520df3d69f58a90f526f0d60523f8d3f96d16 +DIST openafs-1.8.7-doc.tar.bz2 3808045 BLAKE2B 8ded75239dd59633297ee4208a0f3f018486b5b5b71fda91229583fd2d6a7743bbbeba280e61ff91d602617fc47944105b06a5c0610b0c89c808ecba38af7f9c SHA512 6d087320ab6681686b6afb78621b21eaec26b91dbd03a13df447ad9f0ce897332ac378b38bf1abc590575d82d8cb22757249e60a2407e4ad498d46c083632e0d +DIST openafs-1.8.7-src.tar.bz2 15059909 BLAKE2B 89aacc48100d3eabbec45acca3911fbd823c029a30e79ad16564dcc3646b9bbadb60a528f142fc907de0d4eb2831d922d8146cdba72c02f4e8db9ab806c84d86 SHA512 12d5aa9177dde10e504f71b4b1ae19be0b0c52e8031e0f5afacce4a2c3f2321970af65591edab6145f7400f6276acd7e8624aa66e816d2394324e2ef5c403c01 +DIST openafs-1.8.8.1-doc.tar.bz2 3770278 BLAKE2B 4d10c96f05190a71b8d7aa89557946d0b95774ca77f40d8e9ca81f5d5bacff1966e637f3bd066181f2dcf182dbfffdf93521981745fe4dbfea142e6b17fcf574 SHA512 c229636ca4c7245d37fa25b02805982e3f667163ae312e14678117c60320ccce50230bf09e081167e789a76bad8fa39a88638cb439ab87954c93b6108004efa8 +DIST openafs-1.8.8.1-src.tar.bz2 14866119 BLAKE2B ae58a1d30fc8d72b4487700203c03e62fc15d0034a03516d4ea5b52c33970e8d9954e6b3c812a4633910c512d283c11431abbcb3868569d8d5ced1a69585263e SHA512 fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384 +DIST openafs-patches-20210116.tar.xz 67300 BLAKE2B aaafa197d1be1e9d89685fe5193a4682ea9e5e5c1c3227963a97ca7a98e6ab5e855ee65d615a31162559b30ae5867fde6ceeec1055af1a375e73b9fa25654de5 SHA512 06e9e1b65fceda34a197556aba1a05eabb630723fc17c5060d5e2a054e60ab8c5195d5c80eff3d3444bcdca40b7115da9143f5b8100659061446038ad4a79007 +DIST openafs-patches-20211212.tar.xz 13892 BLAKE2B 64582135ff3b81725cf0510d1157785b112f76197b8f50a947d22a82b8b55bebd163f2288b19d68a994f22c78bd90b6bfdad5f75383df1cac06d40feb72e8de8 SHA512 40a1a0d126ae194609da8a264c26b278b6081d95020bcbdb3a809952a70535fa551d1983e811e4ab9deaec06f061075906c2bbaf91e4354bff3520584e3fd336 diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml index 32ca71d15eb8..ccc902021cc8 100644 --- a/net-fs/openafs/metadata.xml +++ b/net-fs/openafs/metadata.xml @@ -1,15 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>NP-Hardass@gentoo.org</email> -</maintainer> -<maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> -</maintainer> +<!-- maintainer-needed --> <use> - <flag name="api">Build API documentation using <pkg>app-doc/doxygen</pkg>. + <flag name="apidoc">Build API documentation using <pkg>app-text/doxygen</pkg>. May take a *long* time to build.</flag> <flag name="bitmap-later">Enable fast startup of file server by not reading bitmap till needed.</flag> diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild b/net-fs/openafs/openafs-1.6.22.2.ebuild deleted file mode 100644 index d1b9080afba6..000000000000 --- a/net-fs/openafs/openafs-1.6.22.2.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs - -MY_PV=${PV/_/} -MY_P="${PN}-${MY_PV}" -PVER="20170822" - -DESCRIPTION="The OpenAFS distributed file system" -HOMEPAGE="https://www.openafs.org/" -# We always d/l the doc tarball as man pages are not USE=doc material -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE="" -SRC_URI=" - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2 - https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2 - https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz -" - -LICENSE="IBM BSD openafs-krb5-a APSL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups" - -CDEPEND=" - virtual/libintl - fuse? ( sys-fs/fuse:0= ) - kerberos? ( virtual/krb5 ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( virtual/pam )" - -DEPEND="${CDEPEND} - virtual/yacc - doc? ( - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - )" - -RDEPEND="${CDEPEND} - modules? ( ~net-fs/openafs-kernel-${PV} )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${WORKDIR}/gentoo/patches" ) - -src_prepare() { - default - - # fixing 2-nd level makefiles to honor flags - sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \ - src/*/Makefile.in || die '*/Makefile.in sed failed' - - # packaging is f-ed up, so we can't run eautoreconf - # run autotools commands based on what is listed in regen.sh - eaclocal -I src/cf - eautoconf - eautoconf -o configure-libafs configure-libafs.ac - eautoheader - einfo "Deleting autom4te.cache directory" - rm -rf autom4te.cache -} - -src_configure() { - local myconf - use debug && use pam && myconf="--enable-debug-pam" - - AFS_SYSKVERS=26 \ - econf \ - --disable-kernel-module \ - --disable-strip-binaries \ - $(use_enable bitmap-later) \ - $(use_enable debug) \ - $(use_enable debug debug-lwp) \ - $(use_enable fuse fuse-client) \ - $(use_enable ncurses gtx) \ - $(use_enable pam) \ - $(use_enable pthreaded-ubik) \ - $(use_enable supergroups) \ - $(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \ - $(use_with kerberos krb5) \ - "${myconf}" -} - -src_compile() { - emake all_nolibafs - local d - if use doc; then - for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do - emake -C "${d}" html; - done - fi -} - -src_install() { - local OPENRCDIR="${WORKDIR}/gentoo/openrc" - local SYSTEMDDIR="${WORKDIR}/gentoo/systemd" - - emake DESTDIR="${ED}" install_nolibafs - - insinto /etc/openafs - doins src/afsd/CellServDB - echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo - echo "openafs.org" > "${ED}"/etc/openafs/ThisCell - - # pam_afs and pam_afs.krb have been installed in irregular locations, fix - if use pam ; then - dopammod "${ED}"/usr/$(get_libdir)/pam_afs* - fi - rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die - - # remove kdump stuff provided by kexec-tools #222455 - rm -rf "${ED}"/usr/sbin/kdump* - - # avoid collision with mit_krb5's version of kpasswd - mv "${ED}"/usr/bin/kpasswd{,_afs} || die - mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die - - # move lwp stuff around #200674 #330061 - mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die - mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die - # update paths to the relocated lwp headers - sed -ri \ - -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \ - "${ED}"/usr/include/*.h \ - "${ED}"/usr/include/*/*.h \ - || die - - # minimal documentation - use pam && doman src/pam/pam_afs.5 - DOCS=( "${WORKDIR}/gentoo/README.Gentoo" - src/afsd/CellServDB NEWS README ) - - # documentation package - if use doc ; then - DOCS+=( doc/{arch,examples,pdf,protocol,txt} ) - dohtml -r doc/xml/ - fi - - einstalldocs - - # Gentoo related scripts - newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client - newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client - newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server - newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server - systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf - systemd_dounit "${SYSTEMDDIR}"/openafs-client.service - systemd_dounit "${SYSTEMDDIR}"/openafs-server.service - systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf - systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf - - # used directories: client - keepdir /etc/openafs - - # used directories: server - keepdir /etc/openafs/server - diropts -m0700 - keepdir /var/lib/openafs - keepdir /var/lib/openafs/db - diropts -m0755 - keepdir /var/lib/openafs/logs - - # link logfiles to /var/log - dosym ../lib/openafs/logs /var/log/openafs -} - -pkg_preinst() { - ## Somewhat intelligently install default configuration files - ## (when they are not present) - local x - for x in cacheinfo CellServDB ThisCell ; do - if [ -e "${EROOT}"/etc/openafs/${x} ] ; then - cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/ - fi - done -} - -pkg_postinst() { - elog "This installation should work out of the box (at least the" - elog "client part doing global afs-cell browsing, unless you had" - elog "a previous and different configuration). If you want to" - elog "set up your own cell or modify the standard config," - elog "please have a look at the Gentoo OpenAFS documentation" - elog "(warning: it is not yet up to date wrt the new file locations)" - elog - elog "The documentation can be found at:" - elog " https://wiki.gentoo.org/wiki/OpenAFS" - elog - elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before" - elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited." -} - -pkg_config() { - elog "Setting cache options for systemd." - - SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf - [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found." - - CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo) - [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo." - - if [ ${CACHESIZE} -lt 131070 ]; then - AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50" - elif [ ${CACHESIZE} -lt 524288 ]; then - AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70" - elif [ ${CACHESIZE} -lt 1048576 ]; then - AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" - elif [ ${CACHESIZE} -lt 2209715 ]; then - AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000" - else - AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000" - fi - - # Replace existing env var if exists, else append line - grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \ - sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \ - sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \ - die "Updating ${SERVICED_FILE} failed." -} diff --git a/net-fs/openafs/openafs-1.8.2-r1.ebuild b/net-fs/openafs/openafs-1.8.7.ebuild index 581e282d0b7e..62bb91c024f5 100644 --- a/net-fs/openafs/openafs-1.8.2-r1.ebuild +++ b/net-fs/openafs/openafs-1.8.7.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools linux-mod flag-o-matic pam systemd toolchain-funcs +MODULES_OPTIONAL_USE="modules" +inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs MY_PV=${PV/_/} MY_P="${PN}-${MY_PV}" -PVER=20190106 -KERNEL_LIMIT=4.21 +PVER=20210116 +KERNEL_LIMIT=5.11 DESCRIPTION="The OpenAFS distributed file system" HOMEPAGE="https://www.openafs.org/" @@ -22,17 +23,17 @@ SRC_URI=" LICENSE="IBM BSD openafs-krb5-a APSL-2" SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 -riscv ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="api bitmap-later debug doc fuse kauth kerberos +modules +namei -ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write" +IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei +ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write" BDEPEND=" dev-lang/perl - sys-devel/flex - virtual/yacc - api? ( - app-doc/doxygen + app-alternatives/lex + app-alternatives/yacc + apidoc? ( + app-text/doxygen[dot] media-gfx/graphviz ) doc? ( @@ -53,10 +54,12 @@ DEPEND=" app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) - kauth? ( virtual/pam ) + 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}" @@ -65,10 +68,6 @@ PATCHES=( "${WORKDIR}/gentoo/patches" ) 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" -MODULES_OPTIONAL_USE="modules" - -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 @@ -115,6 +114,9 @@ src_prepare() { src_configure() { local -a myconf + # bug #861368 + filter-lto + if use debug; then use kauth && myconf+=( --enable-debug-pam ) use modules && myconf+=( --enable-debug-kernel ) @@ -127,8 +129,6 @@ src_configure() { fi myconf+=( --with-linux-kernel-headers="${KV_DIR}" \ --with-linux-kernel-build="${KV_OUT_DIR}" ) - elif use kernel_FreeBSD; then - myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" ) fi fi @@ -153,7 +153,7 @@ src_configure() { $(use_enable pthreaded-ubik) \ $(use_enable supergroups) \ $(use_enable ubik-read-while-write) \ - $(use_with api dot) \ + $(use_with apidoc dot) \ $(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \ $(use_with kerberos krb5) \ $(use_with kerberos gssapi) \ @@ -170,7 +170,7 @@ src_compile() { emake -C doc/xml/QuickStartUnix auqbg000.pdf emake -C doc/xml/UserGuide auusg000.pdf fi - use api && doxygen doc/doxygen/Doxyfile + use apidoc && doxygen doc/doxygen/Doxyfile } src_install() { @@ -187,9 +187,6 @@ src_install() { MODULE_NAMES="libafs(fs/openafs:${srcdir})" linux-mod_src_install - elif use kernel_FreeBSD; then - insinto /boot/modules - doins "${S}"/src/libafs/MODLOAD/libafs.ko fi fi @@ -243,7 +240,7 @@ src_install() { newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf fi - use api && DOCS+=( doc/doxygen/output/html ) + use apidoc && DOCS+=( doc/doxygen/output/html ) einstalldocs # Gentoo related scripts @@ -251,7 +248,7 @@ src_install() { newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server - systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf + dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf systemd_dounit "${SYSTEMDDIR}"/openafs-client.service systemd_dounit "${SYSTEMDDIR}"/openafs-server.service systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf @@ -286,10 +283,11 @@ pkg_preinst() { pkg_postinst() { if use modules; then # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" use kernel_linux && linux-mod_pkg_postinst fi + tmpfiles_process openafs-client.conf + elog "This installation should work out of the box (at least the" elog "client part doing global afs-cell browsing, unless you had" elog "a previous and different configuration). If you want to" @@ -307,7 +305,6 @@ pkg_postinst() { pkg_postrm() { if use modules; then # Update linker.hints file - use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules" use kernel_linux && linux-mod_pkg_postrm fi } diff --git a/net-fs/openafs/openafs-1.6.22.1.ebuild b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild index c8d779968717..8b891ceb331f 100644 --- a/net-fs/openafs/openafs-1.6.22.1.ebuild +++ b/net-fs/openafs/openafs-1.8.8.1-r1.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs +MODULES_OPTIONAL_USE="modules" +inherit autotools linux-mod flag-o-matic pam systemd tmpfiles toolchain-funcs MY_PV=${PV/_/} MY_P="${PN}-${MY_PV}" -PVER="20170822" +PVER=20211212 +KERNEL_LIMIT=5.17 DESCRIPTION="The OpenAFS distributed file system" HOMEPAGE="https://www.openafs.org/" @@ -21,31 +23,75 @@ SRC_URI=" LICENSE="IBM BSD openafs-krb5-a APSL-2" SLOT="0" -KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups" - -CDEPEND=" +KEYWORDS="~amd64 -riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +IUSE="apidoc bitmap-later debug doc fuse kauth kerberos +modules +namei +ncurses perl +pthreaded-ubik selinux +supergroups tsm ubik-read-while-write" + +BDEPEND=" + dev-lang/perl + app-alternatives/lex + app-alternatives/yacc + apidoc? ( + app-text/doxygen[dot] + media-gfx/graphviz + ) + doc? ( + dev-libs/libxslt + || ( + dev-java/fop + app-text/dblatex + app-text/docbook-sgml-utils[jadetex] + ) + ) + perl? ( dev-lang/swig )" +DEPEND=" + !net-fs/openafs-kernel + virtual/libcrypt:= virtual/libintl - fuse? ( sys-fs/fuse:0= ) - kerberos? ( virtual/krb5 ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( virtual/pam )" - -DEPEND="${CDEPEND} - virtual/yacc + amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets - dev-libs/libxslt - )" - -RDEPEND="${CDEPEND} - modules? ( ~net-fs/openafs-kernel-${PV} )" + app-text/docbook-xml-dtd:4.3 + ) + fuse? ( sys-fs/fuse:0= ) + kauth? ( sys-libs/pam ) + kerberos? ( virtual/krb5 ) + ncurses? ( sys-libs/ncurses:0= )" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-afs )" S="${WORKDIR}/${MY_P}" PATCHES=( "${WORKDIR}/gentoo/patches" ) +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" + +pkg_pretend() { + if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then + ewarn "Gentoo supports kernels which are supported by OpenAFS" + ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}" + ewarn "" + ewarn "You are free to utilize epatch_user to provide whatever" + ewarn "support you feel is appropriate, but will not receive" + ewarn "support as a result of those changes." + ewarn "" + ewarn "Please do not file a bug report about this." + ewarn "" + ewarn "Alternatively, you may:" + ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it." + ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS." + ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited." + fi +} + +pkg_setup() { + use kernel_linux && linux-mod_pkg_setup +} + src_prepare() { default @@ -53,45 +99,77 @@ src_prepare() { sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \ src/*/Makefile.in || die '*/Makefile.in sed failed' - # packaging is f-ed up, so we can't run eautoreconf + # build system is very delicate, so we can't run eautoreconf # run autotools commands based on what is listed in regen.sh - eaclocal -I src/cf + _elibtoolize -c -f -i + eaclocal -I src/cf -I src/external/rra-c-util/m4 eautoconf eautoconf -o configure-libafs configure-libafs.ac eautoheader einfo "Deleting autom4te.cache directory" - rm -rf autom4te.cache + rm -rf autom4te.cache || die } src_configure() { - local myconf - use debug && use pam && myconf="--enable-debug-pam" + local -a myconf + + # bug #861368 + filter-lto + + if use debug; then + use kauth && myconf+=( --enable-debug-pam ) + use modules && myconf+=( --enable-debug-kernel ) + fi + + if use modules; then + if use kernel_linux; then + if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then + myconf+=( --enable-linux-d_splice_alias-extra-iput ) + fi + myconf+=( --with-linux-kernel-headers="${KV_DIR}" \ + --with-linux-kernel-build="${KV_OUT_DIR}" ) + fi + fi + + use amd64 && use tsm && myconf+=( --enable-tivoli-tsm ) + + local ARCH="$(tc-arch-kernel)" + local MY_ARCH="$(tc-arch)" + local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC" AFS_SYSKVERS=26 \ econf \ - --disable-kernel-module \ --disable-strip-binaries \ $(use_enable bitmap-later) \ $(use_enable debug) \ + $(use_enable debug debug-locks) \ $(use_enable debug debug-lwp) \ $(use_enable fuse fuse-client) \ + $(use_enable kauth) \ + $(use_enable modules kernel-module) \ + $(use_enable namei namei-fileserver) \ $(use_enable ncurses gtx) \ - $(use_enable pam) \ $(use_enable pthreaded-ubik) \ $(use_enable supergroups) \ - $(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \ + $(use_enable ubik-read-while-write) \ + $(use_with apidoc dot) \ + $(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \ $(use_with kerberos krb5) \ - "${myconf}" + $(use_with kerberos gssapi) \ + $(use_with perl swig) \ + "${myconf[@]}" } src_compile() { - emake all_nolibafs + ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 local d if use doc; then - for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do - emake -C "${d}" html; - done + emake -C doc/xml/AdminGuide auagd000.pdf + emake -C doc/xml/AdminRef auarf000.pdf + emake -C doc/xml/QuickStartUnix auqbg000.pdf + emake -C doc/xml/UserGuide auusg000.pdf fi + use apidoc && doxygen doc/doxygen/Doxyfile } src_install() { @@ -100,23 +178,42 @@ src_install() { emake DESTDIR="${ED}" install_nolibafs + if use modules; then + if use kernel_linux; then + local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*) + [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module" + + MODULE_NAMES="libafs(fs/openafs:${srcdir})" + + linux-mod_src_install + fi + fi + insinto /etc/openafs doins src/afsd/CellServDB echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo echo "openafs.org" > "${ED}"/etc/openafs/ThisCell # pam_afs and pam_afs.krb have been installed in irregular locations, fix - if use pam ; then + if use kauth; then dopammod "${ED}"/usr/$(get_libdir)/pam_afs* fi rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die # remove kdump stuff provided by kexec-tools #222455 - rm -rf "${ED}"/usr/sbin/kdump* + rm -rf "${ED}"/usr/sbin/kdump* || die # avoid collision with mit_krb5's version of kpasswd - mv "${ED}"/usr/bin/kpasswd{,_afs} || die - mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die + if use kauth; then + mv "${ED}"/usr/bin/kpasswd{,_afs} || die + mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die + fi + + # avoid collision with heimdal's pagsh + if has_version app-crypt/heimdal; then + mv "${ED}"/usr/bin/pagsh{,_afs} || die + mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die + fi # move lwp stuff around #200674 #330061 mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die @@ -129,16 +226,20 @@ src_install() { || die # minimal documentation - use pam && doman src/pam/pam_afs.5 + use kauth && doman src/pam/pam_afs.5 DOCS=( "${WORKDIR}/gentoo/README.Gentoo" src/afsd/CellServDB NEWS README ) # documentation package - if use doc ; then - DOCS+=( doc/{arch,examples,pdf,protocol,txt} ) - dohtml -r doc/xml/ + rm -rf doc/txt/winnotes || die # unneeded docs + if use doc; then + DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING ) + newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf + newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf + newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf + newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf fi - + use apidoc && DOCS+=( doc/doxygen/output/html ) einstalldocs # Gentoo related scripts @@ -146,7 +247,7 @@ src_install() { newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server - systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf + dotmpfiles "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf systemd_dounit "${SYSTEMDDIR}"/openafs-client.service systemd_dounit "${SYSTEMDDIR}"/openafs-server.service systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf @@ -179,6 +280,13 @@ pkg_preinst() { } pkg_postinst() { + if use modules; then + # Update linker.hints file + use kernel_linux && linux-mod_pkg_postinst + fi + + tmpfiles_process openafs-client.conf + elog "This installation should work out of the box (at least the" elog "client part doing global afs-cell browsing, unless you had" elog "a previous and different configuration). If you want to" @@ -193,6 +301,13 @@ pkg_postinst() { elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited." } +pkg_postrm() { + if use modules; then + # Update linker.hints file + use kernel_linux && linux-mod_pkg_postrm + fi +} + pkg_config() { elog "Setting cache options for systemd." diff --git a/net-fs/s3backer/Manifest b/net-fs/s3backer/Manifest index 0298646a8451..2f0d6ca8b1b8 100644 --- a/net-fs/s3backer/Manifest +++ b/net-fs/s3backer/Manifest @@ -1 +1 @@ -DIST s3backer-1.4.5.tar.gz 103318 BLAKE2B 0fb93418ddf0fe295002fe0335f8ea626b8d0cb584f0fab6bcd60964b8dc14b883b35c2e2a973d542715732efe3afb3f7e214b96208a6f33aa991915a4a9ccdc SHA512 9feb42266639981e6f7da5618ec356a5c87fdc3c26fe17b27773509d161df62dcf4e42efbc4bb5d55e2f1cd9ea4cef563274ed5fd4119cf1fb3924e91180f589 +DIST s3backer-1.6.3.tar.gz 129742 BLAKE2B 05f8b94e9b5e6ffd11b20d5945a9705f1830f3f358c2777695d0c5066bb044bd314d65259ecde299a51288908fcd869b8c516b30b0fbf66975b46a021d4d5bd6 SHA512 f7db1d733a0426df22c1b7d9c1150f8dbfedd0ba2e9120bd61026a481ed52a16f7f09e9e4fcd072cb656da0536cf98472f369eec0195a03b3f105fb3c9a8ba99 diff --git a/net-fs/s3backer/metadata.xml b/net-fs/s3backer/metadata.xml index a288d2e3b71d..f18a0fb25a1f 100644 --- a/net-fs/s3backer/metadata.xml +++ b/net-fs/s3backer/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>kaikaikai@yandex.ru</email> + <name>Alexey Korepanov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="google-code">s3backer</remote-id> <remote-id type="github">archiecobbs/s3backer</remote-id> diff --git a/net-fs/s3backer/s3backer-1.4.5.ebuild b/net-fs/s3backer/s3backer-1.6.3.ebuild index 8a6fa70538ec..5795b7fcbfd6 100644 --- a/net-fs/s3backer/s3backer-1.4.5.ebuild +++ b/net-fs/s3backer/s3backer-1.6.3.ebuild @@ -1,24 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="FUSE-based single file backing store via Amazon S3" HOMEPAGE="https://github.com/archiecobbs/s3backer" -SRC_URI="https://github.com/archiecobbs/s3backer/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/archiecobbs/s3backer/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="net-misc/curl +RDEPEND="dev-libs/expat + dev-libs/openssl:0= + net-misc/curl sys-fs/fuse:0 - sys-libs/zlib - dev-libs/expat - dev-libs/openssl:0=" -RDEPEND="${DEPEND}" + sys-libs/zlib" +DEPEND="${RDEPEND} + elibc_musl? ( sys-libs/queue-standalone )" src_prepare() { default diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest index 1b0a180fd2f9..a98681df8e09 100644 --- a/net-fs/s3fs/Manifest +++ b/net-fs/s3fs/Manifest @@ -1,2 +1 @@ -DIST s3fs-1.80.tar.gz 135891 BLAKE2B a2e38154e1721a88042e49db22bbd607ce0776758a351f5a54e76cb1654518a4d3e30cf9faf3d6d04f6d45d3224491f6e55cbae83ee5b88c27211044255d51d0 SHA512 c98c61198a6c2132f98ef5a8c8f600787cf359c6f79010366f786a3758281257cbf79b4bb47892fd1e9e50d8e46a389125ea67f3828c1c8131cbee5462c74141 -DIST s3fs-1.83.tar.gz 150816 BLAKE2B 1b567708ea6264a619b664c5be3186374dcd3f50f01ac7d9aa093a82520f4685b7adc49a2d9c5a30e64334439c4c2676ae6cc74079251b4e47fe4ff7ad1f5945 SHA512 a925fb09c5786f2ff7fcb458e3cc37cce0eb2bd431b24e582cf02e7656716bfd9b7ffa3647f6f3c56ccfa313d2238cd263f28c2321850c1de082c48ebd9af5cb +DIST s3fs-1.94.tar.gz 291170 BLAKE2B 86a0271cfedc38778b4e8a50cb4515a3b921e0c69618ff7b2db411a95c3ed37e43f5e394c47937fd9072530177faf4f014e395feb519e995bf386d538318d3bf SHA512 1a29d4f0b73f844ea1d4ad6e0b36d601fb7ab5818af0a90564b77182564c04fbef308362a9a749038b17f28f07f79b6debb661610f69c039a405b931361abe9c diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml index ea9d9e2e2caf..b9a262d42a8d 100644 --- a/net-fs/s3fs/metadata.xml +++ b/net-fs/s3fs/metadata.xml @@ -1,16 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>rini17@gmail.com</email> - <name>Juraj Variny</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <use> - <flag name="openssl">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.80.ebuild b/net-fs/s3fs/s3fs-1.80.ebuild deleted file mode 100644 index e04bd356019f..000000000000 --- a/net-fs/s3fs/s3fs-1.80.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MY_PN=${PN}-fuse -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Amazon S3 mounting via fuse" -HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="openssl nss gnutls nettle" -REQUIRED_USE=" - ^^ ( openssl nss gnutls ) - nettle? ( gnutls )" - -CDEPEND=" - >=dev-libs/libxml2-2.6:2 - openssl? ( dev-libs/openssl:0 ) - nss? ( dev-libs/nss ) - gnutls? ( net-libs/gnutls ) - nettle? ( dev-libs/nettle ) - >=net-misc/curl-7.0 - >=sys-fs/fuse-2.8.4" - -RDEPEND=" - ${CDEPEND} - app-misc/mime-types" - -DEPEND=" - ${CDEPEND} - virtual/pkgconfig" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with nss) \ - $(use_with nettle) \ - $(use_with gnutls) \ - $(use_with openssl) -} diff --git a/net-fs/s3fs/s3fs-1.83.ebuild b/net-fs/s3fs/s3fs-1.83.ebuild deleted file mode 100644 index 434d6f6bf7a7..000000000000 --- a/net-fs/s3fs/s3fs-1.83.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MY_PN=${PN}-fuse -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Amazon S3 mounting via fuse" -HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="openssl nss gnutls nettle" -REQUIRED_USE=" - ^^ ( openssl nss gnutls ) - nettle? ( gnutls )" - -CDEPEND=" - >=dev-libs/libxml2-2.6:2 - openssl? ( dev-libs/openssl:0= ) - nss? ( dev-libs/nss ) - gnutls? ( net-libs/gnutls:= ) - nettle? ( dev-libs/nettle:= ) - >=net-misc/curl-7.0 - >=sys-fs/fuse-2.8.4:0" - -RDEPEND=" - ${CDEPEND} - app-misc/mime-types" - -DEPEND=" - ${CDEPEND} - virtual/pkgconfig" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with nss) \ - $(use_with nettle) \ - $(use_with gnutls) \ - $(use_with openssl) -} diff --git a/net-fs/s3fs/s3fs-1.94.ebuild b/net-fs/s3fs/s3fs-1.94.ebuild new file mode 100644 index 000000000000..910f7f8298c2 --- /dev/null +++ b/net-fs/s3fs/s3fs-1.94.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN=${PN}-fuse +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Amazon S3 mounting via fuse" +HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~riscv x86" +IUSE="gnutls nettle nss" +REQUIRED_USE="nettle? ( gnutls !nss )" + +# 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 + nss? ( dev-libs/nss ) + !nss? ( + gnutls? ( + net-libs/gnutls:= + nettle? ( dev-libs/nettle:= ) + ) + !gnutls? ( dev-libs/openssl:0= ) + ) +" + +RDEPEND="${DEPEND} + app-misc/mime-types +" + +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + sed -i 's/ -D_FORTIFY_SOURCE=3//' configure.ac || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with nettle) + ) + 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/s3ql/Manifest b/net-fs/s3ql/Manifest deleted file mode 100644 index 6aef701b7ce2..000000000000 --- a/net-fs/s3ql/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST s3ql-2.24.tar.bz2 773766 BLAKE2B e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f SHA512 20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc -DIST s3ql-2.25.tar.bz2 770189 BLAKE2B d0d3c7656f93b7bdac97ab7b9afdb6b53c6e909a5fd4e5a1cf9e5c153d81349dfb809409f79ec45768297e7c7eb89a590338cb9726b2eda51b3ca02734fa1001 SHA512 e2aa9f5d68a00b36ae33a7d36bf4aa42f761fb7e2cfb8370c914a78d0ed54edab85dd224fa7ef08e9e240161f5c66e46c0cbe99b6c5451cab3a50f33c78bde36 -DIST s3ql-2.26.tar.bz2 775435 BLAKE2B e30d0108522e3bca2e3e16138c418af553d4a0cb502671b70dee689be2795c02bc4fb47a2aa5d225a1ad748c7fadc099ff28443c9dedba737d89e8efabb455a0 SHA512 5bdf89fba0a0d354dbdb84bdc3f31a2cefaf3bc701989b9f413c428cb2de9e7449255c3f7ed775fccd2f2fbe3bdb3156ecfb43de5a958dedb83ba63399427569 -DIST s3ql-2.28.tar.bz2 779646 BLAKE2B 3ca734d6aac9118da03566080ae46514d83829a132f57741ffc509e6dfe80a2cbbdbe93f84598302c7dbebd188bd5148eda00a6e5dae378ff91742c026c9ef63 SHA512 089d0c47d9e507aa22a162ffbcb8703188d84cbc83d73c30629897250574603edc1ebbddc81682edf2cdd42b10cc6fe55e69d71339f68bfe537f862eeadbd883 -DIST s3ql-2.32.tar.bz2 1167243 BLAKE2B 41107069e2f02b38c704e61bbd531c82fe7dde9aaf82dc6b400d27206456772fbbda41f13c3eee7d0a8eb7ae2a6855fefea3406d9295ceb309cb21317379e316 SHA512 c4c929f182ca06fea58edd26e9eb8044276af68607106bdf1df44f0eff86fa51c1d10f32a55717c300984c4d8cb956506cb195aa9e97842568934dcedff51369 -DIST s3ql-2.33.tar.bz2 845921 BLAKE2B 914c8e029fd10c82eb932a4a68d3771905255763a9ebc88ee5503892d1eb5f1a9c355d2f041fef77afedc5a7237e79db931768667602d7987b41a7c6805a2fa7 SHA512 fbc3895008f19de43c8a90a0896631200e8d292027d8bebc8197271a5677c9922498a7762696b057c067e5b906830f2a88f87d5615d60f24fdfa58972fb367fb diff --git a/net-fs/s3ql/metadata.xml b/net-fs/s3ql/metadata.xml deleted file mode 100644 index 38ca05fddf8f..000000000000 --- a/net-fs/s3ql/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> - </maintainer> - <use> - <flag name="contrib">Install additional contributed scripts</flag> - </use> - <upstream> - <remote-id type="google-code">s3ql</remote-id> - <remote-id type="bitbucket">nikratio/s3ql</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-fs/s3ql/s3ql-2.24.ebuild b/net-fs/s3ql/s3ql-2.24.ebuild deleted file mode 100644 index 66221db6c565..000000000000 --- a/net-fs/s3ql/s3ql-2.24.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A full-featured file system for online data storage" -HOMEPAGE="https://bitbucket.org/nikratio/s3ql/" -SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib doc test" - -RDEPEND=">=dev-db/sqlite-3.7.0:3 - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dugong-3.4[${PYTHON_USEDEP}] - >=dev-python/llfuse-1.0[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sys-fs/fuse:0" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - net-misc/rsync[xattr] - )" - -RESTRICT="test" - -python_test() { - addwrite /dev/fuse - py.test -v tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - if use contrib ; then - exeinto /usr/share/doc/${PF}/contrib - docompress -x /usr/share/doc/${PF}/contrib - doexe contrib/*.{py,sh} - doman contrib/*.1 - fi - - if use doc ; then - dodoc doc/manual.pdf - dodoc -r doc/html - fi -} diff --git a/net-fs/s3ql/s3ql-2.25.ebuild b/net-fs/s3ql/s3ql-2.25.ebuild deleted file mode 100644 index 66221db6c565..000000000000 --- a/net-fs/s3ql/s3ql-2.25.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A full-featured file system for online data storage" -HOMEPAGE="https://bitbucket.org/nikratio/s3ql/" -SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib doc test" - -RDEPEND=">=dev-db/sqlite-3.7.0:3 - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dugong-3.4[${PYTHON_USEDEP}] - >=dev-python/llfuse-1.0[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sys-fs/fuse:0" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - net-misc/rsync[xattr] - )" - -RESTRICT="test" - -python_test() { - addwrite /dev/fuse - py.test -v tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - if use contrib ; then - exeinto /usr/share/doc/${PF}/contrib - docompress -x /usr/share/doc/${PF}/contrib - doexe contrib/*.{py,sh} - doman contrib/*.1 - fi - - if use doc ; then - dodoc doc/manual.pdf - dodoc -r doc/html - fi -} diff --git a/net-fs/s3ql/s3ql-2.26.ebuild b/net-fs/s3ql/s3ql-2.26.ebuild deleted file mode 100644 index 66221db6c565..000000000000 --- a/net-fs/s3ql/s3ql-2.26.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A full-featured file system for online data storage" -HOMEPAGE="https://bitbucket.org/nikratio/s3ql/" -SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib doc test" - -RDEPEND=">=dev-db/sqlite-3.7.0:3 - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dugong-3.4[${PYTHON_USEDEP}] - >=dev-python/llfuse-1.0[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sys-fs/fuse:0" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - net-misc/rsync[xattr] - )" - -RESTRICT="test" - -python_test() { - addwrite /dev/fuse - py.test -v tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - if use contrib ; then - exeinto /usr/share/doc/${PF}/contrib - docompress -x /usr/share/doc/${PF}/contrib - doexe contrib/*.{py,sh} - doman contrib/*.1 - fi - - if use doc ; then - dodoc doc/manual.pdf - dodoc -r doc/html - fi -} diff --git a/net-fs/s3ql/s3ql-2.28.ebuild b/net-fs/s3ql/s3ql-2.28.ebuild deleted file mode 100644 index 66221db6c565..000000000000 --- a/net-fs/s3ql/s3ql-2.28.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A full-featured file system for online data storage" -HOMEPAGE="https://bitbucket.org/nikratio/s3ql/" -SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib doc test" - -RDEPEND=">=dev-db/sqlite-3.7.0:3 - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dugong-3.4[${PYTHON_USEDEP}] - >=dev-python/llfuse-1.0[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sys-fs/fuse:0" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - net-misc/rsync[xattr] - )" - -RESTRICT="test" - -python_test() { - addwrite /dev/fuse - py.test -v tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - if use contrib ; then - exeinto /usr/share/doc/${PF}/contrib - docompress -x /usr/share/doc/${PF}/contrib - doexe contrib/*.{py,sh} - doman contrib/*.1 - fi - - if use doc ; then - dodoc doc/manual.pdf - dodoc -r doc/html - fi -} diff --git a/net-fs/s3ql/s3ql-2.32.ebuild b/net-fs/s3ql/s3ql-2.32.ebuild deleted file mode 100644 index 5671ac728470..000000000000 --- a/net-fs/s3ql/s3ql-2.32.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A full-featured file system for online data storage" -HOMEPAGE="https://bitbucket.org/nikratio/s3ql/" -SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib doc systemd test" - -RDEPEND=">=dev-db/sqlite-3.7.0:3 - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dugong-3.4[${PYTHON_USEDEP}] - >=dev-python/llfuse-1.0[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sys-fs/fuse:0 - systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - net-misc/rsync[xattr] - )" - -RESTRICT="test" - -python_test() { - addwrite /dev/fuse - py.test -v tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - if use contrib ; then - exeinto /usr/share/doc/${PF}/contrib - docompress -x /usr/share/doc/${PF}/contrib - doexe contrib/*.{py,sh} - doman contrib/*.1 - fi - - if use doc ; then - dodoc doc/manual.pdf - dodoc -r doc/html - fi -} diff --git a/net-fs/s3ql/s3ql-2.33.ebuild b/net-fs/s3ql/s3ql-2.33.ebuild deleted file mode 100644 index 4fe0eeaebf22..000000000000 --- a/net-fs/s3ql/s3ql-2.33.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit distutils-r1 - -DESCRIPTION="A full-featured file system for online data storage" -HOMEPAGE="https://github.com/s3ql/s3ql" -SRC_URI="https://github.com/s3ql/s3ql/releases/download/release-${PV}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="contrib doc systemd test" - -RDEPEND=">=dev-db/sqlite-3.7.0:3 - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/apsw-3.7.0[${PYTHON_USEDEP}] - >=dev-python/dugong-3.4[${PYTHON_USEDEP}] - >=dev-python/llfuse-1.0[${PYTHON_USEDEP}] - dev-python/pycryptodome[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - sys-fs/fuse:0 - systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - net-misc/rsync[xattr] - )" - -RESTRICT="test" - -python_test() { - addwrite /dev/fuse - py.test -v tests || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - if use contrib ; then - exeinto /usr/share/doc/${PF}/contrib - docompress -x /usr/share/doc/${PF}/contrib - doexe contrib/*.{py,sh} - doman contrib/*.1 - fi - - if use doc ; then - dodoc doc/manual.pdf - dodoc -r doc/html - fi -} diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index d2cd90f4f366..4051370da83a 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,10 +1,7 @@ -DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf -DIST samba-4.10.5.tar.gz 18290612 BLAKE2B 731ea29b02db5158c5cc564d5663e3f9552d7e1164ed8a41738dba8656692b685cc9a7ba57e8cd32fe9a1cb24eed5373929d2b805bf3da3982c0f4b1246883d0 SHA512 82961791a43511aa42f0d648edd13f0533cb20e1d673903e6a1f6235b0df19dfc0755ab0c8e6d4518ca19c188968a38a6c8e8c80d05a20141c097fb0b3e2b795 -DIST samba-4.10.6.tar.gz 18306135 BLAKE2B 236598c26294e1b7b23e48eba7d6429eec01e65a4a73a45fea16ef0e0b7cf1c7b861d824e860bc178d358c298400e829577525b0438e0384fca7bf4409bd69f0 SHA512 6c06a55ac686210965cf52f79190700a3d3a5cba8ea54b32e5bdb4d6b6167f1fa9aef308c3d5fdc7078496aa78b46d5cea3c623438d3a049b11fc58d334f8d0f -DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d -DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f -DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac -DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b -DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273 -DIST samba-4.9.11.tar.gz 18095745 BLAKE2B d06a15608f71e73e26dbb15ddfb3512a0cd6f6ce5cffe663451cdf1552473c28cc5a66fc5e28d0e3fbfc80be8524903bd42d75050b664e713efdb09855175bdf SHA512 3d1cd7e3f1ffbfa6bb44fe0cb12be47dd17c9b614b6509ecec20210ac734fa1ab90ea5d2d2180fe7c80bd4eb5bb9a73a09183edf70bdd28dde2d33e092c9e71a -DIST samba-4.9.9.tar.gz 18080757 BLAKE2B 3cfe741d21584d74654607d6c1450b67f80524f5809607b0c796fad501c06b34ddfb8eb7ef639cca70e8bc54f53805be4c45d78eeb2760aa7728ba907e99589f SHA512 636fc7073cf9dc9ff9bfe46403d35d7a058024708d090bd0ecc7e900a8468ffb7c9a8d564b2df85758c4ef3d184ed3f2c8fa3079ece13d6b9afa816136f0b608 +DIST samba-4.18.10.tar.gz 41352009 BLAKE2B 191928a3b0b2ff203de83a208dd61ac047bc666b744b0ba16a8f9a7e2e072438e2980bf0096ac95cc44003526b2098e763a29b4317083a1e3192f7e3cae2ab85 SHA512 19fed2644b1cb5a5bddca6c7eb2da11b4faf224b060b52ac9131f321d194dc650ea3082051960253e2ce627cdc06ef396778fa0f95e3e9b79f74cd1422577d80 +DIST samba-4.18.11.tar.gz 41352059 BLAKE2B b2a39079286c5c0ca7beec99597ef6004c37eb81e7772b010c78b95b468b48d0370941717b8b919f0308e5313be4fc6a09374460eb2a0d2d7b26e3a8cea996d0 SHA512 7ae0f739070133c803fff3daf27ae2b0adff7336affb4898b07e5ca13bd6658228e8796565374e5a2c14e0b16ae84f404d3a62454096cacccc120520d379199f +DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246 +DIST samba-4.18.9.tar.gz 41332779 BLAKE2B 8a0769c73d42b941b6f69d62243dd2b93d66748231465b853320cf1bf4b3dd8a912ac7bddfaa9c8b1941788951c2ccd630dabb23cf94965bc1d1e4cb5d74d123 SHA512 93a6c878bca583f59208df2a7865bbd453f7a65dc2f39a863797ef807bdeced4d632c5edd4579e341f8cf3b0b2fbe41e68a815a1510518bdd43e9a25a973c94c +DIST samba-4.19.4.tar.gz 41839810 BLAKE2B b5916478d9385eff93d852b61eaa835e04eef7d813175b7011dfab518d3115707895a67f34fc4bb6afc2a1e3b2f60af8d30cd5a32b59d8ec48977c7eefd1b906 SHA512 9a66f685cb1b5b89c59c75ccb67292b3f792b40b30ca76dfc483e805f5bb680bac027117a28a117f42713452fca41c439bed1724ba7d436fe0b0cb30a34f5b45 +DIST samba-4.19.6.tar.gz 41847853 BLAKE2B 42a1756f3cb1cd48da5abe043357e15b294148b88fdcb2502394372628a17a729ffb5ea070a967face2dfb76e319cdf6fa56d611c369baddf54e998164d782ca SHA512 23172f4393deb9c520182ffb1acb3cf3e53391d4276fffe98527f2f514f969c0952e6e59bcd90f11385dc51367a7bb9cd0534fa9fc3814f16bfb88f41609d0f5 +DIST samba-4.20.0.tar.gz 42433302 BLAKE2B 97cdfdaf118fcd9b44aef0134d211e243a6e2468d90449b9c5ac55c9a8c4dc1e63bf9eb2be9878dc70609c830f90b08b4d1dbf80d7e947c10219043def970d24 SHA512 e820739706992ef3b4e3a7a771ad5d8efc6b87d5ccdcee7ebd41483d90fa3cc0420ba9680d059e71d7083c9c12b0d36deafcdce0224560f49bbfc3a277e7e77c diff --git a/net-fs/samba/files/4.4/samba4.initd-r1 b/net-fs/samba/files/4.4/samba4.initd-r1 index 05bd1fcfd695..0a5289828525 100644 --- a/net-fs/samba/files/4.4/samba4.initd-r1 +++ b/net-fs/samba/files/4.4/samba4.initd-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 or later extra_started_commands="reload" @@ -7,7 +7,6 @@ extra_started_commands="reload" depend() { after slapd - need net use cupsd } diff --git a/net-fs/samba/files/cmocka-config_h.patch b/net-fs/samba/files/cmocka-config_h.patch new file mode 100644 index 000000000000..124928450cd6 --- /dev/null +++ b/net-fs/samba/files/cmocka-config_h.patch @@ -0,0 +1,23 @@ +--- ./third_party/cmocka/cmocka.h.orig 2024-03-26 10:23:03.378410042 +0100 ++++ ./third_party/cmocka/cmocka.h 2024-03-26 10:24:51.526922405 +0100 +@@ -14,6 +14,11 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #ifndef CMOCKA_H_ + #define CMOCKA_H_ + +@@ -111,7 +114,7 @@ + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; diff --git a/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch new file mode 100644 index 000000000000..4578435064b0 --- /dev/null +++ b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch @@ -0,0 +1,12 @@ +--- ldb-1.3.6/lib/tevent/wscript ++++ ldb-1.3.6/lib/tevent/wscript +@@ -34,8 +34,7 @@ + if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, + onlyif='talloc', implied_deps='replace talloc'): + conf.define('USING_SYSTEM_TEVENT', 1) +- if not conf.env.disable_python and \ +- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): ++ if not conf.env.disable_python: + conf.define('USING_SYSTEM_PYTEVENT', 1) + + if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): diff --git a/net-fs/samba/files/nmbd.service b/net-fs/samba/files/nmbd.service deleted file mode 100644 index 44b4ffba1f7f..000000000000 --- a/net-fs/samba/files/nmbd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Samba NetBIOS name server -After=network.target - -[Service] -Type=forking -PIDFile=/var/run/samba/nmbd.pid -ExecStart=/usr/sbin/nmbd -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch deleted file mode 100644 index 12b2df3a5979..000000000000 --- a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001 -From: Andrew Bartlett <abartlet@samba.org> -Date: Wed, 20 Mar 2019 13:57:50 +1300 -Subject: [PATCH] build: Allow build when --disable-gnutls is set - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844 - -Signed-off-by: Andrew Bartlett <abartlet@samba.org> ---- - lib/mscat/wscript | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lib/mscat/wscript b/lib/mscat/wscript -index 7ca9ef567ee..4d1f752a3c1 100644 ---- a/lib/mscat/wscript -+++ b/lib/mscat/wscript -@@ -12,7 +12,11 @@ def configure(conf): - if not conf.find_program('asn1Parser', var='ASN1PARSER'): - Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)') - -- conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') -+ # GnuTLS is currently able to be disabled -+ if conf.env.enable_gnutls: -+ conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls') -+ else: -+ Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built') - - def build(bld): - if (bld.CONFIG_SET('HAVE_LIBTASN1') and --- -2.11.0 - 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/files/samba-4.5.1-compile_et_fix.patch b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch deleted file mode 100644 index 463512f9a9c8..000000000000 --- a/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- samba-4.5.1/source4/heimdal_build/wscript_configure -+++ samba-4.5.1/source4/heimdal_build/wscript_configure -@@ -258,7 +258,11 @@ - - # With the proper checks in place we should be able to build against the system libtommath. - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -+# comment out next line to stop Gentoo Samba build from using the compile_et in e2fsprogs-libs -+# to compile the error tables. This produces a compile error later on. -+#check_system_heimdal_binary("compile_et") -+# -+# As a precaution do the same for asn1_compile -+#check_system_heimdal_binary("asn1_compile") diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch deleted file mode 100644 index 9fad9fca44fb..000000000000 --- a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://lists.samba.org/archive/samba-technical/2017-December/124344.html -https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836 - -From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001 -From: Zentaro Kavanagh <zentaro@chromium.org> -Date: Mon, 11 Dec 2017 12:41:16 -0800 -Subject: [PATCH] Remove unsupported colon from configure msg. - -- When cross-compiling an answers file must be supplied via - --cross-compile --cross-answers=<path to answers>. -- The lines in the answer file have the form; - Config Msg: Answer -- The colon is used to delimit the msg and the answer when reading - the answers file. -- WAF doesn't support the message containing a colon. -- It's not possible to override this variable so cross compile fails. - -Signed-off-by: Zentaro Kavanagh <zentaro@google.com> -Reviewed-by: Uri Simchoni <uri@samba.org> -Reviewed-by: Andrew Bartlett <abartlet@samba.org> ---- - wscript_configure_system_mitkrb5 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 -index 9c351131ad1a..803dad7ab63b 100644 ---- a/wscript_configure_system_mitkrb5 -+++ b/wscript_configure_system_mitkrb5 -@@ -282,7 +282,7 @@ conf.CHECK_CODE(''' - ''', - 'HAVE_WRFILE_KEYTAB', - headers='krb5.h', lib='krb5', execute=True, -- msg="Checking whether the WRFILE:-keytab is supported"); -+ msg="Checking whether the WRFILE -keytab is supported"); - # Check for KRB5_DEPRECATED handling - conf.CHECK_CODE('''#define KRB5_DEPRECATED 1 - #include <krb5.h>''', --- -2.15.1 - diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch deleted file mode 100644 index 1093b1de71df..000000000000 --- a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch +++ /dev/null @@ -1,36 +0,0 @@ -Do not install the python DSDB modules when ADDC is disabled. -This is a change integrated upstream in 4.9.1 (or earlier). - -Without this, the python dsdb_dns.so module is installed, which -is linked to libdnsserver-common.so that is NOT installed, and so -potential breakage ensues. - ---- a/source4/dsdb/wscript_build 2018-01-17 03:08:39.000000000 -0500 -+++ b/source4/dsdb/wscript_build 2018-11-08 10:43:58.064486832 -0500 -@@ -63,10 +63,11 @@ - ) - - bld.SAMBA_PYTHON('python_dsdb', - source='pydsdb.c', - # the dependency on dcerpc here is because gensec - # depends on dcerpc but the waf circular dependency finder - # removes it so we end up with unresolved symbols. - deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones', -- realname='samba/dsdb.so' -+ realname='samba/dsdb.so', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED() - ) ---- a/source4/dns_server/wscript_build 2018-11-08 11:49:03.450296286 -0500 -+++ b/source4/dns_server/wscript_build 2018-11-08 11:49:23.327864408 -0500 -@@ -64,9 +64,10 @@ - private_library=True, - deps='samba-hostconfig samdb-common gensec popt dnsserver_common', - enabled=bld.AD_DC_BUILD_IS_ENABLED()) - - - bld.SAMBA_PYTHON('python_dsdb_dns', - source='pydns.c', - deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util', -- realname='samba/dsdb_dns.so') -+ realname='samba/dsdb_dns.so', -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()) diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch b/net-fs/samba/files/samba-4.9.2-timespec.patch deleted file mode 100644 index c82f4af4e7ea..000000000000 --- a/net-fs/samba/files/samba-4.9.2-timespec.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 11e8c14b78e2423041f3846882f74cd6490a3e44 Mon Sep 17 00:00:00 2001 -From: Joan Karadimov <joan@profuzdigital.com> -Date: Thu, 18 Oct 2018 18:16:17 +0300 -Subject: [PATCH] Fix compatibility issues with the timespec struct - ---- - source3/include/libsmbclient.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h -index 5e4a1715402..6487ea7a8aa 100644 ---- a/source3/include/libsmbclient.h -+++ b/source3/include/libsmbclient.h -@@ -78,6 +78,7 @@ extern "C" { - #include <sys/statvfs.h> - #include <stdint.h> - #include <fcntl.h> -+#include <time.h> - #include <utime.h> - - #define SMBC_BASE_FD 10000 /* smallest file descriptor returned */ diff --git a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch deleted file mode 100644 index e66446845f24..000000000000 --- a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://attachments.samba.org/attachment.cgi?id=13172 -https://bugs.gentoo.org/637320 - ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -71,7 +71,7 @@ - conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') - conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') - -- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') -+ conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') - - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') - conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf index e0a6f325cf9a..8e6e9dd8a158 100644 --- a/net-fs/samba/files/samba.conf +++ b/net-fs/samba/files/samba.conf @@ -1,2 +1,8 @@ -D /run/samba 0755 root root -D /run/lock/samba 0755 root root +d /run/samba +d /run/ctdb +d /run/lock/samba +d /var/cache/samba +d /var/lib/ctdb +d /var/lib/samba/bind-dns +d /var/lib/samba/private +d /var/log/samba diff --git a/net-fs/samba/files/samba.service b/net-fs/samba/files/samba.service deleted file mode 100644 index 8214ff863182..000000000000 --- a/net-fs/samba/files/samba.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Samba AD server -After=network.target winbindd.service -Conflicts=nmbd.service smbd.service - -[Service] -ExecStart=/usr/sbin/samba --interactive - -[Install] -WantedBy=multi-user.target diff --git a/net-fs/samba/files/smbd.service b/net-fs/samba/files/smbd.service deleted file mode 100644 index 5c006a44edb6..000000000000 --- a/net-fs/samba/files/smbd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Samba SMB/CIFS server -After=network.target nmbd.service winbindd.service - -[Service] -Type=forking -PIDFile=/var/run/samba/smbd.pid -ExecStart=/usr/sbin/smbd -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-fs/samba/files/smbd.socket b/net-fs/samba/files/smbd.socket deleted file mode 100644 index 833bf438832f..000000000000 --- a/net-fs/samba/files/smbd.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Samba SMB/CIFS server socket - -[Socket] -ListenStream=445 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/net-fs/samba/files/smbd_at.service b/net-fs/samba/files/smbd_at.service deleted file mode 100644 index e1f71be3f7fa..000000000000 --- a/net-fs/samba/files/smbd_at.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Samba SMB/CIFS server instance - -[Service] -ExecStart=/usr/sbin/smbd -F -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket diff --git a/net-fs/samba/files/talloc-disable-python.patch b/net-fs/samba/files/talloc-disable-python.patch deleted file mode 100644 index 6ef45eb37fb8..000000000000 --- a/net-fs/samba/files/talloc-disable-python.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/lib/talloc/wscript 2017-04-28 04:57:26.000000000 -0400 -+++ b/lib/talloc/wscript 2017-07-05 14:30:42.700580464 -0400 -@@ -74,19 +74,22 @@ - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) - -- using_system_pytalloc_util = True -- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, -- implied_deps='talloc replace'): -+ if conf.env.disable_python: - using_system_pytalloc_util = False -- -- # We need to get a pytalloc-util for all the python versions -- # we are building for -- if conf.env['EXTRA_PYTHON']: -- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -+ else: -+ using_system_pytalloc_util = True -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): - using_system_pytalloc_util = False - -+ # We need to get a pytalloc-util for all the python versions -+ # we are building for -+ if conf.env['EXTRA_PYTHON']: -+ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -+ implied_deps='talloc replace'): -+ using_system_pytalloc_util = False -+ - if using_system_pytalloc_util: - conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) - diff --git a/net-fs/samba/files/winbindd.service b/net-fs/samba/files/winbindd.service deleted file mode 100644 index 67a778fc76c7..000000000000 --- a/net-fs/samba/files/winbindd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Samba Winbind daemon -After=network.target nmbd.service - -[Service] -Type=forking -PIDFile=/var/run/samba/winbindd.pid -ExecStart=/usr/sbin/winbindd -D -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml index fb277df6bb3b..0839deab51b0 100644 --- a/net-fs/samba/metadata.xml +++ b/net-fs/samba/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>samba@gentoo.org</email> @@ -10,24 +10,28 @@ </longdescription> <use> <flag name="addc">Enable Active Directory Domain Controller support</flag> - <flag name="addns">Enable AD DNS integration</flag> <flag name="ads">Enable Active Directory support</flag> <flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag> <flag name="client">Enables the client part</flag> <flag name="cluster">Enable support for clustering</flag> - <flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag> + <flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag> <flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag> <flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag> <flag name="iprint">Enabling iPrint technology by Novell</flag> <flag name="profiling-data">Enables support for collecting profiling data</flag> <flag name="quota">Enables support for user quotas</flag> + <flag name="regedit">Enable support for regedit command-line tool</flag> + <flag name="snapper">Enable vfs_snapper module (requires <pkg>sys-apps/dbus</pkg>)</flag> + <flag name="spotlight">Enable support for spotlight backend</flag> <flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of bundled heimdal.</flag> <flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of <pkg>app-crypt/heimdal</pkg>.</flag> + <flag name="unwind">Enable libunwind usage for backtraces</flag> <flag name="winbind">Enables support for the winbind auth daemon</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:samba:samba</remote-id> + <remote-id type="gitlab">samba-team/samba</remote-id> </upstream> </pkgmetadata> diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild deleted file mode 100644 index 636b9efa77a8..000000000000 --- a/net-fs/samba/samba-4.10.2.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap -pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - json? ( dev-libs/jansson ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls json winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.9.2-timespec.patch" - "${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - if ! use test ; then - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - fi - - # ugly hackaround for bug #592502 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die - - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ - -i source4/dsdb/samdb/ldb_modules/password_hash.c \ - || die - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - ) - - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.10.5.ebuild b/net-fs/samba/samba-4.10.5.ebuild deleted file mode 100644 index 9abce7be82cd..000000000000 --- a/net-fs/samba/samba-4.10.5.ebuild +++ /dev/null @@ -1,309 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal -+system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - json? ( dev-libs/jansson ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls json winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.9.2-timespec.patch" - "${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - if ! use test ; then - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - fi - - # ugly hackaround for bug #592502 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die - - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ - -i source4/dsdb/samdb/ldb_modules/password_hash.c \ - || die - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - $(use_with profiling-data) - ) - - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.10.6.ebuild b/net-fs/samba/samba-4.10.6.ebuild deleted file mode 100644 index 3d065562f7cc..000000000000 --- a/net-fs/samba/samba-4.10.6.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal -+system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - json? ( dev-libs/jansson ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls json winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.9.2-timespec.patch" - "${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - if ! use test ; then - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - fi - - # ugly hackaround for bug #592502 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die - - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ - -i source4/dsdb/samdb/ldb_modules/password_hash.c \ - || die - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - $(use_with profiling-data) - ) - - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_install_all() { - # Attempt to fix bug #673168 - find "${ED}" -type d -name "Yapp" -print0 \ - | xargs -0 --no-run-if-empty rm -r || die -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.18.10.ebuild b/net-fs/samba/samba-4.18.10.ebuild new file mode 100644 index 000000000000..be5091996562 --- /dev/null +++ b/net-fs/samba/samba-4.18.10.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.0" +TDB_VERSION="1.4.8" +TEVENT_VERSION="0.14.1" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.18.11.ebuild b/net-fs/samba/samba-4.18.11.ebuild new file mode 100644 index 000000000000..853948ccc18f --- /dev/null +++ b/net-fs/samba/samba-4.18.11.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.0" +TDB_VERSION="1.4.8" +TEVENT_VERSION="0.14.1" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + !system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.18.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild new file mode 100644 index 000000000000..6d1877fa6e7b --- /dev/null +++ b/net-fs/samba/samba-4.18.8.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}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.18.9.ebuild b/net-fs/samba/samba-4.18.9.ebuild new file mode 100644 index 000000000000..1acb8412bd5c --- /dev/null +++ b/net-fs/samba/samba-4.18.9.ebuild @@ -0,0 +1,384 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.0" +TDB_VERSION="1.4.8" +TEVENT_VERSION="0.14.1" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch + "${FILESDIR}"/cmocka-config_h.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + --accel-aes=$(usex cpu_flags_x86_aes intelaesni none) + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.19.4.ebuild b/net-fs/samba/samba-4.19.4.ebuild new file mode 100644 index 000000000000..9903c474ab38 --- /dev/null +++ b/net-fs/samba/samba-4.19.4.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..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 + "${FILESDIR}"/cmocka-config_h.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(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.6.ebuild b/net-fs/samba/samba-4.19.6.ebuild new file mode 100644 index 000000000000..24963862293b --- /dev/null +++ b/net-fs/samba/samba-4.19.6.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.1" +TDB_VERSION="1.4.9" +TEVENT_VERSION="0.15.0" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.8.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}] ) + !system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") + $(use_with debug lttng) + $(use_with ldap) + $(use_with profiling-data) + # bug #683148 + --jobs 1 + ) + + if multilib_is_native_abi ; then + myconf+=( --with-shared-modules=${SHAREDMODS} ) + else + myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) + fi + + append-cppflags "-I${ESYSROOT}/usr/include/et" + + waf-utils_src_configure ${myconf[@]} +} + +multilib_src_compile() { + waf-utils_src_compile +} + +multilib_src_test() { + if multilib_is_native_abi ; then + "${WAF_BINARY}" test || die "Test failed" + fi +} + +multilib_src_install() { + waf-utils_src_install + + # Make all .so files executable + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die + # smbspool_krb5_wrapper must only be accessible to root, bug #880739 + find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die + + # Remove empty runtime dirs created by build system (bug #892341) + find "${ED}"/{run,var} -type d -empty -delete || die + + if multilib_is_native_abi ; then + # Install ldap schema for server (bug #491002) + if use ldap ; then + insinto /etc/openldap/schema + doins examples/LDAP/samba.schema + fi + + # Create symlink for cups (bug #552310) + if use cups ; then + dosym ../../../bin/smbspool \ + /usr/libexec/cups/backend/smb + fi + + # Install example config file + insinto /etc/samba + doins examples/smb.conf.default + + # Fix paths in example file (bug #603964) + sed \ + -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ + -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ + -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ + -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ + -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ + -i "${ED}"/etc/samba/smb.conf.default || die + + # Install init script and conf.d file + newinitd "${CONFDIR}/samba4.initd-r1" samba + newconfd "${CONFDIR}/samba4.confd" samba + + dotmpfiles "${FILESDIR}"/samba.conf + if ! use addc ; then + rm "${D}/$(systemd_get_systemunitdir)/samba.service" \ + || die + fi + + # Preserve functionality for old gentoo-specific unit names + dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service" + dosym smb.service "$(systemd_get_systemunitdir)/smbd.service" + dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service" + fi + + if use pam && use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + # bugs #376853 and #590374 + insinto /etc/security + doins examples/pam_winbind/pam_winbind.conf + fi +} + +pkg_postinst() { + tmpfiles_process samba.conf +} diff --git a/net-fs/samba/samba-4.20.0.ebuild b/net-fs/samba/samba-4.20.0.ebuild new file mode 100644 index 000000000000..5cdececc5c61 --- /dev/null +++ b/net-fs/samba/samba-4.20.0.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+),xml(+)" +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles + +DESCRIPTION="Samba Suite Version 4" +HOMEPAGE="https://samba.org/" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} == *_rc* ]]; then + SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz" +else + SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + addc? ( json python !system-mitkrb5 winbind ) + ads? ( acl ldap python winbind ) + cluster? ( ads ) + gpg? ( addc ) + spotlight? ( json ) + test? ( python ) + !ads? ( !addc ) + ?? ( system-heimdal system-mitkrb5 ) +" + +# the test suite is messed, it uses system-installed samba +# bits instead of what was built, tests things disabled via use +# flags, and generally just fails to work in a way ebuilds could +# rely on in its current state +RESTRICT="test" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/samba-4.0/policy.h + /usr/include/samba-4.0/dcerpc_server.h + /usr/include/samba-4.0/ctdb.h + /usr/include/samba-4.0/ctdb_client.h + /usr/include/samba-4.0/ctdb_protocol.h + /usr/include/samba-4.0/ctdb_private.h + /usr/include/samba-4.0/ctdb_typesafe_cb.h + /usr/include/samba-4.0/ctdb_version.h +) + +TALLOC_VERSION="2.4.2" +TDB_VERSION="1.4.10" +TEVENT_VERSION="0.16.1" + +COMMON_DEPEND=" + >=app-arch/libarchive-3.1.2:=[${MULTILIB_USEDEP}] + dev-lang/perl:= + dev-libs/icu:=[${MULTILIB_USEDEP}] + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/libtasn1:=[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + dev-perl/Parse-Yapp + >=net-libs/gnutls-3.4.7:=[${MULTILIB_USEDEP}] + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + >=sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}] + <sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + sys-libs/liburing:=[${MULTILIB_USEDEP}] + sys-libs/ncurses:= + sys-libs/readline:= + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/libcrypt:=[${MULTILIB_USEDEP}] + virtual/libiconv + $(python_gen_cond_dep ' + addc? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ) + ads? ( + dev-python/dnspython:=[${PYTHON_USEDEP}] + net-dns/bind-tools[gssapi] + ) + ') + acl? ( virtual/acl ) + ceph? ( sys-cluster/ceph ) + cluster? ( net-libs/rpcsvc-proto ) + cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) + fam? ( virtual/fam ) + gpg? ( app-crypt/gpgme:= ) + json? ( dev-libs/jansson:= ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( + sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) + snapper? ( sys-apps/dbus ) + system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] ) + system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) + !system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) ) + systemd? ( sys-apps/systemd:= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) + zeroconf? ( net-dns/avahi[dbus] ) +" +DEPEND="${COMMON_DEPEND} + dev-perl/JSON + net-libs/libtirpc[${MULTILIB_USEDEP}] + net-libs/rpcsvc-proto + spotlight? ( dev-libs/glib ) + test? ( + >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] + $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + !system-mitkrb5? ( + >=net-dns/resolv_wrapper-1.1.4 + >=net-libs/socket_wrapper-1.1.9 + >=sys-libs/nss_wrapper-1.1.3 + >=sys-libs/uid_wrapper-1.2.1 + ) + )" +RDEPEND="${COMMON_DEPEND} + client? ( net-fs/cifs-utils[ads?] ) + python? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-samba ) +" +BDEPEND="${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.18.4-pam.patch + "${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch +) + +CONFDIR="${FILESDIR}/4.4" +WAF_BINARY="${S}/buildtools/bin/waf" +SHAREDMODS="" + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + python-single-r1_pkg_setup + + SHAREDMODS="$(usev !snapper '!')vfs_snapper" + if use cluster ; then + SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" + elif use ads ; then + SHAREDMODS+=",idmap_ad" + fi +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + # Unbundle dnspython + sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die + + # Unbundle iso8601 unless tests are enabled + if ! use test ; then + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die + fi + + # Ugly hackaround for bug #592502 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die + + sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ + -i source4/dsdb/samdb/ldb_modules/password_hash.c \ + || die + + # WAF + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + if ! use system-heimdal && ! use system-mitkrb5 ; then + bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" + fi + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test ; then + bundled_libs="cmocka,${bundled_libs}" + fi + + # bug #874633 + if use llvm-libunwind ; then + mkdir -p "${T}"/${ABI}/pkgconfig || die + + local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}" + + cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die + exec_prefix=\${prefix} + libdir=/usr/$(get_libdir) + includedir=\${prefix}/include + + Name: libunwind-generic + Description: libunwind generic library + Version: 1.70 + Libs: -L\${libdir} -lunwind + Cflags: -I\${includedir} + EOF + fi + + local myconf=( + --enable-fhs + --sysconfdir="${EPREFIX}/etc" + --localstatedir="${EPREFIX}/var" + --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" + --with-piddir="${EPREFIX}/run/${PN}" + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + --disable-rpath + --disable-rpath-install + --nopyc + --nopyo + --without-winexe + $(multilib_native_use_with acl acl-support) + $(multilib_native_usex addc '' '--without-ad-dc') + $(multilib_native_use_with ads) + $(multilib_native_use_enable ceph cephfs) + $(multilib_native_use_with cluster cluster-support) + $(multilib_native_use_enable cups) + --without-dmapi + $(multilib_native_use_with fam) + $(multilib_native_use_enable glusterfs) + $(multilib_native_use_with gpg gpgme) + $(multilib_native_use_with json) + $(multilib_native_use_enable iprint) + $(multilib_native_use_with pam) + $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') + $(multilib_native_use_with quota quotas) + $(multilib_native_use_with regedit) + $(multilib_native_use_enable spotlight) + $(multilib_native_use_with syslog) + $(multilib_native_use_with systemd) + --systemd-install-services + --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) + $(multilib_native_use_with winbind) + $(multilib_native_usex python '' '--disable-python') + $(multilib_native_use_enable zeroconf avahi) + $(multilib_native_usex test '--enable-selftest' '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(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.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild deleted file mode 100644 index 3fd2ad28eb1a..000000000000 --- a/net-fs/samba/samba-4.5.16.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz - https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" - -# 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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND="${PYTHON_DEPS} - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] - <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( net-dns/bind-tools[gssapi] ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= )" -DEPEND="${CDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig - test? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.7 - >=sys-libs/uid_wrapper-1.2.1 - )" -RDEPEND="${CDEPEND} - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( gnutls !system-mitkrb5 ) - ads? ( acl gnutls ldap ) - cluster? ( ads ) - gpg? ( addc ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320 -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # install the patches from tarball(s) - eapply "${WORKDIR}/patches" - - # 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 - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=() - myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --without-lttng - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - --disable-cephfs - ) - if multilib_is_native_abi ; then - myconf+=( - $(use_with acl acl-support) - $(usex addc '' '--without-ad-dc') - $(use_with addns dnsupdate) - $(use_with ads) - $(use_with cluster cluster-support) - $(use_enable cups) - $(use_with dmapi) - $(use_with fam) - $(use_enable gnutls) - $(use_with gpg gpgme) - $(use_enable iprint) - $(use_with ldap) - $(use_with pam) - $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') - $(use_with quota quotas) - $(use_with syslog) - $(use_with systemd) - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_with winbind) - $(usex test '--enable-selftest' '') - $(use_enable zeroconf avahi) - --with-shared-modules=${SHAREDMODS} - ) - else - myconf+=( - --without-acl-support - --without-ad-dc - --without-dnsupdate - --without-ads - --disable-avahi - --without-cluster-support - --disable-cups - --without-dmapi - --without-fam - --disable-gnutls - --without-gpgme - --disable-iprint - $(use_with ldap) - --without-pam - --without-quotas - --without-syslog - --without-systemd - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - --without-winbind - --disable-python - ) - fi - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${D}" -type f -name "*.so" -exec chmod +x {} + - - if multilib_is_native_abi; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.service - fi -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://samba.org/samba/history/${PN}-4.5.0.html and" - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.7.12-r1.ebuild b/net-fs/samba/samba-4.7.12-r1.ebuild deleted file mode 100644 index 98b097983e0e..000000000000 --- a/net-fs/samba/samba-4.7.12-r1.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig - net-libs/libtirpc[${MULTILIB_USEDEP}] - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.7 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls ) - addns? ( python ) - ads? ( acl gnutls ldap ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}"/talloc-disable-python.patch - "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - - # 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 - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=() - 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 - ) - if multilib_is_native_abi ; then - myconf+=( - $(use_with acl acl-support) - $(usex addc '' '--without-ad-dc') - $(use_with addns dnsupdate) - $(use_with ads) - $(use_enable ceph cephfs) - $(use_with cluster cluster-support) - $(use_enable cups) - $(use_with debug lttng) - $(use_with dmapi) - $(use_with fam) - $(use_enable gnutls) - $(use_with gpg gpgme) - $(use_enable iprint) - $(use_with ldap) - $(use_with pam) - $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') - $(use_with quota quotas) - $(use_with syslog) - $(use_with systemd) - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_with winbind) - $(usex python '' '--disable-python') - $(usex test '--enable-selftest' '') - $(use_enable zeroconf avahi) - --with-shared-modules=${SHAREDMODS} - ) - else - myconf+=( - --without-acl-support - --without-ad-dc - --without-dnsupdate - --without-ads - --disable-avahi - --disable-cephfs - --without-cluster-support - --disable-cups - --without-dmapi - --without-fam - --disable-gnutls - --without-gpgme - --disable-iprint - $(use_with ldap) - $(use_with debug lttng) - --without-pam - --without-quotas - --without-syslog - --without-systemd - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - --without-winbind - --disable-python - ) - fi - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${D}" -type f -name "*.so" -exec chmod +x {} + - - if multilib_is_native_abi; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://samba.org/samba/history/${PN}-4.5.0.html and" - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild deleted file mode 100644 index abff5eeec78a..000000000000 --- a/net-fs/samba/samba-4.8.12.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg -iprint ldap pam profiling-data python quota selinux syslog system-heimdal -+system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - - # 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 - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(multilib_native_use_with gpg gpgme) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - $(use_with profiling-data) - ) - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r2.ebuild deleted file mode 100644 index 99a93526abd5..000000000000 --- a/net-fs/samba/samba-4.8.6-r2.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.7 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - - # 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 - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(multilib_native_use_with gpg gpgme) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - ) - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.service - fi -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild deleted file mode 100644 index c08ebb650770..000000000000 --- a/net-fs/samba/samba-4.8.6-r3.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - - # 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 - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(multilib_native_use_with gpg gpgme) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - ) - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.9.11.ebuild b/net-fs/samba/samba-4.9.11.ebuild deleted file mode 100644 index c983eaa51e3e..000000000000 --- a/net-fs/samba/samba-4.9.11.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal -+system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.4.7[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - json? ( dev-libs/jansson ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls json winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.9.2-timespec.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - if ! use test ; then - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - fi - - # ugly hackaround for bug #592502 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die - - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ - -i source4/dsdb/samdb/ldb_modules/password_hash.c \ - || die - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(multilib_native_use_with gpg gpgme) - $(multilib_native_use_with json json-audit) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - $(use_with profiling-data) - ) - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/samba/samba-4.9.9.ebuild b/net-fs/samba/samba-4.9.9.ebuild deleted file mode 100644 index b254b52dad44..000000000000 --- a/net-fs/samba/samba-4.9.9.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+),xml(+)' - -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam - -MY_PV="${PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -SRC_PATH="stable" -[[ ${PV} = *_rc* ]] && SRC_PATH="rc" - -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" -[[ ${PV} = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -DESCRIPTION="Samba Suite Version 4" -HOMEPAGE="https://www.samba.org/" -LICENSE="GPL-3" - -SLOT="0" - -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal -+system-mitkrb5 systemd test winbind zeroconf" - -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 -) - -# sys-apps/attr is an automagic dependency (see bug #489748) -CDEPEND=" - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] - dev-lang/perl:= - dev-libs/libaio[${MULTILIB_USEDEP}] - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/iniparser:0 - dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] - net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/libcap - sys-libs/ncurses:0=[${MULTILIB_USEDEP}] - sys-libs/readline:0= - >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/libiconv - pam? ( virtual/pam ) - acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) - ceph? ( sys-cluster/ceph ) - cluster? ( - net-libs/rpcsvc-proto - !dev-db/ctdb - ) - cups? ( net-print/cups ) - debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) - fam? ( virtual/fam ) - gnutls? ( - dev-libs/libgcrypt:0 - >=net-libs/gnutls-1.4.0 - ) - gpg? ( app-crypt/gpgme ) - json? ( dev-libs/jansson ) - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:0= ) -" -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - net-libs/libtirpc[${MULTILIB_USEDEP}] - virtual/pkgconfig - || ( - net-libs/rpcsvc-proto - <sys-libs/glibc-2.26[rpc(+)] - ) - test? ( - !system-mitkrb5? ( - >=sys-libs/nss_wrapper-1.1.3 - >=net-dns/resolv_wrapper-1.1.4 - >=net-libs/socket_wrapper-1.1.9 - >=sys-libs/uid_wrapper-1.2.1 - ) - )" -RDEPEND="${CDEPEND} - python? ( ${PYTHON_DEPS} ) - client? ( net-fs/cifs-utils[ads?] ) - selinux? ( sec-policy/selinux-samba ) - !dev-perl/Parse-Yapp -" - -REQUIRED_USE=" - addc? ( python gnutls json winbind ) - addns? ( python ) - ads? ( acl gnutls ldap winbind ) - cluster? ( ads ) - gpg? ( addc ) - test? ( python ) - ?? ( system-heimdal system-mitkrb5 ) - ${PYTHON_REQUIRED_USE} -" - -# 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" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.0-pam.patch" - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" - "${FILESDIR}/${PN}-4.9.2-timespec.patch" -) - -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" -CONFDIR="${FILESDIR}/4.4" - -WAF_BINARY="${S}/buildtools/bin/waf" - -SHAREDMODS="" - -pkg_setup() { - python-single-r1_pkg_setup - if use cluster ; then - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" - elif use ads ; then - SHAREDMODS="idmap_ad" - fi -} - -src_prepare() { - default - - # un-bundle dnspython - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die - - # unbundle iso8601 unless tests are enabled - if ! use test ; then - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die - fi - - # ugly hackaround for bug #592502 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die - - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ - -i source4/dsdb/samdb/ldb_modules/password_hash.c \ - || die - - # Friggin' WAF shit - multilib_copy_sources -} - -multilib_src_configure() { - # when specifying libs for samba build you must append NONE to the end to - # stop it automatically including things - local bundled_libs="NONE" - if ! use system-heimdal && ! use system-mitkrb5 ; then - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" - fi - - local myconf=( - --enable-fhs - --sysconfdir="${EPREFIX}/etc" - --localstatedir="${EPREFIX}/var" - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" - --with-piddir="${EPREFIX}/run/${PN}" - --bundled-libraries="${bundled_libs}" - --builtin-libraries=NONE - --disable-rpath - --disable-rpath-install - --nopyc - --nopyo - $(multilib_native_use_with acl acl-support) - $(multilib_native_usex addc '' '--without-ad-dc') - $(multilib_native_use_with addns dnsupdate) - $(multilib_native_use_with ads) - $(multilib_native_use_enable ceph cephfs) - $(multilib_native_use_with cluster cluster-support) - $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) - $(multilib_native_use_with fam) - $(multilib_native_use_with gpg gpgme) - $(multilib_native_use_with json json-audit) - $(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 syslog) - $(multilib_native_use_with systemd) - $(multilib_native_use_with winbind) - $(multilib_native_usex python '' '--disable-python') - $(multilib_native_use_enable zeroconf avahi) - $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') - $(use_enable gnutls) - $(use_with debug lttng) - $(use_with ldap) - $(use_with profiling-data) - ) - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) - - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ - waf-utils_src_configure ${myconf[@]} -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install - - # Make all .so files executable - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die - - if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) - if use ldap ; then - insinto /etc/openldap/schema - doins examples/LDAP/samba.schema - fi - - # create symlink for cups (bug #552310) - if use cups ; then - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb - fi - - # install example config file - insinto /etc/samba - doins examples/smb.conf.default - - # Fix paths in example file (#603964) - sed \ - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ - -i "${ED%/}"/etc/samba/smb.conf.default || die - - # Install init script and conf.d file - newinitd "${CONFDIR}/samba4.initd-r1" samba - newconfd "${CONFDIR}/samba4.confd" samba - - systemd_dotmpfilesd "${FILESDIR}"/samba.conf - systemd_dounit "${FILESDIR}"/nmbd.service - systemd_dounit "${FILESDIR}"/smbd.{service,socket} - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' - systemd_dounit "${FILESDIR}"/winbindd.service - systemd_dounit "${FILESDIR}"/samba.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 || die - fi - - keepdir /var/cache/samba - keepdir /var/lib/ctdb - keepdir /var/lib/samba/{bind-dns,private} - keepdir /var/lock/samba - keepdir /var/log/samba - keepdir /var/run/{ctdb,samba} -} - -multilib_src_test() { - if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" - fi -} - -pkg_postinst() { - ewarn "Be aware the this release contains the best of all of Samba's" - ewarn "technology parts, both a file server (that you can reasonably expect" - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" - ewarn "controller work previously known as 'samba4'." - - elog "For further information and migration steps make sure to read " - elog "https://samba.org/samba/history/${P}.html " - elog "https://wiki.samba.org/index.php/Samba4/HOWTO " -} diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest index fe7e318fb659..250994bd0ac1 100644 --- a/net-fs/smbnetfs/Manifest +++ b/net-fs/smbnetfs/Manifest @@ -1,2 +1 @@ -DIST smbnetfs-0.6.0.tar.bz2 147946 BLAKE2B dc20ba86e8280365eead7cd540370e727e47f9ba54c24ec4f4174c28eafdf373d716f259a6cff129e88ea1c47f4c3aee83cc6cb8009f232af94168e5c3232be0 SHA512 5bc5327b1087d051cbedda40ea1183c2515e3a42b2027812c6528bbbcb736b7f92f95b3c7b9cc53da99c2138c945ceb517042359029cbe0ab8cd887839711ced -DIST smbnetfs-0.6.1.tar.bz2 171032 BLAKE2B ac263c963318ac01d6acef0247c0cb2149b25d991770be5c717a5d0e8baae1a6df5f9d3bf1019bc2d3fb43c728b89828225047baf4bb82c708ff051957bbcf6a SHA512 b74e979e30075243e859b8b02918b7d379eaf92e61f0fc6d6375864cf12c31c6601719026d96a24e6ac82b572338cfea4b7e0d89fe2d9dc17fd9a1a81e7f7ebd +DIST smbnetfs-0.6.3.tar.bz2 187460 BLAKE2B d6906fa1e513253ae423031486e3be31308254506fd218f15395ac30591ecdc3179fd0998ec1e717ba4d787e7d6d8e951bc417b1c68d89193408a333d90a693c SHA512 19b1ec6a9cc9722e5e80c26ff4bd8b62dcdf7f3bb71a3c7b2a0b2b32af6902fd3fb95c27188a51b2a1f0df20fadad799ca685db28daba101f1e3b2c03ee295cc diff --git a/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch b/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch new file mode 100644 index 000000000000..e5e403e31198 --- /dev/null +++ b/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch @@ -0,0 +1,18 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,3 @@ +-docdir = $(datadir)/doc/$(distdir) + doc_DATA = \ + conf/smbnetfs.conf \ + doc/ENGLISH.FAQ \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -296,7 +296,7 @@ build_alias = @build_alias@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ +-docdir = $(datadir)/doc/$(distdir) ++docdir = @docdir@ + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ diff --git a/net-fs/smbnetfs/files/smbnetfs-0.6.1-use-proper-xattr.patch b/net-fs/smbnetfs/files/smbnetfs-0.6.1-use-proper-xattr.patch deleted file mode 100644 index 925a8cf8fefe..000000000000 --- a/net-fs/smbnetfs/files/smbnetfs-0.6.1-use-proper-xattr.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 398e8169ea6d3d854af0173b1e66bf13c124f901 Mon Sep 17 00:00:00 2001 -From: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com> -Date: Thu, 1 Feb 2018 11:55:41 +0300 -Subject: [PATCH] use proper xattr - ---- - src/function.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/function.c b/src/function.c -index 9728eae..3e88f42 100644 ---- a/src/function.c -+++ b/src/function.c -@@ -8,7 +8,7 @@ - #include <dirent.h> - #include <sys/statvfs.h> - #include <sys/types.h> --#include <attr/xattr.h> -+#include <sys/xattr.h> - #include <time.h> - #include <pthread.h> - #include <libsmbclient.h> --- -2.16.2 - diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml index da1a096c82b2..4758f1c23d0e 100644 --- a/net-fs/smbnetfs/metadata.xml +++ b/net-fs/smbnetfs/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slyfox@gentoo.org</email> - <name>Sergei Trofimovich</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network. @@ -16,12 +13,9 @@ - user defined workgroup/link/hosts are supported - national character supported - in config files you can specify different user/password to access different network shares - - command "cd mountpoint/username:password@computer_or_ip" allows you to access "computer_or_ip" as user "username" with password "password" (this is insecure, but usefull) + - command "cd mountpoint/username:password@computer_or_ip" allows you to access "computer_or_ip" as user "username" with password "password" (this is insecure, but useful) - the program is multithreaded, so simultaneous access to a file/share is possible </longdescription> - <use> - <flag name="gnome">Use the <pkg>gnome-base/gnome-keyring</pkg> for password management.</flag> - </use> <upstream> <remote-id type="sourceforge">smbnetfs</remote-id> </upstream> diff --git a/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild b/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild deleted file mode 100644 index 15ded1593d01..000000000000 --- a/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils readme.gentoo - -DESCRIPTION="FUSE filesystem for SMB shares" -HOMEPAGE="https://sourceforge.net/projects/smbnetfs" -SRC_URI="mirror://sourceforge/smbnetfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="gnome" - -RDEPEND=">=sys-fs/fuse-2.3 - >=net-fs/samba-4.2 - >=dev-libs/glib-2.30 - gnome? ( gnome-base/libgnome-keyring )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS=" -For quick usage, exec: -'modprobe fuse' -'smbnetfs -oallow_other /mnt/samba' -" - -src_configure() { - econf $(use_with gnome gnome-keyring) -} - -src_install() { - default - readme.gentoo_create_doc - dodoc AUTHORS ChangeLog -} diff --git a/net-fs/smbnetfs/smbnetfs-0.6.1.ebuild b/net-fs/smbnetfs/smbnetfs-0.6.3.ebuild index 6c1bdba95b58..7cbf21c76ce2 100644 --- a/net-fs/smbnetfs/smbnetfs-0.6.1.ebuild +++ b/net-fs/smbnetfs/smbnetfs-0.6.3.ebuild @@ -1,27 +1,29 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils readme.gentoo-r1 +EAPI=7 +inherit readme.gentoo-r1 DESCRIPTION="FUSE filesystem for SMB shares" HOMEPAGE="https://sourceforge.net/projects/smbnetfs" -SRC_URI="mirror://sourceforge/smbnetfs/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/SMBNetFS-${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="gnome-keyring" +IUSE="keyring" -RDEPEND=">=sys-fs/fuse-2.3 +RDEPEND=">=sys-fs/fuse-2.3:0= >=net-fs/samba-4.2 >=dev-libs/glib-2.30 - gnome-keyring? ( app-crypt/libsecret )" + keyring? ( app-crypt/libsecret )" DEPEND="${RDEPEND} virtual/pkgconfig" -PATCHES=("${FILESDIR}"/${P}-use-proper-xattr.patch) +PATCHES=( + "${FILESDIR}"/${PN}-0.6.1-docdir.patch +) DISABLE_AUTOFORMATTING=yes DOC_CONTENTS=" @@ -31,7 +33,7 @@ For quick usage, exec: " src_configure() { - econf $(use_with gnome-keyring libsecret) + econf $(use_with keyring libsecret) } src_install() { diff --git a/net-fs/smbtad/Manifest b/net-fs/smbtad/Manifest deleted file mode 100644 index 836a724448c0..000000000000 --- a/net-fs/smbtad/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST smbtad-1.2.6.tar.bz2 82062 BLAKE2B fced362e6add2104fbd4815ee570bb0c21e0b47431cf8ba46d07f7ca73ad65ddb4b8762a1ff5d8e7f44fd39cad8409cb3bf6c2b85b9abdfbe6035c2963ef7f52 SHA512 fd3b370d973a42fb2dee48d2fec08e20af32386893ee67bc407decd001a76c944f3a17b3251e9d8d746feb1e87c69776986d600fd108450113835823f6313e2c diff --git a/net-fs/smbtad/files/smbtad.rc b/net-fs/smbtad/files/smbtad.rc deleted file mode 100644 index afc3e3c13617..000000000000 --- a/net-fs/smbtad/files/smbtad.rc +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONFFILE=/etc/conf.d/${SVCNAME}.conf -PIDFILE=/var/run/${SVCNAME}.pid - -depend() { - before samba - use dns logger -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet \ - --exec /usr/bin/"${SVCNAME}" \ - -- -c "${CONFFILE}" - eend ${?} -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --name "${SVCNAME}" - eend ${?} -} diff --git a/net-fs/smbtad/metadata.xml b/net-fs/smbtad/metadata.xml deleted file mode 100644 index 2ada94ef8a16..000000000000 --- a/net-fs/smbtad/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>samba@gentoo.org</email> - <name>Samba Team</name> - </maintainer> - <upstream> - <remote-id type="github">hhetter/smbtad</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-fs/smbtad/smbtad-1.2.6.ebuild b/net-fs/smbtad/smbtad-1.2.6.ebuild deleted file mode 100644 index 8a0ed2811e4b..000000000000 --- a/net-fs/smbtad/smbtad-1.2.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Data receiver of the SMB Traffic Analyzer project" -HOMEPAGE="https://github.com/hhetter/smbtad" -SRC_URI="http://morelias.org/smbta/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-db/libdbi - dev-libs/iniparser:0 - sys-libs/talloc -" -RDEPEND="${DEPEND} - >=net-fs/samba-3.6 -" - -DOCS=( README AUTHORS ) - -src_prepare() { - cmake-utils_src_prepare - - sed -i \ - -e '/CMAKE_C_FLAGS/d' \ - CMakeLists.txt || die -} - -src_install() { - cmake-utils_src_install - - newinitd "${FILESDIR}"/smbtad.rc smbtad - newconfd dist/smbtad.conf_example smbtad.conf -} diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest index 9256710b6875..07be494f9648 100644 --- a/net-fs/sshfs/Manifest +++ b/net-fs/sshfs/Manifest @@ -1,4 +1 @@ -DIST sshfs-2.10.tar.gz 163076 BLAKE2B e443b3bb65c432d8d8e3d6d198e3e41363ff506dbc19a215b8606317fb02ef3ea370d0f3fbbe01e6f5c49581c74faefbceb9f50ab44bb3791c82e0a633d86655 SHA512 8887eb634edc4c64cf7a0c1a1be4d9ef72d5080eec687d187898dc31bb841ed730850bae8467247a05e56c2b4ef7e9d02fdc0812d48876e145c9826a7406d9ff -DIST sshfs-3.5.0.tar.xz 47564 BLAKE2B 9a6fb1cb347de2903fb67900253f8b28ecf3dd4c972210d4839d0ed7bbbe2dff1be2d847dbfc1727cdeeef74d4b32856aa6e3041b603dc1e3f865269524ddff7 SHA512 6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c -DIST sshfs-3.5.1.tar.xz 48424 BLAKE2B 5d80de9e71e6f5c71e9302fde065855e495dfb276583baf335c8ef022fc28b1c5907fe735f15765b460d10e75a84d6d97495da81b1e03cdb69b7a69a31624197 SHA512 bda7aa0a7a69a0ace355ed755f454402ce7bdd0d66456dac8654a3eb76b6fcfd0ddee9cfc5bcd80485880f47262c72bcbaeeadc7db7d652e864fbbbff6728b76 -DIST sshfs-3.5.2.tar.xz 48744 BLAKE2B 4ef287605a1d08729a29998935125f8d71f719e0d7014c999bdf3b242b4663ae8e93dd527108a650f1bd16b59175b7e2db2cdcb57a5bd2cdcd24110fc29b6a9c SHA512 52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272 +DIST sshfs-3.7.3.tar.xz 53596 BLAKE2B 9a229d0f11e7247e319af13245aeaf71082664409b0ca3fe1522bcdb679d402c574438be1931d5d73a16b9eda43daf20de6c1a016442ae53afa27a697e58c212 SHA512 ba0928f85819984a3eb83d2debab658b2cd4e958ed1c3ba9787e361f452687d42b82d478b7d95e7a7c5580bae5c1cdebe4cf3c9b6cb5eb6a570311f276903d99 diff --git a/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch b/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch deleted file mode 100644 index ad58de4e5054..000000000000 --- a/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fallback to looking for rst2man.py executable as that's what docutils upstream -defaults to installing. - ---- sshfs-3.5.0/meson.build -+++ sshfs-3.5.0/meson.build -@@ -25,7 +25,7 @@ - endif - - --rst2man = find_program('rst2man', required: false) -+rst2man = find_program('rst2man', 'rst2man.py', required: false) - - cfg = configuration_data() - diff --git a/net-fs/sshfs/metadata.xml b/net-fs/sshfs/metadata.xml index 1dde05c3d522..30c175062a7c 100644 --- a/net-fs/sshfs/metadata.xml +++ b/net-fs/sshfs/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>radhermit@gentoo.org</email> - <name>Tim Harder</name> - </maintainer> - <upstream> - <remote-id type="github">libfuse/sshfs</remote-id> - </upstream> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <upstream> + <remote-id type="github">libfuse/sshfs</remote-id> + </upstream> </pkgmetadata> diff --git a/net-fs/sshfs/sshfs-2.10-r1.ebuild b/net-fs/sshfs/sshfs-2.10-r1.ebuild deleted file mode 100644 index d1dcab524e58..000000000000 --- a/net-fs/sshfs/sshfs-2.10-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Fuse-filesystem utilizing the sftp service" -HOMEPAGE="https://github.com/libfuse/sshfs" -SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 arm ~arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" - -CDEPEND=">=sys-fs/fuse-2.6.0_pre3:0 - >=dev-libs/glib-2.4.2" -RDEPEND="${CDEPEND} - >=net-misc/openssh-4.4" -DEPEND="${CDEPEND} - virtual/pkgconfig" diff --git a/net-fs/sshfs/sshfs-3.5.0.ebuild b/net-fs/sshfs/sshfs-3.5.0.ebuild deleted file mode 100644 index 042873de9d7b..000000000000 --- a/net-fs/sshfs/sshfs-3.5.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson - -DESCRIPTION="Fuse-filesystem utilizing the sftp service" -HOMEPAGE="https://github.com/libfuse/sshfs" -SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" - -CDEPEND=">=sys-fs/fuse-3.1.0:3 - >=dev-libs/glib-2.4.2" -RDEPEND="${CDEPEND} - >=net-misc/openssh-4.4" -DEPEND="${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -# requires root privs and specific localhost sshd setup -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${P}-rst2man.patch ) - -DOCS=( AUTHORS ChangeLog.rst README.rst ) diff --git a/net-fs/sshfs/sshfs-3.5.1.ebuild b/net-fs/sshfs/sshfs-3.5.1.ebuild deleted file mode 100644 index 0b8e826b0a9a..000000000000 --- a/net-fs/sshfs/sshfs-3.5.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Fuse-filesystem utilizing the sftp service" -HOMEPAGE="https://github.com/libfuse/sshfs" -SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -SLOT="0" - -CDEPEND=">=sys-fs/fuse-3.1.0:3 - >=dev-libs/glib-2.4.2" -RDEPEND="${CDEPEND} - >=net-misc/openssh-4.4" -DEPEND="${CDEPEND} - dev-python/docutils - virtual/pkgconfig" - -# requires root privs and specific localhost sshd setup -RESTRICT="test" - -DOCS=( AUTHORS ChangeLog.rst README.rst ) diff --git a/net-fs/sshfs/sshfs-3.5.2.ebuild b/net-fs/sshfs/sshfs-3.7.3-r1.ebuild index eb4c2de8ef82..1ed1ef7dd04b 100644 --- a/net-fs/sshfs/sshfs-3.5.2.ebuild +++ b/net-fs/sshfs/sshfs-3.7.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson @@ -10,15 +10,14 @@ HOMEPAGE="https://github.com/libfuse/sshfs" SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" -CDEPEND=">=sys-fs/fuse-3.1.0:3 +DEPEND=">=sys-fs/fuse-3.1.0:3 >=dev-libs/glib-2.4.2" -RDEPEND="${CDEPEND} - >=net-misc/openssh-4.4" -DEPEND="${CDEPEND} - dev-python/docutils +RDEPEND="${DEPEND} + virtual/openssh" +BDEPEND="dev-python/docutils virtual/pkgconfig" # requires root privs and specific localhost sshd setup diff --git a/net-fs/tahoe-lafs/Manifest b/net-fs/tahoe-lafs/Manifest deleted file mode 100644 index b56e7717e444..000000000000 --- a/net-fs/tahoe-lafs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST allmydata-tahoe-1.10.2.tar.bz2 1378204 BLAKE2B bfbd36861b8f868ee0bf667a5b64b1a47d7a0fb255ff19a9f5c2db020988397a8ea57c7dadfd1fb8edbb94d55e247a78a8f61d0e66af56129aea4c528b0c6c84 SHA512 79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198 diff --git a/net-fs/tahoe-lafs/metadata.xml b/net-fs/tahoe-lafs/metadata.xml deleted file mode 100644 index 28b6d980aad7..000000000000 --- a/net-fs/tahoe-lafs/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - Tahoe-LAFS is a Free and Open cloud storage system. It - distributes your data across multiple servers. Even if some - of the servers fail or are taken over by an attacker, the - entire filesystem continues to function correctly, preserving - your privacy and security. - </longdescription> - <upstream> - <bugs-to> - https://tahoe-lafs.org/trac/tahoe-lafs/wiki/ViewTickets - </bugs-to> - <doc lang="en"> - https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Doc - </doc> - <remote-id type="github">tahoe-lafs/tahoe-lafs</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild b/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild deleted file mode 100644 index 031d09ff8c46..000000000000 --- a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -MY_PN="allmydata-tahoe" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Secure, decentralized, data store" -HOMEPAGE="https://tahoe-lafs.org/trac/tahoe-lafs" -SRC_URI="https://tahoe-lafs.org/source/tahoe-lafs/releases/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=" - >=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}] - >=dev-python/foolscap-0.8.0[${PYTHON_USEDEP}] - dev-python/nevow[${PYTHON_USEDEP}] - >=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/pycryptopp[${PYTHON_USEDEP}] - dev-python/pycrypto[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] - dev-python/pyutil[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - dev-python/zbase32[${PYTHON_USEDEP}] - dev-python/zfec[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - rm -r setuptools* setup.cfg || die - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - use doc && dodoc -r docs/* -} diff --git a/net-fs/wdfs/metadata.xml b/net-fs/wdfs/metadata.xml index 59ebf8dba9c7..6782d951f503 100644 --- a/net-fs/wdfs/metadata.xml +++ b/net-fs/wdfs/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>dev-zero@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <longdescription> wdfs is a webdav filesystem that makes it possible to mount a webdav share under linux, freebsd and apple mac os x. wdfs has some special diff --git a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild index 5de6083daed2..67ac495d22aa 100644 --- a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild +++ b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - -inherit eutils +EAPI=7 DESCRIPTION="WebDAV filesystem with special features for accessing subversion repositories" HOMEPAGE="http://noedler.de/projekte/wdfs/" @@ -11,14 +9,14 @@ SRC_URI="http://noedler.de/projekte/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" RDEPEND=">=net-libs/neon-0.24.7 - >=sys-fs/fuse-2.5 - dev-libs/glib:2" + >=sys-fs/fuse-2.5:0 + dev-libs/glib:2" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}/${P}-fix-Waddress.patch" -} +PATCHES=( + "${FILESDIR}/${P}-fix-Waddress.patch" +) |