From: Rosen Penev <redacted>
Date: Wed, 30 Oct 2024 01:16:54 +0000 (-0700)
Subject: pptp: fix compilation with GCC14
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=4275b6930b9a37630bd09bdcdb5e21547aa77683;p=openwrt-packages.git

pptp: fix compilation with GCC14

Needed forward declaration for missing function.

Removed some no longer needed musl fixes.

Signed-off-by: Rosen Penev <redacted>
---

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index ad58b4532..65c4b9ce4 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/poptop
diff --git a/net/pptpd/patches/100-musl-compat.patch b/net/pptpd/patches/100-musl-compat.patch
index 4a17359df..5ab2bd12a 100644
--- a/net/pptpd/patches/100-musl-compat.patch
+++ b/net/pptpd/patches/100-musl-compat.patch
@@ -9,29 +9,13 @@
                                  {
                                    if (errno == ENETDOWN) {
                                      syslog(LOG_NOTICE, "ignored ENETDOWN from sendto(), a network interface was going down?");
---- a/compat.c
-+++ b/compat.c
-@@ -13,9 +13,9 @@
+--- a/plugins/pptpd-logwtmp.c
++++ b/plugins/pptpd-logwtmp.c
+@@ -17,6 +17,7 @@
+ #include <pppd/pppd.h>
+ #include <pppd/options.h>
  
- #include <string.h>
++extern void logwtmp(const char *line, const char *name, const char *host);
+ char pppd_version[] = PPPD_VERSION;
  
--#ifndef HAVE_STRLCPY
- #include <stdio.h>
- 
-+#ifndef HAVE_STRLCPY
- void strlcpy(char *dst, const char *src, size_t size)
- {
-         strncpy(dst, src, size - 1);
---- /dev/null
-+++ b/net/ppp_defs.h
-@@ -0,0 +1,10 @@
-+#ifndef _NET_PPP_DEFS_H
-+#define _NET_PPP_DEFS_H 1
-+
-+#define __need_time_t
-+#include <time.h>
-+
-+#include <asm/types.h>
-+#include <linux/ppp_defs.h>
-+
-+#endif /* net/ppp_defs.h */
+ static char pptpd_original_ip[PATH_MAX+1];