CVS commit: pkgsrc/security/racoon2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 28 12:50:20 UTC 2019

Modified Files:
        pkgsrc/security/racoon2: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/racoon2/patches: patch-samples_Makefile.in

Log Message:
racoon2: update to 20180701nb3.

Install config files in examples directory.
Fixes installation which did not use DESTDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/racoon2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/racoon2/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/racoon2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/racoon2/patches/patch-samples_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/racoon2/Makefile
diff -u pkgsrc/security/racoon2/Makefile:1.17 pkgsrc/security/racoon2/Makefile:1.18
--- pkgsrc/security/racoon2/Makefile:1.17       Mon Nov  4 21:13:01 2019
+++ pkgsrc/security/racoon2/Makefile    Sat Dec 28 12:50:19 2019
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2019/11/04 21:13:01 rillig Exp $
-#
-
-PKGREVISION=           2
-CATEGORIES=            security net
-#DISTNAME=             racoon2-20100526a
-#MASTER_SITES=         ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
-#EXTRACT_SUFX=         .tgz
+# $NetBSD: Makefile,v 1.18 2019/12/28 12:50:19 wiz Exp $
 
 DISTNAME=              racoon2
 PKGNAME=               racoon2-20180701
+PKGREVISION=           3
+CATEGORIES=            security net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=zoulasc/}
 GITHUB_PROJECT=                racoon2
 GITHUB_TAG=            b2a193fc9875d1fb89c0a51690745379bc135fcf
@@ -70,7 +65,6 @@ RCD_SCRIPT_SRC.iked=  ${WRKSRC}/samples/r
 RCD_SCRIPT_SRC.kinkd=  ${WRKSRC}/samples/rc.d-kinkd
 RCD_SCRIPT_SRC.spmd=   ${WRKSRC}/samples/rc.d-spmd
 RCD_SCRIPT_SRC.racoon2=        ${WRKSRC}/samples/rc.d-racoon2
-CONFIGURE_ARGS+=       --disable-startup-scripts
 
 SAMPLE_CONFS=          default.conf racoon2.conf vals.conf \
                        transport_ike.conf tunnel_ike.conf \

Index: pkgsrc/security/racoon2/PLIST
diff -u pkgsrc/security/racoon2/PLIST:1.4 pkgsrc/security/racoon2/PLIST:1.5
--- pkgsrc/security/racoon2/PLIST:1.4   Sun Jun  7 03:43:53 2015
+++ pkgsrc/security/racoon2/PLIST       Sat Dec 28 12:50:19 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/06/07 03:43:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/28 12:50:19 wiz Exp $
 ${IKED}man/man8/iked.8
 ${KINKD}man/man8/kinkd.8
 man/man8/pskgen.8
@@ -10,39 +10,44 @@ sbin/pskgen
 sbin/spmd
 sbin/spmdctl
 share/doc/racoon2/COPYRIGHT
-share/doc/racoon2/README
-share/doc/racoon2/NEWS
 share/doc/racoon2/INSTALL
+share/doc/racoon2/NEWS
+share/doc/racoon2/README
 share/doc/racoon2/USAGE
 share/doc/racoon2/cfg-usage.txt
 share/doc/racoon2/config-usage.txt
 share/examples/racoon2/default.conf
-share/examples/racoon2/racoon2.conf
-share/examples/racoon2/vals.conf
-share/examples/racoon2/transport_ike.conf
-share/examples/racoon2/tunnel_ike.conf
-share/examples/racoon2/tunnel_ike_natt.conf
-share/examples/racoon2/transport_kink.conf
-share/examples/racoon2/tunnel_kink.conf
-share/examples/racoon2/local-test.conf
-share/examples/racoon2/hook/functions
-share/examples/racoon2/hook/child-up
-share/examples/racoon2/hook/child-up.d/00childup_sample
+share/examples/racoon2/default.conf.sample
 share/examples/racoon2/hook/child-down
 share/examples/racoon2/hook/child-rekey
-share/examples/racoon2/hook/ikesa-up
-share/examples/racoon2/hook/ikesa-up.d/00ikesaup_sample
+share/examples/racoon2/hook/child-up
+share/examples/racoon2/hook/child-up.d/00childup_sample
+share/examples/racoon2/hook/functions
 share/examples/racoon2/hook/ikesa-down
 share/examples/racoon2/hook/ikesa-rekey
