version bump to CVS snapshot 20041024

15 files changed, 558 insertions, 13 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index 54e11a3ef7f8..8f08e066b7bd 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dialup/isdn4k-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.21 2004/09/27 12:56:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.22 2004/11/07 17:30:20 mrness Exp $
+
+*isdn4k-utils-20041024 (07 Nov 2004)
+
+  07 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  +isdn4k-utils-20041024.ebuild, +files/20041024/config, +files/20041024/gentoo.patch,
+  +files/20041024/ioptions, +files/20041024/ip-down.ippp0, +files/20041024/ip-up,
+  +files/20041024/isdn4linux.conf, +files/20041024/isdn4linux.init,
+  +files/20041024/net.ippp0, +files/20041024/options.ippp0, +files/20041024/pathfix.patch,
+  +files/20041024/vbox-makefile.am.patch:
+  Version bump. See bug #65168.
 
   27 Sep 2004; Daniel Black <dragonheart@gentoo.org>
   files/3.2_p1-r2/isdn4linux.init:
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 45cb5b5d213a..0e42f57c12b0 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,18 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 46880731bba4ce0f2cb6b1f67dbea6e9 ChangeLog 3540
+MD5 0120790c8c072aa32082bf44a4ef4dc8 ChangeLog 4028
 MD5 9f4187355b91c0dabfca1b251589f527 isdn4k-utils-3.2_p1-r2.ebuild 2808
 MD5 5bfcbc27dc20e18327b61f5df2bbec60 isdn4k-utils-3.2_p1-r3.ebuild 3070
 MD5 f18a68edbe338cae044acc49ae9fdd2b isdn4k-utils-3.2_p1-r4.ebuild 3553
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 fcd8bf61104e8a8768cc00e6179ad4c3 isdn4k-utils-20041024.ebuild 3531
 MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r3 136
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r4 136
 MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977
 MD5 adcc3c0ef100b737b0af224401812a4b files/local.start 564
-MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
+MD5 73d16856e5d4ae2a30bfb77fbd2ab017 files/digest-isdn4k-utils-20041024 144
 MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405
+MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
 MD5 92412760dfacc81cfac908d522ac8e39 files/3.2_p1-r2/ioptions 86
 MD5 49ffb48689897498866cc14687831e08 files/3.2_p1-r2/ip-down.ippp0 228
 MD5 6ed9643d1d6b7e57adadee4dd28ea81a files/3.2_p1-r2/ip-up 115
@@ -23,10 +22,14 @@ MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443
 MD5 0a638249458e39c304846ddd401e3fee files/3.2_p1-r4/config 2405
 MD5 56b93c0cc4cc17b12c6add0237283271 files/3.2_p1-r4/pathfix.patch 641
 MD5 15ef676fec91271f9a48dc7a1b7e82a2 files/3.2_p1-r4/vbox-makefile.am.patch 1211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBWA34mdTrptrqvGERAujWAJkB6KywMjl+7gQc8aC59oH9LxDG0wCfe9Ft
