[PATCH] ppp: Update to version 2.4.9

Hauke Mehrtens hauke at hauke-m.de
Mon Feb 22 06:03:03 EST 2021


On 2/4/21 2:34 AM, Rosen Penev wrote:
> On Wed, Feb 3, 2021 at 3:28 PM Hauke Mehrtens <hauke at hauke-m.de> wrote:
>>
>> Upstream integrated multiple patches from Distributions and did other
>> changes:
>> * rp-pppoe.so was renamed to pppoe.so
>> * Converted to  ANSI C
>>
>> The following patches were applied upstream:
>> * 100-debian_ip-ip_option.patch
>> * 101-debian_close_dev_ppp.patch
>> * 103-debian_fix_link_pidfile.patch
>> * 106-debian_stripMSdomain.patch
>> * 107-debian_pppoatm_wildcard.patch
>> * 110-debian_defaultroute.patch
>> * 202-no_strip.patch
>>
>> Compilation with musl libx was fixed upstream so
>> 140-pppoe_compile_fix.patch  is not needed any more
>>
>> Parts of the 203-opt_flags.patch patch were applied in a different way
>> upstream.
>>
>> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
>> ---
>>   package/network/services/ppp/Makefile         |  10 +-
>>   package/network/services/ppp/files/ppp.sh     |   4 +-
>>   .../010-use_target_for_configure.patch        |  22 +-
>>   .../ppp/patches/100-debian_ip-ip_option.patch |  96 ------
>>   .../patches/101-debian_close_dev_ppp.patch    |  28 --
>>   .../patches/103-debian_fix_link_pidfile.patch |  23 --
>>   .../ppp/patches/105-debian_demand.patch       |  30 +-
>>   .../patches/106-debian_stripMSdomain.patch    |  47 ---
>>   .../patches/107-debian_pppoatm_wildcard.patch |  25 --
>>   .../ppp/patches/110-debian_defaultroute.patch | 314 ------------------
>>   .../120-debian_ipv6_updown_option.patch       |  18 +-
>>   .../ppp/patches/140-pppoe_compile_fix.patch   |  36 --
>>   .../services/ppp/patches/200-makefile.patch   |  23 +-
>>   .../ppp/patches/201-mppe_mppc_1.1.patch       | 133 +++++---
>>   .../services/ppp/patches/202-no_strip.patch   |  88 -----
>>   .../services/ppp/patches/203-opt_flags.patch  |  36 +-
>>   .../patches/205-no_exponential_timeout.patch  |   4 +-
>>   .../ppp/patches/207-lcp_mtu_max.patch         |   2 +-
>>   .../ppp/patches/208-fix_status_code.patch     |   2 +-
>>   .../300-filter-pcap-includes-lib.patch        |   6 +-
>>   .../ppp/patches/310-precompile_filter.patch   |  20 +-
>>   ...multilink_support_custom_iface_names.patch |  33 +-
>>   .../330-retain_foreign_default_routes.patch   |   2 +-
>>   .../340-populate_default_gateway.patch        |   6 +-
>>   .../patches/400-simplify_kernel_checks.patch  |  32 +-
>>   .../ppp/patches/401-no_record_file.patch      |   6 +-
>>   .../services/ppp/patches/403-no_wtmp.patch    |   4 +-
>>   .../404-remove_obsolete_protocol_names.patch  |  16 +-
>>   .../ppp/patches/405-no_multilink_option.patch |   2 +-
>>   .../ppp/patches/500-add-pptp-plugin.patch     |  14 +-
>>   ...openssl-for-the-DES-instead-of-the-l.patch |  25 +-
>>   31 files changed, 222 insertions(+), 885 deletions(-)
>>   delete mode 100644 package/network/services/ppp/patches/100-debian_ip-ip_option.patch
>>   delete mode 100644 package/network/services/ppp/patches/101-debian_close_dev_ppp.patch
>>   delete mode 100644 package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch
>>   delete mode 100644 package/network/services/ppp/patches/106-debian_stripMSdomain.patch
>>   delete mode 100644 package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch
>>   delete mode 100644 package/network/services/ppp/patches/110-debian_defaultroute.patch
>>   delete mode 100644 package/network/services/ppp/patches/140-pppoe_compile_fix.patch
>>   delete mode 100644 package/network/services/ppp/patches/202-no_strip.patch
>>

