From 39004210b170c6af2dc6d8bc0b8fe0687334a0c2 Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Sun, 20 May 2012 01:45:42 +0000
Subject: [PATCH] fwknop: update to 2.0, use new startup commands
 Signed-off-by: Jonathan Bennett <jbscience87@gmail.com>

SVN-Revision: 31824
---
 net/fwknop/Makefile                     |  6 +++---
 net/fwknop/patches/001-fix_config.patch |  4 ++--
 net/fwknop/patches/002-fix_init.patch   | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 net/fwknop/patches/002-fix_init.patch

diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile
index d4778d35f..24d7385e5 100644
--- a/net/fwknop/Makefile
+++ b/net/fwknop/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fwknop
-PKG_VERSION:=2.0.0rc4
+PKG_VERSION:=2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
-PKG_MD5SUM:=4f5d45187429ca56d3b444ab96c57fb6
+PKG_MD5SUM:=96de4c5a4ae75a8618ef80269c6a70ad
 
 PKG_INSTALL:=1
 
diff --git a/net/fwknop/patches/001-fix_config.patch b/net/fwknop/patches/001-fix_config.patch
index e11ae07df..5ae4a9485 100644
--- a/net/fwknop/patches/001-fix_config.patch
+++ b/net/fwknop/patches/001-fix_config.patch
@@ -1,6 +1,6 @@
 --- a/server/fwknopd.conf
 +++ b/server/fwknopd.conf
-@@ -30,7 +30,12 @@
+@@ -29,7 +29,12 @@
  # Define the ethernet interface on which we will sniff packets.
  # Default if not set is eth0.
  #
@@ -14,7 +14,7 @@
  
  # By default fwknopd does not put the pcap interface into promiscuous mode.
  # Set this to 'Y' to enable promiscuous sniffing.
-@@ -239,8 +244,13 @@
+@@ -252,8 +257,13 @@
  # The IPT_FORWARD_ACCESS variable is only used if ENABLE_IPT_FORWARDING is
  # enabled.
  #
diff --git a/net/fwknop/patches/002-fix_init.patch b/net/fwknop/patches/002-fix_init.patch
new file mode 100644
index 000000000..9efda5751
--- /dev/null
+++ b/net/fwknop/patches/002-fix_init.patch
@@ -0,0 +1,17 @@
+--- a/extras/openwrt/package/fwknop/files/fwknopd.init
++++ b/extras/openwrt/package/fwknop/files/fwknopd.init
+@@ -8,12 +8,12 @@ FWKNOPD_BIN=/usr/sbin/fwknopd
+ 
+ start()
+ {
+-	$FWKNOPD_BIN
++	service_start $FWKNOPD_BIN
+ }
+ 
+ stop()
+ {
+-	$FWKNOPD_BIN -K
++	service_stop $FWKNOPD_BIN -K
+ }
+ 
+ restart()
-- 
2.30.2