diff options
author | Alin Năstac <mrness@gentoo.org> | 2005-02-23 05:52:20 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2005-02-23 05:52:20 +0000 |
commit | 0da46bcb4de8f52d6cdfe1ac8349b44b98be1582 (patch) | |
tree | 34e3925d9ddbe8a984324d33ab2e59ed57780cea | |
parent | version bump (bug #82906) - patch from David Bailey (diff) | |
download | gentoo-2-0da46bcb4de8f52d6cdfe1ac8349b44b98be1582.tar.gz gentoo-2-0da46bcb4de8f52d6cdfe1ac8349b44b98be1582.tar.bz2 gentoo-2-0da46bcb4de8f52d6cdfe1ac8349b44b98be1582.zip |
remove obsolete versions, fix net.ippp0 and check for PPP kernel support (#82993)
(Portage version: 2.0.51-r15)
31 files changed, 40 insertions, 1355 deletions
diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog index 666427ae02e8..0efd71ec9760 100644 --- a/net-dialup/isdn4k-utils/ChangeLog +++ b/net-dialup/isdn4k-utils/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for net-dialup/isdn4k-utils # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.38 2005/02/17 22:27:58 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.39 2005/02/23 05:52:20 mrness Exp $ + +*isdn4k-utils-3.6_pre20041219-r1 (23 Feb 2005) + + 23 Feb 2005; Alin Nastac <mrness@gentoo.org> -files/gcc33-multiline.patch, + -files/3.2_p1-r2/config, -files/3.2_p1-r2/gentoo.patch, + -files/3.2_p1-r2/ioptions, -files/3.2_p1-r2/ip-down.ippp0, + -files/3.2_p1-r2/ip-up, -files/3.2_p1-r2/isdn4linux.conf, + -files/3.2_p1-r2/isdn4linux.init, -files/3.2_p1-r2/net.ippp0, + -files/3.2_p1-r2/options.ippp0, -files/3.5_pre20041110/config, + -files/3.5_pre20041110/config.old, -files/3.5_pre20041110/ioptions, + -files/3.5_pre20041110/ip-down, -files/3.5_pre20041110/ip-up, + -files/3.5_pre20041110/isdn.conf, -files/3.5_pre20041110/isdn.init, + -files/3.5_pre20041110/isdnlog.conf, -files/3.5_pre20041110/isdnlog.init, + -files/3.5_pre20041110/isdnlog.logrotated, + -files/3.5_pre20041110/net.ippp0, -files/3.5_pre20041110/options.ippp0, + files/3.6_pre20041219/net.ippp0, -isdn4k-utils-3.2_p1-r2.ebuild, + -isdn4k-utils-3.5_pre20041110-r3.ebuild, + +isdn4k-utils-3.6_pre20041219-r1.ebuild, + -isdn4k-utils-3.6_pre20041219.ebuild: + Remove obsolete versions, fix net.ippp0 script and check for PPP kernel + support (#82993). 17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> isdn4k-utils-3.6_pre20041219.ebuild: diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest index 129233b16a1a..10d06e08460a 100644 --- a/net-dialup/isdn4k-utils/Manifest +++ b/net-dialup/isdn4k-utils/Manifest @@ -1,53 +1,20 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 bab835f739889e139f5acaf397d3d875 metadata.xml 215 MD5 063e543fece01b5d6395f3fcb2a45811 isdn4k-utils-3.6_pre20041219.ebuild 7088 -MD5 e72ee0867ed718d685a58f0aa37a8f6f isdn4k-utils-3.5_pre20041110-r3.ebuild 6742 MD5 8b75fbdb193232d98087d6ddc7e6e47b ChangeLog 9530 -MD5 727cf41752f32b83ffeb3cac8f1936e3 isdn4k-utils-3.2_p1-r2.ebuild 2927 -MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977 -MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73 +MD5 bab835f739889e139f5acaf397d3d875 metadata.xml 215 +MD5 27d508de58d42c29394eb99a97d00dc0 isdn4k-utils-3.6_pre20041219-r1.ebuild 7143 +MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219-r1 81 MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219 81 -MD5 8de88f6cf872f012abe1e320b3fb4336 files/digest-isdn4k-utils-3.5_pre20041110-r3 81 -MD5 38984b8cf470784c9052f566b4faa5d8 files/3.5_pre20041110/ip-up 1105 -MD5 b75b68506a43d3d897d7b32eb280b42e files/3.5_pre20041110/ip-down 956 -MD5 6db07967fecf59be29521a38d433da1f files/3.5_pre20041110/isdn.conf 698 -MD5 b729cb8e840e3d8d19aa8628f04cf948 files/3.5_pre20041110/isdnlog.init 1046 -MD5 b49a72df686b7a94d7ac291a91f20fc5 files/3.5_pre20041110/ioptions 323 -MD5 98b8b7e16fd9a5a7f33ebd09d112a637 files/3.5_pre20041110/net.ippp0 2410 -MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.5_pre20041110/config 2693 -MD5 02118ba89fc41144086224482bff7422 files/3.5_pre20041110/options.ippp0 685 -MD5 02eb09752af937202a4dc000bcb1caf0 files/3.5_pre20041110/isdnlog.conf 414 -MD5 2c3d7ec38577340f0bbf130c15e62ff6 files/3.5_pre20041110/isdn.init 1684 -MD5 077c13d881acae71e88763ffc42b7015 files/3.5_pre20041110/isdnlog.logrotated 439 +MD5 f26cdb4ad4237c11b371a7dcb2d89d17 files/3.6_pre20041219/isdnlog.confd 415 MD5 3f7c76a6d63f3677b81157bf9a7e84cd files/3.6_pre20041219/isdnlog.initd 1047 MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323 -MD5 70260eb2e7f6faaa5698ab95b125f4b0 files/3.6_pre20041219/net.ippp0 2410 -MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693 +MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438 +MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817 MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520 -MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500 MD5 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685 -MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341 -MD5 39cf852699d3cdf350856fad76452352 files/3.6_pre20041219/hisax.initd 5817 -MD5 f26cdb4ad4237c11b371a7dcb2d89d17 files/3.6_pre20041219/isdnlog.confd 415 -MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752 +MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693 MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188 +MD5 a220ed33e5b5b93dcb1066a97dafc6e6 files/3.6_pre20041219/net.ippp0 2428 +MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500 MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410 -MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438 -MD5 6ed9643d1d6b7e57adadee4dd28ea81a files/3.2_p1-r2/ip-up 115 -MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.2_p1-r2/isdn4linux.conf 105 -MD5 92412760dfacc81cfac908d522ac8e39 files/3.2_p1-r2/ioptions 86 -MD5 5d46112f6ebccecdb14e2812d2e348f2 files/3.2_p1-r2/net.ippp0 2426 -MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405 -MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383 -MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443 -MD5 875eb1dbe150bbae5bcdd6ae554f20c5 files/3.2_p1-r2/isdn4linux.init 718 -MD5 49ffb48689897498866cc14687831e08 files/3.2_p1-r2/ip-down.ippp0 228 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCFRqRugEuf3OQ0akRAgayAJ44MO30zVu7R/ZRxHM/Mf5ZK9pBpwCfY+HA -8YRDl1upH7YdiN+DuR6Xma8= -=2Q/k ------END PGP SIGNATURE----- +MD5 673179cfabf5a9839cfbf81bc2eeb34e files/3.6_pre20041219/hisax.conf 1341 +MD5 a077770a61b46a7dbedad0213e5b14c3 files/3.6_pre20041219/auerswald.usermap 752 diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r2/config b/net-dialup/isdn4k-utils/files/3.2_p1-r2/config deleted file mode 100644 index f1ac95d55ffc..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/config +++ /dev/null @@ -1,120 +0,0 @@ -# -# 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=y -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/3.2_p1-r2/gentoo.patch b/net-dialup/isdn4k-utils/files/3.2_p1-r2/gentoo.patch deleted file mode 100644 index 87e2e1d63c21..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/gentoo.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 -@@ -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 -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 -@@ -20,13 +20,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/3.2_p1-r2/ioptions b/net-dialup/isdn4k-utils/files/3.2_p1-r2/ioptions deleted file mode 100644 index 39cd232ddaba..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/ioptions +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index b0db4825ccd0..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-down.ippp0 +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index e84dea974285..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/ip-up +++ /dev/null @@ -1,5 +0,0 @@ -#!/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 deleted file mode 100644 index 9c37494ca519..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.conf +++ /dev/null @@ -1,3 +0,0 @@ -# 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 deleted file mode 100644 index e0a9f62bcdb2..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/isdn4linux.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/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/3.2_p1-r2/isdn4linux.init,v 1.6 2004/09/27 12:56:17 dragonheart 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/3.2_p1-r2/net.ippp0 b/net-dialup/isdn4k-utils/files/3.2_p1-r2/net.ippp0 deleted file mode 100644 index 8dc61a98a86d..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/net.ippp0 +++ /dev/null @@ -1,101 +0,0 @@ -#!/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/3.2_p1-r2/net.ippp0,v 1.4 2004/07/14 23:16:01 agriffis 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 deleted file mode 100644 index 13983f19ee96..000000000000 --- a/net-dialup/isdn4k-utils/files/3.2_p1-r2/options.ippp0 +++ /dev/null @@ -1,25 +0,0 @@ -# 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/3.5_pre20041110/config b/net-dialup/isdn4k-utils/files/3.5_pre20041110/config deleted file mode 100644 index f22ecec7e525..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/config +++ /dev/null @@ -1,132 +0,0 @@ -# -# Automatically generated by make menuconfig: don't edit -# - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y - -# -# General configuration -# -CONFIG_BUILDX11=y -CONFIG_KERNELDIR='/usr/src/linux' -CONFIG_BINDIR='/usr/bin' -CONFIG_SBINDIR='/usr/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_ISDNCTRL_DWABC_UDP_INFO=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 -CONFIG_LOOPCTRL=y -# CONFIG_LOOPCTRL_DEBUG is not set - -# -# 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/isdn restart' -CONFIG_ISDNLOG_STOPCMD='/etc/init.d/isdn stop' -CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' -CONFIG_ISDNLOG_DOCDIR='' -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_ISDN_LOG_DEST_BE=y -CONFIG_ISDN_LOG_DEST_CN=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_IPPP_FILTER=y -# CONFIG_IPPPD_RADIUS is not set -# CONFIG_RADIUS_WTMP_LOGGING is not set -RADIUS_CLIENT_CONFIG_FILE='' -# CONFIG_CAPIFAX is not set -# CONFIG_RCAPID is not set -# CONFIG_PPPDCAPIPLUGIN is not set -CONFIG_EUROFILE=y - -# -# Options for eurofile -# -CONFIG_EFTD=y -CONFIG_EFTD_WUAUTH=y -CONFIG_EFTD_SERVER_MSN='' -# CONFIG_EFT_INSTALL_EFTD_SH is not set -CONFIG_EFTP=y -CONFIG_EFTP_READLINE=y -# CONFIG_EFTP_SETUID is not set -CONFIG_EFTP_CLIENT_MSN='' -CONFIG_EFT_INSTALL_CONF=y - -# -# Documentation -# -CONFIG_GENMAN=y -# CONFIG_FAQ is not set diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/config.old b/net-dialup/isdn4k-utils/files/3.5_pre20041110/config.old deleted file mode 100644 index d67d3163a1eb..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/config.old +++ /dev/null @@ -1,91 +0,0 @@ -# -# Automatically generated by make menuconfig: don't edit -# - -# -# Code maturity level options -# -CONFIG_EXPERIMENTAL=y - -# -# General configuration -# -CONFIG_BUILDX11=y -CONFIG_KERNELDIR='/usr/src/linux' -CONFIG_BINDIR='/usr/bin' -CONFIG_SBINDIR='/usr/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_ISDNCTRL_DWABC_UDP_INFO=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 -CONFIG_LOOPCTRL=y -# CONFIG_LOOPCTRL_DEBUG is not set - -# -# Tools for monitoring activity -# -CONFIG_IMON=y -CONFIG_IMONTTY=y -# CONFIG_ISDNLOG is not set -# CONFIG_IPPPSTATS is not set -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 is not set -# CONFIG_CAPIFAX is not set -# CONFIG_RCAPID is not set -# CONFIG_PPPDCAPIPLUGIN is not set -# CONFIG_EUROFILE is not set - -# -# Options for eurofile -# -# CONFIG_EFTD is not set -# CONFIG_EFTP is not set -# CONFIG_EFT_INSTALL_CONF is not set - -# -# Documentation -# -CONFIG_GENMAN=y -# CONFIG_FAQ is not set diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ioptions b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ioptions deleted file mode 100644 index 844c62029e0e..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ioptions +++ /dev/null @@ -1,6 +0,0 @@ -# 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/3.5_pre20041110/ioptions,v 1.1 2004/11/22 20:05:39 mrness Exp $ - -# System-wide configuration for ipppd. -# Normally, put all options into options.ipppX diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-down b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-down deleted file mode 100644 index 52ae93395c14..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-down +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -# this is a script which is executed after disconnecting the ppp interface. -# look at man pppd for details - -# the followings parameters are available: -# $1 = interface-name -# $2 = tty-device -# $3 = speed -# $4 = local-IP-address -# $5 = remote-IP-address -# $6 = ipparam - -if [ "$USEPEERDNS" ]; then - - # taken from debian's 0000usepeerdns - # follow any symlink to find the real file - REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf) - - if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then - - # if an old resolv.conf file exists, restore it - if [ -e $REALRESOLVCONF.pppd-backup ]; then - mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF - fi - - fi - -fi - -# Recreate the default route so autodial works -[ -s /etc/conf.d/net ] && . /etc/conf.d/net -if [ -n "${gateway}" ] && [ "${gateway%/*}" = "$1" ]; then - /sbin/route add default dev ${gateway%/*} -fi - -[ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local "$1" "$2" "$3" "$4" "$5" "$6" diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-up b/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-up deleted file mode 100644 index 4f16ae3220f6..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/ip-up +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# this is a script which is executed after connecting the ppp interface. -# look at man pppd for details - -# the followings parameters are available: -# $1 = interface-name -# $2 = tty-device -# $3 = speed -# $4 = local-IP-address -# $5 = remote-IP-address -# $6 = ipparam - -if [ "$USEPEERDNS" ]; then - - # add the server supplied DNS entries to /etc/resolv.conf - # (taken from debian's 0000usepeerdns) - - # follow any symlink to find the real file - REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf) - - if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then - - # merge the new nameservers with the other options from the old configuration - { - grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF - cat /etc/ppp/resolv.conf - } > $REALRESOLVCONF.tmp - - # backup the old configuration and install the new one - cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup - mv $REALRESOLVCONF.tmp $REALRESOLVCONF - - # correct permissions - chmod 644 /etc/resolv.conf - chown root:root /etc/resolv.conf - - fi - -fi - -[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local "$1" "$2" "$3" "$4" "$5" "$6" diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.conf b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.conf deleted file mode 100644 index 36e778c9f30b..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.conf +++ /dev/null @@ -1,22 +0,0 @@ -# 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/3.5_pre20041110/isdn.conf,v 1.1 2004/11/22 20:05:39 mrness Exp $ - -# Location where isdnctrl will save its configuration -ISDNCTRL_CONFIG="/var/lib/isdn/isdnctrl.conf" - -# Location where iprofd will save the modem-register settings -# comment out if you don't want to use iprofd -IPROFD_SETTINGS="/var/lib/isdn/modem-register.dat" - -# ISDN drivers to load via modprobe <driver> <params> -# comment out to disable - -ISDN_DRIVER_0="capidrv" -ISDN_PARAMS_0="" - -# ISDN_DRIVER_1="" -# ISDN_PARAMS_1="" - -# ISDN_DRIVER_2="" -# ISDN_PARAMS_2="" diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.init b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.init deleted file mode 100644 index 28a206f47286..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdn.init +++ /dev/null @@ -1,68 +0,0 @@ -#!/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/3.5_pre20041110/isdn.init,v 1.1 2004/11/22 20:05:39 mrness Exp $ - -opts="start stop save reload info show" - -depend() { - use pcmcia capi -} - -start() { - local i=0 - while true; do - local DRIVER=$(eval echo "\$ISDN_DRIVER_${i}") - local PARAMS=$(eval echo "\$ISDN_PARAMS_${i}") - [ -z "${DRIVER}" ] && break - if ! /bin/grep -q "^${DRIVER} " /proc/modules ; then - ebegin "Loading ISDN driver ${DRIVER}" - /sbin/modprobe ${DRIVER} ${PARAMS} &>/dev/null - eend $? - fi - : $((i++)) - done - - ebegin "Loading isdnctrl configuration" - [ ! -f "${ISDNCTRL_CONFIG}" ] || /usr/sbin/isdnctrl readconf "${ISDNCTRL_CONFIG}" >/dev/null - eend $? - - if [ -n "${IPROFD_SETTINGS}" ]; then - ebegin "Starting modem-register daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/iprofd -- "${IPROFD_SETTINGS}" - eend $? - fi -} - -stop() { - if [ -n "${IPROFD_SETTINGS}" ]; then - ebegin "Stopping modem-register daemon" - start-stop-daemon --stop --quiet --retry 5 --exec /usr/sbin/iprofd - eend $? - fi - - ebegin "Unloading isdnctrl configuration" - /usr/sbin/isdnctrl reset force >/dev/null - eend $? -} - -save() { - ebegin "Saving isdnctrl configuration" - /usr/sbin/isdnctrl writeconf "${ISDNCTRL_CONFIG}" >/dev/null - eend $? -} - -reload() { - ebegin "Reloading isdnctrl configuration" - /usr/sbin/isdnctrl reset >/dev/null - [ ! -f "${ISDNCTRL_CONFIG}" ] || /usr/sbin/isdnctrl readconf "${ISDNCTRL_CONFIG}" >/dev/null - eend $? -} - -info() { - /usr/sbin/isdnctrl status all -} - -show() { - /usr/sbin/isdnctrl list all -} diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.conf b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.conf deleted file mode 100644 index 43945f39fa4c..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.conf +++ /dev/null @@ -1,10 +0,0 @@ -# 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/3.5_pre20041110/isdnlog.conf,v 1.1 2004/11/22 20:05:39 mrness Exp $ - -# here you can add some switches not covered by the -# corresponding /etc/isdnlog.options.contrX file. -# -# see "man (8) isdnlog" for further informations - -ISDNLOG_OPTIONS="" diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.init b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.init deleted file mode 100644 index be5a086e72f6..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.init +++ /dev/null @@ -1,33 +0,0 @@ -#!/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/3.5_pre20041110/isdnlog.init,v 1.1 2004/11/22 20:05:39 mrness Exp $ - -opts="start stop" - -depend() { - need isdn -} - -start() { - local CONTR="${myservice#*.contr}" CTRL=$((CONTR * 2)) - local CONFIG="/etc/isdn/isdnlog.isdnctrl${CTRL}.options" - [ -e "$CONFIG" ] || CONFIG="/etc/isdn/isdnlog.options.contr${CONTR}" - - if [ ! -e "$CONFIG" ] ; then - eerror "You're missing ${CONFIG}" - return 1 - fi - - ebegin "Starting ISDNLOG for controller #${CONTR}" - start-stop-daemon --start --quiet --pidfile "/var/run/isdnlog.isdnctrl${CTRL}.pid" \ - --exec /usr/sbin/isdnlog -- ${ISDNLOG_OPTIONS} -f "${CONFIG}" "/dev/isdnctrl${CTRL}" - eend $? -} - -stop() { - local CONTR="${myservice#*.contr}" CTRL=$((CONTR * 2)) - ebegin "Stopping ISDNLOG for controller #${CONTR}" - start-stop-daemon --stop --quiet --retry 5 --pidfile "/var/run/isdnlog.isdnctrl${CTRL}.pid" - eend $? -} diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.logrotated b/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.logrotated deleted file mode 100644 index 1b1e86166c3a..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/isdnlog.logrotated +++ /dev/null @@ -1,15 +0,0 @@ -# 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/3.5_pre20041110/isdnlog.logrotated,v 1.1 2004/11/22 20:05:39 mrness Exp $ -# -# isdnlog logrotate snippet for Gentoo Linux -# contributed by Stefan Briesenick - -/var/log/isdn.log { - compress - rotate 99 - size=4096k - notifempty - missingok - copytruncate -} diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0 b/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0 deleted file mode 100644 index b9828d1ada12..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0 +++ /dev/null @@ -1,100 +0,0 @@ -# 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/3.5_pre20041110/net.ippp0,v 1.2 2004/12/03 16:48:55 mrness Exp $ - -#NB: Config is in /etc/conf.d/net - -depend() { - need isdn -} - -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' - /usr/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.5_pre20041110/options.ippp0 b/net-dialup/isdn4k-utils/files/3.5_pre20041110/options.ippp0 deleted file mode 100644 index 9b1b431c655f..000000000000 --- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/options.ippp0 +++ /dev/null @@ -1,29 +0,0 @@ -# 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/3.5_pre20041110/options.ippp0,v 1.1 2004/11/22 20:05:39 mrness Exp $ - -# 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/3.6_pre20041219/net.ippp0 b/net-dialup/isdn4k-utils/files/3.6_pre20041219/net.ippp0 index b17f1dbf2a5b..fdb81f33037f 100644 --- a/net-dialup/isdn4k-utils/files/3.6_pre20041219/net.ippp0 +++ b/net-dialup/isdn4k-utils/files/3.6_pre20041219/net.ippp0 @@ -1,6 +1,7 @@ +#!/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/3.6_pre20041219/net.ippp0,v 1.1 2004/12/23 22:12:34 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/files/3.6_pre20041219/net.ippp0,v 1.2 2005/02/23 05:52:20 mrness Exp $ #NB: Config is in /etc/conf.d/net 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 deleted file mode 100644 index 6b0b9b465e32..000000000000 --- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.2_p1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 d347afa462e46eccfd1284aebae227b6 isdn4k-utils.v3.2p1.tar.bz2 5238737 diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r3 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r3 deleted file mode 100644 index 9a14b65cf8e9..000000000000 --- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 363efe6929db2fa4196b950c816edb1d isdn4k-utils-CVS-2004-11-10.tar.bz2 5511924 diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.6_pre20041219 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.6_pre20041219-r1 index d06a0598e7ea..d06a0598e7ea 100644 --- a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.6_pre20041219 +++ b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.6_pre20041219-r1 diff --git a/net-dialup/isdn4k-utils/files/gcc33-multiline.patch b/net-dialup/isdn4k-utils/files/gcc33-multiline.patch deleted file mode 100644 index 00c2fc429d30..000000000000 --- a/net-dialup/isdn4k-utils/files/gcc33-multiline.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ipppd/options.c.orig 2002-07-06 00:34:08.000000000 +0000 -+++ ipppd/options.c 2003-07-01 17:59:56.000000000 +0000 -@@ -479,26 +479,25 @@ - #define IMPLEMENTATION "" - #endif - --static char *usage_string = "\ --ipppd version %s patch level %d%s\n\ --Usage: %s [ options ], where options are:\n\ --\t<device> Communicate over the named device\n\ -+static char *usage_string = -+"ipppd version %s patch level %d%s\n" -+"Usage: %s [ options ], where options are:\n" -+"\t<device> Communicate over the named device\n" - #ifdef INCLUDE_OBSOLETE_FEATURES --\tcrtscts Use hardware RTS/CTS flow control\n\ --\t<speed> Set the baud rate to <speed>\n\ --\tmodem Use modem control lines\n\ -+"\tcrtscts Use hardware RTS/CTS flow control\n" -+"\t<speed> Set the baud rate to <speed>\n" -+"\tmodem Use modem control lines\n" - #endif --\t<loc>:<rem> Set the local and/or remote interface IP\n\ --\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\ --\tasyncmap <n> Set the desired async map to hex <n>\n\ --\tauth Require authentication from peer\n\ --\tconnect <p> Invoke shell command <p> to set up the serial line\n\ --\tdefaultroute Add default route through interface\n\ --\tfile <f> Take options from file <f>\n\ --\tmru <n> Set MRU value to <n> for negotiation\n\ --\tnetmask <n> Set interface netmask to <n>\n\ --See ipppd(8) for more options.\n\ --"; -+"\t<loc>:<rem> Set the local and/or remote interface IP\n" -+"\t\taddresses. (you also may use the option 'useifip' to get IPs).\n" -+"\tasyncmap <n> Set the desired async map to hex <n>\n" -+"\tauth Require authentication from peer\n" -+"\tconnect <p> Invoke shell command <p> to set up the serial line\n" -+"\tdefaultroute Add default route through interface\n" -+"\tfile <f> Take options from file <f>\n" -+"\tmru <n> Set MRU value to <n> for negotiation\n" -+"\tnetmask <n> Set interface netmask to <n>\n" -+"See ipppd(8) for more options.\n"; - - static char *current_option; /* the name of the option being parsed */ - 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 deleted file mode 100644 index c3c6391e472b..000000000000 --- a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# 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.14 2005/02/06 09:43:58 mrness Exp $ - -inherit eutils - -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 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" - -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 - epatch ${FILESDIR}/${PVR}/gentoo.patch - - #disabling device creation the easy way: - echo "#!/bin/bash" > scripts/makedev.sh - echo "true" >> scripts/makedev.sh - - epatch ${FILESDIR}/gcc33-multiline.patch -} - -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 - - - # ippdp.init script for the ebuild thinks ipppd should be in /sbin - dodir /sbin - mv ${D}/usr/sbin/ipppd ${D}/sbin/ipppd -} - -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 - -} diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild deleted file mode 100644 index 8fe68125dbd8..000000000000 --- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild,v 1.2 2005/02/06 09:43:58 mrness Exp $ - -inherit eutils - -MY_PV="${PV/*_pre/}" -MY_P="${PN}-CVS-${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="ISDN4Linux Utils" -SRC_URI="ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots/${MY_P}.tar.bz2" -HOMEPAGE="http://www.isdn4linux.de/" - -KEYWORDS="~x86 ~amd64 ~alpha" -LICENSE="GPL-2" -IUSE="X unicode" -SLOT="0" - -DEPEND="virtual/linux-sources - virtual/libc - sys-libs/ncurses - sys-libs/gdbm - dev-lang/tcl - X? ( virtual/x11 )" -RDEPEND="${DEPEND} - virtual/modutils" - -pkg_setup() { - # Get country code from I4L_CC variable - # default country: DE (Germany) - I4L_CC=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]") - [ -z "${I4L_CC}" ] && I4L_CC="DE" - I4L_CC_LOW=$(echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]") - - # Get language from I4L_LANG variable ('de' or 'en') - I4L_LANG=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]") - if [ -z "${I4L_LANG}" ]; then - case "${I4L_CC}" in - AT|CH|DE) - I4L_LANG="DE" - ;; - *) - I4L_LANG="EN" - ;; - esac - fi - [ "${I4L_LANG}" = "DE" -o "${I4L_LANG}" = "EN" ] || I4L_LANG="EN" -} - -src_unpack() { - unpack ${A} - cd ${S} - - # fix for 2.6 headers - find . -name "*.c" | \ - xargs -r sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g' - - # patch all Makefiles to use our CFLAGS - find . -name "Makefile*" | \ - xargs -r sed -i -e "s:^CFLAGS\(.*\)-O[26]:CFLAGS\1${CFLAGS}:g" \ - -e "s:^CFLAGS\(.*\)-g:CFLAGS\1${CFLAGS}:g" \ - -e "s:^CFLAGS = -Wall$:CFLAGS = ${CFLAGS}:g" || die "sed failed" - - # install our config - case "${I4L_CC}" in - DE|AT|NL|LU|CH) - # These countries are specially supported in the isdnlog source. - sed -e "s:^CONFIG_ISDN_LOG_XX=:CONFIG_ISDN_LOG_${I4L_CC}=:g" -e "s:^CONFIG_ISDN_LOG_CC=.*$:#:g" \ - -e "s:^\(CONFIG_ISDN_LOG_CC_\)..=:\1${I4L_LANG}=:g" < ${FILESDIR}/${PV}/config > .config || die "failed to modify .config" - ;; - *) - # Others get a generic isdnlog. - sed -e "s:^\(CONFIG_ISDN_LOG_CC=\).*$:\1'${I4L_CC_LOW}':g" \ - -e "s:^\(CONFIG_ISDN_LOG_CC_\)..=:\1${I4L_LANG}=:g" < ${FILESDIR}/${PV}/config > .config || die "failed to modify .config" - ;; - esac - - useq X || \ - sed -i -e "s:^CONFIG_BUILDX11=.*$:#:g" \ - -e "s:^CONFIG_XISDNLOAD=.*$:#:g" \ - -e "s:^CONFIG_XMONISDN=.*$:#:g" .config - - # Patch in order to make generic config for countries which are not known to isdnlog source - sed -i -e "s:\$(INSTALL_DATA) rate-:-\$(INSTALL_DATA) rate-:g" \ - -e "s:\$(INSTALL_DATA) holiday-:-\$(INSTALL_DATA) holiday-:g" isdnlog/Makefile.in - - # if specified, convert all relevant files from latin1 to UTF-8 - if useq unicode; then - for i in isdnlog/samples/{isdn,rate}.conf* isdnlog/*-{at,ch,de,no}.dat isdnlog/{Isdn,.country-alias}; do - iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~" - done - fi -} - -src_compile() { - make subconfig || die "make subconfig failed" - make || die "make failed" -} - -src_install() { - keepdir /var/lib/isdn - dodir /dev /etc/isdn /usr/bin /usr/sbin - make DESTDIR=${D} install || die "make install failed" - - # remove obsolete firmware files - rm -f ${D}/usr/share/isdn/{bip1120.btl,dnload.bin,ds4bri.bit,dspdload.bin} - rm -f ${D}/usr/share/isdn/{loadpg.bin,pc_??_ca.bin,prload.bin,te_????.*} - - # install docs (base) - dodoc NEWS README Mini-FAQ/isdn-faq.txt scripts/makedev.sh FAQ/_howto/xp* - - # install docs (ipppd) - docinto ipppd - dodoc LEGAL.ipppcomp ipppd/{README,README.*.ORIG,NOTES.IPPPD} ipppcomp/README.LZS # ipppd/README.RADIUS - docinto ipppd/example - dodoc FAQ/_example/*.txt - docinto ipppd/howto - dodoc FAQ/_howto/{dns*,i4l_ipx*,isdn*,lan*,leased*,masq*,mppp*,ppp*,route*} - - # install docs (isdnlog) - docinto isdnlog - dodoc isdnlog/{BUGS,FAQ,Isdn,NEWS,README*} FAQ/_howto/win* - docinto isdnlog/areacode - dodoc areacode/*.doc - docinto isdnlog/contrib/isdnbill - dodoc isdnlog/contrib/isdnbill/{*.isdnbill,*.gz} - docinto isdnlog/contrib/winpopup - dodoc isdnlog/contrib/winpopup/* - - # install docs (eft) - docinto eft - dodoc eurofile/{CHANGES,INSTALL,README*,TODO} - newdoc eurofile/src/wuauth/README README.AUTHLIB - docinto eft/scripts - dodoc eurofile/scripts/{eft_useradd,check_system,ix25test,eftd.sh,eftp.sh} - - # install init-scripts - exeinto /etc/init.d - newexe ${FILESDIR}/${PV}/isdn.init isdn - newexe ${FILESDIR}/${PV}/net.ippp0 net.ippp0 - newexe ${FILESDIR}/${PV}/isdnlog.init isdnlog.contr0 - - # install init-configs - insinto /etc/conf.d - newins ${FILESDIR}/${PV}/isdn.conf isdn - newins ${FILESDIR}/${PV}/isdnlog.conf isdnlog.contr0 - - # install example scripts and configs - exeinto /etc/ppp - insinto /etc/ppp - doexe ${FILESDIR}/${PV}/{ip-up,ip-down} - doins ${FILESDIR}/${PV}/{ioptions,options.ippp0} - - # install example configs - insinto /etc/isdn - doins isdnlog/samples/{isdn,rate}.conf.{at,de,lu,nl,no,pl} - newins isdnlog/samples/isdn.conf isdn.conf.unknown - if [ -f isdnlog/samples/isdn.conf.${I4L_CC_LOW} ]; then - newins isdnlog/samples/isdn.conf.${I4L_CC_LOW} isdn.conf - else - doins isdnlog/samples/isdn.conf - fi - if [ -f isdnlog/samples/rate.conf.${I4L_CC_LOW} ]; then - newins isdnlog/samples/rate.conf.${I4L_CC_LOW} rate.conf - fi - sed -i -e "s:/usr/lib/isdn/:/usr/share/isdn/:g" ${D}/etc/isdn/isdn.conf* - - # install sample provider script - exeinto /etc/isdn - doexe isdnlog/samples/provider - - # rename isdnlog options file - insinto /etc/isdn - mv -f ${D}/etc/isdn/isdnlog.isdnctrl0.options ${D}/etc/isdn/isdnlog.options.contr0 - - # install isdnlog data files - insinto /usr/share/isdn - doins isdnlog/*.dat - - # install logrotate configs - insinto /etc/logrotate.d - newins ${FILESDIR}/${PV}/isdnlog.logrotated isdnlog - - # ipppd module from sys-apps/baselayout thinks ipppd should be in /sbin; waiting #73067 to be solved - dodir /sbin - dosym /usr/sbin/ipppd /sbin/ipppd -} - -pkg_postinst() { - einfo - einfo "Please edit:" - einfo - einfo "- /etc/conf.d/isdn to contain your ISDN kernel modules" - einfo "- /etc/ppp/* critical if you need networking" - einfo - einfo "For isdnlog you should edit:" - einfo - einfo "- /etc/conf.d/isdnlog.contr0" - einfo "- /etc/isdn/isdnlog.options.contr0" - einfo "- /etc/isdn/*.conf" - einfo - einfo "/etc/init.d/isdn will save and restore your isdnctrl config." - einfo "it will also handle the modem-register daemon." - einfo - einfo "/etc/init.d/net.ippp0 will start synchronous PPP connections" - einfo "which you need to set up using isdnctrl first!" - einfo - einfo "/etc/init.d/isdnlog.contr0 starts and stops isdnlog for contr0" - einfo "You can symlink it to isdnlog.contr1 and copy the corresponding" - einfo "configs if you have more than one card." - einfo -} diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild index dc585f42cfe5..dcdc3b3692d5 100644 --- a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild +++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild,v 1.4 2005/02/17 22:27:58 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219-r1.ebuild,v 1.1 2005/02/23 05:52:20 mrness Exp $ -inherit eutils +inherit eutils linux-info MY_PV="${PV/*_pre/}" MY_P="${PN}-CVS-${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}" @@ -29,6 +29,9 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" pkg_setup() { + CONFIG_CHECK="PPP" + linux-info_pkg_setup + # Get country code from I4L_CC variable # default country: DE (Germany) I4L_CC=$(echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]") |