Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
86c2a44966

+ 3 - 3
package/pptp/Makefile

@@ -4,14 +4,14 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		pptp
-PKG_VERSION:=		1.8.0
+PKG_VERSION:=		1.10.0
 PKG_RELEASE:=		1
-PKG_HASH:=		e39c42d933242a8a6dd8600a0fa7f0a5ec8f066d10c4149d8e81a5c68fe4bbda
+PKG_HASH:=		82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4
 PKG_DESCR:=		point-to-point tunneling protocol client
 PKG_SECTION:=		net/ppp
 PKG_DEPENDS:=		ppp
 PKG_KDEPENDS:=		ppp net-ipgre
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=pptpclient/}
+PKG_SITES:=		https://sourceforge.net/projects/pptpclient/files/pptp/pptp-$(PKG_VERSION)/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 

+ 3 - 10
package/pptp/patches/patch-Makefile

@@ -1,6 +1,6 @@
---- pptp-1.8.0.orig/Makefile	2013-10-23 10:10:46.000000000 +0200
-+++ pptp-1.8.0/Makefile	2013-12-22 11:35:12.000000000 +0100
-@@ -14,12 +14,13 @@ BINDIR=$(DESTDIR)/usr/sbin
+--- pptp-1.10.0.orig/Makefile	2018-01-18 01:12:00.000000000 +0100
++++ pptp-1.10.0/Makefile	2026-05-22 11:32:40.595530190 +0200
+@@ -14,7 +14,7 @@ BINDIR=$(DESTDIR)/usr/sbin
  MANDIR=$(DESTDIR)/usr/share/man/man8
  PPPDIR=$(DESTDIR)/etc/ppp
  
@@ -9,10 +9,3 @@
  RM	= rm -f
  OPTIMIZE= -O -Wuninitialized
  DEBUG	= -g
- INCLUDE =
--CFLAGS  = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
-+CFLAGS  ?=
-+CFLAGS  += -Wall $(INCLUDE)
- # Solaris
- # CFLAGS +=  -D_XPG4_2 -D__EXTENSIONS__
- LIBS	= -lutil

+ 0 - 11
package/pptp/patches/patch-pptp_c

@@ -1,11 +0,0 @@
---- pptp-1.8.0.orig/pptp.c	2013-10-23 10:10:46.000000000 +0200
-+++ pptp-1.8.0/pptp.c	2013-12-22 11:40:01.000000000 +0100
-@@ -447,7 +447,7 @@ struct in_addr get_ip_address(char *name
-     if (host == NULL) {
-         if (h_errno == HOST_NOT_FOUND)
-             fatal("gethostbyname '%s': HOST NOT FOUND", name);
--        else if (h_errno == NO_ADDRESS)
-+        else if (h_errno == NO_DATA)
-             fatal("gethostbyname '%s': NO IP ADDRESS", name);
-         else
-             fatal("gethostbyname '%s': name server error", name);

+ 0 - 10
package/pptp/patches/patch-pqueue_c

@@ -1,10 +0,0 @@
---- pptp-1.8.0.orig/pqueue.c	2013-10-23 10:10:46.000000000 +0200
-+++ pptp-1.8.0/pqueue.c	2013-12-22 11:35:52.000000000 +0100
-@@ -2,6 +2,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
-+#include <sys/types.h>
- 
- #include "util.h" // for log()
- #include "pqueue.h"