Add patches from Andrej Filipcic to fix building with linux-3.6 #437278 by Oliver Freyermuth.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 173 insertions, 15 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index f108ff87eaec..0bb9e3e23d23 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.183 2012/10/02 23:17:48 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.184 2012/11/11 05:47:27 vapier Exp $
+
+*openafs-1.6.1-r2 (11 Nov 2012)
+
+  11 Nov 2012; Mike Frysinger <vapier@gentoo.org> +openafs-1.6.1-r2.ebuild:
+  Add patches from Andrej Filipcic to fix building with linux-3.6 #437278 by
+  Oliver Freyermuth.
 
   02 Oct 2012;  <naota@gentoo.org> openafs-1.6.1-r1.ebuild:
   Drop *-fbsd. #425352
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index c9ae660c9527..018ddac139d2 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -7,26 +7,28 @@ DIST openafs-1.4.14.1-src.tar.bz2 11812593 SHA256 49eda1f6cad3d425426deb72c91a1c
 DIST openafs-1.6.1-doc.tar.bz2 3481865 SHA256 c41006ca12368b028f2108c972bd3de1881b5f78941bc831ff238a0344a3bec6 SHA512 42dc24c7c6f202d1604fdfab753a39a14ae7196bf51fdaeb3b06ace74a360aaa5e37eae340e243ea295fecb0ec65192c61315a39461c3fdc7de7097ff9bc2647 WHIRLPOOL 12ca58f37f8230532d18207feff2bbaf82801b3b110e5bb9f3d810305e6838760afee9dfb62b16a03c96fba9bd99d5c83156c5f47bc7adfed62dd3db45be4788
 DIST openafs-1.6.1-patches-1.tar.bz2 9897 SHA256 d1fa13b60eaa0e755e379c2e0b05fe08eeb2f9a0c247e036139930969bfd4fde SHA512 898a9e3533e2708b8c966713becf5c9e7d8773dae3dd63d6e8392355aeafaa45e7626b1f25be7b2a059b49bbdabfe23a2ce44304d22c6e589460b118343b7cb0 WHIRLPOOL f967b9d4f0cf9c1232067a51dd84fa724c3b3ce40d02227fdb05b5d76e478a53f03a7fed619af5c6b3a4d0f842da057b1aeb5fa86767d5e55a0253250d243a44
 DIST openafs-1.6.1-patches-2.tar.bz2 12656 SHA256 d38a720bd7c37c833ddef5daa9fdc11fca36ea0cb080b3a7db7a06aa0106d31d SHA512 ba9f95b9d65e3841a26067f530c6a900303c1ef73ce25bf050c75c62210d480b9e33ae598c5383fd088e0ccf70de30dbc863af4d2704cf2dda04651f33763d2e WHIRLPOOL 23751400d088180daf15c5aefcf8d897c8b8ade85a16d60596203565ab15e44e89b523d1166a8daf30a92c9078a27afecdd0b650e26692ee7df6d88e25ca4965
+DIST openafs-1.6.1-patches-3.tar.bz2 18030 SHA256 76920804618bf09bba2d847ed280c3efb1de52a31f417bc0f8a50b2ca8a9aa30 SHA512 751192ebb3bdea43d67d584a250e4dd7ef9414e7fd43f596bd6f0bf5094654d53716621170c7f5b0892423d2c98693c40a056bff4b35118866000a50e9ba94f5 WHIRLPOOL ab44bd977a8b49bc01b6433d6d468e918fbe73accaf92351daf341dac0ea8d0e3f6b63b4480aae67d833f251e5ec91820e5d9280d0c98c985052d10e33d1fd3c
 DIST openafs-1.6.1-src.tar.bz2 14356434 SHA256 d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0 SHA512 c0781a8d64fa9a816f043056ffa93531d0a5ee854821503cd07a07d6a2de9123681f9ed6a478101837ce101cd260a5a093664a90a0054caad87ad683911829cc WHIRLPOOL 87803bbc559dd4b0d56d0217b84d46fea1375cb006b74df31b13a55e80ab5023b2c5cc001dc70def608841b56933b1da86bbda6da4e04abd241957d75d644ea4
 EBUILD openafs-1.4.14.1.ebuild 4318 SHA256 bdbc9d28926a061be892a92c8e5c89028d7f268b5194f8ec76d953ada146c365 SHA512 5326d2cdaad9a9b095e2044d0edc4894c88e9c76b56396dd1417694d322102b3de2ce696290581679afabef53e2a679a3478b8652f627e9550a1ce367dc88863 WHIRLPOOL b49753408754704580da37fa4d320a77f6b7fbd9cb7abf49e5f0094216a6af0fa63a82e09d225422ebdb5eec5a82f46be3006a8b72c29f8b0d8a9e48ddd495c0
 EBUILD openafs-1.6.1-r1.ebuild 4422 SHA256 d36c9fdbae7b5acb25edfbeea31ff210cd9341d9230ae689fa6ffdfa4bb1ebeb SHA512 9fc4a7e8fcc90c7b05ccc68416ac1bc4e0a402fadca88a463a21a0328b686228bbc80a7033066547a2d859ae744b2d1db0ac94de60c90511656079c0cce6fa6c WHIRLPOOL 12c9180b3d18e7e0d28c7e8c3d6436626f7dda86a9ecca814ffeb6f7aba5e63d144ce52f1bd084c6880ddc4e256fc0c89658a7bbe4e528b1529eda1af2212a3c
