*fcpci-0.1-r10 (17 Jul 2013)

  17 Jul 2013; Dennis Freise <dennis.freise@final-frontier.org>
  Revision bump, new patch for kernel >= 3.10 (thx to Arnd Feldmueller)

4 files changed, 122 insertions, 1 deletions

diff --git a/net-dialup/fcpci/ChangeLog b/net-dialup/fcpci/ChangeLog
index 843de57..a07daca 100644
--- a/net-dialup/fcpci/ChangeLog
+++ b/net-dialup/fcpci/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fcpci-0.1-r10 (17 Jul 2013)
+  17 Jul 2013; Dennis Freise <dennis.freise@final-frontier.org>
+  Revision bump, new patch for kernel >= 3.10 (thx to Arnd Feldmueller)
+
 *fcpci-0.1-r9 (28 Feb 2013)
   28 Feb 2013; Dennis Freise <dennis.freise@final-frontier.org>
   Revision bump, new patch for kernel >= 3.8, removing references to __devinit and __devexit
diff --git a/net-dialup/fcpci/Manifest b/net-dialup/fcpci/Manifest
index 5b52c5e..0290ab2 100644
--- a/net-dialup/fcpci/Manifest
+++ b/net-dialup/fcpci/Manifest
@@ -1,16 +1,18 @@
 AUX fcpci-kernel-2.6.34.patch 4358 SHA256 82f72dda3f5a6956e5e35990e0b431ff11c8f9a4f046f991d19aca95d79dfd6e SHA512 e813bf38284d2adeac999d80c104046eb21bdc90098a18d3cfd7cfc51d85924fe815765dc00c8b115d830400b7eb619563196fecc08975d973bf6a2783277788 WHIRLPOOL a36782cbae7ffae859466b995f0fa2b4b8b81a80c4b43489d7e00d872cad76430e957e1914f877e21b210c4f0fdc02f2d31d3e2389dbf4eebd78e8dcd6bd4813
 AUX fcpci-kernel-2.6.39-amd64.patch 1663 SHA256 5170d808807897319d85ed035c170d672df81ee505e795ee0b31d2fc4a9359e1 SHA512 27d8e98ff9173af50a195f08fa3ea194b370a9f5f5e83ee0478f70deaac5005e641918215109e27a5329be41e7784998df97372090e96976d39991d9b4458903 WHIRLPOOL 218eb5052c7ae671bff858f6e230b46b2ba62c740a44ec7cd430e8ab243c9bee0217967ad1a7728e8fc97b4f62addb1a71e7c2e5dafa35690bb250c2f4b15d4c
 AUX fcpci-kernel-2.6.39.patch 850 SHA256 9f56ee45159365216fd58b1d76ce878fd4db2eee456c04354c56330db7a257d6 SHA512 253923b2e81ef6eb81ed30e72a9467dd370719a7f86c5c53f2ec75883ca6892e079fb4edd155199ab840c4c2cc048ba97b84be30a72e229bf9c497b8c044d301 WHIRLPOOL 197bce7cc78406ca49e32f7193bd092173ed24d16a7f54f815673a4134cd563d6aebb79589f8bcfd949a74a0c4dfb1965ed77dec46d8e01b29e91c6e0c958ba3
