From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16537138359 for ; Thu, 22 Oct 2020 17:49:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BE1BE0833; Thu, 22 Oct 2020 17:49:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3D9DE0833 for ; Thu, 22 Oct 2020 17:49:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C213F340E0F for ; Thu, 22 Oct 2020 17:49:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B5AF33A for ; Thu, 22 Oct 2020 17:49:46 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1603388983.32acf46dbfa646259f78215a1e936eb442f71491.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/, net-fs/nfs-utils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/Manifest net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch net-fs/nfs-utils/nfs-utils-2.5.2.ebuild X-VCS-Directories: net-fs/nfs-utils/files/ net-fs/nfs-utils/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 32acf46dbfa646259f78215a1e936eb442f71491 X-VCS-Branch: master Date: Thu, 22 Oct 2020 17:49:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24ce3684-df03-4bce-adaf-c3f031a5b88e X-Archives-Hash: 4cfebb232d1d77fd185dcea73567235b commit: 32acf46dbfa646259f78215a1e936eb442f71491 Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 22 17:49:11 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 22 17:49:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32acf46d net-fs/nfs-utils: Bump to version 2.5.2 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> net-fs/nfs-utils/Manifest | 1 + .../files/nfs-utils-2.5.2-no-werror.patch | 68 +++++++ net-fs/nfs-utils/nfs-utils-2.5.2.ebuild | 204 +++++++++++++++++++++ 3 files changed, 273 insertions(+) diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 2cfc688a642..3985e4172da 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,3 +1,4 @@ DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540 DIST nfs-utils-2.4.3.tar.bz2 921710 BLAKE2B 9386a99561370e09ffe871ec38a4fc993e99332c0c6fdb0d07eb7a924cfab4634e5c5186ac1f1629deecf02557fd2d3d5d99b90d97c32d3680ca4478b5c49d9c SHA512 160c828dd7a7b3206b7f167eb99a8dfac7e1a0c8dd88c81b639c3a1f66916908b3ca11fb9a945e4cf6a474f82509ed91a8a3217623f6cb79302d3d9b760f19d9 DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c SHA512 36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb +DIST nfs-utils-2.5.2.tar.bz2 933724 BLAKE2B 691204739fa4348cea6234f1b87bd74872c94a0c175b09a08ebb4d5cefb0b04c1adfffadc82b7e9a4a45d5c86e7f2af62b275526d27482798d4c5dc296a5be09 SHA512 9e97cf5cd8be27d58e1dcd7fa563280ac8afa57d09387dddd2d6b03cbcd6dae4066ac29804b8b1624b61cb12f2aa016380c85b731113c9359a0e6887d2db0641 diff --git a/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch new file mode 100644 index 00000000000..396532a919a --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-2.5.2-no-werror.patch @@ -0,0 +1,68 @@ +From 6ab8c7c186bd4a547a0ca435ecabe10ee50039c5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Thu, 22 Oct 2020 19:44:34 +0200 +Subject: [PATCH] Don't build with -Werror flags + +https://bugs.gentoo.org/656984 + +Signed-off-by: Lars Wendler +--- + configure.ac | 34 +--------------------------------- + 1 file changed, 1 insertion(+), 33 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 50847d8a..6bc18e93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -620,47 +620,15 @@ AC_SUBST(CPPFLAGS_FOR_BUILD) + AC_SUBST(LDFLAGS_FOR_BUILD) + + my_am_cflags="\ +- -pipe \ + -Wall \ + -Wextra \ + $rpcgen_cflags \ +- -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="-Werror $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]) +-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.29.0 + diff --git a/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild new file mode 100644 index 00000000000..e92cd918e89 --- /dev/null +++ b/net-fs/nfs-utils/nfs-utils-2.5.2.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic linux-info 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 ~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 + +# 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 + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 1.3.0; then + ewarn "We have switched to upstream systemd unit files. Since" + ewarn "they got renamed, you should probably enable the new ones." + ewarn "You can run 'equery files nfs-utils | grep systemd'" + ewarn "to know what services you need to enable now." + fi + done + else + ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." + ewarn "If you were using nfsmount, please add nfsclient and netmount to the" + ewarn "same runlevel as nfsmount." + fi +}