New rev of isdn4kutils, effectively closing bug 9578. Assigning this bug

to seemant since it may indicate that a new person should be added to the
dev team.

12 files changed, 417 insertions, 2 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index 5b7c4ffa2ab0..870651160de1 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for net-dialup/isdn4k-utils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.3 2002/12/16 23:01:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.4 2002/12/17 04:21:16 drobbins Exp $
 
-*isdn4k-utils-3.2_p1-r1 (12 Dec 2002)
+*isdn4k-utils-3.2_p1-r2 (16 Dec 2002)
+
+  16 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: new rev. Incorporated many
+  improvements from bug 9578. Thank you Johannes Ballé for your many fixes.
+
+*isdn4k-utils-3.2_p1-r1 (16 Dec 2002)
 
   16 Dec 2002; Daniel Robbins <drobbins@gentoo.org> : new rev. Docs install in
   the correct place, and device nodes are no longer created (devfs should take
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/config b/net-dialup/isdn4k-utils/files/3.2_p1-r2/config
new file mode 100644
index 000000000000..2bfeb38a2e30
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/config
@@ -0,0 +1,109 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+
+#
+# Code maturity level options
+#
+# CONFIG_EXPERIMENTAL is not set
+
+#
+# General configuration
+#
+CONFIG_BUILDX11=y
+CONFIG_KERNELDIR='/usr/src/linux'
+CONFIG_BINDIR='/usr/bin'
+CONFIG_SBINDIR='/sbin'
+CONFIG_MANDIR='/usr/share/man'
+CONFIG_RUNDIR='/var/run'
+CONFIG_LOCKDIR='/var/lock'
+CONFIG_LOCKFILE='LCK..'
+CONFIG_I4LCONFDIR='/etc/isdn'
+CONFIG_CONFFILE='isdn.conf'
+CONFIG_CALLERIDFILE='callerid.conf'
+CONFIG_USERCONFFILE='~/.isdn'
+CONFIG_COUNTRYCODE='49'
+CONFIG_AREACODE='89'
+CONFIG_COUNTRY_PREFIX='+'
+CONFIG_AREA_PREFIX='0'
+CONFIG_DATADIR='/usr/share/isdn'
+
+#
+# Runtime configuration tools
+#
+CONFIG_ISDNCTRL=y
+CONFIG_ISDNCTRL_CONF=y
+CONFIG_ISDNCTRL_TIMRU=y
+CONFIG_IPROFD=y
+CONFIG_DIVERTCTRL=y
+
+#
+# Card configuration tools
+#
+CONFIG_HISAXCTRL=y
+CONFIG_ICNCTRL=y
+# CONFIG_ICNCTRL_DEBUG is not set
+CONFIG_PCBITCTL=y
+# CONFIG_AVMCAPICTRL is not set
+CONFIG_ACTCTRL=y
+CONFIG_EICONCTRL=y
+
+#
+# Tools for monitoring activity
+#
+CONFIG_IMON=y
+CONFIG_IMONTTY=y
+CONFIG_ISDNLOG=y
+
+#
+# Options for isdnlog package
+#
+CONFIG_ISDNLOG_SERV_PORT=20011
+CONFIG_ISDNLOG_USERFILE='isdnlog.users'
+CONFIG_ISDNLOG_CHARGEFILE='charge.dat'
+CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log'
+CONFIG_ISDNLOG_RELOADCMD='/etc/init.d/isdn4linux restart'
+CONFIG_ISDNLOG_STOPCMD='/etc/init.d/isdn4linux stop'
+CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot'
+CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog'
+CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf'
+# CONFIG_ISDNLOG_POSTGRES is not set
+# CONFIG_ISDNLOG_MYSQLDB is not set
+# CONFIG_ISDNLOG_ORACLE is not set
+CONFIG_ISDN_LOG_XX=y
+CONFIG_ISDN_LOG_CC=''
+CONFIG_ISDN_LOG_CC_EN=y
+CONFIG_ISDN_LOG_DEST_DE=y
+CONFIG_ISDN_LOG_DEST_AT=y
+CONFIG_ISDN_LOG_DEST_NL=y
+CONFIG_ISDN_LOG_DEST_CH=y
+CONFIG_IPPPSTATS=y
+CONFIG_XISDNLOAD=y
+CONFIG_XMONISDN=y
+
+#
+# Options for xmonisdn
+#
+CONFIG_XMONISDN_UPCMD='/etc/isdn/netup'
+CONFIG_XMONISDN_DOWNCMD='/etc/isdn/netdown'
+
+#
+# Applications
+#
+# CONFIG_VBOX is not set
+CONFIG_IPPPD=y
+
+#
+# Options for ipppd
+#
+CONFIG_IPPPD_MSCHAP=y
+# CONFIG_IPPPD_RADIUS is not set
+# CONFIG_RADIUS_WTMP_LOGGING is not set
+RADIUS_CLIENT_CONFIG_FILE=''
+
+#
+# Documentation
+#
+CONFIG_GENMAN=y
+#CONFIG_FAQ=y
+#CONFIG_FAQDIR='/usr/doc/faq/isdn4linux'
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/gentoo.patch b/net-dialup/isdn4k-utils/files/3.2_p1-r2/gentoo.patch
new file mode 100644
index 000000000000..3a4f7e1f4c01
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/gentoo.patch
@@ -0,0 +1,22 @@
+diff -ruN isdn4k-utils.orig/isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in
+--- isdn4k-utils.orig/isdnlog/Makefile.in	2002-07-19 21:03:55.000000000 +0200
++++ isdn4k-utils/isdnlog/Makefile.in	2002-11-21 00:36:44.000000000 +0100
+@@ -1794,6 +1794,7 @@
+ 				$(INSTALL_DATA) samples/$$f.conf.$(NATION) $(DESTDIR)$(I4LCONFDIR)/$$f.conf.new ; \
+ 			fi ; \
+ 		done
++		@[ -f "$(DESTDIR)$(I4LCONFDIR)/isdn.conf" ] || $(INSTALL_DATA) samples/isdn.conf $(DESTDIR)$(I4LCONFDIR)
+ 		@for f in callerid.conf isdnlog.isdnctrl0.options isdnlog.users ; do \
+ 			if [ ! -f "$(DESTDIR)$(I4LCONFDIR)/$$f" ]; then \
+ 				$(INSTALL_DATA) samples/$$f $(DESTDIR)$(I4LCONFDIR)/$$f ; \
+@@ -1836,8 +1837,8 @@
+ 		$(INSTALL_DATA) tools/isdnrate.1     $(DESTDIR)$(MAN1DIR)/isdnrate$(MAN1EXT)
+ 		$(INSTALL_DATA) tools/rate-files.5     $(DESTDIR)$(MAN5DIR)/rate-files$(MAN5EXT)
+ 		$(INSTALL_DATA) country-de.dat	$(DESTDIR)$(DATADIR)/country.dat
+-		$(INSTALL_DATA) rate-$(NATION).dat      $(DESTDIR)$(DATADIR)
+-		$(INSTALL_DATA) holiday-$(NATION).dat   $(DESTDIR)$(DATADIR)
++		@[ ! -f rate-${NATION}.dat ] || $(INSTALL_DATA) rate-$(NATION).dat      $(DESTDIR)$(DATADIR)
++		@[ ! -f holiday-${NATION}.dat ] || $(INSTALL_DATA) holiday-$(NATION).dat   $(DESTDIR)$(DATADIR)
+ 		@for f in `ls zone-$(NATION)-*.gdbm zone-$(NATION)-*.db zone-$(NATION)-*.cdb tools/dest/dest.gdbm tools/dest/dest.db tools/dest/dest.cdb 2>/dev/null` ; do \
+ 		  $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \
+ 		  echo Installing $(DESTDIR)$(DATADIR)/$$f; \
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/ioptions b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ioptions
new file mode 100644
index 000000000000..39cd232ddaba
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ioptions
@@ -0,0 +1,2 @@
+# System-wide configuration for ipppd.
+# Normally, put all options into options.ipppX
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-down.ippp0 b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-down.ippp0
new file mode 100644
index 000000000000..b0db4825ccd0
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-down.ippp0
@@ -0,0 +1,11 @@
+IFACE=$1
+
+/bin/sleep 1
+
+[ -s /etc/conf.d/net ] && . /etc/conf.d/net
+
+# Recreate the default route so autodial works
+
+if [ -n "${gateway}" ] && [ "${gateway%/*}" = "${IFACE}" ]; then
+	/sbin/route add default dev ${gateway%/*}
+fi
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-up b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-up
new file mode 100644
index 000000000000..445fa500b70e
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-up
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This calls /etc/ppp/ip-up.<interface> or /etc/ppp/ip-down.<interface>
+
+[ -s $0.$1 ] && . $0.$1 $*
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.conf b/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.conf
new file mode 100644
index 000000000000..9c37494ca519
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.conf
@@ -0,0 +1,3 @@
+# Location where isdnctrl will save its configuration
+
+ISDNCTRL_SAVE="/var/lib/isdn4linux/isdnctrl.conf"
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.init b/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.init
new file mode 100644
index 000000000000..9e289e155910
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.init
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.init,v 1.1 2002/12/17 04:21:16 drobbins Exp $
+
+depend() {
+	use pcmcia
+}
+
+start() {
+
+	ebegin "Loading isdnctrl configuration"
+
+	# This variable is set in /etc/conf.d/isdn4linux
+	[ ! -f ${ISDNCTRL_SAVE} ] || isdnctrl readconf ${ISDNCTRL_SAVE} >/dev/null
+
+	eend $?
+
+}
+
+stop() {
+
+	ebegin "Saving isdnctrl configuration"
+
+	isdnctrl writeconf ${ISDNCTRL_SAVE} >/dev/null
+
+	eend $?
+
+}
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/net.ippp0 b/net-dialup/isdn4k-utils/files/3.2_p1-r2/net.ippp0
new file mode 100644
index 000000000000..51499b7b1dc0
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/net.ippp0
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.2_p1-r2/net.ippp0,v 1.1 2002/12/17 04:21:16 drobbins Exp $
+
+#NB: Config is in /etc/conf.d/net
+
+depend() {
+	need isdn4linux
+}
+
+checkconfig() {
+	if [ -z "$(eval echo \$\{iface_${IFACE}\})" ]
+	then
+		eerror "Please make sure that /etc/conf.d/net has \$iface_$IFACE set"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	local iface_args="$(eval echo \$\{iface_${IFACE}\})"
+	local ipppd_opts=""
+
+	ebegin "Starting ipppd for ${IFACE}"
+	[ -n "${gateway}" ] && [ "${gateway%/*}" = "${IFACE}" ] && ipppd_opts='defaultroute'
+	/sbin/ipppd ${ipppd_opts} pidfile /var/run/ipppd.${IFACE}.pid file /etc/ppp/options.${IFACE} || {
+		local retval=$?
+		eend ${retval} "Failed to start ipppd"
+		return ${retval}
+	}
+	eend 0
+
+	ebegin "Bringing ${IFACE} up"
+	/sbin/ifconfig ${IFACE} ${iface_args} >/dev/null || {
+		local retval=$?
+		eend ${retval} "Failed to bring ${IFACE} up"
+		stop
+		return ${retval}
+	}
+	eend 0
+
+	if [ -n "$(eval echo \$\{inet6_${IFACE}\})" ]
+	then
+		local x=""
+		ebegin "  Adding inet6 addresses"
+		for x in $(eval echo \$\{inet6_${IFACE}\})
+		do
+			ebegin "    ${IFACE} inet6 add ${x}"
+			/sbin/ifconfig ${IFACE} inet6 add ${x} >/dev/null
+			eend 0
+		done
+		save_options "inet6" "$(eval echo \$\{inet6_${IFACE}\})"
+	fi
+
+	if [ -n "${gateway}" ] && [ "${gateway%/*}" = "${IFACE}" ]
+	then
+		ebegin "  Setting default gateway"
+		/sbin/route add default dev ${gateway%/*} >/dev/null || {
+			local retval=$?
+			eend ${retval} "Failed to bring ${IFACE} up"
+			stop
+			return ${retval}
+		}
+		eend 0
+	fi
+
+	# Enabling rp_filter causes wacky packets to be auto-dropped by
+	# the kernel
+	if [ -e /proc/sys/net/ipv4/conf/${IFACE}/rp_filter ]
+	then
+		echo 1 > /proc/sys/net/ipv4/conf/${IFACE}/rp_filter
+	fi
+}
+
+stop() {
+	local myinet6="$(get_options inet6)"
+	local pidfile="/var/run/ipppd.${IFACE}.pid"
+
+	ebegin "Bringing ${IFACE} down"
+
+	# Also down the inet6 interfaces
+	if [ -n "${myinet6}" ]
+	then
+		local x=""
+		for x in ${myinet6}
+		do
+			/sbin/ifconfig ${IFACE} inet6 del ${x} >/dev/null
+		done
+	fi
+
+	/sbin/ifconfig ${IFACE} down >/dev/null
+
+	# Kill ipppd
+	test -s "${pidfile}" && kill `cat ${pidfile}`
+	sleep 1
+	test -s "${pidfile}" && sleep 2 && test -s "${pidfile}" && einfon "Killing ipppd" && kill -KILL `cat ${pidfile}`
+
+	eend 0
+}
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/options.ippp0 b/net-dialup/isdn4k-utils/files/3.2_p1-r2/options.ippp0
new file mode 100644
index 000000000000..13983f19ee96
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r2/options.ippp0
@@ -0,0 +1,25 @@
+# Example config for a personal ISP dialin
+# see "man ipppd" for explanation of all possible options
+
+# for the defaultroute setting, look in /etc/conf.d/net
+
+/dev/isdn/ippp0
+
+# you have to put login and password into /etc/ppp/pap-secrets too
+
+name "insert ppp login here"
+
+lock
+ipcp-accept-local
+ipcp-accept-remote
+noipdefault
+
+# You might want to try these if you have problems:
+#-vj
+#-vjccomp
+#-ac
+#-pc
+#-bsdcomp
+#mru 1524
+#mtu 1500
+#noccp
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r2 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r2
new file mode 100644
index 000000000000..6b0b9b465e32
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r2
@@ -0,0 +1 @@
+MD5 d347afa462e46eccfd1284aebae227b6 isdn4k-utils.v3.2p1.tar.bz2 5238737
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild
new file mode 100644
index 000000000000..9c72897e9575
--- /dev/null
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild,v 1.1 2002/12/17 04:21:16 drobbins Exp $
+
+IUSE="X"
+S=${WORKDIR}/${PN}
+DESCRIPTION="ISDN-4-Linux Utils"
+SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${PN}.v3.2p1.tar.bz2"
+HOMEPAGE="http://www.isdn4linux.de/"
+SLOT="0"
+KEYWORDS="x86"
+LICENSE="GPL-2"
+
+RDEPEND="virtual/glibc
+	sys-libs/ncurses
+	sys-libs/gdbm
+	X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND} virtual/linux-sources"
+
+src_unpack() {
+	unpack ${A}
+	# Get country code from I4L_CC variable
+	# default country: DE (Germany)
+	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
+	[ "X${I4L_CC}" == "X" ] && export I4L_CC=DE
+	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
+	cd ${S}
+
+	# Patch .config file to suit our needs
+	cat ${FILESDIR}/${PVR}/config | { \
+		if use X >/dev/null; then
+			cat
+		else
+			sed -e s/CONFIG_BUILDX11=y/#/ -e s/CONFIG_XISDNLOAD=y/#/ -e s/CONFIG_XMONISDN=y/#/;
+		fi; } | { \
+		case "${I4L_CC}" in
+			DE|AT|CH|NL)
+				# These countries are specially supported in the isdnlog source.
+				sed -e s/CONFIG_ISDN_LOG_XX=y/CONFIG_ISDN_LOG_${I4L_CC}=y/ -e s/CONFIG_ISDN_LOG_CC=\'\'/#/
+				;;
+			*)
+				# Others get a generic isdnlog.
+				sed s/CONFIG_ISDN_LOG_CC=\'\'/CONFIG_ISDN_LOG_CC=\'${I4L_CC_LOW}\'/
+				;;
+		esac } \
+		> .config || die
+
+	# Patch in order to make generic config for countries which are not known to isdnlog source
+	patch -p1 < ${FILESDIR}/${PVR}/gentoo.patch || die
+
+	#disabling device creation the easy way:
+	echo "#!/bin/bash" > scripts/makedev.sh
+	echo "true" >> scripts/makedev.sh
+}
+
+src_compile() {                           
+	make subconfig || die
+	make || die
+}
+
+src_install() {                   
+  	cd ${S}
+	dodir /dev /sbin /usr/bin
+	make DESTDIR=${D} install || die
+	rm -rf ${D}/usr/doc ${D}/dev
+	dodoc COPYING NEWS README Mini-FAQ/isdn-faq.txt
+	
+	cd ${FILESDIR}/${PVR}
+	dodir /etc/init.d /etc/conf.d /etc/ppp /var/lib/isdn4linux
+
+	exeinto /etc/init.d
+	doexe net.ippp0
+	newexe isdn4linux.init isdn4linux
+
+	insinto /etc/conf.d
+	newins isdn4linux.conf isdn4linux
+
+	exeinto /etc/ppp
+	insinto /etc/ppp
+	doexe ip-up
+	dosym ip-up /etc/ppp/ip-down
+	doins ip-down.ippp0
+	doins ioptions
+	doins options.ippp0
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Please edit:"
+	einfo
+	einfo "- /etc/modules.autoload to contain your ISDN kernel modules"
+	einfo "- /etc/isdn/* (critical)"
+	einfo "- /etc/ppp/* (critical)"
+	einfo
+	einfo "/etc/init.d/isdn4linux will save and restore your isdnctrl config."
+	einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections which"
+	einfo "you need to set up using isdnctrl first!"
+	einfo
+
+}