--- /usr/portage/net-dialup/ppp/files/ppp-2.4.3-eaptls-0.7.patch 1970-01-01 01:00:00.000000000 +0100 +++ /usr/portage/net-dialup/ppp/files/ppp-2.4.3-eaptls-0.7.patch 2005-03-30 13:18:02.000000000 +0200 @@ -0,0 +1,2808 @@ +diff -Naur ppp-2.4.3/etc.ppp/eaptls-client ppp-2.4.3-eaptls-0.7/etc.ppp/eaptls-client +--- ppp-2.4.3/etc.ppp/eaptls-client 1970-01-01 01:00:00.000000000 +0100 @@ -0,0 +1,217 @@ +--- ppp-2.4.3/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100 @@ -1,24 +1,26 @@ +MD5 06756b9843bf54824792153605bcac28 ppp-2.4.2-r12.ebuild 6935 +MD5 6205d840f3f2fda06c502408de02a298 ppp-2.4.3-r8.ebuild 9523 MD5 1679bdc947d662d842ffba712c44bc94 ChangeLog 22834 +MD5 ff2e9f24c17c1fa83d260539af3149cb ppp-2.4.2-r15.ebuild 7411 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295 MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209 -MD5 06756b9843bf54824792153605bcac28 ppp-2.4.2-r12.ebuild 6935 -MD5 ff2e9f24c17c1fa83d260539af3149cb ppp-2.4.2-r15.ebuild 7411 -MD5 2b7d702806660278ad8fc0f38b3cb842 ppp-2.4.3-r8.ebuild 8082 -MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530 +MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957 +MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146 +MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723 +MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347 +MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083 +MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775 MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271 MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r12 271 -MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931 -MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083 -MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268 -MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408 -MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53 -MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238 -MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146 -MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723 -MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957 -MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607 -MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605 MD5 23a7e77ad13ddd12f281fe134508e52f files/digest-ppp-2.4.2-r15 271 +MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53 +MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408 +MD5 af39f6df6bcd564f9ff725f3ab457ae4 files/ppp-2.4.3-eaptls-mppe-0.7.patch 6308 MD5 b7ba474b501edf4a1179142b306bdcd0 files/digest-ppp-2.4.3-r8 195 +MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530 +MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268 +MD5 0dcb7dd0a688a256ca520727b5fc36d4 files/ppp-2.4.3-eaptls-0.7.patch 72420 +MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931 +MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605 --- /usr/portage/net-dialup/ppp/ppp-2.4.3-r8.ebuild 2005-09-23 01:05:52.000000000 +0200 +++ /usr/portage/net-dialup/ppp/ppp-2.4.3-r8.ebuild 2005-10-20 21:05:11.000000000 +0200 @@ -13,13 +13,15 @@ LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="activefilter atm dhcp gtk ipv6 mppe-mppc pam radius" +IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius" RDEPEND="virtual/libc activefilter? ( >=virtual/libpcap-0.9.3 ) atm? ( net-dialup/linux-atm ) pam? ( sys-libs/pam ) - gtk? ( =x11-libs/gtk+-1* )" + gtk? ( =x11-libs/gtk+-1* ) + eap-tls? ( net-misc/curl ) + eap-tls? ( dev-libs/openssl )" DEPEND="${RDEPEND} >=sys-apps/sed-4" @@ -68,6 +70,28 @@ sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux } + use eap-tls && { + einfo "Adding support of authenticating with certificates..." + cp ${FILESDIR}/ppp-2.4.3-eaptls-0.7.patch ${WORKDIR}/patch/ + sed -i "s/ eap\.c chap-md5\.c$/ eap.c chap-md5.c mplscp.c/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s/ eap\.c chap-md5\.c eap-tls\.c$/ eap.c chap-md5.c mplscp.c eap-tls.c/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s/ eap\.o chap-md5\.o$/ eap.o chap-md5.o mplscp.o/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s/ eap\.o chap-md5\.o eap-tls\.o$/ eap.o chap-md5.o mplscp.o eap-tls.o/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s/^-.*upap\.h eap\.h/- upap.h eap.h mplscp.h/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s/^\+.*upap\.h eap\.h eap-tls\.h$/+ upap.h eap.h mplscp.h eap-tls.h/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s/^-COPTS = -O2 -pipe -Wall -g$/-COPTS+= -Wall/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + sed -i "s|^\+COPTS = -O2 -pipe -Wall -g -I/usr/kerberos/include|+COPTS+= -Wall -I/usr/kerberos/include|" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + epatch ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch + } + + use eap-tls && use mppe-mppc && { + einfo "Allowing MPPE to work with autentification with certificates..." + opt="$EPATCH_OPTS" + EPATCH_OPTS="-l" + epatch ${FILESDIR}/ppp-2.4.3-eaptls-mppe-0.7.patch + EPATCH_OPTS="$opt" + } + einfo "Enabling CBCP" sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux