| 1 |
mrness 09/03/13 20:41:48 |
| 2 |
|
| 3 |
Added: hsfmodem-7.80.02.03-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump that fixes bug 261888. |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: hsfmodem-7.80.02.03-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nru hsfmodem-7.80.02.03x86_64full.orig/diag/makefile hsfmodem-7.80.02.03x86_64full/diag/makefile |
| 17 |
--- hsfmodem-7.80.02.03x86_64full.orig/diag/makefile 2006-01-13 19:23:50.000000000 +0000 |
| 18 |
+++ hsfmodem-7.80.02.03x86_64full/diag/makefile 2009-03-13 20:38:16.000000000 +0000 |
| 19 |
@@ -10,7 +10,7 @@ |
| 20 |
include $(TOP)/config.mak |
| 21 |
-include $(TOP)/modules/imported/makeflags.mak |
| 22 |
|
| 23 |
-CFLAGS = -I$(TOP)/modules/imported/include -I$(TOP)/modules/include |
| 24 |
+CFLAGS += -I$(TOP)/modules/imported/include -I$(TOP)/modules/include |
| 25 |
CFLAGS += $(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS) |
| 26 |
CFLAGS += -DCNXTTARGET="\"$(CNXTTARGET)\"" |
| 27 |
|
| 28 |
@@ -41,13 +41,13 @@ |
| 29 |
$(MKDIR) -p $@ |
| 30 |
|
| 31 |
$(CNXTTARGET)diag: diag.o modemexpert.o |
| 32 |
- $(CC) -o $@ $^ |
| 33 |
+ $(CC) ${LDFLAGS} -o $@ $^ |
| 34 |
|
| 35 |
$(CNXTTARGET)scr: scr.o |
| 36 |
- $(CC) -o $@ $^ |
| 37 |
+ $(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^ |
| 38 |
|
| 39 |
$(CNXTTARGET)dmp: dmp.o |
| 40 |
- $(CC) -o $@ $^ |
| 41 |
+ $(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^ |
| 42 |
|
| 43 |
clean: |
| 44 |
rm -f *.o $(ALL) |
| 45 |
diff -Nru hsfmodem-7.80.02.03x86_64full.orig/modules/Makefile hsfmodem-7.80.02.03x86_64full/modules/Makefile |
| 46 |
--- hsfmodem-7.80.02.03x86_64full.orig/modules/Makefile 2009-02-20 21:30:12.000000000 +0000 |
| 47 |
+++ hsfmodem-7.80.02.03x86_64full/modules/Makefile 2009-03-13 20:38:16.000000000 +0000 |
| 48 |
@@ -158,7 +158,7 @@ |
| 49 |
ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-) |
| 50 |
# On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package |
| 51 |
# and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file |
| 52 |
-CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n) |
| 53 |
+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n) |
| 54 |
endif |
| 55 |
|
| 56 |
MODULAR_HDA := $(shell test -e ${REAL_KERNELSRC}/include/sound/hda_codec.h && echo yes || echo no) |
| 57 |
diff -Nru hsfmodem-7.80.02.03x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.80.02.03x86_64full/scripts/cnxtconfig.in |
| 58 |
--- hsfmodem-7.80.02.03x86_64full.orig/scripts/cnxtconfig.in 2009-02-20 21:30:17.000000000 +0000 |
| 59 |
+++ hsfmodem-7.80.02.03x86_64full/scripts/cnxtconfig.in 2009-03-13 20:38:16.000000000 +0000 |
| 60 |
@@ -1994,9 +1994,9 @@ |
| 61 |
if [ -d /etc/udev/rules.d ]; then |
| 62 |
rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules |
| 63 |
if [ "@CNXTDRIVER@" = "dgc" ]; then |
| 64 |
- echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules |
| 65 |
+ echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules |
| 66 |
else |
| 67 |
- echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules |
| 68 |
+ echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules |
| 69 |
fi |
| 70 |
fi |
| 71 |
|
| 72 |
diff -Nru hsfmodem-7.80.02.03x86_64full.orig/scripts/rccnxt.in hsfmodem-7.80.02.03x86_64full/scripts/rccnxt.in |
| 73 |
--- hsfmodem-7.80.02.03x86_64full.orig/scripts/rccnxt.in 2004-11-22 21:59:29.000000000 +0000 |
| 74 |
+++ hsfmodem-7.80.02.03x86_64full/scripts/rccnxt.in 2009-03-13 20:38:16.000000000 +0000 |
| 75 |
@@ -1,63 +1,12 @@ |
| 76 |
-# |
| 77 |
-# chkconfig: 2345 09 91 |
| 78 |
-# description: @CNXTDRVDSC@ |
| 79 |
-# |
| 80 |
-### BEGIN INIT INFO |
| 81 |
-# Provides: @CNXTTARGET@ |
| 82 |
-# Should-Start: hotplug coldplug |
| 83 |
-# Required-Start: $local_fs |
| 84 |
-# Required-Stop: $network |
| 85 |
-# Default-Start: 3 5 |
| 86 |
-# Default-Stop: 0 1 2 6 |
| 87 |
-# Description: Start @CNXTDRVDSC@ |
| 88 |
-### END INIT INFO |
| 89 |
|
| 90 |
-if [ -e /etc/runlevels ]; then |
| 91 |
- begincmd="ebegin" |
| 92 |
- endcmd="eend" |
| 93 |
-else |
| 94 |
- begincmd="echo" |
| 95 |
- endcmd="/bin/true" |
| 96 |
-fi |
| 97 |
- |
| 98 |
- |
| 99 |
-start() |
| 100 |
-{ |
| 101 |
- ${begincmd} "Starting @CNXTDRVDSC@" |
| 102 |
+start() { |
| 103 |
+ ebegin "Starting @CNXTDRVDSC@" |
| 104 |
@CNXTSBINDIR@/@CNXTTARGET@config --rcstart |
| 105 |
- ${endcmd} 0 |
| 106 |
+ eend 0 |
| 107 |
} |
| 108 |
|
| 109 |
-stop() |
| 110 |
-{ |
| 111 |
- ${begincmd} "Stopping @CNXTDRVDSC@" |
| 112 |
+stop() { |
| 113 |
+ ebegin "Stopping @CNXTDRVDSC@" |
| 114 |
@CNXTSBINDIR@/@CNXTTARGET@config --rcstop |
| 115 |
- ${endcmd} 0 |
| 116 |
+ eend 0 |
| 117 |
} |
| 118 |
- |
| 119 |
-restart() |
| 120 |
-{ |
| 121 |
- stop |
| 122 |
- start |
| 123 |
-} |
| 124 |
- |
| 125 |
-if [ ! -e /etc/runlevels ]; then |
| 126 |
- case "$1" in |
| 127 |
- start) |
| 128 |
- start |
| 129 |
- ;; |
| 130 |
- stop) |
| 131 |
- stop |
| 132 |
- ;; |
| 133 |
- restart|force-reload|reload) |
| 134 |
- restart |
| 135 |
- ;; |
| 136 |
- status) |
| 137 |
- exit 3 |
| 138 |
- ;; |
| 139 |
- *) |
| 140 |
- echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" |
| 141 |
- exit 1 |
| 142 |
- ;; |
| 143 |
- esac |
| 144 |
-fi |
Archives