+AUX fcpci-kernel-3.10.0.patch 781 SHA256 0e9eab553425dd95f2d578c639520fde168d20f519fae892964dba793abba36a SHA512 c13d1882cf38587f0bfae9d3a432051872b5d7ed9871d6ced3c677fede6ede4b73620ffb1bb21354dc8db80e9d78849a397504d77b582dd78955dd1e57ac6cff WHIRLPOOL cf3a9e520013f1f0de99c65329875795eac43b40a22f15281ccd1de3460411a519e05a24d602937da80fee463329f4c2fd2c27c67a8d79a424693b6640ecc654
 AUX fcpci-kernel-3.2.0.patch 336 SHA256 b1c11e9909d5119bda153403adc3c1e54bec3567216bab2feaff7e1088c58d43 SHA512 ca8635ad6a9985e50d20b1011b366af736d1b71f0976eeb23a1cab9d55d4049fbea19a5473a64ff2d26227ecf80c66083774e5af832f4d8ccc7ec200b7e8b97b WHIRLPOOL bc409761ecc503dd64a7206a2419c07b8b27dfcc987ee1b3d6a8b1b6da5551c20bd0a66a1d57cf21977b49d1e5a2db3dea0ed63e165dc1911aba06c91ab0aa5e
 AUX fcpci-kernel-3.4.0.patch 342 SHA256 221bdc9cbc275a79d872bae42fa8fdf3c87422300602d766f080e0ab1e741383 SHA512 b9f438b58c17aaa89987bd6e30204bf247a569681b0408866640b24868f002401e92d5ac2cf1d19d0b8e28556eaa24a5fdb11ea513fed17a1e282c5ab4957e8f WHIRLPOOL 80e4cfad1d94ad771daf9414ca9fa834d1ad0068e9b4d4f12d7a5de37d9594cba362130bd5f5c6bc99d873fa290ddb70f76e8f0e55778fa3450d80b86a6b9839
 AUX fcpci-kernel-3.8.0.patch 1838 SHA256 6890af0ca1dfbb05427738576a8fc48daba161eba7c68b2ab0821dd18cdd29dd SHA512 20b73bba63be236344a39a966d9ec394966f897a30ae25be869ed47185ff0ca4aaf3f760b11ed0e23413bd06649b58888833b25488aef2ccec697a94df8a976a WHIRLPOOL 7432d1cdec46cfa94a75993e3218868240c4f74bf1ed2129741cb698b923fab60b4dc421968415f05ea6d76fa5437bfeef048d7f860f3360276011b796cc4e61
 AUX kernel-2.6.34.patch 4515 SHA256 94e83fad32998596f97d7f5df3e9c674419616a3bcfb3cb7309c220204ac0de7 SHA512 a30783a507529bd592a5380e28945ac3a2c4fb8e44395168bc1ebddcadfac7576bb1f9fa27b185bd6427bd833c3523fea3a40ff6c3c7f1528a53bf190dcb0694 WHIRLPOOL 8b4589e2d446a69fa6b1c4b485886821cb25e9fe6542227fded7ac3e0a0c119ab061c3bca203a09f0d16ca4fef8e9a4a510700f203b2a2ef3b64c290d06dd13d
 AUX kernel-2.6.39.patch 810 SHA256 5ceb47f364064b11d8ed12f73cf6cbaf22b53cd5f9109d7b1beb7943620bc2af SHA512 3b8fb0b0839a27f850bafb8c6f6490b83e9a2fe739075b19790d304e9d9eba8fbbf562cd8ebc325a01edb84f0034158cd066d4c73474fd832019e07c38d75d8f WHIRLPOOL a4aa12975df3d71eba4e85ea1453a1f4ad8ddaafbed3dd45d3074b184727e7b57ea35b940a68d0ffe0f92ef8e3d1ee5f2804021b4cd186e310cb30606b3a0664
 DIST fcpci-0.1-0.src.rpm 1419782 SHA256 f39c7cb83b21fa9ba1de71f357c72552aa1c5327d7ad4ac55274e71e9da3f8e4 SHA512 fa6277e138d44fbf7865cbb035f11a6a1244827c3b1197a6d33a05c8de41366d3f1765a9d6a6c2b5281b8f11e74eabaec827825425b572e8bbf4982cb009e85a WHIRLPOOL f15ce2f094b5abb254b935b323576367c6069004db7cabb0d3615dd32ac31bdfa5140e3e80a67cb07bad6356eb53a389c0dca6823a3b82128ec867ecdba529f8
