svn commit: r307863 - in head/security/fwknop: . files

Raphael Kubo da Costa rakuco at FreeBSD.org
Tue Nov 27 21:41:30 UTC 2012 

Author: rakuco
Date: Tue Nov 27 21:41:29 2012
New Revision: 307863
URL: http://svnweb.freebsd.org/changeset/ports/307863

Log:
  Update to 2.0.3.
  
  This new version includes a migration from Perl to C and support for
  ipfw and pf.
  
  While here, trim the Makefile headers.
  
  PR:		ports/171951
  Submitted by:	Sean Greven <sean.greven at gmail.com> (maintainer)
  Feature safe:	yes

Added:
  head/security/fwknop/files/fwknopd.in   (contents, props changed)
Deleted:
  head/security/fwknop/files/patch-access.conf
  head/security/fwknop/files/patch-fwknop
  head/security/fwknop/files/patch-fwknop.8
  head/security/fwknop/files/patch-fwknop.conf
  head/security/fwknop/files/patch-fwknop_serv
  head/security/fwknop/files/patch-fwknopd
  head/security/fwknop/files/patch-fwknopd.8
  head/security/fwknop/files/patch-init-scripts-fwknop-init.freebsd
  head/security/fwknop/files/patch-install.pl
  head/security/fwknop/files/patch-knopmd.8
  head/security/fwknop/files/patch-knopmd.c
  head/security/fwknop/files/patch-knopmd.conf
  head/security/fwknop/files/patch-knopspoof
  head/security/fwknop/files/patch-knoptm
  head/security/fwknop/files/patch-knopwatchd.8
  head/security/fwknop/files/patch-knopwatchd.c
Modified:
  head/security/fwknop/Makefile
  head/security/fwknop/distinfo
  head/security/fwknop/pkg-plist

Modified: head/security/fwknop/Makefile
==============================================================================
--- head/security/fwknop/Makefile	Tue Nov 27 21:34:53 2012	(r307862)
+++ head/security/fwknop/Makefile	Tue Nov 27 21:41:29 2012	(r307863)
@@ -1,61 +1,28 @@
-# New ports collection makefile for:	fwknop
-#
-# Date created:				23 Nov 2007
-# Whom:					Sean Greven<sean.greven at gmail.com>
-#
+# Created by: Sean Greven <sean.greven at gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	fwknop
-PORTVERSION=	1.8.3
-PORTREVISION=	2
+PORTVERSION=	2.0.3
 CATEGORIES=	security
 MASTER_SITES=	http://www.cipherdyne.org/fwknop/download/
 
 MAINTAINER=	sean.greven at gmail.com
 COMMENT=	SPA implementation for Linux and FreeBSD
 
-BUILD_DEPENDS=	p5-Net-IPv4Addr>=0:${PORTSDIR}/net-mgmt/p5-Net-IPv4Addr \
-		p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP \
-		p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket \
-		p5-Net-Ping-External>=0:${PORTSDIR}/net/p5-Net-Ping-External
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-MAN8=		fwknop.8 fwknopd.8 knopmd.8 knopwatchd.8
-MANCOMPRESSED=	yes
-
-NO_BUILD=	yes
-IS_INTERACTIVE=	yes
-USE_PERL5_BUILD=yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/access.conf
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/fwknop
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/fwknop.8
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/fwknop.conf
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/fwknop_serv
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/fwknopd
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/fwknopd.8
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knopmd.8
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knopmd.c
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knopmd.conf
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knopspoof
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knoptm
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knopwatchd.8
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/knopwatchd.c
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/init-scripts/fwknop-init.freebsd
-
-do-install:
-	cd ${WRKSRC} && ./install.pl
-	@${ECHO_MSG} "Configuration files in ${LOCALBASE}/etc/fwknop";
+OPTIONS_DEFINE=		GPGME
+OPTIONS_DEFAULT=	GPGME
+GPGME_DESC=	Build support for gpgme
+MAN8=		fwknop.8 fwknopd.8
+INFO=		libfko
+MANCOMPRESSED=	no
+GNU_CONFIGURE=	yes
+USE_RC_SUBR=	fwknopd
+USE_LDCONFIG=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGPGME}
+BUILD_DEPENDS+=	gpgme:${PORTSDIR}/security/gpgme
+.endif
 
 .include <bsd.port.mk>

