New version thanks to MonkeyIsland <parkmann@gmx.net> and tuXXer <bs.net@gmx.de> in bug 76832, version 2.6.20.7-r2 stable on x86 for livecd

(Portage version: 2.0.51-r15)

6 files changed, 311 insertions, 20 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 4a157c5c9211..1da187b2086b 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/fcdsl
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.6 2004/12/12 19:14:21 mrness Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.7 2005/01/25 18:44:54 genstef Exp $
+
+*fcdsl-2.6.20.7-r3 (25 Jan 2005)
+
+  25 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
+  fcdsl-2.6.20.7-r2.ebuild, +fcdsl-2.6.20.7-r3.ebuild:
+  New version thanks to MonkeyIsland <parkmann@gmx.net> and tuXXer
+  <bs.net@gmx.de> in bug 76832, version 2.6.20.7-r2 stable on x86 for livecd
 
 *fcdsl-2.6.20.7-r2 (12 Dec 2004)
 
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 203f619accca..56899a6bc2e6 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0cc00b2e6d53d6bae0841f23b81eed17 ChangeLog 1366
-MD5 7e441fe8845d85e66f3cf257959d2572 fcdsl-2.6.20.7.ebuild 7203
+MD5 bac438e232c274f04dfa717e08deb48b fcdsl-2.6.20.7-r3.ebuild 7702
+MD5 39420ab21749b7795ca796f85427aab5 fcdsl-2.6.20.7.ebuild 7203
+MD5 fe39d757f45630fb38ab4ac0811d1896 fcdsl-2.6.20.7-r2.ebuild 7855
+MD5 e5ce7642bf0a78f13c2bc64806d4849d ChangeLog 1653
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 8a28152fcd0fe00a030770189969c09a fcdsl-2.6.20.7-r2.ebuild 7856
 MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7 72
 MD5 364100988c059984dab986c49888df6f files/digest-fcdsl-2.6.20.7-r2 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBvJ/Ijtv59x0+BrURAkQCAJ9AzecEv+z3ltESBsxfLiCwMOIbdQCeLcCX
