From owner-svn-ports-all@freebsd.org Wed Sep 7 17:09:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F083BD0704; Wed, 7 Sep 2016 17:09:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1801C338; Wed, 7 Sep 2016 17:09:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87H9v7w083574; Wed, 7 Sep 2016 17:09:57 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87H9vnM083572; Wed, 7 Sep 2016 17:09:57 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201609071709.u87H9vnM083572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 7 Sep 2016 17:09:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421514 - head/security/racoon2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 17:09:58 -0000 Author: tijl Date: Wed Sep 7 17:09:57 2016 New Revision: 421514 URL: https://svnweb.freebsd.org/changeset/ports/421514 Log: - Don't return an error on package installation when spmd.pwd doesn't exist. - Always generate spmd.pwd. Modified: head/security/racoon2/Makefile head/security/racoon2/pkg-plist Modified: head/security/racoon2/Makefile ============================================================================== --- head/security/racoon2/Makefile Wed Sep 7 16:40:32 2016 (r421513) +++ head/security/racoon2/Makefile Wed Sep 7 17:09:57 2016 (r421514) @@ -3,7 +3,7 @@ PORTNAME= racoon2 PORTVERSION= 20100526a -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security net ipv6 MASTER_SITES= ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/ @@ -76,9 +76,7 @@ HEIMDAL_BASE_MAKE_ENV= WITH_KINK=yes HEIMDAL_BASE_PLIST_SUB= KINK="" HEIMDAL_BASE_VARS= KINK=yes -.include - -PLIST_SUB+= PFX=${PREFIX} +.include .if ${PORT_OPTIONS:MDOCS} PORTDOCS+= INSTALL USAGE config-usage.ja.txt config-usage.txt @@ -116,4 +114,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.include +.include Modified: head/security/racoon2/pkg-plist ============================================================================== --- head/security/racoon2/pkg-plist Wed Sep 7 16:40:32 2016 (r421513) +++ head/security/racoon2/pkg-plist Wed Sep 7 17:09:57 2016 (r421514) @@ -44,6 +44,7 @@ man/man8/iked.8.gz @dir etc/racoon2/hook/child-rekey.d @dir etc/racoon2/hook/child-down.d @dir etc/racoon2/cert -@exec test -f %%PFX%%/etc/racoon2/spmd.pwd && mv %%PFX%%/etc/racoon2/spmd.pwd %%PFX%%/etc/racoon2/spmd.pwd.bak && %%PFX%%/sbin/pskgen -r -o %%PFX%%/etc/racoon2/spmd.pwd -@unexec rm -f %%PFX/etc/racoon2/spmd.pwd +@postexec [ ! -e %D/%%ETCDIR%%/spmd.pwd ] || mv %D/%%ETCDIR%%/spmd.pwd %D/%%ETCDIR%%/spmd.pwd.bak +@postexec %D/sbin/pskgen -r -o %D/%%ETCDIR%%/spmd.pwd +@rmtry %%ETCDIR%%/spmd.pwd @dir(root,wheel,700) /var/run/racoon2