| 1 |
commit: 36f95f1a89199d80adc56e0588d9dfbdb52de00a |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 5 15:11:37 2016 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 5 15:16:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f95f1a |
| 7 |
|
| 8 |
net-dialup/accel-ppp: version bump to 1.10.2 |
| 9 |
|
| 10 |
Properly install ipoe kernel module, |
| 11 |
add necessary LDFLAGS to properly handle lazy linking. |
| 12 |
Drop old version. |
| 13 |
|
| 14 |
Reported-by: Christian Roessner <info <AT> roessner-net.com> |
| 15 |
Gentoo-Bug: 549918 |
| 16 |
|
| 17 |
Package-Manager: portage-2.2.28 |
| 18 |
|
| 19 |
net-dialup/accel-ppp/Manifest | 1 + |
| 20 |
.../{accel-ppp-1.10.1.ebuild => accel-ppp-1.10.2.ebuild} | 13 +++++++++++-- |
| 21 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest |
| 24 |
index 697888a..fe9feea 100644 |
| 25 |
--- a/net-dialup/accel-ppp/Manifest |
| 26 |
+++ b/net-dialup/accel-ppp/Manifest |
| 27 |
@@ -1 +1,2 @@ |
| 28 |
DIST accel-ppp-1.10.1.tar.bz2 1587117 SHA256 2333897563925d719b1b5e6fd05238fe769b967a9bac73d3b1daa1b8ff274b7d SHA512 43dc01992a8298970911d202736af0dcd3b46744d18ecce5d4987bab8d312cfb75d5a72a6f5c1b91ad7943c2c66371063402688cce57106db116b407205f142b WHIRLPOOL 0ce66a3a0daf6f4902baf7bf8ace545c1a2e8e9105bb62dc7dad96d3da131a215da17d6e722488fc9388acfb4a7f028bf9904e62c8c7a43fa7d2cb3aa9a7ca81 |
| 29 |
+DIST accel-ppp-1.10.2.tar.bz2 1587850 SHA256 ffd339ff1589c8b9e306028844e7156ee6d2b019b1219f1b8b62314c835e8a7d SHA512 6cc1d5f0786196fbbebc0f04830f780c1f2d2995bc7fb6384729b64820c74d0fb53f052bdaa71fa3b6165ab13cd7c137bfdc3ef717f6e866a329b893d7375ce1 WHIRLPOOL 050a5fe5eafba1e90f7b200a476e2edfbb878039a8e4ac5d06fdc195ad72720d7382267b7181e2a8ec47c2db8da4664b1315dff75ffcbc087c0e7e035577862c |
| 30 |
|
| 31 |
diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild |
| 32 |
similarity index 83% |
| 33 |
rename from net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild |
| 34 |
rename to net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild |
| 35 |
index 4ea714a..e711ab2 100644 |
| 36 |
--- a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild |
| 37 |
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild |
| 38 |
@@ -4,7 +4,7 @@ |
| 39 |
|
| 40 |
EAPI=6 |
| 41 |
|
| 42 |
-inherit cmake-utils 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="http://accel-ppp.sourceforge.net/" |
| 47 |
@@ -42,8 +42,12 @@ src_prepare() { |
| 48 |
sed -i -e "/mkdir/d" \ |
| 49 |
-e "/echo/d" \ |
| 50 |
-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed' |
| 51 |
+ sed -i -e '/modules_install/d' drivers/ipoe/CMakeLists.txt || die 'sed on drivers/ipoe/CMakeLists.txt failed' |
| 52 |
|
| 53 |
- eapply_user |
| 54 |
+ # Bug #549918 |
| 55 |
+ append-ldflags -Wl,-z,lazy |
| 56 |
+ |
| 57 |
+ cmake-utils_src_prepare |
| 58 |
} |
| 59 |
|
| 60 |
src_configure() { |
| 61 |
@@ -69,6 +73,11 @@ src_compile() { |
| 62 |
} |
| 63 |
|
| 64 |
src_install() { |
| 65 |
+ if use ipoe; then |
| 66 |
+ local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver)" |
| 67 |
+ linux-mod_src_install |
| 68 |
+ fi |
| 69 |
+ |
| 70 |
cmake-utils_src_install |
| 71 |
|
| 72 |
use doc && dodoc -r rfc |
Archives