AUX nfs-utils-2.3.4-no-common.patch 2849 BLAKE2B 54abbfa1844500798bbe68065ba985429d21cb9e9272784a15e6d5f0184fa24911c9418e1de9df3943e4de3e327e07f533c6c005b6993b5c9f96f54285b9b756 SHA512 01b9fea7f3602b1d56733071da49a02662c38ab4a1bfdae2f8ef5381344fdbfa87c036aa3aed5c09a7fd29d0e56aa836f2f740e4a2b798ffa9d580459ac08ccf

EBUILD nfs-utils-2.3.4-r1.ebuild 5267 BLAKE2B 3cfdc36c2baa7005be877129d8b420de16577b2d0d2eda05eebb6dd429ef5d5b4d7fe114831124bb7698db5e4a8e68711a3694c52b2d2493a0eaaf74eab3d5f2 SHA512 6a4ef77dfb0aafc711548afc58f8bc0cfa268059ebe5bb277c033f1e2c5dbe57194d641078bdcc5237e4aaeea99077b4c79c121ff9acaa0c117f3ed2129fe671

When compiled with -fno-common, global variables that are declared

multple times cause an error.  With -fcommon (the default), they are

merged.

Declaring such variable multiple times is probably not a good idea, and

is definitely not necessary.

This patch changes all the global variables defined in include files to

be explicitly "extern", and where necessary, adds the variable

declaration to a suitable .c file.

To test, run

  CFLAGS=-fno-common ./configure

  make

Signed-off-by: NeilBrown <neilb@xxxxxxx>

---

 utils/mountd/v4root.c        |  2 --

 utils/nfsdcld/cld-internal.h | 10 +++++-----

 utils/nfsdcld/nfsdcld.c      |  6 ++++++

 utils/statd/statd.c          |  1 +

 utils/statd/statd.h          |  2 +-

 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c

index d735dbfe192d..dd9828eb0c11 100644

--- a/utils/mountd/v4root.c

+++ b/utils/mountd/v4root.c

@@ -28,8 +28,6 @@

 #include "v4root.h"

 #include "pseudoflavors.h"

-int v4root_needed;

-

 static nfs_export pseudo_root = {

 	.m_next = NULL,

 	.m_client = NULL,

diff --git a/utils/nfsdcld/cld-internal.h b/utils/nfsdcld/cld-internal.h

index 05f01be2105a..cc283dae9dbf 100644

--- a/utils/nfsdcld/cld-internal.h

+++ b/utils/nfsdcld/cld-internal.h

@@ -35,10 +35,10 @@ struct cld_client {

 	} cl_u;

 };

-uint64_t current_epoch;

-uint64_t recovery_epoch;

-int first_time;

-int num_cltrack_records;

-int num_legacy_records;

+extern uint64_t current_epoch;

+extern uint64_t recovery_epoch;

+extern int first_time;

+extern int num_cltrack_records;

+extern int num_legacy_records;

 #endif /* _CLD_INTERNAL_H_ */

diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c

index 2ad1001988d2..be6556262504 100644

--- a/utils/nfsdcld/nfsdcld.c

+++ b/utils/nfsdcld/nfsdcld.c

@@ -69,6 +69,12 @@ static int 		inotify_fd = -1;

 static struct event	pipedir_event;

 static bool old_kernel = false;

+uint64_t current_epoch;

+uint64_t recovery_epoch;

+int first_time;

+int num_cltrack_records;

+int num_legacy_records;

+

 static struct option longopts[] =

 {

 	{ "help", 0, NULL, 'h' },

diff --git a/utils/statd/statd.c b/utils/statd/statd.c

index 8eef2ff24fe8..e4a1df43b73f 100644

--- a/utils/statd/statd.c

+++ b/utils/statd/statd.c

@@ -67,6 +67,7 @@ static struct option longopts[] =

 };

 extern void sm_prog_1 (struct svc_req *, register SVCXPRT *);

+stat_chge	SM_stat_chge;

 #ifdef SIMULATIONS

 extern void simulator (int, char **);

diff --git a/utils/statd/statd.h b/utils/statd/statd.h

index 231ac7e0764b..bb1fecbb6a51 100644

--- a/utils/statd/statd.h

+++ b/utils/statd/statd.h

@@ -41,7 +41,7 @@ extern void	load_state(void);

 /*

  * Host status structure and macros.

  */

-stat_chge		SM_stat_chge;

+extern stat_chge	SM_stat_chge;

 #define MY_NAME		SM_stat_chge.mon_name

 #define MY_STATE	SM_stat_chge.state

-- 

2.24.1

# Copyright 1999-2020 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 ~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

	!<sys-apps/openrc-0.13.9

	selinux? (

		sec-policy/selinux-rpc

		sec-policy/selinux-rpcbind

	)

"

BDEPEND="

	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

	"${FILESDIR}"/${PN}-2.3.4-no-common.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-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

		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

}