Diff ppp-2.4.4-r25 with a ppp-2.4.5-r1

/usr/portage/net-dialup/ppp/ppp-2.4.5-r1.ebuild 2011-07-17 15:54:00.000000000 +0400
1 1
# Copyright 1999-2011 Gentoo Foundation
2 2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r25.ebuild,v 1.11 2011/04/02 12:51:08 ssuominen Exp $
3
# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r1.ebuild,v 1.7 2011/07/17 11:54:21 xarthisius Exp $
4 4

  
5 5
EAPI="2"
6 6

  
......
9 9
DESCRIPTION="Point-to-Point Protocol (PPP)"
10 10
HOMEPAGE="http://www.samba.org/ppp"
11 11
SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
12
	mirror://gentoo/${P}-gentoo-20091116.tar.gz
12
	mirror://gentoo/${P}-gentoo-20101127.tar.gz
13 13
	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
14 14

  
15 15
LICENSE="BSD GPL-2"
16 16
SLOT="0"
17 17
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
18
IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
18
IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
19 19

  
20
DEPEND="activefilter? ( >=net-libs/libpcap-0.9.4 )
20
DEPEND="activefilter? ( net-libs/libpcap )
21 21
	atm? ( net-dialup/linux-atm )
22 22
	pam? ( virtual/pam )
23
	gtk? ( >=x11-libs/gtk+-2.8:2 )
24
	eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
23
	gtk? ( x11-libs/gtk+:2 )
24
	eap-tls? ( net-misc/curl dev-libs/openssl )"
25 25
RDEPEND="${DEPEND}"
26 26

  
27
pkg_setup() {
28
	if use mppe-mppc; then
29
		echo
30
		ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
31
		ewarn "patch developed by Jan Dubiec."
32
		ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
33
		ewarn "You could obtain the kernel patch from MPPE-MPPC homepage:"
34
		ewarn "   http://mppe-mppc.alphacron.de/"
35
		ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
36
		ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
37
		ebeep
38
	fi
39
}
40

  
41 27
src_prepare() {
42 28
	epatch "${WORKDIR}/patch/make-vars.patch"
43 29
	epatch "${WORKDIR}/patch/mpls.patch"
44 30
	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
45 31
	epatch "${WORKDIR}/patch/wait-children.patch"
46
	epatch "${WORKDIR}/patch/maxoctets-2Glimit.patch"
47 32
	epatch "${WORKDIR}/patch/defaultgateway.patch"
48
	epatch "${WORKDIR}/patch/mschapv2-initialize-response.patch"
49 33
	epatch "${WORKDIR}/patch/linkpidfile.patch"
50 34
	epatch "${WORKDIR}/patch/qa-fixes.patch"
51
	epatch "${WORKDIR}/patch/kill-pg.patch"
52 35
	epatch "${WORKDIR}/patch/auth-fail.patch"
53 36
	epatch "${WORKDIR}/patch/defaultmetric.patch"
54 37
	epatch "${WORKDIR}/patch/dev-ppp.patch"
55 38
	epatch "${WORKDIR}/patch/gtk2.patch"
56
	epatch "${WORKDIR}/patch/pppoe-lcp-timeout.patch"
57 39
	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
58 40
	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
59 41
	epatch "${WORKDIR}/patch/connect-errors.patch"
60
	epatch "${WORKDIR}/patch/ppp-pppoe-mac.patch"
42
	epatch "${WORKDIR}/patch/Makefile.patch"
43
	epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
44
	epatch "${WORKDIR}/patch/pado-timeout.patch"
45
	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
61 46

  
62 47
	use eap-tls && {
63
		# see http://eaptls.spe.net/index.html for more info
48
		# see http://www.nikhef.nl/~janjust/ppp for more info
64 49
		einfo "Enabling EAP-TLS support"
65
		epatch "${WORKDIR}/patch/eaptls-0.7-gentoo.patch"
66
		use mppe-mppc || epatch "${WORKDIR}/patch/eaptls-mppe-0.7.patch"
67
	}
68

  
69
	use mppe-mppc && {
70
		einfo "Enabling MPPE-MPPC support"
71
		epatch "${WORKDIR}/patch/mppe-mppc-1.1.patch"
72
		use eap-tls && epatch "${WORKDIR}/patch/eaptls-mppe-0.7-with-mppc.patch"
50
		epatch "${WORKDIR}/patch/eaptls-mppe-0.98-gentoo.patch"
73 51
	}
74 52

  
75 53
	use atm && {
......
97 75

  
98 76
	use dhcp && {
99 77
		# copy the ppp-dhcp plugin files
100
		einfo "Copying ppp-dhcp plugin files..."
101
		tar -xzf "${DISTDIR}/ppp-dhcpc.tgz" -C pppd/plugins/ \
102
			&& sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux \
78
		einfo "Adding ppp-dhcp plugin files..."
79
		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" \
80
			&& sed -i -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' pppd/plugins/Makefile.linux \
103 81
			|| die "ppp-dhcp plugin addition failed"
104 82
		epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
105 83
		epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
......
144 122
src_install() {
145 123
	local i
146 124
	for i in chat pppd pppdump pppstats ; do
147
		doman ${i}/${i}.8
148
		dosbin ${i}/${i} || die
125
		doman ${i}/${i}.8 || die "man page for ${i} not build"
126
		dosbin ${i}/${i} || die "${i} not build"
149 127
	done
150 128
	fperms u+s-w /usr/sbin/pppd
151 129

  
152 130
	# Install pppd header files
153 131
	pushd pppd >/dev/null
154
	emake INSTROOT="${D}" install-devel || die
132
	emake INSTROOT="${D}" install-devel || die "emake install-devel failed"
155 133
	popd >/dev/null
156 134

  
157
	dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die
135
	dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die "pppoe-discovery not build"
158 136

  
159 137
	dodir /etc/ppp/peers
160 138
	insinto /etc/ppp
161 139
	insopts -m0600
162
	newins etc.ppp/pap-secrets pap-secrets.example
163
	newins etc.ppp/chap-secrets chap-secrets.example
140
	newins etc.ppp/pap-secrets pap-secrets.example || die "pap-secrets.example not found"
141
	newins etc.ppp/chap-secrets chap-secrets.example || die "chap-secrets.example not found"
164 142

  
165 143
	insopts -m0644
166 144
	doins etc.ppp/options
......
184 162
	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
185 163
	doins pppd/plugins/winbind.so || die "winbind.so not build"
186 164
	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
165
	doins pppd/plugins/pppol2tp/openl2tp.so || die "openl2tp.so not build"
166
	doins pppd/plugins/pppol2tp/pppol2tp.so || die "pppol2tp.so not build"
187 167
	if use atm; then
188 168
		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
189 169
	fi
......
207 187
	insinto /etc/modprobe.d
208 188
	insopts -m0644
209 189
	newins "${FILESDIR}/modules.ppp" ppp.conf
210
	if use mppe-mppc; then
211
		sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' "${D}/etc/modprobe.d/ppp.conf"
212
	fi
213 190

  
214 191
	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
215 192
	dodoc "${FILESDIR}/README.mpls"
......
247 224
			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
248 225
			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
249 226
		fi
250
		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP"
227
		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
251 228
		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
252 229
		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
253
		if use mppe-mppc ; then
254
			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE_MPPC"
255
			local WARNING_PPP_MPPE_MPPC="CONFIG_PPP_MPPE_MPPC:\t missing MPPE/MPPC encryption/compression (optional, mostly used by PPTP links)"
256
		else
257
			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE"
258
			local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
259
		fi
230
		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
260 231
		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
261 232
		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
262 233
		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
Thank you!