+EBUILD fcpci-0.1-r10.ebuild 2006 SHA256 fdc4c989b9d752301765f60d9dc92f2e743a364db1957db727b205475c5aaa21 SHA512 54a3cf69c59c85105b2eec4aca5a2fa511b7fe46b33e2335473633556711ab0aba6f62cf9d87e88398ffb000bb34da78913610febbb394a137f88d34091670d7 WHIRLPOOL e0ae4732b1f5c3c647328dd59e5f7020d474a34731654a94071e48f6091e2b0f28c0a9d94c49c1a680098ec204c712a5e4254d0e73d35adfe4780cd0a8981f7a
 EBUILD fcpci-0.1-r5.ebuild 1535 SHA256 f5458a60ae2dd955f1a6ed6527b89f18ff981c6364bff50f0c18a7d555412c97 SHA512 2ad4a2bdb60331f0e56707b3a66ba720fdc8ae9e326078fa90ce7ba1f01b52727c258fdd9976bad464eaa9209847df1a15170ac6f641bb54ce4e914c3126131b WHIRLPOOL 96f9186e7bb880a4c1be10e735528a065e57c1447181c9f444dc368e5c38663d435f8dbeb05f13adc598049401a12f0f9e8df6e21631e6a070db3b68d3f05cae
 EBUILD fcpci-0.1-r6.ebuild 1659 SHA256 f3ef07ba92ed05943a55da310a1ac251344b60bdccebc081fbca2025b2332340 SHA512 ccee474c0854371a68cf9c140dd4289b85546e482191648ff088d4073ee6d3c4a684fa700f7831f00f832bdf7ec50fc1aaef0bfb3a5db06dc6961ad291272d59 WHIRLPOOL 5a4499d0b804855a0a35567bba8bcae205091dcf38925b4b318b23a0b370310eedf722800b664f7d3d396c83bb8bd15591ccef793f88dcbb211aade921a9508d
 EBUILD fcpci-0.1-r7.ebuild 1744 SHA256 76ccc097ed4482463d04cf74aae779b942431a8d9c09d04e156d85596cba460b SHA512 6ec33126593d51562338046916c58f43e6c3210269c4870b65e1c2f607990d1bc5bb0a0a19434a84a796bc1b543690f9aba9298272f11fa392554013b5ea9b80 WHIRLPOOL 91c9d5329441ad1800eb63ef6e653bc1d45f3bb3964b7156e5c585e5d5401faa18334328b1666d2faf0bdc46d9350e053b7be06ee0679d2f7f6db2cc589bb049
 EBUILD fcpci-0.1-r8.ebuild 1827 SHA256 61074b317a3f421fefbf1f1ff25ec0d510a7cf1b78ff6e9caa0bff2b55cd7b59 SHA512 e362c9ac6db40f223593f02684fe682878174c96add06713d47d34f8a449e9480805f49549f0ba71cd96fb793a27b8046fff1d83f200d5bd488512493b8dbbc9 WHIRLPOOL c67b0baef6d82e9bb52a406f004b1c5a382df43f3056eaf299c4707ea2999a18bfef3a5915119514b9e65558e7881fd1e3c32b74833a1f2872fd7fd5032c4924
 EBUILD fcpci-0.1-r9.ebuild 1917 SHA256 65177814f35a379a93515866bf63792806110d0c1f3e72cb65ce752116d6a302 SHA512 600a0cbab2ec0cf4e589778b2cb3c902d7045d9d3c829fe4c033b97b8e7f9c3608b02bd07694d76edea9af54b97c8bab6e2d2b5e2e0851d8c9bb6f013736de49 WHIRLPOOL 93f013aeb25bb505a98afe4468d83dfaeb4412f589c6995c3984f9d119aef05790775a948f309b6ff82c296cbee18953cc53f8e32dca34a3ec17f5e75f2fa89b
-MISC ChangeLog 3449 SHA256 29fea4f68591ab2828bd9f191a05a4ad87344ffaeb7d7905ee991a321d0d3cfb SHA512 d7689579704e522a11998691f8b07202d2f12828eadac100c48ebff847828b35009fdc27d98468bd46d2236a08d84256be1d9f9bceeea08efc07bcd26a4325a5 WHIRLPOOL 4bd4c162bee9d07d6328ddb38a970ef6dbd430741276508037251a8aac8058466eb76d0112e1cfe01fbe3823d8bed781cff56079b066df6b2c9c7e5d0c675bd5
+MISC ChangeLog 3615 SHA256 21d10fbf4560c2a7680b40ce48521e4388eea5c2ff9e7653955ca1c3424848ad SHA512 80238bf1d80068040092ba0410cc89aa00dcb40c6a9da63c47e3087dfc983cb6c9800c7be41c42c25e82bd9c408a252bd66a7580f5c20bb5070857028db392e7 WHIRLPOOL 540cc1383a51e8a6757fcdd2af0522604c1295e1474ee5ab6304cc5a7f674e9d61f7adbc063c5ee10a26de05ec5e2e3838336e1e4957933ee2de2c497aecbf1c
 MISC metadata.xml 263 SHA256 ad6c0344e90e2a2c1f631b6d6e0242799bec90eee1eaccdc04674f52be49ea75 SHA512 c7faba7f22a21cd1c85a0f45fb2257e036022ccc828faa699e5c1c8efc364b83e639c0466da9d6b1183fc19b953f2df6d68246880f091c9d59ed80d1449a674c WHIRLPOOL f7c52da6567716bfbc3b59aedb57906171011baa47ec613f9183930c2801c2528101e52b9223247d8d7f1910e389f199db969f661f6deb356dd2762aa0238fca
