refresh 4.14 ppp patch

package/network/services/ppp/Makefile

@@ -10,13 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.7
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/
 PKG_HASH:=02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-4-Clause
+PKG_CPE_ID:=cpe:/a:samba:ppp
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -35,7 +36,7 @@ endef
 
 define Package/ppp
 $(call Package/ppp/Default)
-  DEPENDS:=+kmod-ppp +libpthread +shellsync
+  DEPENDS:=+kmod-ppp
   TITLE:=PPP daemon
   VARIANT:=default
 endef
@@ -177,14 +178,19 @@ $(call Build/Configure/Default,, \
 	UNAME_M="$(ARCH)" \
 )
 	mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
-	cp \
+	$(CP) \
 		$(LINUX_DIR)/include/linux/compiler.h \
 		$(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
 		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
+
+	# Kernel 4.14.9+ only, ignore the exit status of cp in case the file
+	# doesn't exits
+	-$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \
+		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
 endef
 
-TARGET_CFLAGS += -ffunction-sections -fdata-sections
-TARGET_LDFLAGS += -Wl,--gc-sections
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
+TARGET_LDFLAGS += -Wl,--gc-sections -flto -fuse-linker-plugin
 
 MAKE_FLAGS += COPTS="$(TARGET_CFLAGS)" \
 		PRECOMPILED_FILTER=1 \

package/network/services/ppp/files/etc/ppp/options

@@ -6,5 +6,3 @@ nopcomp
 nocrtscts
 lock
 maxfail 0
-lcp-echo-failure 5
-lcp-echo-interval 1

package/network/services/ppp/files/ppp.sh

@@ -120,6 +120,8 @@ ppp_generic_setup() {
 		}
 	}
 
+	[ -n "$keepalive" ] || keepalive="5 1"
+
 	local lcp_failure="${keepalive%%[, ]*}"
 	local lcp_interval="${keepalive##*[, ]}"
 	local lcp_adaptive="lcp-echo-adaptive"
@@ -223,16 +225,7 @@ proto_pppoe_setup() {
 	json_get_var service service
 	json_get_var host_uniq host_uniq
 
-#By 蝈蝈：并发拨号同步的前期准备
-	syncppp_option=""
-	[ "$(uci get syncdial.config.enabled)" == "1" ] && {
-		ppp_if_cnt=$(cat /etc/config/network | grep -c "proto 'pppoe'")
-		syncppp_option="syncppp $ppp_if_cnt"
-		shellsync $ppp_if_cnt 10
-	}
-
 	ppp_generic_setup "$config" \
-		$syncppp_option \
 		plugin rp-pppoe.so \
 		${ac:+rp_pppoe_ac "$ac"} \
 		${service:+rp_pppoe_service "$service"} \

package/network/services/ppp/patches/001-honor-ldflags.patch

@@ -5,15 +5,15 @@
  
  radius.so: radius.o libradiusclient.a
 -	$(CC) -o radius.so -shared radius.o libradiusclient.a
-+	$(CC) $(COPTS) -o radius.so -shared radius.o libradiusclient.a
++	$(CC) $(CFLAGS) -o radius.so -shared radius.o libradiusclient.a
  
  radattr.so: radattr.o
 -	$(CC) -o radattr.so -shared radattr.o
-+	$(CC) $(COPTS) -o radattr.so -shared radattr.o
++	$(CC) $(CFLAGS) -o radattr.so -shared radattr.o
  
  radrealms.so: radrealms.o
 -	$(CC) -o radrealms.so -shared radrealms.o
-+	$(CC) $(COPTS) -o radrealms.so -shared radrealms.o
++	$(CC) $(CFLAGS) -o radrealms.so -shared radrealms.o
  
  CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
  	clientid.o sendserver.o lock.o util.o md5.o

package/network/services/ppp/patches/203-opt_flags.patch

@@ -30,3 +30,14 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
  
  INSTALL= install
+--- a/pppd/plugins/rp-pppoe/Makefile.linux
++++ b/pppd/plugins/rp-pppoe/Makefile.linux
+@@ -39,7 +39,7 @@ debug.o: debug.c
+ 	$(CC) $(CFLAGS) -c -o debug.o debug.c
+ 
+ rp-pppoe.so: plugin.o discovery.o if.o common.o
+-	$(CC) $(CFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
++	$(CC) $(CFLAGS) -fPIC -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(LIBDIR)

package/network/services/ppp/patches/500-add-pptp-plugin.patch

@@ -1064,7 +1064,7 @@
 +			   struct in_addr localbind);
 --- /dev/null
 +++ b/pppd/plugins/pptp/pptp_ctrl.c
-@@ -0,0 +1,1077 @@
+@@ -0,0 +1,1078 @@
 +/* pptp_ctrl.c ... handle PPTP control connection.
 + *                 C. Scott Ananian <cananian@alumni.princeton.edu>
 + *
@@ -1083,6 +1083,7 @@
 +#include <string.h>
 +#include <ctype.h>
 +#include <fcntl.h>
++#include "pppd.h"
 +#include "pptp_msg.h"
 +#include "pptp_ctrl.h"
 +#include "pptp_options.h"

package/network/services/ppp/patches/511-pptp_cflags.patch

@@ -0,0 +1,11 @@
+--- a/pppd/plugins/pptp/Makefile.linux
++++ b/pppd/plugins/pptp/Makefile.linux
+@@ -20,7 +20,7 @@ all: pptp.so
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ pptp.so: dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o
+-	$(CC) -o pptp.so -shared dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o
++	$(CC) -fPIC -o pptp.so -shared dirutil.o orckit_quirks.o pptp.o pptp_callmgr.o pptp_ctrl.o pptp_quirks.o util.o vector.o
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(LIBDIR)