From 2455bc08b400126c1ce7f425a77eb7cda6940a23 Mon Sep 17 00:00:00 2001
From: Chen Minqiang <ptpt52@gmail.com>
Date: Sun, 13 Oct 2024 13:18:06 +0800
Subject: [PATCH] pptpd: update to 1.5.0

Update pptpd "poptop" to 1.5.0 to fix comptability with PPP 2.5.1.

Also refresh patches

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
---
 net/pptpd/Makefile                      |  6 +++---
 net/pptpd/patches/003-opt_flags.patch   |  4 ++--
 net/pptpd/patches/100-musl-compat.patch | 25 ++++++++++++-------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index 4892a3e9b0..ad58b45321 100644
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
-PKG_VERSION:=1.4.0
-PKG_RELEASE:=6
+PKG_VERSION:=1.5.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/poptop
-PKG_HASH:=8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0
+PKG_HASH:=6a724284b1ce00ea23f7d7608d081843a10c8a8d87d951cb2ea86e70aa1b4e77
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/net/pptpd/patches/003-opt_flags.patch b/net/pptpd/patches/003-opt_flags.patch
index cc136c5167..f67213cacd 100644
--- a/net/pptpd/patches/003-opt_flags.patch
+++ b/net/pptpd/patches/003-opt_flags.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -153,7 +153,7 @@ AUTOMAKE = @AUTOMAKE@
+@@ -233,7 +233,7 @@ AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
@@ -8,4 +8,4 @@
 +CFLAGS = $(COPTS) -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
+ CSCOPE = @CSCOPE@
diff --git a/net/pptpd/patches/100-musl-compat.patch b/net/pptpd/patches/100-musl-compat.patch
index 6ce625a414..4a17359df8 100644
--- a/net/pptpd/patches/100-musl-compat.patch
+++ b/net/pptpd/patches/100-musl-compat.patch
@@ -1,22 +1,21 @@
 --- a/bcrelay.c
 +++ b/bcrelay.c
-@@ -667,7 +667,7 @@ static void mainloop(int argc, char **ar
-                  * there is no need to concern about the physical/link layer header because it is
-                  * filled in automatically (based on the contents of sa).
-                  */
--                if ((nrsent = sendto(cur_ifsnr[j].sock_nr, ipp_p, rlen, MSG_DONTWAIT|MSG_TRYHARD, (struct sockaddr *)&sa, salen)) < 0)
-+                if ((nrsent = sendto(cur_ifsnr[j].sock_nr, ipp_p, rlen, MSG_DONTWAIT|MSG_DONTROUTE, (struct sockaddr *)&sa, salen)) < 0)
-                 {
-                   if (errno == ENETDOWN) {
-                     syslog(LOG_NOTICE, "ignored ENETDOWN from sendto(), a network interface was going down?");
+@@ -746,7 +746,7 @@ static void mainloop(int argc, char **ar
+                                * because it is filled in automatically
+                                * (based on the contents of sa).
+                                */
+-                              if ((nrsent = sendto(cur_ifsnr[j].sock_nr, ipp_p, rlen, MSG_DONTWAIT|MSG_TRYHARD, (struct sockaddr *)&sa, salen)) < 0)
++                              if ((nrsent = sendto(cur_ifsnr[j].sock_nr, ipp_p, rlen, MSG_DONTWAIT|MSG_DONTROUTE, (struct sockaddr *)&sa, salen)) < 0)
+                                 {
+                                   if (errno == ENETDOWN) {
+                                     syslog(LOG_NOTICE, "ignored ENETDOWN from sendto(), a network interface was going down?");
 --- a/compat.c
 +++ b/compat.c
-@@ -11,10 +11,10 @@
- #include "compat.h"
- #include "our_syslog.h"
+@@ -13,9 +13,9 @@
  
--#ifndef HAVE_STRLCPY
  #include <string.h>
+ 
+-#ifndef HAVE_STRLCPY
  #include <stdio.h>
  
 +#ifndef HAVE_STRLCPY
-- 
2.30.2