1 |
commit: d413bc84e352fd761aabeadd7fe5a2412fd2b9bf |
2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
3 |
AuthorDate: Tue Nov 30 12:12:46 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 1 21:29:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d413bc84 |
7 |
|
8 |
net-dialup/rp-pppoe: revision bump to fix bugs. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/715396 |
11 |
Closes: https://bugs.gentoo.org/364941 |
12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
13 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/23126 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
net-dialup/rp-pppoe/metadata.xml | 2 +- |
18 |
net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild | 89 +++++++++++++++++++++++++++++ |
19 |
2 files changed, 90 insertions(+), 1 deletion(-) |
20 |
|
21 |
diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml |
22 |
index 77a87ef4abda..6bde8ba5af3b 100644 |
23 |
--- a/net-dialup/rp-pppoe/metadata.xml |
24 |
+++ b/net-dialup/rp-pppoe/metadata.xml |
25 |
@@ -9,4 +9,4 @@ |
26 |
<email>base-system@g.o</email> |
27 |
<name>Gentoo Base System</name> |
28 |
</maintainer> |
29 |
- </pkgmetadata> |
30 |
+</pkgmetadata> |
31 |
|
32 |
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild |
33 |
new file mode 100644 |
34 |
index 000000000000..dba2eeb9b98f |
35 |
--- /dev/null |
36 |
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.15-r1.ebuild |
37 |
@@ -0,0 +1,89 @@ |
38 |
+# Copyright 1999-2021 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=7 |
42 |
+ |
43 |
+inherit autotools readme.gentoo-r1 toolchain-funcs |
44 |
+ |
45 |
+PATCHES="${PN}-3.14-patches-01" |
46 |
+ |
47 |
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux" |
48 |
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/" |
49 |
+SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz |
50 |
+ https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz" |
51 |
+ |
52 |
+LICENSE="GPL-2" |
53 |
+SLOT="0" |
54 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
55 |
+IUSE="tk" |
56 |
+ |
57 |
+RDEPEND=" |
58 |
+ net-dialup/ppp:= |
59 |
+ sys-apps/iproute2 |
60 |
+ tk? ( dev-lang/tk:= ) |
61 |
+" |
62 |
+DEPEND=">=sys-kernel/linux-headers-2.6.25 |
63 |
+ ${RDEPEND}" |
64 |
+ |
65 |
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection" |
66 |
+ |
67 |
+pkg_setup() { |
68 |
+ # This is needed in multiple phases |
69 |
+ PPPD_VER="$(best_version net-dialup/ppp)" |
70 |
+ PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR} |
71 |
+ PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV} |
72 |
+ |
73 |
+ PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}" |
74 |
+} |
75 |
+ |
76 |
+src_prepare() { |
77 |
+ if ! use elibc_musl ; then |
78 |
+ rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die |
79 |
+ fi |
80 |
+ |
81 |
+ rm "${WORKDIR}/patches/${PN}-3.14-ifconfig-path.patch" || die |
82 |
+ |
83 |
+ eapply "${WORKDIR}/patches" |
84 |
+ eapply_user |
85 |
+ |
86 |
+ cd "${S}"/src || die |
87 |
+ eautoreconf |
88 |
+} |
89 |
+ |
90 |
+src_configure() { |
91 |
+ addpredict /dev/ppp |
92 |
+ |
93 |
+ cd src || die |
94 |
+ |
95 |
+ econf --enable-plugin=/usr/include/pppd |
96 |
+} |
97 |
+ |
98 |
+src_compile() { |
99 |
+ cd src || die |
100 |
+ emake AR="$(tc-getAR)" PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}" |
101 |
+ |
102 |
+ if use tk ; then |
103 |
+ emake -C "${S}/gui" |
104 |
+ fi |
105 |
+} |
106 |
+ |
107 |
+src_install() { |
108 |
+ cd src || die |
109 |
+ emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install |
110 |
+ |
111 |
+ # We don't need this README file here. |
112 |
+ rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation" |
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 |
+} |