Version bump. Fix broken compilation against kernel 2.6.19 (#156783).
authorAlin Năstac <mrness@gentoo.org>
Sat, 2 Dec 2006 08:23:06 +0000 (08:23 +0000)
committerAlin Năstac <mrness@gentoo.org>
Sat, 2 Dec 2006 08:23:06 +0000 (08:23 +0000)
Package-Manager: portage-2.1.1-r1

net-dialup/slmodem/ChangeLog
net-dialup/slmodem/Manifest
net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021 [new file with mode: 0644]
net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch [new file with mode: 0644]
net-dialup/slmodem/slmodem-2.9.11_pre20061021.ebuild [new file with mode: 0644]

index 20e8188860aa11801928d32dd9657dc7229fc11d..5303121a3480fc75d9a3c163ce8705de85662847 100644 (file)
@@ -1,6 +1,13 @@
 # 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.74 2006/12/01 09:59:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.75 2006/12/02 08:23:06 mrness Exp $
+
+*slmodem-2.9.11_pre20061021 (02 Dec 2006)
+
+  02 Dec 2006; Alin Năstac <mrness@gentoo.org>
+  +files/slmodem-2.9.11-kernel-2.6.19.patch,
+  +slmodem-2.9.11_pre20061021.ebuild:
+  Version bump. Fix broken compilation against kernel 2.6.19 (#156783).
 
 *slmodem-2.9.11_pre20051101-r3 (01 Dec 2006)
 
index 990de3804828d2881b963303b95a4bc7755e56fe..977b8ff779db1f6b8cad52e6234247dc45881d7c 100644 (file)
@@ -5,6 +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-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
@@ -26,15 +30,20 @@ MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
 SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
 DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
+DIST slmodem-2.9.11-20061021.tar.gz 839050 RMD160 7f307d5267e2c9ecb165b34ccb0432032122eb6d SHA1 f8fc8a88399a2332cdeb2f319b58aa1d058a1487 SHA256 7516ee6fbf897a1fad5689f4cb6ec03b1b459fc53e72cebd1f641d1a25916c98
 DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
 EBUILD slmodem-2.9.11_pre20051101-r3.ebuild 4647 RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 SHA1 91f7e55b5d0f1b981b2b350aa32c1d45e872f268 SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57
 MD5 1f8422dd189f180c170dce93a715eee7 slmodem-2.9.11_pre20051101-r3.ebuild 4647
 RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 slmodem-2.9.11_pre20051101-r3.ebuild 4647
 SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57 slmodem-2.9.11_pre20051101-r3.ebuild 4647
-MISC ChangeLog 16400 RMD160 14b19fdae9c777181111bb9341fdfbed0f968264 SHA1 196110a36b3665ef61814dc675f4f572978b541b SHA256 7ba5c09dfc597a83decedc06300a3c64cec86169b19807d2d6d354d96e9b0148
-MD5 28c370f5e1c2e9663f1cc00f038f42b9 ChangeLog 16400
-RMD160 14b19fdae9c777181111bb9341fdfbed0f968264 ChangeLog 16400
-SHA256 7ba5c09dfc597a83decedc06300a3c64cec86169b19807d2d6d354d96e9b0148 ChangeLog 16400
+EBUILD slmodem-2.9.11_pre20061021.ebuild 4588 RMD160 d2ee4fa2b125e63df5244712f886eb374268ed84 SHA1 ef4eedcff1914fac3e6daea357be76b45270e8b3 SHA256 279e3e3c3462f5cd6fbe88e1c6d7dfa0281485de3f1f8e76098b9700b963e2d9
+MD5 85e6f96179422501f28e05ad900ae4ad slmodem-2.9.11_pre20061021.ebuild 4588
+RMD160 d2ee4fa2b125e63df5244712f886eb374268ed84 slmodem-2.9.11_pre20061021.ebuild 4588
+SHA256 279e3e3c3462f5cd6fbe88e1c6d7dfa0281485de3f1f8e76098b9700b963e2d9 slmodem-2.9.11_pre20061021.ebuild 4588
+MISC ChangeLog 16647 RMD160 feb2afb6dff1cb24fd582f133ec5178b53bfc306 SHA1 055544d8f24b2e49f1785dafbc79605025da3a4b SHA256 aa4bfebcedbebbee7403256399bbb3dd497c5e9879c737bb452dd673b31e5912
+MD5 8ee8ffcc9ab2cac1b27a3fe081f0976b ChangeLog 16647
+RMD160 feb2afb6dff1cb24fd582f133ec5178b53bfc306 ChangeLog 16647
+SHA256 aa4bfebcedbebbee7403256399bbb3dd497c5e9879c737bb452dd673b31e5912 ChangeLog 16647
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -42,10 +51,13 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r3 512
 RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r3 512
 SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r3 512
+MD5 1e86c27a40bdda7df7e235d0495dbc5d files/digest-slmodem-2.9.11_pre20061021 512
+RMD160 e1732463bba377a01a9845a6705e32ea4816655d files/digest-slmodem-2.9.11_pre20061021 512
+SHA256 55e9c497a14ce5058ab1b24c2540bded458b7bcb88bece092aebc0d6f1a301f3 files/digest-slmodem-2.9.11_pre20061021 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFb/0K3sf9c6kjmR8RAprjAJ96rhTK0sIN1VAtYGf7JXUE6nN6VQCfWTZm
-6ipUGBYMocguW1wfAYe/jYE=
-=N8G1
+iD8DBQFFcTf23sf9c6kjmR8RAs50AKCZoTU7BwycK5RDMC/3P3nT9GnveACgoFd+
+WbMq25SE5VUbFtChTgZuaGI=
+=IF27
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021
new file mode 100644 (file)
index 0000000..2754331
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 8e1858b0a6d16fce73966759732986ab slmodem-2.9.11-20061021.tar.gz 839050
+RMD160 7f307d5267e2c9ecb165b34ccb0432032122eb6d slmodem-2.9.11-20061021.tar.gz 839050
+SHA256 7516ee6fbf897a1fad5689f4cb6ec03b1b459fc53e72cebd1f641d1a25916c98 slmodem-2.9.11-20061021.tar.gz 839050
+MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
+RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872
+SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872
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
new file mode 100644 (file)
index 0000000..b9db2de
--- /dev/null
@@ -0,0 +1,24 @@
+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 @@
+ /*****************************************************************************/
+-#include <linux/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/version.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/config.h>
++#include <linux/autoconf.h>
+ #include <linux/module.h>
+ #include <linux/version.h>
+ #include <linux/init.h>
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20061021.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20061021.ebuild
new file mode 100644 (file)
index 0000000..da15ae3
--- /dev/null
@@ -0,0 +1,154 @@
+# Copyright 1999-2006 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_pre20061021.ebuild,v 1.1 2006/12/02 08:23:06 mrness Exp $
+
+inherit eutils linux-mod multilib
+
+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.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 )"
+
+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)"
+       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"
+       linux-mod_pkg_setup
+       BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${WORKDIR}"
+       sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
+               ungrab-winmodem/Makefile
+       convert_to_m ungrab-winmodem/Makefile
+
+       epatch "${FILESDIR}/${P%%_*}-kernel-2.6.19.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 hotplug script
+       insinto /etc/modules.d/; newins "${FILESDIR}/slmodem-modules" ${PN}
+       if use usb; then
+               exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb
+       fi
+
+       dodir /etc/hotplug/blacklist.d
+       echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}"
+
+       # Add configuration for devfs, udev
+       if [ -e "${ROOT}/dev/.devfsd" ] ; then
+               insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN}
+       elif [ -e "${ROOT}/dev/.udev" ] ; then
+               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"' >> \
+                                "${D}/etc/udev/rules.d/55-${PN}.rules"
+               fi
+       fi
+
+       dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt"
+}
+
+pkg_postinst() {
+       linux-mod_pkg_postinst
+
+       # Make some devices if we aren't using devfs or udev
+       if [ -e "${ROOT}/dev/.devfsd" ]; then
+               ebegin "Restarting devfsd to reread devfs rules"
+                       killall -HUP devfsd
+               eend $?
+
+       elif [ -e "${ROOT}/dev/.udev" ]; then
+               ebegin "Restarting udev to reread udev rules"
+                       udevstart
+               eend $?
+       else
+               cd "${S}/drivers"
+               make DESTDIR="${ROOT}" install-devices
+       fi
+
+       if [ ! -e "${ROOT}/dev/ppp" ]; then
+               mknod "${ROOT}/dev/ppp" c 108 0
+       fi
+
+       ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
+       einfo "You must edit /etc/conf.d/${PN} for your configuration"
+       einfo "To add slmodem to your startup - type : rc-update add slmodem default"
+
+       if use alsa; then
+               einfo "I hope you have already added alsa to your startup: "
+               einfo "otherwise type: rc-update add alsasound boot"
+               einfo
+               einfo "If you need to use snd-intel8x0m from the kernel"
+               einfo "compile it as a module and edit /etc/modules.d/alsa"
+               einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
+       fi
+
+       einfo "You need to be in the uucp AND dialout group to make calls as a user."
+       einfo
+       einfo "If you see the following in dmesg:"
+       echo slamr: device 10b9:5457 is grabbed by driver serial
+       einfo "you need to modprobe ungrab-winmodem before slamr"
+}