| 1 |
commit: cd7bdd8a269e0a22dad2a80991a1f4752867fc9b |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 9 13:13:35 2019 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 9 13:15:47 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7bdd8a |
| 7 |
|
| 8 |
net-dialup/accel-ppp: version bump, update live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 12 |
|
| 13 |
net-dialup/accel-ppp/Manifest | 1 + |
| 14 |
...ccel-ppp-9999.ebuild => accel-ppp-1.12.0.ebuild} | 21 ++++++++++++++------- |
| 15 |
net-dialup/accel-ppp/accel-ppp-9999.ebuild | 8 ++++---- |
| 16 |
3 files changed, 19 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest |
| 19 |
index 8cd346959bb..e8ecf5cc9a3 100644 |
| 20 |
--- a/net-dialup/accel-ppp/Manifest |
| 21 |
+++ b/net-dialup/accel-ppp/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914 |
| 24 |
+DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba |
| 25 |
|
| 26 |
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild |
| 27 |
similarity index 84% |
| 28 |
copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild |
| 29 |
copy to net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild |
| 30 |
index ff874dac881..f2e7d2b54cc 100644 |
| 31 |
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
| 32 |
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild |
| 33 |
@@ -1,25 +1,24 @@ |
| 34 |
-# Copyright 1999-2019 Gentoo Foundation |
| 35 |
+# Copyright 1999-2019 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=6 |
| 39 |
+EAPI=7 |
| 40 |
|
| 41 |
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code" |
| 42 |
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod |
| 43 |
+inherit cmake-utils flag-o-matic linux-info linux-mod |
| 44 |
|
| 45 |
DESCRIPTION="High performance PPTP, PPPoE and L2TP server" |
| 46 |
HOMEPAGE="https://sourceforge.net/projects/accel-ppp/" |
| 47 |
-SRC_URI="" |
| 48 |
+SRC_URI="https://download.sourceforge.net/accel-ppp/${P}.tar.bz2 -> ${P}.tar" |
| 49 |
|
| 50 |
LICENSE="GPL-2" |
| 51 |
SLOT="0" |
| 52 |
-KEYWORDS="" |
| 53 |
+KEYWORDS="~amd64 ~x86" |
| 54 |
IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" |
| 55 |
|
| 56 |
RDEPEND="lua? ( dev-lang/lua:0 ) |
| 57 |
postgres? ( dev-db/postgresql:* ) |
| 58 |
snmp? ( net-analyzer/net-snmp ) |
| 59 |
dev-libs/libpcre |
| 60 |
- dev-libs/openssl:0" |
| 61 |
+ dev-libs/openssl:0=" |
| 62 |
DEPEND="${RDEPEND} |
| 63 |
valgrind? ( dev-util/valgrind )" |
| 64 |
PDEPEND="net-dialup/ppp-scripts" |
| 65 |
@@ -30,6 +29,10 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" |
| 66 |
|
| 67 |
REQUIRED_USE="valgrind? ( debug )" |
| 68 |
|
| 69 |
+PATCHES=( |
| 70 |
+ "${FILESDIR}/${PN}-1.11.1-socklen.patch" |
| 71 |
+) |
| 72 |
+ |
| 73 |
pkg_setup() { |
| 74 |
if use ipoe; then |
| 75 |
linux-mod_pkg_setup |
| 76 |
@@ -48,6 +51,10 @@ src_prepare() { |
| 77 |
drivers/ipoe/CMakeLists.txt \ |
| 78 |
drivers/vlan_mon/CMakeLists.txt || die |
| 79 |
|
| 80 |
+ # Fix version |
| 81 |
+ sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die |
| 82 |
+ sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die |
| 83 |
+ |
| 84 |
# Bug #549918 |
| 85 |
append-ldflags -Wl,-z,lazy |
| 86 |
|
| 87 |
|
| 88 |
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
| 89 |
index ff874dac881..a05fd2d9a09 100644 |
| 90 |
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
| 91 |
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild |
| 92 |
@@ -1,9 +1,9 @@ |
| 93 |
-# Copyright 1999-2019 Gentoo Foundation |
| 94 |
+# Copyright 1999-2019 Gentoo Authors |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
|
| 97 |
-EAPI=6 |
| 98 |
+EAPI=7 |
| 99 |
|
| 100 |
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code" |
| 101 |
+EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code" |
| 102 |
inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod |
| 103 |
|
| 104 |
DESCRIPTION="High performance PPTP, PPPoE and L2TP server" |
| 105 |
@@ -19,7 +19,7 @@ RDEPEND="lua? ( dev-lang/lua:0 ) |
| 106 |
postgres? ( dev-db/postgresql:* ) |
| 107 |
snmp? ( net-analyzer/net-snmp ) |
| 108 |
dev-libs/libpcre |
| 109 |
- dev-libs/openssl:0" |
| 110 |
+ dev-libs/openssl:0=" |
| 111 |
DEPEND="${RDEPEND} |
| 112 |
valgrind? ( dev-util/valgrind )" |
| 113 |
PDEPEND="net-dialup/ppp-scripts" |
Archives