public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: nfs-utils-1.3.0.ebuild ChangeLog
@ 2014-06-20  6:24 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2014-06-20  6:24 UTC (permalink / raw
  To: gentoo-commits

vapier      14/06/20 06:24:27

  Modified:             ChangeLog
  Added:                nfs-utils-1.3.0.ebuild
  Log:
  Version bump #506760 by Nenad Peric.  Run keepdir on /etc/exports.d #470102 by Alon Bar-Lev.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.247                net-fs/nfs-utils/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.247&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.247&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.246&r2=1.247

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- ChangeLog	20 Jun 2014 06:21:22 -0000	1.246
+++ ChangeLog	20 Jun 2014 06:24:27 -0000	1.247
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.246 2014/06/20 06:21:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.247 2014/06/20 06:24:27 vapier Exp $
+
+*nfs-utils-1.3.0 (20 Jun 2014)
+
+  20 Jun 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/nfs-utils-1.3.0-gcc-4.9.patch, +nfs-utils-1.3.0.ebuild:
+  Version bump #506760 by Nenad Peric.  Run keepdir on /etc/exports.d #470102 by
+  Alon Bar-Lev.
 
   20 Jun 2014; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
   Drop rpc_pipefs creation as the rpc.pipefs.initd takes care of it.



1.1                  net-fs/nfs-utils/nfs-utils-1.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.1&content-type=text/plain

Index: nfs-utils-1.3.0.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.1 2014/06/20 06:24:27 vapier Exp $

EAPI="4"

inherit eutils flag-o-matic multilib autotools systemd

DESCRIPTION="NFS client and server daemons"
HOMEPAGE="http://linux-nfs.org/"
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="caps ipv6 kerberos +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="tcpd? ( sys-apps/tcp-wrappers )
	caps? ( sys-libs/libcap )
	sys-libs/e2fsprogs-libs
	>=net-nds/rpcbind-0.2.0-r1
	net-libs/libtirpc
	libmount? ( sys-apps/util-linux )
	nfsdcld? ( >=dev-db/sqlite-3.3 )
	nfsv4? (
		>=dev-libs/libevent-1.0b
		>=net-libs/libnfsidmap-0.21-r1
		kerberos? (
			>=net-libs/libtirpc-0.2.4-r1[kerberos]
			app-crypt/mit-krb5
		)
		nfsidmap? (
			>=net-libs/libnfsidmap-0.24
			>=sys-apps/keyutils-1.5.9
		)
	)
	nfsv41? (
		sys-fs/lvm2
	)
	selinux? (
		sec-policy/selinux-rpc
		sec-policy/selinux-rpcbind
	)
	uuid? ( sys-apps/util-linux )"
RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
DEPEND="${DEPEND_COMMON}
	virtual/pkgconfig"

src_prepare() {
	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
	epatch "${FILESDIR}"/${PN}-1.3.0-gcc-4.9.patch

	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)
	econf \
		--with-statedir="${EPREFIX}"/var/lib/nfs \
		--enable-tirpc \
		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
		$(use_enable libmount libmount-mount) \
		$(use_with tcpd tcp-wrappers) \
		$(use_enable nfsdcld nfsdcltrack) \
		$(use_enable nfsv4) \
		$(use_enable nfsv41) \
		$(use_enable ipv6) \
		$(use_enable caps) \
		$(use_enable uuid) \
		$(use_enable kerberos gss) \
		--without-gssglue
}

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 "${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 nfsmount rpc.statd "${list[@]}" ; do
		newinitd "${FILESDIR}"/${f}.initd ${f}
	done
	for f in nfs nfsmount ; do
		newconfd "${FILESDIR}"/${f}.confd ${f}
	done
	sed -i \
		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
		"${ED}"/etc/conf.d/nfs || die #234132

	systemd_dounit systemd/*.{mount,service,target}
	if ! use nfsv4 || ! use kerberos ; then
		rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
	fi
	sed -i \
		-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
		"${D}$(systemd_get_unitdir)"/* || die
}

pkg_postinst() {
	# Install default xtab and friends if there's none existing.  In
	# src_install we put them in /usr/lib/nfs for safe-keeping, but
	# the daemons actually use the files in /var/lib/nfs.  #30486
	local f
	mkdir -p "${EROOT}"/var/lib/nfs #368505
	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
}





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: nfs-utils-1.3.0.ebuild ChangeLog
@ 2014-06-24 22:54 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2014-06-24 22:54 UTC (permalink / raw
  To: gentoo-commits

vapier      14/06/24 22:54:16

  Modified:             nfs-utils-1.3.0.ebuild ChangeLog
  Log:
  Hack up the systemd scripts a bit more #514372 by Juergen Rose.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.2                  net-fs/nfs-utils/nfs-utils-1.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?r1=1.1&r2=1.2

Index: nfs-utils-1.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.3.0.ebuild	20 Jun 2014 06:24:27 -0000	1.1
+++ nfs-utils-1.3.0.ebuild	24 Jun 2014 22:54:16 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.1 2014/06/20 06:24:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.2 2014/06/24 22:54:16 vapier Exp $
 
 EAPI="4"
 
@@ -134,8 +134,11 @@
 	if ! use nfsv4 || ! use kerberos ; then
 		rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
 	fi
-	sed -i \
+	rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
+	sed -i -r \
 		-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+		-e '/^(After|Wants)=nfs-config.service$/d' \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
 		"${D}$(systemd_get_unitdir)"/* || die
 }
 



1.248                net-fs/nfs-utils/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.247&r2=1.248

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- ChangeLog	20 Jun 2014 06:24:27 -0000	1.247
+++ ChangeLog	24 Jun 2014 22:54:16 -0000	1.248
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.247 2014/06/20 06:24:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.248 2014/06/24 22:54:16 vapier Exp $
+
+  24 Jun 2014; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.3.0.ebuild:
+  Hack up the systemd scripts a bit more #514372 by Juergen Rose.
 
 *nfs-utils-1.3.0 (20 Jun 2014)
 





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: nfs-utils-1.3.0.ebuild ChangeLog
@ 2014-07-01 16:41 Pacho Ramos (pacho)
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos (pacho) @ 2014-07-01 16:41 UTC (permalink / raw
  To: gentoo-commits

pacho       14/07/01 16:41:57

  Modified:             nfs-utils-1.3.0.ebuild ChangeLog
  Log:
  Add a warning too, bug #514372
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.3                  net-fs/nfs-utils/nfs-utils-1.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild?r1=1.2&r2=1.3

Index: nfs-utils-1.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfs-utils-1.3.0.ebuild	24 Jun 2014 22:54:16 -0000	1.2
+++ nfs-utils-1.3.0.ebuild	1 Jul 2014 16:41:57 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.2 2014/06/24 22:54:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.3 2014/07/01 16:41:57 pacho Exp $
 
 EAPI="4"
 
@@ -153,4 +153,13 @@
 		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
+	fi
 }



1.251                net-fs/nfs-utils/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.250&r2=1.251

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- ChangeLog	28 Jun 2014 08:17:11 -0000	1.250
+++ ChangeLog	1 Jul 2014 16:41:57 -0000	1.251
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.250 2014/06/28 08:17:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.251 2014/07/01 16:41:57 pacho Exp $
+
+  01 Jul 2014; Pacho Ramos <pacho@gentoo.org> nfs-utils-1.3.0.ebuild:
+  Add a warning too, bug #514372
 
   28 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> nfs-utils-1.2.9-r3.ebuild:
   amd64/arm/x86 stable, wrt bug #504714





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-07-01 16:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-24 22:54 [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: nfs-utils-1.3.0.ebuild ChangeLog Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2014-07-01 16:41 Pacho Ramos (pacho)
2014-06-20  6:24 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox