- Update to 1.1

PR:		ports/104658
Submitted by:	Michael Ranner <mranner at inode.at> (maintainer)

4 files changed, 35 insertions, 26 deletions

diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index 12074e3d4f2f..527568c5d696 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	fwlogwatch
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.kybs.de/boris/sw/
 
@@ -16,6 +15,7 @@ MAINTAINER=	mranner@inode.at
 COMMENT=	A packet filter and firewall log analyzer
 
 USE_GETTEXT=	yes
+USE_BZIP2=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
 INSTALL_TARGET=	install install-config install-i18n
 
diff --git a/security/fwlogwatch/distinfo b/security/fwlogwatch/distinfo
index 043e9ced1363..36024c45853e 100644
--- a/security/fwlogwatch/distinfo
+++ b/security/fwlogwatch/distinfo
@@ -1,3 +1,3 @@
-MD5 (fwlogwatch-1.0.tar.gz) = 7fff74be5a5c6277b771f6d963e3ac7e
-SHA256 (fwlogwatch-1.0.tar.gz) = d3a68f42cbadfde7a9a26bb7c86d7958f430ad16ac95b9242a032a42475516e9
-SIZE (fwlogwatch-1.0.tar.gz) = 105304
+MD5 (fwlogwatch-1.1.tar.bz2) = 266974c417a7b973d3e54b64f95e9536
+SHA256 (fwlogwatch-1.1.tar.bz2) = 9908ef51f79aa069b31851e23550d5bfacb4583fc3569f87ad1a0957c974ba7f
+SIZE (fwlogwatch-1.1.tar.bz2) = 90341
diff --git a/security/fwlogwatch/files/patch-Makefile b/security/fwlogwatch/files/patch-Makefile
index cd494f9df615..d232ceb179c7 100644
--- a/security/fwlogwatch/files/patch-Makefile
+++ b/security/fwlogwatch/files/patch-Makefile
@@ -1,27 +1,24 @@
---- Makefile.orig	Sun Apr  4 17:42:16 2004
-+++ Makefile	Tue May 18 21:46:48 2004
+--- Makefile.orig	Wed Mar  8 20:36:02 2006
++++ Makefile	Sat Oct 21 20:44:00 2006
 @@ -2,10 +2,10 @@
- # $Id: Makefile,v 1.73 2004/04/04 14:42:16 bw Exp $
+ # $Id: Makefile,v 1.76 2006/03/08 19:36:02 bw Exp $
  
  # Linux
 -CC = gcc
 -CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
 -LDFLAGS = #-g #-static -p
--LIBS = -lcrypt -lz #-lc_p
+-LIBS = -lcrypt -lz #-ladns #-lc_p
 +#CC = gcc
 +#CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
 +#LDFLAGS = #-g #-static -p
-+#LIBS = -lcrypt -lz #-lc_p
++#LIBS = -lcrypt -lz #-ladns #-lc_p
  
  # Solaris
  #LIBS = -lnsl -lsocket -lcrypt -lz
-@@ -23,9 +23,12 @@
- #LIBS = -L/usr/local/lib -lz -lintl
- 
- # FreeBSD
--#CC = gcc
--#CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall -I/usr/local/include
--#LIBS = -L/usr/local/lib -lcrypt -lz -lintl
+@@ -26,6 +26,12 @@
+ #CC = gcc
+ #CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall -I/usr/local/include
+ #LIBS = -L/usr/local/lib -lcrypt -lz -lintl
 +CC ?= gcc
 +CFLAGS += -DHAVE_ZLIB -DHAVE_GETTEXT -I${LOCALBASE}/include \
 +	-DINSTALL_DIR=\"${INSTALL_DIR}\" \
@@ -29,9 +26,9 @@
 +	-DLOCALE_DIR=\"${LOCALE_DIR}\"
 +LIBS = -L${LOCALBASE}/lib -lcrypt -lz -lintl
  
- # You might want to add -DSHORT_NAMES to CFLAGS if you only intend to
- # analyze log formats with short list/chain/branch/interface names like
-@@ -38,12 +41,12 @@
+ # You might want to add -DSHORT_NAMES to CFLAGS if you only intend to analyze
+ # log formats with short list/chain/branch/interface names like ipchains.
+@@ -39,12 +45,18 @@
  LFLAGS = -B #-f #-p -p -d
  
  INSTALL = install
