Make fetchable again.

Update 1.1 --> 1.5

Assume responsiblity for care and feeding of this port.

8 files changed, 93 insertions, 54 deletions

diff --git a/security/fwlogwatch/Makefile b/security/fwlogwatch/Makefile
index be4a852a895f..fa1869620cfb 100644
--- a/security/fwlogwatch/Makefile
+++ b/security/fwlogwatch/Makefile
@@ -2,16 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	fwlogwatch
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.5
 CATEGORIES=	security
-MASTER_SITES=	http://www.kybs.de/boris/sw/
+MASTER_SITES=	http://fwlogwatch.inside-security.de/sw/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Packet filter and firewall log analyzer
 
-BROKEN=		unfetchable
-
 USES=		gettext tar:bzip2
 MAKE_ENV=	MKDIR="${MKDIR}"
 INSTALL_TARGET=	install install-config install-i18n
diff --git a/security/fwlogwatch/distinfo b/security/fwlogwatch/distinfo
index 8d71f2f9eead..0bf5c52c3c84 100644
--- a/security/fwlogwatch/distinfo
+++ b/security/fwlogwatch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fwlogwatch-1.1.tar.bz2) = 9908ef51f79aa069b31851e23550d5bfacb4583fc3569f87ad1a0957c974ba7f
-SIZE (fwlogwatch-1.1.tar.bz2) = 90341
+SHA256 (fwlogwatch-1.5.tar.bz2) = 0c8c9465b9d6c653b26492028bb040f60987804dfc53e480cb8cfde62cb72b1d
+SIZE (fwlogwatch-1.5.tar.bz2) = 94451
diff --git a/security/fwlogwatch/files/patch-Makefile b/security/fwlogwatch/files/patch-Makefile
index e467f1b5c666..b620777a0045 100644
--- a/security/fwlogwatch/files/patch-Makefile
+++ b/security/fwlogwatch/files/patch-Makefile
@@ -1,59 +1,53 @@
---- Makefile.orig	2006-03-08 20:36:02.000000000 +0100
-+++ Makefile	2014-07-08 21:18:54.475126894 +0200
-@@ -2,10 +2,10 @@
- # $Id: Makefile,v 1.76 2006/03/08 19:36:02 bw Exp $
+--- Makefile.orig	2016-02-19 06:35:50.592222000 -0800
++++ Makefile	2016-04-21 19:29:52.738338000 -0700
+@@ -11,10 +11,10 @@
+ # -DHAVE_GEOIP enables support for GeoIP database lookups.
  
  # Linux
 -CC = gcc
 -CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
--LDFLAGS = #-g #-static -p
--LIBS = -lcrypt -lz #-ladns #-lc_p
+-LDFLAGS = -s #-g #-static -p
+-LIBS = -lcrypt -lz #-ladns -lGeoIP #-lc_p
 +#CC = gcc
 +#CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall #-pedantic -Wpointer-arith #-g #-p
-+#LDFLAGS = #-g #-static -p
-+#LIBS = -lcrypt -lz #-ladns #-lc_p
++#LDFLAGS = -s #-g #-static -p
++#LIBS = -lcrypt -lz #-ladns -lGeoIP #-lc_p
  
- # Solaris
- #LIBS = -lnsl -lsocket -lcrypt -lz
-@@ -26,6 +26,12 @@
+ # Mac OS X
  #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=\"${PREFIX}\" \
-+	-DCONF_DIR=\"${PREFIX}/etc\" \
-+	-DLOCALE_DIR=\"${PREFIX}\"
-+LIBS = -L${LOCALBASE}/lib -lcrypt -lz -lintl
+@@ -37,21 +37,21 @@
+ #LIBS = -L/usr/local/lib -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 ipchains.
-@@ -39,12 +45,18 @@
- LFLAGS = -B #-f #-p -p -d
+ # FreeBSD
+-#CC = gcc
+-#CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall -I/usr/local/include
+-#LIBS = -L/usr/local/lib -lcrypt -lz -lintl
++CC = cc
++CFLAGS = -DHAVE_ZLIB -DHAVE_GETTEXT -pipe -O2 -Wall -I/usr/local/include
++LIBS = -L/usr/local/lib -lcrypt -lz -lintl
  
- INSTALL = install
--INSTALL_PROGRAM = $(INSTALL) -s -m 0755
+ 
+ LEX = flex
+ LFLAGS = -B --nounput #-f #-p -p -d
+ 
+-INSTALL = install
+-INSTALL_PROGRAM = $(INSTALL) -m 0755
 -INSTALL_SCRIPT = $(INSTALL) -m 0755
 -INSTALL_DATA = $(INSTALL) -m 0644
 -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}
 +INSTALL_DIR = ${DESTDIR}${PREFIX}
 +CONF_DIR = ${INSTALL_DIR}/etc
 +LOCALE_DIR = ${INSTALL_DIR}
++
  
  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 \
