summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2004-10-01 22:52:21 +0000
committerDaniel Black <dragonheart@gentoo.org>2004-10-01 22:52:21 +0000
commit3ffccaee8ba7a4b9574f38d2d88d5cb4f3995da0 (patch)
tree87de98d862fad3824235e10dd56ed08fbc327979 /net-dialup
parentRemoved doc useflag. (diff)
downloadhistorical-3ffccaee8ba7a4b9574f38d2d88d5cb4f3995da0.tar.gz
historical-3ffccaee8ba7a4b9574f38d2d88d5cb4f3995da0.tar.bz2
historical-3ffccaee8ba7a4b9574f38d2d88d5cb4f3995da0.zip
Fixes compile for 2.4 kernels (bug #65743 and #61825)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/slmodem/ChangeLog7
-rw-r--r--net-dialup/slmodem/Manifest10
-rw-r--r--net-dialup/slmodem/files/slmodem-2.9.10-makefile-fixup.patch8
3 files changed, 15 insertions, 10 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 749887c2d6ee..3f90d0d43bd5 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/slmodem
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.25 2004/09/23 22:59:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.26 2004/10/01 22:52:21 dragonheart Exp $
+
+ 02 Oct 2004; Daniel Black <dragonheart@gentoo.org>
+ files/slmodem-2.9.10-makefile-fixup.patch:
+ Fixes compile for 2.4 kernels (bug #65743 and #61825). Thanks to Alin
+ Nastac <mrness@gentoo.ro> for the fixed patch
*slmodem-2.9.10 (24 Sep 2004)
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index e4d8ada97b15..a1937a1d6aec 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
MD5 7faf41f1aa59e6b8a1673f106ffac1e1 metadata.xml 523
MD5 39a6e7fcda2ee23817e894ed009e7ba7 slmodem-2.7.14.ebuild 1511
-MD5 0af50f7d62cdb853c51a42d8d4962266 ChangeLog 5846
+MD5 099fcd1269631619aebc85d80d0f4325 ChangeLog 6066
MD5 d5d2b6c197ae9d40d4e3326e2f1b1dd5 slmodem-2.9.9-r2.ebuild 4335
MD5 d087a4c2817309c5060154ad7840a463 slmodem-2.9.10.ebuild 4333
MD5 43dee264075d4262df5388ce1f055929 files/slmodem-2.9.conf 707
@@ -16,12 +16,12 @@ MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10 66
MD5 9ae4e594075f43c76a7067fa8004095a files/digest-slmodem-2.9.9-r2 65
MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
MD5 5c0b5dfce1ad5bd98a79d8307faf584d files/slmodem-2.9.init 2659
-MD5 9369d8897185aaf33af4fa94775c7b29 files/slmodem-2.9.10-makefile-fixup.patch 6228
+MD5 a358a1ca75aad86c0d7a059da089bc58 files/slmodem-2.9.10-makefile-fixup.patch 6229
MD5 a1b37267647bbb45a01facc3b807ccff files/slmodem-2.9.9-makefile-fixup.patch 6328
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
-iD8DBQFBU1XAmdTrptrqvGERAgHEAKCRCjRgfxT9B5YVQPy7nH9mcqYCOwCbBHgr
-NT43coHUnc+HRJA0vkxDIEg=
-=ClTb
+iD8DBQFBXd+rmdTrptrqvGERAj8nAJ4xsWLkPjeVgM83Nzamffu0rfwgmgCgmxzd
+eT4hh4ZmIcZ2dCmMG+NF88w=
+=pbHY
-----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/slmodem-2.9.10-makefile-fixup.patch b/net-dialup/slmodem/files/slmodem-2.9.10-makefile-fixup.patch
index 544e10b63a4c..203454637d23 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.10-makefile-fixup.patch
+++ b/net-dialup/slmodem/files/slmodem-2.9.10-makefile-fixup.patch
@@ -1,6 +1,6 @@
diff -Nru slmodem-2.9.10.orig/Makefile slmodem-2.9.10/Makefile
--- slmodem-2.9.10.orig/Makefile 2004-08-08 16:27:51.000000000 +0300
-+++ slmodem-2.9.10/Makefile 2004-09-23 21:55:55.275220920 +0300
++++ slmodem-2.9.10/Makefile 2004-09-29 23:49:21.601948472 +0300
@@ -13,7 +13,9 @@
#
###########################################################################
@@ -44,7 +44,7 @@ diff -Nru slmodem-2.9.10.orig/Makefile slmodem-2.9.10/Makefile
$(foreach dir,$(sub-dirs),$(MAKE) -C $(dir) $(patsubst %-sub-dirs,%,$@) && ) echo "done."
diff -Nru slmodem-2.9.10.orig/drivers/Makefile slmodem-2.9.10/drivers/Makefile
--- slmodem-2.9.10.orig/drivers/Makefile 2003-12-21 23:15:54.000000000 +0200
-+++ slmodem-2.9.10/drivers/Makefile 2004-09-23 21:47:51.456772504 +0300
++++ slmodem-2.9.10/drivers/Makefile 2004-09-29 23:50:09.901605808 +0300
@@ -16,9 +16,17 @@
#KBUILD_VERBOSE=1
#export KBUILD_VERBOSE
@@ -123,7 +123,7 @@ diff -Nru slmodem-2.9.10.orig/drivers/Makefile slmodem-2.9.10/drivers/Makefile
+ cp /etc/modules.conf $(DESTDIR)/etc/modules.conf.slamr && \
+ echo 'alias char-major-212 slamr' >> $(DESTDIR)/etc/modules.conf && \
+ echo 'alias char-major-213 slusb' >> $(DESTDIR)/etc/modules.conf
-+ /sbin/depmod -a
++# /sbin/depmod -a
+
+install-modules: uninstall-old
install -D -m 644 slamr.o $(module-dir)/slamr.o
@@ -180,7 +180,7 @@ diff -Nru slmodem-2.9.10.orig/drivers/Makefile slmodem-2.9.10/drivers/Makefile
+.PHONY: install install-modules uninstall-old install-devices remove-devices all
diff -Nru slmodem-2.9.10.orig/modem/Makefile slmodem-2.9.10/modem/Makefile
--- slmodem-2.9.10.orig/modem/Makefile 2003-11-20 14:50:47.000000000 +0200
-+++ slmodem-2.9.10/modem/Makefile 2004-09-23 21:47:51.457772352 +0300
++++ slmodem-2.9.10/modem/Makefile 2004-09-29 23:49:21.602948320 +0300
@@ -16,8 +16,7 @@
CC:= gcc
RM:= rm -f