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, 110 insertions, 16 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 81e847a024e9..8c8466d3145c 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/openafs-kernel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.139 2012/09/25 00:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.140 2012/11/11 20:04:46 vapier Exp $
+
+*openafs-kernel-1.6.1-r2 (11 Nov 2012)
+
+  11 Nov 2012; Mike Frysinger <vapier@gentoo.org>
+  +openafs-kernel-1.6.1-r2.ebuild:
+  Add patches from Andrej Filipcic to fix building with linux-3.6 #437278 by
+  Oliver Freyermuth.
 
   25 Sep 2012; Mike Frysinger <vapier@gentoo.org>
   -openafs-kernel-1.4.14.ebuild, -openafs-kernel-1.6.0.ebuild,
@@ -683,4 +690,3 @@
   This set of ebuilds exist to match openafs-1.2.13 and openafs-1.3.85
   respectively. All this hard work was done to ease the pain for openafs users
   on kernel upgrades, by Stefaan De Roeck <stefaan.deroeck@gmail.com>.
-
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 8dcbbef64ab8..f50d38139cbf 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -5,26 +5,28 @@ DIST openafs-1.4.14.1-patches-1.tar.bz2 12912 SHA256 381755cd88b8171a8c605f3bf4a
 DIST openafs-1.4.14.1-src.tar.bz2 11812593 SHA256 49eda1f6cad3d425426deb72c91a1cffd2273917dc28f82da0a46234bb99af3b SHA512 93137416903340775f0253224f8da7beac958ef76e418892d24adf190ab9513cf1fc5b93ee34d83a7feb41e17e3cd89cd6d98e2c057eb1313ca2d42cd33d3370 WHIRLPOOL d48b49a991c740fb4f6fca9829fc45051ba9356dfda407b6d31ddd2ba6773a661d6c6a09dbe3a0dd1aed57e0c3951ed991cd6bea3e44bded036ff96521e8da43
 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-kernel-1.4.14.1.ebuild 1836 SHA256 e8095c2f30d1e60ba2397672ff1637c753507e97cd0fe4710a301559dceeb2c4 SHA512 45fed2d09c8323c1302fe28152af7bb767614f6089acaecbfc9a7dc4660e66388f942c71e1145521378e18eb9a6d7b4dc255c5511e544aa4585ebc0beee52675 WHIRLPOOL f2a03b3662b72c4cf483c88818c2e28fd585fe5884e118197f218c3f79f7d39f3144fad50e274f64c02194f0622ed11973bd554a6c69b7a2a95d9ab1565ab5d7
 EBUILD openafs-kernel-1.6.1-r1.ebuild 2469 SHA256 b423bca4f09761e8c65e07a73ec46e3027c73eb5c5eb2e2c2832426dadb8b5fe SHA512 20ed7c7806251880624e7fd8e1a66e2a617adb656aa1d3afe3583127df45a93a15c5df228c46c7fe6874d5611cd88961c8a23e9e9640ca618335e1486d1c08c9 WHIRLPOOL 041a098538a9f348161c65286e8356a652999346edc10852334d562877d346dfb306b6f9a4519a6853ea9c47b8a27117af6dd864b78a2f33032e1ced206a1773
+EBUILD openafs-kernel-1.6.1-r2.ebuild 2469 SHA256 df3641bac14e312309c1ccc979da3e6f4a3a602dca7f14f04efe79ebba47e89e SHA512 42eb0c65844a5b2e622e7ea655e7844cfad2d815858a08074346d64fca8ff7e2af568eee167dda985d4c1d8bae685c05ca10beb3c26286d9e685c3a404b7948f WHIRLPOOL 4b625e97ed9b1b1a5328c1bf25257c3220e45b473a1d74da64af8be88d6add8017cbf9c008cf75ab444b03b0ad15675f1c519b4e6b6e435d117552e9fb2392eb
 EBUILD openafs-kernel-1.6.1.ebuild 1921 SHA256 b9518b42bac0a94156a2f87973fd2b1e9386654092084419147d5f49b9c8f1bb SHA512 93c5a8ee7394b9fb205a8d47d427af4fd99226613026f384886725845ab75c37a7ce4d83890ac2f1cab9ef5eb74bf6562ba4f007dd37ee091d970e4c6ad627b0 WHIRLPOOL d265388fa580ee7feca98380ce863381985feb0fec62b20c9d83e0f2e84d6d42db5f4b0021d40fdc10f008e668ea09d91a29f9305b8a02b11db41e6e6ba92f46
-MISC ChangeLog 23081 SHA256 ca16d053967e2ea6396aae3ace890bb07e8086a74dd3e3c410a0773456b53ee3 SHA512 ea5cb6bbe5716de4ee83181d1a893e8dfa2418fb3b3403815a76b787ec57640583aa2ec07cd9af26f35c33fcd949fc1cc254ec9c7d06f6613220dfb9c94b908b WHIRLPOOL 2a24ba09039d0d99ae60d72a81d186138d85f4c0d498f9bb532ec4ce944cb9a7d823ed0ad297c9725db16ab5d11eec7d5ca6ce45e3bdfd722ec86276b979c430
+MISC ChangeLog 23304 SHA256 0021c225ef22df9e99ceeab3e76bd8a460b5a7fcf1d3a23df3ed107ba0b82020 SHA512 6d61a8c9df2ef51199473774fa8e9b3055d356fe8e023ac3187c972e2f85a7e55c71fd5ab403f5838c02d6e3b97160419cb4caebc4bc1d1cd4696773a512d0bf WHIRLPOOL c27294a4ee3b40957ca8225d607090f87b7ba97f2e8eac3286b8d9bc73352492d08ff264d512d438260a969718269bd6e0e6207f5d535c730403dc0ce51d5565
 MISC metadata.xml 255 SHA256 de102ec27cffb1c6a78bd1e8c26372d8c616fc55e9412a8dcc45e30986669909 SHA512 41336c2e66dd1f0ef990f3166b9ed43e8208b6607f310f7dbd23e12f6a4e645a679cebf6ae9838f5ee7beef1a04de7ffbcd0fbca802cff2f5fff38c18ff020ac WHIRLPOOL e3ecc5b6cfd7bdba276ca2851f0939938802a423b3d8e4c10b6c5d3afbe5a8212023d89035cdc62dad4bcf3171a776ee1afe0bae881ab1bf9c381dc2855330ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQYPiJAAoJELEHsLL7fEFWw70QAKPTZnR9JirYJSjKqB4ddRY7
-pKRQUp4Ysx1xkK2KkhwTKidBhXX+6JGy6cFL9GRl5xo+urtdNlNf5UB44UVFywF+
-MaXHkNhLcsUi8j3zUAmgnxYwffC3SFqCbGw0e9K2shJEav2AhGmMOXD3IcsiDsHH
-F2yaQUSclFfUQWCEnixsQnHwx9NSagX4gAOsc3SkfVutzTDlvPkouErjKzuF761O
-jTAQK4O/Jewt+yME6N5BM8kanEbolQSRVCwtdZ2JTYGeM0Szir3XRabXCQjOIJ4I
-8ylDuwQnXTJm24weuBjA7I7F1wiKQVnUvO1TlBIZd0uEjddSkWd+LENw5QZFa9l4
-HR+YsYmIBF9EMc6QoItA3vcf+ObfR9N5undc8G3KRFUGI7w6sDhsvddxrallcDZx
-qko4GN7jY11e9wFcnsJ3CPRSD7ZUx4fTx1h0UT8lr9S+5SAAPqL7ri6du0Do1JnJ
-WZNFpkBPmniv2BKvI1ZUtWZmdgCrW8NkuFaRPEvIVDJWbnv6AwZhp29mgAAP/YzQ
-oRVo8sRfm5DWil7Oeo2KMjIlHUEsed9HyVhiu5tKFAivDapsUMMfS+DdRx/lFxcr
-CpDFgo9PEXjINArQ++BFzAs9MoKhroKP/vrnq6dzLJAEHi0ALsLrBa5NS/UU9HuV
-C5nUzM1eXL7EEzf/wSL5
-=O+Di
+iQIcBAEBCAAGBQJQoATfAAoJELEHsLL7fEFWaKMQALHOXjmAxeihfLp+cBUyNJG/
+7iTw59Vq/cxiKGPEumk88vaJ+7M1ErFJISHJpxKLWhOrj82/IL9y5vNdYU2xebZy
+zyG8hBLlTtbx86AVcHcq3JfLDcj9UWZMjvLwm8+45H2hPijG1yX+7lDu0Fi37Hpd
+5XzufzZKF35BW5q4jZbYpYxWjXVY/BQo9vrEZWEUhWCYu56DS02BPTQHClR2LMP6
+PViJe4BpR9ipKp/glV5JB45FpZwyLhSqUQvXYw05gyjDoKSouYax9WnCOiaDaoL/
+vYriZj5KA+W9slTlEeI1szYxpJAOLxvDFm8deoXnkJGP+qUOABZuPQHqHdmVXn+q
+BdmVrR3EMsMhj1LJz+//N79aiDHODXhZqGyNTEccP/SX/Acpk/gTR8nvMgusc9Sa
+7+VJq8+wjW169TcIvFARfeBzcARXRYHoUdSWc4xzwh7zT/X15XSVYH7ROTToFmKl
+s2Yly0g+W7V5NjpCrdwsR1kcqP3JRWIChQngaaPvfBSRvnTWPYdyauuFd4+iOVzs
+nXT8S/YZTXR2HHYMALo6QHyX7UPgUDQJ7GrVZ0xCHK1AyGIm1TAObpqv6WuBuM8D
+zOt1BnVvAqnqgJ0ABtOw1795NoIef2IoGum170NIA+C4xzWbxeKzVqUiMFXHm2Dm
+SA0yF6mCctOP6YPH+ZOp
+=pBAf
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.1-r2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.1-r2.ebuild
new file mode 100644
index 000000000000..35e006ce9496
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.1-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.1-r2.ebuild,v 1.1 2012/11/11 20:04:46 vapier Exp $
+
+EAPI="4"
+
+inherit eutils autotools multilib linux-mod versionator toolchain-funcs
+
+MY_PV=$(delete_version_separator '_')
+MY_PN=${PN/-kernel}
+MY_P2="${MY_PN}-${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="3"
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+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
+	mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2 sun-rpc"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+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 's/^\(\s*\)a/\1ea/' regen.sh
+	: # this line makes repoman ok with not calling eautoconf etc. directly
+	skipman=1
+	. regen.sh
+}
+
+src_configure() {
+	ARCH="$(tc-arch-kernel)" \
+	econf \
+		--with-linux-kernel-headers=${KV_DIR} \
+		--with-linux-kernel-build=${KV_OUT_DIR}
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
+}
+
+src_install() {
+	if use kernel_linux; then
+		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+		linux-mod_src_install
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${S}"/src/libafs/MODLOAD/libafs.ko
+	fi
+}
+
+pkg_postinst() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+}
+
+pkg_postrm() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+}