diff options
Diffstat (limited to 'net-vpn/pptpd/pptpd-1.4.0-r3.ebuild')
| -rw-r--r-- | net-vpn/pptpd/pptpd-1.4.0-r3.ebuild | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild index 3a01c176e448..3a013c769e13 100644 --- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild +++ b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,21 +21,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog NEWS README TODO ) -PATCHES=( - "${FILESDIR}/${P}-gentoo.patch" - "${FILESDIR}/${P}-sandbox-fix.patch" - "${FILESDIR}/${P}-pidfile.patch" - "${FILESDIR}/${P}-libdir.patch" - "${FILESDIR}/${P}-musl.patch" -) - src_prepare() { - # 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 - sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" plugins/patchlevel.h || die - # configure.in is actually configure.ac mv configure.in configure.ac || die @@ -48,6 +34,19 @@ src_prepare() { # respect compiler, bug #461722 tc-export CC + local PATCHES=( + "${FILESDIR}/${P}-gentoo.patch" + "${FILESDIR}/${P}-sandbox-fix.patch" + "${FILESDIR}/${P}-pidfile.patch" + "${FILESDIR}/${P}-libdir.patch" + "${FILESDIR}/${P}-musl.patch" + ) + + if has_version -d ">=net-dialup/ppp-2.5.0"; then + # https://bugs.gentoo.org/904877 + PATCHES+=( "${FILESDIR}/${P}-ppp-2.5.0.patch" ) + fi + # Call to default src_prepare to apply patches default |