diff options
Diffstat (limited to 'security')
82 files changed, 203 insertions, 210 deletions
diff --git a/security/AiSSLtelnet/distinfo b/security/AiSSLtelnet/distinfo index 717a441aace..d42ddb13014 100644 --- a/security/AiSSLtelnet/distinfo +++ b/security/AiSSLtelnet/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/07/17 23:40:31 kristerw Exp $ +$NetBSD: distinfo,v 1.11 2005/12/05 20:50:54 rillig Exp $ SHA1 (AiSSLtelnet-0.15.tar.gz) = 533662049ac44dbf45bb5b53f37eabf269017a79 RMD160 (AiSSLtelnet-0.15.tar.gz) = 6010734e7a38cf1b26e43b84e12678f99409f170 @@ -8,5 +8,5 @@ SHA1 (patch-ab) = ab2261a810c63a5b5b2d0d1021de94253bb3bc54 SHA1 (patch-ac) = 8fcaf2a51d0f9209033072ded426a8fff28588ac SHA1 (patch-ad) = 954b02c4d494477062dcb05016e2f7d29c299e48 SHA1 (patch-ae) = 3b162a664c920ac5897154167871925739745083 -SHA1 (patch-af) = 792a27501e29304265b02ba5a7cfaa68ced916a1 +SHA1 (patch-af) = 686ce88931e977e14041be096b589942b35c7a98 SHA1 (patch-ag) = ebeb3ce32341d4b4e69c71ab969408ff84a5d309 diff --git a/security/AiSSLtelnet/patches/patch-af b/security/AiSSLtelnet/patches/patch-af index 9e4fba9d624..0d1598e19d3 100644 --- a/security/AiSSLtelnet/patches/patch-af +++ b/security/AiSSLtelnet/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2004/03/25 15:23:40 taca Exp $ +$NetBSD: patch-af,v 1.2 2005/12/05 20:50:54 rillig Exp $ --- telnet/commands.c.orig 2001-08-02 22:42:45.000000000 +0900 +++ telnet/commands.c -@@ -68,7 +68,7 @@ static char vcid[] = "$Id: commands.c,v +@@ -68,7 +68,7 @@ #include <netdb.h> #include <ctype.h> #include <pwd.h> diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 68d5222cfdf..64953b9cfb1 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/10/04 18:27:00 reed Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:54 rillig Exp $ # DISTNAME= Linux-PAM-0.77 @@ -35,7 +35,7 @@ CONFIGURE_ENV+= ac_cv_prog_HAVE_SGML2PS=no CONFIGURE_ENV+= ac_cv_prog_HAVE_PS2PDF=no PAM_MODULEDIR= ${VIEWBASE}/lib/security -MAKE_ENV+= PAM_MODULEDIR="${PAM_MODULEDIR}" +MAKE_ENV+= PAM_MODULEDIR=${PAM_MODULEDIR:Q} MESSAGE_SUBST+= PAM_MODULEDIR=${PAM_MODULEDIR} .include "../../mk/bsd.prefs.mk" diff --git a/security/amap/Makefile b/security/amap/Makefile index dff34c98069..ddd87a00ad8 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/06/17 03:50:31 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:54 rillig Exp $ # DISTNAME= amap-5.0 @@ -22,7 +22,7 @@ CONF_FILES= ${EGDIR}/appdefs.resp ${PKG_SYSCONFDIR}/appdefs.resp CONF_FILES+= ${EGDIR}/appdefs.rpc ${PKG_SYSCONFDIR}/appdefs.rpc CONF_FILES+= ${EGDIR}/appdefs.trig ${PKG_SYSCONFDIR}/appdefs.trig -SUBST_CLASSES= conf +SUBST_CLASSES+= conf SUBST_FILES.conf= configure SUBST_STAGE.conf= pre-configure SUBST_SED.conf= -e 's|@PREFIX@|${PREFIX}|g' \ diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile index abae30c3de7..bc07f8ed651 100644 --- a/security/amavis-perl/Makefile +++ b/security/amavis-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/08/01 12:18:41 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:54 rillig Exp $ DISTNAME= amavisd-${VERSION} PKGNAME= amavis-perl-${VERSION} @@ -48,7 +48,7 @@ GNU_CONFIGURE= YES PLIST_SRC= ${PKGDIR}/PLIST USE_TOOLS+= file -CONFIGURE_ENV+= file=${TOOLS_FILE_CMD} +CONFIGURE_ENV+= file=${TOOLS_FILE_CMD:Q} CONFIGURE_ENV+= procmail="/usr/libexec/mail.local" diff --git a/security/amavis/Makefile b/security/amavis/Makefile index 80e631f2322..4449ae66a64 100644 --- a/security/amavis/Makefile +++ b/security/amavis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/07/26 19:28:55 kristerw Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $ # DISTNAME= amavis-0.2.1 @@ -30,7 +30,7 @@ VIRUSMAILTO?= security # whom to notify about viruses GNU_CONFIGURE= YES CONFIGURE_ENV+= procmail="/usr/libexec/mail.local" -CONFIGURE_ENV+= BASH=${TOOLS_SH} +CONFIGURE_ENV+= BASH=${TOOLS_SH:Q} CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR} CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO} diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index ce60f62c155..86c013da22f 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/09/05 10:14:16 cube Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -51,10 +51,10 @@ EGDIR= ${PREFIX}/share/examples/amavisd-new MESSAGE_SRC= ${PKGDIR}/MESSAGE BUILD_DEFS+= AMAVIS_USER AMAVIS_GROUP AMAVIS_DIR AMAVIS_QUARANTINE -FILES_SUBST+= AMAVIS_USER=${AMAVIS_USER} -FILES_SUBST+= AMAVIS_GROUP=${AMAVIS_GROUP} -FILES_SUBST+= AMAVIS_DIR=${AMAVIS_DIR} -FILES_SUBST+= AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE} +FILES_SUBST+= AMAVIS_USER=${AMAVIS_USER:Q} +FILES_SUBST+= AMAVIS_GROUP=${AMAVIS_GROUP:Q} +FILES_SUBST+= AMAVIS_DIR=${AMAVIS_DIR:Q} +FILES_SUBST+= AMAVIS_QUARANTINE=${AMAVIS_QUARANTINE:Q} PKG_GROUPS= ${AMAVIS_GROUP} PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\ Scanning\ Account:${AMAVIS_DIR}:${SH} diff --git a/security/antonym/distinfo b/security/antonym/distinfo index d9d5beb0451..f6aadb55af7 100644 --- a/security/antonym/distinfo +++ b/security/antonym/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:10:05 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/12/05 20:50:54 rillig Exp $ SHA1 (antonym-1.9.tar.gz) = 0c1fd06f175a3c13900479460824c07a4bbeb480 RMD160 (antonym-1.9.tar.gz) = b49db8adcd87e57f22fe1095c8307fecd1e08f6a Size (antonym-1.9.tar.gz) = 14902 bytes SHA1 (patch-aa) = 36c055595784ff8cd6fc600e3ac3ed5ce4f03275 -SHA1 (patch-ab) = 3421c1849a71e6ae5a2d4ee11e94111c39299664 +SHA1 (patch-ab) = ccb7b3bca2faf22aa8948aea5d8df2fada83388f diff --git a/security/antonym/patches/patch-ab b/security/antonym/patches/patch-ab index ede55a79c6c..bc20f2b8e6a 100644 --- a/security/antonym/patches/patch-ab +++ b/security/antonym/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/05/05 16:34:34 tv Exp $ +$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:54 rillig Exp $ --- README.orig Tue Aug 6 12:44:44 2002 +++ README -@@ -2,18 +2,17 @@ $Id: README,v 1.1 2002/07/25 16:42:06 ki +@@ -2,18 +2,17 @@ INSTALLATION diff --git a/security/apg/Makefile b/security/apg/Makefile index 65a9a8ff143..587e0b34287 100644 --- a/security/apg/Makefile +++ b/security/apg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:54 rillig Exp $ # DISTNAME= apg-2.2.3 @@ -9,7 +9,7 @@ MAINTAINER= zuntum@NetBSD.org HOMEPAGE= http://www.adel.nursat.kz/apg/ COMMENT= Tool set for random password generation -MAKE_ENV+= FLAGS="${CFLAGS}" INSTALL_PREFIX="${PREFIX}" +MAKE_ENV+= FLAGS=${CFLAGS:M*:Q} INSTALL_PREFIX=${PREFIX:Q} USE_TOOLS+= perl:run REPLACE_PERL= perl/apgcli.pl @@ -17,7 +17,7 @@ REPLACE_PERL= perl/apgcli.pl OPSYSVARS+= CS_LIBS CS_LIBS.Linux+= -lnsl CS_LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= CS_LIBS="${CS_LIBS}" +MAKE_ENV+= CS_LIBS=${CS_LIBS:Q} post-install: ${INSTALL_SCRIPT} ${WRKSRC}/perl/apgcli.pl ${PREFIX}/bin/apgcli diff --git a/security/cfs/Makefile b/security/cfs/Makefile index 84bf234fdbc..9614dbe60d7 100644 --- a/security/cfs/Makefile +++ b/security/cfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:10 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $ DISTNAME= cfs-1.4.1 PKGREVISION= 5 @@ -30,7 +30,7 @@ CFS_SUBST+= cpasswd->cfs_passwd CPASSWD->CFS_PASSWD .include "../../mk/compiler.mk" .include "../../mk/bsd.prefs.mk" -MAKE_ENV+= OPSYS="${OPSYS}" +MAKE_ENV+= OPSYS=${OPSYS:Q} # Required settings necessary to build CFS on various platforms. This is # copied from ${WRKSRC}/Makefile and from browsing the various README files. @@ -38,7 +38,7 @@ MAKE_ENV+= OPSYS="${OPSYS}" .if ${OPSYS} == "NetBSD" CFLAGS+= -DPROTOTYPES=1 CFLAGS+= -DBSD44 -DANYPORT -DCFS_PORT=2049 -DSHORTLINKS -MAKE_ENV+= MAKE=${MAKE_PROGRAM} +MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} MAKE_ENV+= COMPAT="-lcompat" MAKE_ENV+= RPCOPTS="-b" # @@ -54,7 +54,7 @@ CFLAGS+= -traditional . endif CFLAGS+= -DPROTOTYPES=1 CFLAGS+= -DSOLARIS2X -DPORTMAP -DPTMX -MAKE_ENV+= MAKE=${MAKE_PROGRAM} +MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} MAKE_ENV+= LIBS="-lsocket -lnsl" MAKE_ENV+= COMPAT= MAKE_ENV+= RPCOPTS= @@ -65,7 +65,7 @@ CFLAGS+= -traditional . endif CFLAGS+= -DPROTOTYPES=1 CFLAGS+= -U__OPTIMIZE__ -U__STDC__ -Dd_fileno=d_ino -MAKE_ENV+= MAKE=${MAKE_PROGRAM} +MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} MAKE_ENV+= LIBS= MAKE_ENV+= COMPAT= MAKE_ENV+= RPCOPTS="-k -b" diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile index 7a85558d9fa..a0600f4496f 100644 --- a/security/chkrootkit/Makefile +++ b/security/chkrootkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:55 rillig Exp $ # DISTNAME= chkrootkit-0.44 @@ -17,7 +17,7 @@ NO_CONFIGURE= yes PROGRAMS= chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static DOCDIR= ${PREFIX}/share/doc/chkrootkit -SUBST_CLASSES= helper +SUBST_CLASSES+= helper SUBST_STAGE.helper= post-patch SUBST_FILES.helper= chkrootkit SUBST_SED.helper= -e "s|./chklastlog|${PREFIX}/bin/chklastlog|g" \ diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index c6d6a3d0879..82d6345e164 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/11/07 16:43:49 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:55 rillig Exp $ .include "Makefile.common" @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --without-stdheaderdir AUTHDAEMONVAR?= ${VARBASE}/authdaemon CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR} OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750 -FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR} +FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q} # Expect is used to change the password from within the courier webmail # application (sqwebmail). @@ -42,8 +42,8 @@ AUTHLIBDIR= lib/courier-authlib AUTHLIBEXECDIR= libexec/courier-authlib AUTHEXAMPLEDIR= share/examples/courier-authlib AUTHDOCDIR= share/doc/courier-authlib -FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR} -FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR} +FILES_SUBST+= AUTHLIBEXECDIR=${AUTHLIBEXECDIR:Q} +FILES_SUBST+= AUTHEXAMPLEDIR=${AUTHEXAMPLEDIR:Q} PKG_SYSCONFSUBDIR?= courier diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common index 2bcab23a910..51659d837a6 100644 --- a/security/courier-authlib/Makefile.common +++ b/security/courier-authlib/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.4 2005/08/23 11:48:51 rillig Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:55 rillig Exp $ COURIER_USER?= courier COURIER_GROUP?= mail -FILES_SUBST+= COURIER_USER=${COURIER_USER} -FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP} +FILES_SUBST+= COURIER_USER=${COURIER_USER:Q} +FILES_SUBST+= COURIER_GROUP=${COURIER_GROUP:Q} USE_PKGINSTALL= yes PKG_GROUPS= ${COURIER_GROUP} diff --git a/security/cy2-anonymous/Makefile b/security/cy2-anonymous/Makefile index db8240c2c2b..4e287b94d42 100644 --- a/security/cy2-anonymous/Makefile +++ b/security/cy2-anonymous/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-anonymous/} COMMENT= Cyrus SASL ANONYMOUS authentication plugin @@ -6,7 +6,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-anonymous diff --git a/security/cy2-crammd5/Makefile b/security/cy2-crammd5/Makefile index db9879dc987..8e66ec7aaec 100644 --- a/security/cy2-crammd5/Makefile +++ b/security/cy2-crammd5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-crammd5/} COMMENT= Cyrus SASL CRAM-MD5 authentication plugin @@ -6,7 +6,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-cram diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile index ce7537a2b54..c03d0f28253 100644 --- a/security/cy2-digestmd5/Makefile +++ b/security/cy2-digestmd5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/} COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin @@ -6,7 +6,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-digest CONFIGURE_ARGS+= --with-rc4 diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile index ed993e66497..3f862f41b9a 100644 --- a/security/cy2-gssapi/Makefile +++ b/security/cy2-gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} COMMENT= Cyrus SASL GSSAPI authentication plugin @@ -6,7 +6,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} diff --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile index 5c4383f6587..8789fff16e1 100644 --- a/security/cy2-login/Makefile +++ b/security/cy2-login/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/} COMMENT= Cyrus SASL LOGIN authentication plugin SASL_PLUGIN= yes -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" # We need to configure the PLAIN plugin as well since some of the important # build variables for the LOGIN plugin are only set if PLAIN is configured. diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile index c861326d154..d67401f0442 100644 --- a/security/cy2-ntlm/Makefile +++ b/security/cy2-ntlm/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/} COMMENT= Cyrus SASL NTLM authentication plugin SASL_PLUGIN= yes -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-ntlm CONFIGURE_ARGS+= --with-openssl=${SSLBASE} diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile index 34bb6f022d4..1b4f87ec17a 100644 --- a/security/cy2-otp/Makefile +++ b/security/cy2-otp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/} COMMENT= Cyrus SASL OTP authentication plugin @@ -6,7 +6,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-otp CONFIGURE_ARGS+= --with-openssl=${SSLBASE} diff --git a/security/cy2-plain/Makefile b/security/cy2-plain/Makefile index ed7e0fa1bff..6217819833c 100644 --- a/security/cy2-plain/Makefile +++ b/security/cy2-plain/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:08 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-plain/} COMMENT= Cyrus SASL PLAIN authentication plugin @@ -6,7 +6,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-plain diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile index c6a9a6d0c37..9d87c817e91 100644 --- a/security/cy2-sql/Makefile +++ b/security/cy2-sql/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2005/05/31 10:01:39 dillo Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:55 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} COMMENT= Cyrus SASL SQL authentication plugin SASL_PLUGIN= yes -.include "../cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl2/Makefile.common" PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 251a63f2bc2..d3660b77df2 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/08/20 01:56:11 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:55 rillig Exp $ .include "Makefile.common" @@ -56,8 +56,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL # CYRUS_USER?= cyrus CYRUS_GROUP?= mail -FILES_SUBST+= CYRUS_USER=${CYRUS_USER} -FILES_SUBST+= ROOT_USER=${ROOT_USER} +FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} +FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} BUILD_DEFS+= CYRUS_USER CYRUS_GROUP PKG_GROUPS= ${CYRUS_GROUP} diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index bbc14d48d78..eff31978872 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:11 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $ DISTNAME= cyrus-sasl-2.1.20 PKGNAME= ${DISTNAME:S/sasl/saslauthd/} @@ -27,7 +27,7 @@ BUILD_TARGET= all saslcache testsaslauthd SASLSOCKETDIR?= ${VARBASE}/run/saslauthd BUILD_DEFS+= SASLSOCKETDIR -FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR} +FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q} CONFIGURE_ARGS+= --with-saslauthd="${SASLSOCKETDIR}" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} @@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-openssl=${SSLBASE} USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL RCD_SCRIPTS= saslauthd -FILES_SUBST+= ROOT_USER=${ROOT_USER} +FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} INSTALLATION_DIRS= bin diff --git a/security/destroy/Makefile b/security/destroy/Makefile index bb8a5002ff2..eb2875177d1 100644 --- a/security/destroy/Makefile +++ b/security/destroy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:31 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:55 rillig Exp $ # DISTNAME= destroy-20040415 @@ -8,7 +8,7 @@ MASTER_SITES= http://www.freebsdhackers.net/destroy/ \ MAINTAINER= shane@freebsdhackers.net HOMEPAGE= http://www.freebsdhackers.net/destroy/ -COMMENT= A program to securely destroy files on the hard disk +COMMENT= Program to securely destroy files on the hard disk INSTALLATION_DIRS= bin man/man1 diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile index b7148c15378..0435f6a77c5 100644 --- a/security/dropbear/Makefile +++ b/security/dropbear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/09 17:31:06 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:55 rillig Exp $ DISTNAME= dropbear-0.46 CATEGORIES= security @@ -20,7 +20,7 @@ PKG_SUPPORTED_OPTIONS= pam CONFIGURE_ARGS+= --enable-pam .endif -MAKEFLAGS+= ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP} +MAKEFLAGS+= ROOT_USER=${ROOT_USER:Q} ROOT_GROUP=${ROOT_GROUP:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dropbear diff --git a/security/dsniff-nox11/Makefile b/security/dsniff-nox11/Makefile index 2d749686e61..0845990cc01 100644 --- a/security/dsniff-nox11/Makefile +++ b/security/dsniff-nox11/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/03/22 01:05:16 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:55 rillig Exp $ -.include "../dsniff/Makefile.common" +.include "../../security/dsniff/Makefile.common" PKGNAME= dsniff-nox11-${VERS} COMMENT= Password sniffer diff --git a/security/fsh/Makefile b/security/fsh/Makefile index fd74ce8ee3a..5aa9422b508 100644 --- a/security/fsh/Makefile +++ b/security/fsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/03/20 12:51:54 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:55 rillig Exp $ # DISTNAME= fsh-1.2 @@ -14,7 +14,7 @@ COMMENT= Fast remote command execution GNU_CONFIGURE= YES INFO_FILES= fsh.info -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile index 914b8c17fd4..29979cf5347 100644 --- a/security/fwbuilder/Makefile +++ b/security/fwbuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/10/27 22:09:23 bad Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:55 rillig Exp $ DISTNAME= fwbuilder-2.0.9 CATEGORIES= security net @@ -15,8 +15,8 @@ USE_LANGUAGES= c++ UNLIMIT_RESOURCES+= datasize QMAKE= ${QTDIR}/bin/qmake -CONFIGURE_ENV+= QMAKE="${QMAKE}" -MAKE_ENV+= QMAKE="${QMAKE}" +CONFIGURE_ENV+= QMAKE=${QMAKE:Q} +MAKE_ENV+= QMAKE=${QMAKE:Q} .include "../../security/libfwbuilder/buildlink3.mk" diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index df16da307a1..40e3eb633e5 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/12 21:46:00 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:55 rillig Exp $ # DISTNAME= gnome-keyring-0.4.5 @@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= YES PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in -BUILDLINK_DEPENDS.glib2= glib2>=2.6.0 +BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.0 .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/security/gnu-crypto/Makefile b/security/gnu-crypto/Makefile index 506f83cc38f..978189743a2 100644 --- a/security/gnu-crypto/Makefile +++ b/security/gnu-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:31 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= gnu-crypto-2.0.1-bin @@ -11,7 +11,7 @@ MAINTAINER= tv@duh.org HOMEPAGE= http://www.gnu.org/software/gnu-crypto/ COMMENT= GPL implementation of the Java Crypto Extensions -USE_JAVA2= run +USE_JAVA2= yes INSTALLATION_DIRS= info do-build: # do nothing diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index e962f7de410..486f5cf4cf3 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2005/10/10 20:45:19 reed Exp $ +# $NetBSD: Makefile,v 1.79 2005/12/05 20:50:56 rillig Exp $ DISTNAME= gnupg-1.4.2 CATEGORIES= security @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --disable-gnupg-iconv # XXX: still needed? .if ${OPSYS} == "FreeBSD" -SUBST_CLASSES= fixme +SUBST_CLASSES+= fixme SUBST_STAGE.fixme= post-configure SUBST_FILES.fixme= mpi/i386/mpih-add1.S mpi/i386/mpih-lshift.S \ mpi/i386/mpih-mul1.S mpi/i386/mpih-mul2.S \ diff --git a/security/gnupg/hacks.mk b/security/gnupg/hacks.mk index c9e9da96975..ed619453afb 100644 --- a/security/gnupg/hacks.mk +++ b/security/gnupg/hacks.mk @@ -1,7 +1,7 @@ -# $NetBSD: hacks.mk,v 1.2 2005/10/04 22:50:41 wiz Exp $ +# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $ -.ifndef GNUPG_HACKS_MK -GNUPG_HACKS_MK= #defined +.if !defined(GNUPG_HACKS_MK) +GNUPG_HACKS_MK= # defined ### workaround for a GCC optimizer bug on sparc: ### drop any -mcpu flag diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index 367487fc14c..320052a9948 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/07/15 18:27:53 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2005/12/05 20:50:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= i586-optimized curl idea ldap m68060-optimized @@ -41,6 +41,6 @@ PLIST_SUBST+= OPENLDAP="@comment " .if !empty(PKG_OPTIONS:Mm68060-optimized) # be more efficient on M68060 machines -CONFIGURE_ENV+= M68060=${M68060} +CONFIGURE_ENV+= M68060=${M68060:Q} CFLAGS+= -m68060 .endif diff --git a/security/gnustep-ssl/Makefile b/security/gnustep-ssl/Makefile index 7d7773bbc2a..40981e30bbd 100644 --- a/security/gnustep-ssl/Makefile +++ b/security/gnustep-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/11/04 11:22:24 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= gnustep-base-1.10.1 @@ -10,7 +10,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= GNUstep SSL bundle -BUILDLINK_DEPENDS.gnustep-base= gnustep-base>1.10.1 +BUILDLINK_DEPENDS.gnustep-base+= gnustep-base>1.10.1 PTHREAD_LIBS= -lpthread @@ -20,7 +20,7 @@ USE_TOOLS+= gmake GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/share/GNUstep CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" +CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q} SUBST_CLASSES+= gsssl SUBST_STAGE.gsssl= pre-configure diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index bddb586a78f..0b31b090d12 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/11/14 18:17:49 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:56 rillig Exp $ DISTNAME= gnutls-1.2.9 CATEGORIES= security devel @@ -16,7 +16,7 @@ COMMENT= GNU Transport Layer Security library PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes -USE_TOOLS= gmake +USE_TOOLS+= gmake GNU_CONFIGURE= yes TEST_TARGET= check @@ -25,9 +25,9 @@ INFO_FILES= gnutls.info PKGCONFIG_OVERRIDE= lib/gnutls.pc.in PKGCONFIG_OVERRIDE+= libextra/gnutls-extra.pc.in -BUILDLINK_DEPENDS.opencdk= opencdk>=0.5.5 -BUILDLINK_DEPENDS.libtasn1= libtasn1>=0.2.11 -BUILDLINK_DEPENDS.libgcrypt= libgcrypt>=1.2.2 +BUILDLINK_DEPENDS.opencdk+= opencdk>=0.5.5 +BUILDLINK_DEPENDS.libtasn1+= libtasn1>=0.2.11 +BUILDLINK_DEPENDS.libgcrypt+= libgcrypt>=1.2.2 MAKE_ENV+= RM=${RM:Q} MAKE_ENV+= TZ=UTC diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index efc90b7e9b0..1f59472308f 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/08/12 19:36:53 drochner Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= gpgme-1.0.3 @@ -23,7 +23,7 @@ PKG_SUPPORTED_OPTIONS= gpgsm LIBS.SunOS+= -lnsl -lsocket # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} # getenv_r is not detected correctly. It will be found # in either base system or librfuncs diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile index d58da19526c..24f0a0c7d91 100644 --- a/security/gtk-systrace/Makefile +++ b/security/gtk-systrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= gtk-systrace-2002-12-01 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.citi.umich.edu/u/provos/systrace/index.html COMMENT= GTK interface to systrace(1) -ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-[2-9]* +ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-[2-9]*-* WRKSRC= ${WRKDIR}/notification-0.1 GNU_CONFIGURE= YES diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index a994fff8087..b86596d6258 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/10/26 16:44:24 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2005/12/05 20:50:56 rillig Exp $ DISTNAME= heimdal-0.7.1 PKGREVISION= 1 @@ -83,7 +83,7 @@ HEIMDAL_TRANSFORM= s/^ftp/${KRB5_PREFIX}&/; \ KRB5_PREFIX= # empty HEIMDAL_TRANSFORM= s/^ftp/k&/ .endif -PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX} +PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q} CONFIGURE_ARGS+= --program-transform-name="${HEIMDAL_TRANSFORM}" USE_PKGINSTALL= yes diff --git a/security/honeyd-arpd/Makefile b/security/honeyd-arpd/Makefile index 981bd55fc35..6271e2ce94e 100644 --- a/security/honeyd-arpd/Makefile +++ b/security/honeyd-arpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/09/16 14:46:43 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= arpd-0.2 @@ -28,4 +28,3 @@ do-install: .include "../../net/libdnet/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" - diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile index 12abf722d73..80764429f0f 100644 --- a/security/honeyd/Makefile +++ b/security/honeyd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/16 14:46:43 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= honeyd-1.0 @@ -31,7 +31,6 @@ DOCDIR= ${PREFIX}/share/doc/${PKGBASE} .for f in ${DIST_CONF_FILES} CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.undef f .include "../../devel/libevent/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/security/honeyd/options.mk b/security/honeyd/options.mk index 39b1e4fe920..9b9cc83397b 100644 --- a/security/honeyd/options.mk +++ b/security/honeyd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/04/20 14:34:31 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.honeyd PKG_SUPPORTED_OPTIONS= python rrdtool @@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS= python rrdtool ### .if !empty(PKG_OPTIONS:Mpython) . include "../../lang/python/extension.mk" -CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q} .else CONFIGURE_ARGS+= --without-python .endif diff --git a/security/hydra/Makefile b/security/hydra/Makefile index 301083d93ca..4cf054c238c 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:23 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= ${PKGNAME}-src @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} LICENSE+= hydra-license -SUBST_CLASSES= build +SUBST_CLASSES+= build SUBST_STAGE.build= post-patch SUBST_FILES.build= Makefile.am configure hydra-gtk/src/main.c SUBST_SED.build= -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \ diff --git a/security/ike-scan/Makefile b/security/ike-scan/Makefile index 73c8cd86668..39cd46778ea 100644 --- a/security/ike-scan/Makefile +++ b/security/ike-scan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:12 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:56 rillig Exp $ DISTNAME= ike-scan-1.7.1 CATEGORIES= security @@ -11,7 +11,7 @@ COMMENT= Fingerprinting IKE implementation GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-openssl -SUBST_CLASSES= man +SUBST_CLASSES+= man SUBST_STAGE.man= post-patch SUBST_FILES.man= ike-scan.1 SUBST_SED.man= -e "s|/usr/local|${PREFIX}|g" diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 986734de369..24c785d5a26 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/11/22 16:22:47 tron Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:56 rillig Exp $ DISTNAME= ipsec-tools-0.6.3 CATEGORIES= security @@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --enable-adminport --enable-dpd CONFIGURE_ARGS+= --enable-natt=kernel CONFIGURE_ARGS+= --localstatedir=${VARBASE} -PLIST_SUBST+= VARBASE=${VARBASE} +PLIST_SUBST+= VARBASE=${VARBASE:Q} PKG_SYSCONFSUBDIR= racoon CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/security/jessie/Makefile b/security/jessie/Makefile index cb93fa08979..daf5a7765f0 100644 --- a/security/jessie/Makefile +++ b/security/jessie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:30 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= jessie-0.9.7 @@ -11,7 +11,7 @@ COMMENT= GPL implementation of the Java Secure Sockets Extension DEPENDS+= gnu-crypto>=2.0:../../security/gnu-crypto -USE_TOOLS= gmake +USE_TOOLS+= gmake USE_JAVA2= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/security/libbf/Makefile b/security/libbf/Makefile index 8341ad8e3c9..dad86efa0f4 100644 --- a/security/libbf/Makefile +++ b/security/libbf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:32 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= libbf-0.8.2b @@ -23,7 +23,7 @@ BF_ENC=asm/bx86-elf.o BF_ENC=bf_enc.o .endif -MAKEFLAGS+= BF_ENC=${BF_ENC} +MAKEFLAGS+= BF_ENC=${BF_ENC:Q} INSTALLATION_DIRS= bin include lib diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile index e87d238019a..fd964ef3e97 100644 --- a/security/libnasl/Makefile +++ b/security/libnasl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:13 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:56 rillig Exp $ -.include "../nessus/Makefile.common" +.include "../../security/nessus/Makefile.common" DISTNAME= libnasl-${VERS} diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index c47301bf2be..d9b23769950 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/10/05 13:29:51 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:56 rillig Exp $ DISTNAME= krb5-1.4.2 PKGNAME= mit-${DISTNAME:S/-signed$//} @@ -27,7 +27,7 @@ USE_LIBTOOL= yes # The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc. MIT_KRB5_STATEDIR?= ${VARBASE} -FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR} +FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR:Q} CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --enable-kdc-replay-cache CONFIGURE_ARGS+= --disable-thread-support CONFIGURE_ARGS+= --without-krb4 CONFIGURE_ARGS+= --without-tcl -MAKE_ENV+= ROOT_USER=${ROOT_USER} +MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} PKG_OPTIONS_VAR= PKG_OPTIONS.mit-krb5 PKG_SUPPORTED_OPTIONS= kerberos-prefix-cmds @@ -59,7 +59,7 @@ MIT_KRB5_TRANSFORM= s/^ftp/${KRB5_PREFIX}&/; \ KRB5_PREFIX= # empty MIT_KRB5_TRANSFORM= s/^ftp/k&/ .endif -PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX} +PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q} CONFIGURE_ARGS+= --program-transform-name="${MIT_KRB5_TRANSFORM}" # Fix some places in the MIT krb5 sources that don't point to the correct diff --git a/security/msu/Makefile b/security/msu/Makefile index e8d34186b1f..6f9219f34ef 100644 --- a/security/msu/Makefile +++ b/security/msu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 22:52:59 grant Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:56 rillig Exp $ # DISTNAME= msu-1.06 @@ -9,6 +9,6 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://www.mono.org/abs/tools/msu/ COMMENT= Mini passwordless su -MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/security/msudir/Makefile b/security/msudir/Makefile index 402849fa0c0..85daf740870 100644 --- a/security/msudir/Makefile +++ b/security/msudir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 22:53:00 grant Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:57 rillig Exp $ # DISTNAME= msudir-0.13 @@ -9,6 +9,6 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://www.mono.org/abs/tools/msudir/ COMMENT= Easy setuid script management -MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile index 46b35346ca4..371f130bb71 100644 --- a/security/nessus-core/Makefile +++ b/security/nessus-core/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2005/07/29 16:42:05 tron Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:57 rillig Exp $ -.include "../nessus/Makefile.common" +.include "../../security/nessus/Makefile.common" DISTNAME= nessus-core-${VERS} @@ -14,7 +14,7 @@ CONFIGURE_ENV+= ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \ ac_cv_path_GLIBCONFIG="pkg-config glib-2.0" RCD_SCRIPTS= nessusd -PLIST_SUBST+= VARBASE="${VARBASE}" +PLIST_SUBST+= VARBASE=${VARBASE:Q} .include "../../security/libnasl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile index efa62f9dca2..24b73d2c77f 100644 --- a/security/nessus-libraries/Makefile +++ b/security/nessus-libraries/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:14 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $ -.include "../nessus/Makefile.common" +.include "../../security/nessus/Makefile.common" DISTNAME= nessus-libraries-${VERS} COMMENT= Libs required by the Nessus Network security scanner @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \ --with-ssl=${BUILDLINK_PREFIX.openssl} \ --localstatedir=${VARBASE} -CONFIGURE_ENV+= CPP="${CPP}" +CONFIGURE_ENV+= CPP=${CPP:Q} .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile index 43c6f165de3..d757c0c38e4 100644 --- a/security/nessus-plugins/Makefile +++ b/security/nessus-plugins/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2005/08/30 20:46:23 tron Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $ -.include "../nessus/Makefile.common" +.include "../../security/nessus/Makefile.common" DISTNAME= nessus-plugins-GPL-${VERS} PKGREVISION= 2 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= cat gzip CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ENV+= CAT="${TOOLS_CAT}" GZIP=${TOOLS_GZIP_CMD:Q} +CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} GZIP=${TOOLS_GZIP_CMD:Q} PLIST_SRC= ${WRKDIR}/PLIST PLIST diff --git a/security/nessus/Makefile b/security/nessus/Makefile index 441471092b8..fe9a51ec15a 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2005/08/09 21:33:23 tron Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:57 rillig Exp $ -.include "../nessus/Makefile.common" +.include "../../security/nessus/Makefile.common" DISTNAME= nessus-${VERS} MASTER_SITES= # empty diff --git a/security/nikto/Makefile b/security/nikto/Makefile index 892ce7012ee..83267d3b56b 100644 --- a/security/nikto/Makefile +++ b/security/nikto/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2005/09/06 21:11:57 adrianp Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:57 rillig Exp $ DISTNAME= nikto-1.35 PKGREVISION= 2 -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb2 CATEGORIES= security www MASTER_SITES= http://www.cirt.net/nikto/ @@ -21,7 +21,7 @@ USE_PKGINSTALL= YES # NOTE: this package will not work with pkgviews due to a hardcoded # location for nmap. # -SUBST_CLASSES= conf +SUBST_CLASSES+= conf SUBST_STAGE.conf= post-patch SUBST_FILES.conf= config.txt SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" diff --git a/security/openpam/Makefile b/security/openpam/Makefile index 449df07838b..528cb09d441 100644 --- a/security/openpam/Makefile +++ b/security/openpam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:14 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:57 rillig Exp $ DISTNAME= openpam-20050201 CATEGORIES= security @@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openpam/} MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://www.openpam.org/ -COMMENT= open-source PAM library +COMMENT= Open-source PAM library CONFLICTS+= PAM-[0-9]* diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 7b088b71540..398abca3a94 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/10/07 17:43:29 reed Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:57 rillig Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -107,8 +107,8 @@ ASKPASS_PROGRAM= ${X11BASE}/bin/ssh-askpass .else ASKPASS_PROGRAM= ${X11PREFIX}/bin/ssh-askpass .endif -CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM} -MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM} +CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} +MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} CONFS= ssh_config sshd_config moduli @@ -129,7 +129,7 @@ OWN_DIRS= ${OPENSSH_CHROOT} RCD_SCRIPTS= sshd PLIST_SRC+= ${.CURDIR}/PLIST -FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR} +FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} MESSAGE_SUBST+= EGDIR=${EGDIR} MESSAGE_SUBST+= OPENSSH_USER=${OPENSSH_USER} MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP} diff --git a/security/openssh/Makefile b/security/openssh/Makefile index c29eb1916fc..80e6274d617 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.160 2005/11/14 22:36:17 grant Exp $ +# $NetBSD: Makefile,v 1.161 2005/12/05 20:50:57 rillig Exp $ DISTNAME= openssh-4.2p1 PKGNAME= openssh-4.2.1 -PKGREVISION= SVR4_PKGNAME= ossh CATEGORIES= security MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ @@ -109,8 +108,8 @@ ASKPASS_PROGRAM= ${X11BASE}/bin/ssh-askpass .else ASKPASS_PROGRAM= ${X11PREFIX}/bin/ssh-askpass .endif -CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM} -MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM} +CONFIGURE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} +MAKE_ENV+= ASKPASS_PROGRAM=${ASKPASS_PROGRAM:Q} # do the same for xauth .if exists(${X11BASE}/bin/xauth) @@ -140,7 +139,7 @@ OWN_DIRS= ${OPENSSH_CHROOT} RCD_SCRIPTS= sshd PLIST_SRC+= ${.CURDIR}/PLIST -FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR} +FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 2852dd253d0..93fd55e518f 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2005/10/15 06:29:58 jlam Exp $ +# $NetBSD: Makefile,v 1.109 2005/12/05 20:50:57 rillig Exp $ OPENSSL_SNAPSHOT?= # empty OPENSSL_STABLE?= # empty @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= irix64-mips4-cc .include "../../security/openssl/options.mk" CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} -CONFIGURE_ENV+= PERL="${PERL5}" +CONFIGURE_ENV+= PERL=${PERL5:Q} PLIST_OPSYS= ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//} .if exists(${PLIST_OPSYS}) diff --git a/security/p0f/Makefile b/security/p0f/Makefile index ca9e6e48dcc..b9ded4847c5 100644 --- a/security/p0f/Makefile +++ b/security/p0f/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:32 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:57 rillig Exp $ # DISTNAME= p0f-2.0.5 @@ -19,7 +19,7 @@ CONF_FILES= ${PREFIX}/share/examples/p0f/p0f.fp ${PKG_SYSCONFDIR}/p0f.fp CONF_FILES+= ${PREFIX}/share/examples/p0f/p0fa.fp ${PKG_SYSCONFDIR}/p0fa.fp CONF_FILES+= ${PREFIX}/share/examples/p0f/p0fr.fp ${PKG_SYSCONFDIR}/p0fr.fp -SUBST_CLASSES= paths +SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-build SUBST_FILES.paths= config.h p0f.1 SUBST_SED.paths= -e "s|/etc/p0f|${PKG_SYSCONFDIR}|g" diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile index f8d8cc74a72..124cefb4fa4 100644 --- a/security/p5-Digest/Makefile +++ b/security/p5-Digest/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2005/11/23 22:29:51 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:57 rillig Exp $ # DISTNAME= Digest-1.13 PKGNAME= p5-${DISTNAME} SVR4_PKGNAME= p5dig -PKGREVISION= # empty CATEGORIES= security perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Digest/} diff --git a/security/p5-Net-DNS-SEC/Makefile b/security/p5-Net-DNS-SEC/Makefile index 37912557396..90b549b8368 100644 --- a/security/p5-Net-DNS-SEC/Makefile +++ b/security/p5-Net-DNS-SEC/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/10/22 20:05:01 heinz Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:57 rillig Exp $ # DISTNAME= Net-DNS-SEC-0.12 @@ -20,7 +20,7 @@ DEPENDS+= p5-Digest-SHA1>=2.04:../../security/p5-Digest-SHA1 DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64 DEPENDS+= p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble -BUILDLINK_DEPENDS.perl= perl>=5.6.1 +BUILDLINK_DEPENDS.perl+= perl>=5.6.1 USE_PKGINSTALL= YES PERL5_PACKLIST= auto/Net/DNS/SEC/.packlist diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile index f5edb880d41..da95c4d6629 100644 --- a/security/pflkm/Makefile +++ b/security/pflkm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/23 11:48:51 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:57 rillig Exp $ DISTNAME= pflkm-20050511 CATEGORIES= security @@ -92,7 +92,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump.cat8 ${PREFIX}/man/cat8/pftcpdump.0 ${INSTALL_MAN} ${WRKSRC}/usr.sbin/tcpdump/pftcpdump.8 ${PREFIX}/man/man8/pftcpdump.8 -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_STAGE.path= post-patch SUBST_FILES.path= man/pfsync.4 man/pf.conf.5 SUBST_FILES.path+= sbin/pfctl/pfctl.8 sbin/pfctl/pfctl_parser.h diff --git a/security/php-mcrypt/Makefile b/security/php-mcrypt/Makefile index 5d25ccb585d..cfb60375440 100644 --- a/security/php-mcrypt/Makefile +++ b/security/php-mcrypt/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:58 rillig Exp $ MODNAME= mcrypt CATEGORIES+= security -PKGREVISION= # empty COMMENT= PHP extension for the mcrypt crypto algorithms library diff --git a/security/php-mhash/Makefile b/security/php-mhash/Makefile index d41f5ff5cef..7eaa4f3443b 100644 --- a/security/php-mhash/Makefile +++ b/security/php-mhash/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:58 rillig Exp $ MODNAME= mhash CATEGORIES+= security -PKGREVISION= # empty COMMENT= PHP extension for the mhash hash algorithms library diff --git a/security/pinepgp/Makefile b/security/pinepgp/Makefile index ab838ab50a7..555d4de9e8d 100644 --- a/security/pinepgp/Makefile +++ b/security/pinepgp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/24 18:29:14 kristerw Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= pinepgp-0.18.0 @@ -17,7 +17,7 @@ DEPENDS+= bash>=2:../../shells/bash2 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= cat -CONFIGURE_ENV+= CAT="${TOOLS_CAT}" +CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} PINEPGP_USEGPG?= yes PINEPGP_USEPGP5?= yes diff --git a/security/pks/Makefile b/security/pks/Makefile index 42b3de79698..e6cf4e7a186 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/10/23 19:59:54 adrianp Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:58 rillig Exp $ DISTNAME= pks-0.9.4 PKGREVISION= 3 @@ -35,8 +35,8 @@ EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/pksd.conf ${PKG_SYSCONFDIR}/pksd.conf RCD_SCRIPTS= pksd -FILES_SUBST+= PKS_USER=${PKS_USER} -FILES_SUBST+= PKS_GROUP=${PKS_GROUP} +FILES_SUBST+= PKS_USER=${PKS_USER:Q} +FILES_SUBST+= PKS_GROUP=${PKS_GROUP:Q} OWN_DIRS_PERMS+= ${PKS_HOME} ${PKS_USER} ${PKS_GROUP} 0770 OWN_DIRS_PERMS+= ${PKS_HOME}/db ${PKS_USER} ${PKS_GROUP} 0770 @@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --localstatedir=${PKS_HOME} # CONFIGURE_ARGS+= --sysconfdir=${EGDIR} -SUBST_CLASSES= paths +SUBST_CLASSES+= paths SUBST_MESSAGE.paths= "Fixing hardcoded paths." SUBST_STAGE.paths= post-patch SUBST_FILES.paths= pks-commands.html diff --git a/security/prngd/Makefile b/security/prngd/Makefile index b242967b085..7faf786bd46 100644 --- a/security/prngd/Makefile +++ b/security/prngd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/03/07 10:03:13 uebayasi Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:58 rillig Exp $ DISTNAME= prngd-0.9.29 CATEGORIES= security @@ -21,7 +21,7 @@ CONF_FILES= ${EGDIR}/prngd.conf.netbsd ${PKG_SYSCONFDIR}/prngd.conf INSTALLATION_DIRS= bin man/man1 -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_STAGE.path= pre-install SUBST_FILES.path= prngd.man SUBST_SED.path= -e 's,/usr/local,${PREFIX},g' diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index a130bbe3cec..59b253fda81 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:18 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= m2crypto-0.12 @@ -15,7 +15,7 @@ COMMENT= Crypto and SSL toolkit for Python PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 23 22 21 -BUILDLINK_DEPENDS.openssl= openssl>=0.9.7b +BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7b .include "../../lang/python/extension.mk" .include "../../devel/swig-build/buildlink3.mk" diff --git a/security/qca/Makefile b/security/qca/Makefile index 9e37ad5bfac..3257927b7eb 100644 --- a/security/qca/Makefile +++ b/security/qca/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:58 rillig Exp $ DISTNAME= qca-1.0 -PKGREVISION= # empty CATEGORIES= security MASTER_SITES= http://delta.affinix.com/qca/ EXTRACT_SUFX= .tar.bz2 diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile index 66a5156d90e..a4ad42f6fd5 100644 --- a/security/smtpd/Makefile +++ b/security/smtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/10/29 19:49:40 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= smtpd-2.0 @@ -19,21 +19,21 @@ RCD_SCRIPTS= smtpfwdd FILES_SUBST+= SPOOL=${SPOOL:Q} # taken directly from the Makefile. -CFLAGS.NetBSD= -DUSE_FLOCK -DUSE_MKSTEMP -CFLAGS.DragonFly= -DUSE_FLOCK -DUSE_MKSTEMP -CFLAGS.SunOS= -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES -CFLAGS.IRIX= -DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES -CFLAGS.AIX= -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H -OPSYSVARS= LD_LIBS -LD_LIBS.SunOS= -lnsl -lsocket -lresolv -MAKE_ENV+= LD_LIBS="${LD_LIBS}" +CFLAGS.NetBSD+= -DUSE_FLOCK -DUSE_MKSTEMP +CFLAGS.DragonFly+= -DUSE_FLOCK -DUSE_MKSTEMP +CFLAGS.SunOS+= -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_STRINGS_H -DBROKEN_SUN_INCLUDES +CFLAGS.IRIX+= -DGETOPT_EOF -DUSE_FLOCK -DNEEDS_FCNTL_H -DNEEDS_BSTRING_H -DIRIX_BROKEN_INCLUDES +CFLAGS.AIX+= -DGETOPT_EOF -DUSE_LOCKF -DNEEDS_FCNTL_H -DNEEDS_LOCKF_H -DNEEDS_STRINGS_H -DNEEDS_SELECT_H +OPSYSVARS+= LD_LIBS +LD_LIBS.SunOS+= -lnsl -lsocket -lresolv +MAKE_ENV+= LD_LIBS=${LD_LIBS:Q} .include "../../mk/bsd.prefs.mk" INSTALLATION_DIRS= sbin do-install: - -${INSTALL_DATA_DIR} ${SPOOL}/etc + ${INSTALL_DATA_DIR} ${SPOOL}/etc ${INSTALL} -m 500 ${WRKSRC}/smtpd ${PREFIX}/sbin/smtpd ${INSTALL} -m 500 ${WRKSRC}/smtpfwdd ${PREFIX}/sbin/smtpfwdd ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smtpd diff --git a/security/sniff/Makefile b/security/sniff/Makefile index 555a7de2a8f..68588b506b4 100644 --- a/security/sniff/Makefile +++ b/security/sniff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:19 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= sniff-2.0 @@ -13,7 +13,7 @@ COMMENT= Program to sniff logins and passwords .if ${OPSYS} == "SunOS" LIBS+= -lsocket -lnsl -MAKE_ENV+= LIBS="${LIBS}" +MAKE_ENV+= LIBS=${LIBS:M*:Q} .endif .include "../../net/libpcap/buildlink3.mk" diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common index 39ca6c84d61..ce4f4bc6328 100644 --- a/security/ssh2/Makefile.common +++ b/security/ssh2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2005/10/23 23:11:09 rillig Exp $ +# $NetBSD: Makefile.common,v 1.15 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= ssh-3.2.9.1 @@ -6,7 +6,7 @@ CATEGORIES= security MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/ MAINTAINER= seb@NetBSD.org -HOMEPAGE= http://www.ssh.com +HOMEPAGE= http://www.ssh.com/ CONFLICTS+= openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]* CONFLICTS+= openssh+gssapi-[0-9]* @@ -63,8 +63,8 @@ CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR} CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} -MAKE_ENV+= PKGBASE=${PKGBASE} -MAKE_ENV+= RM="${RM}" +MAKE_ENV+= PKGBASE=${PKGBASE:Q} +MAKE_ENV+= RM=${RM:Q} RCD_SCRIPTS= ssh2_secure_shell @@ -77,7 +77,7 @@ CONF_FILES= # empty .for FILE in ${CONFS} CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor -FILES_SUBST= SSH_PID_DIR=${SSH_PID_DIR} +FILES_SUBST+= SSH_PID_DIR=${SSH_PID_DIR:Q} OWN_DIRS= ${PKG_SYSCONFDIR}/knownhosts OWN_DIRS+= ${PKG_SYSCONFDIR}/hostkeys diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile index b66d3271615..0ca056fd78a 100644 --- a/security/sslwrap/Makefile +++ b/security/sslwrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/10/10 09:16:48 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= ${PKGNAME_NOREV:S/-//} @@ -15,8 +15,8 @@ COMMENT= Simple SSL wrapper OPSYSVARS+= LDADD LDADD.SunOS= -lnsl -lsocket MAKE_ENV+= LDADD=${LDADD:Q} -MAKE_ENV+= BINOWN=${BINOWN} -MAKE_ENV+= BINGRP=${BINGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} +MAKE_ENV+= BINGRP=${BINGRP:Q} .include "../../security/openssl/buildlink3.mk" diff --git a/security/tct/Makefile b/security/tct/Makefile index f57062fef78..6207e69e3d8 100644 --- a/security/tct/Makefile +++ b/security/tct/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/08/06 06:19:31 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:58 rillig Exp $ # DISTNAME= tct-1.09 @@ -17,7 +17,7 @@ REPLACE_PERL= bin/grave-robber bin/mactime bin/strip_tct_home REPLACE_PERL+= extras/bdf extras/ils2mac extras/realpath REPLACE_PERL+= lazarus/lazarus -MAKE_ENV+= PERL5="${PERL5}" +MAKE_ENV+= PERL5=${PERL5:Q} do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/bin diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo index 883986044d0..aca552ab71f 100644 --- a/security/tripwire/distinfo +++ b/security/tripwire/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/02/24 13:10:14 agc Exp $ +$NetBSD: distinfo,v 1.11 2005/12/05 20:50:58 rillig Exp $ SHA1 (tripwire-1.2.tar.gz) = 6fc91e25b3e1af3881fd5b6acf240ab6c1133e38 RMD160 (tripwire-1.2.tar.gz) = f745db5973f14b1abbc0c2e7030f90e6fdac3257 @@ -7,10 +7,10 @@ SHA1 (patch-aa) = 2a03c5970becef18d0b655cc5e91a1db070111f8 SHA1 (patch-ab) = 186edaa504e6e1a7edadb2168982b9b8a2482bac SHA1 (patch-ac) = 35b3fe52f497e6cbbf7edfeaee398f0d24aff219 SHA1 (patch-ad) = 4b8ad8d0cd7c17a8f3a655c5a574856670533ea5 -SHA1 (patch-ae) = 18fe18ded565476a80b9280054cdf7f90403588e -SHA1 (patch-af) = b8238aa69ddab6c74ac9057bdc58acbce0f50c0e +SHA1 (patch-ae) = 6eb1767af3d881ed4181ab83bd02c960edd0a84e +SHA1 (patch-af) = 1e4eb327ddda18ef08d4b62ca846262dfdf059a6 SHA1 (patch-ag) = 3bfc6965782d727b6b5cf20da4dd44e45327925f SHA1 (patch-ah) = 97eccc44190e165dbf174f04c3acab5f1b442bc7 -SHA1 (patch-ai) = 51075e32a7523a8d1691aa41336fe46b671fa865 +SHA1 (patch-ai) = c01404b4036d8607c0eea294d2c87d7f454e9abe SHA1 (patch-aj) = 87a7df6f487339cf06ec662492db4fc238674488 SHA1 (patch-ak) = f97dbba31eec398322384ec72c75ba6698d55718 diff --git a/security/tripwire/patches/patch-ae b/security/tripwire/patches/patch-ae index 6f91bcdfd90..c11b40d78fb 100644 --- a/security/tripwire/patches/patch-ae +++ b/security/tripwire/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2003/12/05 05:40:32 ben Exp $ +$NetBSD: patch-ae,v 1.2 2005/12/05 20:50:58 rillig Exp $ --- src/config.parse.c.orig 1994-07-20 18:03:26.000000000 -0700 +++ src/config.parse.c -@@ -55,7 +55,6 @@ static char rcsid[] = "$Id: config.parse +@@ -55,7 +55,6 @@ #endif /* prototypes */ diff --git a/security/tripwire/patches/patch-af b/security/tripwire/patches/patch-af index c6fbc789b9c..27a22366ac4 100644 --- a/security/tripwire/patches/patch-af +++ b/security/tripwire/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2003/12/09 19:17:37 ben Exp $ +$NetBSD: patch-af,v 1.3 2005/12/05 20:50:58 rillig Exp $ --- src/dbase.build.c.orig 1994-07-25 08:24:09.000000000 -0700 +++ src/dbase.build.c -@@ -66,7 +66,6 @@ static char rcsid[] = "$Id: dbase.build. +@@ -66,7 +66,6 @@ int files_scanned_num = 0; /* prototypes */ diff --git a/security/tripwire/patches/patch-ai b/security/tripwire/patches/patch-ai index 164f42bb3b3..2bc7bbbe49d 100644 --- a/security/tripwire/patches/patch-ai +++ b/security/tripwire/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1 2003/12/05 05:40:32 ben Exp $ +$NetBSD: patch-ai,v 1.2 2005/12/05 20:50:58 rillig Exp $ --- src/siggen.c.orig 1994-07-25 08:24:12.000000000 -0700 +++ src/siggen.c -@@ -52,7 +52,6 @@ static char rcsid[] = "$Id: siggen.c,v 1 +@@ -52,7 +52,6 @@ extern int optind; int debuglevel = 0; diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index d3e670939e4..6b988ea88d1 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/09/18 13:51:09 taca Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:58 rillig Exp $ DISTNAME= zebedee-2.5.3 CATEGORIES= security @@ -12,8 +12,8 @@ DEPENDS+= tcl-[0-9]*:../../lang/tcl USE_TOOLS+= gmake perl -MAKE_ENV+= PERL5=${PERL5} -MAKE_FLAGS= OS=${LOWER_OPSYS} +MAKE_ENV+= PERL5=${PERL5:Q} +MAKE_FLAGS+= OS=${LOWER_OPSYS:Q} .include "../../mk/pthread.buildlink3.mk" |