ppp: fix precompiled filter option

The upgrade to 2.5.0 accidentally dropped the CPP defines, so the
precompiled-active-filter option has been missing and the demand dialing
option in uci has been broken since then. Add the missing defines.

Fixes: 9cecf2b16e0e ("ppp: update to 2.5.0")
Closes: https://github.com/openwrt/openwrt/issues/24454
Signed-off-by: Qingfang Deng <dqfext@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/24467
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 3e27a253b8d6fede62a3cfbf642fef20ab88d43e..ad5f32ac747ab91b61aa868eda818df8b8a0a8b1 100644 (file)
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.5.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.samba.org/pub/ppp

diff --git a/package/network/services/ppp/patches/310-precompile_filter.patch b/package/network/services/ppp/patches/310-precompile_filter.patch
index d88cab8bcc65fcc0de96e270f78823ab12179b81..39d67ed5b25c4a5211e3b3e13528ad6f4681d422 100644 (file)
--- a/package/network/services/ppp/patches/310-precompile_filter.patch
+++ b/package/network/services/ppp/patches/310-precompile_filter.patch
@@ -13,17 +13,21 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -306,6 +306,9 @@ AM_CONDITIONAL(PPP_WITH_PAM, test "x${wi
+@@ -306,6 +306,13 @@ AM_CONDITIONAL(PPP_WITH_PAM, test "x${wi
  # With libpcap support, activate pppd on network activity
  AX_CHECK_PCAP
  
 +# internal statically linked pcap
 +AM_CONDITIONAL(PPP_WITH_PRECOMPILED_FILTER, test "x${with_static_pcap}" = "xyes")
++AM_COND_IF([PPP_WITH_PRECOMPILED_FILTER], [
++    AC_DEFINE([PPP_WITH_PRECOMPILED_FILTER], 1, [Have precompiled packet activity filter support])
++    AC_DEFINE([PPP_WITH_FILTER], 1, [Have packet activity filter support])
++])
 +
  #
  # 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" ])
-@@ -349,6 +352,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
+@@ -349,6 +356,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
      With libatm..........: ${with_atm:-no}
      With libpam..........: ${with_pam:-no}
      With libpcap.........: ${with_pcap:-no}

diff --git a/package/network/services/ppp/patches/500-add-pptp-plugin.patch b/package/network/services/ppp/patches/500-add-pptp-plugin.patch
index e786ed42bd602525a0222f210eb5801fc5ae6c99..b2ad465d11c6ceb9e7b254ae2cf9b6e785a6ce69 100644 (file)
--- a/package/network/services/ppp/patches/500-add-pptp-plugin.patch
+++ b/package/network/services/ppp/patches/500-add-pptp-plugin.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -334,6 +334,7 @@ AC_CONFIG_FILES([
+@@ -338,6 +338,7 @@ AC_CONFIG_FILES([
      pppd/plugins/pppol2tp/Makefile
      pppd/plugins/radius/Makefile
      pppd/plugins/dhcpv6relay/Makefile