ppp: update to 2.5.3

Update to 2.5.3 and use the official tarball.

Changelog: https://github.com/ppp-project/ppp/releases/tag/v2.5.3

Removed upstreamed:
- 000-pppd-session-fixed-building-with-gcc-15.patch
- 001-pppdump-fixed-building-with-gcc-15.patch
- 501-fix-memcpy-fortify.patch
- 502-remove_mru.patch

Manually rebased:
- 500-add-pptp-plugin.patch

Add a pending patch to relax the check to avoid breaking existing
configurations.

Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Link: openwrt/openwrt#23540
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

Author: LGA1150

package/network/services/ppp/Makefile

@@ -9,14 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
-PKG_VERSION:=2.5.2
-PKG_RELEASE:=3
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/ppp-project/ppp
-PKG_MIRROR_HASH:=381668ce1547afeaf599f08ae37935bfd3d5841747c62bca5a870c11e3e9bedb
-PKG_SOURCE_DATE:=2024-12-31
-PKG_SOURCE_VERSION:=9f612dc02c34509f062ed63b60bcc7e937e25178
+PKG_VERSION:=2.5.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://download.samba.org/pub/ppp
+PKG_HASH:=ddda28dec8aca99a403ab6070d94ffd2b17d63e9a4c5509158e99e148f572d4f
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-4-Clause

package/network/services/ppp/patches/000-pppd-session-fixed-building-with-gcc-15.patch

@@ -137,7 +137,7 @@
  	} else {
 --- a/pppd/ipcp.c
 +++ b/pppd/ipcp.c
-@@ -1915,7 +1915,7 @@ ipcp_up(fsm *f)
+@@ -1930,7 +1930,7 @@ ipcp_up(fsm *f)
  		    proxy_arp_set[f->unit] = 1;
 
  	}
@@ -148,7 +148,7 @@
      } else {
 --- a/pppd/ipv6cp.c
 +++ b/pppd/ipv6cp.c
-@@ -1338,7 +1338,7 @@ ipv6cp_up(fsm *f)
+@@ -1344,7 +1344,7 @@ ipv6cp_up(fsm *f)
  		if (sif6defaultroute(f->unit, go->ourid, ho->hisid))
  		    default_route_set[f->unit] = 1;
  	}
@@ -159,7 +159,7 @@
      } else {
 --- a/pppd/pppd-private.h
 +++ b/pppd/pppd-private.h
-@@ -370,7 +370,7 @@ void demand_conf(void);	/* config interf
+@@ -375,7 +375,7 @@ void demand_conf(void);	/* config interf
  void demand_block(void);	/* set all NPs to queue up packets */
  void demand_unblock(void); /* set all NPs to pass packets */
  void demand_discard(void); /* set all NPs to discard packets */

package/network/services/ppp/patches/001-pppdump-fixed-building-with-gcc-15.patch

@@ -12,7 +12,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
 --- a/pppd/main.c
 +++ b/pppd/main.c
-@@ -1150,7 +1150,8 @@ get_input(void)
+@@ -1159,7 +1159,8 @@ get_input(void)
  	}
  	notice("Modem hangup");
  	hungup = 1;

package/network/services/ppp/patches/105-debian_demand.patch

@@ -23,7 +23,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  #
  # SunOS provides a version of libpcap that would work, but SunOS has no support for activity filter
  AM_CONDITIONAL([PPP_WITH_FILTER], [ test "x${with_pcap}" = "xyes" && test "x${build_sunos}" != "xyes" ])
-@@ -348,6 +351,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
+@@ -349,6 +352,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
      With libatm..........: ${with_atm:-no}
      With libpam..........: ${with_pam:-no}
      With libpcap.........: ${with_pcap:-no}
@@ -56,7 +56,7 @@ Signed-off-by: Jo-Philipp Wich <jo@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...
-@@ -182,6 +183,13 @@ static int setlogfile(char **);
+@@ -186,6 +187,13 @@ static int setlogfile(char **);
  static int loadplugin(char **);
  #endif
 
@@ -70,7 +70,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  #ifdef PPP_WITH_FILTER
  static int setpassfilter(char **);
  static int setactivefilter(char **);
-@@ -391,6 +399,14 @@ struct option general_options[] = {
+@@ -404,6 +412,14 @@ struct option general_options[] = {
        "set filter for active pkts", OPT_PRIO },
  #endif
 
@@ -85,7 +85,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      { "maxoctets", o_int, &maxoctets,
        "Set connection traffic limit",
        OPT_PRIO | OPT_LLIMIT | OPT_NOINCR | OPT_ZEROINF },
-@@ -1666,6 +1682,27 @@ callfile(char **argv)
+@@ -1690,6 +1706,27 @@ callfile(char **argv)
      return ok;
  }
 

package/network/services/ppp/patches/208-fix_status_code.patch

@@ -119,7 +119,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  			&& memcmp(vd.dptr, key.dptr, vd.dsize) == 0;
 --- a/pppd/sys-linux.c
 +++ b/pppd/sys-linux.c
