From 413421048cc2b0df9a218f0ab3cb151846809eb5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Apr 2024 23:59:43 +0100 Subject: gentoo auto-resync : 27:04:2024 - 23:59:42 --- net-vpn/pptpd/Manifest | 3 +- net-vpn/pptpd/files/pptpd-1.4.0-c99.patch | 16 ++++++ net-vpn/pptpd/pptpd-1.4.0-r3.ebuild | 81 ------------------------------ net-vpn/pptpd/pptpd-1.4.0-r4.ebuild | 82 +++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 82 deletions(-) create mode 100644 net-vpn/pptpd/files/pptpd-1.4.0-c99.patch delete mode 100644 net-vpn/pptpd/pptpd-1.4.0-r3.ebuild create mode 100644 net-vpn/pptpd/pptpd-1.4.0-r4.ebuild (limited to 'net-vpn/pptpd') diff --git a/net-vpn/pptpd/Manifest b/net-vpn/pptpd/Manifest index c4536e165514..53c2832813bf 100644 --- a/net-vpn/pptpd/Manifest +++ b/net-vpn/pptpd/Manifest @@ -1,3 +1,4 @@ +AUX pptpd-1.4.0-c99.patch 343 BLAKE2B 6702ba28f99a86bc4c91e993d978d875c1ddff8a1a7cffa02dff39f3ccd260e913e8b8111c657424e13f325d6aac63069df783b6a34c538f19c1cf43b358c474 SHA512 1532aaeede7d7b0dc5c4d373d5f8caa280b25f554720ec0c0acb82d8707153323139155f7a44a9a10ad040476f0351a3e46ac639cffc865f1aa487943adb9434 AUX pptpd-1.4.0-gentoo.patch 2360 BLAKE2B ca5ac7babf0ee6752305659ca50ce4c7972c433007249ced3c99d4c04a3a9461c245151082fa545b642fd85b375f51ba622fc6137ce538a9ec54798a7b73b27a SHA512 ba89b3b9eacd19e7cf6173289e8cb5db2443b55b3ad86f053c58636ed4f65227c626678f052f2d0a3c4c22fe4e0487493d097cd9a5434101017b95605966fc5b AUX pptpd-1.4.0-libdir.patch 1205 BLAKE2B 4b0d269b4de78346ffe577379824510dfb330e84606ff1b56abda08a4296935c947a0c61188475007c565cb5d5ba987beca61020e20a8cf050c82ff2f9335502 SHA512 927254c2527eada485d7d86940858835712d272fea818e17a6dd81878843b1a58dd6f1230fdc1b5e5ac0cd0fd726956d816655884ac7b8f6ee3c2e6b20e6beb4 AUX pptpd-1.4.0-musl.patch 381 BLAKE2B b3094ada7db21fcf5e249512d0f3aabb4782562e82dcda1fedfc8d78f70f59a062751e2cc6c03789871cc8b2f79bece8b6f125a7849eefbfca566e0b083d3194 SHA512 ac48f18aea8ce89c55bb102705912391fa4d0f3da237261110dfc3ec04b7c461cd4676419bffeabc52afddb78c8f7a2494df6a60bbd507f306f01be592b9e2b3 @@ -7,5 +8,5 @@ AUX pptpd-1.4.0-sandbox-fix.patch 528 BLAKE2B 1b784cbf9eb1699a5c8e31a6ebb64035e9 AUX pptpd-confd 131 BLAKE2B b1cf43035bb96859e3f69ad2ba8d161fd5e7c98370f407767a74ec9e87fd3187ec127155171bebf3e0655d076d2edb640993ec4445672abb40a9d87fb5a6b008 SHA512 59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488 AUX pptpd-init-r2 325 BLAKE2B 492d4a17910fd45475337376570e23b2193f0b5471e82a575465eb139a9cf0f9296388962e3dc2584784a4be6aac17edf4da67410ca422498a2f3c39c9baba43 SHA512 5eb0839310b6897aeb5ef067f3bbccc3f302f9d5375fea9c2cf405a6e823560a776a96fa0189b4c9adf1744651a35a41d4fcafc3f9e1ebf5ddeb5d88bece9678 DIST pptpd-1.4.0.tar.gz 252167 BLAKE2B c7fa9397c0a1b7c1ae5f22f9d7f85ba1bb60966984506f7b7c7b4f5dce69efa717f41e8d9a717e4c6f482d2d3e4052611709e0b825a2fcc63fabf19a53a550f0 SHA512 cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484 -EBUILD pptpd-1.4.0-r3.ebuild 1840 BLAKE2B be8162bfec0fc4f6aa426abf99880d54573682e8916a80fc1031878fe19dc3d8e7d51416cccdce47dd0dcc5bde6acfe3151d50aec4251ee79fc52db82fa6ba8e SHA512 25fe4003b42a88cb96d5834aba350379693ec7b9c2264e9044e28a10c68aa16dfbfd5d3f2b07627a7473e04177dfa227dedbf93a221710f892486319046505f4 +EBUILD pptpd-1.4.0-r4.ebuild 1871 BLAKE2B 38d843764f24f30b21f0ad5ccc54aa0eb1a9c2e26aebdcc1c1a1123b6e454062f46ed19d5adbb5d8ae3215a6364ffe9e69c0163b5256797e464944024ea2c905 SHA512 7eacf4304f0d4c78ce4a831d94229744ece49d7f4910be79597f1d79c77997a94dace9b6b93a9670a1e3e31d49170a3e179871a17c9e0acad6f88ac3505ad2f2 MISC metadata.xml 469 BLAKE2B e1c0396ab4a78ed9b1b20dab4a3c81fc4058adacdb87d9f287e0ba9dfdb050ee64727ef95433e249fc1054ad1849ef543fbd0ff35cfd4a2c3f08f3d5ec51965c SHA512 d1d9a5a96795964d88f79aaf93b67948f7298d1410e5ec5bf4a0b98eb11f5157eeb71633209ee6491d1ba02e77454ec641c36ad217c7eb084dc3015a9f8b854b diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch b/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch new file mode 100644 index 000000000000..fd14963b50e2 --- /dev/null +++ b/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/920775 +https://bugs.gentoo.org/927333 +https://sourceforge.net/p/poptop/bugs/54/ +--- a/compat.c ++++ b/compat.c +@@ -10,9 +10,9 @@ + + #include "compat.h" + #include "our_syslog.h" ++#include + + #ifndef HAVE_STRLCPY +-#include + #include + + void strlcpy(char *dst, const char *src, size_t size) diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild deleted file mode 100644 index 425dcbcb8d78..000000000000 --- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server" -HOMEPAGE="http://poptop.sourceforge.net/" -SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="gre-extreme-debug tcpd" - -RDEPEND="net-dialup/ppp:= - tcpd? ( sys-apps/tcp-wrappers )" -DEPEND="${RDEPEND} - elibc_musl? ( net-libs/ppp-defs )" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -src_prepare() { - # configure.in is actually configure.ac - mv configure.in configure.ac || die - - # Automake 1.13 compatibility, bug #469476 - sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac || die 'sed on configure.ac failed' - - # remove 'missing' script to prevent warnings - rm missing || die 'remove missing script failed' - - # 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 - - eautoreconf -} - -src_configure() { - use gre-extreme-debug && append-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET" - econf \ - --enable-bcrelay \ - $(use tcpd && echo "--with-libwrap") -} - -src_compile() { - emake COPTS="${CFLAGS}" -} - -src_install() { - default - - insinto /etc - doins samples/pptpd.conf - - insinto /etc/ppp - doins samples/options.pptpd - - newinitd "${FILESDIR}/pptpd-init-r2" pptpd - newconfd "${FILESDIR}/pptpd-confd" pptpd - - dodoc README.* - dodoc -r samples -} diff --git a/net-vpn/pptpd/pptpd-1.4.0-r4.ebuild b/net-vpn/pptpd/pptpd-1.4.0-r4.ebuild new file mode 100644 index 000000000000..c5805c7696e2 --- /dev/null +++ b/net-vpn/pptpd/pptpd-1.4.0-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Linux Point-to-Point Tunnelling Protocol Server" +HOMEPAGE="http://poptop.sourceforge.net/" +SRC_URI="mirror://sourceforge/poptop/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +IUSE="gre-extreme-debug tcpd" + +RDEPEND="net-dialup/ppp:= + tcpd? ( sys-apps/tcp-wrappers )" +DEPEND="${RDEPEND} + elibc_musl? ( net-libs/ppp-defs )" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_prepare() { + # configure.in is actually configure.ac + mv configure.in configure.ac || die + + # Automake 1.13 compatibility, bug #469476 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac || die 'sed on configure.ac failed' + + # remove 'missing' script to prevent warnings + rm missing || die 'remove missing script failed' + + # 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" + "${FILESDIR}/${P}-c99.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 + + eautoreconf +} + +src_configure() { + use gre-extreme-debug && append-cppflags "-DLOG_DEBUG_GRE_ACCEPTING_PACKET" + econf \ + --enable-bcrelay \ + $(use tcpd && echo "--with-libwrap") +} + +src_compile() { + emake COPTS="${CFLAGS}" +} + +src_install() { + default + + insinto /etc + doins samples/pptpd.conf + + insinto /etc/ppp + doins samples/options.pptpd + + newinitd "${FILESDIR}/pptpd-init-r2" pptpd + newconfd "${FILESDIR}/pptpd-confd" pptpd + + dodoc README.* + dodoc -r samples +} -- cgit v1.2.3