Attachment #71081 for bug #109935

View | Details | Raw Unified | Return to bug 109935
Collapse All | Expand All

Line 0 Link Here

(-)/usr/portage/net-dialup/ppp/Manifest (-15 / +20 lines)
		1	diff -Naur ppp-2.4.3/etc.ppp/eaptls-client ppp-2.4.3-eaptls-0.7/etc.ppp/eaptls-client
		2	--- ppp-2.4.3/etc.ppp/eaptls-client 1970-01-01 01:00:00.000000000 +0100
Line 0 Link Here
		1	--- ppp-2.4.3/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100
Lines 1-24 Link Here
		1	MD5 06756b9843bf54824792153605bcac28 ppp-2.4.2-r12.ebuild 6935
		2	MD5 6205d840f3f2fda06c502408de02a298 ppp-2.4.3-r8.ebuild 9523
1	MD5 1679bdc947d662d842ffba712c44bc94 ChangeLog 22834	3	MD5 1679bdc947d662d842ffba712c44bc94 ChangeLog 22834
		4	MD5 ff2e9f24c17c1fa83d260539af3149cb ppp-2.4.2-r15.ebuild 7411
2	MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295	5	MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
3	MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209	6	MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209
4	MD5 06756b9843bf54824792153605bcac28 ppp-2.4.2-r12.ebuild 6935	7	MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
5	MD5 ff2e9f24c17c1fa83d260539af3149cb ppp-2.4.2-r15.ebuild 7411	8	MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
6	MD5 2b7d702806660278ad8fc0f38b3cb842 ppp-2.4.3-r8.ebuild 8082	9	MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
7	MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530	10	MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
8	MD5 140bc2a08334d3546f43259934da603e files/chat-default 347	11	MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
		12	MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
		13	MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
9	MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775	14	MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775
10	MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271	15	MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271
11	MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r12 271	16	MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r12 271
12	MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
13	MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
14	MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
15	MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
16	MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
17	MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
18	MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
19	MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
20	MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
21	MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
22	MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
23	MD5 23a7e77ad13ddd12f281fe134508e52f files/digest-ppp-2.4.2-r15 271	17	MD5 23a7e77ad13ddd12f281fe134508e52f files/digest-ppp-2.4.2-r15 271
		18	MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
		19	MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
		20	MD5 af39f6df6bcd564f9ff725f3ab457ae4 files/ppp-2.4.3-eaptls-mppe-0.7.patch 6308
24	MD5 b7ba474b501edf4a1179142b306bdcd0 files/digest-ppp-2.4.3-r8 195	21	MD5 b7ba474b501edf4a1179142b306bdcd0 files/digest-ppp-2.4.3-r8 195
		22	MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
		23	MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
		24	MD5 0dcb7dd0a688a256ca520727b5fc36d4 files/ppp-2.4.3-eaptls-0.7.patch 72420
		25	MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
		26	MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605

Lines 13-25 Link Here

(-)/usr/portage/net-dialup/ppp/ppp-2.4.3-r8.ebuild (-2 / +26 lines)
13	LICENSE="BSD GPL-2"	13	LICENSE="BSD GPL-2"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"	15	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
16	IUSE="activefilter atm dhcp gtk ipv6 mppe-mppc pam radius"	16	IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
17		17
18	RDEPEND="virtual/libc	18	RDEPEND="virtual/libc
19	activefilter? ( >=virtual/libpcap-0.9.3 )	19	activefilter? ( >=virtual/libpcap-0.9.3 )
20	atm? ( net-dialup/linux-atm )	20	atm? ( net-dialup/linux-atm )
21	pam? ( sys-libs/pam )	21	pam? ( sys-libs/pam )
22	gtk? ( =x11-libs/gtk+-1* )"	22	gtk? ( =x11-libs/gtk+-1* )
		23	eap-tls? ( net-misc/curl )
		24	eap-tls? ( dev-libs/openssl )"
23	DEPEND="${RDEPEND}	25	DEPEND="${RDEPEND}
24	>=sys-apps/sed-4"	26	>=sys-apps/sed-4"
25		27
Lines 68-73 Link Here
68	sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux	70	sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
69	}	71	}
70		72
		73	use eap-tls && {
		74	einfo "Adding support of authenticating with certificates..."
		75	cp ${FILESDIR}/ppp-2.4.3-eaptls-0.7.patch ${WORKDIR}/patch/
		76	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
		77	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
		78	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
		79	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
		80	sed -i "s/^-.*upap\.h eap\.h/- upap.h eap.h mplscp.h/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch
		81	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
		82	sed -i "s/^-COPTS = -O2 -pipe -Wall -g$/-COPTS+= -Wall/" ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch
		83	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
		84	epatch ${WORKDIR}/patch/ppp-2.4.3-eaptls-0.7.patch
		85	}
		86
		87	use eap-tls && use mppe-mppc && {
		88	einfo "Allowing MPPE to work with autentification with certificates..."
		89	opt="$EPATCH_OPTS"
		90	EPATCH_OPTS="-l"
		91	epatch ${FILESDIR}/ppp-2.4.3-eaptls-mppe-0.7.patch
		92	EPATCH_OPTS="$opt"
		93	}
		94
71	einfo "Enabling CBCP"	95	einfo "Enabling CBCP"
72	sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux	96	sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux
73		97

Return to bug 109935