From: Alin Năstac Date: Fri, 24 Nov 2006 20:03:56 +0000 (+0000) Subject: Correct initialization of mschap-v2 response buffer, thanks to Guillaume Knispel... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3fa17dddcbb6fddc68aeba04c4979858b5bad462;p=gentoo.git Correct initialization of mschap-v2 response buffer, thanks to Guillaume Knispel (#156052). Package-Manager: portage-2.1.1-r1 --- diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index 78eea3f21445..9a199f0c9e0a 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,12 @@ # 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.162 2006/11/03 09:46:45 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.163 2006/11/24 20:03:56 mrness Exp $ + +*ppp-2.4.4-r4 (24 Nov 2006) + + 24 Nov 2006; Alin Nastac +ppp-2.4.4-r4.ebuild: + Correct initialization of mschap-v2 response buffer, thanks to Guillaume + Knispel (#156052). *ppp-2.4.4-r3 (03 Nov 2006) diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 5d818925b2aa..386f93def05e 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -20,6 +20,7 @@ SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 files/mo DIST ppp-2.4.3-patches-20060910.tar.gz 56471 RMD160 160ebf1425fc338907d51e4b601e3dbd9bcad148 SHA1 04c1d540d87c3639ab00e991daea52228f44a3a1 SHA256 a4d23bb0026d7b1f9d7a5c97706afe83775504a49d8aa3b55ab247abb78eeeb1 DIST ppp-2.4.3.tar.gz 688092 RMD160 845821496bacb07d93bb7572a171854853ef722b SHA1 5e2789f4dedc81943fa9f94c840cccc2407056f7 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 DIST ppp-2.4.4-patches-20061103.tar.gz 43148 RMD160 e69ed336a0f6d0c485317bb8556245fd37587087 SHA1 93721bee1d98d63c5502e57b1e33136100ba1c2c SHA256 11b456c46ba9e957a27c79745f9bb93d17814f69de61c4cf6df072c85a8e6de5 +DIST ppp-2.4.4-patches-20061124.tar.gz 43341 RMD160 8c429879a3f00a415663bbbe657198185d25b1c7 SHA1 d1507488c53877c5ebb152adc6d4211e034eb4c1 SHA256 96fb2e24ff5e7a2584f709d389ecd6ee87e1bec9d9cc2d14fb3d6265ba60bf91 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.3-r16.ebuild 11517 RMD160 9d77710d63f0422046fa5dc53c542189c89de34d SHA1 932e775a84e8f4d814bcfad2bb05c6cfb81175d7 SHA256 8f04bd2050070665461752942336e13dc374ccc154e9cb0fc0617e1546a9fbdc @@ -30,10 +31,14 @@ EBUILD ppp-2.4.4-r3.ebuild 9557 RMD160 06ef35888c2890cf9f0272e808ea1f04a635e8a6 MD5 e653c17c106ae4686d656adc818f8575 ppp-2.4.4-r3.ebuild 9557 RMD160 06ef35888c2890cf9f0272e808ea1f04a635e8a6 ppp-2.4.4-r3.ebuild 9557 SHA256 25131b1cffc91373fbb56e88958b098778531291ddcd38a1cc78ec770a6fd6a9 ppp-2.4.4-r3.ebuild 9557 -MISC ChangeLog 28634 RMD160 8c108f5c006ca824df799d205c1e3c4bbd1424b6 SHA1 fa89023db6ea837e61fa7ddf2e1d86ed784c50af SHA256 e9f0bb68a896b75677c205c7af0a9a95d5dd0bcd93b92ce0230a5a8df8f71bb1 -MD5 036ea331d3df9dfd3263af7153228633 ChangeLog 28634 -RMD160 8c108f5c006ca824df799d205c1e3c4bbd1424b6 ChangeLog 28634 -SHA256 e9f0bb68a896b75677c205c7af0a9a95d5dd0bcd93b92ce0230a5a8df8f71bb1 ChangeLog 28634 +EBUILD ppp-2.4.4-r4.ebuild 9620 RMD160 1c40e80fc1179c9c6e95cbb29edb6b0131b538e7 SHA1 7993a661691bb8d29eaa8cd9af209b56e172ba74 SHA256 efc62cfa9b23ef3642aa94046d67b88e60cdf6daa957bb0630a88cd047c8a3f0 +MD5 6df87fbc742a575687b31d693b53cf8e ppp-2.4.4-r4.ebuild 9620 +RMD160 1c40e80fc1179c9c6e95cbb29edb6b0131b538e7 ppp-2.4.4-r4.ebuild 9620 +SHA256 efc62cfa9b23ef3642aa94046d67b88e60cdf6daa957bb0630a88cd047c8a3f0 ppp-2.4.4-r4.ebuild 9620 +MISC ChangeLog 28865 RMD160 91318acc2c5cb3ce1b5f0b7ca4ee8d03c8bad83b SHA1 bac9135a1efad59bd27205ad743da8ee256f997c SHA256 089a473bea140e8a9cf66a5dfa4e5cc539e05e6f183615d529e0be0a531d8dee +MD5 1a56b33a8dcdba82c353f06fae9f0321 ChangeLog 28865 +RMD160 91318acc2c5cb3ce1b5f0b7ca4ee8d03c8bad83b ChangeLog 28865 +SHA256 089a473bea140e8a9cf66a5dfa4e5cc539e05e6f183615d529e0be0a531d8dee ChangeLog 28865 MISC metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e SHA1 00f7ddc284f2338465ba8a1d1bc31da70dc6d7bc SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683 MD5 8c831d16c63dd88ff9cb350ab8104831 metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e metadata.xml 384 @@ -44,10 +49,13 @@ SHA256 15aa0950b61add7c588e0b0e255bfa7a117f700b1af938cbfbf9bd6aebbc76c5 files/di MD5 8c0945531fb1cdb2cfa21b3b94e3c734 files/digest-ppp-2.4.4-r3 723 RMD160 ea519040faca33e867110290684961faed77ef2b files/digest-ppp-2.4.4-r3 723 SHA256 7b8f5351d9a0616b0b59dca217e1dbe1646ca0da01c3c47117906d864194ec07 files/digest-ppp-2.4.4-r3 723 +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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFSxAR3sf9c6kjmR8RAmc7AKCunWSN2QiX9Coqg9S/Yx5Lx+WpTwCeNkzD -fkd0+HGtyL39BgY7/ffRX4E= -=tu9p +iD8DBQFFZ1A43sf9c6kjmR8RAvY8AJ9MVLNgQUFzEVZBB7RuhJLzj8wpegCeJSNj +4++iL5B5WNPmtSPGdgkMxpI= +=gtNV -----END PGP SIGNATURE----- diff --git a/net-dialup/ppp/files/digest-ppp-2.4.4-r4 b/net-dialup/ppp/files/digest-ppp-2.4.4-r4 new file mode 100644 index 000000000000..ddc27d97febd --- /dev/null +++ b/net-dialup/ppp/files/digest-ppp-2.4.4-r4 @@ -0,0 +1,9 @@ +MD5 045f3c2a7228c415c005fb6dd66a6253 ppp-2.4.4-patches-20061124.tar.gz 43341 +RMD160 8c429879a3f00a415663bbbe657198185d25b1c7 ppp-2.4.4-patches-20061124.tar.gz 43341 +SHA256 96fb2e24ff5e7a2584f709d389ecd6ee87e1bec9d9cc2d14fb3d6265ba60bf91 ppp-2.4.4-patches-20061124.tar.gz 43341 +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-r4.ebuild b/net-dialup/ppp/ppp-2.4.4-r4.ebuild new file mode 100644 index 000000000000..2b3b0fbd4e73 --- /dev/null +++ b/net-dialup/ppp/ppp-2.4.4-r4.ebuild @@ -0,0 +1,285 @@ +# 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.4-r4.ebuild,v 1.1 2006/11/24 20:03:56 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-20061124.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.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." + 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 +} + +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" + + 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}" || 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 + 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 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 + /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 + 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/${PF}/scripts directory." +}