From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2019 21:23:20 +0100 Subject: gentoo resync : 16.06.2019 --- net-fs/Manifest.gz | Bin 4692 -> 4691 bytes net-fs/cvmfs/Manifest | 2 +- net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild | 157 -------------------------- net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild | 157 ++++++++++++++++++++++++++ net-fs/nfs-utils/Manifest | 2 + net-fs/nfs-utils/nfs-utils-2.4.1.ebuild | 190 ++++++++++++++++++++++++++++++++ 6 files changed, 350 insertions(+), 158 deletions(-) delete mode 100644 net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild create mode 100644 net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild create mode 100644 net-fs/nfs-utils/nfs-utils-2.4.1.ebuild (limited to 'net-fs') diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz index bee6650dec76..e673ed677e96 100644 Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest index fc36c2d49c44..125f1869c669 100644 --- a/net-fs/cvmfs/Manifest +++ b/net-fs/cvmfs/Manifest @@ -1,3 +1,3 @@ DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b -EBUILD cvmfs-2.3.5-r1.ebuild 3598 BLAKE2B 37bd86039e8966d2b535803ba6388a71ef53bcb58deac5ac691dcadc02d8a06665296b336a1ccda51821b564ad2814ea04724b3d33c21a59d7096659077b3957 SHA512 5e5b4ab84442cb7047295654dcb19a26a24d70afb69ee2e7d1b051c3a8973300ab26cb56a83e4b42f8a3cd32f0781d2c6cce30f860a01a031e249be59cf08e0a +EBUILD cvmfs-2.3.5-r2.ebuild 3595 BLAKE2B 2f147f335a7ea7a2f217947119a391d926b6a9ee03e55d1272758a5b789fc31123ec6946b1055ad8baaae971f159da074faa5d895237d9511ab45c0a88e048f0 SHA512 e656004a46c4d65fb70fd0d542f726c452232c0e42bf6f7a271cbd0f92a6e1c1b46d4a4fbd928ea672b23082b4fa664c7160e799a3c02edaa6e0897e5c32b31b MISC metadata.xml 1184 BLAKE2B 90621d313849529a259d07f913f8867c420b4f65cab5c958873ec455f26baac0ad7748902993badb03c5ff800a0f50af41023383fe4f6981e26d22e0c27ae36f SHA512 16c10f416575332edfb009cb58a1ef3f11165d7eecb739209a70a31c522768e92c78fe146324f5073094126c902de0232976d9d9431fe08832f8a955587ed76b diff --git a/net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild b/net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild deleted file mode 100644 index 375fdee6e324..000000000000 --- a/net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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/cvmfs-2.3.5-r2.ebuild b/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild new file mode 100644 index 000000000000..393df3a15fde --- /dev/null +++ b/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild @@ -0,0 +1,157 @@ +# 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/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 5e15a94a865d..733c6da6de90 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -21,6 +21,8 @@ AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c8621 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f 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 EBUILD nfs-utils-2.3.3.ebuild 5494 BLAKE2B 1da519c6135e9fd70d88bede60e19479dca05e80645a04a4a57ee21be978589d86a6adb3bc1f1881fbaff8839685da6fa1b1e37212a36ced856f60220b6bd5d2 SHA512 39b5e83e3140d203d3b7d411a81d8341ffc55fc1f72d81a4b2ea2be0b2398607fcd7fb3b45ed7dfdc71a4ef13f6c28fa2d3139543fa65553fa8855e943e4d79e EBUILD nfs-utils-2.3.4.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67 +EBUILD nfs-utils-2.4.1.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5 diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild new file mode 100644 index 000000000000..dafe5f83ce34 --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild @@ -0,0 +1,190 @@ +# 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 + ! 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 +} -- cgit v1.2.3