Date: Sun, 9 Aug 2020 01:58:37 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r544538 - in branches/2020Q3/security/racoon2: . files Message-ID: <202008090158.0791wbd0090671@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Sun Aug 9 01:58:36 2020 New Revision: 544538 URL: https://svnweb.freebsd.org/changeset/ports/544538 Log: MFH: r544301 Update to the latest Christos Zoulas commit on github (202000801). Fixes 13-CURRENT build errors. Additional change required to fixup pkg-plist was to move rc.d files to their proper location. Approved by: portmgr (joneum) Added: branches/2020Q3/security/racoon2/files/patch-Makefile.am - copied unchanged from r544301, head/security/racoon2/files/patch-Makefile.am branches/2020Q3/security/racoon2/files/patch-configure.ac - copied unchanged from r544301, head/security/racoon2/files/patch-configure.ac branches/2020Q3/security/racoon2/files/patch-samples_Makefile.am - copied unchanged from r544301, head/security/racoon2/files/patch-samples_Makefile.am branches/2020Q3/security/racoon2/files/patch-samples_init.d_Makefile.am - copied unchanged from r544301, head/security/racoon2/files/patch-samples_init.d_Makefile.am branches/2020Q3/security/racoon2/files/patch-samples_rc.d_Makefile.am - copied unchanged from r544301, head/security/racoon2/files/patch-samples_rc.d_Makefile.am Deleted: branches/2020Q3/security/racoon2/files/patch-configure branches/2020Q3/security/racoon2/files/patch-kinkd-Makefile.in branches/2020Q3/security/racoon2/files/patch-lib-cftoken.l branches/2020Q3/security/racoon2/files/patch-pskgen-Makefile.in branches/2020Q3/security/racoon2/files/patch-samples-rc.d-iked.in branches/2020Q3/security/racoon2/files/patch-samples-rc.d-kinkd.in branches/2020Q3/security/racoon2/files/patch-samples-rc.d-spmd.in branches/2020Q3/security/racoon2/files/patch-samples_Makefile.in branches/2020Q3/security/racoon2/files/patch-samples_hook_Makefile.in branches/2020Q3/security/racoon2/files/patch-samples_hook_child-down.d_Makefile.in branches/2020Q3/security/racoon2/files/patch-samples_hook_child-up.d_Makefile.in branches/2020Q3/security/racoon2/files/patch-samples_hook_ikesa-up.d_Makefile.in branches/2020Q3/security/racoon2/files/patch-samples_rc.d_Makefile.in branches/2020Q3/security/racoon2/files/patch-spmd-Makefile.in Modified: branches/2020Q3/security/racoon2/Makefile branches/2020Q3/security/racoon2/distinfo branches/2020Q3/security/racoon2/pkg-plist Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/security/racoon2/Makefile ============================================================================== --- branches/2020Q3/security/racoon2/Makefile Sun Aug 9 01:25:55 2020 (r544537) +++ branches/2020Q3/security/racoon2/Makefile Sun Aug 9 01:58:36 2020 (r544538) @@ -3,10 +3,9 @@ PORTNAME= racoon2 PORTVERSION= ${RACOON2_COMMIT_DATE} -PORTREVISION= 1 CATEGORIES= security net -HASH= 5c4af73 -RACOON2_COMMIT_DATE=20181215 +HASH= f96b7ab +RACOON2_COMMIT_DATE=202000801 MAINTAINER= cy@FreeBSD.org COMMENT= Racoon2 IPsec daemon @@ -19,66 +18,33 @@ USE_GITHUB= yes GH_ACCOUNT= zoulasc GH_TAGNAME= ${HASH} -USES= autoreconf:build perl5 tar:tgz ssl +USES= autoreconf libtool:build perl5 tar:tgz ssl CONFIGURE_ARGS+= --enable-natt \ - --prefix=${PREFIX} + --prefix=${STAGEDIR}/${PREFIX} GNU_CONFIGURE= yes -CONFIGURE_ENV= YACC=/usr/bin/yacc perl_bindir=${LOCALBASE}/bin/perl5 +CONFIGURE_ENV= YACC=/usr/bin/yacc perl_bindir=${LOCALBASE}/bin/perl5 \ + STAGEDIR=${STAGEDIR} PREFIX=${PREFIX} -# MAKE_ENV= DESTDIR=${DESTDIR} +MAKE_ENV= STAGEDIR=${STAGEDIR} PREFIX=${PREFIX} CFLAGS= -DHAVE_CONFIG_H OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT= DOCS NO_KRB -OPTIONS_SINGLE= KERBEROS -OPTIONS_SINGLE_KERBEROS= NO_KRB KRB5 HEIMDAL_PORT HEIMDAL_BASE -NO_KRB_DESC= No Kerberos support -KRB5_DESC= Build with Kerberos (security/krb5) -HEIMDAL_PORT_DESC= Build with Heimdal in ports (security/heimdal) -HEIMDAL_BASE_DESC= Build with Heimdal in base +OPTIONS_DEFAULT= DOCS -NO_KRB_CONFIGURE_ON= --disable-kinkd -NO_KRB_MAKE_ENV= WITH_KINK=no -NO_KRB_PLIST_SUB= KINK="@comment " -NO_KRB_VARS= KINK=no - -KRB5_USES= gssapi:mit -KRB5_CONFIGURE_ON= --enable-kinkd -KRB5_MAKE_ENV= WITH_KINK=yes -KRB5_PLIST_SUB= KINK="" -KRB5_LIB_DEPENDS= libkrb5support.so:security/krb5 -KRB5_RUN_DEPENDS= kinit:security/krb5 -KRB5_VARS= KINK=yes - -HEIMDAL_PORT_USES= gssapi:heimdal -HEIMDAL_PORT_CONFIGURE_ON= --enable-kinkd -HEIMDAL_PORT_MAKE_ENV= WITH_KINK=yes -HEIMDAL_PORT_PLIST_SUB= KINK="" -HEIMDAL_PORT_VARS= KINK=yes - -HEIMDAL_BASE_USES= gssapi:base -HEIMDAL_BASE_CONFIGURE_ON= --enable-kinkd -HEIMDAL_BASE_MAKE_ENV= WITH_KINK=yes -HEIMDAL_BASE_PLIST_SUB= KINK="" -HEIMDAL_BASE_VARS= KINK=yes - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} PORTDOCS+= INSTALL USAGE config-usage.ja.txt config-usage.txt PORTDOCS+= iked-memo.ja.txt libracoon.ja.txt specification.ja.txt PORTDOCS+= spmif.txt style.txt system-message.ja.txt -.if defined(KINK) -PORTDOCS+= kinkd-data-struct.obj kinkd-impl.ja.txt -PORTDOCS+= kinkd-install.ja.txt kinkd-state-txn.obj .endif -.endif post-patch: # @${REINPLACE_CMD} 's|/var/run/racoon2|$$(STAGEDIR)&|' \ ${WRKSRC}/samples/Makefile.in + ${REINPLACE_CMD} 's|$$(sysconfdir)|${STAGEDIR}/${PREFIX}/etc|' ${WRKSRC}/samples/rc.d/Makefile.am @${LN} -sf ${LOCALBASE}/share/automake-1.16/ylwrap ${WRKSRC}/lib post-patch-DOCS-on: Modified: branches/2020Q3/security/racoon2/distinfo ============================================================================== --- branches/2020Q3/security/racoon2/distinfo Sun Aug 9 01:25:55 2020 (r544537) +++ branches/2020Q3/security/racoon2/distinfo Sun Aug 9 01:58:36 2020 (r544538) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539958190 -SHA256 (zoulasc-racoon2-20181215-5c4af73_GH0.tar.gz) = 9cce3857e0c16e284d2b4141ff2e6a3acf11f8401536a258bd9a1bec484bedb3 -SIZE (zoulasc-racoon2-20181215-5c4af73_GH0.tar.gz) = 1365031 +TIMESTAMP = 1596656478 +SHA256 (zoulasc-racoon2-202000801-f96b7ab_GH0.tar.gz) = 4742aeeadbc40db4a6a7cd7440295514f38b3169b5854eeb1460641fdb41040f +SIZE (zoulasc-racoon2-202000801-f96b7ab_GH0.tar.gz) = 885762 Copied: branches/2020Q3/security/racoon2/files/patch-Makefile.am (from r544301, head/security/racoon2/files/patch-Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/racoon2/files/patch-Makefile.am Sun Aug 9 01:58:36 2020 (r544538, copy of r544301, head/security/racoon2/files/patch-Makefile.am) @@ -0,0 +1,10 @@ +--- Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700 ++++ Makefile.am 2020-06-29 12:53:16.217963000 -0700 +@@ -2,6 +2,6 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = lib spmd kinkd iked pskgen samples ++SUBDIRS = lib spmd iked pskgen samples + + Copied: branches/2020Q3/security/racoon2/files/patch-configure.ac (from r544301, head/security/racoon2/files/patch-configure.ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/racoon2/files/patch-configure.ac Sun Aug 9 01:58:36 2020 (r544538, copy of r544301, head/security/racoon2/files/patch-configure.ac) @@ -0,0 +1,34 @@ +--- configure.ac.orig 2020-03-18 13:57:19.000000000 -0700 ++++ configure.ac 2020-06-29 12:55:22.015784000 -0700 +@@ -16,7 +16,7 @@ + AC_PROG_MAKE_SET + RC_IF_INSTALL_OPTS + +-AC_CONFIG_SUBDIRS([lib spmd iked kinkd]) ++AC_CONFIG_SUBDIRS([lib spmd iked]) + + dnl Set the debug option by default for now. + AC_MSG_CHECKING(if --enable-debug option is specified) +@@ -57,7 +57,7 @@ + netbsd*1.[[56]]*|netbsd*[[2-9]].*) + startup_scripts=rc.d + ;; +- freebsd[[5-9]].*) ++ freebsd*) + startup_scripts=rc.d + ;; + *) +@@ -90,13 +90,11 @@ + samples/hook/Makefile + samples/Makefile + samples/rc.d/iked +- samples/rc.d/kinkd + samples/rc.d/racoon2 + samples/rc.d/spmd + samples/rc.d/Makefile + samples/racoon2.conf + samples/init.d/iked +- samples/init.d/kinkd + samples/init.d/spmd + samples/init.d/Makefile + samples/vals.conf]) Copied: branches/2020Q3/security/racoon2/files/patch-samples_Makefile.am (from r544301, head/security/racoon2/files/patch-samples_Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/racoon2/files/patch-samples_Makefile.am Sun Aug 9 01:58:36 2020 (r544538, copy of r544301, head/security/racoon2/files/patch-samples_Makefile.am) @@ -0,0 +1,11 @@ +--- samples/Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700 ++++ samples/Makefile.am 2020-06-29 13:05:24.670094000 -0700 +@@ -13,8 +13,6 @@ + $(INSTALL) -m 600 transport_ike.conf $(DESTDIR)$(sysconfdir)/transport_ike.conf.sample + $(INSTALL) -m 600 tunnel_ike.conf $(DESTDIR)$(sysconfdir)/tunnel_ike.conf.sample + $(INSTALL) -m 600 tunnel_ike_natt.conf $(DESTDIR)$(sysconfdir)/tunnel_ike_natt.conf.sample +- $(INSTALL) -m 600 transport_kink.conf $(DESTDIR)$(sysconfdir)/transport_kink.conf.sample +- $(INSTALL) -m 600 tunnel_kink.conf $(DESTDIR)$(sysconfdir)/tunnel_kink.conf.sample + $(INSTALL) -m 600 local-test.conf $(DESTDIR)$(sysconfdir)/local-test.conf.sample + $(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/psk + $(INSTALL) -d -m 700 $(DESTDIR)$(sysconfdir)/cert Copied: branches/2020Q3/security/racoon2/files/patch-samples_init.d_Makefile.am (from r544301, head/security/racoon2/files/patch-samples_init.d_Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/racoon2/files/patch-samples_init.d_Makefile.am Sun Aug 9 01:58:36 2020 (r544538, copy of r544301, head/security/racoon2/files/patch-samples_init.d_Makefile.am) @@ -0,0 +1,8 @@ +--- samples/init.d/Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700 ++++ samples/init.d/Makefile.am 2020-06-29 14:52:07.468234000 -0700 +@@ -5,5 +5,4 @@ + install-exec-hook: + $(INSTALL) -d $(DESTDIR)$(sysconfdir)/init.d + $(INSTALL_SCRIPT) iked $(DESTDIR)$(sysconfdir)/init.d/iked +- $(INSTALL_SCRIPT) kinkd $(DESTDIR)$(sysconfdir)/init.d/kinkd + $(INSTALL_SCRIPT) spmd $(DESTDIR)$(sysconfdir)/init.d/spmd Copied: branches/2020Q3/security/racoon2/files/patch-samples_rc.d_Makefile.am (from r544301, head/security/racoon2/files/patch-samples_rc.d_Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/racoon2/files/patch-samples_rc.d_Makefile.am Sun Aug 9 01:58:36 2020 (r544538, copy of r544301, head/security/racoon2/files/patch-samples_rc.d_Makefile.am) @@ -0,0 +1,9 @@ +--- samples/rc.d/Makefile.am.orig 2020-03-18 13:57:19.000000000 -0700 ++++ samples/rc.d/Makefile.am 2020-06-29 14:50:50.509434000 -0700 +@@ -5,6 +5,5 @@ + install-exec-hook: + $(INSTALL) -d $(sysconfdir)/rc.d + $(INSTALL_SCRIPT) iked $(sysconfdir)/rc.d/iked +- $(INSTALL_SCRIPT) kinkd $(sysconfdir)/rc.d/kinkd + $(INSTALL_SCRIPT) spmd $(sysconfdir)/rc.d/spmd + $(INSTALL_SCRIPT) racoon2 $(sysconfdir)/rc.d/racoon2 Modified: branches/2020Q3/security/racoon2/pkg-plist ============================================================================== --- branches/2020Q3/security/racoon2/pkg-plist Sun Aug 9 01:25:55 2020 (r544537) +++ branches/2020Q3/security/racoon2/pkg-plist Sun Aug 9 01:58:36 2020 (r544538) @@ -1,5 +1,4 @@ sbin/iked -%%KINK%%sbin/kinkd sbin/spmd sbin/spmdctl sbin/pskgen @@ -7,10 +6,8 @@ etc/racoon2/default.conf.sample etc/racoon2/local-test.conf.sample etc/racoon2/racoon2.conf.sample etc/racoon2/transport_ike.conf.sample -etc/racoon2/transport_kink.conf.sample etc/racoon2/tunnel_ike.conf.sample etc/racoon2/tunnel_ike_natt.conf.sample -etc/racoon2/tunnel_kink.conf.sample etc/racoon2/vals.conf.sample etc/racoon2/hook/functions etc/racoon2/hook/ikesa-up.d/00ikesaup_sample @@ -28,12 +25,13 @@ etc/racoon2/hook/child-down.d/03arp etc/racoon2/hook/child-down etc/racoon2/hook/child-rekey etc/racoon2/hook/migration -etc/racoon2/hook/ph1-up -etc/racoon2/hook/ph1-down etc/rc.d/iked etc/rc.d/racoon2 etc/rc.d/spmd -%%KINK%%etc/rc.d/kinkd +lib/libracoon.a +lib/libracoon.so +lib/libracoon.so.0 +lib/libracoon.so.0.0.0 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp %%PORTDOCS%%%%DOCSDIR%%/README @@ -41,10 +39,7 @@ man/man8/spmd.8.gz man/man8/spmdctl.8.gz man/man8/pskgen.8.gz man/man8/iked.8.gz -%%KINK%%man/man8/kinkd.8.gz @dir etc/racoon2/psk -@dir etc/racoon2/hook/ph1-up.d -@dir etc/racoon2/hook/ph1-down.d @dir etc/racoon2/hook/migration.d @dir etc/racoon2/hook/ikesa-rekey.d @dir etc/racoon2/hook/ikesa-down.d
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008090158.0791wbd0090671>