Date: Sat, 21 Oct 2006 20:58:31 +0200 (CEST) From: Michael Ranner <mranner@inode.at> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104658: [MAINTAINER] security/fwlogwatch: update to 1.1 Message-ID: <200610211858.k9LIwVAO016716@dwarf.jawa.at> Resent-Message-ID: <200610211900.k9LJ0Wwr099308@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104658 >Category: ports >Synopsis: [MAINTAINER] security/fwlogwatch: update to 1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 21 19:00:31 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Michael Ranner >Release: FreeBSD 6.1-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD dwarf.jawa.at 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #1: Mon Aug 7 21:00:30 CEST >Description: - Update to 1.1 and fix unfetchable distfile from primary master site Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- fwlogwatch-1.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/fwlogwatch/Makefile /usr/ports/security/fwlogwatch.update/Makefile --- /usr/ports/security/fwlogwatch/Makefile Thu Aug 3 10:33:08 2006 +++ /usr/ports/security/fwlogwatch.update/Makefile Sat Oct 21 20:37:49 2006 @@ -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 @@ 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 -ruN --exclude=CVS /usr/ports/security/fwlogwatch/distinfo /usr/ports/security/fwlogwatch.update/distinfo --- /usr/ports/security/fwlogwatch/distinfo Tue Jan 24 02:03:01 2006 +++ /usr/ports/security/fwlogwatch.update/distinfo Sat Oct 21 20:37:55 2006 @@ -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 -ruN --exclude=CVS /usr/ports/security/fwlogwatch/files/patch-Makefile /usr/ports/security/fwlogwatch.update/files/patch-Makefile --- /usr/ports/security/fwlogwatch/files/patch-Makefile Mon May 24 10:17:07 2004 +++ /usr/ports/security/fwlogwatch.update/files/patch-Makefile Sat Oct 21 20:45:21 2006 @@ -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 -ruN --exclude=CVS /usr/ports/security/fwlogwatch/files/patch-ipfw.l /usr/ports/security/fwlogwatch.update/files/patch-ipfw.l --- /usr/ports/security/fwlogwatch/files/patch-ipfw.l Tue Sep 6 19:20:34 2005 +++ /usr/ports/security/fwlogwatch.update/files/patch-ipfw.l Sat Oct 21 20:47:59 2006 @@ -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; }; --- fwlogwatch-1.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610211858.k9LIwVAO016716>