Add -lresolv linking fix by Andrej Filipcic #305823 by Sébastien Fabbro.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 154 insertions, 7 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 7eac4519109b..1cc6e17a03ad 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.165 2010/06/23 18:22:05 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.166 2010/08/21 22:10:34 vapier Exp $
+
+*openafs-1.4.12.1-r1 (21 Aug 2010)
+
+  21 Aug 2010; Mike Frysinger <vapier@gentoo.org> +openafs-1.4.12.1-r1.ebuild:
+  Add -lresolv linking fix by Andrej Filipcic #305823 by Sébastien Fabbro.
 
   23 Jun 2010; Mark Loeser <halcy0n@gentoo.org> -openafs-1.4.6.ebuild,
   openafs-1.4.9.ebuild, openafs-1.4.10.ebuild, openafs-1.4.11.ebuild,
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 62a8a68f2a0c..db05955256df 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openafs-dprintf.patch 4319 RMD160 6ce7cab3cbe43755fdff1463b0cf6050ab9f5100 SHA1 2bc9f1f7415148b119a4b93935990044dedb87f8 SHA256 9e0f41a6c2c0fec30916d2fab18209b8444d5e8dbd85e5c2eda8d454f8c9e2b3
 DIST openafs-1.4.10-doc.tar.bz2 2989990 RMD160 3853c76e829e5b893333ea5ba012721d302583c3 SHA1 baa66ad04e86819ef48830b6f4f45ec45c29dd49 SHA256 7c43cc49f5bb90bb3df5929cdb628fb1d06aecac37443d520addf45b9c15bb91
@@ -8,6 +8,7 @@ DIST openafs-1.4.11-doc.tar.bz2 3756075 RMD160 d635791134ccd661dc0eebb49eb459a42
 DIST openafs-1.4.11-src.tar.bz2 11556938 RMD160 e9b4d67a8ccd331745441f643863fa196f8f9220 SHA1 932c7830b747e944edd558f3dbac5636e367beb0 SHA256 acaaca5919a21e2c6b2ba666e7bcb07dc511a6611b80e378fc9e7699ec5dd6f3
 DIST openafs-1.4.12.1-doc.tar.bz2 3721359 RMD160 ea16d4aa03e87e2d0b4f1ad98a955cf07e561261 SHA1 1c9dcc41de19470953fa339e4cfea1b0e780b9fd SHA256 297e7e70fac13505843afcbf48f2d49a9c9c07ff8cfcdb698fe256b565919c91
 DIST openafs-1.4.12.1-patches-1.tar.bz2 12246 RMD160 4770a1957bf400c640426f17728cc64385478c51 SHA1 3d476099bd7357b30ccfebc067b61c7819df6bf0 SHA256 1d119bfe06e196cae18b2765b23066e9c96d8ef773f3a1a36616e70a546a33c8
+DIST openafs-1.4.12.1-patches-2.tar.bz2 12632 RMD160 93f910ba4806d83bd3f9da870d54b6557ad40054 SHA1 f9a208be0f79dcda407bec1466d340530d9d1994 SHA256 488ae2cc366ba600f8a1ef10459c662abd076683c9ea34694276e873caaf54a0
 DIST openafs-1.4.12.1-src.tar.bz2 11797335 RMD160 5c0d370a52faa2f7787b9c321cbfe733ae212be1 SHA1 b91a4d6213af1b31311b089a85e729b52980c18b SHA256 2335542deba8e1c1751d0586f88adf7fdc642305241c0ebb896f4d264dd6298e
 DIST openafs-1.4.9-doc.tar.bz2 2983594 RMD160 d0e1bfae41d4b6e3591cc32b438a4c9edcb60f38 SHA1 061de830797a2e1db912df92419aec013824b895 SHA256 381a10b0208c63e787a5ebeca123464235c6561f33281843d3f73ae1f7d18a88
 DIST openafs-1.4.9-src.tar.bz2 11537589 RMD160 f5652e5576fd67a058dece1eff7481f7a9ced080 SHA1 b1816b45f09a8009a1fa19860c27aa7abdf5ee4d SHA256 e190a1b22d23cb549aa61b7dcdf2e19b1b3904c1d9a286749aca18660bc200de
@@ -17,15 +18,16 @@ DIST openafs-gentoo-0.14.tar.bz2 18293 RMD160 2a7ed8a40395d402de2f972fe0f96154d8
 DIST openafs-gentoo-0.15.tar.bz2 20155 RMD160 40270539fe8992f76953b6ab5f133ec23b017316 SHA1 8f985eb753786c9289721cc7818d96112a5310fc SHA256 3448b50e839826f3fe09ae95a593030a8029c5a769744e74b6d8f3f52f03f940
 EBUILD openafs-1.4.10.ebuild 4636 RMD160 3284094695c20852761b8401a3aca3b9755b9075 SHA1 3fd0ec7fb51e211a9159ac0c806e191e02a4d1f0 SHA256 fec9a948af4666c406ada7c894a21d2c9df85f67af6474bfbd7d202f5a948abe
 EBUILD openafs-1.4.11.ebuild 4591 RMD160 c1f48b93303c1902ebe5aab93abe7262c1c3ebe8 SHA1 92de212ebf54d4c3283d9018eac3e82768e3eb43 SHA256 0229b10114ba6ad6e12ee7d883040199de28539afbcc309db71060fdfcebe519