-@@ -86,19 +98,25 @@
+@@ -89,18 +89,24 @@
  	$(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
@@ -62,28 +56,30 @@
  
  install-config:
  	$(INSTALL_DATA) fwlogwatch.config $(CONF_DIR)/fwlogwatch.config
- 	$(INSTALL_DATA) fwlogwatch.template $(CONF_DIR)/fwlogwatch.template
  
  install-i18n:
 -	cd po; make
 +	cd po; $(MAKE)
-+	${MKDIR} $(LOCALE_DIR)/share/locale/de/LC_MESSAGES
++	$(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/ja/LC_MESSAGES
++	$(MKDIR) $(LOCALE_DIR)/share/locale/ja/LC_MESSAGES
  	$(INSTALL_DATA) po/ja.mo $(LOCALE_DIR)/share/locale/ja/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
++	$(MKDIR) $(LOCALE_DIR)/share/locale/pt/LC_MESSAGES
+ 	$(INSTALL_DATA) po/pt.mo $(LOCALE_DIR)/share/locale/pt/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
++	$(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
++	$(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
  
  install-rhinit:
-@@ -120,4 +138,4 @@
+@@ -121,7 +127,7 @@
  
  clean:
  	rm -f *.o *~ *.bak fwlogwatch
 -	cd po; make clean
 +	cd po; $(MAKE) clean
+ 
+ indent:
+ 	indent --k-and-r-style --indent-level 2 --line-length 180 *.c *.h
diff --git a/security/fwlogwatch/files/patch-main.h b/security/fwlogwatch/files/patch-main.h
index 64b638da16da..888039c8e704 100644
--- a/security/fwlogwatch/files/patch-main.h
+++ b/security/fwlogwatch/files/patch-main.h
@@ -1,6 +1,6 @@
---- main.h.orig	Sun Mar 23 02:41:37 2003
-+++ main.h	Mon Mar 31 10:37:08 2003
-@@ -9,9 +9,15 @@
+--- main.h.orig	2016-02-19 06:57:49.938584000 -0800
++++ main.h	2016-04-21 19:31:22.393058000 -0700
+@@ -10,9 +10,15 @@
  
  /* Paths */
  
@@ -16,3 +16,13 @@
  
  /* i18n */
  
+@@ -377,7 +383,9 @@
+ /* Data structures */
+ 
+ #include <time.h>
++#define _KERNEL
+ #include <netinet/in.h>
++#undef _KERNEL
+ 
+ struct log_line {
+   time_t time;
diff --git a/security/fwlogwatch/files/patch-resolve.c b/security/fwlogwatch/files/patch-resolve.c
new file mode 100644
index 000000000000..29f2947a8b64
--- /dev/null
+++ b/security/fwlogwatch/files/patch-resolve.c
@@ -0,0 +1,12 @@
+--- resolve.c.orig	2016-02-19 06:35:50.592222000 -0800
++++ resolve.c	2016-04-21 19:32:37.383666000 -0700
+@@ -5,7 +5,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++#define _KERNEL
+ #include <netinet/in.h>
++#undef _KERNEL
+ #include <arpa/inet.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
diff --git a/security/fwlogwatch/files/patch-utils.c b/security/fwlogwatch/files/patch-utils.c
new file mode 100644
index 000000000000..5a0374545271
--- /dev/null
+++ b/security/fwlogwatch/files/patch-utils.c
@@ -0,0 +1,13 @@
+--- utils.c.orig	2016-02-19 06:35:50.592222000 -0800
++++ utils.c	2016-04-21 19:36:08.436094000 -0700
+@@ -9,7 +9,10 @@
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <sys/socket.h>
++#define _KERNEL
+ #include <netinet/in.h>
++#undef _KERNEL
+ #include <arpa/inet.h>
+ #include <stdarg.h>
+ #include "main.h"
diff --git a/security/fwlogwatch/files/patch-whois.c b/security/fwlogwatch/files/patch-whois.c
new file mode 100644
index 000000000000..95bd9c3f7900
--- /dev/null
+++ b/security/fwlogwatch/files/patch-whois.c
@@ -0,0 +1,12 @@
+--- whois.c.orig	2016-02-19 06:35:50.592222000 -0800
++++ whois.c	2016-04-21 19:33:49.670304000 -0700
+@@ -14,7 +14,9 @@
+ #include <strings.h>
+ #endif
+ 
++#define _KERNEL
+ #include <netinet/in.h>
++#undef _KERNEL
+ #include <arpa/inet.h>
+ #include "main.h"
+ #include "utils.h"
diff --git a/security/fwlogwatch/pkg-plist b/security/fwlogwatch/pkg-plist
index 8d2fc649ab69..665886392b2d 100644
--- a/security/fwlogwatch/pkg-plist
+++ b/security/fwlogwatch/pkg-plist
@@ -1,5 +1,4 @@
 etc/fwlogwatch.config
-etc/fwlogwatch.template
 etc/rc.d/fwlogwatch.sh.sample
 man/man8/fwlogwatch.8.gz
 sbin/fwlogwatch
@@ -7,7 +6,7 @@ sbin/fwlw_notify
 sbin/fwlw_respond
 share/locale/de/LC_MESSAGES/fwlogwatch.mo
 share/locale/ja/LC_MESSAGES/fwlogwatch.mo
-share/locale/pt_BR/LC_MESSAGES/fwlogwatch.mo
+share/locale/pt/LC_MESSAGES/fwlogwatch.mo
 share/locale/sv/LC_MESSAGES/fwlogwatch.mo
 share/locale/zh_TW/LC_MESSAGES/fwlogwatch.mo
 share/locale/zh_CN/LC_MESSAGES/fwlogwatch.mo