From 58a0648738fc9e3454b526473cb8355af1e32925 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Mar 2014 16:39:18 +0100 Subject: enable musl build, patches via lua script from alpinelinux --- package/ppp/Makefile | 4 +- package/ppp/patches/patch-chat_chat_c | 74 +++ package/ppp/patches/patch-include_net_if_ppp_h | 12 + package/ppp/patches/patch-include_net_ppp-comp_h | 56 +++ package/ppp/patches/patch-include_net_ppp_defs_h | 11 + package/ppp/patches/patch-include_net_slcompress_h | 22 + package/ppp/patches/patch-include_net_vjcompress_h | 26 + package/ppp/patches/patch-modules_bsd-comp_c | 35 ++ package/ppp/patches/patch-modules_deflate_c | 47 ++ package/ppp/patches/patch-modules_if_ppp_c | 43 ++ package/ppp/patches/patch-modules_ppp_ahdlc_c | 19 + package/ppp/patches/patch-modules_ppp_c | 76 +++ package/ppp/patches/patch-modules_ppp_comp_c | 30 ++ package/ppp/patches/patch-modules_ppp_mod_h | 28 ++ package/ppp/patches/patch-pppd_auth_c | 116 +++++ package/ppp/patches/patch-pppd_cbcp_c | 59 +++ package/ppp/patches/patch-pppd_ccp_c | 81 ++++ package/ppp/patches/patch-pppd_chap-new_c | 20 + package/ppp/patches/patch-pppd_chap_ms_c | 36 ++ package/ppp/patches/patch-pppd_chap_ms_h | 24 + package/ppp/patches/patch-pppd_demand_c | 11 + package/ppp/patches/patch-pppd_eap_c | 41 ++ package/ppp/patches/patch-pppd_eap_h | 13 + package/ppp/patches/patch-pppd_ecp_c | 42 ++ package/ppp/patches/patch-pppd_eui64_h | 11 + package/ppp/patches/patch-pppd_fsm_c | 25 + package/ppp/patches/patch-pppd_fsm_h | 73 +++ package/ppp/patches/patch-pppd_ipcp_c | 129 +++++ package/ppp/patches/patch-pppd_ipcp_h | 10 + package/ppp/patches/patch-pppd_ipv6cp_c | 106 +++- package/ppp/patches/patch-pppd_ipxcp_c | 98 ++++ package/ppp/patches/patch-pppd_lcp_c | 115 +++++ package/ppp/patches/patch-pppd_lcp_h | 19 + package/ppp/patches/patch-pppd_magic_c | 13 + package/ppp/patches/patch-pppd_magic_h | 14 + package/ppp/patches/patch-pppd_main_c | 137 +++++- package/ppp/patches/patch-pppd_md4_h | 36 ++ package/ppp/patches/patch-pppd_multilink_c | 22 + package/ppp/patches/patch-pppd_options_c | 155 ++++++ .../patch-pppd_plugins_radius_radiusclient_h | 121 +++++ .../ppp/patches/patch-pppd_plugins_rp-pppoe_if_c | 13 + .../patches/patch-pppd_plugins_rp-pppoe_plugin_c | 10 + .../patch-pppd_plugins_rp-pppoe_pppoe-discovery_c | 22 + .../patches/patch-pppd_plugins_rp-pppoe_pppoe_h | 29 ++ package/ppp/patches/patch-pppd_pppcrypt_h | 14 + package/ppp/patches/patch-pppd_pppd_h | 532 +++++++++++++++++++++ package/ppp/patches/patch-pppd_sys-linux_c | 22 + package/ppp/patches/patch-pppd_sys-solaris_c | 27 ++ package/ppp/patches/patch-pppd_tty_c | 61 +++ package/ppp/patches/patch-pppd_upap_c | 53 ++ package/ppp/patches/patch-pppd_upap_h | 12 + package/ppp/patches/patch-pppd_utils_c | 37 ++ package/ppp/patches/patch-pppdump_bsd-comp_c | 27 ++ package/ppp/patches/patch-pppdump_deflate_c | 31 ++ package/ppp/patches/patch-pppdump_ppp-comp_h | 33 ++ package/ppp/patches/patch-pppstats_pppstats_c | 22 + package/ppp/patches/patch-solaris_ppp_ahdlc_c | 19 + package/ppp/patches/patch-solaris_ppp_c | 78 +++ package/ppp/patches/patch-solaris_ppp_comp_c | 30 ++ package/ppp/patches/patch-solaris_ppp_mod_c | 17 + package/ppp/patches/patch-solaris_ppp_mod_h | 28 ++ 61 files changed, 3116 insertions(+), 11 deletions(-) create mode 100644 package/ppp/patches/patch-chat_chat_c create mode 100644 package/ppp/patches/patch-include_net_if_ppp_h create mode 100644 package/ppp/patches/patch-include_net_ppp-comp_h create mode 100644 package/ppp/patches/patch-include_net_ppp_defs_h create mode 100644 package/ppp/patches/patch-include_net_slcompress_h create mode 100644 package/ppp/patches/patch-include_net_vjcompress_h create mode 100644 package/ppp/patches/patch-modules_bsd-comp_c create mode 100644 package/ppp/patches/patch-modules_deflate_c create mode 100644 package/ppp/patches/patch-modules_if_ppp_c create mode 100644 package/ppp/patches/patch-modules_ppp_ahdlc_c create mode 100644 package/ppp/patches/patch-modules_ppp_c create mode 100644 package/ppp/patches/patch-modules_ppp_comp_c create mode 100644 package/ppp/patches/patch-modules_ppp_mod_h create mode 100644 package/ppp/patches/patch-pppd_auth_c create mode 100644 package/ppp/patches/patch-pppd_cbcp_c create mode 100644 package/ppp/patches/patch-pppd_ccp_c create mode 100644 package/ppp/patches/patch-pppd_chap-new_c create mode 100644 package/ppp/patches/patch-pppd_chap_ms_c create mode 100644 package/ppp/patches/patch-pppd_chap_ms_h create mode 100644 package/ppp/patches/patch-pppd_demand_c create mode 100644 package/ppp/patches/patch-pppd_eap_c create mode 100644 package/ppp/patches/patch-pppd_eap_h create mode 100644 package/ppp/patches/patch-pppd_ecp_c create mode 100644 package/ppp/patches/patch-pppd_eui64_h create mode 100644 package/ppp/patches/patch-pppd_fsm_c create mode 100644 package/ppp/patches/patch-pppd_fsm_h create mode 100644 package/ppp/patches/patch-pppd_ipcp_c create mode 100644 package/ppp/patches/patch-pppd_ipcp_h create mode 100644 package/ppp/patches/patch-pppd_ipxcp_c create mode 100644 package/ppp/patches/patch-pppd_lcp_c create mode 100644 package/ppp/patches/patch-pppd_lcp_h create mode 100644 package/ppp/patches/patch-pppd_magic_c create mode 100644 package/ppp/patches/patch-pppd_magic_h create mode 100644 package/ppp/patches/patch-pppd_md4_h create mode 100644 package/ppp/patches/patch-pppd_multilink_c create mode 100644 package/ppp/patches/patch-pppd_options_c create mode 100644 package/ppp/patches/patch-pppd_plugins_radius_radiusclient_h create mode 100644 package/ppp/patches/patch-pppd_plugins_rp-pppoe_if_c create mode 100644 package/ppp/patches/patch-pppd_plugins_rp-pppoe_plugin_c create mode 100644 package/ppp/patches/patch-pppd_plugins_rp-pppoe_pppoe-discovery_c create mode 100644 package/ppp/patches/patch-pppd_plugins_rp-pppoe_pppoe_h create mode 100644 package/ppp/patches/patch-pppd_pppcrypt_h create mode 100644 package/ppp/patches/patch-pppd_pppd_h create mode 100644 package/ppp/patches/patch-pppd_sys-linux_c create mode 100644 package/ppp/patches/patch-pppd_sys-solaris_c create mode 100644 package/ppp/patches/patch-pppd_tty_c create mode 100644 package/ppp/patches/patch-pppd_upap_c create mode 100644 package/ppp/patches/patch-pppd_upap_h create mode 100644 package/ppp/patches/patch-pppd_utils_c create mode 100644 package/ppp/patches/patch-pppdump_bsd-comp_c create mode 100644 package/ppp/patches/patch-pppdump_deflate_c create mode 100644 package/ppp/patches/patch-pppdump_ppp-comp_h create mode 100644 package/ppp/patches/patch-pppstats_pppstats_c create mode 100644 package/ppp/patches/patch-solaris_ppp_ahdlc_c create mode 100644 package/ppp/patches/patch-solaris_ppp_c create mode 100644 package/ppp/patches/patch-solaris_ppp_comp_c create mode 100644 package/ppp/patches/patch-solaris_ppp_mod_c create mode 100644 package/ppp/patches/patch-solaris_ppp_mod_h (limited to 'package/ppp') diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 08d545c79..2c3c17bc3 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ppp PKG_VERSION:= 2.4.5 -PKG_RELEASE:= 6 +PKG_RELEASE:= 7 PKG_MD5SUM:= 4621bc56167b6953ec4071043fe0ec57 PKG_DESCR:= Point-to-Point Protocol software PKG_SECTION:= ppp @@ -15,8 +15,6 @@ PKG_URL:= http://ppp.samba.org/ PKG_SITES:= ftp://ftp.samba.org/pub/ppp/ PKG_MULTI:= 1 -PKG_LIBC_DEPENDS:= uclibc glibc - 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 PKGSS_PPP_MOD_PPPOE:= kmod-pppoe diff --git a/package/ppp/patches/patch-chat_chat_c b/package/ppp/patches/patch-chat_chat_c new file mode 100644 index 000000000..2718fbd8d --- /dev/null +++ b/package/ppp/patches/patch-chat_chat_c @@ -0,0 +1,74 @@ +--- ppp-2.4.5.orig/chat/chat.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/chat/chat.c 2014-03-17 16:13:08.000000000 +0100 +@@ -209,39 +209,39 @@ int clear_report_next = 0; + + int say_next = 0, hup_next = 0; + +-void *dup_mem __P((void *b, size_t c)); +-void *copy_of __P((char *s)); +-char *grow __P((char *s, char **p, size_t len)); +-void usage __P((void)); +-void msgf __P((const char *fmt, ...)); +-void fatal __P((int code, const char *fmt, ...)); +-SIGTYPE sigalrm __P((int signo)); +-SIGTYPE sigint __P((int signo)); +-SIGTYPE sigterm __P((int signo)); +-SIGTYPE sighup __P((int signo)); +-void unalarm __P((void)); +-void init __P((void)); +-void set_tty_parameters __P((void)); +-void echo_stderr __P((int)); +-void break_sequence __P((void)); +-void terminate __P((int status)); +-void do_file __P((char *chat_file)); +-int get_string __P((register char *string)); +-int put_string __P((register char *s)); +-int write_char __P((int c)); +-int put_char __P((int c)); +-int get_char __P((void)); +-void chat_send __P((register char *s)); +-char *character __P((int c)); +-void chat_expect __P((register char *s)); +-char *clean __P((register char *s, int sending)); +-void break_sequence __P((void)); +-void terminate __P((int status)); +-void pack_array __P((char **array, int end)); +-char *expect_strtok __P((char *, char *)); +-int vfmtmsg __P((char *, int, const char *, va_list)); /* vsprintf++ */ ++void *dup_mem (void *b, size_t c); ++void *copy_of (char *s); ++char *grow (char *s, char **p, size_t len); ++void usage (void); ++void msgf (const char *fmt, ...); ++void fatal (int code, const char *fmt, ...); ++SIGTYPE sigalrm (int signo); ++SIGTYPE sigint (int signo); ++SIGTYPE sigterm (int signo); ++SIGTYPE sighup (int signo); ++void unalarm (void); ++void init (void); ++void set_tty_parameters (void); ++void echo_stderr (int); ++void break_sequence (void); ++void terminate (int status); ++void do_file (char *chat_file); ++int get_string (register char *string); ++int put_string (register char *s); ++int write_char (int c); ++int put_char (int c); ++int get_char (void); ++void chat_send (register char *s); ++char *character (int c); ++void chat_expect (register char *s); ++char *clean (register char *s, int sending); ++void break_sequence (void); ++void terminate (int status); ++void pack_array (char **array, int end); ++char *expect_strtok (char *, char *); ++int vfmtmsg (char *, int, const char *, va_list); /* vsprintf++ */ + +-int main __P((int, char *[])); ++int main (int, char *[]); + + void *dup_mem(b, c) + void *b; diff --git a/package/ppp/patches/patch-include_net_if_ppp_h b/package/ppp/patches/patch-include_net_if_ppp_h new file mode 100644 index 000000000..6741e64c8 --- /dev/null +++ b/package/ppp/patches/patch-include_net_if_ppp_h @@ -0,0 +1,12 @@ +--- ppp-2.4.5.orig/include/net/if_ppp.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/include/net/if_ppp.h 2014-03-17 16:13:06.000000000 +0100 +@@ -150,7 +150,7 @@ struct ifpppcstatsreq { + #endif + + #if (defined(_KERNEL) || defined(KERNEL)) && !defined(NeXT) +-void pppattach __P((void)); +-void pppintr __P((void)); ++void pppattach (void); ++void pppintr (void); + #endif + #endif /* _IF_PPP_H_ */ diff --git a/package/ppp/patches/patch-include_net_ppp-comp_h b/package/ppp/patches/patch-include_net_ppp-comp_h new file mode 100644 index 000000000..42e9562b5 --- /dev/null +++ b/package/ppp/patches/patch-include_net_ppp-comp_h @@ -0,0 +1,56 @@ +--- ppp-2.4.5.orig/include/net/ppp-comp.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/include/net/ppp-comp.h 2014-03-17 16:13:07.000000000 +0100 +@@ -59,36 +59,36 @@ struct compressor { + int compress_proto; /* CCP compression protocol number */ + + /* Allocate space for a compressor (transmit side) */ +- void *(*comp_alloc) __P((u_char *options, int opt_len)); ++ void *(*comp_alloc) (u_char *options, int opt_len); + /* Free space used by a compressor */ +- void (*comp_free) __P((void *state)); ++ void (*comp_free) (void *state); + /* Initialize a compressor */ +- int (*comp_init) __P((void *state, u_char *options, int opt_len, +- int unit, int hdrlen, int debug)); ++ int (*comp_init) (void *state, u_char *options, int opt_len, ++ int unit, int hdrlen, int debug); + /* Reset a compressor */ +- void (*comp_reset) __P((void *state)); ++ void (*comp_reset) (void *state); + /* Compress a packet */ +- int (*compress) __P((void *state, PACKETPTR *mret, +- PACKETPTR mp, int orig_len, int max_len)); ++ int (*compress) (void *state, PACKETPTR *mret, ++ PACKETPTR mp, int orig_len, int max_len); + /* Return compression statistics */ +- void (*comp_stat) __P((void *state, struct compstat *stats)); ++ void (*comp_stat) (void *state, struct compstat *stats); + + /* Allocate space for a decompressor (receive side) */ +- void *(*decomp_alloc) __P((u_char *options, int opt_len)); ++ void *(*decomp_alloc) (u_char *options, int opt_len); + /* Free space used by a decompressor */ +- void (*decomp_free) __P((void *state)); ++ void (*decomp_free) (void *state); + /* Initialize a decompressor */ +- int (*decomp_init) __P((void *state, u_char *options, int opt_len, +- int unit, int hdrlen, int mru, int debug)); ++ int (*decomp_init) (void *state, u_char *options, int opt_len, ++ int unit, int hdrlen, int mru, int debug); + /* Reset a decompressor */ +- void (*decomp_reset) __P((void *state)); ++ void (*decomp_reset) (void *state); + /* Decompress a packet. */ +- int (*decompress) __P((void *state, PACKETPTR mp, +- PACKETPTR *dmpp)); ++ int (*decompress) (void *state, PACKETPTR mp, ++ PACKETPTR *dmpp); + /* Update state for an incompressible packet received */ +- void (*incomp) __P((void *state, PACKETPTR mp)); ++ void (*incomp) (void *state, PACKETPTR mp); + /* Return decompression statistics */ +- void (*decomp_stat) __P((void *state, struct compstat *stats)); ++ void (*decomp_stat) (void *state, struct compstat *stats); + }; + #endif /* PACKETPTR */ + diff --git a/package/ppp/patches/patch-include_net_ppp_defs_h b/package/ppp/patches/patch-include_net_ppp_defs_h new file mode 100644 index 000000000..1945c78d7 --- /dev/null +++ b/package/ppp/patches/patch-include_net_ppp_defs_h @@ -0,0 +1,11 @@ +--- ppp-2.4.5.orig/include/net/ppp_defs.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/include/net/ppp_defs.h 2014-03-17 16:32:53.000000000 +0100 +@@ -38,6 +38,8 @@ + #ifndef _PPP_DEFS_H_ + #define _PPP_DEFS_H_ + ++#include ++ + /* + * The basic PPP frame. + */ diff --git a/package/ppp/patches/patch-include_net_slcompress_h b/package/ppp/patches/patch-include_net_slcompress_h new file mode 100644 index 000000000..69d57d909 --- /dev/null +++ b/package/ppp/patches/patch-include_net_slcompress_h @@ -0,0 +1,22 @@ +--- ppp-2.4.5.orig/include/net/slcompress.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/include/net/slcompress.h 2014-03-17 16:13:06.000000000 +0100 +@@ -137,12 +137,12 @@ struct slcompress { + /* flag values */ + #define SLF_TOSS 1 /* tossing rcvd frames because of input err */ + +-void sl_compress_init __P((struct slcompress *)); +-void sl_compress_setup __P((struct slcompress *, int)); +-u_int sl_compress_tcp __P((struct mbuf *, +- struct ip *, struct slcompress *, int)); +-int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *)); +-int sl_uncompress_tcp_core __P((u_char *, int, int, u_int, +- struct slcompress *, u_char **, u_int *)); ++void sl_compress_init (struct slcompress *); ++void sl_compress_setup (struct slcompress *, int); ++u_int sl_compress_tcp (struct mbuf *, ++ struct ip *, struct slcompress *, int); ++int sl_uncompress_tcp (u_char **, int, u_int, struct slcompress *); ++int sl_uncompress_tcp_core (u_char *, int, int, u_int, ++ struct slcompress *, u_char **, u_int *); + + #endif /* _SLCOMPRESS_H_ */ diff --git a/package/ppp/patches/patch-include_net_vjcompress_h b/package/ppp/patches/patch-include_net_vjcompress_h new file mode 100644 index 000000000..cc267c8ea --- /dev/null +++ b/package/ppp/patches/patch-include_net_vjcompress_h @@ -0,0 +1,26 @@ +--- ppp-2.4.5.orig/include/net/vjcompress.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/include/net/vjcompress.h 2014-03-17 16:13:06.000000000 +0100 +@@ -130,15 +130,15 @@ struct vjcompress { + /* flag values */ + #define VJF_TOSS 1 /* tossing rcvd frames because of input err */ + +-extern void vj_compress_init __P((struct vjcompress *comp, int max_state)); +-extern u_int vj_compress_tcp __P((struct ip *ip, u_int mlen, ++extern void vj_compress_init (struct vjcompress *comp, int max_state); ++extern u_int vj_compress_tcp (struct ip *ip, u_int mlen, + struct vjcompress *comp, int compress_cid_flag, +- u_char **vjhdrp)); +-extern void vj_uncompress_err __P((struct vjcompress *comp)); +-extern int vj_uncompress_uncomp __P((u_char *buf, int buflen, +- struct vjcompress *comp)); +-extern int vj_uncompress_tcp __P((u_char *buf, int buflen, int total_len, ++ u_char **vjhdrp); ++extern void vj_uncompress_err (struct vjcompress *comp); ++extern int vj_uncompress_uncomp (u_char *buf, int buflen, ++ struct vjcompress *comp); ++extern int vj_uncompress_tcp (u_char *buf, int buflen, int total_len, + struct vjcompress *comp, u_char **hdrp, +- u_int *hlenp)); ++ u_int *hlenp); + + #endif /* _VJCOMPRESS_H_ */ diff --git a/package/ppp/patches/patch-modules_bsd-comp_c b/package/ppp/patches/patch-modules_bsd-comp_c new file mode 100644 index 000000000..4bba327c7 --- /dev/null +++ b/package/ppp/patches/patch-modules_bsd-comp_c @@ -0,0 +1,35 @@ +--- ppp-2.4.5.orig/modules/bsd-comp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/bsd-comp.c 2014-03-17 16:13:07.000000000 +0100 +@@ -148,19 +148,19 @@ struct bsd_db { + #define BSD_OVHD 2 /* BSD compress overhead/packet */ + #define BSD_INIT_BITS BSD_MIN_BITS + +-static void *bsd_comp_alloc __P((u_char *options, int opt_len)); +-static void *bsd_decomp_alloc __P((u_char *options, int opt_len)); +-static void bsd_free __P((void *state)); +-static int bsd_comp_init __P((void *state, u_char *options, int opt_len, +- int unit, int hdrlen, int debug)); +-static int bsd_decomp_init __P((void *state, u_char *options, int opt_len, +- int unit, int hdrlen, int mru, int debug)); +-static int bsd_compress __P((void *state, mblk_t **mret, +- mblk_t *mp, int slen, int maxolen)); +-static void bsd_incomp __P((void *state, mblk_t *dmsg)); +-static int bsd_decompress __P((void *state, mblk_t *cmp, mblk_t **dmpp)); +-static void bsd_reset __P((void *state)); +-static void bsd_comp_stats __P((void *state, struct compstat *stats)); ++static void *bsd_comp_alloc (u_char *options, int opt_len); ++static void *bsd_decomp_alloc (u_char *options, int opt_len); ++static void bsd_free (void *state); ++static int bsd_comp_init (void *state, u_char *options, int opt_len, ++ int unit, int hdrlen, int debug); ++static int bsd_decomp_init (void *state, u_char *options, int opt_len, ++ int unit, int hdrlen, int mru, int debug); ++static int bsd_compress (void *state, mblk_t **mret, ++ mblk_t *mp, int slen, int maxolen); ++static void bsd_incomp (void *state, mblk_t *dmsg); ++static int bsd_decompress (void *state, mblk_t *cmp, mblk_t **dmpp); ++static void bsd_reset (void *state); ++static void bsd_comp_stats (void *state, struct compstat *stats); + + /* + * Procedures exported to ppp_comp.c. diff --git a/package/ppp/patches/patch-modules_deflate_c b/package/ppp/patches/patch-modules_deflate_c new file mode 100644 index 000000000..53cd6fc0e --- /dev/null +++ b/package/ppp/patches/patch-modules_deflate_c @@ -0,0 +1,47 @@ +--- ppp-2.4.5.orig/modules/deflate.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/deflate.c 2014-03-17 16:13:07.000000000 +0100 +@@ -80,25 +80,25 @@ struct deflate_state { + + #define DEFLATE_OVHD 2 /* Deflate overhead/packet */ + +-static void *z_alloc __P((void *, u_int items, u_int size)); +-static void *z_alloc_init __P((void *, u_int items, u_int size)); +-static void z_free __P((void *, void *ptr)); +-static void *z_comp_alloc __P((u_char *options, int opt_len)); +-static void *z_decomp_alloc __P((u_char *options, int opt_len)); +-static void z_comp_free __P((void *state)); +-static void z_decomp_free __P((void *state)); +-static int z_comp_init __P((void *state, u_char *options, int opt_len, +- int unit, int hdrlen, int debug)); +-static int z_decomp_init __P((void *state, u_char *options, int opt_len, +- int unit, int hdrlen, int mru, int debug)); +-static int z_compress __P((void *state, mblk_t **mret, +- mblk_t *mp, int slen, int maxolen)); +-static void z_incomp __P((void *state, mblk_t *dmsg)); +-static int z_decompress __P((void *state, mblk_t *cmp, +- mblk_t **dmpp)); +-static void z_comp_reset __P((void *state)); +-static void z_decomp_reset __P((void *state)); +-static void z_comp_stats __P((void *state, struct compstat *stats)); ++static void *z_alloc (void *, u_int items, u_int size); ++static void *z_alloc_init (void *, u_int items, u_int size); ++static void z_free (void *, void *ptr); ++static void *z_comp_alloc (u_char *options, int opt_len); ++static void *z_decomp_alloc (u_char *options, int opt_len); ++static void z_comp_free (void *state); ++static void z_decomp_free (void *state); ++static int z_comp_init (void *state, u_char *options, int opt_len, ++ int unit, int hdrlen, int debug); ++static int z_decomp_init (void *state, u_char *options, int opt_len, ++ int unit, int hdrlen, int mru, int debug); ++static int z_compress (void *state, mblk_t **mret, ++ mblk_t *mp, int slen, int maxolen); ++static void z_incomp (void *state, mblk_t *dmsg); ++static int z_decompress (void *state, mblk_t *cmp, ++ mblk_t **dmpp); ++static void z_comp_reset (void *state); ++static void z_decomp_reset (void *state); ++static void z_comp_stats (void *state, struct compstat *stats); + + /* + * Procedures exported to ppp_comp.c. diff --git a/package/ppp/patches/patch-modules_if_ppp_c b/package/ppp/patches/patch-modules_if_ppp_c new file mode 100644 index 000000000..67561642a --- /dev/null +++ b/package/ppp/patches/patch-modules_if_ppp_c @@ -0,0 +1,43 @@ +--- ppp-2.4.5.orig/modules/if_ppp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/if_ppp.c 2014-03-17 16:13:07.000000000 +0100 +@@ -80,10 +80,10 @@ + + #define ifr_mtu ifr_metric + +-static int if_ppp_open __P((queue_t *, int, int, int)); +-static int if_ppp_close __P((queue_t *, int)); +-static int if_ppp_wput __P((queue_t *, mblk_t *)); +-static int if_ppp_rput __P((queue_t *, mblk_t *)); ++static int if_ppp_open (queue_t *, int, int, int); ++static int if_ppp_close (queue_t *, int); ++static int if_ppp_wput (queue_t *, mblk_t *); ++static int if_ppp_rput (queue_t *, mblk_t *); + + #define PPP_IF_ID 0x8021 + static struct module_info minfo = { +@@ -117,11 +117,11 @@ static int ppp_nalloc; /* Number of ele + static struct ifnet **ifs; /* Array of pointers to interface structs */ + static if_ppp_t **states; /* Array of pointers to state structs */ + +-static int if_ppp_output __P((struct ifnet *, struct mbuf *, +- struct sockaddr *)); +-static int if_ppp_ioctl __P((struct ifnet *, u_int, caddr_t)); +-static struct mbuf *make_mbufs __P((mblk_t *, int)); +-static mblk_t *make_message __P((struct mbuf *, int)); ++static int if_ppp_output (struct ifnet *, struct mbuf *, ++ struct sockaddr *); ++static int if_ppp_ioctl (struct ifnet *, u_int, caddr_t); ++static struct mbuf *make_mbufs (mblk_t *, int); ++static mblk_t *make_message (struct mbuf *, int); + + #ifdef SNIT_SUPPORT + /* Fake ether header for SNIT */ +@@ -129,7 +129,7 @@ static struct ether_header snit_ehdr = { + #endif + + #ifndef __osf__ +-static void ppp_if_detach __P((struct ifnet *)); ++static void ppp_if_detach (struct ifnet *); + + /* + * Detach all the interfaces before unloading. diff --git a/package/ppp/patches/patch-modules_ppp_ahdlc_c b/package/ppp/patches/patch-modules_ppp_ahdlc_c new file mode 100644 index 000000000..93ad5795a --- /dev/null +++ b/package/ppp/patches/patch-modules_ppp_ahdlc_c @@ -0,0 +1,19 @@ +--- ppp-2.4.5.orig/modules/ppp_ahdlc.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/ppp_ahdlc.c 2014-03-17 16:13:07.000000000 +0100 +@@ -107,11 +107,11 @@ typedef unsigned int uintpoin + + MOD_OPEN_DECL(ahdlc_open); + MOD_CLOSE_DECL(ahdlc_close); +-static int ahdlc_wput __P((queue_t *, mblk_t *)); +-static int ahdlc_rput __P((queue_t *, mblk_t *)); +-static void ahdlc_encode __P((queue_t *, mblk_t *)); +-static void ahdlc_decode __P((queue_t *, mblk_t *)); +-static int msg_byte __P((mblk_t *, unsigned int)); ++static int ahdlc_wput (queue_t *, mblk_t *); ++static int ahdlc_rput (queue_t *, mblk_t *); ++static void ahdlc_encode (queue_t *, mblk_t *); ++static void ahdlc_decode (queue_t *, mblk_t *); ++static int msg_byte (mblk_t *, unsigned int); + + #if defined(SOL2) + /* diff --git a/package/ppp/patches/patch-modules_ppp_c b/package/ppp/patches/patch-modules_ppp_c new file mode 100644 index 000000000..f8c569cad --- /dev/null +++ b/package/ppp/patches/patch-modules_ppp_c @@ -0,0 +1,76 @@ +--- ppp-2.4.5.orig/modules/ppp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/ppp.c 2014-03-17 16:13:07.000000000 +0100 +@@ -254,43 +254,43 @@ static upperstr_t *minor_devs = NULL; + static upperstr_t *ppas = NULL; + + #ifdef SVR4 +-static int pppopen __P((queue_t *, dev_t *, int, int, cred_t *)); +-static int pppclose __P((queue_t *, int, cred_t *)); ++static int pppopen (queue_t *, dev_t *, int, int, cred_t *); ++static int pppclose (queue_t *, int, cred_t *); + #else +-static int pppopen __P((queue_t *, int, int, int)); +-static int pppclose __P((queue_t *, int)); ++static int pppopen (queue_t *, int, int, int); ++static int pppclose (queue_t *, int); + #endif /* SVR4 */ +-static int pppurput __P((queue_t *, mblk_t *)); +-static int pppuwput __P((queue_t *, mblk_t *)); +-static int pppursrv __P((queue_t *)); +-static int pppuwsrv __P((queue_t *)); +-static int ppplrput __P((queue_t *, mblk_t *)); +-static int ppplwput __P((queue_t *, mblk_t *)); +-static int ppplrsrv __P((queue_t *)); +-static int ppplwsrv __P((queue_t *)); ++static int pppurput (queue_t *, mblk_t *); ++static int pppuwput (queue_t *, mblk_t *); ++static int pppursrv (queue_t *); ++static int pppuwsrv (queue_t *); ++static int ppplrput (queue_t *, mblk_t *); ++static int ppplwput (queue_t *, mblk_t *); ++static int ppplrsrv (queue_t *); ++static int ppplwsrv (queue_t *); + #ifndef NO_DLPI +-static void dlpi_request __P((queue_t *, mblk_t *, upperstr_t *)); +-static void dlpi_error __P((queue_t *, upperstr_t *, int, int, int)); +-static void dlpi_ok __P((queue_t *, int)); ++static void dlpi_request (queue_t *, mblk_t *, upperstr_t *); ++static void dlpi_error (queue_t *, upperstr_t *, int, int, int); ++static void dlpi_ok (queue_t *, int); + #endif +-static int send_data __P((mblk_t *, upperstr_t *)); +-static void new_ppa __P((queue_t *, mblk_t *)); +-static void attach_ppa __P((queue_t *, mblk_t *)); +-static void detach_ppa __P((queue_t *, mblk_t *)); +-static void detach_lower __P((queue_t *, mblk_t *)); +-static void debug_dump __P((queue_t *, mblk_t *)); +-static upperstr_t *find_dest __P((upperstr_t *, int)); ++static int send_data (mblk_t *, upperstr_t *); ++static void new_ppa (queue_t *, mblk_t *); ++static void attach_ppa (queue_t *, mblk_t *); ++static void detach_ppa (queue_t *, mblk_t *); ++static void detach_lower (queue_t *, mblk_t *); ++static void debug_dump (queue_t *, mblk_t *); ++static upperstr_t *find_dest (upperstr_t *, int); + #if defined(SOL2) +-static upperstr_t *find_promisc __P((upperstr_t *, int)); +-static mblk_t *prepend_ether __P((upperstr_t *, mblk_t *, int)); +-static mblk_t *prepend_udind __P((upperstr_t *, mblk_t *, int)); +-static void promisc_sendup __P((upperstr_t *, mblk_t *, int, int)); ++static upperstr_t *find_promisc (upperstr_t *, int); ++static mblk_t *prepend_ether (upperstr_t *, mblk_t *, int); ++static mblk_t *prepend_udind (upperstr_t *, mblk_t *, int); ++static void promisc_sendup (upperstr_t *, mblk_t *, int, int); + #endif /* defined(SOL2) */ +-static int putctl2 __P((queue_t *, int, int, int)); +-static int putctl4 __P((queue_t *, int, int, int)); +-static int pass_packet __P((upperstr_t *ppa, mblk_t *mp, int outbound)); ++static int putctl2 (queue_t *, int, int, int); ++static int putctl4 (queue_t *, int, int, int); ++static int pass_packet (upperstr_t *ppa, mblk_t *mp, int outbound); + #ifdef FILTER_PACKETS +-static int ip_hard_filter __P((upperstr_t *ppa, mblk_t *mp, int outbound)); ++static int ip_hard_filter (upperstr_t *ppa, mblk_t *mp, int outbound); + #endif /* FILTER_PACKETS */ + + #define PPP_ID 0xb1a6 diff --git a/package/ppp/patches/patch-modules_ppp_comp_c b/package/ppp/patches/patch-modules_ppp_comp_c new file mode 100644 index 000000000..944d0d80f --- /dev/null +++ b/package/ppp/patches/patch-modules_ppp_comp_c @@ -0,0 +1,30 @@ +--- ppp-2.4.5.orig/modules/ppp_comp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/ppp_comp.c 2014-03-17 16:13:07.000000000 +0100 +@@ -74,12 +74,12 @@ + + MOD_OPEN_DECL(ppp_comp_open); + MOD_CLOSE_DECL(ppp_comp_close); +-static int ppp_comp_rput __P((queue_t *, mblk_t *)); +-static int ppp_comp_rsrv __P((queue_t *)); +-static int ppp_comp_wput __P((queue_t *, mblk_t *)); +-static int ppp_comp_wsrv __P((queue_t *)); +-static void ppp_comp_ccp __P((queue_t *, mblk_t *, int)); +-static int msg_byte __P((mblk_t *, unsigned int)); ++static int ppp_comp_rput (queue_t *, mblk_t *); ++static int ppp_comp_rsrv (queue_t *); ++static int ppp_comp_wput (queue_t *, mblk_t *); ++static int ppp_comp_wsrv (queue_t *); ++static void ppp_comp_ccp (queue_t *, mblk_t *, int); ++static int msg_byte (mblk_t *, unsigned int); + + /* Extract byte i of message mp. */ + #define MSG_BYTE(mp, i) ((i) < (mp)->b_wptr - (mp)->b_rptr? (mp)->b_rptr[i]: \ +@@ -118,7 +118,7 @@ int ppp_comp_count; /* number of module + + #ifdef __osf__ + +-static void ppp_comp_alloc __P((comp_state_t *)); ++static void ppp_comp_alloc (comp_state_t *); + typedef struct memreq { + unsigned char comp_opts[20]; + int cmd; diff --git a/package/ppp/patches/patch-modules_ppp_mod_h b/package/ppp/patches/patch-modules_ppp_mod_h new file mode 100644 index 000000000..29f6624e2 --- /dev/null +++ b/package/ppp/patches/patch-modules_ppp_mod_h @@ -0,0 +1,28 @@ +--- ppp-2.4.5.orig/modules/ppp_mod.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/modules/ppp_mod.h 2014-03-17 16:13:07.000000000 +0100 +@@ -143,10 +143,10 @@ typedef int minor_t; + */ + #ifdef SVR4 + #define MOD_OPEN_DECL(name) \ +-static int name __P((queue_t *, dev_t *, int, int, cred_t *)) ++static int name (queue_t *, dev_t *, int, int, cred_t *) + + #define MOD_CLOSE_DECL(name) \ +-static int name __P((queue_t *, int, cred_t *)) ++static int name (queue_t *, int, cred_t *) + + #define MOD_OPEN(name) \ + static int name(q, devp, flag, sflag, credp) \ +@@ -168,10 +168,10 @@ static int name(q, flag, credp) \ + + #else /* not SVR4 */ + #define MOD_OPEN_DECL(name) \ +-static int name __P((queue_t *, int, int, int)) ++static int name (queue_t *, int, int, int) + + #define MOD_CLOSE_DECL(name) \ +-static int name __P((queue_t *, int)) ++static int name (queue_t *, int) + + #define MOD_OPEN(name) \ + static int name(q, dev, flag, sflag) \ diff --git a/package/ppp/patches/patch-pppd_auth_c b/package/ppp/patches/patch-pppd_auth_c new file mode 100644 index 000000000..e15fbc458 --- /dev/null +++ b/package/ppp/patches/patch-pppd_auth_c @@ -0,0 +1,116 @@ +--- ppp-2.4.5.orig/pppd/auth.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/auth.c 2014-03-17 16:13:14.000000000 +0100 +@@ -161,38 +161,38 @@ static int passwd_from_file; + static bool default_auth; + + /* Hook to enable a plugin to control the idle time limit */ +-int (*idle_time_hook) __P((struct ppp_idle *)) = NULL; ++int (*idle_time_hook) (struct ppp_idle *) = NULL; + + /* Hook for a plugin to say whether we can possibly authenticate any peer */ +-int (*pap_check_hook) __P((void)) = NULL; ++int (*pap_check_hook) (void) = NULL; + + /* Hook for a plugin to check the PAP user and password */ +-int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, ++int (*pap_auth_hook) (char *user, char *passwd, char **msgp, + struct wordlist **paddrs, +- struct wordlist **popts)) = NULL; ++ struct wordlist **popts) = NULL; + + /* Hook for a plugin to know about the PAP user logout */ +-void (*pap_logout_hook) __P((void)) = NULL; ++void (*pap_logout_hook) (void) = NULL; + + /* Hook for a plugin to get the PAP password for authenticating us */ +-int (*pap_passwd_hook) __P((char *user, char *passwd)) = NULL; ++int (*pap_passwd_hook) (char *user, char *passwd) = NULL; + + /* Hook for a plugin to say if we can possibly authenticate a peer using CHAP */ +-int (*chap_check_hook) __P((void)) = NULL; ++int (*chap_check_hook) (void) = NULL; + + /* Hook for a plugin to get the CHAP password for authenticating us */ +-int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL; ++int (*chap_passwd_hook) (char *user, char *passwd) = NULL; + + /* Hook for a plugin to say whether it is OK if the peer + refuses to authenticate. */ +-int (*null_auth_hook) __P((struct wordlist **paddrs, +- struct wordlist **popts)) = NULL; ++int (*null_auth_hook) (struct wordlist **paddrs, ++ struct wordlist **popts) = NULL; + +-int (*allowed_address_hook) __P((u_int32_t addr)) = NULL; ++int (*allowed_address_hook) (u_int32_t addr) = NULL; + + #ifdef HAVE_MULTILINK + /* Hook for plugin to hear when an interface joins a multilink bundle */ +-void (*multilink_join_hook) __P((void)) = NULL; ++void (*multilink_join_hook) (void) = NULL; + #endif + + /* A notifier for when the peer has authenticated itself, +@@ -241,37 +241,37 @@ char remote_name[MAXNAMELEN]; /* Peer's + + static char *uafname; /* name of most recent +ua file */ + +-extern char *crypt __P((const char *, const char *)); ++extern char *crypt (const char *, const char *); + + /* Prototypes for procedures local to this file. */ + +-static void network_phase __P((int)); +-static void check_idle __P((void *)); +-static void connect_time_expired __P((void *)); +-static int null_login __P((int)); +-static int get_pap_passwd __P((char *)); +-static int have_pap_secret __P((int *)); +-static int have_chap_secret __P((char *, char *, int, int *)); +-static int have_srp_secret __P((char *client, char *server, int need_ip, +- int *lacks_ipp)); +-static int ip_addr_check __P((u_int32_t, struct permitted_ip *)); +-static int scan_authfile __P((FILE *, char *, char *, char *, ++static void network_phase (int); ++static void check_idle (void *); ++static void connect_time_expired (void *); ++static int null_login (int); ++static int get_pap_passwd (char *); ++static int have_pap_secret (int *); ++static int have_chap_secret (char *, char *, int, int *); ++static int have_srp_secret (char *client, char *server, int need_ip, ++ int *lacks_ipp); ++static int ip_addr_check (u_int32_t, struct permitted_ip *); ++static int scan_authfile (FILE *, char *, char *, char *, + struct wordlist **, struct wordlist **, +- char *, int)); +-static void free_wordlist __P((struct wordlist *)); +-static void auth_script __P((char *)); +-static void auth_script_done __P((void *)); +-static void set_allowed_addrs __P((int, struct wordlist *, struct wordlist *)); +-static int some_ip_ok __P((struct wordlist *)); +-static int setupapfile __P((char **)); +-static int privgroup __P((char **)); +-static int set_noauth_addr __P((char **)); +-static int set_permitted_number __P((char **)); +-static void check_access __P((FILE *, char *)); +-static int wordlist_count __P((struct wordlist *)); ++ char *, int); ++static void free_wordlist (struct wordlist *); ++static void auth_script (char *); ++static void auth_script_done (void *); ++static void set_allowed_addrs (int, struct wordlist *, struct wordlist *); ++static int some_ip_ok (struct wordlist *); ++static int setupapfile (char **); ++static int privgroup (char **); ++static int set_noauth_addr (char **); ++static int set_permitted_number (char **); ++static void check_access (FILE *, char *); ++static int wordlist_count (struct wordlist *); + + #ifdef MAXOCTETS +-static void check_maxoctets __P((void *)); ++static void check_maxoctets (void *); + #endif + + /* diff --git a/package/ppp/patches/patch-pppd_cbcp_c b/package/ppp/patches/patch-pppd_cbcp_c new file mode 100644 index 000000000..dfbfb44ab --- /dev/null +++ b/package/ppp/patches/patch-pppd_cbcp_c @@ -0,0 +1,59 @@ +--- ppp-2.4.5.orig/pppd/cbcp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/cbcp.c 2014-03-17 16:13:14.000000000 +0100 +@@ -50,7 +50,7 @@ static const char rcsid[] = RCSID; + /* + * Options. + */ +-static int setcbcp __P((char **)); ++static int setcbcp (char **); + + static option_t cbcp_option_list[] = { + { "callback", o_special, (void *)setcbcp, +@@ -61,14 +61,14 @@ static option_t cbcp_option_list[] = { + /* + * Protocol entry points. + */ +-static void cbcp_init __P((int unit)); +-static void cbcp_open __P((int unit)); +-static void cbcp_lowerup __P((int unit)); +-static void cbcp_input __P((int unit, u_char *pkt, int len)); +-static void cbcp_protrej __P((int unit)); +-static int cbcp_printpkt __P((u_char *pkt, int len, ++static void cbcp_init (int unit); ++static void cbcp_open (int unit); ++static void cbcp_lowerup (int unit); ++static void cbcp_input (int unit, u_char *pkt, int len); ++static void cbcp_protrej (int unit); ++static int cbcp_printpkt (u_char *pkt, int len, + void (*printer) __P((void *, char *, ...)), +- void *arg)); ++ void *arg); + + struct protent cbcp_protent = { + PPP_CBCP, +@@ -94,11 +94,11 @@ cbcp_state cbcp[NUM_PPP]; + + /* internal prototypes */ + +-static void cbcp_recvreq __P((cbcp_state *us, u_char *pckt, int len)); +-static void cbcp_resp __P((cbcp_state *us)); +-static void cbcp_up __P((cbcp_state *us)); +-static void cbcp_recvack __P((cbcp_state *us, u_char *pckt, int len)); +-static void cbcp_send __P((cbcp_state *us, int code, u_char *buf, int len)); ++static void cbcp_recvreq (cbcp_state *us, u_char *pckt, int len); ++static void cbcp_resp (cbcp_state *us); ++static void cbcp_up (cbcp_state *us); ++static void cbcp_recvack (cbcp_state *us, u_char *pckt, int len); ++static void cbcp_send (cbcp_state *us, int code, u_char *buf, int len); + + /* option processing */ + static int +@@ -227,7 +227,7 @@ static int + cbcp_printpkt(p, plen, printer, arg) + u_char *p; + int plen; +- void (*printer) __P((void *, char *, ...)); ++ void (*printer) (void *, char *, ...); + void *arg; + { + int code, opt, id, len, olen, delay; diff --git a/package/ppp/patches/patch-pppd_ccp_c b/package/ppp/patches/patch-pppd_ccp_c new file mode 100644 index 000000000..41db56039 --- /dev/null +++ b/package/ppp/patches/patch-pppd_ccp_c @@ -0,0 +1,81 @@ +--- ppp-2.4.5.orig/pppd/ccp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/ccp.c 2014-03-17 16:13:13.000000000 +0100 +@@ -57,8 +57,8 @@ static const char rcsid[] = RCSID; + /* + * Command-line options. + */ +-static int setbsdcomp __P((char **)); +-static int setdeflate __P((char **)); ++static int setbsdcomp (char **); ++static int setdeflate (char **); + static char bsd_value[8]; + static char deflate_value[8]; + +@@ -164,17 +164,17 @@ static option_t ccp_option_list[] = { + /* + * Protocol entry points from main code. + */ +-static void ccp_init __P((int unit)); +-static void ccp_open __P((int unit)); +-static void ccp_close __P((int unit, char *)); +-static void ccp_lowerup __P((int unit)); +-static void ccp_lowerdown __P((int)); +-static void ccp_input __P((int unit, u_char *pkt, int len)); +-static void ccp_protrej __P((int unit)); +-static int ccp_printpkt __P((u_char *pkt, int len, ++static void ccp_init (int unit); ++static void ccp_open (int unit); ++static void ccp_close (int unit, char *); ++static void ccp_lowerup (int unit); ++static void ccp_lowerdown (int); ++static void ccp_input (int unit, u_char *pkt, int len); ++static void ccp_protrej (int unit); ++static int ccp_printpkt (u_char *pkt, int len, + void (*printer) __P((void *, char *, ...)), +- void *arg)); +-static void ccp_datainput __P((int unit, u_char *pkt, int len)); ++ void *arg); ++static void ccp_datainput (int unit, u_char *pkt, int len); + + struct protent ccp_protent = { + PPP_CCP, +@@ -205,18 +205,18 @@ ccp_options ccp_hisoptions[NUM_PPP]; /* + /* + * Callbacks for fsm code. + */ +-static void ccp_resetci __P((fsm *)); +-static int ccp_cilen __P((fsm *)); +-static void ccp_addci __P((fsm *, u_char *, int *)); +-static int ccp_ackci __P((fsm *, u_char *, int)); +-static int ccp_nakci __P((fsm *, u_char *, int, int)); +-static int ccp_rejci __P((fsm *, u_char *, int)); +-static int ccp_reqci __P((fsm *, u_char *, int *, int)); +-static void ccp_up __P((fsm *)); +-static void ccp_down __P((fsm *)); +-static int ccp_extcode __P((fsm *, int, int, u_char *, int)); +-static void ccp_rack_timeout __P((void *)); +-static char *method_name __P((ccp_options *, ccp_options *)); ++static void ccp_resetci (fsm *); ++static int ccp_cilen (fsm *); ++static void ccp_addci (fsm *, u_char *, int *); ++static int ccp_ackci (fsm *, u_char *, int); ++static int ccp_nakci (fsm *, u_char *, int, int); ++static int ccp_rejci (fsm *, u_char *, int); ++static int ccp_reqci (fsm *, u_char *, int *, int); ++static void ccp_up (fsm *); ++static void ccp_down (fsm *); ++static int ccp_extcode (fsm *, int, int, u_char *, int); ++static void ccp_rack_timeout (void *); ++static char *method_name (ccp_options *, ccp_options *); + + static fsm_callbacks ccp_callbacks = { + ccp_resetci, +@@ -1489,7 +1489,7 @@ static int + ccp_printpkt(p, plen, printer, arg) + u_char *p; + int plen; +- void (*printer) __P((void *, char *, ...)); ++ void (*printer) (void *, char *, ...); + void *arg; + { + u_char *p0, *optend; diff --git a/package/ppp/patches/patch-pppd_chap-new_c b/package/ppp/patches/patch-pppd_chap-new_c new file mode 100644 index 000000000..fec9acbed --- /dev/null +++ b/package/ppp/patches/patch-pppd_chap-new_c @@ -0,0 +1,20 @@ +--- ppp-2.4.5.orig/pppd/chap-new.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/chap-new.c 2014-03-17 16:13:14.000000000 +0100 +@@ -129,7 +129,7 @@ static void chap_handle_status(struct ch + static void chap_protrej(int unit); + static void chap_input(int unit, unsigned char *pkt, int pktlen); + static int chap_print_pkt(unsigned char *p, int plen, +- void (*printer) __P((void *, char *, ...)), void *arg); ++ void (*printer) (void *, char *, ...), void *arg); + + /* List of digest types that we know about */ + static struct chap_digest_type *chap_digests; +@@ -584,7 +584,7 @@ static char *chap_code_names[] = { + + static int + chap_print_pkt(unsigned char *p, int plen, +- void (*printer) __P((void *, char *, ...)), void *arg) ++ void (*printer) (void *, char *, ...), void *arg) + { + int code, id, len; + int clen, nlen; diff --git a/package/ppp/patches/patch-pppd_chap_ms_c b/package/ppp/patches/patch-pppd_chap_ms_c new file mode 100644 index 000000000..f04abf740 --- /dev/null +++ b/package/ppp/patches/patch-pppd_chap_ms_c @@ -0,0 +1,36 @@ +--- ppp-2.4.5.orig/pppd/chap_ms.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/chap_ms.c 2014-03-17 16:13:15.000000000 +0100 +@@ -97,22 +97,22 @@ + static const char rcsid[] = RCSID; + + +-static void ascii2unicode __P((char[], int, u_char[])); +-static void NTPasswordHash __P((u_char *, int, u_char[MD4_SIGNATURE_SIZE])); +-static void ChallengeResponse __P((u_char *, u_char *, u_char[24])); +-static void ChapMS_NT __P((u_char *, char *, int, u_char[24])); +-static void ChapMS2_NT __P((u_char *, u_char[16], char *, char *, int, +- u_char[24])); ++static void ascii2unicode (char[], int, u_char[]); ++static void NTPasswordHash (u_char *, int, u_char[MD4_SIGNATURE_SIZE]); ++static void ChallengeResponse (u_char *, u_char *, u_char[24]); ++static void ChapMS_NT (u_char *, char *, int, u_char[24]); ++static void ChapMS2_NT (u_char *, u_char[16], char *, char *, int, ++ u_char[24]); + static void GenerateAuthenticatorResponsePlain +- __P((char*, int, u_char[24], u_char[16], u_char *, +- char *, u_char[41])); ++ (char*, int, u_char[24], u_char[16], u_char *, ++ char *, u_char[41]); + #ifdef MSLANMAN +-static void ChapMS_LANMan __P((u_char *, char *, int, u_char *)); ++static void ChapMS_LANMan (u_char *, char *, int, u_char *); + #endif + + #ifdef MPPE +-static void Set_Start_Key __P((u_char *, char *, int)); +-static void SetMasterKeys __P((char *, int, u_char[24], int)); ++static void Set_Start_Key (u_char *, char *, int); ++static void SetMasterKeys (char *, int, u_char[24], int); + #endif + + #ifdef MSLANMAN diff --git a/package/ppp/patches/patch-pppd_chap_ms_h b/package/ppp/patches/patch-pppd_chap_ms_h new file mode 100644 index 000000000..8156d3d95 --- /dev/null +++ b/package/ppp/patches/patch-pppd_chap_ms_h @@ -0,0 +1,24 @@ +--- ppp-2.4.5.orig/pppd/chap_ms.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/chap_ms.h 2014-03-17 16:13:14.000000000 +0100 +@@ -87,16 +87,16 @@ extern void set_mppe_enc_types(int, int) + #define MS_CHAP2_AUTHENTICATEE 0 + #define MS_CHAP2_AUTHENTICATOR 1 + +-void ChapMS __P((u_char *, char *, int, u_char *)); +-void ChapMS2 __P((u_char *, u_char *, char *, char *, int, +- u_char *, u_char[MS_AUTH_RESPONSE_LENGTH+1], int)); ++void ChapMS (u_char *, char *, int, u_char *); ++void ChapMS2 (u_char *, u_char *, char *, char *, int, ++ u_char *, u_char[MS_AUTH_RESPONSE_LENGTH+1], int); + #ifdef MPPE +-void mppe_set_keys __P((u_char *, u_char[MD4_SIGNATURE_SIZE])); ++void mppe_set_keys (u_char *, u_char[MD4_SIGNATURE_SIZE]); + void mppe_set_keys2(u_char PasswordHashHash[MD4_SIGNATURE_SIZE], + u_char NTResponse[24], int IsServer); + #endif + +-void ChallengeHash __P((u_char[16], u_char *, char *, u_char[8])); ++void ChallengeHash (u_char[16], u_char *, char *, u_char[8]); + + void GenerateAuthenticatorResponse(u_char PasswordHashHash[MD4_SIGNATURE_SIZE], + u_char NTResponse[24], u_char PeerChallenge[16], diff --git a/package/ppp/patches/patch-pppd_demand_c b/package/ppp/patches/patch-pppd_demand_c new file mode 100644 index 000000000..42cf70670 --- /dev/null +++ b/package/ppp/patches/patch-pppd_demand_c @@ -0,0 +1,11 @@ +--- ppp-2.4.5.orig/pppd/demand.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/demand.c 2014-03-17 16:13:13.000000000 +0100 +@@ -70,7 +70,7 @@ struct packet { + struct packet *pend_q; + struct packet *pend_qtail; + +-static int active_packet __P((unsigned char *, int)); ++static int active_packet (unsigned char *, int); + + /* + * demand_conf - configure the interface for doing dial-on-demand. diff --git a/package/ppp/patches/patch-pppd_eap_c b/package/ppp/patches/patch-pppd_eap_c new file mode 100644 index 000000000..2a73f162f --- /dev/null +++ b/package/ppp/patches/patch-pppd_eap_c @@ -0,0 +1,41 @@ +--- ppp-2.4.5.orig/pppd/eap.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/eap.c 2014-03-17 16:13:15.000000000 +0100 +@@ -111,13 +111,13 @@ static option_t eap_option_list[] = { + /* + * Protocol entry points. + */ +-static void eap_init __P((int unit)); +-static void eap_input __P((int unit, u_char *inp, int inlen)); +-static void eap_protrej __P((int unit)); +-static void eap_lowerup __P((int unit)); +-static void eap_lowerdown __P((int unit)); +-static int eap_printpkt __P((u_char *inp, int inlen, +- void (*)(void *arg, char *fmt, ...), void *arg)); ++static void eap_init (int unit); ++static void eap_input (int unit, u_char *inp, int inlen); ++static void eap_protrej (int unit); ++static void eap_lowerup (int unit); ++static void eap_lowerdown (int unit); ++static int eap_printpkt (u_char *inp, int inlen, ++ void (*)(void *arg, char *fmt, ...), void *arg); + + struct protent eap_protent = { + PPP_EAP, /* protocol number */ +@@ -178,7 +178,7 @@ static const u_char wkmodulus[] = { + }; + + /* Local forward declarations. */ +-static void eap_server_timeout __P((void *arg)); ++static void eap_server_timeout (void *arg); + + /* + * Convert EAP state code to printable string for debug. +@@ -2144,7 +2144,7 @@ static int + eap_printpkt(inp, inlen, printer, arg) + u_char *inp; + int inlen; +-void (*printer) __P((void *, char *, ...)); ++void (*printer) (void *, char *, ...); + void *arg; + { + int code, id, len, rtype, vallen; diff --git a/package/ppp/patches/patch-pppd_eap_h b/package/ppp/patches/patch-pppd_eap_h new file mode 100644 index 000000000..8df5ca09c --- /dev/null +++ b/package/ppp/patches/patch-pppd_eap_h @@ -0,0 +1,13 @@ +--- ppp-2.4.5.orig/pppd/eap.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/eap.h 2014-03-17 16:13:13.000000000 +0100 +@@ -145,8 +145,8 @@ typedef struct eap_state { + + extern eap_state eap_states[]; + +-void eap_authwithpeer __P((int unit, char *localname)); +-void eap_authpeer __P((int unit, char *localname)); ++void eap_authwithpeer (int unit, char *localname); ++void eap_authpeer (int unit, char *localname); + + extern struct protent eap_protent; + diff --git a/package/ppp/patches/patch-pppd_ecp_c b/package/ppp/patches/patch-pppd_ecp_c new file mode 100644 index 000000000..42ed12934 --- /dev/null +++ b/package/ppp/patches/patch-pppd_ecp_c @@ -0,0 +1,42 @@ +--- ppp-2.4.5.orig/pppd/ecp.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/ecp.c 2014-03-17 16:13:14.000000000 +0100 +@@ -79,20 +79,20 @@ static option_t ecp_option_list[] = { + /* + * Protocol entry points from main code. + */ +-static void ecp_init __P((int unit)); ++static void ecp_init (int unit); + /* +-static void ecp_open __P((int unit)); +-static void ecp_close __P((int unit, char *)); +-static void ecp_lowerup __P((int unit)); +-static void ecp_lowerdown __P((int)); +-static void ecp_input __P((int unit, u_char *pkt, int len)); +-static void ecp_protrej __P((int unit)); ++static void ecp_open (int unit); ++static void ecp_close (int unit, char *); ++static void ecp_lowerup (int unit); ++static void ecp_lowerdown (int); ++static void ecp_input (int unit, u_char *pkt, int len); ++static void ecp_protrej (int unit); + */ +-static int ecp_printpkt __P((u_char *pkt, int len, ++static int ecp_printpkt (u_char *pkt, int len, + void (*printer) __P((void *, char *, ...)), +- void *arg)); ++ void *arg); + /* +-static void ecp_datainput __P((int unit, u_char *pkt, int len)); ++static void ecp_datainput (int unit, u_char *pkt, int len); + */ + + struct protent ecp_protent = { +@@ -165,7 +165,7 @@ static int + ecp_printpkt(p, plen, printer, arg) + u_char *p; + int plen; +- void (*printer) __P((void *, char *, ...)); ++ void (*printer) (void *, char *, ...); + void *arg; + { + return 0; diff --git a/package/ppp/patches/patch-pppd_eui64_h b/package/ppp/patches/patch-pppd_eui64_h new file mode 100644 index 000000000..ce593874b --- /dev/null +++ b/package/ppp/patches/patch-pppd_eui64_h @@ -0,0 +1,11 @@ +--- ppp-2.4.5.orig/pppd/eui64.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/eui64.h 2014-03-17 16:13:14.000000000 +0100 +@@ -108,7 +108,7 @@ typedef union + } while (0) + #define eui64_setlo32(e, l) eui64_set32(e, l) + +-char *eui64_ntoa __P((eui64_t)); /* Returns ascii representation of id */ ++char *eui64_ntoa (eui64_t); /* Returns ascii representation of id */ + + #endif /* __EUI64_H__ */ + diff --git a/package/ppp/patches/patch-pppd_fsm_c b/package/ppp/patches/patch-pppd_fsm_c new file mode 100644 index 000000000..098d101ee --- /dev/null +++ b/package/ppp/patches/patch-pppd_fsm_c @@ -0,0 +1,25 @@ +--- ppp-2.4.5.orig/pppd/fsm.c 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/fsm.c 2014-03-17 16:13:14.000000000 +0100 +@@ -57,14 +57,14 @@ + + static const char rcsid[] = RCSID; + +-static void fsm_timeout __P((void *)); +-static void fsm_rconfreq __P((fsm *, int, u_char *, int)); +-static void fsm_rconfack __P((fsm *, int, u_char *, int)); +-static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int)); +-static void fsm_rtermreq __P((fsm *, int, u_char *, int)); +-static void fsm_rtermack __P((fsm *)); +-static void fsm_rcoderej __P((fsm *, u_char *, int)); +-static void fsm_sconfreq __P((fsm *, int)); ++static void fsm_timeout (void *); ++static void fsm_rconfreq (fsm *, int, u_char *, int); ++static void fsm_rconfack (fsm *, int, u_char *, int); ++static void fsm_rconfnakrej (fsm *, int, int, u_char *, int); ++static void fsm_rtermreq (fsm *, int, u_char *, int); ++static void fsm_rtermack (fsm *); ++static void fsm_rcoderej (fsm *, u_char *, int); ++static void fsm_sconfreq (fsm *, int); + + #define PROTO_NAME(f) ((f)->callbacks->proto_name) + diff --git a/package/ppp/patches/patch-pppd_fsm_h b/package/ppp/patches/patch-pppd_fsm_h new file mode 100644 index 000000000..a0705c0c6 --- /dev/null +++ b/package/ppp/patches/patch-pppd_fsm_h @@ -0,0 +1,73 @@ +--- ppp-2.4.5.orig/pppd/fsm.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/fsm.h 2014-03-17 16:13:14.000000000 +0100 +@@ -86,33 +86,33 @@ typedef struct fsm { + + typedef struct fsm_callbacks { + void (*resetci) /* Reset our Configuration Information */ +- __P((fsm *)); ++ (fsm *); + int (*cilen) /* Length of our Configuration Information */ +- __P((fsm *)); ++ (fsm *); + void (*addci) /* Add our Configuration Information */ +- __P((fsm *, u_char *, int *)); ++ (fsm *, u_char *, int *); + int (*ackci) /* ACK our Configuration Information */ +- __P((fsm *, u_char *, int)); ++ (fsm *, u_char *, int); + int (*nakci) /* NAK our Configuration Information */ +- __P((fsm *, u_char *, int, int)); ++ (fsm *, u_char *, int, int); + int (*rejci) /* Reject our Configuration Information */ +- __P((fsm *, u_char *, int)); ++ (fsm *, u_char *, int); + int (*reqci) /* Request peer's Configuration Information */ +- __P((fsm *, u_char *, int *, int)); ++ (fsm *, u_char *, int *, int); + void (*up) /* Called when fsm reaches OPENED state */ +- __P((fsm *)); ++ (fsm *); + void (*down) /* Called when fsm leaves OPENED state */ +- __P((fsm *)); ++ (fsm *); + void (*starting) /* Called when we want the lower layer */ +- __P((fsm *)); ++ (fsm *); + void (*finished) /* Called when we don't want the lower layer */ +- __P((fsm *)); ++ (fsm *); + void (*protreject) /* Called when Protocol-Reject received */ +- __P((int)); ++ (int); + void (*retransmit) /* Retransmission is necessary */ +- __P((fsm *)); ++ (fsm *); + int (*extcode) /* Called when unknown code received */ +- __P((fsm *, int, int, u_char *, int)); ++ (fsm *, int, int, u_char *, int); + char *proto_name; /* String name for protocol (for messages) */ + } fsm_callbacks; + +@@ -152,14 +152,14 @@ typedef struct fsm_callbacks { + /* + * Prototypes + */ +-void fsm_init __P((fsm *)); +-void fsm_lowerup __P((fsm *)); +-void fsm_lowerdown __P((fsm *)); +-void fsm_open __P((fsm *)); +-void fsm_close __P((fsm *, char *)); +-void fsm_input __P((fsm *, u_char *, int)); +-void fsm_protreject __P((fsm *)); +-void fsm_sdata __P((fsm *, int, int, u_char *, int)); ++void fsm_init (fsm *); ++void fsm_lowerup (fsm *); ++void fsm_lowerdown (fsm *); ++void fsm_open (fsm *); ++void fsm_close (fsm *, char *); ++void fsm_input (fsm *, u_char *, int); ++void fsm_protreject (fsm *); ++void fsm_sdata (fsm *, int, int, u_char *, int); + + + /* diff --git a/package/ppp/patches/patch-pppd_ipcp_c b/package/ppp/patches/patch-pppd_ipcp_c new file mode 100644 index 000000000..e0b610948 --- /dev/null +++ b/package/ppp/patches/patch-pppd_ipcp_c @@ -0,0 +1,129 @@ +--- 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 +@@ -75,13 +75,13 @@ bool disable_defaultip = 0; /* Don't use + bool noremoteip = 0; /* Let him have no IP address */ + + /* Hook for a plugin to know when IP protocol has come up */ +-void (*ip_up_hook) __P((void)) = NULL; ++void (*ip_up_hook) (void) = NULL; + + /* Hook for a plugin to know when IP protocol has come down */ +-void (*ip_down_hook) __P((void)) = NULL; ++void (*ip_down_hook) (void) = NULL; + + /* Hook for a plugin to choose the remote IP address */ +-void (*ip_choose_hook) __P((u_int32_t *)) = NULL; ++void (*ip_choose_hook) (u_int32_t *) = NULL; + + /* Notifiers for when IPCP goes up and down */ + struct notifier *ip_up_notifier = NULL; +@@ -100,16 +100,16 @@ static char netmask_str[20]; /* string + /* + * Callbacks for fsm code. (CI = Configuration Information) + */ +-static void ipcp_resetci __P((fsm *)); /* Reset our CI */ +-static int ipcp_cilen __P((fsm *)); /* Return length of our CI */ +-static void ipcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */ +-static int ipcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ +-static int ipcp_nakci __P((fsm *, u_char *, int, int));/* Peer nak'd our CI */ +-static int ipcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ +-static int ipcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */ +-static void ipcp_up __P((fsm *)); /* We're UP */ +-static void ipcp_down __P((fsm *)); /* We're DOWN */ +-static void ipcp_finished __P((fsm *)); /* Don't need lower layer */ ++static void ipcp_resetci (fsm *); /* Reset our CI */ ++static int ipcp_cilen (fsm *); /* Return length of our CI */ ++static void ipcp_addci (fsm *, u_char *, int *); /* Add our CI */ ++static int ipcp_ackci (fsm *, u_char *, int); /* Peer ack'd our CI */ ++static int ipcp_nakci (fsm *, u_char *, int, int);/* Peer nak'd our CI */ ++static int ipcp_rejci (fsm *, u_char *, int); /* Peer rej'd our CI */ ++static int ipcp_reqci (fsm *, u_char *, int *, int); /* Rcv CI */ ++static void ipcp_up (fsm *); /* We're UP */ ++static void ipcp_down (fsm *); /* We're DOWN */ ++static void ipcp_finished (fsm *); /* Don't need lower layer */ + + fsm ipcp_fsm[NUM_PPP]; /* IPCP fsm structure */ + +@@ -134,12 +134,12 @@ static fsm_callbacks ipcp_callbacks = { + /* + * Command-line options. + */ +-static int setvjslots __P((char **)); +-static int setdnsaddr __P((char **)); +-static int setwinsaddr __P((char **)); +-static int setnetmask __P((char **)); +-int setipaddr __P((char *, char **, int)); +-static void printipaddr __P((option_t *, void (*)(void *, char *,...),void *)); ++static int setvjslots (char **); ++static int setdnsaddr (char **); ++static int setwinsaddr (char **); ++static int setnetmask (char **); ++int setipaddr (char *, char **, int); ++static void printipaddr (option_t *, void (*)(void *, char *,...),void *); + + static option_t ipcp_option_list[] = { + { "noip", o_bool, &ipcp_protent.enabled_flag, +@@ -237,19 +237,19 @@ static option_t ipcp_option_list[] = { + /* + * Protocol entry points from main code. + */ +-static void ipcp_init __P((int)); +-static void ipcp_open __P((int)); +-static void ipcp_close __P((int, char *)); +-static void ipcp_lowerup __P((int)); +-static void ipcp_lowerdown __P((int)); +-static void ipcp_input __P((int, u_char *, int)); +-static void ipcp_protrej __P((int)); +-static int ipcp_printpkt __P((u_char *, int, +- void (*) __P((void *, char *, ...)), void *)); +-static void ip_check_options __P((void)); +-static int ip_demand_conf __P((int)); +-static int ip_active_pkt __P((u_char *, int)); +-static void create_resolv __P((u_int32_t, u_int32_t)); ++static void ipcp_init (int); ++static void ipcp_open (int); ++static void ipcp_close (int, char *); ++static void ipcp_lowerup (int); ++static void ipcp_lowerdown (int); ++static void ipcp_input (int, u_char *, int); ++static void ipcp_protrej (int); ++static int ipcp_printpkt (u_char *, int, ++ void (*) __P((void *, char *, ...)), void *); ++static void ip_check_options (void); ++static int ip_demand_conf (int); ++static int ip_active_pkt (u_char *, int); ++static void create_resolv (u_int32_t, u_int32_t); + + struct protent ipcp_protent = { + PPP_IPCP, +@@ -271,9 +271,9 @@ struct protent ipcp_protent = { + ip_active_pkt + }; + +-static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t)); +-static void ipcp_script __P((char *, int)); /* Run an up/down script */ +-static void ipcp_script_done __P((void *)); ++static void ipcp_clear_addrs (int, u_int32_t, u_int32_t); ++static void ipcp_script (char *, int); /* Run an up/down script */ ++static void ipcp_script_done (void *); + + /* + * Lengths of configuration options. +@@ -482,7 +482,7 @@ setipaddr(arg, argv, doit) + static void + printipaddr(opt, printer, arg) + option_t *opt; +- void (*printer) __P((void *, char *, ...)); ++ void (*printer) (void *, char *, ...); + void *arg; + { + ipcp_options *wo = &ipcp_wantoptions[0]; +@@ -2126,7 +2126,7 @@ static int + ipcp_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_ipcp_h b/package/ppp/patches/patch-pppd_ipcp_h new file mode 100644 index 000000000..76656d181 --- /dev/null +++ b/package/ppp/patches/patch-pppd_ipcp_h @@ -0,0 +1,10 @@ +--- ppp-2.4.5.orig/pppd/ipcp.h 2009-11-16 23:26:07.000000000 +0100 ++++ ppp-2.4.5/pppd/ipcp.h 2014-03-17 16:13:16.000000000 +0100 +@@ -91,6 +91,6 @@ extern ipcp_options ipcp_gotoptions[]; + extern ipcp_options ipcp_allowoptions[]; + extern ipcp_options ipcp_hisoptions[]; + +-char *ip_ntoa __P((u_int32_t)); ++char *ip_ntoa (u_int32_t); + + extern struct protent ipcp_protent; diff --git a/package/ppp/patches/patch-pppd_ipv6cp_c b/package/ppp/patches/patch-pppd_ipv6cp_c index 1d4123776..0d63be37b 100644 --- a/package/ppp/patches/patch-pppd_ipv6cp_c +++ b/package/ppp/patches/patch-pppd_ipv6cp_c @@ -1,5 +1,5 @@ ---- ppp-2.4.4.orig/pppd/ipv6cp.c 2005-08-26 01:59:34.000000000 +0200 -+++ ppp-2.4.4/pppd/ipv6cp.c 2009-12-18 09:06:00.333449663 +0100 +--- 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 @@ */ @@ -8,3 +8,105 @@ #include #include #include +@@ -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 *));