update ppp to latest stable version

4 files changed, 21 insertions, 17 deletions

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 4e44c6050..b236d4770 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -4,14 +4,14 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		ppp
-PKG_VERSION:=		2.4.6
+PKG_VERSION:=		2.4.7
 PKG_RELEASE:=		1
-PKG_HASH:=		1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d
+PKG_HASH:=		02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30
 PKG_DESCR:=		point-to-point protocol software
 PKG_SECTION:=		net/ppp
 PKG_BUILDDEP:=		libpcap
 PKG_URL:=		http://ppp.samba.org/
-PKG_SITES:=		ftp://ftp.samba.org/pub/ppp/
+PKG_SITES:=		https://ppp.samba.org/ftp/ppp/
 PKG_CFLINE_PPP:=	select ADK_KERNEL_PPP m
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/ppp/patches/patch-pppd_plugins_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_Makefile_linux
index 8351654c7..ce28a1e2c 100644
--- a/package/ppp/patches/patch-pppd_plugins_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_Makefile_linux
@@ -1,5 +1,5 @@
---- ppp-2.4.5.orig/pppd/plugins/Makefile.linux	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/Makefile.linux	2011-01-21 21:29:58.118658260 +0100
+--- ppp-2.4.7.orig/pppd/plugins/Makefile.linux	2014-08-09 14:31:39.000000000 +0200
++++ ppp-2.4.7/pppd/plugins/Makefile.linux	2015-06-09 11:14:41.000000000 +0200
 @@ -1,13 +1,13 @@
 -#CC	= gcc
 -COPTS	= -O2 -g
@@ -23,7 +23,7 @@
  
  SUBDIRS := rp-pppoe pppoatm pppol2tp
  # Uncomment the next line to include the radius authentication plugin
-@@ -23,12 +23,10 @@ all:	$(PLUGINS)
+@@ -30,12 +30,10 @@ all:	$(PLUGINS)
  	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
  
  %.so: %.c
@@ -38,7 +38,7 @@
  	$(INSTALL) $? $(LIBDIR)
  	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d install; done
  
-@@ -37,5 +35,4 @@ clean:
+@@ -44,5 +42,4 @@ clean:
  	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done
  
  depend:
diff --git a/package/ppp/patches/patch-pppd_pppd_h b/package/ppp/patches/patch-pppd_pppd_h
index b6c851da3..220dacdba 100644
--- a/package/ppp/patches/patch-pppd_pppd_h
+++ b/package/ppp/patches/patch-pppd_pppd_h
@@ -1,5 +1,5 @@
---- ppp-2.4.6.orig/pppd/pppd.h	2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/pppd/pppd.h	2014-06-06 08:12:44.000000000 +0200
+--- ppp-2.4.7.orig/pppd/pppd.h	2014-08-09 14:31:39.000000000 +0200
++++ ppp-2.4.7/pppd/pppd.h	2015-06-09 13:01:25.000000000 +0200
 @@ -198,8 +198,8 @@ struct epdisc {
  #define EPD_MAGIC	4
  #define EPD_PHONENUM	5
@@ -11,7 +11,7 @@
  
  struct notifier {
      struct notifier *next;
-@@ -396,34 +396,34 @@ extern int  option_priority;	/* priority
+@@ -397,34 +397,34 @@ extern int  option_priority;	/* priority
  struct protent {
      u_short protocol;		/* PPP protocol number */
      /* Initialization procedure */
@@ -59,7 +59,7 @@
  };
  
  /* Table of pointers to supported protocols */
-@@ -440,25 +440,25 @@ struct channel {
+@@ -441,25 +441,25 @@ struct channel {
  	/* set of options for this channel */
  	option_t *options;
  	/* find and process a per-channel options file */
@@ -95,7 +95,7 @@
  };
  
  extern struct channel *the_channel;
-@@ -483,117 +483,117 @@ extern struct userenv *userenv_list;
+@@ -484,117 +484,117 @@ extern struct userenv *userenv_list;
   */
  
  /* Procedures exported from main.c. */
@@ -296,7 +296,7 @@
  #else
  #define mp_bundle_terminated()	/* nothing */
  #define mp_exit_bundle()	/* nothing */
-@@ -602,145 +602,145 @@ int  str_to_epdisc __P((struct epdisc *,
+@@ -603,147 +603,147 @@ int  str_to_epdisc __P((struct epdisc *,
  #endif
  
  /* Procedures exported from sys-*.c */
@@ -396,7 +396,11 @@
  				/* Reset i/f IP addresses */
  #ifdef INET6
  int  ether_to_eui64(eui64_t *p_eui64);	/* convert eth0 hw address to EUI64 */
+-int  sif6up __P((int));		/* Configure i/f up for IPv6 */
+-int  sif6down __P((int));	/* Configure i/f down for IPv6 */
 -int  sif6addr __P((int, eui64_t, eui64_t));
++int  sif6up (int);		/* Configure i/f up for IPv6 */
++int  sif6down (int);	/* Configure i/f down for IPv6 */
 +int  sif6addr (int, eui64_t, eui64_t);
  				/* Configure IPv6 addresses for i/f */
 -int  cif6addr __P((int, eui64_t, eui64_t));
@@ -511,7 +515,7 @@
 -extern void (*ipv6_up_hook) __P((void));
 -extern void (*ipv6_down_hook) __P((void));
 +				 struct wordlist **popts);
-+extern void (*pap_logout_hook) (void);
++extern void (*pap_logout_hook)(void);
 +extern int (*pap_passwd_hook) (char *user, char *passwd);
 +extern int (*allowed_address_hook) (u_int32_t addr);
 +extern void (*ip_up_hook) (void);
diff --git a/package/ppp/patches/patch-pppd_tty_c b/package/ppp/patches/patch-pppd_tty_c
index 3588e439a..ded8db3dd 100644
--- a/package/ppp/patches/patch-pppd_tty_c
+++ b/package/ppp/patches/patch-pppd_tty_c
@@ -1,5 +1,5 @@
---- ppp-2.4.5.orig/pppd/tty.c	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/tty.c	2014-03-17 16:13:14.000000000 +0100
+--- ppp-2.4.7.orig/pppd/tty.c	2014-08-09 14:31:39.000000000 +0200
++++ ppp-2.4.7/pppd/tty.c	2015-06-09 11:14:41.000000000 +0200
 @@ -98,28 +98,28 @@
  #include "fsm.h"
  #include "lcp.h"
@@ -50,7 +50,7 @@
  
  static int pty_master;		/* fd for master side of pty */
  static int pty_slave;		/* fd for slave side of pty */
-@@ -374,7 +374,7 @@ setescape(argv)
+@@ -378,7 +378,7 @@ setescape(argv)
  static void
  printescape(opt, printer, arg)
      option_t *opt;