summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-09-03 07:20:54 +0000
committerPeter Volkov <pva@gentoo.org>2010-09-03 07:20:54 +0000
commit67c37d0061d20d2c8fb303465d54cf65c3431ceb (patch)
tree35aeab4d050bc9f06a3359db526d04df2feaa304
parentsys-kernel/openvz-sources: testing 2.6.27.6.1-r1. (diff)
downloadpva-67c37d0061d20d2c8fb303465d54cf65c3431ceb.tar.gz
pva-67c37d0061d20d2c8fb303465d54cf65c3431ceb.tar.bz2
pva-67c37d0061d20d2c8fb303465d54cf65c3431ceb.zip
net-dialup/accel-pptp: Fixed LDFLAGS issue, configure pptpd-logwtmp.so as required.
svn path=/; revision=453
-rw-r--r--net-dialup/accel-pptp/Manifest2
-rw-r--r--net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild8
2 files changed, 9 insertions, 1 deletions
diff --git a/net-dialup/accel-pptp/Manifest b/net-dialup/accel-pptp/Manifest
index e5c4b2d..b645d23 100644
--- a/net-dialup/accel-pptp/Manifest
+++ b/net-dialup/accel-pptp/Manifest
@@ -4,5 +4,5 @@ AUX options.pptp 341 RMD160 c55a423ee0bc8a9c349c1fe0c54847242809e915 SHA1 756529
AUX pptpd-confd 131 RMD160 cd7483c023adbb5d5e1aa6ed3b14114af5035790 SHA1 208d224be1e91f6e7d13b1c4cb451f92bbc55b94 SHA256 4d69da546e36439dc1a7cb5abb949ad48046155752c047babb5472decdfa1958
AUX pptpd-init 531 RMD160 983c64cea78173ff190938e53f852e6ff4cb8ab9 SHA1 f6b83a219c44956e480f0668de7cfde44e741d2c SHA256 5e7f353a2b3812cd0e0292e5889bdbda6849e79be336d0acd5113f2fc00d38c6
DIST accel-pptp-0.8.4.tar.bz2 493906 RMD160 f0428a3a460e3cb212fea55b7840ae580f005e53 SHA1 b275de7681baf5d1deab06672447393c3c0cd786 SHA256 2948c22dbdc7ee14f570a130c781e99c28c5521b329cae354c9d874b41c311fb
-EBUILD accel-pptp-0.8.4.ebuild 2364 RMD160 fbacba64bb018604a1cc0143c390c9e79f6ef0d5 SHA1 c2f6c033172f286efad15e30bc9cc02aeb19cd20 SHA256 414e41b3b5f6e1fd9ae6a12ed68cbb8780c1ec7ae59559b41eb362fde127344d
+EBUILD accel-pptp-0.8.4.ebuild 2775 RMD160 c62364bfef8f2bd777047eb54ac4d2d105c695a5 SHA1 db6e503673cbfed22a37e58d3fd6d481f95ad106 SHA256 ebc51a729120b8f99401929a9f4b4afdeb080542c303f1900fc42fa07e3725fa
MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
diff --git a/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild b/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild
index b1830aa..7a682b5 100644
--- a/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild
+++ b/net-dialup/accel-pptp/accel-pptp-0.8.4.ebuild
@@ -34,6 +34,14 @@ src_prepare() {
convert_to_m "${S}/kernel/driver/Makefile"
use server && cd "${S}/pptpd-1.3.3" && eautoreconf
cd "${S}/pppd_plugin" && eautoreconf
+
+ #Match pptpd-logwtmp.so's version with pppd's version (#89895)
+ local PPPD_VER=$(best_version net-dialup/ppp)
+ PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+ echo "#define VERSION \"${PPPD_VER}\"" > "${S}/pptpd-1.3.3/plugins/patchlevel.h"
+ # Respect LDFLAGS
+ sed -e "/^LDFLAGS/{s:=:+=:}" -i "${S}/pptpd-1.3.3/plugins/Makefile"
}
src_configure() {