Version bump that fixes bug 261888.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 228 insertions, 6 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 506d2e7f6dbf..91e89aca212b 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.53 2009/01/12 22:25:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.54 2009/03/13 20:41:47 mrness Exp $
+
+*hsfmodem-7.80.02.03 (13 Mar 2009)
+
+  13 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/hsfmodem-7.80.02.03-gentoo.patch, +hsfmodem-7.80.02.03.ebuild:
+  Version bump that fixes bug 261888.
 
 *hsfmodem-7.80.02.01 (12 Jan 2009)
 
diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest
index 35305886542c..f7597d381fd9 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -6,6 +6,7 @@ AUX hsfmodem-7.68.00.12-gentoo.patch 3028 RMD160 50ac17ea33386316b965d78e50f7199
 AUX hsfmodem-7.68.00.13-gentoo.patch 3089 RMD160 efffe47e3d194bded0c76f2c3e6445122cba744f SHA1 b4d7c9a66f43fa604a5bcc3e65c8ab2e99c74354 SHA256 0303a348e452ee965a3677337fe69ba1eea82e49e3cfcbc4e0c9deaf8c439e12
 AUX hsfmodem-7.68.00.14-gentoo.patch 3964 RMD160 76a267a60c9aebcf5cd47a8e174c7be361b0ece6 SHA1 49a190a92714964e757cb5789ad8ab0422652700 SHA256 616d0c81de5ac1304cc896969709f71c03d6c5274a1445f55c6f4713b7389831
 AUX hsfmodem-7.80.02.01-gentoo.patch 3968 RMD160 a1f9b9613b4cfbbb1d6fd7e3deb66bd25ac4ce09 SHA1 2fee1e379a4b7dcc7b2849d210ae93c7caedf661 SHA256 c226a1be162e5f58999100fa3e42a63e10e56e2618b1926d84e9967950fb2416
+AUX hsfmodem-7.80.02.03-gentoo.patch 4063 RMD160 29c67d928d61a1e218f6cef6f1082ea6f5ca1ff1 SHA1 7e155044abd7f16887b906899dd5bd425c161b67 SHA256 8ab42d2a8b1c6e45a92af710d9f3c0348458b8da16e92bb52891cf5a73b9b9bc
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
 DIST hsfmodem-7.68.00.09full.tar.gz 1468087 RMD160 5a1ddf2cc3f5949e279819d3f5710ed63f81f832 SHA1 323e4270e969f1ee2763313cc9f0bd29444fbb2b SHA256 380a600676bfcf81967b321e95e870b238aaa7b39310d2b9a4f0d8bc9ac5d92c
 DIST hsfmodem-7.68.00.09x86_64full.tar.gz 1595414 RMD160 0e4ced44d0f9327ae8f6c2b3c4af0759e859bda6 SHA1 a3d0cc78a9974c659dfb9245a17ec9fcfe0bc6fd SHA256 d235f2ef546ed928cd6c96411081d4d6dfbdaa72592fe1b25f7c7c33da92b239
@@ -17,17 +18,20 @@ DIST hsfmodem-7.68.00.14full.tar.gz 1469774 RMD160 ab6643bea775e56b948ee14a23f84
 DIST hsfmodem-7.68.00.14x86_64full.tar.gz 1597633 RMD160 08cff862017af089047ebe28f93e721df489c0f2 SHA1 06dd5dfcf5edbc2fa7822b74d24c1b2a8b430213 SHA256 cd6760a8dcd79393f12e8ee103eb998d9342ff647942e0e90a96e74e0108d106
 DIST hsfmodem-7.80.02.01full.tar.gz 1471760 RMD160 15876c8f99d4d23e77cdb6655d2f21d906aca4ad SHA1 a86042794ee7ccaa56d58227a58e7efc523f1025 SHA256 5b57fef56426540632c7ceda747f9dda1c9bc7cc2a50360dcd7406c473c3c5f8
 DIST hsfmodem-7.80.02.01x86_64full.tar.gz 1594783 RMD160 6ef1be0f1d3f2dc2e36dd5ce01c58df0ac990dc3 SHA1 7e655833b53b11226c5e347ceb8bc78316999bc6 SHA256 01b943811422a956de0b31378ae85f885890e0cd9ffe65eb59fa0e0b9e5f4fc3
