diff options
author | Alin Năstac <mrness@gentoo.org> | 2006-05-23 04:44:27 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2006-05-23 04:44:27 +0000 |
commit | 2d0a1834ed0e599d70ada40fc4f3d370ed1a8172 (patch) | |
tree | 15e198696eb94f73f178d70e61bfb85bb9a764d3 /net-dialup/ppp | |
parent | Stable on SPARC wrt bug #131857. (diff) | |
download | historical-2d0a1834ed0e599d70ada40fc4f3d370ed1a8172.tar.gz historical-2d0a1834ed0e599d70ada40fc4f3d370ed1a8172.tar.bz2 historical-2d0a1834ed0e599d70ada40fc4f3d370ed1a8172.zip |
Remove old test version. Take advantage of the new features implemented in linux-info.eclass (#133026).
Package-Manager: portage-2203-svn
Diffstat (limited to 'net-dialup/ppp')
-rw-r--r-- | net-dialup/ppp/ChangeLog | 7 | ||||
-rw-r--r-- | net-dialup/ppp/Manifest | 12 | ||||
-rw-r--r-- | net-dialup/ppp/files/digest-ppp-2.4.3-r14 | 9 | ||||
-rw-r--r-- | net-dialup/ppp/ppp-2.4.3-r14.ebuild | 318 | ||||
-rw-r--r-- | net-dialup/ppp/ppp-2.4.3-r15.ebuild | 12 |
5 files changed, 17 insertions, 341 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index 2e63b93b3d5a..c5eb4349164b 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/ppp # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.144 2006/05/16 06:34:23 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.145 2006/05/23 04:44:27 mrness Exp $ + + 23 May 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r14.ebuild, + ppp-2.4.3-r15.ebuild: + Remove old test version. Take advantage of the new features implemented in + linux-info.eclass (#133026). 16 May 2006; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r15.ebuild: Fix recursive definitions of COPTS make variable (#133309). diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index a66d6b7c966d..b13e9df8f546 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,12 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 dab226cac8c0fbfce25bc2581063e0ec ChangeLog 25964 +MD5 383b8ed556083212778888ce0fc7eba0 ChangeLog 26167 MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775 MD5 8655ab40bfaab82ff96de0e7e63ef4d4 files/digest-ppp-2.4.2-r15 271 -MD5 1c4c4640b2fb85fbc43de8866745b84f files/digest-ppp-2.4.3-r14 723 MD5 6a313351e3cd5fa543cf3a5772d2c79c files/digest-ppp-2.4.3-r15 195 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931 MD5 d224887368bd3b15d96d5dc976bf58bf files/ip-down.baselayout 960 @@ -23,12 +22,11 @@ MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295 MD5 7ea817999376b36ab8fc2431f32fe521 ppp-2.4.2-r15.ebuild 7794 -MD5 8457ab93b5541f365daf8d06e40295e7 ppp-2.4.3-r14.ebuild 10257 -MD5 75d1a4e504819e64930d60ed7d03eaa8 ppp-2.4.3-r15.ebuild 11451 +MD5 639d0fe77bb43262fb6ba7decc6edbb0 ppp-2.4.3-r15.ebuild 11513 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEaXJ/jG8pv1lIUX4RAimgAKCz+ZLCEw5lETt7JVFSCWd7BDciiACfZ/Xz -9Rll0sDPwN19OeM7hsjIlj8= -=7hWa +iD8DBQFEcpM8jG8pv1lIUX4RAuO3AJ4innJ57Bab5K+tgkdMrrxjy4v6ggCfWDaM +unlx2xAjq9v03tel21YPAxQ= +=WFNA -----END PGP SIGNATURE----- diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r14 b/net-dialup/ppp/files/digest-ppp-2.4.3-r14 deleted file mode 100644 index 364876b1a183..000000000000 --- a/net-dialup/ppp/files/digest-ppp-2.4.3-r14 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 28a95472e0a741864418697c86b4d68f ppp-2.4.3-patches-20060409.tar.gz 55960 -RMD160 30d5f039b960cf378d5d856d695728fff0acc3f0 ppp-2.4.3-patches-20060409.tar.gz 55960 -SHA256 13cdeefaaf324723eb4c54a10b196486c6cb55c2f35f179b88393f5397162387 ppp-2.4.3-patches-20060409.tar.gz 55960 -MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092 -RMD160 845821496bacb07d93bb7572a171854853ef722b ppp-2.4.3.tar.gz 688092 -SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 ppp-2.4.3.tar.gz 688092 -MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497 -RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 ppp-dhcpc.tgz 33497 -SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 ppp-dhcpc.tgz 33497 diff --git a/net-dialup/ppp/ppp-2.4.3-r14.ebuild b/net-dialup/ppp/ppp-2.4.3-r14.ebuild deleted file mode 100644 index e43883ad69b3..000000000000 --- a/net-dialup/ppp/ppp-2.4.3-r14.ebuild +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 1999-2006 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-r14.ebuild,v 1.2 2006/05/03 11:29:44 tove Exp $ - -inherit eutils flag-o-matic toolchain-funcs linux-info - -DESCRIPTION="Point-to-Point Protocol (PPP)" -HOMEPAGE="http://www.samba.org/ppp" -SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz - mirror://gentoo/${P}-patches-20060409.tar.gz - dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius" - -DEPEND="activefilter? ( >=virtual/libpcap-0.9.3 ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( =x11-libs/gtk+-1* ) - eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )" - -pkg_setup() { - if use mppe-mppc; then - echo - ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC" - ewarn "patch developed by Jan Dubiec." - ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14." - einfo "You could obtain the kernel patch from MPPE-MPPC homepage:" - einfo " http://mppe-mppc.alphacron.de/" - ewarn "CAUTION: MPPC is a U.S. patented algorithm!" - ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first." - ebeep - fi - - if has_version "<${CATEGORY}/${PF}"; then - local files="" - [ -f "${ROOT}/etc/conf.d/net.ppp0" ] && files=( "${ROOT}/etc/conf.d/net.ppp0" ) - if [ -f "${ROOT}/etc/init.d/net.ppp0" ]; then - local x y - x=$(<"${ROOT}/etc/init.d/net.ppp0") - y=$(<"${ROOT}/etc/init.d/net.lo") - #It should be symlink to net.lo or at least have the same content - if [ "$x" != "$y" ] ; then - files=( ${files[@]} "${ROOT}/etc/init.d/net.ppp0" ) - fi - fi - - if [[ -n "${files[@]}" ]]; then - local f - einfo "Gentoo is moving toward common configuration file for all network" - einfo "interfaces. Thus starting from >=ppp-2.4.3-r10 the following files" - einfo "are obsoleted and should be removed to avoid future confusion:" - for f in ${files[@]} ; do - eerror " ${f//\/\///} - conflict with baselayout" - done - for f in chat-default options-pppoe options-pptp ; do - f="${ROOT}/etc/ppp/${f}" - if [ -f "${f}" ] ; then - ewarn " ${f//\/\///} - unused by this version" - files=( ${files[@]} "${f}" ) - fi - done - echo - einfo "If you use the old net.ppp0 script, you need to:" - einfo " - upgrade to >=sys-apps/baselayout-1.12.0_pre11" - einfo " - set ppp0 parameters in /etc/conf.d/net (see example file)" - einfo " - remove conflicting files" - einfo " - upgrade net-dialup/ppp" - echo - einfo "If you never used net.ppp0 script, just run the following commands:" - einfo " rm ${files[@]}" - einfo " emerge --resume" - die "Conflicts with baselayout support detected" - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${WORKDIR}/patch/ppp_flags.patch" - epatch "${WORKDIR}/patch/mpls.patch" - epatch "${WORKDIR}/patch/killaddr-smarter.patch" - epatch "${WORKDIR}/patch/upstream-fixes.patch" - epatch "${WORKDIR}/patch/rp-pppoe-any-interface.patch" - epatch "${WORKDIR}/patch/quiet-pppoatm-modprobe.patch" - epatch "${WORKDIR}/patch/wait-children.patch" - - use eap-tls && { - # see http://eaptls.spe.net/index.html for more info - einfo "Enabling EAP-TLS support" - epatch "${WORKDIR}/patch/eaptls-0.7-gentoo.patch" - use mppe-mppc || epatch "${WORKDIR}/patch/eaptls-mppe-0.7.patch" - } - - use mppe-mppc && { - einfo "Enabling MPPE-MPPC support" - epatch "${WORKDIR}/patch/mppe-mppc-1.1.patch" - use eap-tls && epatch "${WORKDIR}/patch/eaptls-mppe-0.7-with-mppc.patch" - } - - use atm && { - einfo "Enabling PPPoATM support" - sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux - } - - use activefilter || { - einfo "Disabling active filter" - sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux - } - - use pam && { - einfo "Enabling PAM" - sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux - } - - use ipv6 && { - einfo "Enabling IPv6" - sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux - } - - einfo "Enabling CBCP" - sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux - - use dhcp && { - # copy the ppp-dhcp plugin files - einfo "Copying ppp-dhcp plugin files..." - tar -xzf "${DISTDIR}/ppp-dhcpc.tgz" -C pppd/plugins/ \ - && sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux \ - && sed -i -e "s/-O2/${CFLAGS} -fPIC/" \ - -e "s/gcc/\$(CC)/" pppd/plugins/dhcp/Makefile.linux \ - || die "ppp-dhcp plugin addition failed" - epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch" - } - - # Set correct libdir - sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ - pppd/{pathnames.h,pppd.8} - - find . -type f -name Makefile.linux \ - -exec sed -i -e '/^CC[[:space:]]*=/d' {} \; - - use radius && { - #set the right paths in radiusclient.conf - sed -i -e "s:/usr/local/etc:/etc:" \ - -e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf - #set config dir to /etc/ppp/radius - sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \ - pppd/plugins/radius/{*.8,*.c,*.h} \ - pppd/plugins/radius/etc/* - } -} - -src_compile() { - export CC="$(tc-getCC)" - export AR="$(tc-getAR)" - append-ldflags $(bindnow-flags) - econf || die "configuration failed" - emake COPTS="${CFLAGS}" || die "compile failed" - - #build pppgetpass - cd contrib/pppgetpass - if use gtk; then - emake -f Makefile.linux || die "failed to build pppgetpass" - else - emake pppgetpass.vt || die "failed to build pppgetpass" - 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 -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius" - eend $? - fi -} - -src_install() { - local y - for y in chat pppd pppdump pppstats - do - doman ${y}/${y}.8 - dosbin ${y}/${y} - done - chmod u+s-w "${D}/usr/sbin/pppd" - - dosbin pppd/plugins/rp-pppoe/pppoe-discovery - - dodir /etc/ppp/peers - insinto /etc/ppp - insopts -m0600 - newins etc.ppp/pap-secrets pap-secrets.example - newins etc.ppp/chap-secrets chap-secrets.example - - insopts -m0644 - doins etc.ppp/options - - insopts -m0755 - newins "${FILESDIR}/ip-up.baselayout" ip-up - newins "${FILESDIR}/ip-down.baselayout" ip-down - - if use pam; then - insinto /etc/pam.d - insopts -m0644 - newins pppd/ppp.pam ppp || die "not found ppp.pam" - fi - - local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h) - #closing " for syntax coloring - dodir "${PLUGINS_DIR}" - insinto "${PLUGINS_DIR}" - insopts -m0755 - doins pppd/plugins/minconn.so || die "minconn.so not build" - doins pppd/plugins/passprompt.so || die "passprompt.so not build" - doins pppd/plugins/passwordfd.so || die "passwordfd.so not build" - doins pppd/plugins/winbind.so || die "winbind.so not build" - doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build" - if use atm; then - doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build" - fi - if use dhcp; then - doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" - fi - if use radius; then - doins pppd/plugins/radius/radius.so || die "radius.so not build" - doins pppd/plugins/radius/radattr.so || die "radattr.so not build" - doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build" - - #Copy radiusclient configuration files (#92878) - insinto /etc/ppp/radius - insopts -m0644 - doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers} - - doman pppd/plugins/radius/pppd-radius.8 - doman pppd/plugins/radius/pppd-radattr.8 - fi - - insinto /etc/modules.d - insopts -m0644 - newins "${FILESDIR}/modules.ppp" ppp - if use mppe-mppc; then - sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' "${D}/etc/modules.d/ppp" - fi - - dodoc PLUGINS README* SETUP Changes-2.3 FAQ - dodoc "${FILESDIR}/README.mpls" - - dosbin scripts/pon - dosbin scripts/poff - dosbin scripts/plog - doman scripts/pon.1 - - # Adding misc. specialized scripts to doc dir - dodir /usr/share/doc/${PF}/scripts/chatchat - insinto /usr/share/doc/${PF}/scripts/chatchat - doins scripts/chatchat/* - insinto /usr/share/doc/${PF}/scripts - doins scripts/* - - if use gtk; then - dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - doman contrib/pppgetpass/pppgetpass.8 -} - -pkg_postinst() { - if get_version ; then - echo - ewarn "If any of the following kernel configuration options is missing," - ewarn "you should reconfigure and rebuild your kernel before running pppd." - CONFIG_CHECK="~PPP" - use activefilter && CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER" - CONFIG_CHECK="${CONFIG_CHECK} ~PPP_BSDCOMP ~PPP_DEFLATE" - check_extra_config - echo - 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 - /sbin/update-modules - fi - - #create *-secrets files if not exists - [ -f "${ROOT}/etc/ppp/pap-secrets" ] || \ - cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets" - [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \ - cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets" - - # 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 - - echo - einfo "Pon, poff and plog scripts have been supplied for experienced users." - einfo "Users needing particular scripts (ssh,rsh,etc.) should check out the" - einfo "/usr/share/doc/ppp*/scripts directory." - - echo - ewarn "The old /etc/init.d/net.ppp0 script has gone!" - einfo "The new way of handling PPP connections of any kind (PPPoE, PPPoA, etc)" - einfo "is through the baselayout's pppd net module." - einfo "Make sure you have a supported version of baselayout by running:" - einfo " emerge -u '>=sys-apps/baselayout-1.12.0_pre11'" -} diff --git a/net-dialup/ppp/ppp-2.4.3-r15.ebuild b/net-dialup/ppp/ppp-2.4.3-r15.ebuild index c56e67a33a70..e7ecad547cc2 100644 --- a/net-dialup/ppp/ppp-2.4.3-r15.ebuild +++ b/net-dialup/ppp/ppp-2.4.3-r15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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-r15.ebuild,v 1.1 2006/05/07 22:21:21 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r15.ebuild,v 1.2 2006/05/23 04:44:27 mrness Exp $ inherit eutils flag-o-matic toolchain-funcs linux-info @@ -273,7 +273,7 @@ pkg_postinst() { CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY" local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)" local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)" - local ERROR_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)" + local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)" if use activefilter ; then CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER" local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)" @@ -283,16 +283,16 @@ pkg_postinst() { local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)" if use mppe-mppc ; then CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE_MPPC" - local ERROR_PPP_MPPE_MPPC="CONFIG_PPP_MPPE_MPPC:\t missing MPPE/MPPC encryption/compression (optional, mostly used by PPTP links)" + local WARNING_PPP_MPPE_MPPC="CONFIG_PPP_MPPE_MPPC:\t missing MPPE/MPPC encryption/compression (optional, mostly used by PPTP links)" else CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE" - local ERROR_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" + local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" fi CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE" - local ERROR_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional)" + local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional needed by rp-pppoe plugin)" if use atm ; then CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM" - local ERROR_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional)" + local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)" fi check_extra_config fi |