Updated ppp to be compiled with PPP filtering options as it was introduced with the newest libpcap

SVN-Revision: 3147
master
Florian Fainelli 19 years ago
parent 2576ba4795
commit 07431e5f0a
  1. 6
      openwrt/package/ppp/Config.in
  2. 10
      openwrt/package/ppp/Makefile
  3. 1
      openwrt/package/ppp/ipkg/ppp.control

@ -6,6 +6,12 @@ config BR2_PACKAGE_PPP
default y default y
select BR2_PACKAGE_KMOD_PPP select BR2_PACKAGE_KMOD_PPP
config BR2_PACKAGE_PPP_WITH_FILTER
prompt "Enable filter support"
bool
default y
depends BR2_PACKAGE_LIBPCAP
config BR2_PACKAGE_PPP_MOD_PPPOA config BR2_PACKAGE_PPP_MOD_PPPOA
prompt "ppp-mod-pppoa................... PPPoA (PPP over ATM) plugin" prompt "ppp-mod-pppoa................... PPPoA (PPP over ATM) plugin"
tristate tristate

@ -39,6 +39,12 @@ $(eval $(call PKG_mod_template,PPP_MOD_PPPOA,pppoatm))
$(eval $(call PKG_mod_template,PPP_MOD_PPPOE,rp-pppoe)) $(eval $(call PKG_mod_template,PPP_MOD_PPPOE,rp-pppoe))
$(eval $(call PKG_mod_template,PPP_MOD_RADIUS,radius)) $(eval $(call PKG_mod_template,PPP_MOD_RADIUS,radius))
PKG_DEPEND:="kmod-ppp"
ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y)
ENABLE_FILTER:="FILTER=1"
PKG_DEPEND += ", libpcap"
endif
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
@ -73,6 +79,8 @@ $(PKG_BUILD_DIR)/.built:
CC=$(TARGET_CC) \ CC=$(TARGET_CC) \
COPTS="$(TARGET_CFLAGS)" \ COPTS="$(TARGET_CFLAGS)" \
HAVE_INET6="1" \ HAVE_INET6="1" \
$(ENABLE_FILTER) \
STAGING_DIR=$(STAGING_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)/usr" \ DESTDIR="$(PKG_INSTALL_DIR)/usr" \
all install all install
touch $@ touch $@
@ -87,6 +95,7 @@ $(IPKG_PPP):
install -d -m0755 $(IDIR_PPP)/usr/sbin install -d -m0755 $(IDIR_PPP)/usr/sbin
install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/ install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/
install -d -m0755 $(IDIR_PPP)/usr/lib/pppd install -d -m0755 $(IDIR_PPP)/usr/lib/pppd
echo "Depends: $(PKG_DEPEND)" >> $(IDIR_PPP)/CONTROL/control
$(RSTRIP) $(IDIR_PPP) $(RSTRIP) $(IDIR_PPP)
$(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_PPP) $(PACKAGE_DIR)
@ -103,7 +112,6 @@ $(IDIR_PPP_MOD_PPPOE)/sbin/ifup.pppoe:
$(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/sbin/ifup.pppoe $(IPKG_PPP_MOD_PPPOE): $(IDIR_PPP_MOD_PPPOE)/sbin/ifup.pppoe
$(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf: $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf:
install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp
install -m644 ./files/etc/ppp/radius.conf $(IDIR_PPP_MOD_RADIUS)/etc/ppp/ install -m644 ./files/etc/ppp/radius.conf $(IDIR_PPP_MOD_RADIUS)/etc/ppp/
install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius install -d -m0755 $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius

@ -1,5 +1,4 @@
Package: ppp Package: ppp
Priority: optional Priority: optional
Section: net Section: net
Depends: kmod-ppp
Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support) Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support)

Loading…
Cancel
Save