+DIST hsfmodem-7.80.02.03full.tar.gz 1479138 RMD160 c49e0b3d9df77c032afe9c3c2bcd4168f020e21c SHA1 5fbd258bc65c0373611fe3633449cc2858b55843 SHA256 0e193fbe79f5cdef17756b3c18340f8675771a78cefe49d314f6bfa023222c60
+DIST hsfmodem-7.80.02.03x86_64full.tar.gz 1603339 RMD160 6853a1250024e14186347843a7bb8d43ceeeebad SHA1 96c0bad3890482b80e28454568075393e79ba5f4 SHA256 fb1b8349a2c5db61a7761a1306c1117e216d1169bd96381a77d4f27d7c5dbef8
 EBUILD hsfmodem-7.68.00.09.ebuild 2089 RMD160 1dd99a36db9f126a27e2367b4609bd4124b1c524 SHA1 595e4846dc6c5330d41d46aa555682dd422f39aa SHA256 f913355bf18f63e6ee8da4d3e3a709d18d90116d24afac907f18ab7a13b122fb
 EBUILD hsfmodem-7.68.00.12.ebuild 2091 RMD160 fdb46267f0d0e7fad78d59556898da0388c5a79b SHA1 d5e353cd7222de689f9558d00845d416090988f6 SHA256 c5180e5da4839a6c63ae5726264ab5920e2ec4b435ec1b6995552e7342a879c1
 EBUILD hsfmodem-7.68.00.13.ebuild 2091 RMD160 a861d3ba29872e5d116e5ad1037327554b081f46 SHA1 f6c3f6fc5d27b47a332054d19b8392d95bd8783f SHA256 5169b1b16fe2f80b8a52fbcbd7c63eb64eb5f6b6bb6f9020d574ab701ca92e59
 EBUILD hsfmodem-7.68.00.14.ebuild 2091 RMD160 83c0f7489fb0efaf5471cdd628da7c139cd63e6a SHA1 a2dd6d91c0640c1ad3dd3d1135e2c3c32413b347 SHA256 e8442de9e5fd73419bc63e4786350be7b1de548991232d400da105c434d28de9
 EBUILD hsfmodem-7.80.02.01.ebuild 2091 RMD160 182eff8414d862f9d728dd170c152df3f1c595a1 SHA1 da32a5bd3b89f7e2c7a4b5f47a0ec21f947c812e SHA256 70580c292fe4190626d4643f43a5bc37aa3bffbe8329fdc39c8cf38432ae16a1