+EBUILD openafs-1.6.1-r2.ebuild 4423 SHA256 c6aca1047c70b8aaaa5dc248e08dd66631152ce9dcd79a2a49ee76636de8a22c SHA512 2387ddd5db08b3411f844bf95e71cff1ae0249957bd4d3df1168a192ebcea43782a948465e3c4beea5e48fdc0ecddead547d9d12a1c45bff508365ebabaa1364 WHIRLPOOL 260e8e294356d9e241ca5169add13f75bd88fe6f14a7e75565ec9a11b18aafdd8981d3a159a0e3815c132e4e02f8b0a46e3d5dfbeaa01c10006a298a5d9a04af
 EBUILD openafs-1.6.1.ebuild 4436 SHA256 2fd32a7c2cd15a2ea55afb0f20e8ad2eba8353d54c1d9539b312da4dc948c5c3 SHA512 78cd410fd84dc135e9cd7d07b571564b823bd4a1b5aa498e6a89c73fb4f6aae43c39400ccb712a33280b9de685527a18339c2a2541067922516b608ad9cadf5b WHIRLPOOL d178135fba0f2aa9effeb638fe03f0d3e89fdf1eb7a6fce732b2eb335aa51e430f30ef14882ae13d85a601466642eb2716f5555337aa95c351357d4f82dc4c87
-MISC ChangeLog 29363 SHA256 5cf1a18ddcfa45fb7fcf11b5cccb8bf1c51b0e54f5a4e226fa213a007a30c086 SHA512 58a91c484e96b1a5bfd8acebd1c8c807519dd4a75c74e2a329a687e5278be0fc030a68cb923557ab0aa21427e1aa1e7824b115b5ae7b6cf977b4cfac5cd520b3 WHIRLPOOL 7c594e16eba93502883326def9f964e5e35a60466a724ba62146da8741c2f886b9ea2323974f30ea325df8cd36027bf8462314645cdf1fa28f2e8d29b9213701
+MISC ChangeLog 29572 SHA256 f8da6b7ea3f7c5110b0c4a19b3eeb6f33351e3d682aa771f0b2a7e72db636bcb SHA512 92cc4ebe81065a4d50edf79656505f965c8b58865225a877e036b89044df8acdea78359a1202a05a00e679be206eee092e6fb814978fef7be8435eade446390c WHIRLPOOL fb6cd7f338ea2d71e1fea407d2c5c21c59f7d6032791ec1c02c8b07d45b46f4eb81f2bebad29c6295ecc8d08c8f5e331a2c8c0a2b77bf30c0c45edc46ece8656
 MISC metadata.xml 255 SHA256 de102ec27cffb1c6a78bd1e8c26372d8c616fc55e9412a8dcc45e30986669909 SHA512 41336c2e66dd1f0ef990f3166b9ed43e8208b6607f310f7dbd23e12f6a4e645a679cebf6ae9838f5ee7beef1a04de7ffbcd0fbca802cff2f5fff38c18ff020ac WHIRLPOOL e3ecc5b6cfd7bdba276ca2851f0939938802a423b3d8e4c10b6c5d3afbe5a8212023d89035cdc62dad4bcf3171a776ee1afe0bae881ab1bf9c381dc2855330ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQa3YlAAoJEDYO1FT4VRUUGskP/1Mg8A6qUr9yWeVFI2lVBCJn
