Date: Wed, 23 Jun 2010 16:49:32 +0400 (MSD) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mgrooms@shrew.net Subject: ports/148090: [PATCH] security/ike: update to 2.1.5 Message-ID: <201006231249.o5NCnWiU014149@darklight.org.ru> Resent-Message-ID: <201006231250.o5NCo75D031529@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148090 >Category: ports >Synopsis: [PATCH] security/ike: update to 2.1.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jun 23 12:50:07 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r209358: Sun Jun 20 12:00:12 MSD >Description: - Update to 2.1.5 - Use pkg-message - Add rc script for iked - Respect set PREFIX (even if it's not available at configure time, installing to /usr isn't a solution) Added file(s): - pkg-message - files/iked.in - files/patch-CMakeLists.txt Port maintainer (mgrooms@shrew.net) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- ike-2.1.5.patch 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 23 Jun 2010 12:44:33 -0000 @@ -6,8 +6,7 @@ # PORTNAME= ike -PORTVERSION= 2.1.4 -PORTREVISION= 2 +PORTVERSION= 2.1.5 CATEGORIES= security net MASTER_SITES= http://www.shrew.net/download/ike/ DISTNAME= ${PORTNAME}-${PORTVERSION}-release @@ -16,6 +15,8 @@ MAINTAINER= mgrooms@shrew.net COMMENT= Shrew Soft IKE daemon and client tools +USE_RC_SUBR= iked + ONLY_FOR_ARCHS= i386 amd64 USE_BISON= build @@ -54,28 +55,6 @@ LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 .endif -post-patch: -.ifdef(WITH_NATT) - @${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} "===> -------------------------------------------------------------------------" - - @sleep 3 -.endif - post-build: # QT 3.3 UIC (User Interface Compiler) creates these, so remove them. # Otherwise x11-toolkits/qt33 would have to be patched, as Gentoo did. @@ -85,9 +64,8 @@ @${RMDIR} ${LOCALBASE}/etc/settings || ${TRUE} 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"; \ - fi ; + @if [ ! -f {PREFIX}/etc/iked.conf ] ; then \ + ${CP} -p ${PREFIX}/etc/iked.conf.sample ${PREFIX}/etc/iked.conf ; \ + fi .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 23 Jun 2010 12:44:33 -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.5-release.tbz2) = f5ef105d4a755909b130b4f2836ae2d9 +SHA256 (ike-2.1.5-release.tbz2) = ded138da5f6548f99c1c1ebc5323fb87e2147ce83134bb215817533412d3e210 +SIZE (ike-2.1.5-release.tbz2) = 578320 Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-message 23 Jun 2010 12:44:33 -0000 @@ -0,0 +1,17 @@ +You need IPSEC support in your kernel, please see: + +http://www.freebsd.org/doc/en/books/handbook/ipsec.html + +NAT-Traversal functionality: + +For FreeBSD 8.x and newer: + +Add "options IPSEC_NAT_T" to your kernel config file. + +FreeBSD 7.x: + +http://vanhu.free.fr/FreeBSD/patch-natt-freebsd7-2007-10-22.diff + +FreeBSD 6.x: + +http://ipsec-tools.sf.net/freebsd6-natt.diff 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 23 Jun 2010 12:44:33 -0000 @@ -1,10 +1,10 @@ @unexec if cmp -s %D/etc/iked.conf %D/etc/iked.conf.sample; then rm -f %D/etc/iked.conf; fi etc/iked.conf.sample -@exec [ -f %D/etc/iked.conf ] || cp %D/etc/iked.conf.sample %D/etc/iked.conf +@exec if [ ! -f %D/etc/iked.conf ] ; then cp -p %D/%F %D/etc/iked.conf; fi sbin/iked bin/ikea bin/ikec lib/libike.so -lib/libike.so.2.1.4 +lib/libike.so.2.1 lib/libpfk.so -lib/libpfk.so.2.1.4 +lib/libpfk.so.2.1 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 23 Jun 2010 12:44:33 -0000 @@ -0,0 +1,31 @@ +#!/bin/sh +# +# PROVIDE: iked +# REQUIRE: DAEMON +# +# Add the following lines to /etc/rc.conf to enable Internet Key Exchange Daemon: +# +# iked_enable="YES" +# + +. /etc/rc.subr + +name=iked +rcvar=${name}_enable + +command="%%PREFIX%%/sbin/iked" +command_args="-f ${iked_config}" + +load_rc_config ${name} + +: ${iked_enable="NO"} +: ${iked_config="%%PREFIX%%/etc/iked.conf"} + +stop_postcmd="iked_poststop" + +iked_poststop() +{ + rm -f /var/run/ikedi +} + +run_rc_command "$1" Index: files/patch-CMakeLists.txt =================================================================== RCS file: files/patch-CMakeLists.txt diff -N files/patch-CMakeLists.txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-CMakeLists.txt 23 Jun 2010 12:44:33 -0000 @@ -0,0 +1,80 @@ +--- ./CMakeLists.txt.orig 2010-06-23 16:32:36.561885883 +0400 ++++ ./CMakeLists.txt 2010-06-23 16:34:54.800564545 +0400 +@@ -62,40 +62,14 @@ + # Path Option Checks + # + +-if( NOT EXISTS ${CMAKE_INSTALL_PREFIX} ) +- +- set( +- CMAKE_INSTALL_PREFIX +- "/usr" ) +- +-endif( NOT EXISTS ${CMAKE_INSTALL_PREFIX} ) +- + message( + STATUS + "Using install prefix ${CMAKE_INSTALL_PREFIX} ..." ) + + # etc path + +-if( ETCDIR ) +- +- set( PATH_ETC +- ${ETCDIR} ) +- +-else( ETCDIR ) +- +- if( EXISTS ${CMAKE_INSTALL_PREFIX}/etc ) +- +- set( PATH_ETC +- "${CMAKE_INSTALL_PREFIX}/etc" ) +- +- else( EXISTS ${CMAKE_INSTALL_PREFIX}/etc ) +- +- set( PATH_ETC +- "/etc" ) +- +- endif( EXISTS ${CMAKE_INSTALL_PREFIX}/etc ) +- +-endif( ETCDIR ) ++set( PATH_ETC ++ "${CMAKE_INSTALL_PREFIX}/etc" ) + + message( + STATUS +@@ -103,32 +77,8 @@ + + # man path + +-if( MANDIR ) +- +- set( PATH_MAN +- ${MANDIR} ) +- +-else( MANDIR ) +- +- find_path( +- PATH_MAN +- NAMES "man" +- PATHS ${SEARCH_SYS} +- NO_DEFAULT_PATH ) +- +- if( PATH_MAN ) +- +- set( PATH_MAN +- "${PATH_MAN}/man" ) +- +- else( PATH_MAN ) +- +- set( PATH_MAN +- "${CMAKE_INSTALL_PREFIX}/man" ) +- +- endif( PATH_MAN ) +- +-endif( MANDIR ) ++set( PATH_MAN ++ "${CMAKE_INSTALL_PREFIX}/man" ) + + message( + STATUS --- ike-2.1.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006231249.o5NCnWiU014149>