Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Oct 2002 23:03:43 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/44487: Update port: security/fwlogwatch to 0.9
Message-ID:  <200210260603.g9Q63hCK094826@www.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         44487
>Category:       ports
>Synopsis:       Update port: security/fwlogwatch to 0.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 25 23:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.7-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.9

New file:
files/patch-main.h

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/security/fwlogwatch/Makefile security/fwlogwatch/Makefile
--- /usr/ports/security/fwlogwatch/Makefile	Tue Sep 10 20:26:21 2002
+++ security/fwlogwatch/Makefile	Fri Oct 25 03:11:50 2002
@@ -7,27 +7,23 @@
 #
 
 PORTNAME=	fwlogwatch
-PORTVERSION=	0.6
-PORTREVISION=	1
+PORTVERSION=	0.9
 CATEGORIES=	security
-MASTER_SITES=	http://www.kyb.uni-stuttgart.de/boris/sw/
+MASTER_SITES=	http://www.kybs.de/boris/sw/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
+USE_BZIP2=	yes
 USE_REINPLACE=	yes
+MAKE_ENV=	MKDIR="${MKDIR}"
 INSTALL_TARGET=	install install-config install-i18n
+
 MANCOMPRESSES=	no
 MAN8=	fwlogwatch.8
-MAKE_ENV=	MKDIR="${MKDIR}"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g; \
-		s,/usr/local,${PREFIX},g; \
-		s,/usr/share,${PREFIX}/share,g; \
-		s,%%LOCALBASE%%,${LOCALBASE},g' \
-		${WRKSRC}/Makefile ${WRKSRC}/main.h
 	@${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" ${WRKSRC}/${MAN8}
 
 post-install:
diff -urN /usr/ports/security/fwlogwatch/distinfo security/fwlogwatch/distinfo
--- /usr/ports/security/fwlogwatch/distinfo	Sat Mar  9 00:51:03 2002
+++ security/fwlogwatch/distinfo	Fri Oct 25 03:02:51 2002
@@ -1 +1 @@
-MD5 (fwlogwatch-0.6.tar.gz) = cdc5ba4d72c2a528503e2682fb24f493
+MD5 (fwlogwatch-0.9.tar.bz2) = b58bfa714f10995a0012df87a6ae7fc9
diff -urN /usr/ports/security/fwlogwatch/files/patch-Makefile security/fwlogwatch/files/patch-Makefile
--- /usr/ports/security/fwlogwatch/files/patch-Makefile	Wed Mar 13 19:22:57 2002
+++ security/fwlogwatch/files/patch-Makefile	Fri Oct 25 03:16:39 2002
@@ -1,58 +1,78 @@
---- Makefile.orig	Sun Feb 24 07:15:21 2002
-+++ Makefile	Wed Mar 13 05:04:51 2002
+--- Makefile.orig	Sun Aug 18 21:32:26 2002
++++ Makefile	Fri Oct 25 03:16:30 2002
 @@ -1,10 +1,10 @@
- # $Id: Makefile,v 1.56 2002/02/24 12:15:21 bw Exp $
+ # $Id: Makefile,v 1.66 2002/08/18 12:32:26 bw Exp $
  
  # Linux
 -CC = gcc
--CFLAGS = -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
+-CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -DHAVE_IPV6 -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
 -LDFLAGS = #-g #-static -p
 -LIBS = -lcrypt -lz #-lc_p
 +#CC = gcc
-+#CFLAGS = -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
++#CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -DHAVE_IPV6 -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
 +#LDFLAGS = #-g #-static -p
 +#LIBS = -lcrypt -lz #-lc_p
  
  # Solaris
- #LIBS = -lnsl -lsocket -lz -lcrypt
-@@ -23,8 +23,8 @@
+ #LIBS = -lnsl -lsocket -lcrypt -lz
+@@ -22,9 +22,12 @@
+ #LIBS = -L/usr/local/lib -lz -lintl
  
  # FreeBSD
- #CC = gcc
--#CFLAGS = -pipe -O2 -Wall -I/usr/local/include
--#LIBS = -L/usr/local/lib -lintl -lcrypt -lz
-+CFLAGS += -I%%LOCALBASE%%/include
-+LIBS = -L%%LOCALBASE%%/lib -lintl -lcrypt -lz
+-#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}\" \
++	-DCONF_DIR=\"${CONF_DIR}\" \
++	-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
-@@ -35,10 +35,9 @@
- LEX = flex
+@@ -37,12 +40,12 @@
  LFLAGS = -B #-f #-p -p -d
  
--INSTALL = install
+ INSTALL = install
 -INSTALL_PROGRAM = $(INSTALL) -s -m 0755
 -INSTALL_SCRIPT = $(INSTALL) -m 0755
 -INSTALL_DATA = $(INSTALL) -m 0644
-+INSTALL_PROGRAM= ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA= ${BSD_INSTALL_DATA}
-+INSTALL_SCRIPT= ${BSD_INSTALL_SCRIPT}
- 
- OBJS = cisco_ios.o cisco_pix.o compare.o ipchains.o ipfilter.o \
-        main.o modes.o net.o netfilter.o output.o parser.o \
-@@ -82,10 +81,15 @@
+-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}
++INSTALL_DIR = ${PREFIX}
++CONF_DIR = ${INSTALL_DIR}/etc
++LOCALE_DIR = ${INSTALL_DIR}
+ 
+ OBJS = cisco_ios.o cisco_pix.o compare.o ipchains.o ipfilter.o lancom.o \
+        main.o modes.o net.o netfilter.o netscreen.o output.o parser.o \
+@@ -82,18 +85,23 @@
+ 	$(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
+-	$(INSTALL_DATA) fwlogwatch.8 $(INSTALL_DIR)/share/man/man8/fwlogwatch.8
++	$(INSTALL_DATA) fwlogwatch.8 $(INSTALL_DIR)/man/man8/fwlogwatch.8
+ 
+ install-config:
+ 	$(INSTALL_DATA) fwlogwatch.config $(CONF_DIR)/fwlogwatch.config
+ 	$(INSTALL_DATA) fwlogwatch.template $(CONF_DIR)/fwlogwatch.template
  
  install-i18n:
- 	cd po; make
-+	${MKDIR} ${PREFIX}/share/locale/de/LC_MESSAGES
- 	$(INSTALL_DATA) po/de.mo /usr/share/locale/de/LC_MESSAGES/fwlogwatch.mo
-+	${MKDIR} ${PREFIX}/share/locale/pt_BR/LC_MESSAGES
- 	$(INSTALL_DATA) po/pt_BR.mo /usr/share/locale/pt_BR/LC_MESSAGES/fwlogwatch.mo
-+	${MKDIR} ${PREFIX}/share/locale/sv/LC_MESSAGES
- 	$(INSTALL_DATA) po/sv.mo /usr/share/locale/sv/LC_MESSAGES/fwlogwatch.mo
-+	${MKDIR} ${PREFIX}/share/locale/zh_CN/LC_MESSAGES
- 	$(INSTALL_DATA) po/zh_CN.mo /usr/share/locale/zh_CN/LC_MESSAGES/fwlogwatch.mo
-+	${MKDIR} ${PREFIX}/share/locale/zh_TW/LC_MESSAGES
- 	$(INSTALL_DATA) po/zh_TW.mo /usr/share/locale/zh_TW/LC_MESSAGES/fwlogwatch.mo
+-	cd po; make
++	cd po; $(MAKE)
++	${MKDIR} $(LOCALE_DIR)/share/locale/de/LC_MESSAGES
+ 	$(INSTALL_DATA) po/de.mo $(LOCALE_DIR)/share/locale/de/LC_MESSAGES/fwlogwatch.mo
++	${MKDIR} $(LOCALE_DIR)/share/locale/pt_BR/LC_MESSAGES
+ 	$(INSTALL_DATA) po/pt_BR.mo $(LOCALE_DIR)/share/locale/pt_BR/LC_MESSAGES/fwlogwatch.mo
++	${MKDIR} $(LOCALE_DIR)/share/locale/sv/LC_MESSAGES
+ 	$(INSTALL_DATA) po/sv.mo $(LOCALE_DIR)/share/locale/sv/LC_MESSAGES/fwlogwatch.mo
++	${MKDIR} $(LOCALE_DIR)/share/locale/zh_CN/LC_MESSAGES
+ 	$(INSTALL_DATA) po/zh_CN.mo $(LOCALE_DIR)/share/locale/zh_CN/LC_MESSAGES/fwlogwatch.mo
++	${MKDIR} $(LOCALE_DIR)/share/locale/zh_TW/LC_MESSAGES
+ 	$(INSTALL_DATA) po/zh_TW.mo $(LOCALE_DIR)/share/locale/zh_TW/LC_MESSAGES/fwlogwatch.mo
  
- uninstall:
+ install-rhinit:
diff -urN /usr/ports/security/fwlogwatch/files/patch-main.h security/fwlogwatch/files/patch-main.h
--- /usr/ports/security/fwlogwatch/files/patch-main.h	Thu Jan  1 09:00:00 1970
+++ security/fwlogwatch/files/patch-main.h	Fri Oct 25 03:09:36 2002
@@ -0,0 +1,18 @@
+--- main.h.orig	Wed Aug 21 04:53:51 2002
++++ main.h	Fri Oct 25 03:09:26 2002
+@@ -9,9 +9,15 @@
+ 
+ /* Paths */
+ 
++#ifndef INSTALL_DIR
+ #define INSTALL_DIR "/usr/local"
++#endif
++#ifndef CONF_DIR
+ #define CONF_DIR "/etc"
++#endif
++#ifndef LOCALE_DIR
+ #define LOCALE_DIR "/usr"
++#endif
+ 
+ /* i18n */
+ 

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210260603.g9Q63hCK094826>