1 |
commit: 71fed557815206d7b1380326fdfbcc56a4105bd7 |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 14 12:19:46 2020 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 14 12:23:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fed557 |
7 |
|
8 |
net-dialup/accel-ppp: version bump |
9 |
|
10 |
Add snapshot with upstream changes, |
11 |
fixing CVE-2020-15173 |
12 |
|
13 |
Gentoo-Bug: https://bugs.gentoo.org/741568 |
14 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
15 |
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> |
16 |
|
17 |
net-dialup/accel-ppp/Manifest | 1 + |
18 |
.../accel-ppp/accel-ppp-1.12.0_p20200913.ebuild | 109 +++++++++++++++++++++ |
19 |
2 files changed, 110 insertions(+) |
20 |
|
21 |
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest |
22 |
index 2272c95bf67..e3e8b2a8bf6 100644 |
23 |
--- a/net-dialup/accel-ppp/Manifest |
24 |
+++ b/net-dialup/accel-ppp/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba |
27 |
+DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6 |
28 |
|
29 |
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..43549ba9cb3 |
32 |
--- /dev/null |
33 |
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild |
34 |
@@ -0,0 +1,109 @@ |
35 |
+# Copyright 1999-2020 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=7 |
39 |
+ |
40 |
+inherit cmake flag-o-matic linux-info linux-mod |
41 |
+ |
42 |
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server" |
43 |
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/" |
44 |
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2" |
45 |
+ |
46 |
+LICENSE="GPL-2" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~amd64 ~x86" |
49 |
+IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" |
50 |
+ |
51 |
+RDEPEND="lua? ( dev-lang/lua:0 ) |
52 |
+ postgres? ( dev-db/postgresql:* ) |
53 |
+ snmp? ( net-analyzer/net-snmp ) |
54 |
+ dev-libs/libpcre |
55 |
+ dev-libs/openssl:0=" |
56 |
+DEPEND="${RDEPEND} |
57 |
+ valgrind? ( dev-util/valgrind )" |
58 |
+PDEPEND="net-dialup/ppp-scripts" |
59 |
+ |
60 |
+DOCS=( README ) |
61 |
+ |
62 |
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" |
63 |
+ |
64 |
+REQUIRED_USE="valgrind? ( debug )" |
65 |
+ |
66 |
+PATCHES=( |
67 |
+ "${FILESDIR}/${PN}-1.11.1-socklen.patch" |
68 |
+) |
69 |
+ |
70 |
+S="${WORKDIR}" |
71 |
+ |
72 |
+pkg_setup() { |
73 |
+ if use ipoe; then |
74 |
+ linux-mod_pkg_setup |
75 |
+ set_arch_to_kernel |
76 |
+ else |
77 |
+ linux-info_pkg_setup |
78 |
+ fi |
79 |
+} |
80 |
+ |
81 |
+src_prepare() { |
82 |
+ sed -i -e "/mkdir/d" \ |
83 |
+ -e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed' |
84 |
+ |
85 |
+ # Do not install kernel modules like that - breaks sandbox! |
86 |
+ sed -i -e '/modules_install/d' \ |
87 |
+ drivers/ipoe/CMakeLists.txt \ |
88 |
+ drivers/vlan_mon/CMakeLists.txt || die |
89 |
+ |
90 |
+ # Fix version |
91 |
+ sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die |
92 |
+ sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die |
93 |
+ |
94 |
+ # Bug #549918 |
95 |
+ append-ldflags -Wl,-z,lazy |
96 |
+ |
97 |
+ cmake_src_prepare |
98 |
+} |
99 |
+ |
100 |
+src_configure() { |
101 |
+ local libdir="$(get_libdir)" |
102 |
+ # There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL |
103 |
+ local mycmakeargs=( |
104 |
+ -DLIB_SUFFIX="${libdir#lib}" |
105 |
+ -DBUILD_IPOE_DRIVER="$(usex ipoe)" |
106 |
+ -DBUILD_PPTP_DRIVER=no |
107 |
+ -DBUILD_VLAN_MON_DRIVER="$(usex ipoe)" |
108 |
+ -DCRYPTO=OPENSSL |
109 |
+ -DLOG_PGSQL="$(usex postgres)" |
110 |
+ -DLUA="$(usex lua TRUE FALSE)" |
111 |
+ -DMEMDEBUG="$(usex debug)" |
112 |
+ -DNETSNMP="$(usex snmp)" |
113 |
+ -DRADIUS="$(usex radius)" |
114 |
+ -DSHAPER="$(usex shaper)" |
115 |
+ $(use debug && echo "-DVALGRIND=$(usex valgrind)") |
116 |
+ ) |
117 |
+ cmake_src_configure |
118 |
+} |
119 |
+ |
120 |
+src_compile() { |
121 |
+ cmake_src_compile |
122 |
+} |
123 |
+ |
124 |
+src_install() { |
125 |
+ if use ipoe; then |
126 |
+ local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)" |
127 |
+ linux-mod_src_install |
128 |
+ fi |
129 |
+ |
130 |
+ cmake_src_install |
131 |
+ |
132 |
+ use doc && dodoc -r rfc |
133 |
+ |
134 |
+ if use snmp; then |
135 |
+ insinto /usr/share/snmp/mibs |
136 |
+ doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt |
137 |
+ fi |
138 |
+ |
139 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}d |
140 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}d |
141 |
+ |
142 |
+ keepdir /var/log/accel-ppp |
143 |
+} |