Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/ppp/
Date: Mon, 29 Apr 2019 00:23:44
Message-Id: 1556497413.bbba9ad89b90b660232011d35bdb726d3a2f694e.polynomial-c@gentoo
1 commit: bbba9ad89b90b660232011d35bdb726d3a2f694e
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 29 00:23:20 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 29 00:23:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbba9ad8
7
8 net-dialup/ppp: Removed old.
9
10 Package-Manager: Portage-2.3.65, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-dialup/ppp/Manifest | 1 -
14 net-dialup/ppp/ppp-2.4.7-r6.ebuild | 230 -------------------------------------
15 2 files changed, 231 deletions(-)
16
17 diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
18 index 8b38b71a7a4..4fd619a491a 100644
19 --- a/net-dialup/ppp/Manifest
20 +++ b/net-dialup/ppp/Manifest
21 @@ -1,4 +1,3 @@
22 -DIST ppp-2.4.7-patches-6.tar.xz 39420 BLAKE2B 22754af6f266ff43f6b3cc2931ca33e9d0865ce08b8eed6961740a3a06ec69b6406c702a86e7f4a7b2f7dc9e2a751581ae58cd4398cff5e6646e53ee069e08d7 SHA512 16342010515e6d69d446656b52208e3f034c47aad8643a1e2f48fa410343f8a2e0bc8b5223b4bdc381050d9dc49a7b7ac6bc74b37380072eb91214b216d8afa2
23 DIST ppp-2.4.7-patches-7.tar.xz 40540 BLAKE2B 353814692aab3012f5d5ccdecc514d69357826ea7abe64a7581c562f333d868f9766f11516721cf0b116b4c1c8b01daee306d98ef7be356af6e8d16e22fc9fac SHA512 9d34c044ded09424a6d80047e88bb21130a9c2414c9ea4f52c7299d9db08b1391543b50cd97c0c8763e6943591fc325d01932b31966a1374dbfe5e977bbf4356
24 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
25 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
26
27 diff --git a/net-dialup/ppp/ppp-2.4.7-r6.ebuild b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
28 deleted file mode 100644
29 index f8547e791e9..00000000000
30 --- a/net-dialup/ppp/ppp-2.4.7-r6.ebuild
31 +++ /dev/null
32 @@ -1,230 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit linux-info multilib pam toolchain-funcs
39 -
40 -PATCH_VER="6"
41 -DESCRIPTION="Point-to-Point Protocol (PPP)"
42 -HOMEPAGE="https://ppp.samba.org/"
43 -SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
44 - https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
45 - http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
46 -
47 -LICENSE="BSD GPL-2"
48 -SLOT="0/${PV}"
49 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
50 -IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
51 -
52 -DEPEND="activefilter? ( net-libs/libpcap )
53 - atm? ( net-dialup/linux-atm )
54 - pam? ( virtual/pam )
55 - gtk? ( x11-libs/gtk+:2 )
56 - eap-tls? (
57 - !libressl? ( dev-libs/openssl:0= )
58 - libressl? ( dev-libs/libressl:= )
59 - )"
60 -RDEPEND="${DEPEND}"
61 -PDEPEND="net-dialup/ppp-scripts"
62 -
63 -src_prepare() {
64 - mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
65 -
66 - if ! use eap-tls ; then
67 - rm "${WORKDIR}"/patch/8?_all_eaptls-* || die
68 - fi
69 - eapply "${WORKDIR}"/patch
70 -
71 - if use atm ; then
72 - einfo "Enabling PPPoATM support"
73 - sed -i '/^#HAVE_LIBATM=yes/s:#::' \
74 - pppd/plugins/pppoatm/Makefile.linux || die
75 - fi
76 -
77 - if ! use activefilter ; then
78 - einfo "Disabling active filter"
79 - sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
80 - fi
81 -
82 - if use pam ; then
83 - einfo "Enabling PAM"
84 - sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
85 - fi
86 -
87 - if use ipv6 ; then
88 - einfo "Enabling IPv6"
89 - sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
90 - echo "+ipv6" >> etc.ppp/options || die
91 - fi
92 -
93 - einfo "Enabling CBCP"
94 - sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
95 -
96 - if use dhcp ; then
97 - einfo "Adding ppp-dhcp plugin files"
98 - sed \
99 - -e '/^SUBDIRS :=/s:$: dhcp:' \
100 - -i pppd/plugins/Makefile.linux || die
101 - fi
102 -
103 - # Set correct libdir
104 - sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
105 - pppd/{pathnames.h,pppd.8} || die
106 -
107 - if use radius ; then
108 - #set the right paths in radiusclient.conf
109 - sed -e "s:/usr/local/etc:/etc:" \
110 - -e "s:/usr/local/sbin:/usr/sbin:" \
111 - -i pppd/plugins/radius/etc/radiusclient.conf || die
112 - #set config dir to /etc/ppp/radius
113 - sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
114 - pppd/plugins/radius/{*.8,*.c,*.h} \
115 - pppd/plugins/radius/etc/* || die
116 - else
117 - einfo "Disabling radius"
118 - sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
119 - fi
120 -
121 - # Respect our pkg-config settings.
122 - sed -i \
123 - -e 's:pkg-config:$(PKG_CONFIG):' \
124 - contrib/pppgetpass/Makefile.linux || die
125 - sed -i \
126 - -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \
127 - pppd/Makefile.linux || die
128 -
129 - eapply_user #549588
130 -}
131 -
132 -src_compile() {
133 - tc-export AR CC PKG_CONFIG
134 - emake COPTS="${CFLAGS} -D_GNU_SOURCE"
135 -
136 - # build pppgetpass
137 - cd contrib/pppgetpass || die
138 - if use gtk ; then
139 - emake -f Makefile.linux
140 - else
141 - emake pppgetpass.vt
142 - fi
143 -}
144 -
145 -src_install() {
146 - local i
147 - for i in chat pppd pppdump pppstats ; do
148 - doman ${i}/${i}.8
149 - dosbin ${i}/${i}
150 - done
151 - fperms u+s-w /usr/sbin/pppd
152 -
153 - # Install pppd header files
154 - emake -C pppd INSTROOT="${D}" install-devel
155 -
156 - dosbin pppd/plugins/rp-pppoe/pppoe-discovery
157 -
158 - dodir /etc/ppp/peers
159 - insinto /etc/ppp
160 - insopts -m0600
161 - newins etc.ppp/pap-secrets pap-secrets.example
162 - newins etc.ppp/chap-secrets chap-secrets.example
163 -
164 - insopts -m0644
165 - doins etc.ppp/options
166 -
167 - pamd_mimic_system ppp auth account session
168 -
169 - local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
170 - # closing " for syntax coloring
171 - insinto "${PLUGINS_DIR}"
172 - insopts -m0755
173 - doins pppd/plugins/minconn.so
174 - doins pppd/plugins/passprompt.so
175 - doins pppd/plugins/passwordfd.so
176 - doins pppd/plugins/winbind.so
177 - doins pppd/plugins/rp-pppoe/rp-pppoe.so
178 - doins pppd/plugins/pppol2tp/openl2tp.so
179 - doins pppd/plugins/pppol2tp/pppol2tp.so
180 - if use atm ; then
181 - doins pppd/plugins/pppoatm/pppoatm.so
182 - fi
183 - if use dhcp ; then
184 - doins pppd/plugins/dhcp/dhcpc.so
185 - fi
186 - if use radius ; then
187 - doins pppd/plugins/radius/rad{ius,attr,realms}.so
188 -
189 - #Copy radiusclient configuration files (#92878)
190 - insinto /etc/ppp/radius
191 - insopts -m0644
192 - doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
193 -
194 - doman pppd/plugins/radius/pppd-rad{ius,attr}.8
195 - fi
196 -
197 - insinto /etc/modprobe.d
198 - insopts -m0644
199 - newins "${FILESDIR}/modules.ppp" ppp.conf
200 -
201 - dodoc PLUGINS README* SETUP Changes-2.3 FAQ
202 - dodoc "${FILESDIR}/README.mpls"
203 -
204 - dosbin scripts/p{on,off,log}
205 - doman scripts/pon.1
206 -
207 - # Adding misc. specialized scripts to doc dir
208 - insinto /usr/share/doc/${PF}/scripts/chatchat
209 - doins scripts/chatchat/*
210 - insinto /usr/share/doc/${PF}/scripts
211 - doins scripts/*
212 -
213 - if use gtk ; then
214 - dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
215 - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
216 - else
217 - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
218 - fi
219 - doman contrib/pppgetpass/pppgetpass.8
220 -}
221 -
222 -pkg_postinst() {
223 - if linux-info_get_any_version && linux_config_src_exists ; then
224 - echo
225 - ewarn "If the following test report contains a missing kernel configuration option that you need,"
226 - ewarn "you should reconfigure and rebuild your kernel before running pppd."
227 - CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
228 - local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
229 - local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
230 - local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
231 - if use activefilter ; then
232 - CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
233 - local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
234 - fi
235 - CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
236 - local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
237 - local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
238 - local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
239 - CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
240 - local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
241 - local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
242 - if use atm ; then
243 - CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
244 - local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
245 - fi
246 - check_extra_config
247 - fi
248 -
249 - # create *-secrets files if not exists
250 - [ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
251 - cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
252 - [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
253 - cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
254 -
255 - # lib name has changed
256 - sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
257 -
258 - echo
259 - elog "Pon, poff and plog scripts have been supplied for experienced users."
260 - elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
261 - elog "/usr/share/doc/${PF}/scripts directory."
262 -}