update to latest upstream version

1 files changed, 36 insertions, 38 deletions

diff --git a/package/ppp/patches/patch-pppd_Makefile_linux b/package/ppp/patches/patch-pppd_Makefile_linux
index 0096f7018..f5bb4e614 100644
--- a/package/ppp/patches/patch-pppd_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_Makefile_linux
@@ -1,9 +1,10 @@
---- ppp-2.4.5.orig/pppd/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/Makefile.linux	2011-01-21 21:40:47.384898388 +0100
-@@ -3,11 +3,7 @@
+--- ppp-2.4.6.orig/pppd/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/Makefile.linux	2014-06-06 08:23:21.000000000 +0200
+@@ -2,12 +2,7 @@
+ # pppd makefile for Linux
  # $Id: Makefile.linux,v 1.70 2007/06/19 02:08:34 carlsonj Exp $
  #
- 
+-
 -# Default installation locations
 -DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
@@ -13,7 +14,7 @@
  
  TARGETS = pppd
  
-@@ -24,17 +20,6 @@ PPPDOBJS = main.o magic.o fsm.o lcp.o ip
+@@ -24,16 +19,6 @@ PPPDOBJS = main.o magic.o fsm.o lcp.o ip
  	   ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \
  	   eap.o chap-md5.o session.o
  
@@ -27,11 +28,10 @@
 -#
 -COPTS = -O2 -pipe -Wall -g
 -LIBS =
--
+ 
  # Uncomment the next 2 lines to include support for Microsoft's
  # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
- CHAPMS=y
-@@ -75,28 +60,25 @@ PLUGIN=y
+@@ -78,28 +63,25 @@ USE_LIBUTIL=y
  
  MAXOCTETS=y
  
@@ -45,57 +45,63 @@
  
  ifdef CHAPMS
 -CFLAGS   += -DCHAPMS=1
-+CPPFLAGS += -DCHAPMS=1
++CPPFLAGS   += -DCHAPMS=1
  NEEDDES=y
  PPPDOBJS += md4.o chap_ms.o
  HEADERS	+= md4.h chap_ms.h
  ifdef MSLANMAN
 -CFLAGS   += -DMSLANMAN=1
-+CPPFLAGS += -DMSLANMAN=1
++CPPFLAGS   += -DMSLANMAN=1
  endif
  ifdef MPPE
 -CFLAGS   += -DMPPE=1
-+CPPFLAGS += -DMPPE=1
++CPPFLAGS   += -DMPPE=1
  endif
  endif
  
  # EAP SRP-SHA1
  ifdef USE_SRP
 -CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
-+CPPFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
++CPPFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
  LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
  TARGETS	+= srp-entry
  EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-@@ -113,12 +95,12 @@ PPPDOBJS += sha1.o
+@@ -116,17 +98,17 @@ PPPDOBJS += sha1.o
  endif
  
  ifdef HAS_SHADOW
 -CFLAGS   += -DHAS_SHADOW
-+CPPFLAGS += -DHAS_SHADOW
++CPPFLAGS   += -DHAS_SHADOW
  #LIBS     += -lshadow $(LIBS)
  endif
  
  ifneq ($(wildcard /usr/include/crypt.h),)
 -CFLAGS  += -DHAVE_CRYPT_H=1
-+CPPFLAGS += -DHAVE_CRYPT_H=1
++CPPFLAGS  += -DHAVE_CRYPT_H=1
  LIBS	+= -lcrypt
  endif
  
-@@ -126,7 +108,7 @@ ifdef NEEDDES
+ ifdef USE_LIBUTIL
+-CFLAGS	+= -DHAVE_LOGWTMP=1
++CPPFLAGS	+= -DHAVE_LOGWTMP=1
+ LIBS	+= -lutil
+ endif
+ 
+@@ -134,7 +116,7 @@ ifdef NEEDDES
  ifndef USE_CRYPT
  LIBS     += -ldes $(LIBS)
  else
 -CFLAGS   += -DUSE_CRYPT=1
-+CPPFLAGS += -DUSE_CRYPT=1
++CPPFLAGS   += -DUSE_CRYPT=1
  endif
  PPPDOBJS += pppcrypt.o
  HEADERS += pppcrypt.h
-@@ -134,36 +116,36 @@ endif
+@@ -142,36 +124,36 @@ endif
  
  # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
  ifdef USE_PAM
 -CFLAGS   += -DUSE_PAM
-+CPPFLAGS += -DUSE_PAM
++CPPFLAGS   += -DUSE_PAM
  LIBS     += -lpam -ldl
  endif
  
@@ -130,21 +136,21 @@
  ifdef LOCKLIB
  LIBS     += -llock
 -CFLAGS   += -DLOCKLIB=1
-+CPPFLAGS += -DLOCKLIB=1
++CPPFLAGS   += -DLOCKLIB=1
  endif
  
  ifdef PLUGIN
 -CFLAGS	+= -DPLUGIN
-+CPPFLAGS += -DPLUGIN
++CPPFLAGS	+= -DPLUGIN
  LDFLAGS	+= -Wl,-E
  LIBS	+= -ldl
  endif
-@@ -171,52 +153,51 @@ endif
+@@ -179,36 +161,34 @@ endif
  ifdef FILTER
  ifneq ($(wildcard /usr/include/pcap-bpf.h),)
  LIBS    += -lpcap
 -CFLAGS  += -DPPP_FILTER
-+CPPFLAGS += -DPPP_FILTER
++CPPFLAGS  += -DPPP_FILTER
  endif
  endif
  
@@ -156,7 +162,7 @@
 +PPPDSRCS += ipv6cp.c eui64.c
 +HEADERS  += ipv6cp.h eui64.h
 +PPPDOBJS += ipv6cp.o eui64.o
-+CPPFLAGS += -DINET6=1
++CPPFLAGS   += -DINET6=1
  endif
  
  ifdef CBCP
@@ -179,23 +185,17 @@
 -
  all: $(TARGETS)
  
-+# generate dependencies
-+#include $(PPPDSRCS:.c=.d)
-+
  install: pppd
--	mkdir -p $(BINDIR) $(MANDIR)
-+	$(INSTALL) -d -m 755 $(BINDIR)
-+	$(INSTALL) -d -m 755 $(MANDIR)
+ 	mkdir -p $(BINDIR) $(MANDIR)
  	$(EXTRAINSTALL)
 -	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
 +	$(INSTALL) $(STRIP) -c -m 555 pppd $(BINDIR)/pppd
  	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
  	  chmod o-rx,u+s $(BINDIR)/pppd; fi
  	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
- 
+@@ -216,8 +196,8 @@ install: pppd
  pppd: $(PPPDOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
  
 -srp-entry:	srp-entry.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
@@ -203,13 +203,11 @@
 +	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
  install-devel:
--	mkdir -p $(INCDIR)/pppd
-+	$(INSTALL) -d -m 755 $(INCDIR)/pppd
- 	$(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd
+ 	mkdir -p $(INCDIR)/pppd
+@@ -225,6 +205,3 @@ install-devel:
  
  clean:
--	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
+ 	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
 -
 -depend:
 -	$(CPP) -M $(CFLAGS) $(PPPDSRCS) >.depend
-+	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *.d *~ #* core