diff options
author | Alin Năstac <mrness@gentoo.org> | 2007-05-28 18:30:23 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2007-05-28 18:30:23 +0000 |
commit | edd89a751b0c919a26aee86ec05e6e9036eb2f92 (patch) | |
tree | baf9a6d99fd1e83216b713d4ccf67f48a12346d8 /net-dialup | |
parent | old (diff) | |
download | historical-edd89a751b0c919a26aee86ec05e6e9036eb2f92.tar.gz historical-edd89a751b0c919a26aee86ec05e6e9036eb2f92.tar.bz2 historical-edd89a751b0c919a26aee86ec05e6e9036eb2f92.zip |
Fix QA notice. Remove /var/run/ppp-$linkname.pid only on exit (#179978).
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/ppp/ChangeLog | 7 | ||||
-rw-r--r-- | net-dialup/ppp/Manifest | 26 | ||||
-rw-r--r-- | net-dialup/ppp/files/digest-ppp-2.4.4-r5 | 9 | ||||
-rw-r--r-- | net-dialup/ppp/ppp-2.4.4-r5.ebuild | 285 |
4 files changed, 322 insertions, 5 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index 1334d1b67649..de37c882643a 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/ppp # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.179 2007/05/06 08:03:29 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.180 2007/05/28 18:30:23 mrness Exp $ + +*ppp-2.4.4-r5 (28 May 2007) + + 28 May 2007; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r5.ebuild: + Fix QA notice. Remove /var/run/ppp-$linkname.pid only on exit (#179978). 06 May 2007; Marius Mauch <genone@gentoo.org> ppp-2.4.4-r4.ebuild: Replacing einfo with elog diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 040758bc9e91..e1bcf55cede4 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX README.mpls 530 RMD160 4814f25fa3d788311f37045188cf285fb588da67 SHA1 fdf4abff10b2593ca9012429cf684243cc74fec6 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57 MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530 RMD160 4814f25fa3d788311f37045188cf285fb588da67 files/README.mpls 530 @@ -15,16 +18,21 @@ MD5 1945441c257a952a3de0d95683047ec6 files/modules.ppp 299 RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 files/modules.ppp 299 SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 files/modules.ppp 299 DIST ppp-2.4.4-patches-20061124.tar.gz 43341 RMD160 8c429879a3f00a415663bbbe657198185d25b1c7 SHA1 d1507488c53877c5ebb152adc6d4211e034eb4c1 SHA256 96fb2e24ff5e7a2584f709d389ecd6ee87e1bec9d9cc2d14fb3d6265ba60bf91 +DIST ppp-2.4.4-patches-20070528.tar.gz 43020 RMD160 8568ce3f5361ae7b3ce1a2b732a0c60419d0a2a6 SHA1 334752c829f8c201c62854998775eb8377dd6b74 SHA256 92136c88d9573c6e057d6f16551d4ef10b49ea761fa86e73726f5e27ea91019f DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 EBUILD ppp-2.4.4-r4.ebuild 9613 RMD160 4c5ccc22d33d5a8196c1a96d7699e1bd638f00de SHA1 7d8402016b632d21f9bcdc01861d959a8cdc490c SHA256 e4bb92f563c0edfd9dcd7e63318a1624058028388435c7915116a4c72cd08a3b MD5 b988c57b57215ecb5e5a5bafdf130a09 ppp-2.4.4-r4.ebuild 9613 RMD160 4c5ccc22d33d5a8196c1a96d7699e1bd638f00de ppp-2.4.4-r4.ebuild 9613 SHA256 e4bb92f563c0edfd9dcd7e63318a1624058028388435c7915116a4c72cd08a3b ppp-2.4.4-r4.ebuild 9613 -MISC ChangeLog 30474 RMD160 be115371c1cea6ca2d3ba124b0e14a0c960bba48 SHA1 b536a201a8b4bb7455fac3ad3733c6936fdba931 SHA256 a56b10003b53c0cc0bcf21cb62940dda0421bc7f163c9a82022874265d79422c -MD5 07ddae8ff5e454d21d122d8e4fd9c597 ChangeLog 30474 -RMD160 be115371c1cea6ca2d3ba124b0e14a0c960bba48 ChangeLog 30474 -SHA256 a56b10003b53c0cc0bcf21cb62940dda0421bc7f163c9a82022874265d79422c ChangeLog 30474 +EBUILD ppp-2.4.4-r5.ebuild 9710 RMD160 bae0b7e385ded8e6b9015b86e94b91f93938237a SHA1 fda216b796a6a21dab43f062db852a453c4d9db0 SHA256 e4a630b9888cf59c2bcfbc03b52930d8ec76ff85d8f44455196cc9cc4541cd44 +MD5 cc2536d4e0527b5e39dc8b20849cf796 ppp-2.4.4-r5.ebuild 9710 +RMD160 bae0b7e385ded8e6b9015b86e94b91f93938237a ppp-2.4.4-r5.ebuild 9710 +SHA256 e4a630b9888cf59c2bcfbc03b52930d8ec76ff85d8f44455196cc9cc4541cd44 ppp-2.4.4-r5.ebuild 9710 +MISC ChangeLog 30649 RMD160 2a6e161dbe04f27fdf8849b0e7244d92099b7d68 SHA1 52d9b12378a462db31f6c771a5842576e62a9385 SHA256 ad17eaa85e6c7d6bbec9560ca5177bf7f2555f8e9fb3acc390db79b221fa5632 +MD5 2a311056cb958d8c108a1f6ca32bb715 ChangeLog 30649 +RMD160 2a6e161dbe04f27fdf8849b0e7244d92099b7d68 ChangeLog 30649 +SHA256 ad17eaa85e6c7d6bbec9560ca5177bf7f2555f8e9fb3acc390db79b221fa5632 ChangeLog 30649 MISC metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e SHA1 00f7ddc284f2338465ba8a1d1bc31da70dc6d7bc SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683 MD5 8c831d16c63dd88ff9cb350ab8104831 metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e metadata.xml 384 @@ -32,3 +40,13 @@ SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683 metadata MD5 66137b05bcd2dc9a318a500940b3bffb files/digest-ppp-2.4.4-r4 723 RMD160 225b55c039c0f53bd8d721e2cc918ce20c68fb3e files/digest-ppp-2.4.4-r4 723 SHA256 ef5eb7b6adc34f5f45194665a4315e7450ac48cbadb96f9712d5b104929b087c files/digest-ppp-2.4.4-r4 723 +MD5 ccc6eef126423d7fbf507469170c9734 files/digest-ppp-2.4.4-r5 723 +RMD160 b4736da752475e438d2a816033af60f0a9fa57f5 files/digest-ppp-2.4.4-r5 723 +SHA256 b14c3cc3c2ab5796523c7dcb56791e89a2455c3823cf075e93c5dabcc5f899e3 files/digest-ppp-2.4.4-r5 723 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.4 (GNU/Linux) + +iD8DBQFGWx/JJnxX6mF440QRAgzqAKCVpyL77eAQ0YYkjBZoy7j1AjUmcACggfwe +yOzufe7HyVmHX1WXYVfvP9E= +=Pz3Y +-----END PGP SIGNATURE----- diff --git a/net-dialup/ppp/files/digest-ppp-2.4.4-r5 b/net-dialup/ppp/files/digest-ppp-2.4.4-r5 new file mode 100644 index 000000000000..44281178d197 --- /dev/null +++ b/net-dialup/ppp/files/digest-ppp-2.4.4-r5 @@ -0,0 +1,9 @@ +MD5 566d63d95755021e35ed8a63fb7b0672 ppp-2.4.4-patches-20070528.tar.gz 43020 +RMD160 8568ce3f5361ae7b3ce1a2b732a0c60419d0a2a6 ppp-2.4.4-patches-20070528.tar.gz 43020 +SHA256 92136c88d9573c6e057d6f16551d4ef10b49ea761fa86e73726f5e27ea91019f ppp-2.4.4-patches-20070528.tar.gz 43020 +MD5 183800762e266132218b204dfb428d29 ppp-2.4.4.tar.gz 688763 +RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 ppp-2.4.4.tar.gz 688763 +SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea ppp-2.4.4.tar.gz 688763 +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.4-r5.ebuild b/net-dialup/ppp/ppp-2.4.4-r5.ebuild new file mode 100644 index 000000000000..58baa6533203 --- /dev/null +++ b/net-dialup/ppp/ppp-2.4.4-r5.ebuild @@ -0,0 +1,285 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r5.ebuild,v 1.1 2007/05/28 18:30:23 mrness 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-20070528.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 ~s390 ~sh ~sparc ~x86" +IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius" + +DEPEND="activefilter? ( >=virtual/libpcap-0.9.4 ) + 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." + ewarn "You could obtain the kernel patch from MPPE-MPPC homepage:" + ewarn " 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 +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${WORKDIR}/patch/make-vars.patch" + epatch "${WORKDIR}/patch/mpls.patch" + epatch "${WORKDIR}/patch/killaddr-smarter.patch" + epatch "${WORKDIR}/patch/wait-children.patch" + epatch "${WORKDIR}/patch/maxoctets-2Glimit.patch" + epatch "${WORKDIR}/patch/defaultgateway.patch" + epatch "${WORKDIR}/patch/mschapv2-initialize-response.patch" + epatch "${WORKDIR}/patch/linkpidfile.patch" + epatch "${WORKDIR}/patch/qa-fixes.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 \ + || die "ppp-dhcp plugin addition failed" + epatch "${WORKDIR}/patch/dhcp-make-vars.patch" + 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} + + 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} -D_GNU_SOURCE" || 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 + doins "${FILESDIR}/ip-up" + doins "${FILESDIR}/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 + 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 + 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 the following test report contains a missing kernel configuration option that you need," + ewarn "you should reconfigure and rebuild your kernel before running pppd." + 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 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)" + fi + CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP" + local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)" + 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 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 WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" + fi + CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE" + 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 WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)" + fi + check_extra_config + 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 + [ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update + 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 + elog "Pon, poff and plog scripts have been supplied for experienced users." + elog "Users needing particular scripts (ssh,rsh,etc.) should check out the" + elog "/usr/share/doc/${PF}/scripts directory." +} |