Attachment 25455 Details for Bug 43506 – security_fwlogwatch.diff

[patch] security_fwlogwatch.diff

security_fwlogwatch.diff (text/plain), 6.28 KB, created by Jim Geovedi on 2002-09-30 10:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Geovedi

Created: 2002-09-30 10:30:01 UTC

Size: 6.28 KB

patch

obsolete

>security/fwlogwatch:
>
>Modified files: 
>	Makefile distinfo patch/patch-Makefile
>
>Added files:
>	files/patch-main.h
>
>Index: fwlogwatch/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/security/fwlogwatch/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- fwlogwatch/Makefile	2002/08/01 16:22:34	1.8
>+++ fwlogwatch/Makefile	2002/09/29 18:12:06
>@@ -7,19 +7,18 @@
> #
> 
> PORTNAME=	fwlogwatch
>-PORTVERSION=	0.6
>-PORTREVISION=	1
>+PORTVERSION=	0.9
> CATEGORIES=	security
> MASTER_SITES=	http://www.kyb.uni-stuttgart.de/boris/sw/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	jim@corebsd.or.id
> 
> LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
> 
> USE_REINPLACE=	yes
> INSTALL_TARGET=	install install-config install-i18n
> MANCOMPRESSES=	no
>-MAN8=	fwlogwatch.8
>+MAN8=		fwlogwatch.8
> MAKE_ENV=	MKDIR="${MKDIR}"
> 
> post-patch:
>Index: fwlogwatch/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/security/fwlogwatch/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- fwlogwatch/distinfo	2002/03/08 15:51:03	1.2
>+++ fwlogwatch/distinfo	2002/09/29 18:12:06
>@@ -1 +1 @@
>-MD5 (fwlogwatch-0.6.tar.gz) = cdc5ba4d72c2a528503e2682fb24f493
>+MD5 (fwlogwatch-0.9.tar.gz) = 5063a68382cf9ff7ca16c4c96d06c756
>Index: fwlogwatch/files/patch-Makefile
>===================================================================
>RCS file: /home/ncvs/ports/security/fwlogwatch/files/patch-Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 patch-Makefile
>--- fwlogwatch/files/patch-Makefile	2002/03/13 10:22:57	1.4
>+++ fwlogwatch/files/patch-Makefile	2002/09/29 18:12:07
>@@ -1,32 +1,32 @@
>---- Makefile.orig	Sun Feb 24 07:15:21 2002
>-+++ Makefile	Wed Mar 13 05:04:51 2002
>+--- Makefile.orig	Sun Aug 18 19:32:26 2002
>++++ Makefile	Mon Sep 30 00:56:00 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
>+ #LIBS = -lnsl -lsocket -lcrypt -lz
> @@ -23,8 +23,8 @@
>  
>  # 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
>+-#CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall -I/usr/local/include
>+-#LIBS = -L/usr/local/lib -lcrypt -lz -lintl
>++CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall -I%%LOCALBASE%%/include
>++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 @@
>+@@ -36,13 +36,12 @@
>  LEX = flex
>  LFLAGS = -B #-f #-p -p -d
>  
>@@ -34,25 +34,47 @@
> -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_PROGRAM = ${BSD_INSTALL_PROGRAM}
>++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
>++INSTALL_DATA = ${BSD_INSTALL_DATA}
>+ INSTALL_DIR = /usr/local
>+ CONF_DIR = /etc
>+-LOCALE_DIR = /usr
>++LOCALE_DIR = /usr/local
>+ 
>+ 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,7 +81,7 @@
>+ 	$(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
>+@@ -90,10 +89,15 @@
>  
>  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
>+ 	$(INSTALL_DATA) po/de.mo $(LOCALE_DIR)/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
>+ 	$(INSTALL_DATA) po/pt_BR.mo $(LOCALE_DIR)/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
>+ 	$(INSTALL_DATA) po/sv.mo $(LOCALE_DIR)/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
>+ 	$(INSTALL_DATA) po/zh_CN.mo $(LOCALE_DIR)/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
>+ 	$(INSTALL_DATA) po/zh_TW.mo $(LOCALE_DIR)/share/locale/zh_TW/LC_MESSAGES/fwlogwatch.mo
>  
>- uninstall:
>+ install-rhinit:
>+@@ -103,7 +107,7 @@
>+ 	@rm -f $(INSTALL_DIR)/sbin/fwlogwatch \
>+ 		$(INSTALL_DIR)/sbin/fwlw_notify \
>+ 		$(INSTALL_DIR)/sbin/fwlw_respond \
>+-		$(INSTALL_DIR)/share/man/man8/fwlogwatch.8 \
>++		$(INSTALL_DIR)/man/man8/fwlogwatch.8 \
>+ 		$(LOCALE_DIR)/share/locale/de/LC_MESSAGES/fwlogwatch.mo \
>+ 		$(LOCALE_DIR)/share/locale/pt_BR/LC_MESSAGES/fwlogwatch.mo \
>+ 		$(LOCALE_DIR)/share/locale/sv/LC_MESSAGES/fwlogwatch.mo \
>
>
>--- /dev/null	Mon Sep 30 01:15:01 2002
>+++ fwlogwatch/files/patch-main.h	Mon Sep 30 00:42:56 2002
>@@ -0,0 +1,11 @@
>+--- main.h.orig	Mon Sep 30 00:39:29 2002
>++++ main.h	Mon Sep 30 00:42:39 2002
>+@@ -11,7 +11,7 @@
>+ 
>+ #define INSTALL_DIR "/usr/local"
>+ #define CONF_DIR "/etc"
>+-#define LOCALE_DIR "/usr"
>++#define LOCALE_DIR "/usr/local"
>+ 
>+ /* i18n */
>+

Actions: View | Diff

Attachments on bug 43506: 25455