Add some bug fix patches from hlfl's CVS, reported by ISIHARA

Takanori in PR 27105.  Bump PKGREVISION.

6 files changed, 89 insertions, 2 deletions

diff --git a/net/hlfl/Makefile b/net/hlfl/Makefile
index 96830f54391..497d4901db2 100644
--- a/net/hlfl/Makefile
+++ b/net/hlfl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/08 11:46:42 wiz Exp $
 #
 
 DISTNAME=		hlfl-0.60.1
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.hlfl.org/hlfl/ \
 			ftp://ftp.hlfl.org/pub/hlfl/
diff --git a/net/hlfl/distinfo b/net/hlfl/distinfo
index fd996a14438..892cc0ac9f4 100644
--- a/net/hlfl/distinfo
+++ b/net/hlfl/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:13:48 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 11:46:42 wiz Exp $
 
 SHA1 (hlfl-0.60.1.tar.bz2) = 5438a393c0231852e7823591fe7ae24a7270c7c8
 RMD160 (hlfl-0.60.1.tar.bz2) = cfe4ad6903fe21a8dea57a9c991f7aec7bd76304
+SHA1 (patch-aa) = d93814f84c2719a881e1fe469134ed7aebccc7aa
+SHA1 (patch-ab) = e43f3f2cd6c4160a913c025f1ae114391048e81b
+SHA1 (patch-ac) = 2f5cdafb72ad9a62385fca574c52845c9c224e58
+SHA1 (patch-ad) = 1788ce450c83dd508a953d4b1c3d9004c026bedd
 Size (hlfl-0.60.1.tar.bz2) = 86954 bytes
diff --git a/net/hlfl/patches/patch-aa b/net/hlfl/patches/patch-aa
new file mode 100644
index 00000000000..0e6c02d8900
--- /dev/null
+++ b/net/hlfl/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2006/01/08 11:46:43 wiz Exp $
+
+--- NEWS.orig	2002-02-20 23:14:44.000000000 +0900
++++ NEWS
+@@ -1,3 +1,10 @@
++Oct 6, 2003 -- Version 0.60.1
++- ipchains now ACCEPT packets by default
++- malloc() are now checked
++- cisco accepts comments, netmask
++- spaces and tabs are better managed
++- as always, bugfixes here and there
++
+ Feb 20, 2002 -- Version 0.60.0
+ - dev system use autoconf 2.52 / automake 1.5
+ - verbose operators
diff --git a/net/hlfl/patches/patch-ab b/net/hlfl/patches/patch-ab
new file mode 100644
index 00000000000..e1cc567fd73
--- /dev/null
+++ b/net/hlfl/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2006/01/08 11:46:43 wiz Exp $
+
+--- src/hlfl.c.orig	2004-09-30 01:11:05.000000000 +0900
++++ src/hlfl.c
+@@ -58,7 +58,7 @@ struct definition *definitions = NULL;
+ 
+ #ifdef HAVE_GETOPT
+ /* option string for getopt() or getopt_long() */
+-char *optstr = "hvV:c:t:o:";
++char *optstr = "c:t:o:hvV";
+ #ifdef HAVE_GETOPT_LONG
+ /* array of long option structs for getopt_long() */
+ struct option long_options[] = {
+@@ -66,7 +66,7 @@ struct option long_options[] = {
+ 	{"output", 1, 0, 'o'},
+ 	{"type", 1, 0, 't'},
+ 	{"version", 0, 0, 'V'},
+-	{"verbose", 1, 0, 'v'},
++       {"verbose", 0, 0, 'v'},
+ 	{"check", 1, 0, 'c'},
+ 	{0, 0, 0, 0}
+ };
+@@ -1173,7 +1173,7 @@ char **argv;
+ 				break;
+ 			}
+ 		case 'v':{
+-				verbose_level = atoi(optarg);
++                               verbose_level = 1;
+ 				break;
+ 			}
+ 		case 'V':{
diff --git a/net/hlfl/patches/patch-ac b/net/hlfl/patches/patch-ac
new file mode 100644
index 00000000000..0669177e847
--- /dev/null
+++ b/net/hlfl/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2006/01/08 11:46:43 wiz Exp $
+
+--- src/hlfl.def.orig	2002-10-27 20:43:28.000000000 +0900
++++ src/hlfl.def
+@@ -4,15 +4,15 @@
+ DEF("<->",		ACCEPT_TWO_WAYS)
+ DEF("<=>>",		ACCEPT_TWO_WAYS_ESTABLISHED)
+ DEF("<<=>",		ACCEPT_TWO_WAYS_ESTABLISHED_REVERSE)
+-DEF("X->",		DENY_OUT)
+-DEF("<-X",		DENY_IN)
+ DEF("<-X!",		REJECT_IN)
+ DEF("X!->",		REJECT_OUT)
+ DEF("!X->",		REJECT_OUT)
+ DEF("X!",		REJECT_ALL)
+-DEF("X",		DENY_ALL)
++DEF("X->",             DENY_OUT)
++DEF("<-X",             DENY_IN)
+ DEF("->",		ACCEPT_ONE_WAY)
+ DEF("<-",		ACCEPT_ONE_WAY_REVERSE)
++DEF("X",               DENY_ALL)
+ DEF("accept",		ACCEPT)
+ DEF("deny",		DENY)
+ DEF("reject",		REJECT)
diff --git a/net/hlfl/patches/patch-ad b/net/hlfl/patches/patch-ad
new file mode 100644
index 00000000000..4a21bc37eaf
--- /dev/null
+++ b/net/hlfl/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/01/08 11:46:43 wiz Exp $
+
+--- src/linux_netfilter.c.orig	2003-06-17 07:17:59.000000000 +0900
++++ src/linux_netfilter.c
+@@ -15,7 +15,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
+- * Reference : http://netfilter.kernelnotes.org/iptables-HOWTO-7.html
++ * Reference : http://www.netfilter.org/documentation/HOWTO/packet-filtering-HOWTO-7.html
+  */
+ 
+ #include "includes.h"