Re: [OpenWrt-Devel] fwknop package update
Hi Le 24/07/2013 02:10, Jonathan Bennett a écrit : The following patch updates fwknop to the newest release, v 2.5. I`m not familiar with the standard procedures for package updates after the official release. If possible, it would be great to update the package in 12.09 as well. Signed-off-by: Jonathan Bennett jbscienc...@gmail.com mailto:jbscienc...@gmail.com diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index 24d7385..80575a8 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk http://rules.mk PKG_NAME:=fwknop -PKG_VERSION:=2.0 +PKG_VERSION:=2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download -PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad +PKG_MD5SUM:=b9f28aba92c959946e540a822a623964 PKG_INSTALL:=1 diff --git a/net/fwknop/patches/001-fix_config.patch b/net/fwknop/patches/001-fix_config.patch index 5ae4a94..93a261f 100644 --- a/net/fwknop/patches/001-fix_config.patch +++ b/net/fwknop/patches/001-fix_config.patch @@ -1,20 +1,20 @@ a/server/fwknopd.conf -+++ b/server/fwknopd.conf -@@ -29,7 +29,12 @@ - # Define the ethernet interface on which we will sniff packets. - # Default if not set is eth0. +--- a/server/fwknopd.conf.inst b/server/fwknopd.conf.inst +@@ -37,7 +37,12 @@ + # Default if not set is eth0. The '-i intf' command line option overrides + # the PCAP_INTF setting. # -#PCAP_INTF eth0; -+ +# The following line is changed specifically for Openwrt. +# Openwrt defaults to using eth1 as its wan port. If using PPPoE, +# Then this needs to be set to pppoe-wan. It depends on router model (it can also be eth0.1, ...). At runtime you can execute uci -P/var/state get network.wan.ifname to get the ifname + +PCAP_INTF eth1; ++ # By default fwknopd does not put the pcap interface into promiscuous mode. # Set this to 'Y' to enable promiscuous sniffing. -@@ -252,8 +257,13 @@ +@@ -279,8 +284,13 @@ # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is # enabled. # ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] fwknop package update
On Jul 24, 2013 1:19 AM, Etienne Champetier etienne.champet...@free.fr wrote: Hi Le 24/07/2013 02:10, Jonathan Bennett a écrit : The following patch updates fwknop to the newest release, v 2.5. I`m not familiar with the standard procedures for package updates after the official release. If possible, it would be great to update the package in 12.09 as well. Signed-off-by: Jonathan Bennett jbscienc...@gmail.com diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index 24d7385..80575a8 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fwknop -PKG_VERSION:=2.0 +PKG_VERSION:=2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download -PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad +PKG_MD5SUM:=b9f28aba92c959946e540a822a623964 PKG_INSTALL:=1 diff --git a/net/fwknop/patches/001-fix_config.patch b/net/fwknop/patches/001-fix_config.patch index 5ae4a94..93a261f 100644 --- a/net/fwknop/patches/001-fix_config.patch +++ b/net/fwknop/patches/001-fix_config.patch @@ -1,20 +1,20 @@ a/server/fwknopd.conf -+++ b/server/fwknopd.conf -@@ -29,7 +29,12 @@ - # Define the ethernet interface on which we will sniff packets. - # Default if not set is eth0. +--- a/server/fwknopd.conf.inst b/server/fwknopd.conf.inst +@@ -37,7 +37,12 @@ + # Default if not set is eth0. The '-i intf' command line option overrides + # the PCAP_INTF setting. # -#PCAP_INTF eth0; -+ +# The following line is changed specifically for Openwrt. +# Openwrt defaults to using eth1 as its wan port. If using PPPoE, +# Then this needs to be set to pppoe-wan. It depends on router model (it can also be eth0.1, ...). At runtime you can execute uci -P/var/state get network.wan.ifname to get the ifname That is a good point, but as the config files always need to be edited by the end user to include the password, etc, I'm not inclined to add a sed or awk command to firstboot to tweak that config. I hope to eventually write a uci config for fwknop, which would allow for a luci module. This seems like the better way to deal with unusual setups. + +PCAP_INTF eth1; ++ # By default fwknopd does not put the pcap interface into promiscuous mode. # Set this to 'Y' to enable promiscuous sniffing. -@@ -252,8 +257,13 @@ +@@ -279,8 +284,13 @@ # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is # enabled. # ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] fwknop package update
The following patch updates fwknop to the newest release, v 2.5. I`m not familiar with the standard procedures for package updates after the official release. If possible, it would be great to update the package in 12.09 as well. Signed-off-by: Jonathan Bennett jbscienc...@gmail.com diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index 24d7385..80575a8 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fwknop -PKG_VERSION:=2.0 +PKG_VERSION:=2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download -PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad +PKG_MD5SUM:=b9f28aba92c959946e540a822a623964 PKG_INSTALL:=1 diff --git a/net/fwknop/patches/001-fix_config.patch b/net/fwknop/patches/001-fix_config.patch index 5ae4a94..93a261f 100644 --- a/net/fwknop/patches/001-fix_config.patch +++ b/net/fwknop/patches/001-fix_config.patch @@ -1,20 +1,20 @@ a/server/fwknopd.conf -+++ b/server/fwknopd.conf -@@ -29,7 +29,12 @@ - # Define the ethernet interface on which we will sniff packets. - # Default if not set is eth0. +--- a/server/fwknopd.conf.inst b/server/fwknopd.conf.inst +@@ -37,7 +37,12 @@ + # Default if not set is eth0. The '-i intf' command line option overrides + # the PCAP_INTF setting. # -#PCAP_INTF eth0; -+ +# The following line is changed specifically for Openwrt. +# Openwrt defaults to using eth1 as its wan port. If using PPPoE, +# Then this needs to be set to pppoe-wan. + +PCAP_INTF eth1; ++ # By default fwknopd does not put the pcap interface into promiscuous mode. # Set this to 'Y' to enable promiscuous sniffing. -@@ -252,8 +257,13 @@ +@@ -279,8 +284,13 @@ # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is # enabled. # ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
