Date: Fri, 8 Oct 2010 01:39:40 -0500 (CDT) From: Matthew Grooms <mgrooms@shrew.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mgrooms@shrew.net Subject: ports/151297: Update security/ike port to ver 2.1.7 Message-ID: <201010080639.o986dePJ070662@ops.shrew.net> Resent-Message-ID: <201010081030.o98AU4Lx067726@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151297 >Category: ports >Synopsis: Update security/ike port to ver 2.1.7 >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: Fri Oct 08 10:30:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Matthew Grooms >Release: FreeBSD 7.2-RELEASE i386 >Organization: Shrew Soft Inc >Environment: System: FreeBSD ops.shrew.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Sun Feb 28 19:54:28 UTC 2010 mgrooms@ops.shrew.net:/usr/src/sys/i386/compile/CUSTOM i386 >Description: Patch to update the port to a new release version. I've tried to submit updates to PR #148090 but I'm not having any luck. >How-To-Repeat: Apply patch. >Fix: --- port-iked-2.1.7.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/ike/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 28 Mar 2010 06:43:21 -0000 1.11 +++ Makefile 8 Oct 2010 06:04:29 -0000 @@ -6,8 +6,8 @@ # PORTNAME= ike -PORTVERSION= 2.1.4 -PORTREVISION= 2 +PORTVERSION= 2.1.7 +PORTREVISION= 1 CATEGORIES= security net MASTER_SITES= http://www.shrew.net/download/ike/ DISTNAME= ${PORTNAME}-${PORTVERSION}-release @@ -18,6 +18,7 @@ ONLY_FOR_ARCHS= i386 amd64 +USE_RC_SUBR= iked USE_BISON= build USE_OPENSSL= yes USE_CMAKE= yes @@ -55,25 +56,23 @@ .endif post-patch: -.ifdef(WITH_NATT) +.if defined(WITH_NATT) +. if ${OSVERSION} < 800000 @${ECHO_MSG} "===> -------------------------------------------------------------------------" - @${ECHO_MSG} "===> ATTENTION: You need a kernel patch to enable NAT-Traversal functionality!" -. if ${OSVERSION} < 600000 - @${ECHO_MSG} "===> There is no known NAT-T patch for FreeBSD 1 - 5!!!" -. endif -. if ${OSVERSION} > 600000 && ${OSVERSION} < 699999 - @${ECHO_MSG} "===> http://ipsec-tools.sf.net/freebsd6-natt.diff" -. endif -. if ${OSVERSION} > 700000 && ${OSVERSION} < 799999 - @${ECHO_MSG} "===> http://vanhu.free.fr/FreeBSD/patch-natt-freebsd7-2007-10-22.diff" -. endif -. if ${OSVERSION} > 800000 - @${ECHO_MSG} "===> http://vanhu.free.fr/FreeBSD/patch-natt-freebsd-HEAD-2007-10-22.diff" -. endif - @${ECHO_MSG} "===> You might possibly have to do some steps manually if it fails to apply." + @${ECHO_MSG} "===> WARNING: You will need to patch your kernel for NAT-T functionality!" +. if ${OSVERSION} < 600000 + @${ECHO_MSG} "===> There is no known NAT-T patch for FreeBSD 1 - 5!!!" +. endif +. if ${OSVERSION} > 600000 && ${OSVERSION} < 699999 + @${ECHO_MSG} "===> http://ipsec-tools.sf.net/freebsd6-natt.diff" +. endif +. if ${OSVERSION} > 700000 && ${OSVERSION} < 799999 + @${ECHO_MSG} "===> http://people.freebsd.org/~vanhu/NAT-T/patch-natt-7.2-2009-05-12.diff" +. endif + @${ECHO_MSG} "===> You may need to edit the patch if it fails to apply cleanly." @${ECHO_MSG} "===> -------------------------------------------------------------------------" - @sleep 3 +. endif .endif post-build: @@ -86,8 +85,17 @@ post-install: @if ! ${SYSCTL} -a | ${GREP} -q ipsec; then \ - ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \ - ${ECHO_MSG} " You must configure a kernel with this option to use this software"; \ + ${ECHO_MSG} "===> -------------------------------------------------------------------------"; \ + ${ECHO_MSG} "===> WARNNG: You need IPsec support in your kernel, please see:"; \ + ${ECHO_MSG} "===> http://www.freebsd.org/doc/en/books/handbook/ipsec.html"; \ + ${ECHO_MSG} "===> -------------------------------------------------------------------------"; \ fi ; +.if defined(WITH_NATT) + @${ECHO_MSG} "===> -------------------------------------------------------------------------" + @${ECHO_MSG} "===> WARNING: To use NAT Traversal ( NAT-T ) support, please be sure to" + @${ECHO_MSG} "===> include the following line in your kernel config file." + @${ECHO_MSG} "===> options IPSEC_NAT_T" + @${ECHO_MSG} "===> -------------------------------------------------------------------------" +.endif .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/security/ike/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 23 Jul 2009 14:37:53 -0000 1.5 +++ distinfo 8 Oct 2010 06:04:29 -0000 @@ -1,3 +1,3 @@ -MD5 (ike-2.1.4-release.tbz2) = 1b855717698ba62781284b202aa72a98 -SHA256 (ike-2.1.4-release.tbz2) = 8c587e71af361ecb383c99dea0ae01b45f6206a23de8d113c75e996729dc5677 -SIZE (ike-2.1.4-release.tbz2) = 575785 +MD5 (ike-2.1.7-release.tbz2) = bc86e101809fc750013e18480c8c1040 +SHA256 (ike-2.1.7-release.tbz2) = 28e64efcec165522a775657a6c2c2263a3d03a78b114f62f5e30f4d38602edba +SIZE (ike-2.1.7-release.tbz2) = 581284 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/ike/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 23 Jul 2009 14:37:53 -0000 1.5 +++ pkg-plist 8 Oct 2010 06:04:29 -0000 @@ -5,6 +5,6 @@ bin/ikea bin/ikec lib/libike.so -lib/libike.so.2.1.4 +lib/libike.so.2.1.7 lib/libpfk.so -lib/libpfk.so.2.1.4 +lib/libpfk.so.2.1.7 Index: files/iked.in =================================================================== RCS file: files/iked.in diff -N files/iked.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/iked.in 8 Oct 2010 06:04:29 -0000 @@ -0,0 +1,29 @@ +#!/bin/sh +# +# rc.d script for iked +# +# $Id$ + +# PROVIDE: iked +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable iked: +# +# #required +# iked_enable="YES" +# + +. "/etc/rc.subr" + +# defaults +iked_enable=${iked_enable:-"NO"} + +name=iked +rcvar=`set_rcvar` +load_rc_config $name +command=/usr/local/sbin/iked +command_args="-p /var/run/iked.pid > /dev/null" + +run_rc_command "$1" Index: files/patch-source_iked_conf.parse.yy =================================================================== RCS file: files/patch-source_iked_conf.parse.yy diff -N files/patch-source_iked_conf.parse.yy --- files/patch-source_iked_conf.parse.yy 6 Mar 2009 12:04:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- source/iked/conf.parse.yy.orig 2008-06-10 04:24:20.000000000 +0200 -+++ source/iked/conf.parse.yy 2009-03-06 11:40:56.000000000 +0100 -@@ -43,7 +43,7 @@ - %defines - %define "parser_class_name" "conf_parser" - --%{ -+%code requires { - - #include <string> - -@@ -51,7 +51,7 @@ - - typedef class _IKED IKED; - --%} -+} - - // The parsing context. - %parse-param { IKED & iked } --- port-iked-2.1.7.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010080639.o986dePJ070662>