diff --git a/net-dialup/fcpci/fcpci-0.1-r10.ebuild b/net-dialup/fcpci/fcpci-0.1-r10.ebuild
new file mode 100644
index 0000000..2a0e400
--- /dev/null
+++ b/net-dialup/fcpci/fcpci-0.1-r10.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils rpm linux-mod
+
+DESCRIPTION="AVM kernel 2.6/3.0 modules for Fritz!Card PCI"
+HOMEPAGE="http://opensuse.foehr-it.de/"
+SRC_URI="http://opensuse.foehr-it.de/rpms/11_2/src/${P}-0.src.rpm"
+
+LICENSE="AVM-FC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="!net-dialup/fritzcapi"
+RDEPEND="${DEPEND} net-dialup/capi4k-utils"
+
+RESTRICT="primaryuri"
+
+S="${WORKDIR}/fritz"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if ! kernel_is ge 2 6 ; then
+		die "This package works only with 2.6/3.0 kernel!"
+	fi
+
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}/src"
+	MODULE_NAMES="${PN}(net:${S}/src)"
+}
+
+src_unpack() {
+	local BIT="" PAT="012345"
+	if use amd64; then
+		BIT="64bit-" PAT="1234"
+	fi
+
+	if kernel_is ge 2 6 31 ; then
+		PAT="${PAT}67"
+	fi
+
+	rpm_unpack "${A}" || die "failed to unpack ${A} file"
+	DISTDIR="${WORKDIR}" unpack ${PN}-suse[0-9][0-9]-${BIT}[0-9].[0-9]*-[0-9]*.tar.gz
+
+	cd "${S}"
+	epatch $(sed -n "s|^Patch[${PAT}]:\s*\(.*\)|../\1|p" ../${PN}.spec)
+
+	if kernel_is ge 2 6 34 ; then
+		epatch "${FILESDIR}"/fcpci-kernel-2.6.34.patch
+	fi
+
+	if kernel_is ge 2 6 39 ; then
+		if use amd64; then
+			epatch "${FILESDIR}"/fcpci-kernel-2.6.39-amd64.patch
+		else
+			epatch "${FILESDIR}"/fcpci-kernel-2.6.39.patch
+		fi
+
+		if kernel_is ge 3 2 0 ; then
+			epatch "${FILESDIR}"/fcpci-kernel-3.2.0.patch
+		fi
+
+		if kernel_is ge 3 4 0 ; then
+			epatch "${FILESDIR}"/fcpci-kernel-3.4.0.patch
+		fi
+
+		if kernel_is ge 3 8 0 ; then
+			epatch "${FILESDIR}"/fcpci-kernel-3.8.0.patch
+		fi
+
+		if kernel_is ge 3 10 0 ; then
+			epatch "${FILESDIR}"/fcpci-kernel-3.10.0.patch
+		fi
+
+	fi
+
+	convert_to_m src/Makefile
+
+	for i in lib/*-lib.o; do
+		einfo "Localize symbols in ${i##*/} ..."
+		objcopy -L memcmp -L memcpy -L memmove -L memset -L strcat \
+			-L strcmp -L strcpy -L strlen -L strncmp -L strncpy "${i}"
+	done
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc CAPI*.txt
+	dohtml *.html
+}
diff --git a/net-dialup/fcpci/files/fcpci-kernel-3.10.0.patch b/net-dialup/fcpci/files/fcpci-kernel-3.10.0.patch
new file mode 100644
index 0000000..d7cbdda
--- /dev/null
+++ b/net-dialup/fcpci/files/fcpci-kernel-3.10.0.patch
@@ -0,0 +1,22 @@
+--- fritz/src/driver.c.old	2013-07-15 18:29:24.311278403 +0200
++++ fritz/src/driver.c		2013-07-15 18:34:30.139297718 +0200
+@@ -37,6 +37,7 @@
+ #include <linux/ctype.h>
+ #include <linux/string.h>
+ #include <linux/list.h>
++#include <linux/proc_fs.h>
+ #include <linux/capi.h>
+ #include <linux/isdn/capilli.h>
+ #include <linux/isdn/capiutil.h>
+@@ -534,7 +535,10 @@ static int __kcapi ctr_info (struct seq_
+ 
+ static int ctr_proc_open(struct inode *inode, struct file *file)
+ {
+-	return single_open(file, ctr_info, PDE(inode)->data);
++	return single_open(file, ctr_info, PDE_DATA(inode));
++
++/* > = kernel 3.10.0 rename PDE to PDE_DATE without pointer to data in linux/proc_fs.h 
++       Arnd Feldmueller <arnd.feldmueller@web.de> */
+ }
+ 
+ const struct file_operations ctr_proc_fops = {