From f37bf9952927b91553ba92a57996c290d155e757 Mon Sep 17 00:00:00 2001 From: heinz Date: Fri, 19 Dec 2008 21:09:11 +0000 Subject: Added fixes for DESTDIR support: Correct settings for file ownership (*OWN, *GRP in patch-aa and patch-ao). Added missing installation directories in patch-aa. Sorted PLIST to placate pkglint. Adapted filename in patch-an to the way mkpatches generates nowadays. --- security/isakmpd/Makefile | 13 ++++++++++++- security/isakmpd/PLIST | 6 +++--- security/isakmpd/distinfo | 7 ++++--- security/isakmpd/patches/patch-aa | 25 +++++++++++++++++++++---- security/isakmpd/patches/patch-an | 6 +++--- security/isakmpd/patches/patch-ao | 19 +++++++++++++++++++ 6 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 security/isakmpd/patches/patch-ao (limited to 'security') diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile index 3b3bae77e9d..02a75fcaf54 100644 --- a/security/isakmpd/Makefile +++ b/security/isakmpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2008/01/18 05:09:38 tnn Exp $ +# $NetBSD: Makefile,v 1.43 2008/12/19 21:09:11 heinz Exp $ # DISTNAME= isakmpd-20030903 @@ -9,6 +9,8 @@ MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= OpenBSD IKE daemon +PKG_DESTDIR_SUPPORT= user-destdir + # this is not compatible with cross build - there's no other way .if !exists(/usr/include/netinet6/ipsec.h) PKG_FAIL_REASON+= "${PKGNAME} requires ipsec-ready ${OPSYS}" @@ -44,5 +46,14 @@ SUBST_FILES.man= isakmpd.8 isakmpd.conf.5 isakmpd.policy.5 SUBST_SED.man= -e "s+/usr/share/ipsec+${PREFIX}/share/examples+g" SUBST_SED.man+= -e "s+/etc/isakmpd+${PKG_SYSCONFDIR}+g" +SUBST_CLASSES+= destdir +SUBST_STAGE.destdir= pre-configure +SUBST_MESSAGE.destdir= Fixing ownership for DESTDIR installations +SUBST_FILES.destdir= Makefile apps/certpatch/Makefile +SUBST_VARS.destdir= BINOWN BINGRP MANOWN MANGRP + +INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/cat5 +INSTALLATION_DIRS+= ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 + .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/isakmpd/PLIST b/security/isakmpd/PLIST index b176be79e18..33a19748854 100644 --- a/security/isakmpd/PLIST +++ b/security/isakmpd/PLIST @@ -1,6 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:34:05 reed Exp $ -sbin/certpatch -sbin/isakmpd +@comment $NetBSD: PLIST,v 1.5 2008/12/19 21:09:11 heinz Exp $ man/cat5/isakmpd.conf.0 man/cat5/isakmpd.policy.0 man/cat8/certpatch.0 @@ -9,6 +7,8 @@ man/man5/isakmpd.conf.5 man/man5/isakmpd.policy.5 man/man8/certpatch.8 man/man8/isakmpd.8 +sbin/certpatch +sbin/isakmpd share/examples/isakmpd/VPN-3way-template.conf share/examples/isakmpd/VPN-east.conf share/examples/isakmpd/VPN-west.conf diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo index eac94c937e8..4acec58754f 100644 --- a/security/isakmpd/distinfo +++ b/security/isakmpd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2005/02/24 13:10:07 agc Exp $ +$NetBSD: distinfo,v 1.18 2008/12/19 21:09:11 heinz Exp $ SHA1 (isakmpd-20030903.tar.gz) = 3400947199759a69b878ea396a598d9df174c6e8 RMD160 (isakmpd-20030903.tar.gz) = 988afc6f8c84122e7a0a70ef4afe6815aceeb95d Size (isakmpd-20030903.tar.gz) = 358314 bytes -SHA1 (patch-aa) = 4b7b92b5f220fb263ebb972120cc577a1264ef6c +SHA1 (patch-aa) = 2a8758a13eca157378fddd7caea6205f8056b5c4 SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0 SHA1 (patch-ae) = c6ca573357381ae867b1251a90b0c4df4e82d95a @@ -12,4 +12,5 @@ SHA1 (patch-aj) = 16e592ec1666b70ba6726e4a20878333ca50d7c2 SHA1 (patch-ak) = e168240460695a86533237856f3997b5c06d7805 SHA1 (patch-al) = eb6c16bf8d98219ab5d70dc5378a47772ec4dc23 SHA1 (patch-am) = 6220da76dcf0d2a150f8803ce5728469a4e66c31 -SHA1 (patch-an) = 4df8fdbaf5852c0177244e6ea62533b1c454ec94 +SHA1 (patch-an) = 15daec89e015b74f92fdd2ad6b1a890a77cbbbb3 +SHA1 (patch-ao) = d4a5a6a546cd70dd8d1f707512a212108375d406 diff --git a/security/isakmpd/patches/patch-aa b/security/isakmpd/patches/patch-aa index 3881f77f85c..2a20614073e 100644 --- a/security/isakmpd/patches/patch-aa +++ b/security/isakmpd/patches/patch-aa @@ -1,7 +1,11 @@ -$NetBSD: patch-aa,v 1.6 2003/10/10 12:56:18 agc Exp $ +$NetBSD: patch-aa,v 1.7 2008/12/19 21:09:11 heinz Exp $ ---- Makefile.orig Thu Aug 28 16:43:35 2003 -+++ Makefile Wed Sep 3 13:02:08 2003 + - At the moment, this is only for NetBSD + + - Override *OWN and *GRP variables for DESTDIR support. + +--- Makefile.orig 2003-08-28 16:43:35.000000000 +0200 ++++ Makefile @@ -38,8 +38,8 @@ # openbsd means OpenBSD 2.5 or newer. freeswan is the name for Linux with @@ -13,7 +17,20 @@ $NetBSD: patch-aa,v 1.6 2003/10/10 12:56:18 agc Exp $ #OS= freebsd #OS= freeswan #OS= bsdi -@@ -71,7 +71,7 @@ +@@ -55,6 +55,12 @@ FEATURES+= rawkey isakmp_cfg + .PATH: ${.CURDIR}/sysdep/${OS} + + PROG= isakmpd ++ ++BINOWN= @BINOWN@ ++BINGRP= @BINGRP@ ++MANOWN= @MANOWN@ ++MANGRP= @MANGRP@ ++ + BINDIR?= /sbin + LDSTATIC?= -static + SRCS= app.c attribute.c cert.c connection.c constants.c conf.c \ +@@ -71,7 +77,7 @@ CLEANFILES= exchange_num.c exchange_num. isakmp_num.c isakmp_num.h ipsec_fld.c ipsec_fld.h \ isakmp_fld.c isakmp_fld.h MAN= isakmpd.8 isakmpd.conf.5 isakmpd.policy.5 diff --git a/security/isakmpd/patches/patch-an b/security/isakmpd/patches/patch-an index db40b9aca1d..a6e78ff37d2 100644 --- a/security/isakmpd/patches/patch-an +++ b/security/isakmpd/patches/patch-an @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.1 2004/11/22 12:42:46 shannonjr Exp $ +$NetBSD: patch-an,v 1.2 2008/12/19 21:09:12 heinz Exp $ ---- ./conf.c.orig 2003-09-02 12:15:55.000000000 -0600 -+++ ./conf.c +--- conf.c.orig 2003-09-02 12:15:55.000000000 -0600 ++++ conf.c @@ -118,7 +118,7 @@ conf_hash (char *s) while (*s) diff --git a/security/isakmpd/patches/patch-ao b/security/isakmpd/patches/patch-ao new file mode 100644 index 00000000000..32d7f9f4d0f --- /dev/null +++ b/security/isakmpd/patches/patch-ao @@ -0,0 +1,19 @@ +$NetBSD: patch-ao,v 1.1 2008/12/19 21:09:12 heinz Exp $ + + - Override variables for DESTDIR support. + +--- apps/certpatch/Makefile.orig 2003-06-03 16:35:00.000000000 +0200 ++++ apps/certpatch/Makefile +@@ -31,6 +31,12 @@ + # + + PROG= certpatch ++ ++BINOWN= @BINOWN@ ++BINGRP= @BINGRP@ ++MANOWN= @MANOWN@ ++MANGRP= @MANGRP@ ++ + SRCS= certpatch.c + BINDIR?= /usr/sbin + TOPSRC= ${.CURDIR}/../.. -- cgit v1.2.3