1 |
commit: e25379164de96a9bb68dced4be6a1b284073e1e2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 3 07:38:01 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 3 07:38:36 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2537916 |
7 |
|
8 |
net-dialup/rp-pppoe: Bump to version 3.14 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708452 |
11 |
Closes: https://bugs.gentoo.org/715950 |
12 |
Closes: https://bugs.gentoo.org/721036 |
13 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
net-dialup/rp-pppoe/Manifest | 3 + |
17 |
net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild | 96 ++++++++++++++++++++++++++++++++ |
18 |
2 files changed, 99 insertions(+) |
19 |
|
20 |
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest |
21 |
index fac075dbc80..81e6d6cafff 100644 |
22 |
--- a/net-dialup/rp-pppoe/Manifest |
23 |
+++ b/net-dialup/rp-pppoe/Manifest |
24 |
@@ -1,3 +1,6 @@ |
25 |
DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 |
26 |
+DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478 |
27 |
DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1 |
28 |
DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36 |
29 |
+DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea |
30 |
+DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29 |
31 |
|
32 |
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..eaaeb1d3a7c |
35 |
--- /dev/null |
36 |
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild |
37 |
@@ -0,0 +1,96 @@ |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=7 |
42 |
+ |
43 |
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs |
44 |
+ |
45 |
+PPP_P="ppp-2.4.8" |
46 |
+PATCHES="${P}-patches-01" |
47 |
+ |
48 |
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux" |
49 |
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/" |
50 |
+SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz |
51 |
+ https://github.com/paulusmack/ppp/archive/${PPP_P}.tar.gz |
52 |
+ https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz" |
53 |
+ |
54 |
+LICENSE="GPL-2" |
55 |
+SLOT="0" |
56 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
57 |
+IUSE="tk" |
58 |
+ |
59 |
+RDEPEND=" |
60 |
+ net-dialup/ppp:= |
61 |
+ tk? ( dev-lang/tk:= ) |
62 |
+" |
63 |
+DEPEND=">=sys-kernel/linux-headers-2.6.25 |
64 |
+ ${RDEPEND}" |
65 |
+ |
66 |
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection" |
67 |
+ |
68 |
+pkg_setup() { |
69 |
+ # This is needed in multiple phases |
70 |
+ PPPD_VER=$(best_version net-dialup/ppp) |
71 |
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
72 |
+ PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} |
73 |
+} |
74 |
+ |
75 |
+src_prepare() { |
76 |
+ if ! use elibc_musl ; then |
77 |
+ rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die |
78 |
+ fi |
79 |
+ |
80 |
+ eapply "${WORKDIR}/patches" |
81 |
+ eapply_user |
82 |
+ |
83 |
+ cd "${S}"/src || die |
84 |
+ eautoreconf |
85 |
+} |
86 |
+ |
87 |
+src_configure() { |
88 |
+ addpredict /dev/ppp |
89 |
+ |
90 |
+ cd src || die |
91 |
+ # Not a mistake! This comes from the GitHub tarball doing funky naming |
92 |
+ econf --enable-plugin=../../ppp-ppp-${PPPD_VER} |
93 |
+} |
94 |
+ |
95 |
+src_compile() { |
96 |
+ cd src || die |
97 |
+ emake AR="$(tc-getAR)" |
98 |
+ |
99 |
+ if use tk; then |
100 |
+ emake -C "${S}/gui" |
101 |
+ fi |
102 |
+} |
103 |
+ |
104 |
+src_install() { |
105 |
+ cd src || die |
106 |
+ emake DESTDIR="${D}" install |
107 |
+ |
108 |
+ #Don't use compiled rp-pppoe plugin - see pkg_preinst below |
109 |
+ local pppoe_plugin="${ED}/etc/ppp/plugins/rp-pppoe.so" |
110 |
+ if [[ -f "${pppoe_plugin}" ]] ; then |
111 |
+ rm "${pppoe_plugin}" || die |
112 |
+ fi |
113 |
+ |
114 |
+ if use tk ; then |
115 |
+ emake -C "${S}/gui" \ |
116 |
+ DESTDIR="${D}" \ |
117 |
+ datadir=/usr/share/doc/${PF}/ \ |
118 |
+ install |
119 |
+ dosym doc/${PF}/tkpppoe /usr/share/tkpppoe |
120 |
+ fi |
121 |
+ |
122 |
+ newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server |
123 |
+ newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server |
124 |
+ |
125 |
+ readme.gentoo_create_doc |
126 |
+} |
127 |
+ |
128 |
+pkg_preinst() { |
129 |
+ # Use the rp-pppoe plugin that comes with net-dialup/pppd |
130 |
+ if [[ -n "${PPPD_VER}" ]] && [[ -f "${EROOT}/usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so" ]] ; then |
131 |
+ dosym ../../../usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so |
132 |
+ fi |
133 |
+} |