-MISC ChangeLog 12192 RMD160 87f8d55de4d1f534025ca1b331d8dfd336afc5cc SHA1 d05af1b43525d8209c5c678d5b3d529b24cc99ba SHA256 81d22436a8d22cde1c691d960515ddda3542bf5dc03da53d62b474fedade9bb6
+EBUILD hsfmodem-7.80.02.03.ebuild 2111 RMD160 dd0daf33460b576181f4f56cf2c351eb35a3a4d8 SHA1 6cb3a3fa9ba925a68b31276e0e959bf7f45dfde6 SHA256 63a53bde0a9ab361288da50988b1e30acc7f0f17e79bef50ea1bff089e5c4b4a
+MISC ChangeLog 12387 RMD160 912c29b1e494ddc239101a898139b816f9e69d81 SHA1 e5358abe60bfc02f9ef7bca2f4da0f291c37c373 SHA256 c24ed93cf84ee68e01be80fc6aa390bfd0c4774c51405df52f0adfd8226f55f1
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAklrw5EACgkQts85UDFmaOWDxwCePLRaqPamJcb/6v/AaDaqKCHV
-fO0AmwQaRf8/ubevbVBkmrv6Cq0c0aJ/
-=lHhv
+iEYEARECAAYFAkm6xREACgkQts85UDFmaOVIcQCfX8LyVViJxqwrVjMeIzvfNf5z
+K44An2ZYoPDyXTOTFFfH94VtMxwUmXjl
+=BuXh
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch
new file mode 100644
index 000000000000..069286519fbd
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch
@@ -0,0 +1,129 @@
+diff -Nru hsfmodem-7.80.02.03x86_64full.orig/diag/makefile hsfmodem-7.80.02.03x86_64full/diag/makefile
+--- hsfmodem-7.80.02.03x86_64full.orig/diag/makefile	2006-01-13 19:23:50.000000000 +0000
++++ hsfmodem-7.80.02.03x86_64full/diag/makefile	2009-03-13 20:38:16.000000000 +0000
+@@ -10,7 +10,7 @@
+ include $(TOP)/config.mak
+ -include $(TOP)/modules/imported/makeflags.mak
+ 
+-CFLAGS =	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
++CFLAGS +=	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
+ CFLAGS +=	$(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS)
+ CFLAGS +=	-DCNXTTARGET="\"$(CNXTTARGET)\""
+ 
+@@ -41,13 +41,13 @@
+ 	$(MKDIR) -p $@
+ 
+ $(CNXTTARGET)diag: diag.o modemexpert.o
+-	$(CC) -o $@ $^
++	$(CC) ${LDFLAGS} -o $@ $^
+ 
+ $(CNXTTARGET)scr: scr.o
+-	$(CC) -o $@ $^
++	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
+ 
+ $(CNXTTARGET)dmp: dmp.o
+-	$(CC) -o $@ $^
++	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
+ 
+ clean:
+ 	rm -f *.o $(ALL)
+diff -Nru hsfmodem-7.80.02.03x86_64full.orig/modules/Makefile hsfmodem-7.80.02.03x86_64full/modules/Makefile
+--- hsfmodem-7.80.02.03x86_64full.orig/modules/Makefile	2009-02-20 21:30:12.000000000 +0000
++++ hsfmodem-7.80.02.03x86_64full/modules/Makefile	2009-03-13 20:38:16.000000000 +0000
+@@ -158,7 +158,7 @@
+ ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
+ # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
+ # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
+-CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
++# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
+ endif
+ 
+ MODULAR_HDA := $(shell test -e  ${REAL_KERNELSRC}/include/sound/hda_codec.h && echo yes || echo no)
+diff -Nru hsfmodem-7.80.02.03x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.80.02.03x86_64full/scripts/cnxtconfig.in
+--- hsfmodem-7.80.02.03x86_64full.orig/scripts/cnxtconfig.in	2009-02-20 21:30:17.000000000 +0000
++++ hsfmodem-7.80.02.03x86_64full/scripts/cnxtconfig.in	2009-03-13 20:38:16.000000000 +0000
+@@ -1994,9 +1994,9 @@
+ 	if [ -d /etc/udev/rules.d ]; then
+ 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
+ 		if [ "@CNXTDRIVER@" = "dgc" ]; then
+-			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
++			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
+ 		else
+-		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
++		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
+ 	fi
+ 	fi
+ 
+diff -Nru hsfmodem-7.80.02.03x86_64full.orig/scripts/rccnxt.in hsfmodem-7.80.02.03x86_64full/scripts/rccnxt.in
+--- hsfmodem-7.80.02.03x86_64full.orig/scripts/rccnxt.in	2004-11-22 21:59:29.000000000 +0000
++++ hsfmodem-7.80.02.03x86_64full/scripts/rccnxt.in	2009-03-13 20:38:16.000000000 +0000
+@@ -1,63 +1,12 @@
+-#
+-# chkconfig: 2345 09 91
+-# description: @CNXTDRVDSC@
+-#
+-### BEGIN INIT INFO
+-# Provides: @CNXTTARGET@
+-# Should-Start: hotplug coldplug
+-# Required-Start: $local_fs
+-# Required-Stop: $network
+-# Default-Start: 3 5
+-# Default-Stop: 0 1 2 6
+-# Description: Start @CNXTDRVDSC@
+-### END INIT INFO
+ 
+-if [ -e /etc/runlevels ]; then
+-	begincmd="ebegin"
+-	endcmd="eend"
+-else
+-	begincmd="echo"
+-	endcmd="/bin/true"
+-fi
+-
+-
+-start()
+-{
+-	${begincmd} "Starting @CNXTDRVDSC@"
++start() {
++	ebegin "Starting @CNXTDRVDSC@"
+ 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
+-	${endcmd} 0
++	eend 0
+ }
+ 
+-stop()
+-{
+-	${begincmd} "Stopping @CNXTDRVDSC@"
++stop() {
++	ebegin "Stopping @CNXTDRVDSC@"
+ 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
+-	${endcmd} 0
++	eend 0
+ }
+-
+-restart()
+-{
+-	stop
+-	start
+-}
+-
+-if [ ! -e /etc/runlevels ]; then
+-	case "$1" in
+-      start)
+-			start
+-			;;
+-      stop)
+-			stop
+-			;;
+-      restart|force-reload|reload)
+-			restart
+-			;;
+-      status)
+-			exit 3
+-			;;
+-      *)
+-			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
+-			exit 1
+-			;;
+-	esac
+-fi
diff --git a/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild b/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild
new file mode 100644
index 000000000000..2add7e2e260b
--- /dev/null
+++ b/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild,v 1.1 2009/03/13 20:41:47 mrness Exp $
+
+inherit eutils linux-info
+
+#The document is the same as in hcfpcimodem, even if it has a different URL
+MY_DOC="100498D_RM_HxF_Released.pdf"
+
+DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
+HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
+SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
+	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
+	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
+
+LICENSE="Conexant"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="doc"
+SLOT="0"
+
+DEPEND="dev-lang/perl
+	app-arch/cpio"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if useq x86; then
+		MY_ARCH_S="${S}/${P}full"
+	elif useq amd64; then
+		MY_ARCH_S="${S}/${P}x86_64full"
+	fi
+
+	local f
+	QA_EXECSTACK=""
+	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
+		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${MY_ARCH_S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_compile() {
+	cd "${MY_ARCH_S}"
+	emake all || die "make failed"
+}
+
+src_install () {
+	cd "${MY_ARCH_S}"
+	make ROOT="${D}" install || die "make install failed"
+
+	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
+	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
+
+	use doc && dodoc "${DISTDIR}/${MY_DOC}"
+}
+
+pkg_preinst() {
+	local NVMDIR="${ROOT}/etc/${PN}/nvm"
+	if [ -d "${NVMDIR}" ]; then
+		einfo "Cleaning ${NVMDIR}..."
+		rm -rf "${NVMDIR}"
+		eend
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = / ]; then
+		elog "To complete the installation and configuration of your HSF modem,"
+		elog "please run hsfconfig."
+	fi
+}
+
+pkg_prerm() {
+	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
+		hsfconfig --remove || die "hsfconfig --remove failed"
+	fi
+}