diff options
author | Alin Năstac <mrness@gentoo.org> | 2005-05-26 18:29:12 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2005-05-26 18:29:12 +0000 |
commit | 52ed563986a912f5dbd1f48587a4ccb825ccdbd9 (patch) | |
tree | 826ab985c26f64357fffa1362be2c10bb011100d /net-dialup | |
parent | Version bump. (diff) | |
download | historical-52ed563986a912f5dbd1f48587a4ccb825ccdbd9.tar.gz historical-52ed563986a912f5dbd1f48587a4ccb825ccdbd9.tar.bz2 historical-52ed563986a912f5dbd1f48587a4ccb825ccdbd9.zip |
/etc/radiusclient -> /etc/ppp/radius (#92878)
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/ppp/ChangeLog | 9 | ||||
-rw-r--r-- | net-dialup/ppp/Manifest | 12 | ||||
-rw-r--r-- | net-dialup/ppp/files/digest-ppp-2.4.3-r5 (renamed from net-dialup/ppp/files/digest-ppp-2.4.3-r4) | 0 | ||||
-rw-r--r-- | net-dialup/ppp/ppp-2.4.3-r5.ebuild (renamed from net-dialup/ppp/ppp-2.4.3-r4.ebuild) | 41 |
4 files changed, 43 insertions, 19 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index eada60b9ca39..a7305936d86e 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-dialup/ppp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.110 2005/05/23 18:16:42 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.111 2005/05/26 18:29:12 mrness Exp $ + +*ppp-2.4.3-r5 (26 May 2005) + + 26 May 2005; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r4.ebuild, + +ppp-2.4.3-r5.ebuild: + Move /etc/radiusclient directory installed by ppp-2.4.3 to /etc/ppp/radius + for avoiding collisions with net-dialup/radiusclient package (#92878). *ppp-2.4.3-r4 (23 May 2005) *ppp-2.4.2-r11 (23 May 2005) diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 1b6375511c85..a97a00262936 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 215f648fa31e547edb11b4835a759163 ppp-2.4.3-r4.ebuild 6441 MD5 882e85fabc75a4917d0b774452a5356d ppp-2.4.2-r11.ebuild 6472 MD5 8ac8019ba04fc2340ef5b7f32461bd60 ppp-2.4.3-r3.ebuild 6046 -MD5 3eef860d3e11309f0dd41ebd5e381494 ChangeLog 20109 +MD5 7718d56aca3bf4786bed5a12c3f1b47d ppp-2.4.3-r5.ebuild 7156 +MD5 b9c3020d1a57bc420b23ec90412e3948 ChangeLog 20382 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295 MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957 @@ -20,7 +20,7 @@ MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r11 271 MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53 MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408 MD5 4afa8dd77ad811492789477df07e47da files/digest-ppp-2.4.3-r3 195 -MD5 4afa8dd77ad811492789477df07e47da files/digest-ppp-2.4.3-r4 195 +MD5 4afa8dd77ad811492789477df07e47da files/digest-ppp-2.4.3-r5 195 MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931 @@ -28,7 +28,7 @@ MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCkh4ljiC39V7gKu0RAhjqAJ9oJwD1p7rOrsvVr/IeqhTTFcpPbgCgx1+R -HTMYI/IXB1l/pBp0NssWGC4= -=sZHk +iD8DBQFClhWWjiC39V7gKu0RAr8dAJ9Zev04xcKoAP5rgRAr60hF1J+e6wCfT4G8 +x5bZrXFlfCWVEXABCRGSgtU= +=GtW1 -----END PGP SIGNATURE----- diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r4 b/net-dialup/ppp/files/digest-ppp-2.4.3-r5 index 7e13042c0ec3..7e13042c0ec3 100644 --- a/net-dialup/ppp/files/digest-ppp-2.4.3-r4 +++ b/net-dialup/ppp/files/digest-ppp-2.4.3-r5 diff --git a/net-dialup/ppp/ppp-2.4.3-r4.ebuild b/net-dialup/ppp/ppp-2.4.3-r5.ebuild index af44a26b2ee8..57746e5a148e 100644 --- a/net-dialup/ppp/ppp-2.4.3-r4.ebuild +++ b/net-dialup/ppp/ppp-2.4.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r4.ebuild,v 1.1 2005/05/23 18:16:42 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r5.ebuild,v 1.1 2005/05/26 18:29:12 mrness Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -78,9 +78,15 @@ src_unpack() { find ${S} -type f -name Makefile.linux \ -exec sed -i -e '/^CC[[:space:]]*=/d' {} \; - #set the right paths in radiusclient.conf - sed -i -e "s:/usr/local/etc:/etc:" \ - -e "s:/usr/local/sbin:/usr/sbin:" ${S}/pppd/plugins/radius/etc/radiusclient.conf + use radius && { + #set the right paths in radiusclient.conf + sed -i -e "s:/usr/local/etc:/etc:" \ + -e "s:/usr/local/sbin:/usr/sbin:" ${S}/pppd/plugins/radius/etc/radiusclient.conf + #set config dir to /etc/ppp/radius + sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \ + ${S}/pppd/plugins/radius/{*.8,*.c,*.h} \ + ${S}/pppd/plugins/radius/etc/* + } } src_compile() { @@ -99,6 +105,14 @@ src_compile() { fi } +pkg_preinst() { + if use radius && [ -d ${ROOT}/etc/radiusclient ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then + ebegin "Copy /etc/radiusclient to /etc/ppp/radius" + cp -ar ${ROOT}/etc/radiusclient ${ROOT}/etc/ppp/radius + eend $? + fi +} + src_install() { local y for y in chat pppd pppdump pppstats @@ -160,7 +174,7 @@ src_install() { doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build" #Copy radiusclient configuration files (#92878) - insinto /etc/radiusclient + insinto /etc/ppp/radius insopts -m0644 doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers} @@ -201,14 +215,10 @@ src_install() { } pkg_postinst() { - if [ ! -e ${ROOT}dev/.devfsd ] && [ ! -e ${ROOT}dev/.udev ] - then - if [ ! -e ${ROOT}dev/ppp ]; then - mknod ${ROOT}dev/ppp c 108 0 - fi + if [ ! -e ${ROOT}dev/.devfsd ] && [ ! -e ${ROOT}dev/.udev ] && [ ! -e ${ROOT}dev/ppp ]; then + mknod ${ROOT}dev/ppp c 108 0 fi - if [ "$ROOT" = "/" ] - then + if [ "$ROOT" = "/" ]; then /sbin/update-modules fi ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory." @@ -221,4 +231,11 @@ pkg_postinst() { # lib name has changed sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options + + if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then + echo + ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from" + ewarn " /etc/radiusclient to /etc/ppp/radius." + einfo "For your convenience, radiusclient directory was copied to the new location." + fi } |