CVS commit: pkgsrc/security/racoon2

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 22 12:21:46 UTC 2026

Modified Files:
        pkgsrc/security/racoon2: Makefile distinfo options.mk
        pkgsrc/security/racoon2/patches: patch-samples_Makefile.in

Log Message:
racoon2: fix installation as non-root user

While here, adapt paths for non-default var, set LICENSE,
and remove unknown configure options.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/racoon2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/racoon2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/racoon2/options.mk
cvs rdiff -u -r1.1 -r1.2 \
    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.28 pkgsrc/security/racoon2/Makefile:1.29
--- pkgsrc/security/racoon2/Makefile:1.28       Mon Feb  2 20:23:09 2026
+++ pkgsrc/security/racoon2/Makefile    Tue Sep 22 12:21:46 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2026/02/02 20:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/09/22 12:21:46 wiz Exp $
 
 DISTNAME=              racoon2
 PKGNAME=               racoon2-20180701
-PKGREVISION=           11
+PKGREVISION=           12
 CATEGORIES=            security net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=zoulasc/}
 GITHUB_PROJECT=                racoon2
@@ -11,6 +11,7 @@ GITHUB_TAG=           b2a193fc9875d1fb89c0a516907
 MAINTAINER=            kamada%nanohz.org@localhost
 #HOMEPAGE=             http://www.racoon2.wide.ad.jp/
 COMMENT=               IPsec key management system (IKEv2, IKEv1, and KINK)
+LICENSE=               modified-bsd
 
 GNU_CONFIGURE=         yes
 INSTALL_UNSTRIPPED=    yes
@@ -64,10 +65,19 @@ CONF_FILES_PERMS+=  ${EGDIR}/racoon2.conf
                                ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
 CONF_FILES_PERMS+=     ${EGDIR}/vals.conf ${PKG_SYSCONFDIR}/vals.conf \
                                ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 600
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR} --enable-natt
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 MAKE_DIRS_PERMS+=      ${VARBASE}/run/racoon2 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
+SUBST_CLASSES+=                var
+SUBST_SED.var+=                -e "s,/var/run/racoon2,${VARBASE}/run/racoon2,"
+SUBST_FILES.var+=      samples/init.d-spmd.in
+SUBST_FILES.var+=      samples/racoon2.conf.in
+SUBST_FILES.var+=      samples/init.d-spmd.in
+SUBST_FILES.var+=      samples/rc.d-spmd.in
+SUBST_STAGE.var=       pre-configure
+SUBST_MESSAGE.var=     Adapt path to /var for pkgsrc.
+
 RCD_SCRIPTS=           iked kinkd spmd racoon2
 RCD_SCRIPT_SRC.iked=   ${WRKSRC}/samples/rc.d-iked
 RCD_SCRIPT_SRC.kinkd=  ${WRKSRC}/samples/rc.d-kinkd

Index: pkgsrc/security/racoon2/distinfo
diff -u pkgsrc/security/racoon2/distinfo:1.10 pkgsrc/security/racoon2/distinfo:1.11
--- pkgsrc/security/racoon2/distinfo:1.10       Tue Oct 26 11:17:52 2021
+++ pkgsrc/security/racoon2/distinfo    Tue Sep 22 12:21:46 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:17:52 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/09/22 12:21:46 wiz Exp $
 
 BLAKE2s (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = fa3c58e31c07e8cd5a91fa6235e9c452ac1d562190e26ef5fc92a5f568eb9f11
 SHA512 (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = b3dcbe43f7f2454f0befd4434a9335df6063e4468924d8c6ab22c960dc45802c7733f0e8720b2674666fbe953309668221352ee25c6bb1ffaafc7eab4666ce49
 Size (racoon2-b2a193fc9875d1fb89c0a51690745379bc135fcf.tar.gz) = 1144364 bytes
-SHA1 (patch-samples_Makefile.in) = e86ae807d4d0e51e862eda67d7f555eb3ce27015
+SHA1 (patch-samples_Makefile.in) = 654718ebb1d0d35499b8c0a58149d1a468a7f579

Index: pkgsrc/security/racoon2/options.mk
diff -u pkgsrc/security/racoon2/options.mk:1.2 pkgsrc/security/racoon2/options.mk:1.3
--- pkgsrc/security/racoon2/options.mk:1.2      Fri Feb 26 09:41:06 2016
+++ pkgsrc/security/racoon2/options.mk  Tue Sep 22 12:21:46 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/02/26 09:41:06 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2026/09/22 12:21:46 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.racoon2
 PKG_SUPPORTED_OPTIONS= iked kinkd
@@ -27,5 +27,3 @@ PLIST_SUBST+=         KINKD=""
 CONFIGURE_ARGS+=       --disable-kinkd
 PLIST_SUBST+=          KINKD="@comment "
 .endif
-
-CONFIGURE_ARGS.Darwin+=        --disable-natt

Index: pkgsrc/security/racoon2/patches/patch-samples_Makefile.in
diff -u pkgsrc/security/racoon2/patches/patch-samples_Makefile.in:1.1 pkgsrc/security/racoon2/patches/patch-samples_Makefile.in:1.2
--- pkgsrc/security/racoon2/patches/patch-samples_Makefile.in:1.1       Sat Dec 28 12:50:19 2019
+++ pkgsrc/security/racoon2/patches/patch-samples_Makefile.in   Tue Sep 22 12:21:46 2026
@@ -1,10 +1,11 @@
-$NetBSD: patch-samples_Makefile.in,v 1.1 2019/12/28 12:50:19 wiz Exp $
+$NetBSD: patch-samples_Makefile.in,v 1.2 2026/09/22 12:21:46 wiz Exp $
 
 Install config into examples directory.
+Let pkgsrc infrastructure create directory.
 
 --- samples/Makefile.in.orig   2018-07-01 15:39:24.000000000 +0000
 +++ samples/Makefile.in
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,7 @@ prefix=@prefix@
  
  srcdir=@srcdir@
  prefix=@prefix@
@@ -13,3 +14,11 @@ Install config into examples directory.
  datarootdir=@datarootdir@  
  INSTALL =@INSTALL@ @INSTALL_OPTS@
  INSTALL_PROGRAM=@INSTALL_PROGRAM@
+@@ -13,7 +13,6 @@ install: all install-startup-@startup_scripts@ install
+ all:
+ 
+ install: all install-startup-@startup_scripts@ install-samples install-hook
+-      $(INSTALL) -d -o 0 -g 0 -m 700 $(DESTDIR)/var/run/racoon2
+ 
+ install-samples:
+       $(INSTALL) -d $(sysconfdir)