Make kernel patch future-proof (bug #156783 comment #11).

Package-Manager: portage-2.1.1-r2

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 777f34fc34025eeb587473a323b56c0d6ba83f49..75af359d2554e64c46fe296565e80fed78474d07 100644 (file)
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.77 2006/12/08 11:42:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.78 2006/12/20 18:33:11 mrness Exp $
+
+  20 Dec 2006; Alin Năstac <mrness@gentoo.org>
+  files/slmodem-2.9.11-kernel-2.6.19.patch:
+  Make kernel patch future-proof (bug #156783 comment #11).
 
   08 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
   slmodem-2.9.11_pre20061021-r1.ebuild:

diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 6575e0015f55f38742a29e2c571bd1afe5ae8fb2..847bbcc03879a4da94f26b992c506118d3a508ec 100644 (file)
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -5,10 +5,10 @@ AUX slmodem-2.9.11-kernel-2.6.18.patch 1724 RMD160 b9510f6bc823dc3e56cabe3245813
 MD5 6f4ceab8b6496bed4d7ded34fca88f0b files/slmodem-2.9.11-kernel-2.6.18.patch 1724
 RMD160 b9510f6bc823dc3e56cabe32458136b0c204824f files/slmodem-2.9.11-kernel-2.6.18.patch 1724
 SHA256 8d3540177b25624c19ab66526e5666cef570226c6426422d815fe3040416d148 files/slmodem-2.9.11-kernel-2.6.18.patch 1724
-AUX slmodem-2.9.11-kernel-2.6.19.patch 956 RMD160 791b4d74e50c285b9b604e044f7cd9f381fe092e SHA1 30021701369511423790c72ea26a984a43fd7676 SHA256 000ab36c8c440f6662e17a6ec632978b46974f38a20b60b8fe97d1d0d4cbd301
-MD5 ad58a84a7314ce0884b66ad0f03f34a6 files/slmodem-2.9.11-kernel-2.6.19.patch 956
-RMD160 791b4d74e50c285b9b604e044f7cd9f381fe092e files/slmodem-2.9.11-kernel-2.6.19.patch 956
-SHA256 000ab36c8c440f6662e17a6ec632978b46974f38a20b60b8fe97d1d0d4cbd301 files/slmodem-2.9.11-kernel-2.6.19.patch 956
+AUX slmodem-2.9.11-kernel-2.6.19.patch 1232 RMD160 44b02574314ec5da34f1a6d5aa064246d33520cc SHA1 cc050ae29f4282dd6f1984184c20f11de6b5f63e SHA256 4deec71a6381a3983493e4d3d8b1b955a8e230545765e49d7c6d203ac3e12aee
+MD5 8e8c7d5d64825f7b452818a4d072649c files/slmodem-2.9.11-kernel-2.6.19.patch 1232
+RMD160 44b02574314ec5da34f1a6d5aa064246d33520cc files/slmodem-2.9.11-kernel-2.6.19.patch 1232
+SHA256 4deec71a6381a3983493e4d3d8b1b955a8e230545765e49d7c6d203ac3e12aee files/slmodem-2.9.11-kernel-2.6.19.patch 1232
 AUX slmodem-2.9.11-makefile.patch 872 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc439402 SHA1 3c8d191a0e7983247a64e54ca70551fe4b83d046 SHA256 56518c7fa8ce442613ff9f23d87cbabe83ddb1fc21d10ae11dc8e7fd57610189
 MD5 ead92ab897f69fd1b9fc97c4c0e305e1 files/slmodem-2.9.11-makefile.patch 872
 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc439402 files/slmodem-2.9.11-makefile.patch 872
@@ -40,10 +40,10 @@ EBUILD slmodem-2.9.11_pre20061021-r1.ebuild 4647 RMD160 30f650a28afe303e086caa69
 MD5 6202704fbb9bbadeb282f69fc368aed2 slmodem-2.9.11_pre20061021-r1.ebuild 4647
 RMD160 30f650a28afe303e086caa69f2ffb97ded91da48 slmodem-2.9.11_pre20061021-r1.ebuild 4647
 SHA256 9c1201b3e8508c84ae590bb784d0eacbba380983c1cb325bf62a9418f9be2a2b slmodem-2.9.11_pre20061021-r1.ebuild 4647
-MISC ChangeLog 16973 RMD160 7d1637888c666187052d228893c41cd4facdedfb SHA1 7a2c388dfde31b22162f09d59d0d67b81fa88a6f SHA256 ab8e3d3eb623718d25dc4237bb2e3858f9437361076b18cb02f7fbe080e7cecb
-MD5 082cade4817c4750ec6cabf06fac9b52 ChangeLog 16973
-RMD160 7d1637888c666187052d228893c41cd4facdedfb ChangeLog 16973
-SHA256 ab8e3d3eb623718d25dc4237bb2e3858f9437361076b18cb02f7fbe080e7cecb ChangeLog 16973
+MISC ChangeLog 17127 RMD160 8d3ed0b1490acd91a404c0ee7a070817ff990c5e SHA1 ac95778858ab1f4327cdebea8f9f3f08197c4c4d SHA256 278cfc6b87dea4035826d0f01d7af3a7f18d901d8b57e8a125148c81945c2a79
+MD5 0f69f2e629c98ec02969d699eacfa5dc ChangeLog 17127
+RMD160 8d3ed0b1490acd91a404c0ee7a070817ff990c5e ChangeLog 17127
+SHA256 278cfc6b87dea4035826d0f01d7af3a7f18d901d8b57e8a125148c81945c2a79 ChangeLog 17127
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -57,7 +57,7 @@ SHA256 55e9c497a14ce5058ab1b24c2540bded458b7bcb88bece092aebc0d6f1a301f3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFeU+jNQqtfCuFneMRAjQtAJ9suwU3L0PrwMgk+ly6OgVB9YNYLgCgnTPN
-MYD0G6X0e/cHCez4FCaJElo=
-=53kp
+iD8DBQFFiYHy3sf9c6kjmR8RAlsqAJ4j8eMnb5gUATSaNLkFAQJ5+kI3wQCgjWTd
+4Y+T1rU7FATs7cqxkZpEXSc=
+=hRt7
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch
index b9db2de709bc357c35406aa6ffde0d40acf5f716..2958470ae034fcc919736ef7d28bcfecc825e349 100644 (file)
--- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch
@@ -1,24 +1,34 @@
-diff -Nru work.old/slmodem-2.9.11-20061021/drivers/amrmo_init.c work/slmodem-2.9.11-20061021/drivers/amrmo_init.c
---- work.old/slmodem-2.9.11-20061021/drivers/amrmo_init.c      2006-10-21 22:15:44.000000000 +0300
-+++ work/slmodem-2.9.11-20061021/drivers/amrmo_init.c  2006-12-02 10:16:22.778347895 +0200
-@@ -43,7 +43,7 @@
+diff -Nru work.orig/slmodem-2.9.11-20061021/drivers/amrmo_init.c work/slmodem-2.9.11-20061021/drivers/amrmo_init.c
+--- work.orig/slmodem-2.9.11-20061021/drivers/amrmo_init.c     2006-12-20 20:26:38.000000000 +0200
++++ work/slmodem-2.9.11-20061021/drivers/amrmo_init.c  2006-12-20 20:28:01.000000000 +0200
+@@ -43,9 +43,11 @@
  
  /*****************************************************************************/
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/module.h>
+-#include <linux/module.h>
  #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
++#include <linux/module.h>
  #include <linux/init.h>
-diff -Nru work.old/ungrab-winmodem/ungrab-winmodem.c work/ungrab-winmodem/ungrab-winmodem.c
---- work.old/ungrab-winmodem/ungrab-winmodem.c 2005-09-06 16:29:11.000000000 +0300
-+++ work/ungrab-winmodem/ungrab-winmodem.c     2006-12-02 10:16:22.778347895 +0200
-@@ -11,7 +11,7 @@
+ #include <linux/pci.h>
+ #include <linux/kernel.h>
+diff -Nru work.orig/ungrab-winmodem/ungrab-winmodem.c work/ungrab-winmodem/ungrab-winmodem.c
+--- work.orig/ungrab-winmodem/ungrab-winmodem.c        2006-12-20 20:26:38.000000000 +0200
++++ work/ungrab-winmodem/ungrab-winmodem.c     2006-12-20 20:28:19.000000000 +0200
+@@ -11,9 +11,11 @@
   *
   */
  
 -#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/module.h>
+-#include <linux/module.h>
  #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++#     include <linux/config.h>
++#endif
++#include <linux/module.h>
  #include <linux/init.h>
+ #include <linux/pci.h>
+ #include <linux/kernel.h>