+share/examples/racoon2/hook/ikesa-up
+share/examples/racoon2/hook/ikesa-up.d/00ikesaup_sample
 share/examples/racoon2/hook/migration
-share/examples/racoon2/hook/ph1-up
 share/examples/racoon2/hook/ph1-down
-@pkgdir share/examples/racoon2/hook/child-down.d
-@pkgdir share/examples/racoon2/hook/child-rekey.d
-@pkgdir share/examples/racoon2/hook/ikesa-down.d
-@pkgdir share/examples/racoon2/hook/ikesa-rekey.d
-@pkgdir share/examples/racoon2/hook/migration.d
-@pkgdir share/examples/racoon2/hook/ph1-up.d
-@pkgdir share/examples/racoon2/hook/ph1-down.d
+share/examples/racoon2/hook/ph1-up
+share/examples/racoon2/init.d/iked
+share/examples/racoon2/init.d/kinkd
+share/examples/racoon2/init.d/spmd
+share/examples/racoon2/local-test.conf
+share/examples/racoon2/local-test.conf.sample
+share/examples/racoon2/racoon2.conf
+share/examples/racoon2/racoon2.conf.sample
+share/examples/racoon2/transport_ike.conf
+share/examples/racoon2/transport_ike.conf.sample
+share/examples/racoon2/transport_kink.conf
+share/examples/racoon2/transport_kink.conf.sample
+share/examples/racoon2/tunnel_ike.conf
+share/examples/racoon2/tunnel_ike.conf.sample
+share/examples/racoon2/tunnel_ike_natt.conf
+share/examples/racoon2/tunnel_ike_natt.conf.sample
+share/examples/racoon2/tunnel_kink.conf
+share/examples/racoon2/tunnel_kink.conf.sample
+share/examples/racoon2/vals.conf
+share/examples/racoon2/vals.conf.sample
 @exec %D/sbin/pskgen -r -o ${PKG_SYSCONFDIR}/spmd.pwd
 @unexec ${RM} ${PKG_SYSCONFDIR}/spmd.pwd

Index: pkgsrc/security/racoon2/distinfo
diff -u pkgsrc/security/racoon2/distinfo:1.7 pkgsrc/security/racoon2/distinfo:1.8
--- pkgsrc/security/racoon2/distinfo:1.7        Sun Jul  1 15:47:17 2018
+++ pkgsrc/security/racoon2/distinfo    Sat Dec 28 12:50:19 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2018/07/01 15:47:17 christos Exp $
+$NetBSD: distinfo,v 1.8 2019/12/28 12:50:19 wiz Exp $
 
 SHA1 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = 5f36bf656682f794d933584485296c2556500536
 RMD160 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = ad6c26b5a2f818bc38989bf687f4a623b995c0df
 SHA512 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = b3dcbe43f7f2454f0befd4434a9335df6063e4468924d8c6ab22c960dc45802c7733f0e8720b2674666fbe953309668221352ee25c6bb1ffaafc7eab4666ce49
 Size (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = 1144364 bytes
+SHA1 (patch-samples_Makefile.in) = e86ae807d4d0e51e862eda67d7f555eb3ce27015

Added files:

Index: pkgsrc/security/racoon2/patches/patch-samples_Makefile.in
diff -u /dev/null pkgsrc/security/racoon2/patches/patch-samples_Makefile.in:1.1
--- /dev/null   Sat Dec 28 12:50:20 2019
+++ pkgsrc/security/racoon2/patches/patch-samples_Makefile.in   Sat Dec 28 12:50:19 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-samples_Makefile.in,v 1.1 2019/12/28 12:50:19 wiz Exp $
+
+Install config into examples directory.
+
+--- samples/Makefile.in.orig   2018-07-01 15:39:24.000000000 +0000
++++ samples/Makefile.in
+@@ -2,7 +2,7 @@
+ 
+ srcdir=@srcdir@
+ prefix=@prefix@
+-sysconfdir=@sysconfdir@
++sysconfdir=${DESTDIR}${PREFIX}/share/examples/racoon2
+ datarootdir=@datarootdir@  
+ INSTALL =@INSTALL@ @INSTALL_OPTS@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@