-@@ -980,6 +980,16 @@ void cfg_bundle(int mrru, int mtru, int
+@@ -1111,6 +1111,16 @@ void cfg_bundle(int mrru, int mtru, int
  	add_fd(ppp_dev_fd);
  }
 
@@ -136,7 +136,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  /*
   * make_new_bundle - create a new PPP unit (i.e. a bundle)
   * and connect our channel to it.  This should only get called
-@@ -998,6 +1008,8 @@ void make_new_bundle(int mrru, int mtru,
+@@ -1129,6 +1139,8 @@ void make_new_bundle(int mrru, int mtru,
 
  	/* set the mrru and flags */
  	cfg_bundle(mrru, mtru, rssn, tssn);

package/network/services/ppp/patches/310-precompile_filter.patch

@@ -13,7 +13,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
 --- a/pppd/sys-linux.c
 +++ b/pppd/sys-linux.c
-@@ -2247,6 +2247,9 @@ int sifdefaultroute (int unit, u_int32_t
+@@ -2374,6 +2374,9 @@ int sifdefaultroute (int unit, u_int32_t
      memset (&rt, 0, sizeof (rt));
      SET_SA_FAMILY (rt.rt_dst, AF_INET);
 
@@ -23,7 +23,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      rt.rt_dev = ifname;
      rt.rt_metric = dfl_route_metric + 1; /* +1 for binary compatibility */
 
-@@ -2255,7 +2258,7 @@ int sifdefaultroute (int unit, u_int32_t
+@@ -2382,7 +2385,7 @@ int sifdefaultroute (int unit, u_int32_t
  	SIN_ADDR(rt.rt_genmask) = 0L;
      }
 

package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch

@@ -10,8 +10,8 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
 --- a/pppd/sys-linux.c
 +++ b/pppd/sys-linux.c
-@@ -220,14 +220,10 @@ static fd_set in_fds;		/* set of fds tha
- static int max_in_fd;		/* highest fd set in in_fds */
+@@ -218,14 +218,10 @@ static int chindex;		/* channel index (n
+ static unsigned routing_table_id = RT_TABLE_MAIN;
 
  static int has_proxy_arp       = 0;
 -static int driver_version      = 0;
@@ -26,7 +26,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
  static char loop_name[20];
  static unsigned char inbuf[512]; /* buffer for chars read from loopback */
-@@ -245,9 +241,8 @@ static int	dynaddr_set;		/* 1 if ip_dyna
+@@ -241,9 +237,8 @@ static int	dynaddr_set;		/* 1 if ip_dyna
  static int	looped;			/* 1 if using loop */
  static int	link_mtu;		/* mtu for the link (not bundle) */
 
@@ -37,7 +37,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
  #define MAX_IFS		100
 
-@@ -1966,11 +1961,12 @@ int ccp_fatal_error (int unit)
+@@ -2067,11 +2062,12 @@ int ccp_fatal_error (int unit)
   *
   * path_to_procfs - find the path to the proc file system mount point
   */
@@ -52,15 +52,15 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      struct mntent *mntent;
      FILE *fp;
 
-@@ -1992,6 +1988,7 @@ static char *path_to_procfs(const char *
+@@ -2093,6 +2089,7 @@ static char *path_to_procfs(const char *
  	    fclose (fp);
  	}
      }
 +#endif
 
      strlcpy(proc_path + proc_path_len, tail,
  	    sizeof(proc_path) - proc_path_len);
-@@ -2883,6 +2880,8 @@ ppp_registered(void)
+@@ -2874,6 +2871,8 @@ ppp_registered(void)
 
  int ppp_check_kernel_support(void)
  {
@@ -69,39 +69,39 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      int s, ok, fd;
      struct ifreq ifr;
      int    size;
-@@ -3010,6 +3009,7 @@ int ppp_check_kernel_support(void)
+@@ -3001,6 +3000,7 @@ int ppp_check_kernel_support(void)
      }
      close(s);
      return ok;
 +#endif
  }
 
  #ifndef HAVE_LOGWTMP
-@@ -3571,6 +3571,7 @@ get_pty(int *master_fdp, int *slave_fdp,
+@@ -3562,6 +3562,7 @@ get_pty(int *master_fdp, int *slave_fdp,
      }
  #endif /* TIOCGPTN */
 
 +#if 0
      if (sfd < 0) {
  	/* the old way - scan through the pty name space */
  	for (i = 0; i < 64; ++i) {
-@@ -3595,6 +3596,7 @@ get_pty(int *master_fdp, int *slave_fdp,
+@@ -3586,6 +3587,7 @@ get_pty(int *master_fdp, int *slave_fdp,
  	    }
  	}
      }
 +#endif
 
      if (sfd < 0)
  	return 0;
-@@ -3710,6 +3712,7 @@ get_host_seed(void)
+@@ -3701,6 +3703,7 @@ get_host_seed(void)
  int
  sys_check_options(void)
  {
 +#if 0
      if (demand && driver_is_old) {
  	ppp_option_error("demand dialling is not supported by kernel driver "
  		     "version %d.%d.%d", driver_version, driver_modification,
-@@ -3720,6 +3723,7 @@ sys_check_options(void)
+@@ -3711,6 +3714,7 @@ sys_check_options(void)
  	warn("Warning: multilink is not supported by the kernel driver");
  	multilink = 0;
      }
@@ -147,7 +147,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      info("PPPoE plugin from pppd %s", PPPD_VERSION);
 --- a/pppd/plugins/pppol2tp/pppol2tp.c
 +++ b/pppd/plugins/pppol2tp/pppol2tp.c
-@@ -501,10 +501,6 @@ static void pppol2tp_cleanup(void)
+@@ -502,10 +502,6 @@ static void pppol2tp_cleanup(void)
  void plugin_init(void)
  {
  #if defined(__linux__)