summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/ppp/Makefile20
-rw-r--r--package/ppp/patches/patch-include_linux_if_pppol2tp_h49
-rw-r--r--package/ppp/patches/patch-pppd_Makefile_linux74
-rw-r--r--package/ppp/patches/patch-pppd_ipcp_c6
-rw-r--r--package/ppp/patches/patch-pppd_ipv6cp_c112
-rw-r--r--package/ppp/patches/patch-pppd_lcp_c24
-rw-r--r--package/ppp/patches/patch-pppd_main_c8
-rw-r--r--package/ppp/patches/patch-pppd_options_c155
-rw-r--r--package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux27
-rw-r--r--package/ppp/patches/patch-pppd_plugins_radius_radiusclient_h6
-rw-r--r--package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c6
-rw-r--r--package/ppp/patches/patch-pppd_pppd_877
-rw-r--r--package/ppp/patches/patch-pppd_pppd_h37
-rw-r--r--package/ppp/patches/patch-pppd_utils_c37
14 files changed, 108 insertions, 530 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 50e10c2f8..13b7ade48 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= ppp
-PKG_VERSION:= 2.4.5
-PKG_RELEASE:= 7
-PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57
+PKG_VERSION:= 2.4.6
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 3434d2cc9327167a0723aaaa8670083b
PKG_DESCR:= point-to-point protocol software
PKG_SECTION:= net/ppp
PKG_BUILDDEP:= libpcap
@@ -17,20 +17,20 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_SUBPKGS:= PPP PPP_MOD_PPPOA PPP_MOD_PPPOE PPP_MOD_RADIUS
PKG_SUBPKGS+= PPP_MOD_CHAT PPP_MOD_PPPDUMP PPP_MOD_PPPSTATS PPP_MOD_PPPUMTS
-PKGSD_PPP_MOD_PPPOE:= PPP over Ethernet support
+PKGSD_PPP_MOD_PPPOE:= ppp over ethernet support
PKGSN_PPP_MOD_PPPOE:= ppp
-PKGSD_PPP_MOD_PPPUMTS:= PPP UMTS support
+PKGSD_PPP_MOD_PPPUMTS:= ppp umts support
PKGSS_PPP_MOD_PPPUMTS:= comgt
PKGSN_PPP_MOD_PPPUMTS:= ppp
-PKGSD_PPP_MOD_PPPOA:= PPP over ATM support
+PKGSD_PPP_MOD_PPPOA:= ppp over atm support
PKGSN_PPP_MOD_PPPOA:= ppp
-PKGSD_PPP_MOD_RADIUS:= RADIUS support
+PKGSD_PPP_MOD_RADIUS:= radius support
PKGSN_PPP_MOD_RADIUS:= ppp
-PKGSD_PPP_MOD_CHAT:= PPP chat application
+PKGSD_PPP_MOD_CHAT:= ppp chat application
PKGSN_PPP_MOD_CHAT:= ppp
-PKGSD_PPP_MOD_PPPDUMP:= PPP dump utility
+PKGSD_PPP_MOD_PPPDUMP:= ppp dump utility
PKGSN_PPP_MOD_PPPDUMP:= ppp
-PKGSD_PPP_MOD_PPPSTATS:=PPP statistic utility
+PKGSD_PPP_MOD_PPPSTATS:=ppp statistic utility
PKGSN_PPP_MOD_PPPSTATS:=ppp
diff --git a/package/ppp/patches/patch-include_linux_if_pppol2tp_h b/package/ppp/patches/patch-include_linux_if_pppol2tp_h
deleted file mode 100644
index 9e346beab..000000000
--- a/package/ppp/patches/patch-include_linux_if_pppol2tp_h
+++ /dev/null
@@ -1,49 +0,0 @@
---- ppp-2.4.5.orig/include/linux/if_pppol2tp.h 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2013-03-04 12:38:54.000000000 +0100
-@@ -32,6 +32,46 @@ struct pppol2tp_addr
- __u16 d_tunnel, d_session; /* For sending outgoing packets */
- };
-
-+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
-+ * bits. So we need a different sockaddr structure.
-+ */
-+struct pppol2tpv3_addr {
-+ pid_t pid; /* pid that owns the fd.
-+ * 0 => current */
-+ int fd; /* FD of UDP or IP socket to use */
-+
-+ struct sockaddr_in addr; /* IP address and port to send to */
-+
-+ __u32 s_tunnel, s_session; /* For matching incoming packets */
-+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
-+};
-+
-+/* Structure used to connect() the socket to a particular tunnel UDP
-+ * * socket over IPv6.
-+ * */
-+struct pppol2tpin6_addr {
-+ __kernel_pid_t pid; /* pid that owns the fd.
-+ * 0 => current */
-+ int fd; /* FD of UDP socket to use */
-+
-+ __u16 s_tunnel, s_session; /* For matching incoming packets */
-+ __u16 d_tunnel, d_session; /* For sending outgoing packets */
-+
-+ struct sockaddr_in6 addr; /* IP address and port to send to */
-+};
-+
-+
-+struct pppol2tpv3in6_addr {
-+ __kernel_pid_t pid; /* pid that owns the fd.
-+ * 0 => current */
-+ int fd; /* FD of UDP or IP socket to use */
-+
-+ __u32 s_tunnel, s_session; /* For matching incoming packets */
-+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
-+
-+ struct sockaddr_in6 addr; /* IP address and port to send to */
-+};
-+
- /* Socket options:
- * DEBUG - bitmask of debug message categories
- * SENDSEQ - 0 => don't send packets with sequence numbers
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
diff --git a/package/ppp/patches/patch-pppd_ipcp_c b/package/ppp/patches/patch-pppd_ipcp_c
index e0b610948..c0f0cf67c 100644
--- a/package/ppp/patches/patch-pppd_ipcp_c
+++ b/package/ppp/patches/patch-pppd_ipcp_c
@@ -1,5 +1,5 @@
---- ppp-2.4.5.orig/pppd/ipcp.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/ipcp.c 2014-03-17 16:13:13.000000000 +0100
+--- ppp-2.4.6.orig/pppd/ipcp.c 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/ipcp.c 2014-06-05 20:42:29.000000000 +0200
@@ -75,13 +75,13 @@ bool disable_defaultip = 0; /* Don't use
bool noremoteip = 0; /* Let him have no IP address */
@@ -118,7 +118,7 @@
void *arg;
{
ipcp_options *wo = &ipcp_wantoptions[0];
-@@ -2126,7 +2126,7 @@ static int
+@@ -2145,7 +2145,7 @@ static int
ipcp_printpkt(p, plen, printer, arg)
u_char *p;
int plen;
diff --git a/package/ppp/patches/patch-pppd_ipv6cp_c b/package/ppp/patches/patch-pppd_ipv6cp_c
deleted file mode 100644
index 0d63be37b..000000000
--- a/package/ppp/patches/patch-pppd_ipv6cp_c
+++ /dev/null
@@ -1,112 +0,0 @@
---- ppp-2.4.5.orig/pppd/ipv6cp.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/ipv6cp.c 2014-03-17 16:13:14.000000000 +0100
-@@ -151,6 +151,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- #include <netdb.h>
-@@ -182,16 +183,16 @@ static int ipv6cp_is_up;
- /*
- * Callbacks for fsm code. (CI = Configuration Information)
- */
--static void ipv6cp_resetci __P((fsm *)); /* Reset our CI */
--static int ipv6cp_cilen __P((fsm *)); /* Return length of our CI */
--static void ipv6cp_addci __P((fsm *, u_char *, int *)); /* Add our CI */
--static int ipv6cp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */
--static int ipv6cp_nakci __P((fsm *, u_char *, int, int));/* Peer nak'd our CI */
--static int ipv6cp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */
--static int ipv6cp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
--static void ipv6cp_up __P((fsm *)); /* We're UP */
--static void ipv6cp_down __P((fsm *)); /* We're DOWN */
--static void ipv6cp_finished __P((fsm *)); /* Don't need lower layer */
-+static void ipv6cp_resetci (fsm *); /* Reset our CI */
-+static int ipv6cp_cilen (fsm *); /* Return length of our CI */
-+static void ipv6cp_addci (fsm *, u_char *, int *); /* Add our CI */
-+static int ipv6cp_ackci (fsm *, u_char *, int); /* Peer ack'd our CI */
-+static int ipv6cp_nakci (fsm *, u_char *, int, int);/* Peer nak'd our CI */
-+static int ipv6cp_rejci (fsm *, u_char *, int); /* Peer rej'd our CI */
-+static int ipv6cp_reqci (fsm *, u_char *, int *, int); /* Rcv CI */
-+static void ipv6cp_up (fsm *); /* We're UP */
-+static void ipv6cp_down (fsm *); /* We're DOWN */
-+static void ipv6cp_finished (fsm *); /* Don't need lower layer */
-
- fsm ipv6cp_fsm[NUM_PPP]; /* IPV6CP fsm structure */
-
-@@ -216,9 +217,9 @@ static fsm_callbacks ipv6cp_callbacks =
- /*
- * Command-line options.
- */
--static int setifaceid __P((char **arg));
--static void printifaceid __P((option_t *,
-- void (*)(void *, char *, ...), void *));
-+static int setifaceid (char **arg);
-+static void printifaceid (option_t *,
-+ void (*)(void *, char *, ...), void *);
-
- static option_t ipv6cp_option_list[] = {
- { "ipv6", o_special, (void *)setifaceid,
-@@ -259,18 +260,18 @@ static option_t ipv6cp_option_list[] = {
- /*
- * Protocol entry points from main code.
- */
--static void ipv6cp_init __P((int));
--static void ipv6cp_open __P((int));
--static void ipv6cp_close __P((int, char *));
--static void ipv6cp_lowerup __P((int));
--static void ipv6cp_lowerdown __P((int));
--static void ipv6cp_input __P((int, u_char *, int));
--static void ipv6cp_protrej __P((int));
--static int ipv6cp_printpkt __P((u_char *, int,
-- void (*) __P((void *, char *, ...)), void *));
--static void ipv6_check_options __P((void));
--static int ipv6_demand_conf __P((int));
--static int ipv6_active_pkt __P((u_char *, int));
-+static void ipv6cp_init (int);
-+static void ipv6cp_open (int);
-+static void ipv6cp_close (int, char *);
-+static void ipv6cp_lowerup (int);
-+static void ipv6cp_lowerdown (int);
-+static void ipv6cp_input (int, u_char *, int);
-+static void ipv6cp_protrej (int);
-+static int ipv6cp_printpkt (u_char *, int,
-+ void (*) __P((void *, char *, ...)), void *);
-+static void ipv6_check_options (void);
-+static int ipv6_demand_conf (int);
-+static int ipv6_active_pkt (u_char *, int);
-
- struct protent ipv6cp_protent = {
- PPP_IPV6CP,
-@@ -292,9 +293,9 @@ struct protent ipv6cp_protent = {
- ipv6_active_pkt
- };
-
--static void ipv6cp_clear_addrs __P((int, eui64_t, eui64_t));
--static void ipv6cp_script __P((char *));
--static void ipv6cp_script_done __P((void *));
-+static void ipv6cp_clear_addrs (int, eui64_t, eui64_t);
-+static void ipv6cp_script (char *);
-+static void ipv6cp_script_done (void *);
-
- /*
- * Lengths of configuration options.
-@@ -380,7 +381,7 @@ char *llv6_ntoa(eui64_t ifaceid);
- static void
- printifaceid(opt, printer, arg)
- option_t *opt;
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- ipv6cp_options *wo = &ipv6cp_wantoptions[0];
-@@ -1435,7 +1436,7 @@ static int
- ipv6cp_printpkt(p, plen, printer, arg)
- u_char *p;
- int plen;
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- int code, id, len, olen;
diff --git a/package/ppp/patches/patch-pppd_lcp_c b/package/ppp/patches/patch-pppd_lcp_c
index 5d8971b94..4238961d4 100644
--- a/package/ppp/patches/patch-pppd_lcp_c
+++ b/package/ppp/patches/patch-pppd_lcp_c
@@ -1,6 +1,14 @@
---- ppp-2.4.5.orig/pppd/lcp.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/lcp.c 2014-03-17 16:13:13.000000000 +0100
-@@ -66,7 +66,7 @@ static const char rcsid[] = RCSID;
+--- ppp-2.4.6.orig/pppd/lcp.c 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/lcp.c 2014-06-05 21:05:49.000000000 +0200
+@@ -52,6 +52,7 @@
+
+ #include "pppd.h"
+ #include "fsm.h"
++#include "eap.h"
+ #include "lcp.h"
+ #include "chap-new.h"
+ #include "magic.h"
+@@ -66,7 +67,7 @@ static const char rcsid[] = RCSID;
/* steal a bit in fsm flags word */
#define DELAYED_UP 0x100
@@ -9,7 +17,7 @@
/*
* LCP-related command-line options.
-@@ -76,12 +76,12 @@ int lcp_echo_fails = 0; /* Tolerance to
+@@ -76,12 +77,12 @@ int lcp_echo_fails = 0; /* Tolerance to
bool lax_recv = 0; /* accept control chars in asyncmap */
bool noendpoint = 0; /* don't send/accept endpoint discriminator */
@@ -26,7 +34,7 @@
#endif /* HAVE_MULTILINK */
static option_t lcp_option_list[] = {
-@@ -202,31 +202,31 @@ static u_char nak_buffer[PPP_MRU]; /* wh
+@@ -202,31 +203,31 @@ static u_char nak_buffer[PPP_MRU]; /* wh
/*
* Callbacks for fsm code. (CI = Configuration Information)
*/
@@ -78,7 +86,7 @@
static fsm_callbacks lcp_callbacks = { /* LCP callback routines */
lcp_resetci, /* Reset our Configuration Information */
-@@ -251,11 +251,11 @@ static fsm_callbacks lcp_callbacks = { /
+@@ -251,11 +252,11 @@ static fsm_callbacks lcp_callbacks = { /
* Some of these are called directly.
*/
@@ -95,7 +103,7 @@
struct protent lcp_protent = {
PPP_LCP,
-@@ -322,7 +322,7 @@ setendpoint(argv)
+@@ -322,7 +323,7 @@ setendpoint(argv)
static void
printendpoint(opt, printer, arg)
option_t *opt;
@@ -104,7 +112,7 @@
void *arg;
{
printer(arg, "%s", epdisc_to_str(&lcp_wantoptions[0].endpoint));
-@@ -1985,7 +1985,7 @@ static int
+@@ -1995,7 +1996,7 @@ static int
lcp_printpkt(p, plen, printer, arg)
u_char *p;
int plen;
diff --git a/package/ppp/patches/patch-pppd_main_c b/package/ppp/patches/patch-pppd_main_c
index adc00acd1..48232482b 100644
--- a/package/ppp/patches/patch-pppd_main_c
+++ b/package/ppp/patches/patch-pppd_main_c
@@ -1,5 +1,5 @@
---- ppp-2.4.5.orig/pppd/main.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/main.c 2014-03-17 16:13:13.000000000 +0100
+--- ppp-2.4.6.orig/pppd/main.c 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/main.c 2014-06-05 20:42:29.000000000 +0200
@@ -90,6 +90,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
@@ -186,7 +186,7 @@
gettimeofday(&timenow, NULL);
tvp->tv_sec = callout->c_time.tv_sec - timenow.tv_sec;
-@@ -1692,7 +1729,7 @@ run_program(prog, args, must_exist, done
+@@ -1777,7 +1814,7 @@ run_program(prog, args, must_exist, done
char *prog;
char **args;
int must_exist;
@@ -195,7 +195,7 @@
void *arg;
int wait;
{
-@@ -1767,7 +1804,7 @@ void
+@@ -1853,7 +1890,7 @@ void
record_child(pid, prog, done, arg, killable)
int pid;
char *prog;
diff --git a/package/ppp/patches/patch-pppd_options_c b/package/ppp/patches/patch-pppd_options_c
deleted file mode 100644
index d23d1291d..000000000
--- a/package/ppp/patches/patch-pppd_options_c
+++ /dev/null
@@ -1,155 +0,0 @@
---- ppp-2.4.5.orig/pppd/options.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/options.c 2014-03-17 16:13:14.000000000 +0100
-@@ -76,7 +76,7 @@
- #include "pathnames.h"
-
- #if defined(ultrix) || defined(NeXT)
--char *strdup __P((char *));
-+char *strdup (char *);
- #endif
-
- static const char rcsid[] = RCSID;
-@@ -147,30 +147,30 @@ static char logfile_name[MAXPATHLEN]; /*
- /*
- * Prototypes
- */
--static int setdomain __P((char **));
--static int readfile __P((char **));
--static int callfile __P((char **));
--static int showversion __P((char **));
--static int showhelp __P((char **));
--static void usage __P((void));
--static int setlogfile __P((char **));
-+static int setdomain (char **);
-+static int readfile (char **);
-+static int callfile (char **);
-+static int showversion (char **);
-+static int showhelp (char **);
-+static void usage (void);
-+static int setlogfile (char **);
- #ifdef PLUGIN
--static int loadplugin __P((char **));
-+static int loadplugin (char **);
- #endif
-
- #ifdef PPP_FILTER
--static int setpassfilter __P((char **));
--static int setactivefilter __P((char **));
-+static int setpassfilter (char **);
-+static int setactivefilter (char **);
- #endif
-
- #ifdef MAXOCTETS
--static int setmodir __P((char **));
-+static int setmodir (char **);
- #endif
-
--static option_t *find_option __P((const char *name));
--static int process_option __P((option_t *, char *, char **));
--static int n_arguments __P((option_t *));
--static int number_option __P((char *, u_int32_t *, int));
-+static option_t *find_option (const char *name);
-+static int process_option (option_t *, char *, char **);
-+static int n_arguments (option_t *);
-+static int number_option (char *, u_int32_t *, int);
-
- /*
- * Structure to store extra lists of options.
-@@ -577,13 +577,13 @@ match_option(name, opt, dowild)
- option_t *opt;
- int dowild;
- {
-- int (*match) __P((char *, char **, int));
-+ int (*match) (char *, char **, int);
-
- if (dowild != (opt->type == o_wild))
- return 0;
- if (!dowild)
- return strcmp(name, opt->name) == 0;
-- match = (int (*) __P((char *, char **, int))) opt->addr;
-+ match = (int (*) (char *, char **, int)) opt->addr;
- return (*match)(name, NULL, 0);
- }
-
-@@ -635,8 +635,8 @@ process_option(opt, cmd, argv)
- u_int32_t v;
- int iv, a;
- char *sv;
-- int (*parser) __P((char **));
-- int (*wildp) __P((char *, char **, int));
-+ int (*parser) (char **);
-+ int (*wildp) (char *, char **, int);
- char *optopt = (opt->type == o_wild)? "": " option";
- int prio = option_priority;
- option_t *mainopt = opt;
-@@ -767,7 +767,7 @@ process_option(opt, cmd, argv)
-
- case o_special_noarg:
- case o_special:
-- parser = (int (*) __P((char **))) opt->addr;
-+ parser = (int (*) (char **)) opt->addr;
- if (!(*parser)(argv))
- return 0;
- if (opt->flags & OPT_A2LIST) {
-@@ -790,7 +790,7 @@ process_option(opt, cmd, argv)
- break;
-
- case o_wild:
-- wildp = (int (*) __P((char *, char **, int))) opt->addr;
-+ wildp = (int (*) (char *, char **, int)) opt->addr;
- if (!(*wildp)(cmd, argv, 1))
- return 0;
- break;
-@@ -881,7 +881,7 @@ check_options()
- static void
- print_option(opt, mainopt, printer, arg)
- option_t *opt, *mainopt;
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- int i, v;
-@@ -944,12 +944,12 @@ print_option(opt, mainopt, printer, arg)
- printer(arg, " ");
- }
- if (opt->flags & OPT_A2PRINTER) {
-- void (*oprt) __P((option_t *,
-+ void (*oprt) (option_t *,
- void ((*)__P((void *, char *, ...))),
-- void *));
-- oprt = (void (*) __P((option_t *,
-+ void *);
-+ oprt = (void (*) (option_t *,
- void ((*)__P((void *, char *, ...))),
-- void *)))opt->addr2;
-+ void *))opt->addr2;
- (*oprt)(opt, printer, arg);
- } else if (opt->flags & OPT_A2STRVAL) {
- p = (char *) opt->addr2;
-@@ -986,7 +986,7 @@ print_option(opt, mainopt, printer, arg)
- static void
- print_option_list(opt, printer, arg)
- option_t *opt;
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- while (opt->name != NULL) {
-@@ -1004,7 +1004,7 @@ print_option_list(opt, printer, arg)
- */
- void
- print_options(printer, arg)
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- struct option_list *list;
-@@ -1576,7 +1576,7 @@ loadplugin(argv)
- char *arg = *argv;
- void *handle;
- const char *err;
-- void (*init) __P((void));
-+ void (*init) (void);
- char *path = arg;
- const char *vers;
-
diff --git a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
index 481f1e41c..e3d743e6f 100644
--- a/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
+++ b/package/ppp/patches/patch-pppd_plugins_pppol2tp_Makefile_linux
@@ -1,18 +1,20 @@
---- ppp-2.4.5.orig/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2011-01-21 21:30:05.208658673 +0100
-@@ -1,29 +1,27 @@
+--- ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux 2014-06-06 08:18:13.000000000 +0200
+@@ -1,22 +1,20 @@
-#CC = gcc
-COPTS = -O2 -g
-CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
-LDFLAGS = -shared
-INSTALL = install
-+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-
+-
-#***********************************************************************
-+include ../../../Makedefs.com
-
+-
-DESTDIR = @DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+-
+ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
+
++include ../../../Makedefs.com
+CPPFLAGS += -I. -I../.. -I../../../include
+ifeq (,$(filter -fPIC,$(CFLAGS)))
+CFLAGS += -fPIC
@@ -20,10 +22,7 @@
+ifeq (,$(filter -shared,$(LDFLAGS)))
+LDFLAGS += -shared
+endif
-
--VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-+#***********************************************************************
-
++
PLUGINS := pppol2tp.so openl2tp.so
all: $(PLUGINS)
@@ -32,11 +31,9 @@
- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
--install: all
-+install: $(PLUGINS)
+ install: all
$(INSTALL) -d -m 755 $(LIBDIR)
-- $(INSTALL) -c -m 4550 $(PLUGINS) $(LIBDIR)
-+ $(INSTALL) $(STRIP) -c -m 755 $(PLUGINS) $(LIBDIR)
+@@ -24,6 +22,3 @@ install: all
clean:
rm -f *.o *.so
diff --git a/package/ppp/patches/patch-pppd_plugins_radius_radiusclient_h b/package/ppp/patches/patch-pppd_plugins_radius_radiusclient_h
index 6c6d1582c..d37a70a6e 100644
--- a/package/ppp/patches/patch-pppd_plugins_radius_radiusclient_h
+++ b/package/ppp/patches/patch-pppd_plugins_radius_radiusclient_h
@@ -1,6 +1,6 @@
---- ppp-2.4.5.orig/pppd/plugins/radius/radiusclient.h 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/radius/radiusclient.h 2014-03-17 16:13:11.000000000 +0100
-@@ -382,74 +382,74 @@ typedef struct env
+--- ppp-2.4.6.orig/pppd/plugins/radius/radiusclient.h 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/radius/radiusclient.h 2014-06-05 20:42:29.000000000 +0200
+@@ -386,74 +386,74 @@ typedef struct env
/* avpair.c */
diff --git a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c
index 9a2b922b2..6a8cb0d8c 100644
--- a/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c
+++ b/package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c
@@ -1,5 +1,5 @@
---- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/plugin.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c 2014-03-17 16:32:55.000000000 +0100
+--- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/plugin.c 2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/rp-pppoe/plugin.c 2014-06-05 20:42:29.000000000 +0200
@@ -46,7 +46,6 @@ static char const RCSID[] =
#include <unistd.h>
#include <fcntl.h>
@@ -7,4 +7,4 @@
-#include <net/ethernet.h>
#include <net/if_arp.h>
#include <linux/ppp_defs.h>
- #include <linux/if_ppp.h>
+ #include <linux/if_pppox.h>
diff --git a/package/ppp/patches/patch-pppd_pppd_8 b/package/ppp/patches/patch-pppd_pppd_8
deleted file mode 100644
index c877824eb..000000000
--- a/package/ppp/patches/patch-pppd_pppd_8
+++ /dev/null
@@ -1,77 +0,0 @@
---- ppp-2.4.5.orig/pppd/pppd.8 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/pppd.8 2011-01-16 15:51:05.000000000 +0100
-@@ -638,9 +638,29 @@ control, as for the \fIcrtscts\fR option
- Enables the use of PPP multilink; this is an alias for the `multilink'
- option. This option is currently only available under Linux.
- .TP
--.B mppe\-stateful
--Allow MPPE to use stateful mode. Stateless mode is still attempted first.
--The default is to disallow stateful mode.
-+.B mppc
-+Enables MPPC (Microsoft Point to Point Compression). This is the default.
-+.TP
-+.B mppe \fIsubopt1[,subopt2[,subopt3[..]]]
-+Modify MPPE (Microsoft Point to Point Encryption) parameters. In order
-+for MPPE to successfully come up, you must have authenticated with either
-+MS-CHAP or MS-CHAPv2. By default MPPE is optional, it means that pppd will
-+not propose MPPE to the peer, but will negotiate MPPE if peer wants that.
-+You can change this using \fIrequired\fR suboption.
-+This option is presently only supported under Linux, and only if your
-+kernel has been configured to include MPPE support.
-+.IP
-+MPPE suboptions:
-+.br
-+\fIrequired\fR - require MPPE; disconnect if peer doesn't support it,
-+.br
-+\fIstateless\fR - try to negotiate stateless mode; default is stateful,
-+.br
-+\fIno40\fR - disable 40 bit keys,
-+.br
-+\fIno56\fR - disable 56 bit keys,
-+.br
-+\fIno128\fR - disable 128 bit keys
- .TP
- .B mpshortseq
- Enables the use of short (12-bit) sequence numbers in multilink
-@@ -778,17 +798,11 @@ peer is buggy.
- Disables the use of PPP multilink. This option is currently only
- available under Linux.
- .TP
--.B nomppe
--Disables MPPE (Microsoft Point to Point Encryption). This is the default.
--.TP
--.B nomppe\-40
--Disable 40-bit encryption with MPPE.
--.TP
--.B nomppe\-128
--Disable 128-bit encryption with MPPE.
-+.B nomppc
-+Disables MPPC (Microsoft Point to Point Compression).
- .TP
--.B nomppe\-stateful
--Disable MPPE stateful mode. This is the default.
-+.B nomppe
-+Disables MPPE (Microsoft Point to Point Encryption).
- .TP
- .B nompshortseq
- Disables the use of short (12-bit) sequence numbers in the PPP
-@@ -980,19 +994,6 @@ peer using PAP.
- Require the peer to authenticate itself using CHAP [Challenge
- Handshake Authentication Protocol] authentication.
- .TP
--.B require\-mppe
--Require the use of MPPE (Microsoft Point to Point Encryption). This
--option disables all other compression types. This option enables
--both 40-bit and 128-bit encryption. In order for MPPE to successfully
--come up, you must have authenticated with either MS\-CHAP or MS\-CHAPv2.
--This option is presently only supported under Linux, and only if your
--kernel has been configured to include MPPE support.
--.TP
--.B require\-mppe\-40
--Require the use of MPPE, with 40-bit encryption.
--.TP
--.B require\-mppe\-128
--Require the use of MPPE, with 128-bit encryption.
- .TP
- .B require\-mschap
- Require the peer to authenticate itself using MS\-CHAP [Microsoft Challenge
diff --git a/package/ppp/patches/patch-pppd_pppd_h b/package/ppp/patches/patch-pppd_pppd_h
index 85e81b675..b6c851da3 100644
--- a/package/ppp/patches/patch-pppd_pppd_h
+++ b/package/ppp/patches/patch-pppd_pppd_h
@@ -1,15 +1,17 @@
---- ppp-2.4.5.orig/pppd/pppd.h 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/pppd.h 2014-03-17 16:13:14.000000000 +0100
-@@ -198,7 +198,7 @@ struct epdisc {
+--- 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
+@@ -198,8 +198,8 @@ struct epdisc {
#define EPD_MAGIC 4
#define EPD_PHONENUM 5
-typedef void (*notify_func) __P((void *, int));
+-typedef void (*printer_func) __P((void *, char *, ...));
+typedef void (*notify_func) (void *, int);
++typedef void (*printer_func) (void *, char *, ...);
struct notifier {
struct notifier *next;
-@@ -392,35 +392,35 @@ extern int option_priority; /* priority
+@@ -396,34 +396,34 @@ extern int option_priority; /* priority
struct protent {
u_short protocol; /* PPP protocol number */
/* Initialization procedure */
@@ -34,10 +36,9 @@
- void (*close) __P((int unit, char *reason));
+ void (*close) (int unit, char *reason);
/* Print a packet in readable form */
-- int (*printpkt) __P((u_char *pkt, int len,
-+ int (*printpkt) (u_char *pkt, int len,
- void (*printer) __P((void *, char *, ...)),
+- int (*printpkt) __P((u_char *pkt, int len, printer_func printer,
- void *arg));
++ int (*printpkt) (u_char *pkt, int len, printer_func printer,
+ void *arg);
/* Process a received data packet */
- void (*datainput) __P((int unit, u_char *pkt, int len));
@@ -58,7 +59,7 @@
};
/* Table of pointers to supported protocols */
-@@ -437,25 +437,25 @@ struct channel {
+@@ -440,25 +440,25 @@ struct channel {
/* set of options for this channel */
option_t *options;
/* find and process a per-channel options file */
@@ -94,7 +95,7 @@
};
extern struct channel *the_channel;
-@@ -465,117 +465,117 @@ extern struct channel *the_channel;
+@@ -483,117 +483,117 @@ extern struct userenv *userenv_list;
*/
/* Procedures exported from main.c. */
@@ -167,8 +168,9 @@
-void log_packet __P((u_char *, int, char *, int));
+void log_packet (u_char *, int, char *, int);
/* Format a packet and log it with syslog */
--void print_string __P((char *, int, void (*) (void *, char *, ...),
-- void *)); /* Format a string for output */
+-void print_string __P((char *, int, printer_func, void *));
++void print_string (char *, int, printer_func, void *);
+ /* Format a string for output */
-int slprintf __P((char *, int, char *, ...)); /* sprintf++ */
-int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */
-size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */
@@ -183,8 +185,6 @@
-void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */
-void end_pr_log __P((void)); /* finish up after using pr_log */
-void dump_packet __P((const char *, u_char *, int));
-+void print_string (char *, int, void (*) (void *, char *, ...),
-+ void *); /* Format a string for output */
+int slprintf (char *, int, char *, ...); /* sprintf++ */
+int vslprintf (char *, int, char *, va_list); /* vsprintf++ */
+size_t strlcpy (char *, const char *, size_t); /* safe strcpy */
@@ -296,7 +296,7 @@
#else
#define mp_bundle_terminated() /* nothing */
#define mp_exit_bundle() /* nothing */
-@@ -584,142 +584,142 @@ int str_to_epdisc __P((struct epdisc *,
+@@ -602,145 +602,145 @@ int str_to_epdisc __P((struct epdisc *,
#endif
/* Procedures exported from sys-*.c */
@@ -395,6 +395,7 @@
+int cifaddr (int, u_int32_t, u_int32_t);
/* Reset i/f IP addresses */
#ifdef INET6
+ int ether_to_eui64(eui64_t *p_eui64); /* convert eth0 hw address to EUI64 */
-int sif6addr __P((int, eui64_t, eui64_t));
+int sif6addr (int, eui64_t, eui64_t);
/* Configure IPv6 addresses for i/f */
@@ -479,8 +480,8 @@
+void check_options (void); /* check values after all options parsed */
+int override_value (const char *, int, const char *);
/* override value if permitted by priority */
--void print_options __P((void (*) __P((void *, char *, ...)), void *));
-+void print_options (void (*) __P((void *, char *, ...)), void *);
+-void print_options __P((printer_func, void *));
++void print_options (printer_func, void *);
/* print out values of all options */
-int parse_dotted_ip __P((char *, u_int32_t *));
@@ -507,6 +508,8 @@
-extern void (*ip_up_hook) __P((void));
-extern void (*ip_down_hook) __P((void));
-extern void (*ip_choose_hook) __P((u_int32_t *));
+-extern void (*ipv6_up_hook) __P((void));
+-extern void (*ipv6_down_hook) __P((void));
+ struct wordlist **popts);
+extern void (*pap_logout_hook) (void);
+extern int (*pap_passwd_hook) (char *user, char *passwd);
@@ -514,6 +517,8 @@
+extern void (*ip_up_hook) (void);
+extern void (*ip_down_hook) (void);
+extern void (*ip_choose_hook) (u_int32_t *);
++extern void (*ipv6_up_hook) (void);
++extern void (*ipv6_down_hook) (void);
-extern int (*chap_check_hook) __P((void));
-extern int (*chap_passwd_hook) __P((char *user, char *passwd));
diff --git a/package/ppp/patches/patch-pppd_utils_c b/package/ppp/patches/patch-pppd_utils_c
deleted file mode 100644
index 46304e640..000000000
--- a/package/ppp/patches/patch-pppd_utils_c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ppp-2.4.5.orig/pppd/utils.c 2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/utils.c 2014-03-17 16:13:14.000000000 +0100
-@@ -65,11 +65,11 @@ static const char rcsid[] = RCSID;
- extern char *strerror();
- #endif
-
--static void logit __P((int, char *, va_list));
--static void log_write __P((int, char *));
--static void vslp_printer __P((void *, char *, ...));
--static void format_packet __P((u_char *, int, void (*) (void *, char *, ...),
-- void *));
-+static void logit (int, char *, va_list);
-+static void log_write (int, char *);
-+static void vslp_printer (void *, char *, ...);
-+static void format_packet (u_char *, int, void (*) (void *, char *, ...),
-+ void *);
-
- struct buffer_info {
- char *ptr;
-@@ -475,7 +475,7 @@ static void
- format_packet(p, len, printer, arg)
- u_char *p;
- int len;
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- int i, n;
-@@ -613,7 +613,7 @@ void
- print_string(p, len, printer, arg)
- char *p;
- int len;
-- void (*printer) __P((void *, char *, ...));
-+ void (*printer) (void *, char *, ...);
- void *arg;
- {
- int c;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 12:20:44 +0000