diff options
| -rw-r--r-- | net-dialup/isdn4k-utils/ChangeLog | 10 | ||||
| -rw-r--r-- | net-dialup/isdn4k-utils/Manifest | 66 | ||||
| -rw-r--r-- | net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-down | 37 | ||||
| -rw-r--r-- | net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-up | 42 | ||||
| -rw-r--r-- | net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild | 4 | ||||
| -rw-r--r-- | net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild | 4 | ||||
| -rw-r--r-- | net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild | 10 |
7 files changed, 49 insertions, 124 deletions
diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog index cf67a69535cb..debf2b7b7293 100644 --- a/net-dialup/isdn4k-utils/ChangeLog +++ b/net-dialup/isdn4k-utils/ChangeLog @@ -1,6 +1,12 @@ # 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.35 2004/12/23 22:12:34 mrness Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.36 2005/02/06 09:43:58 mrness Exp $ + + 06 Feb 2005; Alin Nastac <mrness@gentoo.org> + -files/3.6_pre20041219/ip-down, -files/3.6_pre20041219/ip-up, + isdn4k-utils-3.6_pre20041219.ebuild: + Remove ip-up & ip-down scripts - using net-dialup/ppp scripts instead. Mark + as stable on x86. See bug #76641. *isdn4k-utils-3.6_pre20041219 (24 Dec 2004) diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest index ea247da8a61f..6d17181b3e88 100644 --- a/net-dialup/isdn4k-utils/Manifest +++ b/net-dialup/isdn4k-utils/Manifest @@ -1,55 +1,53 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0ad0aa6529bec5777e88eb44369c41aa ChangeLog 9021 -MD5 3e1f2a62b125bc976d086e9f6c596aa0 isdn4k-utils-3.2_p1-r2.ebuild 2932 +MD5 e72ee0867ed718d685a58f0aa37a8f6f isdn4k-utils-3.5_pre20041110-r3.ebuild 6742 +MD5 727cf41752f32b83ffeb3cac8f1936e3 isdn4k-utils-3.2_p1-r2.ebuild 2927 +MD5 7c4e6e357cbc95414316b1d0619fce42 isdn4k-utils-3.6_pre20041219.ebuild 7090 +MD5 9d0379b032cf7793cf0278844ae21f4d ChangeLog 9286 MD5 bab835f739889e139f5acaf397d3d875 metadata.xml 215 -MD5 4c3fa8046ef0b40f78a445858d682c8d isdn4k-utils-3.5_pre20041110-r3.ebuild 6742 -MD5 ca14583155c39628da877c5f4d9861a7 isdn4k-utils-3.6_pre20041219.ebuild 7116 -MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73 MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977 +MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73 MD5 8de88f6cf872f012abe1e320b3fb4336 files/digest-isdn4k-utils-3.5_pre20041110-r3 81 MD5 6896aa81dfefd061abda1c5a4e6576a0 files/digest-isdn4k-utils-3.6_pre20041219 81 -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 -MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.2_p1-r2/isdn4linux.conf 105 -MD5 875eb1dbe150bbae5bcdd6ae554f20c5 files/3.2_p1-r2/isdn4linux.init 718 -MD5 5d46112f6ebccecdb14e2812d2e348f2 files/3.2_p1-r2/net.ippp0 2426 -MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443 -MD5 98b8b7e16fd9a5a7f33ebd09d112a637 files/3.5_pre20041110/net.ippp0 2410 +MD5 b49a72df686b7a94d7ac291a91f20fc5 files/3.5_pre20041110/ioptions 323 +MD5 38984b8cf470784c9052f566b4faa5d8 files/3.5_pre20041110/ip-up 1105 +MD5 077c13d881acae71e88763ffc42b7015 files/3.5_pre20041110/isdnlog.logrotated 439 +MD5 02118ba89fc41144086224482bff7422 files/3.5_pre20041110/options.ippp0 685 MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.5_pre20041110/config 2693 +MD5 02eb09752af937202a4dc000bcb1caf0 files/3.5_pre20041110/isdnlog.conf 414 MD5 b729cb8e840e3d8d19aa8628f04cf948 files/3.5_pre20041110/isdnlog.init 1046 +MD5 98b8b7e16fd9a5a7f33ebd09d112a637 files/3.5_pre20041110/net.ippp0 2410 MD5 6db07967fecf59be29521a38d433da1f files/3.5_pre20041110/isdn.conf 698 MD5 2c3d7ec38577340f0bbf130c15e62ff6 files/3.5_pre20041110/isdn.init 1684 -MD5 02eb09752af937202a4dc000bcb1caf0 files/3.5_pre20041110/isdnlog.conf 414 -MD5 077c13d881acae71e88763ffc42b7015 files/3.5_pre20041110/isdnlog.logrotated 439 -MD5 b49a72df686b7a94d7ac291a91f20fc5 files/3.5_pre20041110/ioptions 323 MD5 b75b68506a43d3d897d7b32eb280b42e files/3.5_pre20041110/ip-down 956 -MD5 38984b8cf470784c9052f566b4faa5d8 files/3.5_pre20041110/ip-up 1105 -MD5 02118ba89fc41144086224482bff7422 files/3.5_pre20041110/options.ippp0 685 +MD5 92412760dfacc81cfac908d522ac8e39 files/3.2_p1-r2/ioptions 86 +MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.2_p1-r2/isdn4linux.conf 105 +MD5 875eb1dbe150bbae5bcdd6ae554f20c5 files/3.2_p1-r2/isdn4linux.init 718 +MD5 6ed9643d1d6b7e57adadee4dd28ea81a files/3.2_p1-r2/ip-up 115 +MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383 +MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443 +MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405 +MD5 5d46112f6ebccecdb14e2812d2e348f2 files/3.2_p1-r2/net.ippp0 2426 +MD5 49ffb48689897498866cc14687831e08 files/3.2_p1-r2/ip-down.ippp0 228 +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 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 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685 MD5 cd0fb0c848a80ea2f686b351f73b96b0 files/3.6_pre20041219/config 2693 +MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188 MD5 70260eb2e7f6faaa5698ab95b125f4b0 files/3.6_pre20041219/net.ippp0 2410 -MD5 ae970ec0c32e13878655a581742629b8 files/3.6_pre20041219/options.ippp0 685 MD5 0ead941effdcf6061c864112d4a68ccb files/3.6_pre20041219/isdn.confd 500 -MD5 9c63ee81524f51cd1b9f419f00708195 files/3.6_pre20041219/hisax.usermap 188 -MD5 a130607607ec0e1e2cd76a19b35c616f files/3.6_pre20041219/isdn.blacklist 520 -MD5 3f7c76a6d63f3677b81157bf9a7e84cd files/3.6_pre20041219/isdnlog.initd 1047 -MD5 8c05ad5c213cfb5ad62cbd67ea0f2c0c files/3.6_pre20041219/isdnlog.logrotated 438 -MD5 875318ba2ae375b068d0c7a7c1607e52 files/3.6_pre20041219/ioptions 323 +MD5 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410 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 229cfd79f14eb291f6bb46b1275d4e0c files/3.6_pre20041219/isdn.initd 2410 -MD5 5a554e2a04b9e11bb5bea839213bf97c files/3.6_pre20041219/ip-down 931 -MD5 054b3958fe0cfda4ac1420846fcc7a4b files/3.6_pre20041219/ip-up 1081 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBy0Lcjtv59x0+BrURAvmWAKD3/F1XLygLfdm3YpzAMopMrswZqACePeIx -i6DIwqb9wHE+ojyOnduv23w= -=g8pe +iD8DBQFCBebojiC39V7gKu0RAnQSAKCtPua/VPUXY+7TdyGhwkxX0kHqkgCg0fnn +NpZGSUEzCpiJ5ZdlOMsswvM= +=B8EB -----END PGP SIGNATURE----- diff --git a/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-down b/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-down deleted file mode 100644 index 77e05655a585..000000000000 --- a/net-dialup/isdn4k-utils/files/3.6_pre20041219/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 "$@" diff --git a/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-up b/net-dialup/isdn4k-utils/files/3.6_pre20041219/ip-up deleted file mode 100644 index 29719562096f..000000000000 --- a/net-dialup/isdn4k-utils/files/3.6_pre20041219/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 0644 /etc/resolv.conf - chown root:root /etc/resolv.conf - - fi - -fi - -[ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local "$@" 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 index cc193c3eaa7b..c3c6391e472b 100644 --- a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild +++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-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/isdn4k-utils/isdn4k-utils-3.2_p1-r2.ebuild,v 1.13 2004/12/02 12:47:17 dragonheart Exp $ +# $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 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 index 22e5776f3522..8fe68125dbd8 100644 --- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild +++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.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/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r3.ebuild,v 1.1 2004/12/03 18:45:00 mrness Exp $ +# $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 diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild index 514cf7dbd59d..84ff3bd40f50 100644 --- a/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild +++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.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/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild,v 1.1 2004/12/23 22:12:34 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.6_pre20041219.ebuild,v 1.2 2005/02/06 09:43:58 mrness Exp $ inherit eutils @@ -11,7 +11,7 @@ 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" +KEYWORDS="x86 ~amd64 ~alpha" LICENSE="GPL-2" IUSE="X unicode" SLOT="0" @@ -23,7 +23,8 @@ DEPEND="virtual/linux-sources dev-lang/tcl X? ( virtual/x11 )" RDEPEND="${DEPEND} - virtual/modutils" + virtual/modutils + net-dialup/ppp" S="${WORKDIR}/${MY_P}" @@ -159,7 +160,6 @@ src_install() { # install example ippp scripts and configs exeinto /etc/ppp insinto /etc/ppp - doexe ${FILESDIR}/${PV}/{ip-up,ip-down} doins ${FILESDIR}/${PV}/{ioptions,options.ippp0} # install example isdn configs |