[gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/
commit: f2427cc130cb688bd0b7494749dcb157441ef3f5 Author: Sam James gentoo org> AuthorDate: Sat Apr 27 02:12:01 2024 + Commit: Sam James gentoo org> CommitDate: Sat Apr 27 02:12:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2427cc1 net-vpn/pptpd: add upstream ref to patch Signed-off-by: Sam James gentoo.org> net-vpn/pptpd/files/pptpd-1.4.0-c99.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch b/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch index 902a275d5f35..fd14963b50e2 100644 --- a/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch +++ b/net-vpn/pptpd/files/pptpd-1.4.0-c99.patch @@ -1,6 +1,6 @@ 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 @@
[gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/, net-vpn/pptpd/
commit: de42887364fb0681a6045f33b48dfefe58c46298
Author: Sam James gentoo org>
AuthorDate: Sat Apr 27 00:55:29 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Apr 27 00:55:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de428873
net-vpn/pptpd: fix Modern C issue
Interestingly, this only seems to manifest with >=glibc-2.38, because
the include had a '#ifndef HAVE_STRLCPY' guard.
Closes: https://bugs.gentoo.org/920775
Closes: https://bugs.gentoo.org/927333
Signed-off-by: Sam James gentoo.org>
net-vpn/pptpd/files/pptpd-1.4.0-c99.patch| 16
.../{pptpd-1.4.0-r3.ebuild => pptpd-1.4.0-r4.ebuild} | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
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 ..902a275d5f35
--- /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
+
+--- 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-r4.ebuild
similarity index 96%
rename from net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
rename to net-vpn/pptpd/pptpd-1.4.0-r4.ebuild
index 425dcbcb8d78..c5805c7696e2 100644
--- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,7 @@ src_prepare() {
"${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
[gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/, net-vpn/pptpd/
commit: ba13e6934df6244c76a02674ae55c81af2716c5d
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Apr 28 20:50:35 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Apr 28 20:50:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba13e693
net-vpn/pptpd: fix build with ppp-2.5.0
Closes: https://bugs.gentoo.org/904877
Signed-off-by: Mike Gilbert gentoo.org>
net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch | 83 +
net-vpn/pptpd/pptpd-1.4.0-r3.ebuild | 29 +
2 files changed, 97 insertions(+), 15 deletions(-)
diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch
b/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch
new file mode 100644
index ..b3525052a873
--- /dev/null
+++ b/net-vpn/pptpd/files/pptpd-1.4.0-ppp-2.5.0.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/904877
+
+From ea207b89c61e3a201155b973307ee45413f0d058 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Fri, 28 Apr 2023 16:37:44 -0400
+Subject: [PATCH] pptp-logwtmp: update for ppp-2.5.0
+
+Signed-off-by: Mike Gilbert
+---
+ plugins/pptpd-logwtmp.c | 25 +++--
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/plugins/pptpd-logwtmp.c b/plugins/pptpd-logwtmp.c
+index ac5ecc2..457bbce 100644
+--- a/plugins/pptpd-logwtmp.c
b/plugins/pptpd-logwtmp.c
+@@ -12,14 +12,16 @@
+ #include
+ #include
+ #include
++#include
+ #include
++#include
+
+-char pppd_version[] = VERSION;
++char pppd_version[] = PPPD_VERSION;
+
+ static char pptpd_original_ip[PATH_MAX+1];
+ static bool pptpd_logwtmp_strip_domain = 0;
+
+-static option_t options[] = {
++static struct option options[] = {
+ { "pptpd-original-ip", o_string, pptpd_original_ip,
+ "Original IP address of the PPTP connection",
+ OPT_STATIC, NULL, PATH_MAX },
+@@ -28,7 +30,7 @@ static option_t options[] = {
+ { NULL }
+ };
+
+-static char *reduce(char *user)
++static const char *reduce(const char *user)
+ {
+ char *sep;
+ if (!pptpd_logwtmp_strip_domain) return user;
+@@ -42,8 +44,10 @@ static char *reduce(char *user)
+
+ static void ip_up(void *opaque, int arg)
+ {
+- char *user = reduce(peer_authname);
+- if (debug)
++ const char *peer_authname = ppp_peer_authname(NULL, 0);
++ const char *user = reduce(peer_authname);
++ const char *ifname = ppp_ifname();
++ if (debug_on())
+ notice("pptpd-logwtmp.so ip-up %s %s %s", ifname, user,
+ pptpd_original_ip);
+ logwtmp(ifname, user, pptpd_original_ip);
+@@ -51,16 +55,17 @@ static void ip_up(void *opaque, int arg)
+
+ static void ip_down(void *opaque, int arg)
+ {
+- if (debug)
++ const char *ifname = ppp_ifname();
++ if (debug_on())
+ notice("pptpd-logwtmp.so ip-down %s", ifname);
+ logwtmp(ifname, "", "");
+ }
+
+ void plugin_init(void)
+ {
+- add_options(options);
+- add_notifier(_up_notifier, ip_up, NULL);
+- add_notifier(_down_notifier, ip_down, NULL);
+- if (debug)
++ ppp_add_options(options);
++ ppp_add_notify(NF_IP_UP, ip_up, NULL);
++ ppp_add_notify(NF_IP_DOWN, ip_down, NULL);
++ if (debug_on())
+ notice("pptpd-logwtmp: $Version$");
+ }
+--
+2.40.1
+
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
index 227b7be9450d..3a013c769e13 100644
--- a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
@@ -14,28 +14,14 @@ LICENSE="GPL-2"
KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="gre-extreme-debug tcpd"
-RDEPEND="=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
[gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/, net-vpn/pptpd/
commit: 79eb49c4b63ab163c6633247610596195f237bda
Author: Sergey Popov gentoo org>
AuthorDate: Wed Jul 8 09:30:29 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed Jul 8 09:43:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79eb49c4
net-vpn/pptpd: revision bump
Fix library path for plugins
Fix building with Musl
Closes: https://bugs.gentoo.org/716210
Closes: https://bugs.gentoo.org/730068
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergey Popov gentoo.org>
net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch | 24 +
net-vpn/pptpd/files/pptpd-1.4.0-musl.patch | 16 ++
net-vpn/pptpd/pptpd-1.4.0-r3.ebuild | 81
3 files changed, 121 insertions(+)
diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch
b/net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch
new file mode 100644
index 000..898c3aea89d
--- /dev/null
+++ b/net-vpn/pptpd/files/pptpd-1.4.0-libdir.patch
@@ -0,0 +1,24 @@
+diff -r -U 3 pptpd-1.4.0.orig/Makefile.am pptpd-1.4.0/Makefile.am
+--- pptpd-1.4.0.orig/Makefile.am 2020-06-29 00:24:23.301857353 +0300
pptpd-1.4.0/Makefile.am2020-06-29 00:25:16.072686760 +0300
+@@ -11,7 +11,7 @@
+ ## warning with -Wmissing-prototypes).
+ ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
+ ## aren't up to it).
+-CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
++CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -DLIBDIR='"$(libdir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
+ #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror
-DSBINDIR='"$(sbindir)"'
+
+diff -r -U 3 pptpd-1.4.0.orig/pptpctrl.c pptpd-1.4.0/pptpctrl.c
+--- pptpd-1.4.0.orig/pptpctrl.c2013-10-23 08:53:19.0 +0400
pptpd-1.4.0/pptpctrl.c 2020-06-29 00:25:23.356525131 +0300
+@@ -786,7 +786,7 @@
+
+ if (pptp_logwtmp) {
+ pppd_argv[an++] = "plugin";
+- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
++ pppd_argv[an++] = LIBDIR "/pptpd/pptpd-logwtmp.so";
+ pppd_argv[an++] = "pptpd-original-ip";
+ pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+ }
diff --git a/net-vpn/pptpd/files/pptpd-1.4.0-musl.patch
b/net-vpn/pptpd/files/pptpd-1.4.0-musl.patch
new file mode 100644
index 000..998a07acf7e
--- /dev/null
+++ b/net-vpn/pptpd/files/pptpd-1.4.0-musl.patch
@@ -0,0 +1,16 @@
+Modified patch from Alpine Linux
+https://git.alpinelinux.org/aports/plain/main/pptpd/fix_MSG_TRYHARD.patch
+
+--- a/bcrelay.c
b/bcrelay.c
+@@ -103,6 +103,10 @@
+ #include "our_syslog.h"
+ #include "our_getopt.h"
+
++#ifndef MSG_TRYHARD
++ #define MSG_TRYHARDMSG_DONTROUTE
++#endif
++
+ //#define VERSION "1.0"
+
+ /* uncomment if you compile this without poptop's configure script */
diff --git a/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
new file mode 100644
index 000..17768c52b76
--- /dev/null
+++ b/net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gre-extreme-debug tcpd"
+
+DEPEND="net-dialup/ppp:=
+ tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}"
+
+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
+
+ # 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
+
+ # Call to default src_prepare to apply patches
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ use gre-extreme-debug && append-cppflags
"-DLOG_DEBUG_GRE_ACCEPTING_PACKET"
+ econf \
+
[gentoo-commits] repo/gentoo:master commit in: net-vpn/pptpd/files/, net-vpn/pptpd/, net-dialup/pptpd/, net-dialup/pptpd/files/, ...
commit: 83d3fb92ea9656e8f856c68f643ce2ca984f72cf
Author: Sergey Popov gentoo org>
AuthorDate: Mon Mar 27 15:12:34 2017 +
Commit: Sergey Popov gentoo org>
CommitDate: Mon Mar 27 15:17:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d3fb92
net-dialup/pptpd: move to net-vpn/pptpd
Package-Manager: portage-2.3.3
RepoMan-Options: --force
{net-dialup => net-vpn}/pptpd/Manifest| 0
{net-dialup => net-vpn}/pptpd/files/pptpd-1.4.0-gentoo.patch | 0
{net-dialup => net-vpn}/pptpd/files/pptpd-1.4.0-pidfile.patch | 0
{net-dialup => net-vpn}/pptpd/files/pptpd-1.4.0-sandbox-fix.patch | 0
{net-dialup => net-vpn}/pptpd/files/pptpd-confd | 0
{net-dialup => net-vpn}/pptpd/files/pptpd-init-r2 | 0
{net-dialup => net-vpn}/pptpd/metadata.xml| 0
{net-dialup => net-vpn}/pptpd/pptpd-1.4.0-r2.ebuild | 2 +-
profiles/updates/1Q-2017 | 1 +
9 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-dialup/pptpd/Manifest b/net-vpn/pptpd/Manifest
similarity index 100%
rename from net-dialup/pptpd/Manifest
rename to net-vpn/pptpd/Manifest
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch
b/net-vpn/pptpd/files/pptpd-1.4.0-gentoo.patch
similarity index 100%
rename from net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch
rename to net-vpn/pptpd/files/pptpd-1.4.0-gentoo.patch
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-pidfile.patch
b/net-vpn/pptpd/files/pptpd-1.4.0-pidfile.patch
similarity index 100%
rename from net-dialup/pptpd/files/pptpd-1.4.0-pidfile.patch
rename to net-vpn/pptpd/files/pptpd-1.4.0-pidfile.patch
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
b/net-vpn/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
similarity index 100%
rename from net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
rename to net-vpn/pptpd/files/pptpd-1.4.0-sandbox-fix.patch
diff --git a/net-dialup/pptpd/files/pptpd-confd
b/net-vpn/pptpd/files/pptpd-confd
similarity index 100%
rename from net-dialup/pptpd/files/pptpd-confd
rename to net-vpn/pptpd/files/pptpd-confd
diff --git a/net-dialup/pptpd/files/pptpd-init-r2
b/net-vpn/pptpd/files/pptpd-init-r2
similarity index 100%
rename from net-dialup/pptpd/files/pptpd-init-r2
rename to net-vpn/pptpd/files/pptpd-init-r2
diff --git a/net-dialup/pptpd/metadata.xml b/net-vpn/pptpd/metadata.xml
similarity index 100%
rename from net-dialup/pptpd/metadata.xml
rename to net-vpn/pptpd/metadata.xml
diff --git a/net-dialup/pptpd/pptpd-1.4.0-r2.ebuild
b/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
similarity index 97%
rename from net-dialup/pptpd/pptpd-1.4.0-r2.ebuild
rename to net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
index 750c3c32e28..95a0ffb046d 100644
--- a/net-dialup/pptpd/pptpd-1.4.0-r2.ebuild
+++ b/net-vpn/pptpd/pptpd-1.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index f7e78ddeb04..8e12723ba1c 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -35,3 +35,4 @@ move net-p2p/i2p net-vpn/i2p
move net-libs/rb_libtorrent net-libs/libtorrent-rasterbar
move dev-perl/gtk2-perl dev-perl/Gtk2
move dev-haskell/hdbc-sqlite dev-haskell/hdbc-sqlite3
+move net-dialup/pptpd net-vpn/pptpd