>> --- a/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
>> +++ b/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch
>> @@ -7,14 +7,14 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>
>>   --- a/pppd/Makefile.linux
>>   +++ b/pppd/Makefile.linux
>> -@@ -190,8 +190,8 @@ endif
>> +@@ -210,8 +210,8 @@ LIBS       += -ldl
>> + endif
>>
>>    ifdef FILTER
>> - ifneq ($(wildcard /usr/include/pcap-bpf.h),)
>>   -LIBS    += -lpcap
>>   -CFLAGS  += -DPPP_FILTER
>>   +LIBS    += -lpcap -L$(STAGING_DIR)/usr/lib
>>   +CFLAGS  += -DPPP_FILTER -I$(STAGING_DIR)/usr/include
>>    endif
>> - endif
>>
>> + ifdef HAVE_INET6
>> diff --git a/package/network/services/ppp/patches/310-precompile_filter.patch b/package/network/services/ppp/patches/310-precompile_filter.patch
> This patch is broken with musl 1.2.x. If you notice, __P is gone
> everywhere in the codebase except for this patch. Please remove here
> as well.

Sorry I forgot this usage of __P here. I removed this and there are no 
other __P macros added any more.

>> index ec6110442352..d2449e69ea2d 100644
>> --- a/package/network/services/ppp/patches/310-precompile_filter.patch
>> +++ b/package/network/services/ppp/patches/310-precompile_filter.patch
>> @@ -13,7 +13,7 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>
>>   --- a/pppd/Makefile.linux
>>   +++ b/pppd/Makefile.linux
>> -@@ -50,6 +50,9 @@ MPPE=y
>> +@@ -51,6 +51,9 @@ MPPE=y
>>    # and that the kernel driver support PPP packet filtering.
>>    #FILTER=y
>>
>> @@ -23,8 +23,8 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>    # Uncomment the next line to enable multilink PPP (enabled by default)
>>    # Linux distributions: Please leave multilink ENABLED in your builds
>>    # of pppd!
>> -@@ -195,6 +198,14 @@ CFLAGS  += -DPPP_FILTER -I$(STAGING_DIR)
>> - endif
>> +@@ -214,6 +217,14 @@ LIBS    += -lpcap -L$(STAGING_DIR)/usr/l
>> + CFLAGS  += -DPPP_FILTER -I$(STAGING_DIR)/usr/include
>>    endif
>>
>>   +ifdef PRECOMPILED_FILTER
>> @@ -40,7 +40,7 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>         HEADERS  += ipv6cp.h eui64.h
>>   --- a/pppd/options.c
>>   +++ b/pppd/options.c
>> -@@ -57,6 +57,7 @@
>> +@@ -56,6 +56,7 @@
>>
>>    #ifdef PPP_FILTER
>>    #include <pcap.h>
>> @@ -48,8 +48,8 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>    /*
>>     * There have been 3 or 4 different names for this in libpcap CVS, but
>>     * this seems to be what they have settled on...
>> -@@ -169,6 +170,13 @@ static int setlogfile __P((char **));
>> - static int loadplugin __P((char **));
>> +@@ -168,6 +169,13 @@ static int setlogfile(char **);
>> + static int loadplugin(char **);
>>    #endif
>>
>>   +#ifdef PPP_PRECOMPILED_FILTER
>> @@ -60,9 +60,9 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>   +#endif
>>   +
>>    #ifdef PPP_FILTER
>> - static int setpassfilter __P((char **));
>> - static int setactivefilter __P((char **));
>> -@@ -361,6 +369,14 @@ option_t general_options[] = {
>> + static int setpassfilter(char **);
>> + static int setactivefilter(char **);
>> +@@ -360,6 +368,14 @@ option_t general_options[] = {
>>          "set filter for active pkts", OPT_PRIO },
>>    #endif
>>
>> @@ -77,7 +77,7 @@ Signed-off-by: Jo-Philipp Wich <jo at mein.io>
>>    #ifdef MAXOCTETS
>>        { "maxoctets", o_int, &maxoctets,
>>          "Set connection traffic limit",
>> -@@ -1516,6 +1532,29 @@ callfile(argv)
>> +@@ -1468,6 +1484,29 @@ callfile(char **argv)
>>        return ok;
>>    }
>>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x93DD20630910B515.asc
Type: application/pgp-keys
Size: 9895 bytes
Desc: not available
URL: <http://lists.openwrt.org/pipermail/openwrt-devel/attachments/20210222/32a506ed/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 484 bytes
Desc: OpenPGP digital signature
URL: <http://lists.openwrt.org/pipermail/openwrt-devel/attachments/20210222/32a506ed/attachment-0001.sig>


More information about the openwrt-devel mailing list