-N84+ILxZx7juMASxjqiRSkU=
-=FZIr
------END PGP SIGNATURE-----
+MD5 05ac6fb7b43f51ef47b85e53bc08de2d files/digest-fcdsl-2.6.20.7-r3 381
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild
index e365ad2d497b..ba3fc9501811 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild,v 1.2 2004/12/12 19:45:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r2.ebuild,v 1.3 2005/01/25 18:44:54 genstef Exp $
 
 inherit kernel-mod rpm eutils
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.suse.com/pub/suse/i386/update/9.1/rpm/src/avm_${P/2.6./2.6-}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 RDEPEND=">=net-dialup/capi4k-utils-20040810"
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r3.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r3.ebuild
new file mode 100644
index 000000000000..df42a4bfe093
--- /dev/null
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r3.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r3.ebuild,v 1.1 2005/01/25 18:44:54 genstef Exp $
+
+inherit linux-mod eutils
+
+S="${WORKDIR}/fritz"
+
+DESCRIPTION="AVM FRITZ!Card DSL drivers for 2.6 kernel"
+HOMEPAGE="http://www.avm.de/"
+SRC_URI="ftp://ftp.avm.de/cardware/fritzcrd.dsl/linux/suse.91/fcdsl-suse9.1-3.11-02.tar.gz
+		ftp://ftp.avm.de/cardware/fritzcrd.dsl_v20/linux/suse.91/fcdsl2-suse9.1-3.11-04.tar.gz
+		ftp://ftp.avm.de/cardware/fritzcrd.dsl_sl/linux/suse.91/fcdslsl-suse9.1-3.11-04.tar.gz
+		ftp://ftp.avm.de/cardware/fritzcrd.dsl_sl_usb/linux/suse.91/fcdslslusb-suse9.1-3.11-04.tar.gz
+		ftp://ftp.avm.de/cardware/fritzcrd.dsl_usb/linux/suse.91/fcdslusb-suse9.1-3.11-02.tar.gz"
+
+LICENSE="LGPL-2"
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=net-dialup/capi4k-utils-20040810"
+
+FCDSL_NAMES=("AVM FRITZ!Card DSL" "AVM FRITZ!Card DSL v2.0" "AVM FRITZ!Card DSL SL" "AVM FRITZ!Card DSL USB" "AVM FRITZ!Card DSL SL USB")
+FCDSL_BUSTYPES=("pci" "pci" "pci" "usb" "usb")
+FCDSL_IDS=("1131:5402" "1244:2900" "1244:2700" "057c:2300" "057c:3500")
+FCDSL_FIRMWARES=("fdslbase.bin" "fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm")
+FCDSL_MODULES=("fcdsl" "fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb")
+
+pkg_setup() {
+	CONFIG_CHECK="ISDN_CAPI_CAPI20"
+	linux-mod_pkg_setup
+
+	MODULE_NAMES=""
+	#Check existence of user selected cards
+	if [ -n "${FCDSL_CARDS}" ] ; then
+		for USERCARD in ${FCDSL_CARDS} ; do
+			for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+				if [ "${USERCARD}" = "${FCDSL_MODULES[CARD]}" ]; then
+					MODULE_NAMES="${MODULE_NAMES} ${FCDSL_MODULES[CARD]}(net:${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/src)"
+					continue 2
+				fi
+			done
+			die "Driver for ${USERCARD} not present in ${P}"
+		done
+	else
+		einfo
+		einfo "You can control the modules which are built with the variable"
+		einfo "FCDSL_CARDS which should contain a blank separated list"
+		einfo "of a selection from the following cards:"
+		einfo "   ${FCDSL_MODULES[*]}"
+		for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+			MODULE_NAMES="${MODULE_NAMES} ${FCDSL_MODULES[CARD]}(net:${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/src)"
+		done
+	fi
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="KDIR=${KV_DIR} LIBDIR=${S}"
+	NO_MODULESD="1"
+}
+
+src_unpack() {
+	tar xzf ${DISTDIR}/fcdsl-suse9.1-3.11-02.tar.gz
+	mv fritz fritz.dsl
+	tar xzf ${DISTDIR}/fcdsl2-suse9.1-3.11-04.tar.gz
+	mv fritz fritz.dsl2
+	tar xzf ${DISTDIR}/fcdslsl-suse9.1-3.11-04.tar.gz
+	mv fritz fritz.dslsl
+	tar xzf ${DISTDIR}/fcdslslusb-suse9.1-3.11-04.tar.gz
+	mv fritz fritz.dslslusb
+	tar xzf ${DISTDIR}/fcdslusb-suse9.1-3.11-02.tar.gz
+	mv fritz fritz.dslusb
+
+	ln -s fritz.dsl fritz
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodir /etc/drdsl /etc/modules.d /lib/firmware /usr/sbin
+
+	echo -e "# card\tfile\tproto\tio\tirq\tmem\tcardnr\toptions" >${D}/etc/capi.conf
+	echo "#" >>${D}/etc/capi.conf
+
+	echo "# modules.d config file for AVM FRITZ!Card DSL" >${D}/etc/modules.d/fcdsl
+	echo "# Correct these settings with the output from drdsl -n" >>${D}/etc/modules.d/fcdsl
+
+	for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
+		if [ -n "${FCDSL_CARDS}" ] ; then
+			INS=""
+			for USERCARD in ${FCDSL_CARDS} ; do
+				if [ "${USERCARD}" = "${FCDSL_MODULES[CARD]}" ]; then INS="1"; fi
+			done
+			if [ -z "${INS}" ]; then continue; fi
+		fi
+		echo -e "#${FCDSL_MODULES[CARD]}\t${FCDSL_FIRMWARES[CARD]}\t-\t-\t-\t-\t-" >>${D}/etc/capi.conf
+
+		echo "#options ${FCDSL_MODULES[CARD]} VPI=1 VCI=32 VCC=1" >>${D}/etc/modules.d/fcdsl
+
+		insinto /lib/firmware
+		doins ${WORKDIR}/${FCDSL_MODULES[CARD]/fc/fritz.}/${FCDSL_FIRMWARES[CARD]}
+	done
+
+	#Compatibility with <=net-dialup/isdn4k-utils-20041006-r3. 
+	#Please remove it when it becomes obsolete
+	dosym firmware /lib/isdn
+
+	insinto /etc/drdsl
+	doins ${S}/drdsl.ini
+
+	exeinto /usr/sbin
+	doexe ${S}/drdsl
+
+	dodoc ${S}/CAPI* ${S}/compile* ${S}/license.txt
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	echo
+	einfo "If you want to setup your DSL card driver and create a peer file, please run:"
+	einfo "    etc-update"
+	einfo "    ebuild /var/db/pkg/net-dialup/${PF}/${PF}.ebuild config"
+	einfo "    /etc/init.d/capi start"
+	einfo "    drdsl -n"
+	einfo "    nano /etc/modules.d/fcdsl"
+	einfo "    update-modules"
+	einfo "    /etc/init.d/capi restart"
+	epause 10
+}
+
+#pkg-config functions
+
+detect_fcdsl_card() {
+	PCI_IDS=""
+	USB_IDS=""
+	if [ -d /sys/bus ]; then
+		if [ -d /sys/bus/pci/devices ]; then
+			cd /sys/bus/pci/devices
+			for PCI_DEVICE in *; do
+				vendor="$(< ${PCI_DEVICE}/vendor)"
+				device="$(< ${PCI_DEVICE}/device)"
+				PCI_IDS="${PCI_IDS}${vendor:2}:${device:2} "
+			done
+		fi
+		if [ -d /sys/bus/usb/devices ]; then
+			cd /sys/bus/usb/devices
+			for USB_DEVICE in [0-9]*; do
+				if [ -f ${USB_DEVICE}/idVendor ]; then
+					USB_IDS="${USB_IDS}$(< ${USB_DEVICE}/idVendor):$(< ${USB_DEVICE}/idProduct) "
+				fi
+			done
+		fi
+	fi
+
+	FCDSL_MODULE=""
+	for ((CARD=0; CARD < ${#FCDSL_IDS[*]}; CARD++)); do
+		BUS_IDS=""
+		if [ "${FCDSL_BUSTYPES[CARD]}" == "pci" ]; then
+			BUS_IDS="${PCI_IDS}"
+		else
+			BUS_IDS="${USB_IDS}"
+		fi
+		for BUS_ID in ${BUS_IDS}; do
+			if [ "${BUS_ID}" == "${FCDSL_IDS[CARD]}" ]; then
+				einfo "Found: ${FCDSL_NAMES[CARD]}"
+				FCDSL_FIRMWARE=${FCDSL_FIRMWARES[CARD]}
+				FCDSL_MODULE=${FCDSL_MODULES[CARD]}
+			fi
+		done
+	done
+	if [ "${FCDSL_MODULE}" == "" ]; then
+		ewarn "No AVM FRITZ!Card DSL found!"
+	fi
+}
+
+readpassword() {
+	VALUE_1=""
+	VALUE_2=""
+	while true; do
+		einfo "Enter your password:"
+		read -r -s VALUE_1
+		einfo "Retype your password:"
+		read -r -s VALUE_2
+		if [ "${VALUE_1}" == "" ]; then
+			echo
+			eerror "You entered a blank password. Please try again."
+			echo
+		else
+			if [ "${VALUE_1}" == "${VALUE_2}" ] ; then
+				break
+			else
+				echo
+				eerror "Your password entries do not match. Please try again."
+				echo
+			fi
+		fi
+	done
+	eval ${1}=${VALUE_1}
+
+	VALUE_1=""
+	VALUE_2=""
+	unset VALUE_1
+	unset VALUE_2
+}
+
+readvalue() {
+	VALUE=""
+	while true; do
+		einfo "${2}:"
+		read VALUE
+		if [ "${VALUE}" == "" ]; then
+			eerror "You entered a blank value. Please try again."
+			echo
+		else
+			break
+		fi
+	done
+	eval ${1}=${VALUE}
+
+	VALUE=""
+	unset VALUE
+}
+
+pkg_config() {
+	detect_fcdsl_card
+
+	if [ "${FCDSL_MODULE}" != "" ]; then
+		readvalue FCDSL_PROVIDER "Enter the name of your ISP"
+		if [ ! -e "/etc/ppp/peers/${FCDSL_PROVIDER}" ]; then
+			readvalue FCDSL_USER "Enter your user name"
+			if [ "$(grep "${FCDSL_USER}" /etc/ppp/pap-secrets)" == "" ]; then
+				readpassword FCDSL_PASSWORD
+				echo '"'${FCDSL_USER}'" * "'${FCDSL_PASSWORD}'"' >>/etc/ppp/pap-secrets
+				unset FCDSL_PASSWORD
+				cat <<EOF >>/etc/ppp/peers/${FCDSL_PROVIDER}
+connect ""
+ipcp-accept-remote
+ipcp-accept-local
+usepeerdns
+defaultroute
+user "${FCDSL_USER}"
+hide-password
+sync
+noauth
+lcp-echo-interval 5
+lcp-echo-failure 3
+lcp-max-configure 50
+lcp-max-terminate 2
+noccp
+noipx
+noproxyarp
+mru 1492
+mtu 1492
+linkname "${FCDSL_PROVIDER}"
+ipparam internet
+plugin capiplugin.so
+avmadsl
+:
+/dev/null
+EOF
+				echo
+				echo
+				echo
+				einfo "Now, you can start an ADSL connection with either"
+				einfo "    pon \"${FCDSL_PROVIDER}\""
+				einfo "or"
+				einfo "    pppd call \"${FCDSL_PROVIDER}\""
+			else
+				ewarn "User \"${FCDSL_USER}\" always exists in \"/etc/ppp/pap-secrets\"!"
+			fi
+		else
+			ewarn "Peer file \"/etc/ppp/peers/${FCDSL_PROVIDER}\" always exists!"
+		fi
+
+		#Uncomment correspondent lines in /etc/capi.conf & /etc/modules.d/fcdsl
+		if [ -f /etc/capi.conf ]; then
+			sed -i -e "s:^#${FCDSL_MODULE}:${FCDSL_MODULE}" /etc/capi.conf
+		fi
+		if [ -f /etc/modules.d/fcdsl ]; then
+			sed -i -e "s:^#options +${FCDSL_MODULE}:options ${FCDSL_MODULE}" /etc/modules.d/fcdsl
+		fi
+	else
+		ewarn "No AVM FRITZ!Card DSL found!"
+	fi
+	unset FCDSL_PROVIDER
+	unset FCDSL_USER
+}
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7.ebuild
index 4e4cb2dde52e..f277a9207d6d 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7.ebuild,v 1.3 2004/11/20 12:37:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7.ebuild,v 1.4 2005/01/25 18:44:54 genstef Exp $
 
 inherit kmod rpm eutils
 
diff --git a/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r3 b/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r3
new file mode 100644
index 000000000000..0a319f01cd12
--- /dev/null
+++ b/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r3
@@ -0,0 +1,5 @@
+MD5 4355167c8ca87ef796eb55cdaabf1b36 fcdsl-suse9.1-3.11-02.tar.gz 1931601
+MD5 b33f95f659d50a611dc1b63255a0b5fc fcdsl2-suse9.1-3.11-04.tar.gz 1446440
+MD5 ceadcdddc662fbcfa8fa9e2980748666 fcdslsl-suse9.1-3.11-04.tar.gz 1441516
+MD5 1c35c16e699ed70e70ab2351bd83d109 fcdslslusb-suse9.1-3.11-04.tar.gz 1430073
+MD5 5fde466f6c66d37353355fa6d07721fb fcdslusb-suse9.1-3.11-02.tar.gz 1154136