Modified: head/security/fwknop/distinfo
==============================================================================
--- head/security/fwknop/distinfo	Tue Nov 27 21:34:53 2012	(r307862)
+++ head/security/fwknop/distinfo	Tue Nov 27 21:41:29 2012	(r307863)
@@ -1,2 +1,2 @@
-SHA256 (fwknop-1.8.3.tar.gz) = 366dbb0c9ae38973cee960408eb1a76ed6ff544f15855affaed93331face9491
-SIZE (fwknop-1.8.3.tar.gz) = 471949
+SHA256 (fwknop-2.0.3.tar.gz) = f7f306a66c641020e7c7a820eaa3743e2700ddee6e26cca37440db95df56b986
+SIZE (fwknop-2.0.3.tar.gz) = 904769

Added: head/security/fwknop/files/fwknopd.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/fwknop/files/fwknopd.in	Tue Nov 27 21:41:29 2012	(r307863)
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: fwknopd
+# REQUIRE: LOGIN
+
+#
+# Add the following lines to /etc/rc.conf to enable fwknopd:
+#
+# fwknopd_enable="YES"
+#
+# See fwknopd(8) for flags
+#
+
+. /etc/rc.subr
+
+name=fwknopd
+rcvar=fwknopd_enable
+
+command=%%PREFIX%%/sbin/fwknopd
+required_files=%%PREFIX%%/etc/fwknop/access.conf
+
+start_precmd=start_precmd
+stop_postcmd=stop_postcmd
+
+extra_commands="reload"
+
+start_precmd()
+{
+}
+
+stop_postcmd()
+{
+}
+
+# read settings, set default values
+load_rc_config $name
+: ${fwknopd_enable="NO"}
+
+run_rc_command "$1"

Modified: head/security/fwknop/pkg-plist
==============================================================================
--- head/security/fwknop/pkg-plist	Tue Nov 27 21:34:53 2012	(r307862)
+++ head/security/fwknop/pkg-plist	Tue Nov 27 21:41:29 2012	(r307863)
@@ -1,44 +1,10 @@
 bin/fwknop
-sbin/fwknop_serv
+%%ETCDIR%%/access.conf
+%%ETCDIR%%/fwknopd.conf
+include/fko.h
+lib/libfko.a
+lib/libfko.la
+lib/libfko.so
+lib/libfko.so.0
 sbin/fwknopd
-sbin/knopmd
-sbin/knoptm
-sbin/knopwatchd
-
-etc/fwknop/access.conf
-etc/fwknop/fwknop.conf
-etc/fwknop/pf.os
-etc/rc.d/fwknop
-
-lib/fwknop/NetPacket.pm
-lib/fwknop/NetPacket/ARP.pm
-lib/fwknop/NetPacket/Ethernet.pm
-lib/fwknop/NetPacket/ICMP.pm
-lib/fwknop/NetPacket/IGMP.pm
-lib/fwknop/NetPacket/IP.pm
-lib/fwknop/NetPacket/TCP.pm
-lib/fwknop/NetPacket/UDP.pm
-lib/fwknop/i386-freebsd-64int/auto/NetPacket/.packlist
-lib/fwknop/i386-freebsd-64int/perllocal.pod
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::ARP.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::Ethernet.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::ICMP.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::IGMP.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::IP.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::TCP.3
-lib/fwknop/lib/perl5/5.8.8/man/man3/NetPacket::UDP.3
-
- at dirrm lib/fwknop/lib/perl5/5.8.8/man/man3
- at dirrm lib/fwknop/lib/perl5/5.8.8/man
- at dirrm lib/fwknop/lib/perl5/5.8.8
- at dirrm lib/fwknop/lib/perl5
- at dirrm lib/fwknop/lib
- at dirrm lib/fwknop/i386-freebsd-64int/auto/NetPacket
- at dirrm lib/fwknop/i386-freebsd-64int/auto
- at dirrm lib/fwknop/i386-freebsd-64int
- at dirrm lib/fwknop/NetPacket
- at dirrm lib/fwknop
- at dirrm etc/fwknop/archive
- at dirrm etc/fwknop
-
+ at dirrm %%ETCDIR%%

More information about the svn-ports-all mailing list