-dNVvhFHxKK6TFky0UpB+d8w=
-=qi7V
------END PGP SIGNATURE-----
+MD5 36eadf8ec47ec3bf118cffbf2a42adb5 files/20041024/config 2407
+MD5 76e9b700a1600d4b74dea30751934c83 files/20041024/gentoo.patch 2383
+MD5 92412760dfacc81cfac908d522ac8e39 files/20041024/ioptions 86
+MD5 49ffb48689897498866cc14687831e08 files/20041024/ip-down.ippp0 228
+MD5 6ed9643d1d6b7e57adadee4dd28ea81a files/20041024/ip-up 115
+MD5 115bcf317b18a9c362ef37acf5cd4c4b files/20041024/isdn4linux.conf 105
+MD5 875eb1dbe150bbae5bcdd6ae554f20c5 files/20041024/isdn4linux.init 718
+MD5 5d46112f6ebccecdb14e2812d2e348f2 files/20041024/net.ippp0 2426
+MD5 48266d44ebe70519d3fc67a6b0e260ff files/20041024/options.ippp0 443
+MD5 56b93c0cc4cc17b12c6add0237283271 files/20041024/pathfix.patch 641
+MD5 15ef676fec91271f9a48dc7a1b7e82a2 files/20041024/vbox-makefile.am.patch 1211
diff --git a/net-dialup/isdn4k-utils/files/20041024/config b/net-dialup/isdn4k-utils/files/20041024/config
new file mode 100644
index 000000000000..a07d9589bf52
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/config
@@ -0,0 +1,120 @@
+#
+# 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=y
+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 vbox package
+#
+VBOX_SPOOLDIR='/var/spool/vbox'
+VBOX_LOGDIR='/var/log/vbox'
+VBOX_PIDDIR='/var/run'
+VBOX_LOCKDIR='/var/lock'
+VBOX_DOCDIR='/usr/doc/vbox'
+VBOX_TCL='tcl8.3'
+# VBOX_SUSPEND_ID is not set
+
+#
+# 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/20041024/gentoo.patch b/net-dialup/isdn4k-utils/files/20041024/gentoo.patch
new file mode 100644
index 000000000000..4101b3abf044
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/gentoo.patch
@@ -0,0 +1,44 @@
+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	2003-04-26 12:06:28.000000000 +0200
+@@ -1959,6 +1959,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 ; \
+@@ -2005,8 +2005,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 -ruN isdn4k-utils.orig/isdnlog/samples/isdn.conf isdn4k-utils/isdnlog/samples/isdn.conf
+--- isdn4k-utils.orig/isdnlog/samples/isdn.conf	2002-01-29 17:39:20.000000000 +0100
++++ isdn4k-utils/isdnlog/samples/isdn.conf	2003-04-26 12:05:01.000000000 +0200
+@@ -21,13 +21,13 @@
+ CHARGEMAX       = 50.00
+ CURRENCY = 0.062,EUR
+ 
+-COUNTRYFILE = /usr/lib/isdn/country.dat
+-DESTFILE= /usr/lib/isdn/dest.cdb
++COUNTRYFILE = /usr/share/isdn/country.dat
++DESTFILE= /usr/share/isdn/dest.cdb
+ RATECONF= /etc/isdn/rate.conf
+ # replace the xx in the next 3 lines with your country's letters!
+-RATEFILE= /usr/lib/isdn/rate-xx.dat
+-HOLIDAYS= /usr/lib/isdn/holiday-xx.dat
+-ZONEFILE= /usr/lib/isdn/zone-xx-%s.cdb
++RATEFILE= /usr/share/isdn/rate-xx.dat
++HOLIDAYS= /usr/share/isdn/holiday-xx.dat
++ZONEFILE= /usr/share/isdn/zone-xx-%s.cdb
+ 
+ # providerselect
+ VBN = 10	# change this, depends on your country
diff --git a/net-dialup/isdn4k-utils/files/20041024/ioptions b/net-dialup/isdn4k-utils/files/20041024/ioptions
new file mode 100644
index 000000000000..39cd232ddaba
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/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/20041024/ip-down.ippp0 b/net-dialup/isdn4k-utils/files/20041024/ip-down.ippp0
new file mode 100644
index 000000000000..b0db4825ccd0
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/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/20041024/ip-up b/net-dialup/isdn4k-utils/files/20041024/ip-up
new file mode 100644
index 000000000000..e84dea974285
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/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/20041024/isdn4linux.conf b/net-dialup/isdn4k-utils/files/20041024/isdn4linux.conf
new file mode 100644
index 000000000000..9c37494ca519
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/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/20041024/isdn4linux.init b/net-dialup/isdn4k-utils/files/20041024/isdn4linux.init
new file mode 100644
index 000000000000..82be3854d14f
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/isdn4linux.init
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/20041024/isdn4linux.init,v 1.1 2004/11/07 17:30:20 mrness Exp $
+
+opts="start stop save reload"
+
+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 $?
+}
+
+save() {
+	ebegin "Saving isdnctrl configuration"
+
+	isdnctrl writeconf ${ISDNCTRL_SAVE} >/dev/null
+
+	eend $?
+}
+
+stop() {
+	ebegin "Unloading isdnctrl configuration"
+
+	isdnctrl reset force >/dev/null
+
+	eend $?
+}
diff --git a/net-dialup/isdn4k-utils/files/20041024/net.ippp0 b/net-dialup/isdn4k-utils/files/20041024/net.ippp0
new file mode 100644
index 000000000000..76e913707f67
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/net.ippp0
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/20041024/net.ippp0,v 1.1 2004/11/07 17:30:20 mrness 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/20041024/options.ippp0 b/net-dialup/isdn4k-utils/files/20041024/options.ippp0
new file mode 100644
index 000000000000..13983f19ee96
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/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/20041024/pathfix.patch b/net-dialup/isdn4k-utils/files/20041024/pathfix.patch
new file mode 100644
index 000000000000..1b5c0bdd5d17
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/pathfix.patch
@@ -0,0 +1,20 @@
+--- isdn.conf.install   2004-03-19 13:53:59.000000000 +0100
++++ isdn.conf   2004-03-19 13:54:48.000000000 +0100
+@@ -24,12 +24,12 @@
+ CHARGEMAX       = 50.00
+ CURRENCY = 0.062,EUR
+
+-COUNTRYFILE = /usr/lib/isdn/country.dat
++COUNTRYFILE = /usr/share/isdn/country.dat
+ RATECONF= /etc/isdn/rate.conf
+-RATEFILE= /usr/lib/isdn/rate-de.dat
+-HOLIDAYS= /usr/lib/isdn/holiday-de.dat
+-ZONEFILE= /usr/lib/isdn/zone-de-%s.cdb
+-DESTFILE= /usr/lib/isdn/dest.cdb
++RATEFILE= /usr/share/isdn/rate-de.dat
++HOLIDAYS= /usr/share/isdn/holiday-de.dat
++ZONEFILE= /usr/share/isdn/zone-de-%s.cdb
++DESTFILE= /usr/share/isdn/dest.cdb
+
+ # providerselect
+ VBN = 010:01900
diff --git a/net-dialup/isdn4k-utils/files/20041024/vbox-makefile.am.patch b/net-dialup/isdn4k-utils/files/20041024/vbox-makefile.am.patch
new file mode 100644
index 000000000000..226262112f89
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/20041024/vbox-makefile.am.patch
@@ -0,0 +1,24 @@
+--- vboxgetty/examples/scripts/Makefile.am.orig	2004-09-24 11:14:08.044455472 +0930
++++ vboxgetty/examples/scripts/Makefile.am	2004-09-24 11:14:38.451386288 +0930
+@@ -14,6 +14,6 @@
+ ## Local install routines ################################################
+ 
+ install-data-local:
+-			  $(mkinstalldirs) $(pkgdatadir)/tcl
+-			  $(INSTALL) -m 644 initmodem.tcl $(pkgdatadir)/tcl/
+-			  $(INSTALL) -m 644 answercall.tcl $(pkgdatadir)/tcl/
++			  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/tcl
++			  $(INSTALL) -m 644 initmodem.tcl $(DESTDIR)$(pkgdatadir)/tcl/
++			  $(INSTALL) -m 644 answercall.tcl $(DESTDIR)$(pkgdatadir)/tcl/
+--- vboxgetty/examples/Makefile.am.orig	2004-09-24 11:27:49.756751152 +0930
++++ vboxgetty/examples/Makefile.am	2004-09-24 11:27:08.663145584 +0930
+@@ -18,6 +18,6 @@
+ ## Local install routines ################################################
+ 
+ install-data-local:
+-			  $(mkinstalldirs) $(sysconfdir)
+-			  $(INSTALL) -m 664 vboxgetty.conf $(sysconfdir)
+-			  $(INSTALL) -m 664 vboxcallerid.conf $(sysconfdir)
++			  $(mkinstalldirs) $(DESTDIR)/$(sysconfdir)
++			  $(INSTALL) -m 664 vboxgetty.conf $(DESTDIR)/$(sysconfdir)
++			  $(INSTALL) -m 664 vboxcallerid.conf $(DESTDIR)/$(sysconfdir)
diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-20041024 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-20041024
new file mode 100644
index 000000000000..50734554dc2d
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-20041024
@@ -0,0 +1,2 @@
+MD5 453e6ca8812555d96fe3e840c89b15a8 isdn4k-utils-CVS-2004-10-24.tar.bz2 5508166
+MD5 dec7c96a6b3e8aa524bf0bcbae1f8af7 vbox3_0.1.9.tar.gz 105619
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-20041024.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-20041024.ebuild
new file mode 100644
index 000000000000..7ac0cc93ddff
--- /dev/null
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-20041024.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-20041024.ebuild,v 1.1 2004/11/07 17:30:20 mrness Exp $
+
+inherit eutils
+
+IUSE="X"
+VBOX_V=0.1.9
+MY_PV=${PN}-CVS-2004-10-24
+S=${WORKDIR}/${MY_PV}
+DESCRIPTION="ISDN-4-Linux Utils"
+SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_PV}.tar.bz2
+	http://smarden.org/pape/vbox3/vbox3_${VBOX_V}.tar.gz"
+HOMEPAGE="http://www.isdn4linux.de/"
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~alpha"
+LICENSE="GPL-2"
+
+RDEPEND=">=sys-apps/portage-2.0.47-r10
+	virtual/libc
+	sys-libs/ncurses
+	sys-libs/gdbm
+	dev-lang/tcl
+	X? (
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	sys-devel/libtool
+	sys-devel/automake"
+
+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}
+
+	# fix for 2.6 headers
+	find . -name \*.c | xargs sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
+
+	# 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
+	epatch ${FILESDIR}/${PVR}/gentoo.patch
+
+	# disabling device creation the easy way:
+	echo "#!/bin/bash" > scripts/makedev.sh
+	echo "true" >> scripts/makedev.sh
+
+	for x in capi20 capiinfo capiinit ../vbox3-${VBOX_V}
+	do
+		cd ${S}/${x}
+		[ -f ltmain.sh ] && libtoolize --force
+		rm -f missing
+		aclocal
+		automake --add-missing
+		autoconf
+	done
+
+	cd ${WORKDIR}/vbox3-${VBOX_V}
+	epatch ${FILESDIR}/${PVR}/vbox-makefile.am.patch || die "failed to patch vbox"
+}
+
+src_compile() {
+	make subconfig || die
+	make || die
+
+	cd ${S}/../vbox3-${VBOX_V}
+	econf || die "econf failed"
+	emake || die
+}
+
+src_install() {
+	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
+
+	cd ${S}/../vbox3-${VBOX_V}
+	einstall || die "cannot install vbox3"
+
+	cd ${D}/etc/isdn
+	epatch ${FILESDIR}/${PVR}/pathfix.patch || die
+}
+
+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
+
+}