7 files changed, 43 insertions, 272 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 8345f93e4a92..1a658244281b 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dialup/slmodem
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.98 2008/07/06 19:11:56 opfer Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.99 2009/03/03 20:08:41 mrness Exp $
+
+*slmodem-2.9.11_pre20080817 (03 Mar 2009)
+
+  03 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  -files/slmodem-2.9.11-amd64.patch,
+  +files/slmodem-2.9.11-create-mode.patch,
+  -files/slmodem-2.9.11-kernel-2.6.24.patch,
+  -files/slmodem-2.9.11-makefile.patch,
+  -slmodem-2.9.11_pre20080126-r1.ebuild, -slmodem-2.9.11_pre20080401.ebuild,
+  +slmodem-2.9.11_pre20080817.ebuild:
+  Version bump. Fix open missing mode compilation error (#260114).
 
   06 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
   slmodem-2.9.11_pre20080417.ebuild:
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch b/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch
deleted file mode 100644
index b6a4cfa02165..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -aur slmodem-2.9.11-20080126.orig/drivers/Makefile slmodem-2.9.11-20080126/drivers/Makefile
---- slmodem-2.9.11-20080126.orig/drivers/Makefile	2005-04-05 17:17:50.000000000 +0200
-+++ slmodem-2.9.11-20080126/drivers/Makefile	2008-02-23 13:35:50.861045252 +0100
-@@ -20,7 +20,7 @@
- 
- EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem
- 
--obj-m := slamr.o slusb.o
-+obj-m := slusb.o
- 
- slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o
- slusb-objs:= st7554.o
-@@ -71,7 +71,6 @@
- 	$(LD) -r -o $@ $^
- 
- install: 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-242 slamr' >> /etc/modules.conf && \
-@@ -101,7 +100,6 @@
- all:
- 	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
- install:
--	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
- 	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
- 	/sbin/depmod -a
- uninstall:
-diff -aur slmodem-2.9.11-20080126.orig/drivers/st7554.c slmodem-2.9.11-20080126/drivers/st7554.c
---- slmodem-2.9.11-20080126.orig/drivers/st7554.c	2007-02-04 15:22:22.000000000 +0100
-+++ slmodem-2.9.11-20080126/drivers/st7554.c	2008-02-23 13:08:55.768355723 +0100
-@@ -968,6 +968,11 @@
- 	return -ENOIOCTLCMD;
- }
- 
-+static long st7554_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+	return st7554_ioctl(NULL, file, cmd, arg);
-+}
-+
- static int st7554_open(struct inode *inode, struct file *file)
- {
- 	struct st7554_state *s;
-@@ -1011,7 +1016,8 @@
-         .read =    st7554_read,
-         .write =   st7554_write,
-         .poll =    st7554_poll,
--        .ioctl =   st7554_ioctl,
-+        .unlocked_ioctl = st7554_ioctl32,
-+        .compat_ioctl = st7554_ioctl32,
-         .open =    st7554_open,
-         .release = st7554_close,
- };
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-create-mode.patch b/net-dialup/slmodem/files/slmodem-2.9.11-create-mode.patch
new file mode 100644
index 000000000000..c7f146f4d771
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-create-mode.patch
@@ -0,0 +1,12 @@
+diff -Nru slmodem-2.9.11-20080817.orig/modem/modem_datafile.c slmodem-2.9.11-20080817/modem/modem_datafile.c
+--- slmodem-2.9.11-20080817.orig/modem/modem_datafile.c	2008-03-29 12:04:16.000000000 +0000
++++ slmodem-2.9.11-20080817/modem/modem_datafile.c	2009-03-03 22:02:01.000000000 +0000
+@@ -111,7 +111,7 @@
+ 	int ret = -1;
+ 	int fd;
+ 
+-	fd = open(file_name,O_CREAT|O_WRONLY);
++	fd = open(file_name,O_CREAT|O_WRONLY, 0600);
+ 	if(fd < 0)
+ 		return -errno;
+ 
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
deleted file mode 100644
index 0238a301f3f8..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- drivers/amrmo_init.c	2008-01-29 12:19:19.000000000 +0200
-+++ drivers/amrmo_init.c	2008-01-29 12:24:05.000000000 +0200
-@@ -609,7 +609,11 @@
- 		}
- 	}
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-         ret = request_irq(amrmo->irq, &amrmo_pci_interrupt,SA_SHIRQ,
-+#else
-+        ret = request_irq(amrmo->irq, &amrmo_pci_interrupt,IRQF_SHARED,
-+#endif
- 			  amrmo->name,amrmo);
- 	if(ret) {
- 		printk(KERN_ERR "slamr: failed request_irq\n");
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-makefile.patch b/net-dialup/slmodem/files/slmodem-2.9.11-makefile.patch
deleted file mode 100644
index 7bc568ddaf8b..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru slmodem-2.9.11-20051101.orig/modem/Makefile slmodem-2.9.11-20051101/modem/Makefile
---- slmodem-2.9.11-20051101.orig/modem/Makefile	2005-11-01 17:33:34.000000000 +0200
-+++ slmodem-2.9.11-20051101/modem/Makefile	2006-09-09 18:04:39.680862000 +0300
-@@ -13,10 +13,10 @@
- #
- ###########################################################################
- 
--CC:= gcc
-+CC?= gcc
- RM:= rm -f
- 
--CFLAGS+= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
-+CFLAGS+= -Wall -finline -I. -DCONFIG_DEBUG_MODEM
- 
- 
- modem-objs:= \
-@@ -33,13 +33,13 @@
- 
- #SUPPORT_ALSA:=1
- ifdef SUPPORT_ALSA
--slmodemd: -lasound
-+
- CFLAGS+= -DSUPPORT_ALSA=1
--LFLAGS+= -lasound
-+LDLIBS+= -lasound
- endif
- 
- slmodemd modem_test:
--	$(CC) $(LFLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- clean:
- 	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild
deleted file mode 100644
index d14143cf7ec4..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild,v 1.2 2008/04/13 13:30:48 maekke Exp $
-
-inherit eutils linux-mod multilib
-
-UNGRAB_PV="2.9.11-20080126"
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
-SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz
-	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${UNGRAB_PV}.tar.gz"
-
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-* ~amd64 x86"
-IUSE="alsa usb"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd"
-
-S="${WORKDIR}"/${P/_pre/-}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
-	if ! use amd64; then
-		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
-		if use usb; then
-			MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-			CONFIG_CHECK="USB"
-		fi
-	fi
-	BUILD_TARGETS="all"
-	if kernel_is ge 2 6 24; then
-		CONFIG_CHECK="PCI_LEGACY"
-	fi
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}:" \
-		ungrab-winmodem-${UNGRAB_PV}/Makefile
-	convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile
-
-	cd "${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}"
-	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.24.patch"
-	epatch "${FILESDIR}/${P%%_*}-alsa-period-size.patch"
-
-	cd "${S}"/drivers
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
-	convert_to_m Makefile
-	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
-	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \
-		amrmo_init.c old_st7554.c
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	use amd64 && multilib_toolchain_setup amd64
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	newconfd "${FILESDIR}/slmodem-confd" ${PN}
-	newinitd "${FILESDIR}/slmodem-initd" ${PN}
-
-	# configure for alsa - or not for alsa
-	if use alsa; then
-		sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \
-			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem"
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
-	fi
-
-	# Add module aliases and install udev script
-	insinto /etc/modules.d/
-	newins "${FILESDIR}/slmodem-modules" ${PN}
-	if use usb; then
-		exeinto /$(get_libdir)/udev
-		newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh
-	fi
-
-	dodir /etc/modprobe.d
-	echo -e "blacklist slusb\nblacklist slamr\nblacklist snd-intel8x0m" >> "${D}/etc/modprobe.d/${PN}"
-
-	# Add configuration for udev
-	dodir /etc/udev/rules.d/
-	echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \
-		 "${D}/etc/udev/rules.d/55-${PN}.rules"
-	if use usb; then
-		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="slmodem_usb.sh"' >> \
-			 "${D}/etc/udev/rules.d/55-${PN}.rules"
-	fi
-
-	dodoc Changes README
-	newdoc "${WORKDIR}"/ungrab-winmodem-${UNGRAB_PV}/Readme.txt README-ungrab-winmodem.txt
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e "${ROOT}/dev/.udev" ]; then
-		ebegin "Reloading udev rules..."
-			udevcontrol reload_rules
-		eend $?
-	else
-		cd "${S}/drivers"
-		make DESTDIR="${ROOT}" install-devices
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been blacklisted in /etc/modprobe.d/${PN}"
-	elog "You must edit /etc/conf.d/${PN} for your configuration"
-	elog "To add slmodem to your startup - type : rc-update add slmodem default"
-	elog
-
-	if use alsa; then
-		elog "I hope you have already added alsa to your startup: "
-		elog "otherwise type: rc-update add alsasound boot"
-		elog
-		elog "If you need to use snd-intel8x0m from the kernel"
-		elog "compile it as a module and edit /etc/modules.d/alsa"
-		elog 'to: "alias snd-card-(number) snd-intel8x0m"'
-		elog
-	fi
-
-	elog "You need to be in the uucp AND dialout group to make calls as a user."
-	elog
-	elog "If you see the following in dmesg:"
-	elog "    slamr: device 10b9:5457 is grabbed by driver serial"
-	elog "you need to modprobe ungrab-winmodem before slamr"
-	elog "See /etc/modules.d/slmodem for details."
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080817.ebuild
index b833e0194cba..5c800bed727f 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20080817.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild,v 1.1 2008/04/13 09:57:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080817.ebuild,v 1.1 2009/03/03 20:08:41 mrness Exp $
 
 inherit eutils linux-mod multilib
 
@@ -30,16 +30,24 @@ pkg_setup() {
 	use amd64 && multilib_toolchain_setup x86
 
 	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
+	CONFIG_CHECK=""
+	MY_SLMODULES=""
 	if ! use amd64; then
 		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
+		MY_SLMODULES="${MY_SLMODULES} slamr.o"
 	fi
-	if use usb; then
+	if kernel_is ge 2 6 25; then
+	    if use usb; then
+		ewarn "slusb module will not be installed because is not compatible with kernels >=2.6.25"
+	    fi
+	elif use usb; then
 		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-		CONFIG_CHECK="USB"
+		CONFIG_CHECK="${CONFIG_CHECK} USB"
+		MY_SLMODULES="${MY_SLMODULES} slusb.o"
 	fi
 	BUILD_TARGETS="all"
 	if kernel_is ge 2 6 24; then
-		CONFIG_CHECK="PCI_LEGACY"
+		CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY"
 	fi
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
@@ -56,12 +64,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
 
 	cd "${S}"
-	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-alsa-period-size.patch"
-	use amd64 && epatch "${FILESDIR}/${P%%_*}-amd64.patch"
+	epatch "${FILESDIR}/${P%%_*}-makefile-r1.patch"
+	epatch "${FILESDIR}/${P%%_*}-create-mode.patch"
 
 	cd "${S}"/drivers
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
+	sed -i -e "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
+	    -e "s|^obj-m:=.*$|obj-m:=${MY_SLMODULES}|" \
+	    Makefile
 	convert_to_m Makefile
 	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
 	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \