fixed path to ipppd in net.ippp0

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index aea0a5e9824a9d104d583bed8412c4bccaa8c8d6..c67991ca50b0df91c60d06d953498b0f4d68e026 100644 (file)
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2004/12/02 13:42:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.33 2004/12/03 16:48:55 mrness Exp $
+
+*isdn4k-utils-3.5_pre20041110-r2 (03 Dec 2004)
+
+  03 Dec 2004; Alin Nastac <mrness@gentoo.org>
+  files/3.5_pre20041110/net.ippp0, -isdn4k-utils-3.5_pre20041110-r1.ebuild,
+  +isdn4k-utils-3.5_pre20041110-r2.ebuild:
+  Fixed new path to ipppd in /etc/init.d/net.ippp0 script. See bug #73067.
 
 *isdn4k-utils-3.5_pre20041110-r1 (02 Dec 2004)
 

diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 6ee770be7f10c2f9d64c39981df796f5561cac2f..f08bc248d21d460956b74f5174a932cba57a2b4a 100644 (file)
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5f81f309c3ee3e4d1825ad199dc0d0aa ChangeLog 7837
+MD5 1b8a006954990ced9b9a1ad88b853501 ChangeLog 8122
 MD5 3e1f2a62b125bc976d086e9f6c596aa0 isdn4k-utils-3.2_p1-r2.ebuild 2932
 MD5 bab835f739889e139f5acaf397d3d875 metadata.xml 215
-MD5 d21e8fc9ea7f4cdbbb0e3f87ff714ea7 isdn4k-utils-3.5_pre20041110-r1.ebuild 6718
+MD5 0b704691c6a6d9d8ef3d9238a3d89117 isdn4k-utils-3.5_pre20041110-r2.ebuild 6590
 MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73
 MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977
-MD5 8de88f6cf872f012abe1e320b3fb4336 files/digest-isdn4k-utils-3.5_pre20041110-r1 81
-MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
+MD5 8de88f6cf872f012abe1e320b3fb4336 files/digest-isdn4k-utils-3.5_pre20041110-r2 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
@@ -17,21 +17,21 @@ 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 cd0fb0c848a80ea2f686b351f73b96b0 files/3.5_pre20041110/config 2693
-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 b729cb8e840e3d8d19aa8628f04cf948 files/3.5_pre20041110/isdnlog.init 1046
 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 b729cb8e840e3d8d19aa8628f04cf948 files/3.5_pre20041110/isdnlog.init 1046
 MD5 077c13d881acae71e88763ffc42b7015 files/3.5_pre20041110/isdnlog.logrotated 439
-MD5 f4dd44c758ead761b337771b9244ae81 files/3.5_pre20041110/net.ippp0 2406
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBrxuxmdTrptrqvGERAnrkAJ9AYOOr7d06/pnhBrKl23hXzsLaUQCcDE8F
-Xbdkw3Cq9Xce5NWh8D0lAU0=
-=zXKf
+iD8DBQFBsJkBjtv59x0+BrURAu0CAJ9868fscjyZvdQ2Xs7HjHptL7QEwwCgw6HX
+zgvJs/hGCDYUMaSRgn7RsTs=
+=iohk
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0 b/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0
index 2046ffd290e57765dfa47ec5bb184f82aded4b40..b9828d1ada12d58d04a0f405232d03fae21abadf 100644 (file)
--- a/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0
+++ b/net-dialup/isdn4k-utils/files/3.5_pre20041110/net.ippp0
@@ -1,6 +1,6 @@
 # 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.1 2004/11/22 20:05:39 mrness Exp $
+# $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
 
@@ -24,7 +24,7 @@ start() {
 
        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} || {
+       /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}

diff --git a/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r1 b/net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r2
similarity index 100%
rename from net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r1
rename to net-dialup/isdn4k-utils/files/digest-isdn4k-utils-3.5_pre20041110-r2

diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r1.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r2.ebuild
similarity index 97%
rename from net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r1.ebuild
rename to net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r2.ebuild
index 76b7b34578a75822d8ac336224f4266a2e8d369e..df51cda73458dfee6f01e0e5cda69febc539d577 100644 (file)
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r1.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-3.5_pre20041110-r1.ebuild,v 1.1 2004/12/02 13:42:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.5_pre20041110-r2.ebuild,v 1.1 2004/12/03 16:48:55 mrness Exp $
 
 inherit eutils
 
@@ -181,11 +181,6 @@ src_install() {
        # install logrotate configs
        insinto /etc/logrotate.d
        newins ${FILESDIR}/${PV}/isdnlog.logrotated isdnlog
-
-
-       # ippdp.init script for the ebuild thinks ipppd should be in /sbin
-       dodir /sbin
-       mv ${D}/usr/sbin/ipppd ${D}/sbin/ipppd
 }
 
 pkg_postinst() {