1 |
commit: 21385e862dd6ac6b6f9923b5e9562f85fb359e58 |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 21 12:49:36 2018 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 21 12:51:54 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21385e86 |
7 |
|
8 |
net-dialup/accel-ppp: version bump, sync live ebuilds |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-dialup/accel-ppp/Manifest | 1 + |
13 |
...99.ebuild => accel-ppp-1.11.1_p20180320.ebuild} | 22 +++++++++++++--------- |
14 |
net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild | 8 ++++---- |
15 |
net-dialup/accel-ppp/accel-ppp-9999.ebuild | 8 ++++---- |
16 |
4 files changed, 22 insertions(+), 17 deletions(-) |
17 |
|
18 |
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest |
19 |
index 5a31e3bd01a..8f25dd71aaf 100644 |
20 |
--- a/net-dialup/accel-ppp/Manifest |
21 |
+++ b/net-dialup/accel-ppp/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST accel-ppp-1.11.0.tar.bz2 1594327 BLAKE2B f23d8e4f68837e6394136013ce3e65705990f7cf15822a2939c36d00eae49d33c8b88db56629d78a5092b994256fee9859dbb3547484b8800f7fad8d0866e45f SHA512 907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c |
24 |
DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 BLAKE2B 5993e25e09e84fa62fde28e6c79b11514eb5e0c365a8cc1a36c4e3e56ac868725b14049e28184188330ac78cb6c128429f2cc89241d871c02e4154c6882a89e2 SHA512 79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31a7777fbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a |
25 |
+DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914 |
26 |
|
27 |
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild |
28 |
similarity index 84% |
29 |
copy from net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild |
30 |
copy to net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild |
31 |
index f4c53dbb43e..c8c6d3cd86f 100644 |
32 |
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild |
33 |
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild |
34 |
@@ -1,19 +1,17 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Copyright 1999-2018 Gentoo Foundation |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
EAPI=6 |
40 |
|
41 |
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code" |
42 |
-EGIT_BRANCH="1.11" |
43 |
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod |
44 |
+inherit cmake-utils flag-o-matic linux-info linux-mod |
45 |
|
46 |
DESCRIPTION="High performance PPTP, PPPoE and L2TP server" |
47 |
HOMEPAGE="http://accel-ppp.sourceforge.net/" |
48 |
-SRC_URI="" |
49 |
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2" |
50 |
|
51 |
LICENSE="GPL-2" |
52 |
SLOT="0" |
53 |
-KEYWORDS="" |
54 |
+KEYWORDS="~amd64 ~x86" |
55 |
IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" |
56 |
|
57 |
RDEPEND="lua? ( dev-lang/lua:0 ) |
58 |
@@ -31,6 +29,12 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" |
59 |
|
60 |
REQUIRED_USE="valgrind? ( debug )" |
61 |
|
62 |
+PATCHES=( |
63 |
+ "${FILESDIR}/${PN}-1.11.1-socklen.patch" |
64 |
+) |
65 |
+ |
66 |
+S="${WORKDIR}" |
67 |
+ |
68 |
pkg_setup() { |
69 |
if use ipoe; then |
70 |
linux-mod_pkg_setup |
71 |
@@ -42,7 +46,6 @@ pkg_setup() { |
72 |
|
73 |
src_prepare() { |
74 |
sed -i -e "/mkdir/d" \ |
75 |
- -e "/echo/d" \ |
76 |
-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed' |
77 |
|
78 |
# Do not install kernel modules like that - breaks sandbox! |
79 |
@@ -60,17 +63,18 @@ src_configure() { |
80 |
local libdir="$(get_libdir)" |
81 |
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL |
82 |
local mycmakeargs=( |
83 |
- -DLIB_PATH_SUFFIX="${libdir#lib}" |
84 |
+ -DLIB_SUFFIX="${libdir#lib}" |
85 |
-DBUILD_IPOE_DRIVER="$(usex ipoe)" |
86 |
-DBUILD_PPTP_DRIVER=no |
87 |
-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)" |
88 |
-DCRYPTO=OPENSSL |
89 |
-DLOG_PGSQL="$(usex postgres)" |
90 |
+ -DLUA="$(usex lua)" |
91 |
-DMEMDEBUG="$(usex debug)" |
92 |
-DNETSNMP="$(usex snmp)" |
93 |
-DRADIUS="$(usex radius)" |
94 |
-DSHAPER="$(usex shaper)" |
95 |
- -DVALGRIND="$(usex valgrind)" |
96 |
+ $(use debug && echo "-DVALGRIND=$(usex valgrind)") |
97 |
) |
98 |
cmake-utils_src_configure |
99 |
} |
100 |
|
101 |
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild |
102 |
index f4c53dbb43e..fa1729fe089 100644 |
103 |
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild |
104 |
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild |
105 |
@@ -1,4 +1,4 @@ |
106 |
-# Copyright 1999-2017 Gentoo Foundation |
107 |
+# Copyright 1999-2018 Gentoo Foundation |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
|
110 |
EAPI=6 |
111 |
@@ -42,7 +42,6 @@ pkg_setup() { |
112 |
|
113 |
src_prepare() { |
114 |
sed -i -e "/mkdir/d" \ |
115 |
- -e "/echo/d" \ |
116 |
-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed' |
117 |
|
118 |
# Do not install kernel modules like that - breaks sandbox! |
119 |
@@ -60,17 +59,18 @@ src_configure() { |
120 |
local libdir="$(get_libdir)" |
121 |
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL |
122 |
local mycmakeargs=( |
123 |
- -DLIB_PATH_SUFFIX="${libdir#lib}" |
124 |
+ -DLIB_SUFFIX="${libdir#lib}" |
125 |
-DBUILD_IPOE_DRIVER="$(usex ipoe)" |
126 |
-DBUILD_PPTP_DRIVER=no |
127 |
-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)" |
128 |
-DCRYPTO=OPENSSL |
129 |
-DLOG_PGSQL="$(usex postgres)" |
130 |
+ -DLUA="$(usex lua)" |
131 |
-DMEMDEBUG="$(usex debug)" |
132 |
-DNETSNMP="$(usex snmp)" |
133 |
-DRADIUS="$(usex radius)" |
134 |
-DSHAPER="$(usex shaper)" |
135 |
- -DVALGRIND="$(usex valgrind)" |
136 |
+ $(use debug && echo "-DVALGRIND=$(usex valgrind)") |
137 |
) |
138 |
cmake-utils_src_configure |
139 |
} |
140 |
|
141 |
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
142 |
index 0630264eef3..cbb628950c2 100644 |
143 |
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
144 |
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
145 |
@@ -1,4 +1,4 @@ |
146 |
-# Copyright 1999-2017 Gentoo Foundation |
147 |
+# Copyright 1999-2018 Gentoo Foundation |
148 |
# Distributed under the terms of the GNU General Public License v2 |
149 |
|
150 |
EAPI=6 |
151 |
@@ -41,7 +41,6 @@ pkg_setup() { |
152 |
|
153 |
src_prepare() { |
154 |
sed -i -e "/mkdir/d" \ |
155 |
- -e "/echo/d" \ |
156 |
-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed' |
157 |
|
158 |
# Do not install kernel modules like that - breaks sandbox! |
159 |
@@ -59,17 +58,18 @@ src_configure() { |
160 |
local libdir="$(get_libdir)" |
161 |
# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL |
162 |
local mycmakeargs=( |
163 |
- -DLIB_PATH_SUFFIX="${libdir#lib}" |
164 |
+ -DLIB_SUFFIX="${libdir#lib}" |
165 |
-DBUILD_IPOE_DRIVER="$(usex ipoe)" |
166 |
-DBUILD_PPTP_DRIVER=no |
167 |
-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)" |
168 |
-DCRYPTO=OPENSSL |
169 |
-DLOG_PGSQL="$(usex postgres)" |
170 |
+ -DLUA="$(usex lua)" |
171 |
-DMEMDEBUG="$(usex debug)" |
172 |
-DNETSNMP="$(usex snmp)" |
173 |
-DRADIUS="$(usex radius)" |
174 |
-DSHAPER="$(usex shaper)" |
175 |
- -DVALGRIND="$(usex valgrind)" |
176 |
+ $(use debug && echo "-DVALGRIND=$(usex valgrind)") |
177 |
) |
178 |
cmake-utils_src_configure |
179 |
} |