-KHarT4PJfXzlrD9cnBWebzDohtd+D942hisLgRS/Lf1G8RvvgmJraICyRQAVv79d
-el8o47JqpElQE/1faZ4Ia7sjj18yP5wvUOAkTsCIM8UEJpaLUwXzZkW7zKJ9NJht
-bQ68PbbQRmtoJC9+uLmmGg3UJjOtIxhvmYUN82eQQazklVokDZzC52PN0jovUmMT
-v7oqTdsB7ZBcxIdR5Pbij3TR+kZo9tI3+7D/IkaKVoNj9GA7t87XFfV/TLUvYpiX
-g6GSfWQ/bxxKNyTG9XUnfuZuLFBlm2tg9bugxNuRaqonRZTHPQppH3LqMHXTjudW
-kLp8t3EWJfd8LndcWBTy6b5lcOcEuMm4h0t7sVXW8mRlzYn7uzpFsTrV3CJTVFiM
-PnAAmatNzSJfqQ15lXN6gmsGszzmjYISeDxL3uPmQFoOwU7XSJBSuOhIrTUghrb+
-dsRkLC2AHruOhZlMvi70qfxLwN2xKu1yPf3UZMk5dpWmOeMV0TdWs8tchsMH1Yfy
-UVZQN34YULojxCPUsffWwoI0bVvtpVqx7LSNDq//rRSdUoEURb3R+TsPQEVfkLiY
-faFrYUBAuTtmC2svHKkN3jScgD5yU9PaLPElnXDfnpRrPKDHO8NhJqLVOGXVaSL7
-Bz7xX62L18+GKHB7jLNp
-=w8u1
+iQIcBAEBCAAGBQJQnzvwAAoJELEHsLL7fEFW1S4QAJqjYFmCNxMSVEmlOYenkmQz
+24j6w8K0xyUgeUwnHr/vKcdJwj7xlM8ejjEFjzM5QPcCtNv8BmeLZBOpAF7E9Fo/
+OQZwZ/a3m8KmMgidari8877dFtgIZEKJ9Wr+FwuepmJDcvgBlFEEGGpoqjSKs4rw
+ZA3B/pkQdTYmqrHeofs+zU2SYaxZuTe8koCLT8NVQaI7haKh6Fui83UmS5KkBTYw
+STcJCRt4P0NXuCtV12xBCK4W6WeVWo2nyAcSa36bF09KjMw1d0i7bAMQxdK2PM1c
+o3Zy3abEiqfcVfd1DNX4DQa/CvuLRsHycsLhe3JHjeGFXD5cHgwbasV3+VQ68/DN
+m+JIt/aspGpzeVknYzDPc7Nb5mgHAupvfpKKu4/p6DUBn41+miQkCIO5BGgrGCsg
+540P9AYkx0VHOD+Zd7YMfccvl6AHXkxBhe/Mdi190w/Sy9oGK0DbZ892TW1e3ydZ
+o3oFlOCb7AYjTgQ9ZULuR7v/cQsX8MK96IO3pxYim+3yn2ChxrfvM5Jr4mUklweA
+yrJWtJskQi6yadVugJ3ZGUwBUnHJkSr+zirCpwZeJ8ElpxUAzob5NbR6xdS1b7z1
+OTgenACbTVyVekOIZ+35CEcmcM7hbJXDocGoKza/Vkpf7/6jvWqpygM/iilM1OEk
+5qiqtjzMi9fOGn4x7knm
+=+xMn
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.6.1-r2.ebuild b/net-fs/openafs/openafs-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..967e2a42bc77
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.1-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.1-r2.ebuild,v 1.1 2012/11/11 05:47:27 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="3"
+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/openafs/${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_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 ~amd64-linux ~x86-linux"
+IUSE="doc kerberos pam"
+
+RDEPEND="~net-fs/openafs-kernel-${PV}
+	sys-libs/ncurses
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+
+	# packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
+	sed -i 's/^\(\s*\)a/\1ea/' regen.sh
+	: # this line makes repoman ok with not calling eautoconf etc. directly
+	skipman=1
+	. regen.sh
+}
+
+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-supergroups \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		${myconf}
+}
+
+src_compile() {
+	emake all_nolibafs
+}
+
+src_install() {
+	local CONFDIR=${WORKDIR}/gentoo/configs
+	local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| 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 "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/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"
+}