+EBUILD openafs-1.4.12.1-r1.ebuild 4045 RMD160 2951449652cafbbccb6e30084bc42e554a8411eb SHA1 9bb3f2e73068192e3f527b9f0ccea94bda5ae708 SHA256 1088ffec1f63316d0f1d9da80843d50ae826f4e4692027a3add1dc8d75510b97
 EBUILD openafs-1.4.12.1.ebuild 4043 RMD160 f8597dd1063998213c1b20deda738db35fc764b8 SHA1 1437b82a1f2cf539c3c2db9934ffd2d4f6440cfc SHA256 77d730519f6071857665ec6fc490a8418797ba3e07f56149d6dc5e7333302aa1
 EBUILD openafs-1.4.9.ebuild 4588 RMD160 b9f2cad932b3d8fe39ae2e86268b6f6d201132a8 SHA1 ee4483d117f6d458fe119333d955d7fe373afb8e SHA256 0351b7c9e0e2c9b5d0c5d878fb0c2b4a29d7aa111666fc7f545245c107c16229
 EBUILD openafs-1.5.34.ebuild 4260 RMD160 70b62797335398fa841121589299d84808160a6d SHA1 d17fb635c824096a8a5ccd7f534af7918abb92f8 SHA256 1deb70901d5d3daacb6e4823618d8b87ee25d2a16963fd21850ce3c5482b56ba
-MISC ChangeLog 26405 RMD160 f7f5ed3b12ff86ca32f31c8cf3ade7e619f470cb SHA1 c7fdb4571226943ad5e3eb23967cbef5050ffa30 SHA256 08a055ba810e1764c46390df923551b1d4a8f52cfd00607d927d852c6df20624
+MISC ChangeLog 26596 RMD160 111a7ae0c227094b71ab580a756c585a7bdcf07c SHA1 a0c3ec024fb9af85c3d0ef812cfe02d3d6ba19c6 SHA256 3d2ee11457d2262107557a8668c0505a373f34c430ae6e404c8f8c6e26fe0db3
 MISC metadata.xml 348 RMD160 4ad6baa2e922d8ab7a2ceb6587d98203c4693d3b SHA1 e4c2d8e5cadb6a474828228d5d34331eb41ba25f SHA256 173c0aaaba2d44913bbb77a69c9821b86450e76990f7b2c3a2af7798afcd12d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwiUNMACgkQCRZPokWLroTGBwCcCo+HV0RDf2AMMJ3SL86ghEhz
-/qcAoLTmJHEAWWSkIAYtymfdoE+x93UT
-=2RUl
+iF4EAREIAAYFAkxwT4oACgkQTwhj9JtAlp69vQD/f6uKhE2R9nfbXNvpE8sZ8pIn
+P6bd7TCYGDFOOoE9ZS4A/1EgyA+3PoIeqmvrvWBom8Clp3ikmruCr2GHNOrdtij6
+=+G53
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.4.12.1-r1.ebuild b/net-fs/openafs/openafs-1.4.12.1-r1.ebuild
new file mode 100644
index 000000000000..6ba5f83574cc
--- /dev/null
+++ b/net-fs/openafs/openafs-1.4.12.1-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.12.1-r1.ebuild,v 1.1 2010/08/21 22:10:34 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils autotools toolchain-funcs versionator pam
+
+MY_PV=$(get_version_component_range 1-3)
+PVER="2"
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+SRC_URI="http://openafs.org/dl/${MY_PV}/${P}-src.tar.bz2
+	http://openafs.org/dl/${MY_PV}/${P}-doc.tar.bz2
+	mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="doc kerberos pam"
+
+RDEPEND="~net-fs/openafs-kernel-${PV}
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+src_prepare() {
+	EPATCH_EXCLUDE="012_all_kbuild.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+
+	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
+	sed -i '/^a/s:^:e:' regen.sh
+	skipman=1
+	. regen.sh
+
+	# don't install local copy of lwp #200674
+	sed -i '/^install:/s|:.*|:|' src/lwp/Makefile.in
+}
+
+src_configure() {
+	# cannot use "use_with" macro, as --without-krb5-config crashes the econf
+	local myconf=""
+	if use kerberos; then
+		myconf="--with-krb5-conf=$(type -p krb5-config)"
+	fi
+
+	AFS_SYSKVERS=26 \
+	XCFLAGS="${CFLAGS}" \
+	econf \
+		$(use_enable pam) \
+		--enable-largefile-fileserver \
+		--enable-supergroups \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1 all_nolibafs || die
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake -j1 DESTDIR="${D}" install_nolibafs || die
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB || die
+	echo "/afs:/var/cache/openafs:200000" > "${D}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${D}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${D}"/usr/$(get_libdir)/pam_afs* || die
+	fi
+	rm -f "${D}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${D}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${D}"/usr/bin/kpasswd{,_afs} || die
+	mv "${D}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	dodoc "${CONFDIR}"/README src/afsd/CellServDB
+
+	# documentation package
+	if use doc ; then
+		dodoc doc/{arch,examples,pdf,protocol,txt}/*
+		dohtml -A xml -r doc/{html,xml}/*
+	fi
+
+	# Gentoo related scripts
+	newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
+	newconfd "${CONFDIR}"/openafs-client openafs-client || die
+	newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
+	newconfd "${CONFDIR}"/openafs-server openafs-server || die
+
+	# used directories: client
+	keepdir /etc/openafs
+	keepdir /var/cache/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 "${ROOT}"/etc/openafs/${x} ] ; then
+			cp "${ROOT}"/etc/openafs/${x} "${D}"/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 "  http://www.gentoo.org/doc/en/openafs.xml"
+}