old version cleanout. 2.9.10-r1 stable. fixes to bugs #60676 and #71498

5 files changed, 6 insertions, 219 deletions

diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.10 b/net-dialup/slmodem/files/digest-slmodem-2.9.10
deleted file mode 100644
index b6aff29497e8..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbc4918f2ee9ed4952d3f4309d364b35 slmodem-2.9.10.tar.gz 806884
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.9-r2
deleted file mode 100644
index 099d04f8b31f..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9eb4b43d8428024d9bb2fa3db4d56ea slmodem-2.9.9.tar.gz 708051
diff --git a/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch b/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch
deleted file mode 100644
index 94d1326616f0..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -ru slmodem-2.9.9.orig/Makefile slmodem-2.9.9/Makefile
---- slmodem-2.9.9.orig/Makefile	2004-02-03 02:13:43.000000000 +0930
-+++ slmodem-2.9.9/Makefile	2004-07-25 01:07:34.504873696 +0930
-@@ -13,7 +13,9 @@
- #
- ###########################################################################
- 
--KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-+KERNEL_VER:=$(shell uname -r)
-+KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
-+KERNEL_OUTPUT_DIR:=$(KERNEL_DIR)
- 
- # tools
- INSTALL:=install
-@@ -28,21 +30,25 @@
- 	$(RM) -rf ${DESTDIR}/var/lib/slmodem
- 	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem
- 
-+install-test:
-+	$(INSTALL) -D -m 755 modem/modem_test ${DESTDIR}/usr/sbin/modem_test
-+
- uninstall: uninstall-drivers
- 	$(RM) ${DESTDIR}/usr/sbin/slmodemd
- 	$(RM) -rf ${DESTDIR}/var/lib/slmodem
- 
- drivers:
--	$(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR)
-+	$(MAKE) -C drivers
- 
- install-drivers:
--	$(MAKE) install -C drivers KERNEL_DIR=$(KERNEL_DIR)
-+	$(MAKE) install -C drivers
-+
- uninstall-drivers:
--	$(MAKE) uninstall -C drivers KERNEL_DIR=$(KERNEL_DIR)
-+	$(MAKE) uninstall -C drivers
- 
- # misc rules
- sub-dirs:= modem drivers
--.PHONY: $(sub-dirs) all old clean dep install
-+.PHONY: $(sub-dirs) all old clean dep install install-drivers install-test uninstall-drivers
- clean dep: %: %-sub-dirs
- %-sub-dirs:
- 	$(foreach dir,$(sub-dirs),$(MAKE) -C $(dir) $(patsubst %-sub-dirs,%,$@) && ) echo "done."
-Only in slmodem-2.9.9/drivers: .amrmo_init.o.d
-Only in slmodem-2.9.9/drivers: .tmp_versions
-diff -ru slmodem-2.9.9.orig/drivers/Makefile slmodem-2.9.9/drivers/Makefile
---- slmodem-2.9.9.orig/drivers/Makefile	2003-12-22 06:45:54.000000000 +0930
-+++ slmodem-2.9.9/drivers/Makefile	2004-07-25 01:11:40.158528664 +0930
-@@ -16,9 +16,17 @@
- #KBUILD_VERBOSE=1
- #export KBUILD_VERBOSE
- 
--KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-+ifndef KERNEL_VER
-+KERNEL_VER:=$(shell uname -r)
-+endif
-+ifndef KERNEL_DIR
-+KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
-+endif
-+ifndef KERNEL_OUTPUT_DIR
-+KERNEL_OUTPUT_DIR:=$(KERNEL_DIR)
-+endif
- 
--EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem
-+EXTRA_CFLAGS+= -I$(obj) -I$(obj)/../modem
- 
- obj-m := slamr.o slusb.o
- 
-@@ -28,39 +36,35 @@
- ifndef KERNELRELEASE
- ifndef KERNEL_VER
- 
--all install uninstall: kernel-ver
--	$(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)
-+all install uninstall:
-+	$(MAKE) $@
- 
- install: install-devices
- uninstall: remove-devices
- 
--kernel-ver::
-+kernel-ver:
- 	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c
- 
--dep:
--clean:
--	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~
--
- install-devices:
- 	mkdir -p ${DESTDIR}/dev
- 	$(foreach minor,0 1 2 3, \
- 	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n
- 	$(foreach minor,0 1 2 3, \
- 	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n
-+
- remove-devices:
--	$(foreach minor,0 1 2 3, \
--	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n
--	$(foreach minor,0 1 2 3, \
--	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n
-+	    $(RM) ${DESTDIR}/dev/slamr[0-3] ; ) echo -n
-+	    $(RM) ${DESTDIR}/dev/slusb[0-3] ; ) echo -n
- 
- else
- ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)
-+# 2.4 kernel
- 
- slusb-objs:= old_st7554.o
- obj:=.
- module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
- 
--CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
-+EXTRA_CFLAGS+=  -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
- 
- all: $(obj-m)
- 
-@@ -69,13 +73,17 @@
- slamr.o slusb.o:
- 	$(LD) -r -o $@ $^
- 
--install: uninstall-old
-+install: install-modules
-+	mkdir -p $(DESTDIR)/etc && \
-+	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
-+
-+install-modules: uninstall-old
- 	install -D -m 644 slamr.o $(module-dir)/slamr.o
- 	install -D -m 644 slusb.o $(module-dir)/slusb.o
--	cp /etc/modules.conf /etc/modules.conf.slamr && \
--	    echo 'alias char-major-212 slamr' >> /etc/modules.conf && \
--	    echo 'alias char-major-213 slusb' >> /etc/modules.conf 
--	/sbin/depmod -a
-+
- uninstall:
- 	/sbin/modprobe -r slamr slusb
- 	cp /etc/modules.conf /etc/modules.conf.slamr && \
-@@ -83,6 +91,7 @@
- 	$(RM) $(module-dir)/slamr.o
- 	$(RM) $(module-dir)/slusb.o
- 	/sbin/depmod -a
-+
- uninstall-old:
- 	$(RM) $(module-dir)/slmdm.o \
-               $(module-dir)/slfax.o \
-@@ -94,15 +103,18 @@
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -o $@ -c $<
- 
- else
-+# 2.6 Kernel
-+
-+EXTRA_CFLAGS+=-I $(KERNEL_INCLUDE_DIR) -I .
- 
- module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/extra
- 
- all:
--	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
-+	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd) O=$(KERNEL_OUTPUT_DIR)
- install:
- 	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
- 	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
--	/sbin/depmod -a
-+#	/sbin/depmod -a
- uninstall:
- 	modprobe -r slamr ; echo -n
- 	modprobe -r slusb ; echo -n
-@@ -114,6 +126,12 @@
- endif
- endif
- 
-+dep:
-+clean:
-+	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~
-+
- $(obj)/amrlibs.o:
- 	echo "$@ done"
- 
-+
-+.PHONY: install install-modules uninstall-old install-devices remove-devices  all
-diff -ru slmodem-2.9.9.orig/modem/Makefile slmodem-2.9.9/modem/Makefile
---- slmodem-2.9.9.orig/modem/Makefile	2003-11-20 22:20:47.000000000 +0930
-+++ slmodem-2.9.9/modem/Makefile	2004-07-25 01:07:34.539868376 +0930
-@@ -16,8 +16,7 @@
- CC:= gcc
- RM:= rm -f
- 
--CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
--
-+EXTRA_CFLAGS+=  -I. -DCONFIG_DEBUG_MODEM
- 
- modem-objs:= \
- 	modem.o modem_datafile.o modem_at.o modem_timer.o \
-@@ -32,13 +31,13 @@
- modem_test: modem_test.o modem_cmdline.o $(modem-objs) $(dp-objs) dsplibs.o $(sysdep-objs)
- 
- #SUPPORT_ALSA:=1
--ifdef SUPPORT_ALSA
-+ifeq ($(SUPPORT_ALSA),1)
- slmodemd: -lasound
--CFLAGS+= -DSUPPORT_ALSA=1
-+EXTRA_CFLAGS+= -DSUPPORT_ALSA=1
- endif
- 
- slmodemd modem_test:
--	$(CC) -o $@ $^
-+	$(CC) $(EXTRA_CFLAGS) -o $@ $^
- 
- clean:
- 	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)
-Only in slmodem-2.9.9: workdir
diff --git a/net-dialup/slmodem/files/slmodem-2.9.conf b/net-dialup/slmodem/files/slmodem-2.9.conf
index 221a47f1bb9b..8021eab75f64 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.conf
+++ b/net-dialup/slmodem/files/slmodem-2.9.conf
@@ -17,8 +17,10 @@ NICE=-6
 # ALSA support.
 # ALSACONF MODULE=alsa
 
-# The hardware slot
-# ALSACONF HW_SLOT=0
+# The modem hardware slot
+# For ALSA <  1.0.6, use "hw:0", "hw:1", etc.
+# For ALSA >= 1.0.6, replace "hw" with "modem".
+# ALSACONF HW_SLOT=hw:0
 
 # Non-ALSA OPTIONS:
 
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
index e801ac9f94e5..9b31d19f92a2 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.init
+++ b/net-dialup/slmodem/files/slmodem-2.9.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.9 2004/08/13 12:59:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.10 2004/12/05 09:28:29 dragonheart Exp $
 
 depend() {
 	need logger
@@ -23,7 +23,7 @@ function loadsalsa {
 	ebegin "Starting slmodemd for ${DEV}"
 	start-stop-daemon --start --background --nicelevel=${NICE} --make-pidfile \
 		--pidfile /var/run/slmodemd.pid --startas /usr/sbin/slmodemd \
-		-- -country=${COUNTRY} -g=${GROUP} --alsa hw:${HW_SLOT}
+		-- -country=${COUNTRY} -g=${GROUP} --alsa ${HW_SLOT}
 	return ${?}
 }