aboutsummaryrefslogtreecommitdiff
path: root/net/pbr/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'net/pbr/Makefile')
-rw-r--r--net/pbr/Makefile73
1 files changed, 41 insertions, 32 deletions
diff --git a/net/pbr/Makefile b/net/pbr/Makefile
index 744db6ab6..d5a9503ed 100644
--- a/net/pbr/Makefile
+++ b/net/pbr/Makefile
@@ -1,73 +1,80 @@
-# Copyright 2017-2022 Stan Grishin (stangri@melmac.ca)
+# Copyright 2017-2023 MOSSDeF, Stan Grishin (stangri@melmac.ca)
# This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk
PKG_NAME:=pbr
-PKG_VERSION:=1.1.1
-PKG_RELEASE:=7
+PKG_VERSION:=1.1.4
+PKG_RELEASE:=5
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
include $(INCLUDE_DIR)/package.mk
-define Package/pbr/Default
+define Package/pbr-service/Default
SECTION:=net
CATEGORY:=Network
SUBMENU:=Routing and Redirection
TITLE:=Policy Based Routing Service
URL:=https://docs.openwrt.melmac.net/pbr/
DEPENDS:=+ip-full +jshn +jsonfilter +resolveip
+ DEPENDS+=+!BUSYBOX_DEFAULT_AWK:gawk
+ DEPENDS+=+!BUSYBOX_DEFAULT_GREP:grep
+ DEPENDS+=+!BUSYBOX_DEFAULT_SED:sed
+ PROVIDES:=pbr-service
CONFLICTS:=vpnbypass vpn-policy-routing
PKGARCH:=all
endef
define Package/pbr
-$(call Package/pbr/Default)
+$(call Package/pbr-service/Default)
TITLE+= with nft/nft set support
DEPENDS+=+kmod-nft-core +kmod-nft-nat +nftables-json
- VARIANT:=nftables
- PROVIDES:=vpnbypass vpn-policy-routing
DEFAULT_VARIANT:=1
+ VARIANT:=nftables
+ PROVIDES+=pbr vpnbypass vpn-policy-routing
endef
define Package/pbr-iptables
-$(call Package/pbr/Default)
+$(call Package/pbr-service/Default)
TITLE+= with iptables/ipset support
DEPENDS+=+ipset +iptables +kmod-ipt-ipset +iptables-mod-ipopt
VARIANT:=iptables
- PROVIDES:=pbr
endef
define Package/pbr-netifd
-$(call Package/pbr/Default)
+$(call Package/pbr-service/Default)
TITLE+= with netifd support
VARIANT:=netifd
- PROVIDES:=pbr
+endef
+
+define Package/pbr-service/description
+ This service enables policy-based routing for WAN interfaces and various VPN tunnels.
endef
define Package/pbr/description
-This service enables policy-based routing for WAN interfaces and various VPN tunnels.
-This version supports OpenWrt with both firewall3/ipset/iptables and firewall4/nft.
+ $(call Package/pbr-service/description)
+ This version supports OpenWrt with both firewall3/ipset/iptables and firewall4/nft.
endef
define Package/pbr-iptables/description
-This service enables policy-based routing for WAN interfaces and various VPN tunnels.
-This version supports OpenWrt with firewall3/ipset/iptables.
+ $(call Package/pbr-service/description)
+ This version supports OpenWrt with firewall3/ipset/iptables.
endef
define Package/pbr-netifd/description
-This service enables policy-based routing for WAN interfaces and various VPN tunnels.
-This version supports OpenWrt with both firewall3/ipset/iptables and firewall4/nft.
-This version uses OpenWrt native netifd/tables to set up interfaces. This is WIP.
+ $(call Package/pbr-service/description)
+ This version supports OpenWrt with both firewall3/ipset/iptables and firewall4/nft.
+ This version uses OpenWrt native netifd/tables to set up interfaces. This is WIP.
endef
-define Package/pbr/conffiles
+define Package/pbr-service/conffiles
/etc/config/pbr
endef
-Package/pbr-iptables/conffiles = $(Package/pbr/conffiles)
-Package/pbr-netifd/conffiles = $(Package/pbr/conffiles)
+Package/pbr/conffiles = $(Package/pbr-service/conffiles)
+Package/pbr-iptables/conffiles = $(Package/pbr-service/conffiles)
+Package/pbr-netifd/conffiles = $(Package/pbr-service/conffiles)
define Build/Configure
endef
@@ -75,31 +82,33 @@ endef
define Build/Compile
endef
-define Package/pbr/default/install
+define Package/pbr-service/install
$(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/etc/init.d/pbr.init $(1)/etc/init.d/pbr
+ $(INSTALL_BIN) ./files/etc/init.d/pbr $(1)/etc/init.d/pbr
$(SED) "s|^\(readonly PKG_VERSION\).*|\1='$(PKG_VERSION)-$(PKG_RELEASE)'|" $(1)/etc/init.d/pbr
- $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
- $(INSTALL_DATA) ./files/etc/hotplug.d/iface/70-pbr $(1)/etc/hotplug.d/iface/70-pbr
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/etc/uci-defaults/90-pbr $(1)/etc/uci-defaults/90-pbr
$(INSTALL_DIR) $(1)/usr/share/pbr
+ $(INSTALL_DATA) ./files/usr/share/pbr/.keep $(1)/usr/share/pbr/.keep
$(INSTALL_DATA) ./files/usr/share/pbr/pbr.user.aws $(1)/usr/share/pbr/pbr.user.aws
$(INSTALL_DATA) ./files/usr/share/pbr/pbr.user.netflix $(1)/usr/share/pbr/pbr.user.netflix
+ $(INSTALL_DATA) ./files/usr/share/pbr/pbr.user.wg_server_and_client $(1)/usr/share/pbr/pbr.user.wg_server_and_client
endef
+# $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+# $(INSTALL_DATA) ./files/etc/hotplug.d/iface/70-pbr $(1)/etc/hotplug.d/iface/70-pbr
define Package/pbr/install
-$(call Package/pbr/default/install,$(1))
+$(call Package/pbr-service/install,$(1))
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/etc/config/pbr $(1)/etc/config/pbr
$(INSTALL_DIR) $(1)/usr/share/pbr
- $(INSTALL_DATA) ./files/usr/share/pbr/pbr.firewall.include $(1)/usr/share/pbr/pbr.firewall.include
+ $(INSTALL_DATA) ./files/usr/share/pbr/firewall.include $(1)/usr/share/pbr/firewall.include
$(INSTALL_DIR) $(1)/usr/share/nftables.d
$(CP) ./files/usr/share/nftables.d/* $(1)/usr/share/nftables.d/
endef
define Package/pbr-iptables/install
-$(call Package/pbr/default/install,$(1))
+$(call Package/pbr-service/install,$(1))
$(INSTALL_DIR) $(1)/etc/hotplug.d/firewall
$(INSTALL_DATA) ./files/etc/hotplug.d/firewall/70-pbr $(1)/etc/hotplug.d/firewall/70-pbr
$(INSTALL_DIR) $(1)/etc/config
@@ -107,7 +116,7 @@ $(call Package/pbr/default/install,$(1))
endef
define Package/pbr-netifd/install
-$(call Package/pbr/default/install,$(1))
+$(call Package/pbr-service/install,$(1))
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/etc/config/pbr $(1)/etc/config/pbr
$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -133,7 +142,7 @@ define Package/pbr/prerm
if [ -z "$${IPKG_INSTROOT}" ]; then
uci -q delete firewall.pbr || true
echo "Stopping pbr service... "
- /etc/init.d/pbr stop && echo "OK" || echo "FAIL"
+ /etc/init.d/pbr stop quiet && echo "OK" || echo "FAIL"
echo -n "Removing rc.d symlink for pbr... "
/etc/init.d/pbr disable && echo "OK" || echo "FAIL"
fi
@@ -165,7 +174,7 @@ define Package/pbr-iptables/prerm
if [ -z "$${IPKG_INSTROOT}" ]; then
uci -q delete firewall.pbr || true
echo "Stopping pbr-iptables service... "
- /etc/init.d/pbr stop && echo "OK" || echo "FAIL"
+ /etc/init.d/pbr stop quiet && echo "OK" || echo "FAIL"
echo -n "Removing rc.d symlink for pbr-iptables... "
/etc/init.d/pbr disable && echo "OK" || echo "FAIL"
fi
@@ -188,7 +197,7 @@ define Package/pbr-netifd/prerm
if [ -z "$${IPKG_INSTROOT}" ]; then
uci -q delete firewall.pbr || true
echo "Stopping pbr-netifd service... "
- /etc/init.d/pbr stop && echo "OK" || echo "FAIL"
+ /etc/init.d/pbr stop quiet && echo "OK" || echo "FAIL"
echo -n "Removing rc.d symlink for pbr... "
/etc/init.d/pbr disable && echo "OK" || echo "FAIL"
fi
Powered by cgit, Themed by Ted Yin.