@@ -41,6 +38,12 @@
 -INSTALL_DIR = /usr/local
 -CONF_DIR = /etc
 -LOCALE_DIR = /usr
++#INSTALL_PROGRAM = $(INSTALL) -s -m 0755
++#INSTALL_SCRIPT = $(INSTALL) -m 0755
++#INSTALL_DATA = $(INSTALL) -m 0644
++#INSTALL_DIR = /usr/local
++#CONF_DIR = /etc
++#LOCALE_DIR = /usr
 +INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
 +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
 +INSTALL_DATA = ${BSD_INSTALL_DATA}
@@ -50,7 +53,7 @@
  
  OBJS = cisco_ios.o cisco_pix.o compare.o ipchains.o ipfilter.o ipfw.o \
         lancom.o main.o modes.o net.o netfilter.o netscreen.o output.o \
-@@ -85,19 +88,25 @@
+@@ -86,19 +98,25 @@
  	$(INSTALL_PROGRAM) fwlogwatch $(INSTALL_DIR)/sbin/fwlogwatch
  	$(INSTALL_SCRIPT) contrib/fwlw_notify $(INSTALL_DIR)/sbin/fwlw_notify
  	$(INSTALL_SCRIPT) contrib/fwlw_respond $(INSTALL_DIR)/sbin/fwlw_respond
@@ -78,3 +81,9 @@
  	$(INSTALL_DATA) po/zh_TW.mo $(LOCALE_DIR)/share/locale/zh_TW/LC_MESSAGES/fwlogwatch.mo
  
  install-rhinit:
+@@ -120,4 +138,4 @@
+ 
+ clean:
+ 	rm -f *.o *~ *.bak fwlogwatch
+-	cd po; make clean
++	cd po; $(MAKE) clean
diff --git a/security/fwlogwatch/files/patch-ipfw.l b/security/fwlogwatch/files/patch-ipfw.l
index 9a8a09ed79e7..8a1ba2cc2b03 100644
--- a/security/fwlogwatch/files/patch-ipfw.l
+++ b/security/fwlogwatch/files/patch-ipfw.l
@@ -1,11 +1,11 @@
---- ipfw.l.orig	Sun Mar 21 10:42:55 2004
-+++ ipfw.l	Sat Dec 11 16:57:23 2004
+--- ipfw.l.orig	Wed Mar  8 21:27:59 2006
++++ ipfw.l	Sat Oct 21 20:46:44 2006
 @@ -33,7 +33,7 @@
  %%
  
  {MONTH}[ ]{1,2}{DIGIT}{1,2}[ ]{DIGIT}{2}:{DIGIT}{2}:{DIGIT}{2}[ ]{LOGHOST}	ipfw_parse_start(ipfwtext);
 -" kernel: ipfw: "{NUMBER}	{ xstrncpy(opt.line->chainlabel, ipfwtext+15, SHORTLEN); opt.parser=opt.parser|IPFW_CHAIN; };
-+" /"?"kernel: ipfw: "{NUMBER}	{ xstrncpy(opt.line->chainlabel, ipfwtext+14, SHORTLEN); opt.parser=opt.parser|IPFW_CHAIN; };
++" /"?"kernel: ipfw: "{NUMBER}  { xstrncpy(opt.line->chainlabel, ipfwtext+14, SHORTLEN); opt.parser=opt.parser|IPFW_CHAIN; };
+ " ipfw: "{NUMBER}		{ xstrncpy(opt.line->chainlabel, ipfwtext+7, SHORTLEN); opt.parser=opt.parser|IPFW_CHAIN; };
  "Deny"				{ xstrncpy(opt.line->branchname, ipfwtext, SHORTLEN); opt.parser=opt.parser|IPFW_BRANCH; };
- {PROTO}				ipfw_parse_proto(ipfwtext, IPFW_OPT_NONE);
- "ICMP:"{NUMBER}"."{NUMBER}	ipfw_parse_proto(ipfwtext+5, IPFW_OPT_ICMP);
+ "Count"				{ xstrncpy(opt.line->branchname, ipfwtext, SHORTLEN); opt.parser=opt.parser|IPFW_BRANCH; };