summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-07-11 23:04:47 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-07-11 23:04:47 +0000
commit1d82e00247a65dcdeb662ec5d4a3f06684025a9d (patch)
tree465addf1dd3b29774b5b498784d2ff7b8c6f9048 /net-dialup
parentAdd two patches from upstream. Enable IPv6 in configuration, depending on the... (diff)
downloadgentoo-2-1d82e00247a65dcdeb662ec5d4a3f06684025a9d.tar.gz
gentoo-2-1d82e00247a65dcdeb662ec5d4a3f06684025a9d.tar.bz2
gentoo-2-1d82e00247a65dcdeb662ec5d4a3f06684025a9d.zip
Add 2.6.22 support thanks to Sven <skoehler@upb.de> in bug 184903
(Portage version: 2.1.3_rc7)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/fritzcapi/ChangeLog6
-rw-r--r--net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch48
-rw-r--r--net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild3
3 files changed, 55 insertions, 2 deletions
diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index 5b3ada080857..6ca594b522c0 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/fritzcapi
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.31 2007/06/27 21:34:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.32 2007/07/11 23:04:47 genstef Exp $
+
+ 11 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+ +files/fritzcapi-2.6.22.patch, fritzcapi-2.6.43.ebuild:
+ Add 2.6.22 support thanks to Sven <skoehler@upb.de> in bug 184903
27 Jun 2007; Stefan Schweizer <genstef@gentoo.org>
+files/2.6.43-linux-2.6.19-irq_handler.amd64.patch,
diff --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch
new file mode 100644
index 000000000000..7ef955ed3aba
--- /dev/null
+++ b/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch
@@ -0,0 +1,48 @@
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/main.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/main.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/main.c 2007-07-11 08:09:35.000000000 +0200
++++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/main.c 2007-07-11 08:18:31.000000000 +0200
+@@ -374,7 +374,7 @@
+ }
+
+ #if defined (__fcpci__)
+- if (0 == (err = pci_module_init (&fcpci_driver))) {
++ if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ LOG("PCI driver registered.\n");
+ register_capi_driver (&fritz_capi_driver);
+ LOG("CAPI driver registered.\n");
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-07-11 08:09:35.000000000 +0200
++++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c 2007-07-11 08:18:31.000000000 +0200
+@@ -364,7 +364,7 @@
+ #endif
+
+ #if defined (__fcpci__)
+- if (0 == (err = pci_module_init (&fcpci_driver))) {
++ if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ LOG("PCI driver registered.\n");
+ register_capi_driver (&fritz_capi_driver);
+ LOG("CAPI driver registered.\n");
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-07-11 08:09:35.000000000 +0200
++++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c 2007-07-11 08:18:31.000000000 +0200
+@@ -363,7 +363,7 @@
+ #endif
+
+ #if defined (__fcpci__)
+- if (0 == (err = pci_module_init (&fcpci_driver))) {
++ if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ LOG("PCI driver registered.\n");
+ register_capi_driver (&fritz_capi_driver);
+ LOG("CAPI driver registered.\n");
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c 2007-07-11 08:09:35.000000000 +0200
++++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c 2007-07-11 08:18:31.000000000 +0200
+@@ -375,7 +375,7 @@
+ }
+
+ #if defined (__fcpci__)
+- if (0 == (err = pci_module_init (&fcpci_driver))) {
++ if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ LOG("PCI driver registered.\n");
+ register_capi_driver (&fritz_capi_driver);
+ LOG("CAPI driver registered.\n");
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
index a98ed48a29d4..30a99d5307eb 100644
--- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.13 2007/07/10 18:01:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.14 2007/07/11 23:04:47 genstef Exp $
inherit linux-mod rpm eutils
@@ -98,6 +98,7 @@ pkg_setup() {
src_unpack() {
rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file"
+ epatch ${FILESDIR}/fritzcapi-2.6.22.patch
cd "${S}"
mkdir -p "${WORKDIR}/var/lib/fritz"
ln fritz.*/lib/*-lib.o "${WORKDIR}/var/lib/fritz"