diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-04 21:12:51 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-04 21:12:51 +0000 |
| commit | 805b440f10356ac31240fdb9960107d1f547f52f (patch) | |
| tree | 76544c2b719967417daf101900353fc02066f614 | |
| parent | 1c44ec1b14eb5e1fcb019972f90d270ed64d21b1 (diff) | |
| download | pkgsrc-805b440f10356ac31240fdb9960107d1f547f52f.tar.gz | |
security: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
118 files changed, 449 insertions, 449 deletions
diff --git a/security/Bastille/Makefile b/security/Bastille/Makefile index b20a1e045de..3ec430edcd8 100644 --- a/security/Bastille/Makefile +++ b/security/Bastille/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:22:44 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:51 rillig Exp $ # DISTNAME= Bastille-3.0.9 @@ -19,7 +19,7 @@ USE_LANGUAGES= # none USE_TOOLS+= bash:run perl:run NO_BUILD= yes -CHECK_INTERPRETER_SKIP+=share/Bastille/bastille-tmpdir.csh +CHECK_INTERPRETER_SKIP+= share/Bastille/bastille-tmpdir.csh BUILD_DEPENDS+= checkperms>=1.4:../../sysutils/checkperms DEPENDS+= p5-Tk-[0-9]*:../../x11/p5-Tk diff --git a/security/CoolKey/Makefile b/security/CoolKey/Makefile index 2697c4cbc9b..57de801769c 100644 --- a/security/CoolKey/Makefile +++ b/security/CoolKey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/08/16 20:45:44 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:12:51 rillig Exp $ # DISTNAME= coolkey-1.1.0 @@ -31,9 +31,9 @@ USE_TOOLS+= gsed USE_LANGUAGES= c c++ AUTOCONF_REQD= 2.59 -CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --disable-dependency-tracking PKGCONFIG_OVERRIDE+= src/libckyapplet/libckyapplet.pc.in diff --git a/security/EasyPG/Makefile b/security/EasyPG/Makefile index bd54d073371..11eb99e8837 100644 --- a/security/EasyPG/Makefile +++ b/security/EasyPG/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/09/29 12:40:28 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:51 rillig Exp $ DISTNAME= epg-0.0.16 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/epg/EasyPG/} @@ -10,8 +10,8 @@ MAINTAINER= gdt@NetBSD.org HOMEPAGE= http://www.easypg.org/ COMMENT= GnuPG interface for emacs -GNU_CONFIGURE= YES -MAKE_FLAGS+= lispdir=${EMACS_LISPPREFIX:Q} +GNU_CONFIGURE= YES +MAKE_FLAGS+= lispdir=${EMACS_LISPPREFIX:Q} INSTALL_MAKE_FLAGS+= lispdir=${DESTDIR}${EMACS_LISPPREFIX:Q} INFO_FILES= yes @@ -19,7 +19,7 @@ INFO_FILES= yes # per README: GnuPG 1.4.3 DEPENDS+= gnupg>=1.4.3:../../security/gnupg # per README: GNU Emacs 21.4, XEmacs 21.4, or later -EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox xemacs214 xemacs215 +EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox xemacs214 xemacs215 .include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/apg/Makefile b/security/apg/Makefile index 75c1b1ead0f..5d280ccaa68 100644 --- a/security/apg/Makefile +++ b/security/apg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/11 13:22:44 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:12:51 rillig Exp $ # DISTNAME= apg-2.3.0b @@ -16,10 +16,10 @@ MAKE_ENV+= FLAGS=${CFLAGS:M*:Q} INSTALL_PREFIX=${DESTDIR:Q}${PREFIX:Q} USE_TOOLS+= perl:run REPLACE_PERL= perl/apgcli.pl -OPSYSVARS+= APG_CS_CLIBS +OPSYSVARS+= APG_CS_CLIBS APG_CS_CLIBS.Linux+= -lnsl APG_CS_CLIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= APG_CS_CLIBS=${APG_CS_CLIBS:Q} +MAKE_ENV+= APG_CS_CLIBS=${APG_CS_CLIBS:Q} INSTALLATION_DIRS+= bin sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 diff --git a/security/asignify/Makefile b/security/asignify/Makefile index 9363d55aff1..24372caf816 100644 --- a/security/asignify/Makefile +++ b/security/asignify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/07/30 22:32:21 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:12:51 rillig Exp $ DISTNAME= asignify-20150220 CATEGORIES= security @@ -16,6 +16,6 @@ USE_LIBTOOL= yes USE_TOOLS+= automake pre-configure: - cd ${WRKSRC}; sh ./autogen.sh + cd ${WRKSRC}; sh ./autogen.sh .include "../../mk/bsd.pkg.mk" diff --git a/security/botan/Makefile b/security/botan/Makefile index 23809f25ec3..0935a0a5920 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2019/09/02 13:19:54 adam Exp $ +# $NetBSD: Makefile,v 1.53 2019/11/04 21:12:51 rillig Exp $ DISTNAME= Botan-1.10.17 PKGNAME= ${DISTNAME:tl} @@ -15,7 +15,7 @@ LICENSE= 2-clause-bsd HAS_CONFIGURE= yes USE_LANGUAGES= c++03 -PYTHON_FOR_BUILD_ONLY= yes +PYTHON_FOR_BUILD_ONLY= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.8.14; 1.10 is supposedly better CONFIG_SHELL= ${PYTHONBIN} @@ -32,12 +32,12 @@ PLIST_VARS+= x86 x86_64 i386 .if ${MACHINE_ARCH} == "x86_64" CONFIGURE_ARGS+= --cpu=amd64 -PLIST.x86_64= yes -PLIST.x86= yes +PLIST.x86_64= yes +PLIST.x86= yes .elif ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+= --cpu=i386 -PLIST.i386= yes -PLIST.x86= yes +PLIST.i386= yes +PLIST.x86= yes .elif ${MACHINE_ARCH} == "powerpc" CONFIGURE_ARGS+= --cpu=ppc .elif ${MACHINE_ARCH} == "powerpc64" diff --git a/security/ccid/Makefile b/security/ccid/Makefile index d0df1bc4c80..1520a6f1d7a 100644 --- a/security/ccid/Makefile +++ b/security/ccid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/09/17 23:09:42 perseant Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/04 21:12:52 rillig Exp $ # DISTNAME= ccid-1.4.27 @@ -30,8 +30,8 @@ USE_LANGUAGES= c c++ # PTHREAD vars. Not yet reported upstream. PTHREAD_AUTO_VARS= yes -CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} REPLACE_PERL= src/convert_version.pl src/create_Info_plist.pl diff --git a/security/cvm/Makefile b/security/cvm/Makefile index 2a9d87d28b2..a2efa5fe92d 100644 --- a/security/cvm/Makefile +++ b/security/cvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:14 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:12:52 rillig Exp $ # DISTNAME= cvm-0.97 @@ -47,9 +47,9 @@ DJB_CONFIG_CMDS= \ .include "../../mk/bsd.prefs.mk" .if ${SHLIB_TYPE} == "dylib" -CVM_LIB_EXT=dylib +CVM_LIB_EXT= dylib .else -CVM_LIB_EXT=so +CVM_LIB_EXT= so .endif LDFLAGS.SunOS+= -lsocket -lnsl diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 279736eb8f9..dfd5b5481b9 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2018/12/09 21:05:35 adam Exp $ +# $NetBSD: Makefile,v 1.76 2019/11/04 21:12:52 rillig Exp $ COMMENT= Simple Authentication and Security Layer @@ -58,7 +58,7 @@ PKG_USERS_VARS+= CYRUS_USER PKG_GROUPS= ${CYRUS_GROUP} PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP} -PKG_SHELL.${CYRUS_USER}=${SH} +PKG_SHELL.${CYRUS_USER}= ${SH} MESSAGE_SUBST+= PLUGINDIR=${PLUGINDIR:Q} diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common index 91b1f0d810b..e04fdc7102f 100644 --- a/security/cyrus-sasl/Makefile.common +++ b/security/cyrus-sasl/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2019/10/09 09:38:10 nros Exp $ +# $NetBSD: Makefile.common,v 1.30 2019/11/04 21:12:52 rillig Exp $ # # used by security/cyrus-sasl/Makefile # used by security/cy2-anonymous/Makefile @@ -17,15 +17,15 @@ # This Makefile fragment should be included _below_ any SASL_PLUGIN # definition and _above_ any CONFIGURE_ARGS definitions. -DISTNAME= cyrus-sasl-2.1.27 -DISTFILES= ${DISTNAME}-rc7${EXTRACT_SUFX} -CATEGORIES= security -MASTER_SITES= https://www.cyrusimap.org/releases/ -MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/ -#MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/ -#PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2 +DISTNAME= cyrus-sasl-2.1.27 +DISTFILES= ${DISTNAME}-rc7${EXTRACT_SUFX} +CATEGORIES= security +MASTER_SITES= https://www.cyrusimap.org/releases/ +MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/ +#MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/ +#PATCHFILES+= cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2 #SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \ -# -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d +# -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d #PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/security/cyrus-sasl/options.mk b/security/cyrus-sasl/options.mk index 94ca3b62c09..8fb3f383e59 100644 --- a/security/cyrus-sasl/options.mk +++ b/security/cyrus-sasl/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2016/09/11 06:11:15 richard Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:52 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl +PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl PKG_OPTIONS_REQUIRED_GROUPS= database PKG_OPTIONS_GROUP.database= ndbm bdb gdbm @@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+= ndbm . elif !empty(SASL_DBTYPE:Mberkeley) PKG_SUGGESTED_OPTIONS+= bdb . else -PKG_FAIL_REASON+= "Unknown SASL_DBTYPE: ${SASL_DBTYPE:Q}" +PKG_FAIL_REASON+= "Unknown SASL_DBTYPE: ${SASL_DBTYPE:Q}" . endif .elif exists(/usr/include/ndbm.h) && ${OPSYS} != "Linux" PKG_SUGGESTED_OPTIONS+= ndbm diff --git a/security/dirb/Makefile b/security/dirb/Makefile index e765b512750..78d0942bef8 100644 --- a/security/dirb/Makefile +++ b/security/dirb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:12:52 rillig Exp $ # PKGNAME= dirb-1.9 @@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dirb.sourceforge.net/ COMMENT= Web Content Scanner -WRKSRC=${WRKDIR}/dirb +WRKSRC= ${WRKDIR}/dirb USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/security/dnssec-tools/Makefile b/security/dnssec-tools/Makefile index 317e297c24b..002ebb70dba 100644 --- a/security/dnssec-tools/Makefile +++ b/security/dnssec-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/08/11 13:22:45 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:52 rillig Exp $ DISTNAME= dnssec-tools-2.1 PKGREVISION= 5 @@ -34,7 +34,7 @@ PERL5_PACKLIST+= auto/Net/DNS/SEC/Tools/conf/.packlist PERL5_PACKLIST+= auto/convertar/.packlist PERL5_PACKLIST+= auto/dnssec-tools/.packlist -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-nsec3 CONFIGURE_ARGS+= --with-resolv-conf=${PKG_SYSCONFDIR}/dnssec-tools/resolv.conf CONFIGURE_ARGS+= --with-root-hints=${PKG_SYSCONFDIR}/dnssec-tools/root.hints diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile index 398a880f58b..ed75a43d1a0 100644 --- a/security/flawfinder/Makefile +++ b/security/flawfinder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/04/25 07:33:15 maya Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/04 21:12:52 rillig Exp $ DISTNAME= flawfinder-1.31 PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= Python program to find flaws in C/C++ programs LICENSE= gnu-gpl-v2 NO_BUILD= yes -REPLACE_PYTHON= flawfinder +REPLACE_PYTHON= flawfinder INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: diff --git a/security/gnome-keyring-sharp/options.mk b/security/gnome-keyring-sharp/options.mk index 895e1c1868f..6e9bb06c745 100644 --- a/security/gnome-keyring-sharp/options.mk +++ b/security/gnome-keyring-sharp/options.mk @@ -1,6 +1,6 @@ -# $NetBSD: options.mk,v 1.1 2012/06/16 22:00:23 dholland Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:12:52 rillig Exp $ -PKG_OPTIONS_VAR=PKG_OPTIONS.gnome-keyring-sharp +PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-keyring-sharp PKG_SUPPORTED_OPTIONS= ndesk-dbus PKG_SUGGESTED_OPTIONS= ndesk-dbus diff --git a/security/gnupg-pkcs11-scd/Makefile b/security/gnupg-pkcs11-scd/Makefile index c7035aebd65..b0ec25edbfc 100644 --- a/security/gnupg-pkcs11-scd/Makefile +++ b/security/gnupg-pkcs11-scd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/07/20 22:46:47 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:52 rillig Exp $ VERSION= 0.7.0 DISTNAME= gnupg-pkcs11-scd-${VERSION} @@ -12,8 +12,8 @@ HOMEPAGE= http://gnupg-pkcs11.sourceforge.net/ COMMENT= OpenSC smart card support for GnuPG LICENSE= modified-bsd -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config LIBS.OperatingSystem+= -ldl CONFIGURE_ARGS+= --with-libgpg-error-prefix=${PREFIX} CONFIGURE_ARGS+= --with-libassuan-prefix=${PREFIX} diff --git a/security/go-crypt/Makefile b/security/go-crypt/Makefile index e71e34f9661..55897dc7914 100644 --- a/security/go-crypt/Makefile +++ b/security/go-crypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:56 bsiegert Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:53 rillig Exp $ # Making up a version number, as this is a snapshot after the latest release DISTNAME= crypt-0.0.2b @@ -7,7 +7,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=xordataexchange/} CATEGORIES= security GITHUB_TAG= 749e360c8f236773f28fc6d3ddfce4a470795227 -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xordataexchange.github.io/crypt/ diff --git a/security/go-sftp/Makefile b/security/go-sftp/Makefile index e0452665d24..fab8781033e 100644 --- a/security/go-sftp/Makefile +++ b/security/go-sftp/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.15 2019/10/18 14:58:56 bsiegert Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:12:53 rillig Exp $ DISTNAME= sftp-1.0.0 PKGNAME= go-${DISTNAME} PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=pkg/} CATEGORIES= security -GITHUB_TAG= ${PKGVERSION_NOREV} -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_TAG= ${PKGVERSION_NOREV} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/pkg/sftp diff --git a/security/gpgmepp/Makefile b/security/gpgmepp/Makefile index 22d89ee8f03..911d7303576 100644 --- a/security/gpgmepp/Makefile +++ b/security/gpgmepp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/04/03 00:33:04 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:12:53 rillig Exp $ DISTNAME= gpgmepp-15.12.2 PKGREVISION= 13 @@ -11,7 +11,7 @@ HOMEPAGE= https://projects.kde.org/gpgmepp COMMENT= C++ bindings/wrapper for gpgme LICENSE= gnu-lgpl-v2.1 -BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules +BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules USE_CMAKE= yes USE_LANGUAGES= c c++ diff --git a/security/gss/Makefile b/security/gss/Makefile index 6085a0cbd31..d0a62b47ec5 100644 --- a/security/gss/Makefile +++ b/security/gss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/01/19 18:52:23 agc Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:12:53 rillig Exp $ # DISTNAME= gss-0.0.15 @@ -13,9 +13,9 @@ COMMENT= GNU Generic Security Service Library CONFLICTS+= heimdal-[0-9]* -USE_TOOLS+= pkg-config msgfmt -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +USE_TOOLS+= pkg-config msgfmt +GNU_CONFIGURE= yes +USE_LIBTOOL= yes INFO_FILES= yes PKGCONFIG_OVERRIDE+= gss.pc.in diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 0a452274d92..4c0d82c34f2 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2019/10/21 16:21:44 wiz Exp $ +# $NetBSD: Makefile,v 1.134 2019/11/04 21:12:53 rillig Exp $ DISTNAME= heimdal-1.5.3 PKGREVISION= 21 @@ -103,8 +103,8 @@ PLIST.hcrypto= yes # Linux does not have include/vis.h and expected include/glob.h. .if ${OPSYS} == "Linux" -PLIST.vis= yes -PLIST.glob= yes +PLIST.vis= yes +PLIST.glob= yes # Without this I get undefined references to pthread_getspecific PTHREAD_AUTO_VARS= yes .endif diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk index 014d1c02856..df097bcaa25 100644 --- a/security/heimdal/builtin.mk +++ b/security/heimdal/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.16 2019/09/12 21:07:01 rillig Exp $ +# $NetBSD: builtin.mk,v 1.17 2019/11/04 21:12:53 rillig Exp $ BUILTIN_PKG:= heimdal @@ -21,7 +21,7 @@ IS_BUILTIN.heimdal= no IS_BUILTIN.heimdal= yes . endif .endif -MAKEVARS+= IS_BUILTIN.heimdal +MAKEVARS+= IS_BUILTIN.heimdal ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -38,17 +38,17 @@ BUILTIN_VERSION.heimdal!= ${SH_KRB5_CONFIG} --version | \ # the version number of the software. Match up heimdal versions with # OS versions for an approximate determination of the heimdal version. # -_BLTN_HEIMDAL_VERSIONS= 0.6.3 0.6.2 0.6.1 0.6 0.5 0.4e 0.3f 0.3e -_BLTN_HEIMDAL_0.6.3= NetBSD-2.* NetBSD-[3-9]*-* -_BLTN_HEIMDAL_0.6.2= # empty -_BLTN_HEIMDAL_0.6.1= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* -_BLTN_HEIMDAL_0.6= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* -_BLTN_HEIMDAL_0.5= NetBSD-1.6[I-T]-* -_BLTN_HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \ +_BLTN_HEIMDAL_VERSIONS= 0.6.3 0.6.2 0.6.1 0.6 0.5 0.4e 0.3f 0.3e +_BLTN_HEIMDAL_0.6.3= NetBSD-2.* NetBSD-[3-9]*-* +_BLTN_HEIMDAL_0.6.2= # empty +_BLTN_HEIMDAL_0.6.1= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* +_BLTN_HEIMDAL_0.6= NetBSD-1.6[U-Z]-* NetBSD-1.6Z*-* +_BLTN_HEIMDAL_0.5= NetBSD-1.6[I-T]-* +_BLTN_HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \ NetBSD-1.6-* NetBSD-1.6_*-* NetBSD-1.6.*-* \ NetBSD-1.5[YZ]-* NetBSD-1.5Z*-* -_BLTN_HEIMDAL_0.3f= NetBSD-1.5X-* -_BLTN_HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \ +_BLTN_HEIMDAL_0.3f= NetBSD-1.5X-* +_BLTN_HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \ NetBSD-1.5.*-* . for _heimdal_version_ in ${_BLTN_HEIMDAL_VERSIONS} . for _pattern_ in ${_BLTN_HEIMDAL_${_heimdal_version_}} @@ -61,7 +61,7 @@ BUILTIN_VERSION.heimdal?= 0.2t . endif BUILTIN_PKG.heimdal= heimdal-${BUILTIN_VERSION.heimdal} .endif -MAKEVARS+= BUILTIN_PKG.heimdal +MAKEVARS+= BUILTIN_PKG.heimdal ### ### Determine whether we should use the built-in implementation if it diff --git a/security/hitch/Makefile b/security/hitch/Makefile index 9407b2a86f7..a48d67ef1e3 100644 --- a/security/hitch/Makefile +++ b/security/hitch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/04/25 07:33:15 maya Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:12:53 rillig Exp $ DISTNAME= hitch-1.5.0 PKGREVISION= 1 @@ -33,7 +33,7 @@ HITCH_OCSP?= ${VARBASE}/db/hitch PKG_GROUPS+= ${HITCH_GROUP} PKG_USERS+= ${HITCH_USER}:${HITCH_GROUP} -PKG_GECOS.${HITCH_USER}=hitch daemon user +PKG_GECOS.${HITCH_USER}= hitch daemon user RCD_SCRIPTS= hitch diff --git a/security/honeyd-arpd/Makefile b/security/honeyd-arpd/Makefile index 171d9752c79..82fa6690c65 100644 --- a/security/honeyd-arpd/Makefile +++ b/security/honeyd-arpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2016/03/05 11:29:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:53 rillig Exp $ # DISTNAME= arpd-0.2 @@ -15,7 +15,7 @@ RCD_SCRIPTS= honeydarpd GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/arpd -CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} +CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 diff --git a/security/honeyd/options.mk b/security/honeyd/options.mk index 9b9cc83397b..483ffab2886 100644 --- a/security/honeyd/options.mk +++ b/security/honeyd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/04 21:12:53 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.honeyd PKG_SUPPORTED_OPTIONS= python rrdtool @@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= python rrdtool ### Add python support ### .if !empty(PKG_OPTIONS:Mpython) -. include "../../lang/python/extension.mk" +. include "../../lang/python/extension.mk" CONFIGURE_ENV+= _PATH_PYTHON=${PYTHONBIN:Q} .else CONFIGURE_ARGS+= --without-python @@ -19,5 +19,5 @@ CONFIGURE_ARGS+= --without-python ### Add RRDTool support ### .if !empty(PKG_OPTIONS:Mrrdtool) -. include "../../databases/rrdtool/buildlink3.mk" +. include "../../databases/rrdtool/buildlink3.mk" .endif diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile index aabcd26c792..1090a3b016d 100644 --- a/security/hs-digest/Makefile +++ b/security/hs-digest/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2014/08/18 21:18:48 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:12:53 rillig Exp $ DISTNAME= digest-0.0.1.2 -CATEGORIES= security +CATEGORIES= security -MAINTAINER= zecrazytux@zecrazytux.net +MAINTAINER= zecrazytux@zecrazytux.net COMMENT= Various cryptographic hashes for bytestrings; CRC32 and Adler32 LICENSE= modified-bsd diff --git a/security/john/Makefile b/security/john/Makefile index 1688018779c..f224fe7c4e7 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:14 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/04 21:12:54 rillig Exp $ # DISTNAME= john-1.8.0 @@ -25,47 +25,47 @@ JOHN_ARCH.sparc64= sparcv9 JOHN_ARCH.x86_64= x86-64 JOHN_CC.gcc= gcc JOHN_CC.sunpro= cc -BUILD_TARGET= solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}} +BUILD_TARGET= solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}} .elif ${OPSYS} == "NetBSD" . if ${MACHINE_ARCH} == "i386" -BUILD_TARGET= openbsd-x86-any +BUILD_TARGET= openbsd-x86-any . elif ${MACHINE_ARCH} == "x86_64" -BUILD_TARGET= openbsd-x86-64 +BUILD_TARGET= openbsd-x86-64 . elif ${MACHINE_ARCH} == "sparc64" -BUILD_TARGET= netbsd-sparc64 +BUILD_TARGET= netbsd-sparc64 . elif ${MACHINE_ARCH} == "sparc" -BUILD_TARGET= openbsd-sparc +BUILD_TARGET= openbsd-sparc . elif ${MACHINE_ARCH} == "alpha" -BUILD_TARGET= openbsd-alpha +BUILD_TARGET= openbsd-alpha . elif ${MACHINE_ARCH} == "powerpc" -BUILD_TARGET= openbsd-ppc32 +BUILD_TARGET= openbsd-ppc32 . elif ${MACHINE_ARCH} == "powerpc64" -BUILD_TARGET= openbsd-ppc64 +BUILD_TARGET= openbsd-ppc64 . elif ${MACHINE_ARCH} == "vax" -BUILD_TARGET= netbsd-vax +BUILD_TARGET= netbsd-vax . else -BUILD_TARGET= generic +BUILD_TARGET= generic . endif .elif ${OPSYS} == "OpenBSD" . if ${MACHINE_ARCH} == "i386" -BUILD_TARGET= openbsd-x86-any +BUILD_TARGET= openbsd-x86-any . elif ${MACHINE_ARCH} == "x86_64" -BUILD_TARGET= openbsd-x86-64 +BUILD_TARGET= openbsd-x86-64 . elif ${MACHINE_ARCH} == "sparc64" -BUILD_TARGET= openbsd-sparc64 +BUILD_TARGET= openbsd-sparc64 . elif ${MACHINE_ARCH} == "sparc" -BUILD_TARGET= openbsd-sparc +BUILD_TARGET= openbsd-sparc . elif ${MACHINE_ARCH} == "alpha" -BUILD_TARGET= openbsd-alpha +BUILD_TARGET= openbsd-alpha . elif ${MACHINE_ARCH} == "powerpc" -BUILD_TARGET= openbsd-ppc32 +BUILD_TARGET= openbsd-ppc32 . elif ${MACHINE_ARCH} == "powerpc64" -BUILD_TARGET= openbsd-ppc64 +BUILD_TARGET= openbsd-ppc64 . else -BUILD_TARGET= generic +BUILD_TARGET= generic . endif .else -BUILD_TARGET= generic +BUILD_TARGET= generic .endif INSTALLATION_DIRS= bin share/john diff --git a/security/kauth/Makefile b/security/kauth/Makefile index ea37fcde56d..c325fdf0c79 100644 --- a/security/kauth/Makefile +++ b/security/kauth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/09/18 14:17:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/04 21:12:54 rillig Exp $ DISTNAME= kauth-${KF5VER} PKGREVISION= 1 @@ -9,7 +9,7 @@ COMMENT= Abstraction to system policy and authentication features LICENSE= gnu-lgpl-v2.1 CONF_FILES+= ${PREFIX}/share/examples/kauth/org.kde.kf5auth.conf \ - ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kf5auth.conf + ${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kf5auth.conf .include "../../meta-pkgs/kde/kf5.mk" diff --git a/security/lasso/Makefile b/security/lasso/Makefile index 036ea3da7d3..77802419be4 100644 --- a/security/lasso/Makefile +++ b/security/lasso/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.38 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/04 21:12:54 rillig Exp $ CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-php5 CONFIGURE_ARGS+= --disable-perl PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.4.1 -PYTHON_FOR_BUILD_ONLY= yes +PYTHON_FOR_BUILD_ONLY= yes EXTRACT_USING= bsdtar diff --git a/security/lasso/Makefile.common b/security/lasso/Makefile.common index 12b8b1608c9..472ebb5c359 100644 --- a/security/lasso/Makefile.common +++ b/security/lasso/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2018/07/31 12:39:34 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.14 2019/11/04 21:12:54 rillig Exp $ # # used by security/lasso/Makefile # used by security/py-lasso/Makefile @@ -12,14 +12,14 @@ HOMEPAGE= http://lasso.entrouvert.org/ COMMENT= Liberty Alliance Single Sign On implementation LICENSE= gnu-gpl-v2 -DISTINFO_FILE= ${.CURDIR}/../../security/lasso/distinfo -PATCHDIR= ${.CURDIR}/../../security/lasso/patches +DISTINFO_FILE= ${.CURDIR}/../../security/lasso/distinfo +PATCHDIR= ${.CURDIR}/../../security/lasso/patches -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sasl2=${PREFIX} CONFIGURE_ARGS+= --with-zlib=${PREFIX} -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config perl +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config perl CFLAGS.NetBSD+= -D_POSIX_C_SOURCE=199506 diff --git a/security/libbf/Makefile b/security/libbf/Makefile index eaaaf592b54..a5024f6f35c 100644 --- a/security/libbf/Makefile +++ b/security/libbf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/01/02 05:37:23 maya Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:12:54 rillig Exp $ # DISTNAME= libbf-0.8.2b @@ -14,9 +14,9 @@ WRKSRC= ${WRKDIR}/bf .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF" -BF_ENC=asm/bx86-elf.o +BF_ENC= asm/bx86-elf.o .else -BF_ENC=bf_enc.o +BF_ENC= bf_enc.o .endif MAKEFLAGS+= BF_ENC=${BF_ENC:Q} diff --git a/security/libcrack/Makefile b/security/libcrack/Makefile index e446b0ea975..1d845e26043 100644 --- a/security/libcrack/Makefile +++ b/security/libcrack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/08/16 20:45:44 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:54 rillig Exp $ # DISTNAME= cracklib,2.7 @@ -8,7 +8,7 @@ CATEGORIES= security MASTER_SITES= http://www.crypticide.com/alecm/security/cracklib/ MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://www.crypticide.com/alecm/security/cracklib/cracklib,2.7.txt +#HOMEPAGE= http://www.crypticide.com/alecm/security/cracklib/cracklib,2.7.txt COMMENT= Password checking library USE_LIBTOOL= YES diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index de17e4bf803..bb49aa5f2c3 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2019/10/08 06:36:13 triaxx Exp $ +# $NetBSD: Makefile,v 1.74 2019/11/04 21:12:54 rillig Exp $ DISTNAME= libgpg-error-1.36 PKGREVISION= 1 @@ -28,7 +28,7 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${CC:Q}\ ${CFLAGS:M*:Q} .endif .if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc) -CFLAGS+= -D__DARWIN_UNIX03 +CFLAGS+= -D__DARWIN_UNIX03 .endif .if !empty(MACHINE_PLATFORM:MSunOS-5.10-*) diff --git a/security/libprelude-lua/Makefile b/security/libprelude-lua/Makefile index ea806689d36..31585e77e0a 100644 --- a/security/libprelude-lua/Makefile +++ b/security/libprelude-lua/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2019/07/20 22:46:47 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/04 21:12:54 rillig Exp $ PKGNAME= libprelude-lua-${VERSION} PKGREVISION= 13 -COMMENT= Lua bindings to LibPrelude +COMMENT= Lua bindings to LibPrelude LUA_VERSIONS_ACCEPTED= 51 diff --git a/security/libpreludedb-perl/buildlink3.mk b/security/libpreludedb-perl/buildlink3.mk index 6aedfdac799..ce6a57ffe3c 100644 --- a/security/libpreludedb-perl/buildlink3.mk +++ b/security/libpreludedb-perl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2019/08/11 13:17:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2019/11/04 21:12:54 rillig Exp $ BUILDLINK_TREE+= libpreludedb-perl @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpreludedb-perl LIBPRELUDEDB_PERL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpreludedb-perl+= libpreludedb-perl>=0.9.15.3 -BUILDLINK_ABI_DEPENDS.libpreludedb-perl?= libpreludedb-perl>=0.9.15.3nb18 +BUILDLINK_ABI_DEPENDS.libpreludedb-perl?= libpreludedb-perl>=0.9.15.3nb18 BUILDLINK_PKGSRCDIR.libpreludedb-perl?= ../../security/libpreludedb-perl .endif # LIBPRELUDEDB_PERL_BUILDLINK3_MK diff --git a/security/libressl/Makefile b/security/libressl/Makefile index 6996f585ecf..a72ba0db031 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2018/06/21 23:10:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:12:54 rillig Exp $ DISTNAME= libressl-2.7.4 CATEGORIES= security @@ -26,10 +26,10 @@ CONFIGURE_ARGS+= --with-openssldir=${PKG_SYSCONFDIR} INSTALLATION_DIRS+= ${EGDIR} lib -EGDIR= ${PREFIX}/libressl/share/examples/${PKGBASE} -CONFS= cert.pem openssl.cnf x509v3.cnf +EGDIR= ${PREFIX}/libressl/share/examples/${PKGBASE} +CONFS= cert.pem openssl.cnf x509v3.cnf .for f in ${CONFS} -CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor # Handle subprefix diff --git a/security/libtcpa/Makefile b/security/libtcpa/Makefile index abf7f696463..23cc3fbde45 100644 --- a/security/libtcpa/Makefile +++ b/security/libtcpa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2018/12/15 16:53:02 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/04 21:12:55 rillig Exp $ # DISTNAME= tpm-1.1b @@ -14,7 +14,7 @@ COMMENT= TCPA libraries and test programs from IBM WRKSRC= ${WRKDIR}/TPM -SITES.tcpa_man_20031210.tgz= http://www.citi.umich.edu/u/rwash/projects/trusted/ +SITES.tcpa_man_20031210.tgz= http://www.citi.umich.edu/u/rwash/projects/trusted/ BUILD_DIRS= libtcpa examples INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man3 share/doc/${PKGBASE} diff --git a/security/lynis/Makefile b/security/lynis/Makefile index bd05746b019..af26f5bf0d9 100644 --- a/security/lynis/Makefile +++ b/security/lynis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:15 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:12:55 rillig Exp $ # DISTNAME= lynis-2.6.2 @@ -31,7 +31,7 @@ SUBST_MESSAGE.confdir= Fixing conf path SUBST_FILES.confdir= include/functions SUBST_SED.confdir= -e "s,@CONFDIR@,${PKG_SYSCONFDIR}," -WRKSRC= ${WRKDIR}/lynis +WRKSRC= ${WRKDIR}/lynis INSTALLATION_DIRS+= bin ${PKGMANDIR}/man8 INSTALLATION_DIRS+= share/examples/lynis INSTALLATION_DIRS+= lib/lynis/db lib/lynis/extras @@ -44,10 +44,10 @@ BUILD_DEFS+= VARBASE AUTO_MKDIRS= yes PKG_SYSCONFSUBDIR= lynis -CONF_FILES+= share/examples/lynis/default.prf \ - ${PKG_SYSCONFDIR}/default.prf -CONF_FILES+= share/examples/lynis/developer.prf \ - ${PKG_SYSCONFDIR}/developer.prf +CONF_FILES+= share/examples/lynis/default.prf \ + ${PKG_SYSCONFDIR}/default.prf +CONF_FILES+= share/examples/lynis/developer.prf \ + ${PKG_SYSCONFDIR}/developer.prf do-install: ${INSTALL_SCRIPT} ${WRKSRC}/lynis \ diff --git a/security/mbedtls1/options.mk b/security/mbedtls1/options.mk index 1c16ec9b2c7..c2fe8dc988a 100644 --- a/security/mbedtls1/options.mk +++ b/security/mbedtls1/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2016/06/16 09:21:11 fhajny Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:12:55 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mbedtls PKG_SUPPORTED_OPTIONS= mbedtls-tools tests zlib @@ -21,13 +21,13 @@ CMAKE_ARGS+= -DENABLE_PROGRAMS=OFF .endif .if !empty(PKG_OPTIONS:Mtests) -. if !empty(PKG_OPTIONS:Mmbedtls-tools) -. include "../../security/openssl/buildlink3.mk" +. if !empty(PKG_OPTIONS:Mmbedtls-tools) +. include "../../security/openssl/buildlink3.mk" CMAKE_ARGS+= -DENABLE_TESTING=ON PLIST.tests= yes -. else +. else PKG_FAIL_REASON+= "option tests needs option mbedtls-tools" -. endif +. endif .else CMAKE_ARGS+= -DENABLE_TESTING=OFF .endif diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk index c71a05ba162..a0a52812664 100644 --- a/security/mit-krb5/builtin.mk +++ b/security/mit-krb5/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.15 2019/05/06 08:20:32 wiz Exp $ +# $NetBSD: builtin.mk,v 1.16 2019/11/04 21:12:55 rillig Exp $ BUILTIN_PKG:= mit-krb5 @@ -31,7 +31,7 @@ IS_BUILTIN.mit-krb5= no IS_BUILTIN.mit-krb5= yes . endif .endif -MAKEVARS+= IS_BUILTIN.mit-krb5 +MAKEVARS+= IS_BUILTIN.mit-krb5 ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -41,12 +41,12 @@ MAKEVARS+= IS_BUILTIN.mit-krb5 !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS]) . if empty(SH_KRB5_CONFIG:M__nonexistent__) BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \ - ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//' + ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//' . endif BUILTIN_VERSION.mit-krb5?= 1.4.0 BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5} .endif -MAKEVARS+= BUILTIN_PKG.mit-krb5 +MAKEVARS+= BUILTIN_PKG.mit-krb5 ### ### Determine whether we should use the built-in implementation if it @@ -73,7 +73,7 @@ USE_BUILTIN.mit-krb5!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.mit-krb5 +MAKEVARS+= USE_BUILTIN.mit-krb5 ### ### The section below only applies if we are not including this file diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile index 239a9fc0884..bbfac315926 100644 --- a/security/mixminion/Makefile +++ b/security/mixminion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/04 21:12:55 rillig Exp $ DISTNAME= Mixminion-0.0.8alpha3 PKGNAME= ${DISTNAME:S/M/m/} @@ -12,7 +12,7 @@ COMMENT= Anonymous Type 3 remailer LICENSE= mit REPLACE_PYTHON= lib/mixminion/Main.py -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.0.8alpha3 +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.0.8alpha3 TEST_TARGET= test diff --git a/security/msu/Makefile b/security/msu/Makefile index 45944fd0549..aeb617a17fe 100644 --- a/security/msu/Makefile +++ b/security/msu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2017/09/03 09:22:58 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:12:55 rillig Exp $ DISTNAME= msu-1.09 CATEGORIES= security @@ -11,6 +11,6 @@ COMMENT= Mini passwordless su MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.pkg.mk" diff --git a/security/msudir/Makefile b/security/msudir/Makefile index afd1d971eab..c0a57e3c29f 100644 --- a/security/msudir/Makefile +++ b/security/msudir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/09/03 09:22:58 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:12:55 rillig Exp $ DISTNAME= msudir-0.15 CATEGORIES= security @@ -11,6 +11,6 @@ COMMENT= Easy setuid script management MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.pkg.mk" diff --git a/security/netramet/Makefile b/security/netramet/Makefile index 2de517bdadc..e7cbccf31b6 100644 --- a/security/netramet/Makefile +++ b/security/netramet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/09/19 13:22:21 wiedi Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:12:55 rillig Exp $ # DISTNAME= NeTraMet44 @@ -15,8 +15,8 @@ MAKE_JOBS_SAFE= no GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--without-x -MAKE_ENV+= PCAP_LIB=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib +CONFIGURE_ARGS+= --without-x +MAKE_ENV+= PCAP_LIB=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libpcap}/lib INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} .include "../../net/libpcap/buildlink3.mk" diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile index 59b785ade57..533ff7bd0fb 100644 --- a/security/ocaml-ssl/Makefile +++ b/security/ocaml-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/08/24 11:09:39 jaapb Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/04 21:12:55 rillig Exp $ # DISTNAME= ocaml-ssl-0.5.9 @@ -11,7 +11,7 @@ COMMENT= SSL library for OCaml LICENSE= gnu-lgpl-v2.1 OCAML_USE_FINDLIB= yes -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes .include "../../mk/bsd.prefs.mk" diff --git a/security/openpam/builtin.mk b/security/openpam/builtin.mk index ef8e57db799..e6a18830170 100644 --- a/security/openpam/builtin.mk +++ b/security/openpam/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2018/05/15 07:57:32 triaxx Exp $ +# $NetBSD: builtin.mk,v 1.11 2019/11/04 21:12:56 rillig Exp $ BUILTIN_PKG:= openpam @@ -17,7 +17,7 @@ IS_BUILTIN.openpam= no IS_BUILTIN.openpam= yes . endif .endif -MAKEVARS+= IS_BUILTIN.openpam +MAKEVARS+= IS_BUILTIN.openpam ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -31,7 +31,7 @@ BUILTIN_VERSION.openpam!= \ ${H_OPENPAM} BUILTIN_PKG.openpam= openpam-${BUILTIN_VERSION.openpam} .endif -MAKEVARS+= BUILTIN_PKG.openpam +MAKEVARS+= BUILTIN_PKG.openpam ### ### Determine whether we should use the built-in implementation if it @@ -58,4 +58,4 @@ USE_BUILTIN.openpam!= \ . endif . endif # PREFER.openpam .endif -MAKEVARS+= USE_BUILTIN.openpam +MAKEVARS+= USE_BUILTIN.openpam diff --git a/security/opensc/options.mk b/security/opensc/options.mk index b336bad40b3..ae2559bb6f5 100644 --- a/security/opensc/options.mk +++ b/security/opensc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2014/03/17 18:21:42 gdt Exp $ +# $NetBSD: options.mk,v 1.5 2019/11/04 21:12:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.opensc @@ -6,7 +6,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.opensc # that exactly one be chosen. PKG_OPTIONS_REQUIRED_GROUPS= cardreader PKG_OPTIONS_GROUP.cardreader= pcsc-lite openct -PKG_SUGGESTED_OPTIONS= pcsc-lite +PKG_SUGGESTED_OPTIONS= pcsc-lite .include "../../mk/bsd.options.mk" diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 46115bfecad..d614f2c17ed 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.37 2019/09/06 09:03:00 manu Exp $ +# $NetBSD: options.mk,v 1.38 2019/11/04 21:12:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openssh PKG_SUPPORTED_OPTIONS= editline kerberos openssl pam legacymodsz @@ -28,7 +28,7 @@ CONFIGURE_ENV+= ac_cv_search_k_hasafs=no .endif .if !empty(PKG_OPTIONS:Mlegacymodsz) -CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS} -DSSH_RSA_INSECURE_LEGACY_MIN_MOD_SZ=768" +CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS} -DSSH_RSA_INSECURE_LEGACY_MIN_MOD_SZ=768" .endif #.if !empty(PKG_OPTIONS:Mhpn-patch) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 9348b01c75b..350ab99c302 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.242 2019/08/11 13:22:48 wiz Exp $ +# $NetBSD: Makefile,v 1.243 2019/11/04 21:12:56 rillig Exp $ DISTNAME= openssl-1.0.2s PKGREVISION= 1 @@ -85,7 +85,7 @@ _OS= darwin _ARCH= ppc . else _ARCH= ${MACHINE_ARCH} -.endif +. endif CONFIGURE_ARGS+= ${_OS}-${_ARCH}-cc SUBST_CLASSES+= dl diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index f7a4c4f919b..35fbcd6a4a8 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -1,9 +1,9 @@ -# $NetBSD: builtin.mk,v 1.43 2015/03/26 08:05:02 dholland Exp $ +# $NetBSD: builtin.mk,v 1.44 2019/11/04 21:12:56 rillig Exp $ BUILTIN_PKG:= openssl -BUILTIN_FIND_LIBS:= crypto des ssl -BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV +BUILTIN_FIND_LIBS:= crypto des ssl +BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV BUILTIN_FIND_HEADERS.H_OPENSSLCONF= openssl/opensslconf.h BUILTIN_FIND_HEADERS.H_OPENSSLV= openssl/opensslv.h @@ -19,7 +19,7 @@ IS_BUILTIN.openssl= no IS_BUILTIN.openssl= yes . endif .endif -MAKEVARS+= IS_BUILTIN.openssl +MAKEVARS+= IS_BUILTIN.openssl ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -57,8 +57,8 @@ BUILTIN_VERSION.openssl!= \ ' ${H_OPENSSLV} BUILTIN_PKG.openssl= openssl-${BUILTIN_VERSION.openssl} .endif -MAKEVARS+= BUILTIN_PKG.openssl -MAKEVARS+= BUILTIN_VERSION.openssl +MAKEVARS+= BUILTIN_PKG.openssl +MAKEVARS+= BUILTIN_VERSION.openssl .if !defined(BUILTIN_OPENSSL_HAS_THREADS) && \ !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \ @@ -78,14 +78,14 @@ MAKEVARS+= BUILTIN_OPENSSL_HAS_THREADS ### .if !defined(USE_BUILTIN.openssl) . if ${PREFER.openssl} == "pkgsrc" -USE_BUILTIN.openssl= no +USE_BUILTIN.openssl= no . else -USE_BUILTIN.openssl= ${IS_BUILTIN.openssl} +USE_BUILTIN.openssl= ${IS_BUILTIN.openssl} . if defined(BUILTIN_PKG.openssl) && \ !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) -USE_BUILTIN.openssl= yes +USE_BUILTIN.openssl= yes ### take care builtin check case, BUILDLINK_API_DEPENDS may not be defined yet. -CHECK_BUILTIN.openssl?= no +CHECK_BUILTIN.openssl?= no . if !empty(CHECK_BUILTIN.openssl:M[yY][eE][sS]) BUILDLINK_API_DEPENDS.openssl?= openssl>=1.0.1c . endif @@ -104,12 +104,12 @@ USE_BUILTIN.openssl!= \ defined(USE_FEATURES.openssl) . if !empty(USE_FEATURES.openssl:Mthreads) && \ !empty(BUILTIN_OPENSSL_HAS_THREADS:M[nN][oO]) -USE_BUILTIN.openssl= no +USE_BUILTIN.openssl= no . endif . endif . endif # PREFER.openssl .endif -MAKEVARS+= USE_BUILTIN.openssl +MAKEVARS+= USE_BUILTIN.openssl ### ### The section below only applies if we are not including this file diff --git a/security/openvas-plugins/Makefile b/security/openvas-plugins/Makefile index 81a29b77e28..03d085ad670 100644 --- a/security/openvas-plugins/Makefile +++ b/security/openvas-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/07/20 22:46:49 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:12:56 rillig Exp $ # DISTNAME= openvas-plugins-1.0.5 @@ -29,9 +29,9 @@ NONFREE= cisco_vpn_client_detect.nasl js.scob.trojan.nasl \ post-extract: @${MKDIR} ${WRKSRC}/bin -. for f in ${NONFREE} - @${RM} ${WRKSRC}/scripts/${f} -. endfor +.for f in ${NONFREE} + @${RM} ${WRKSRC}/scripts/${f} +.endfor .include "../../security/openvas-libraries/buildlink3.mk" .include "../../security/openvas-libnasl/buildlink3.mk" diff --git a/security/openvas-server/options.mk b/security/openvas-server/options.mk index bde6e827735..ff9fe60e088 100644 --- a/security/openvas-server/options.mk +++ b/security/openvas-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2009/01/04 01:11:55 adrianp Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:12:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openvas-server @@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS= x11 ### X11 support ### .if !empty(PKG_OPTIONS:Mx11) -USE_X11=YES +USE_X11= YES CONFIGURE_ARGS+= --with-x .else CONFIGURE_ARGS+= --without-x diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile index 15a85b6392a..555b308a1ac 100644 --- a/security/p11-kit/Makefile +++ b/security/p11-kit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/03/24 18:03:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:12:56 rillig Exp $ DISTNAME= p11-kit-0.23.15 CATEGORIES= security @@ -37,9 +37,9 @@ PLIST_SUBST+= DLEXT=${DLEXT:Q} PKGCONFIG_OVERRIDE+= p11-kit/p11-kit-1.pc.in -PKG_SYSCONFSUBDIR= pkcs11 -CONF_FILES+= share/examples/p11-kit/pkcs11.conf.example \ - ${PKG_SYSCONFDIR}/pkcs11.conf +PKG_SYSCONFSUBDIR= pkcs11 +CONF_FILES+= share/examples/p11-kit/pkcs11.conf.example \ + ${PKG_SYSCONFDIR}/pkcs11.conf .include "../../devel/libffi/buildlink3.mk" .include "../../security/libtasn1/buildlink3.mk" diff --git a/security/p5-Authen-CAS-Client/Makefile b/security/p5-Authen-CAS-Client/Makefile index c3ac4a8464a..d1c46b48804 100644 --- a/security/p5-Authen-CAS-Client/Makefile +++ b/security/p5-Authen-CAS-Client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:22:49 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:56 rillig Exp $ # DISTNAME= Authen-CAS-Client-0.08 @@ -12,8 +12,8 @@ HOMEPAGE= https://metacpan.org/release/Authen-CAS-Client COMMENT= Perl 5 module providing an interface for JA-SIG's CAS LICENSE= 2-clause-bsd -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Authen/CAS/Client/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/Authen/CAS/Client/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled BUILD_DEPENDS+= p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject diff --git a/security/p5-Crypt-Eksblowfish/Makefile b/security/p5-Crypt-Eksblowfish/Makefile index c7d93338c59..39fbc609fe1 100644 --- a/security/p5-Crypt-Eksblowfish/Makefile +++ b/security/p5-Crypt-Eksblowfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/08/11 13:22:51 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:12:57 rillig Exp $ # DISTNAME= Crypt-Eksblowfish-0.009 @@ -15,7 +15,7 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-Class-Mix>=0.001:../../devel/p5-Class-Mix #DEPENDS+= {perl>=5.10.1,p5-parent-[0-9]*}:../../devel/p5-parent #DEPENDS+= {perl>=5.8.2,p5-MIME-Base64>=2.21}:../../converters/p5-MIME-Base64 -#BUILD_DEPENDS+= {perl>=5.10.0,p5-ExtUtils-CBuilder>=0.15}:../../devel/p5-ExtUtils-CBuilder +#BUILD_DEPENDS+= {perl>=5.10.0,p5-ExtUtils-CBuilder>=0.15}:../../devel/p5-ExtUtils-CBuilder USE_LANGUAGES= c PERL5_MODULE_TYPE= Module::Build diff --git a/security/p5-Digest-CRC/Makefile b/security/p5-Digest-CRC/Makefile index 2d3b1ac0428..65af33c9079 100644 --- a/security/p5-Digest-CRC/Makefile +++ b/security/p5-Digest-CRC/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/08/11 13:22:55 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/04 21:12:57 rillig Exp $ DISTNAME= Digest-CRC-0.22.2 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Digest-CRC COMMENT= Perl5 extension interface for cyclic redundancy check algorithms LICENSE= public-domain -PERL5_PACKLIST= auto/Digest/CRC/.packlist +PERL5_PACKLIST= auto/Digest/CRC/.packlist WRKSRC= ${WRKDIR}/Digest-CRC-0.22 .include "../../lang/perl5/module.mk" diff --git a/security/p5-Digest-Perl-MD5/Makefile b/security/p5-Digest-Perl-MD5/Makefile index dbd8a4c0b80..3bf6acd0153 100644 --- a/security/p5-Digest-Perl-MD5/Makefile +++ b/security/p5-Digest-Perl-MD5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:57 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:12:57 rillig Exp $ DISTNAME= Digest-Perl-MD5-1.9 PKGNAME= p5-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/Digest-Perl-MD5 COMMENT= Perl implementation of Ron Rivests MD5 Algorithm LICENSE= ${PERL5_LICENSE} -CHECK_INTERPRETER_SKIP+= ${PERL5_SUB_INSTALLVENDORLIB}/Digest/Perl/MD5.pm +CHECK_INTERPRETER_SKIP+= ${PERL5_SUB_INSTALLVENDORLIB}/Digest/Perl/MD5.pm #DEPENDS+= {perl>=5.7.3,p5-Digest>=1.00}:../../security/p5-Digest diff --git a/security/pakchois/Makefile b/security/pakchois/Makefile index 7c8ea8e09bc..a8c085d61b7 100644 --- a/security/pakchois/Makefile +++ b/security/pakchois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/23 18:16:47 asau Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:12:57 rillig Exp $ # DISTNAME= pakchois-0.4 @@ -20,8 +20,8 @@ PTHREAD_OPTS+= require PKG_PTHREAD_FLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} BROKEN_GETTEXT_DETECTION= yes -BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} -BUILDLINK_TRANSFORM+= opt:-lpthread:${PKG_PTHREAD_FLAGS:M*} +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} +BUILDLINK_TRANSFORM+= opt:-lpthread:${PKG_PTHREAD_FLAGS:M*} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/security/pam-krb5/Makefile b/security/pam-krb5/Makefile index b1f7fba72b4..767ce6eb245 100644 --- a/security/pam-krb5/Makefile +++ b/security/pam-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/09/03 08:53:14 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:12:57 rillig Exp $ # DISTNAME= pam-krb5-4.6 @@ -14,7 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes -CPPFLAGS.NetBSD+= -DNO_STATIC_MODULES +CPPFLAGS.NetBSD+= -DNO_STATIC_MODULES .include "../../mk/krb5.buildlink3.mk" .include "../../mk/pam.buildlink3.mk" diff --git a/security/pam-passwdqc/Makefile b/security/pam-passwdqc/Makefile index 2f36f35c3e8..2e352bce14d 100644 --- a/security/pam-passwdqc/Makefile +++ b/security/pam-passwdqc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/23 18:16:48 asau Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:12:57 rillig Exp $ # DISTNAME= passwdqc-1.1.4 @@ -11,9 +11,9 @@ HOMEPAGE= http://www.openwall.com/passwdqc/ COMMENT= Password strength checker #LICENSE= # TODO: (see mk/license.mk) -BUILD_TARGET= pam -INSTALLATION_DIRS= lib/security ${PKGMANDIR}/man8 ${PKGMANDIR}/man5 -CFLAGS+= -DNO_STATIC_MODULES +BUILD_TARGET= pam +INSTALLATION_DIRS= lib/security ${PKGMANDIR}/man8 ${PKGMANDIR}/man5 +CFLAGS+= -DNO_STATIC_MODULES do-install: ${INSTALL_DATA} ${WRKSRC}/libpasswdqc.so ${DESTDIR}${PREFIX}/lib diff --git a/security/pam-pwauth_suid/Makefile b/security/pam-pwauth_suid/Makefile index ddff10e0488..09c0b242ee9 100644 --- a/security/pam-pwauth_suid/Makefile +++ b/security/pam-pwauth_suid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2018/08/19 20:16:41 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:12:57 rillig Exp $ DISTNAME= pam-pwauth_suid-1.2 PKGREVISION= 1 @@ -10,8 +10,8 @@ COMMENT= PAM authentication module for unprivileged users WRKSRC= ${WRKDIR} -PAMDEF+= -DPATH_HELPER=\"${PREFIX}/libexec/pwauth_suid_helper\" -PAMDEF+= -DNO_STATIC_MODULES +PAMDEF+= -DPATH_HELPER=\"${PREFIX}/libexec/pwauth_suid_helper\" +PAMDEF+= -DNO_STATIC_MODULES INSTALLATION_DIRS= lib/security libexec share/examples/pam-pwauth_suid diff --git a/security/pam-tacplus/Makefile b/security/pam-tacplus/Makefile index 9aa6e34b030..c85ac72e5c2 100644 --- a/security/pam-tacplus/Makefile +++ b/security/pam-tacplus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:15 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:12:57 rillig Exp $ # DISTNAME= pam_tacplus-1.3.6 -PKGNAME= ${DISTNAME:S/_/-/} +PKGNAME= ${DISTNAME:S/_/-/} PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tacplus/} @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 EGDIR= ${PREFIX}/share/examples/pam_tacplus -GNU_CONFIGURE=yes +GNU_CONFIGURE= yes SUBST_CLASSES+= egdir SUBST_STAGE.egdir= pre-configure diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile index 2d03f77f6a8..dee37c86d57 100644 --- a/security/pcsc-lite/Makefile +++ b/security/pcsc-lite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/04/25 07:33:16 maya Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/04 21:12:57 rillig Exp $ DISTNAME= pcsc-lite-1.8.24 PKGREVISION= 1 @@ -23,8 +23,8 @@ USE_LANGUAGES= c c++ .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= spy -#REPLACE_PYTHON= src/spy/pcsc-spy +PLIST_VARS+= spy +#REPLACE_PYTHON= src/spy/pcsc-spy #.include "../../lang/python/application.mk" CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} diff --git a/security/pgp2/options.mk b/security/pgp2/options.mk index 7d69b019d3b..c4aec1dae80 100644 --- a/security/pgp2/options.mk +++ b/security/pgp2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/12/01 20:18:29 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:58 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pgp2 PKG_SUPPORTED_OPTIONS= rsaref @@ -27,11 +27,11 @@ RSAOBJS= rsaglue1.o FIX_RPATH+= RSALIBS .if ${MACHINE_ARCH} == "m68k" -.if !empty(PKG_OPTIONS:Mm68060-optimized) +. if !empty(PKG_OPTIONS:Mm68060-optimized) OBJS_EXT= ASMFLAG= -m68060 -DPORTABLE -DMPORTABLE -.else +. else OBJS_EXT= mc68020.o ASMFLAG= -.endif +. endif .endif diff --git a/security/php-ssh2-0/Makefile b/security/php-ssh2-0/Makefile index 2c052dc5a4a..aed6053fbd5 100644 --- a/security/php-ssh2-0/Makefile +++ b/security/php-ssh2-0/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/12/15 21:12:22 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:12:58 rillig Exp $ # MODNAME= ssh2 @@ -10,12 +10,12 @@ HOMEPAGE= https://www.libssh2.org/ COMMENT= PHP bindings to the functions of libssh2 LICENSE= php -CONFLICTS= ${PHP_PKG_PREFIX}-${MODNAME}>=1.0 +CONFLICTS= ${PHP_PKG_PREFIX}-${MODNAME}>=1.0 PHP_VERSIONS_ACCEPTED= 56 CONFIGURE_ARGS+= --with-ssh2=${PREFIX} -#WRKSRC= ${WRKDIR}/${MODNAME}-${PECL_VERSION} +#WRKSRC= ${WRKDIR}/${MODNAME}-${PECL_VERSION} .include "../../security/libssh2/buildlink3.mk" .include "../../lang/php/ext.mk" diff --git a/security/php-ssh2/Makefile b/security/php-ssh2/Makefile index c53aaba1bbe..0a05c23c841 100644 --- a/security/php-ssh2/Makefile +++ b/security/php-ssh2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/01/14 13:06:11 taca Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:12:58 rillig Exp $ # MODNAME= ssh2 @@ -10,7 +10,7 @@ HOMEPAGE= https://www.libssh2.org/ COMMENT= PHP bindings to the functions of libssh2 LICENSE= php -CONFLICTS= ${PHP_PKG_PREFIX}-${MODNAME}<1.0 +CONFLICTS= ${PHP_PKG_PREFIX}-${MODNAME}<1.0 PHP_VERSIONS_ACCEPTED= 71 72 diff --git a/security/pinentry-fltk/Makefile b/security/pinentry-fltk/Makefile index 7fb5c128c0c..e3c5c799f1f 100644 --- a/security/pinentry-fltk/Makefile +++ b/security/pinentry-fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/02/13 17:40:53 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:12:58 rillig Exp $ PKGNAME= ${DISTNAME:S/pinentry-/pinentry-fltk-/} COMMENT= Applications for entering PINs or Passphrases, FLTK enabled @@ -10,12 +10,12 @@ USE_LANGUAGES+= c c++ USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --disable-pinentry-gtk2 -CONFIGURE_ARGS+= --disable-pinentry-qt -CONFIGURE_ARGS+= --disable-pinentry-curses -CONFIGURE_ARGS+= --disable-pinentry-emacs -#CONFIGURE_ARGS+= --disable-fallback-curses -CONFIGURE_ARGS+= --disable-pinentry-gnome3 -CONFIGURE_ARGS+= --disable-libsecret +CONFIGURE_ARGS+= --disable-pinentry-qt +CONFIGURE_ARGS+= --disable-pinentry-curses +CONFIGURE_ARGS+= --disable-pinentry-emacs +#CONFIGURE_ARGS+= --disable-fallback-curses +CONFIGURE_ARGS+= --disable-pinentry-gnome3 +CONFIGURE_ARGS+= --disable-libsecret INSTALL_DIRS= fltk diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile index a7c2e2962d0..a0d49f9b934 100644 --- a/security/pinentry-gtk2/Makefile +++ b/security/pinentry-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2019/07/21 22:25:40 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2019/11/04 21:12:58 rillig Exp $ PKGNAME= ${DISTNAME:S/pinentry-/pinentry-gtk2-/} PKGREVISION= 6 @@ -8,13 +8,13 @@ COMMENT= Applications for entering PINs or Passphrases, GTK+ enabled USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --enable-pinentry-gtk2 -CONFIGURE_ARGS+= --disable-pinentry-qt -CONFIGURE_ARGS+= --disable-pinentry-curses -CONFIGURE_ARGS+= --disable-pinentry-emacs -#CONFIGURE_ARGS+= --disable-fallback-curses -CONFIGURE_ARGS+= --disable-pinentry-gnome3 -CONFIGURE_ARGS+= --disable-pinentry-fltk -CONFIGURE_ARGS+= --disable-libsecret +CONFIGURE_ARGS+= --disable-pinentry-qt +CONFIGURE_ARGS+= --disable-pinentry-curses +CONFIGURE_ARGS+= --disable-pinentry-emacs +#CONFIGURE_ARGS+= --disable-fallback-curses +CONFIGURE_ARGS+= --disable-pinentry-gnome3 +CONFIGURE_ARGS+= --disable-pinentry-fltk +CONFIGURE_ARGS+= --disable-libsecret INSTALL_DIRS= gtk+-2 diff --git a/security/pinentry-mac/Makefile b/security/pinentry-mac/Makefile index 843d1dfdcab..707eb7cf293 100644 --- a/security/pinentry-mac/Makefile +++ b/security/pinentry-mac/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2017/05/31 21:30:15 jym Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:12:58 rillig Exp $ -DISTNAME= pinentry-mac-${PINENTRY_VERSION} -MASTER_SITES= ${MASTER_SITE_GITHUB:=GPGTools/} -PINENTRY_VERSION=0.9.4 -GITHUB_TAG= v${PKGVERSION_NOREV} -EXTRACT_SUFX= .zip -PKGREVISION= 1 +DISTNAME= pinentry-mac-${PINENTRY_VERSION} +MASTER_SITES= ${MASTER_SITE_GITHUB:=GPGTools/} +PINENTRY_VERSION= 0.9.4 +GITHUB_TAG= v${PKGVERSION_NOREV} +EXTRACT_SUFX= .zip +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/GPGTools/pinentry-mac/ @@ -13,8 +13,8 @@ COMMENT= Application for entering PINs or Passphrases under Mac OS LICENSE= gnu-gpl-v3 CATEGORIES= security -ONLY_FOR_PLATFORM=Darwin-*-* -USE_TOOLS= pax +ONLY_FOR_PLATFORM= Darwin-*-* +USE_TOOLS= pax PINENTRY_APP_DIR= ${PREFIX}/libexec/${PINENTRY_APP_NAME} PINENTRY_APP_NAME= pinentry-mac.app @@ -22,11 +22,11 @@ INSTALLATION_DIRS= bin FILES_SUBST+= PINENTRY_APP_DIR=${PINENTRY_APP_DIR:Q} -SUBST_CLASSES+= pinentry-mac-sh -SUBST_STAGE.pinentry-mac-sh= pre-configure -SUBST_FILES.pinentry-mac-sh+= ${WRKDIR}/pinentry-mac.sh -SUBST_VARS.pinentry-mac-sh+= PINENTRY_APP_DIR -SUBST_MESSAGE.pinentry-mac-sh= Set path to the pinentry-mac .app directory. +SUBST_CLASSES+= pinentry-mac-sh +SUBST_STAGE.pinentry-mac-sh= pre-configure +SUBST_FILES.pinentry-mac-sh+= ${WRKDIR}/pinentry-mac.sh +SUBST_VARS.pinentry-mac-sh+= PINENTRY_APP_DIR +SUBST_MESSAGE.pinentry-mac-sh= Set path to the pinentry-mac .app directory. post-extract: ${CP} ${FILESDIR}/pinentry-mac.sh ${WRKDIR} diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index da53c6a66a9..d9e53778ea4 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.49 2018/01/19 13:36:42 abs Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/04 21:12:58 rillig Exp $ COMMENT= Applications for entering PINs or Passphrases CONFIGURE_ARGS+= --enable-pinentry-tty -CONFIGURE_ARGS+= --enable-pinentry-emacs -CONFIGURE_ARGS+= --disable-pinentry-qt4 -CONFIGURE_ARGS+= --disable-pinentry-gnome3 -CONFIGURE_ARGS+= --disable-pinentry-gtk2 -CONFIGURE_ARGS+= --disable-pinentry-fltk +CONFIGURE_ARGS+= --enable-pinentry-emacs +CONFIGURE_ARGS+= --disable-pinentry-qt4 +CONFIGURE_ARGS+= --disable-pinentry-gnome3 +CONFIGURE_ARGS+= --disable-pinentry-gtk2 +CONFIGURE_ARGS+= --disable-pinentry-fltk .include "../../security/pinentry/Makefile.common" diff --git a/security/pinepgp/options.mk b/security/pinepgp/options.mk index bf68a249248..ad49a277914 100644 --- a/security/pinepgp/options.mk +++ b/security/pinepgp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2017/09/12 02:32:17 ryoon Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:12:58 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pinepgp @@ -9,17 +9,17 @@ PLIST_VARS= gpg pgp5 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mgpg) -DEPENDS+= gnupg>=1.2.3:../../security/gnupg +DEPENDS+= gnupg>=1.2.3:../../security/gnupg CONFIGURE_ARGS+= --with-gpg -PLIST.gpg=yes +PLIST.gpg= yes .else CONFIGURE_ARGS+= --without-gpg .endif .if !empty(PKG_OPTIONS:Mpgp5) -DEPENDS+= pgp5>=5.0:../../security/pgp5 +DEPENDS+= pgp5>=5.0:../../security/pgp5 CONFIGURE_ARGS+= --with-pgp5 -PLIST.pgp5=yes +PLIST.pgp5= yes .else CONFIGURE_ARGS+= --without-pgp5 .endif diff --git a/security/pks/Makefile b/security/pks/Makefile index fbb4130e5c3..01c6e8ecc0b 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:35 jperkin Exp $ - -DISTNAME= pks-0.9.4 -PKGREVISION= 5 -CATEGORIES= security www -#MASTER_SITES+= http://www.mit.edu/people/marc/pks/ -MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pks/} -#PATCH_SITES= http://www.mit.edu/people/marc/pks/ -PATCHFILES= pks094-patch2 \ - pks094-patch3 +# $NetBSD: Makefile,v 1.36 2019/11/04 21:12:58 rillig Exp $ + +DISTNAME= pks-0.9.4 +PKGREVISION= 5 +CATEGORIES= security www +#MASTER_SITES+= http://www.mit.edu/people/marc/pks/ +MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pks/} +#PATCH_SITES= http://www.mit.edu/people/marc/pks/ +PATCHFILES= pks094-patch2 \ + pks094-patch3 PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile index 92dc7576dbf..a906068ca18 100644 --- a/security/prelude-correlator/Makefile +++ b/security/prelude-correlator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:54 adam Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:12:59 rillig Exp $ DISTNAME= prelude-correlator-0.9.0-beta8 PKGNAME= prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//} @@ -12,14 +12,14 @@ COMMENT= Intrusion event correlation engine BUILD_DEFS+= VARBASE -RCD_SCRIPTS= preludecorrelator +RCD_SCRIPTS= preludecorrelator PRELUDE_CORRELATOR_PID_DIR= ${VARBASE}/run/prelude-correlator -PRELUDE_USER?= _prelude -PRELUDE_GROUP?= _prelude -PRELUDE_HOME?= ${VARBASE}/db/prelude-correlator -INSTALLATION_DIRS= sbin -OWN_DIRS= ${PKG_SYSCONFDIR}/prelude-correlator -EGDIR= ${PREFIX}/share/examples +PRELUDE_USER?= _prelude +PRELUDE_GROUP?= _prelude +PRELUDE_HOME?= ${VARBASE}/db/prelude-correlator +INSTALLATION_DIRS= sbin +OWN_DIRS= ${PKG_SYSCONFDIR}/prelude-correlator +EGDIR= ${PREFIX}/share/examples PKG_GROUPS_VARS+= PRELUDE_GROUP PKG_USERS_VARS+= PRELUDE_USER diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile index e3b3e3e7e6b..17e5a0c0d2f 100644 --- a/security/prelude-lml/Makefile +++ b/security/prelude-lml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/07/20 22:46:49 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/04 21:12:59 rillig Exp $ # DISTNAME= prelude-lml-0.9.15 @@ -66,7 +66,7 @@ CONF_FILES_PERMS+= ${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644 # From plugins/pcre/ruleset/Makefile.in -ruleset_DATA = \ +ruleset_DATA = \ apc-emu.rules \ arbor.rules \ arpwatch.rules \ @@ -145,7 +145,7 @@ unsupported_ruleset_DATA = \ zywall.rules \ zyxel.rules . for f in ${unsupported_ruleset_DATA} -CONF_FILES+= ${EGDIR}/ruleset/${f:Q} ${PKG_SYSCONFDIR}/ruleset/${f:Q} +CONF_FILES+= ${EGDIR}/ruleset/${f:Q} ${PKG_SYSCONFDIR}/ruleset/${f:Q} . endfor .endif diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile index c862208c45a..f547995d67c 100644 --- a/security/prelude-manager/Makefile +++ b/security/prelude-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/07/20 22:46:49 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/04 21:12:59 rillig Exp $ # DISTNAME= prelude-manager-0.9.15 @@ -24,13 +24,13 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --with-libpreludedb-prefix=${BUILDLINK_PREFIX.libpreludedb} -RCD_SCRIPTS= preludemanager +RCD_SCRIPTS= preludemanager PRELUDE_MANAGER_PID_DIR= ${VARBASE}/run/prelude-manager -PRELUDE_USER?= _prelude -PRELUDE_GROUP?= _prelude -PRELUDE_HOME?= ${VARBASE}/spool/prelude-manager -OWN_DIRS_PERMS+= ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 750 -OWN_DIRS+= ${PKG_SYSCONFDIR}/prelude-manager +PRELUDE_USER?= _prelude +PRELUDE_GROUP?= _prelude +PRELUDE_HOME?= ${VARBASE}/spool/prelude-manager +OWN_DIRS_PERMS+= ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 750 +OWN_DIRS+= ${PKG_SYSCONFDIR}/prelude-manager INSTALLATION_DIRS= sbin diff --git a/security/prelude-pflogger/Makefile b/security/prelude-pflogger/Makefile index dd7456ba7cd..08ead03f81d 100644 --- a/security/prelude-pflogger/Makefile +++ b/security/prelude-pflogger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/07/20 22:46:49 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:12:59 rillig Exp $ # DISTNAME= prelude-pflogger-0.9.0-rc2 @@ -48,9 +48,9 @@ SUBST_FILES.code= run-prelude-pflogger.c SUBST_VARS.code= PREFIX SUBST_VARS.code+= PRELUDE_USER -SUBST_CLASSES+= make -SUBST_STAGE.make= pre-configure -SUBST_FILES.make= Makefile.am +SUBST_CLASSES+= make +SUBST_STAGE.make= pre-configure +SUBST_FILES.make= Makefile.am SUBST_VARS.make= EGDIR RCD_SCRIPTS= pflogger diff --git a/security/py-Des/Makefile b/security/py-Des/Makefile index 1543f9d9353..015f569424b 100644 --- a/security/py-Des/Makefile +++ b/security/py-Des/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/11/04 21:57:11 pettai Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:12:59 rillig Exp $ # DISTNAME= pyDes-2.0.1 @@ -11,7 +11,7 @@ HOMEPAGE= http://twhiteman.netfirms.com/pyDES/ COMMENT= DES implementation in python LICENSE= public-domain -PYDISTUTILSPKG= yes +PYDISTUTILSPKG= yes .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile index d8367911606..f0853849341 100644 --- a/security/py-OpenSSL/Makefile +++ b/security/py-OpenSSL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2019/01/22 09:12:09 adam Exp $ +# $NetBSD: Makefile,v 1.53 2019/11/04 21:12:59 rillig Exp $ DISTNAME= pyOpenSSL-19.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -18,7 +18,7 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.0.1:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner # https://github.com/pyca/pyopenssl/issues/656 -PYSETUPTESTTARGET= pytest +PYSETUPTESTTARGET= pytest .include "../../lang/python/egg.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/py-SSLCrypto/Makefile b/security/py-SSLCrypto/Makefile index 57a40f519a7..4795b144e9f 100644 --- a/security/py-SSLCrypto/Makefile +++ b/security/py-SSLCrypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:12:59 rillig Exp $ DISTNAME= SSLCrypto-0.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Python bindings for openssl DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.4.1:../../lang/py-pyrex -PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex +PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex .include "../../lang/python/distutils.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/py-acme-tiny/Makefile b/security/py-acme-tiny/Makefile index 14772bd142b..5013ea407b7 100644 --- a/security/py-acme-tiny/Makefile +++ b/security/py-acme-tiny/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/07/22 01:36:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:12:59 rillig Exp $ DISTNAME= acme-tiny-4.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,9 +13,9 @@ LICENSE= mit GITHUB_PROJECT= acme-tiny GITHUB_TAG= ${PKGVERSION_NOREV} -NO_BUILD= yes -INSTALLATION_DIRS=bin share/doc/${PYPKGPREFIX}-acme-tiny -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +NO_BUILD= yes +INSTALLATION_DIRS= bin share/doc/${PYPKGPREFIX}-acme-tiny +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} REPLACE_PYTHON= acme_tiny.py diff --git a/security/py-backports.ssl_match_hostname/Makefile b/security/py-backports.ssl_match_hostname/Makefile index d64d17e7058..0e00ff7e6ce 100644 --- a/security/py-backports.ssl_match_hostname/Makefile +++ b/security/py-backports.ssl_match_hostname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:12:59 rillig Exp $ DISTNAME= backports.ssl_match_hostname-3.5.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= python-software-foundation DEPENDS+= ${PYPKGPREFIX}-backports-[0-9]*:../../devel/py-backports -PYTHON_VERSIONS_ACCEPTED= 27 # included in 3.2+ +PYTHON_VERSIONS_ACCEPTED= 27 # included in 3.2+ post-install: rm ${DESTDIR}${PREFIX}/${PYSITELIB}/backports/__init__.* diff --git a/security/py-denyhosts/Makefile b/security/py-denyhosts/Makefile index 12d93638837..b42f47b2970 100644 --- a/security/py-denyhosts/Makefile +++ b/security/py-denyhosts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:13:00 rillig Exp $ VER= 2.6 DISTNAME= DenyHosts-${VER} @@ -12,7 +12,7 @@ MAINTAINER= he@NetBSD.org HOMEPAGE= http://denyhosts.sourceforge.net/ COMMENT= Watch auth log for invalid ssh login attempts and block hosts -PYDISTUTILSPKG= yes +PYDISTUTILSPKG= yes CONF_FILES+= ${PREFIX}/share/denyhosts/denyhosts.cfg-dist \ ${PREFIX}/etc/denyhosts.conf @@ -20,16 +20,16 @@ CONF_FILES+= ${PREFIX}/share/denyhosts/denyhosts.cfg-dist \ FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} SUBST_CLASSES+= cf -SUBST_STAGE.cf= post-configure +SUBST_STAGE.cf= post-configure SUBST_VARS.cf= VARBASE PREFIX VARBASE PKG_SYSCONFDIR PYTHONBIN SUBST_FILES.cf= setup.py denyhosts.cfg-dist daemon-control-dist -REPLACE_PYTHON= daemon-control-dist plugins/test_deny.py setup.py -REPLACE_PYTHON+= scripts/restricted_from_invalid.py -REPLACE_PYTHON+= scripts/restricted_from_passwd.py +REPLACE_PYTHON= daemon-control-dist plugins/test_deny.py setup.py +REPLACE_PYTHON+= scripts/restricted_from_invalid.py +REPLACE_PYTHON+= scripts/restricted_from_passwd.py -PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_ACCEPTED= 27 RCD_SCRIPTS+= denyhosts SMF_NAME= denyhost diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile index 81973239a5b..95792e49a90 100644 --- a/security/py-gnupg/Makefile +++ b/security/py-gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/09/02 13:19:54 adam Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:13:00 rillig Exp $ DISTNAME= GnuPGInterface-0.3.2 PKGNAME= ${PYPKGPREFIX}-gnupg-0.3.2 @@ -15,7 +15,7 @@ DEPENDS+= gnupg>=1.0.0:../../security/gnupg USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-openid/Makefile b/security/py-openid/Makefile index 2c6b2cfa6ad..1b808d8ebf2 100644 --- a/security/py-openid/Makefile +++ b/security/py-openid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/09/02 13:19:54 adam Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:13:00 rillig Exp $ DISTVERS= 2.2.5 GITREF= b666238 @@ -13,8 +13,8 @@ HOMEPAGE= http://www.openidenabled.com/openid/libraries/python/ COMMENT= Python module for OpenID LICENSE= apache-2.0 -PYDISTUTILSPKG= yes -PYTHON_VERSIONS_ACCEPTED= 27 +PYDISTUTILSPKG= yes +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index a8c731f1733..95d40701f5b 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/09/02 13:19:56 adam Exp $ +# $NetBSD: Makefile,v 1.52 2019/11/04 21:13:00 rillig Exp $ DISTNAME= prewikka-${VERSION} PKGNAME= ${PYPKGPREFIX}-prewikka-${VERSION} @@ -21,10 +21,10 @@ USE_TOOLS+= msgfmt .include "../../mk/bsd.prefs.mk" -PYDISTUTILSPKG= yes -PYSETUP= setup.py +PYDISTUTILSPKG= yes +PYSETUP= setup.py REPLACE_PYTHON= scripts/prewikka-httpd -PYTHON_VERSIONS_ACCEPTED= 27 # py-cheetah +PYTHON_VERSIONS_ACCEPTED= 27 # py-cheetah PREWIKKA_USER?= prewikka PREWIKKA_GROUP?= prewikka @@ -53,7 +53,7 @@ FILES_SUBST+= PREWIKKA_USER=${PREWIKKA_USER:Q} MAKE_ENV+= EXAMPLEDIR=share/examples/${PKGBASE} INSTALLATION_DIRS+= share/examples/${PKGBASE} sbin -CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/prewikka.conf ${PKG_SYSCONFDIR}/prewikka.conf +CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/prewikka.conf ${PKG_SYSCONFDIR}/prewikka.conf pre-patch: cp ${FILESDIR}/runPrewikka.c ${WRKSRC} diff --git a/security/py-slowaes/Makefile b/security/py-slowaes/Makefile index 4f90da40461..f00147f4b54 100644 --- a/security/py-slowaes/Makefile +++ b/security/py-slowaes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/09/02 13:19:56 adam Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:13:00 rillig Exp $ DISTNAME= slowaes-0.1a1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,7 @@ HOMEPAGE= https://pypi.python.org/pypi/slowaes/ COMMENT= Implementation of AES in pure Python LICENSE= apache-2.0 -PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.1a1 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.1a1 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-smbpasswd/Makefile b/security/py-smbpasswd/Makefile index c3d6e662407..8c694a95782 100644 --- a/security/py-smbpasswd/Makefile +++ b/security/py-smbpasswd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/09/04 18:08:27 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:13:00 rillig Exp $ # DISTNAME= py-smbpasswd-1.0.1 @@ -10,7 +10,7 @@ MAINTAINER= bouyer@NetBSD.org HOMEPAGE= https://barryp.org/software/py-smbpasswd/ COMMENT= Python SMB Password Hash Generator -PYDISTUTILSPKG= yes +PYDISTUTILSPKG= yes .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-urllib2-kerberos/Makefile b/security/py-urllib2-kerberos/Makefile index f68eb543a74..6d84377e1e5 100644 --- a/security/py-urllib2-kerberos/Makefile +++ b/security/py-urllib2-kerberos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:13:00 rillig Exp $ # DISTNAME= urllib2_kerberos-0.1.6 @@ -13,7 +13,7 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-kerberos>=1.1:../../security/py-kerberos -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile index 142ae4bf346..80ba083423b 100644 --- a/security/py-yara/Makefile +++ b/security/py-yara/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/09/02 13:19:55 adam Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:13:01 rillig Exp $ DISTNAME= yara-python-${VERSION} PKGNAME= ${PYPKGPREFIX}-yara-${VERSION} @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=VirusTotal/} COMMENT= Yara python bindings -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../security/yara/Makefile.common" .include "../../security/yara/buildlink3.mk" diff --git a/security/qca2-qt5/buildlink3.mk b/security/qca2-qt5/buildlink3.mk index 908ba1226f3..86aa3694a23 100644 --- a/security/qca2-qt5/buildlink3.mk +++ b/security/qca2-qt5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2019/04/03 00:33:05 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2019/11/04 21:13:01 rillig Exp $ BUILDLINK_TREE+= qca2-qt5 @@ -7,7 +7,7 @@ QCA2_QT5_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qca2-qt5+= qca2-qt5>=2.1.3 BUILDLINK_ABI_DEPENDS.qca2-qt5?= qca2-qt5>=2.1.3nb6 -BUILDLINK_PKGSRCDIR.qca2-qt5?= ../../security/qca2-qt5 +BUILDLINK_PKGSRCDIR.qca2-qt5?= ../../security/qca2-qt5 .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # QCA2_QT5_BUILDLINK3_MK diff --git a/security/qore-asn1-module/options.mk b/security/qore-asn1-module/options.mk index 4e9fe41bbb0..c42c37a2998 100644 --- a/security/qore-asn1-module/options.mk +++ b/security/qore-asn1-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 16:01:22 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:13:01 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-asn1-module @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/security/qore-ssh2-module/Makefile b/security/qore-ssh2-module/Makefile index 3cc41c8346b..900acfb5f38 100644 --- a/security/qore-ssh2-module/Makefile +++ b/security/qore-ssh2-module/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2018/06/08 20:02:30 nros Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:13:01 rillig Exp $ DISTNAME= qore-ssh2-module-1.2 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} +EXTRACT_SUFX= .tar.bz2 GITHUB_RELEASE= v${PKGVERSION_NOREV} GITHUB_PROJECT= module-ssh2 @@ -18,7 +18,7 @@ USE_LANGUAGES= c c++11 USE_TOOLS+= gmake pax PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-libsuffix="" +CONFIGURE_ARGS+= --with-libsuffix="" #This is needed in order to comply the with MIT license and binary distribution #Install docs diff --git a/security/qore-ssh2-module/options.mk b/security/qore-ssh2-module/options.mk index c93b98daab8..9b174cc0ad6 100644 --- a/security/qore-ssh2-module/options.mk +++ b/security/qore-ssh2-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 16:02:08 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:13:01 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-ssh2-module @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/security/qore-xmlsec-module/Makefile b/security/qore-xmlsec-module/Makefile index 91ca24b0a87..aae8fa190c3 100644 --- a/security/qore-xmlsec-module/Makefile +++ b/security/qore-xmlsec-module/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/06/08 20:49:42 nros Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:13:01 rillig Exp $ DISTNAME= qore-xmlsec-module-0.0.2 PKGREVISION= 8 @@ -15,9 +15,9 @@ USE_LIBTOOL= yes USE_LANGUAGES= c c++11 PTHREAD_OPTS+= native -CONFIGURE_ARGS+=--with-xmlsec-dir=${BUILDLINK_PREFIX.xmlsec1} -CONFIGURE_ARGS+=--with-libxml2-dir=${BUILDLINK_PREFIX.libxml2} -CONFIGURE_ARGS+=--with-qore-dir=${BUILDLINK_PREFIX.qore} +CONFIGURE_ARGS+= --with-xmlsec-dir=${BUILDLINK_PREFIX.xmlsec1} +CONFIGURE_ARGS+= --with-libxml2-dir=${BUILDLINK_PREFIX.libxml2} +CONFIGURE_ARGS+= --with-qore-dir=${BUILDLINK_PREFIX.qore} INSTALLATION_DIRS+= share/doc/${PKGBASE} post-install: diff --git a/security/qore-xmlsec-module/options.mk b/security/qore-xmlsec-module/options.mk index d16b5e674aa..b16d698d6b9 100644 --- a/security/qore-xmlsec-module/options.mk +++ b/security/qore-xmlsec-module/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/12/30 16:03:28 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:13:01 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.qore-xmlsec-module @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= debug .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdebug) -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug .else -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-debug .endif diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile index c991ab5ec0a..438e6211896 100644 --- a/security/racoon2/Makefile +++ b/security/racoon2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:23:00 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:13:01 rillig Exp $ # PKGREVISION= 2 @@ -9,7 +9,7 @@ CATEGORIES= security net DISTNAME= racoon2 PKGNAME= racoon2-20180701 -MASTER_SITES= ${MASTER_SITE_GITHUB:=zoulasc/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=zoulasc/} GITHUB_PROJECT= racoon2 GITHUB_TAG= b2a193fc9875d1fb89c0a51690745379bc135fcf diff --git a/security/rainbowcrack/Makefile b/security/rainbowcrack/Makefile index 17840770ffd..8725cfc5b33 100644 --- a/security/rainbowcrack/Makefile +++ b/security/rainbowcrack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2016/03/05 11:29:26 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:13:02 rillig Exp $ PKGNAME= rainbowcrack-1.2 DISTNAME= rainbowcrack-1.2-src @@ -7,7 +7,7 @@ CATEGORIES= security MASTER_SITES= # http://www.rainbowcrack.com/downloads/ EXTRACT_SUFX= .zip DISTFILES= rainbowcrack-1.2-src.zip \ - rainbowcrack-1.2-openbsd-diffs.tar.gz + rainbowcrack-1.2-openbsd-diffs.tar.gz MAINTAINER= dhowland@users.sourceforge.net HOMEPAGE= http://project-rainbowcrack.com/ diff --git a/security/scrypt/Makefile b/security/scrypt/Makefile index 6903dc25beb..2e315de1988 100644 --- a/security/scrypt/Makefile +++ b/security/scrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/09/16 05:13:28 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:13:02 rillig Exp $ DISTNAME= scrypt-1.3.0 CATEGORIES= security @@ -10,8 +10,8 @@ HOMEPAGE= https://www.tarsnap.com/scrypt/ COMMENT= Encrypt and decrypt files LICENSE= 2-clause-bsd -GNU_CONFIGURE= yes -TEST_TARGET= test +GNU_CONFIGURE= yes +TEST_TARGET= test UNLIMIT_RESOURCES= datasize .include "../../security/openssl/buildlink3.mk" diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 6b288c2d6c1..37ae0bda15b 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.153 2019/07/21 22:24:11 wiz Exp $ +# $NetBSD: Makefile,v 1.154 2019/11/04 21:13:02 rillig Exp $ DISTNAME= seahorse-2.32.0 PKGREVISION= 56 @@ -12,14 +12,14 @@ COMMENT= GnuPG front end and bonobo component for GNOME #LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.1 AND gnu-lgpl-v2 .if exists(/usr/bin/ssh) && exists(/usr/bin/ssh-add) && exists(/usr/bin/ssh-keygen) -SSH_PATH=/usr/bin/ssh -SSH_ADD_PATH=/usr/bin/ssh-add -SSH_KEYGEN_PATH=/usr/bin/ssh-keygen +SSH_PATH= /usr/bin/ssh +SSH_ADD_PATH= /usr/bin/ssh-add +SSH_KEYGEN_PATH= /usr/bin/ssh-keygen .else DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh -SSH_PATH=${PREFIX}/bin/ssh -SSH_ADD_PATH=${PREFIX}/bin/ssh-add -SSH_KEYGEN_PATH=${PREFIX}/ssh-keygen +SSH_PATH= ${PREFIX}/bin/ssh +SSH_ADD_PATH= ${PREFIX}/bin/ssh-add +SSH_KEYGEN_PATH= ${PREFIX}/ssh-keygen .endif GNU_CONFIGURE= yes @@ -35,7 +35,7 @@ CONFIGURE_ENV+= SSH_KEYGEN_PATH=${SSH_KEYGEN_PATH:Q} CONFIGURE_ENV+= GNUPG=${GPGME_GPG} PKGCONFIG_OVERRIDE+= libcryptui/cryptui.pc.in -GCONF_SCHEMAS= seahorse.schemas +GCONF_SCHEMAS= seahorse.schemas # for PKCS11 .include "../../security/gnome-keyring/buildlink3.mk" diff --git a/security/sign/Makefile b/security/sign/Makefile index c8cd77fbd3a..323cc05be10 100644 --- a/security/sign/Makefile +++ b/security/sign/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2018/04/18 19:56:42 kamil Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:13:02 rillig Exp $ -DISTNAME= sign-1.0.7 +DISTNAME= sign-1.0.7 PKGREVISION= 1 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_GITHUB:=apankrat/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=apankrat/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://swapped.cc/sign/ diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk index 292297237e0..7faefd374ed 100644 --- a/security/skey/builtin.mk +++ b/security/skey/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2013/11/23 12:10:13 obache Exp $ +# $NetBSD: builtin.mk,v 1.6 2019/11/04 21:13:02 rillig Exp $ BUILTIN_PKG:= skey @@ -17,7 +17,7 @@ IS_BUILTIN.skey= no IS_BUILTIN.skey= yes . endif .endif -MAKEVARS+= IS_BUILTIN.skey +MAKEVARS+= IS_BUILTIN.skey ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -31,7 +31,7 @@ MAKEVARS+= IS_BUILTIN.skey # XXX BUILTIN_PKG.skey= skey-1.1.5 .endif -MAKEVARS+= BUILTIN_PKG.skey +MAKEVARS+= BUILTIN_PKG.skey ### ### Determine whether we should use the built-in implementation if it @@ -58,4 +58,4 @@ USE_BUILTIN.skey!= \ . endif . endif # PREFER.skey .endif -MAKEVARS+= USE_BUILTIN.skey +MAKEVARS+= USE_BUILTIN.skey diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile index e254690ed35..2fe51410125 100644 --- a/security/smtpd/Makefile +++ b/security/smtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2017/09/04 18:01:00 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:13:02 rillig Exp $ # DISTNAME= smtpd-2.0 @@ -21,14 +21,14 @@ RCD_SCRIPTS= smtpfwdd FILES_SUBST+= SPOOL=${SPOOL:Q} # taken directly from the Makefile. -CFLAGS.NetBSD+= -DUSE_FLOCK -DUSE_MKSTEMP +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} +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} INSTALLATION_DIRS= sbin share/doc/smtpd share/examples/smtpd OWN_DIRS= ${SPOOL}/etc @@ -40,7 +40,7 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/smtpd .for f in antirelay_check_rules_example antispam_check_rules.example \ smtpd_check_rules.example - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/smtpd + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/smtpd .endfor .include "../../devel/sysexits/buildlink3.mk" diff --git a/security/snoopy/Makefile b/security/snoopy/Makefile index 80b2f8130ed..cb15b6d1f9a 100644 --- a/security/snoopy/Makefile +++ b/security/snoopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/09/09 09:28:40 nia Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:13:02 rillig Exp $ DISTNAME= snoopy-2.1.0 CATEGORIES= security @@ -21,7 +21,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS pre-configure: - set -e; cd ${WRKSRC}; \ - aclocal; autoheader; automake -a --foreign -i; autoconf + set -e; cd ${WRKSRC}; \ + aclocal; autoheader; automake -a --foreign -i; autoconf .include "../../mk/bsd.pkg.mk" diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile index ca8edd2c0e5..f5583a43d2f 100644 --- a/security/softhsm/Makefile +++ b/security/softhsm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2019/05/23 19:23:16 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/04 21:13:02 rillig Exp $ # DISTNAME= softhsm-1.3.7 @@ -22,9 +22,9 @@ CONFIGURE_ARGS+= --with-botan=${PREFIX} EGDIR= ${PREFIX}/share/examples/softhsm -SUBST_CLASSES+= paths -SUBST_FILES.paths= ${WRKSRC}/Makefile.in -SUBST_STAGE.paths= pre-configure +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKSRC}/Makefile.in +SUBST_STAGE.paths= pre-configure SUBST_VARS.paths= EGDIR CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile index f14411ed2e2..2d6bf618592 100644 --- a/security/srp_client/Makefile +++ b/security/srp_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2018/01/02 05:37:24 maya Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/04 21:13:02 rillig Exp $ DISTNAME= srp-1.4.4 PKGNAME= srp-client-1.4.4 @@ -28,11 +28,11 @@ CONFIGURE_ARGS+= --with-krb4 .include "../../mk/bsd.prefs.mk" SED_PATTERN= -e "s,include/kerberos,include/kerberosIV," -.if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == "" +. if ${MACHINE_PLATFORM:MNetBSD-[01].[0-4]*-i386} == "" SED_PATTERN+= -e "s,-ldes,-ldes -lroken -lcom_err -lcrypt," -.else +. else SED_PATTERN+= -e "s,-ldes,-ldes -lcom_err," -.endif +. endif post-patch: for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in \ diff --git a/security/sshfp/Makefile b/security/sshfp/Makefile index 19e075f5f42..16a7a6ebabf 100644 --- a/security/sshfp/Makefile +++ b/security/sshfp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/04/25 07:33:17 maya Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:13:03 rillig Exp $ DISTNAME= sshfp-1.1.3 PKGREVISION= 5 @@ -12,9 +12,9 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns -MANCOMPRESSED= yes -NO_BUILD= yes -REPLACE_PYTHON= sshfp +MANCOMPRESSED= yes +NO_BUILD= yes +REPLACE_PYTHON= sshfp .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/ssldump/Makefile b/security/ssldump/Makefile index 20524dd540f..a6d777e0e6e 100644 --- a/security/ssldump/Makefile +++ b/security/ssldump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2017/09/04 18:01:01 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/04 21:13:03 rillig Exp $ # DISTNAME= ssldump-0.9b3 @@ -13,10 +13,10 @@ COMMENT= SSLv3/TLS network protocol analyzer GNU_CONFIGURE= YES USE_TOOLS+= gmake -CONFIGURE_ARGS+=--with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \ - --with-pcap-lib=${BUILDLINK_PREFIX.libpcap}/lib \ - --with-openssl-inc=${BUILDLINK_PREFIX.openssl}/include \ - --with-openssl-lib=${BUILDLINK_PREFIX.openssl}/lib +CONFIGURE_ARGS+= --with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \ + --with-pcap-lib=${BUILDLINK_PREFIX.libpcap}/lib \ + --with-openssl-inc=${BUILDLINK_PREFIX.openssl}/include \ + --with-openssl-lib=${BUILDLINK_PREFIX.openssl}/lib INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/sbin \ MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile index d07470da4aa..3c77f1effdf 100644 --- a/security/sslwrap/Makefile +++ b/security/sslwrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2016/03/05 11:29:26 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/04 21:13:03 rillig Exp $ DISTNAME= ${PKGNAME_NOREV:S/-//} PKGNAME= sslwrap-206 @@ -10,9 +10,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.rickk.com/sslwrap/ COMMENT= Simple SSL wrapper -OPSYSVARS+= LDADD -LDADD.SunOS= -lnsl -lsocket -MAKE_ENV+= LDADD=${LDADD:Q} +OPSYSVARS+= LDADD +LDADD.SunOS= -lnsl -lsocket +MAKE_ENV+= LDADD=${LDADD:Q} USE_BSD_MAKEFILE= yes .include "../../security/openssl/buildlink3.mk" diff --git a/security/ssss/Makefile b/security/ssss/Makefile index c125f52045c..c6d15bd1439 100644 --- a/security/ssss/Makefile +++ b/security/ssss/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2012/10/23 18:16:59 asau Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:13:03 rillig Exp $ DISTNAME= ssss-0.5 PKGREVISION= 2 CATEGORIES= security MASTER_SITES= http://point-at-infinity.org/ssss/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ssss.1 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ssss.1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://point-at-infinity.org/ssss/ diff --git a/security/sudo/options.mk b/security/sudo/options.mk index aa0785ef641..237e682f8dc 100644 --- a/security/sudo/options.mk +++ b/security/sudo/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.22 2018/08/14 13:18:37 adam Exp $ +# $NetBSD: options.mk,v 1.23 2019/11/04 21:13:03 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.sudo -PKG_SUPPORTED_OPTIONS= ldap nls -PKG_OPTIONS_OPTIONAL_GROUPS=auth -PKG_OPTIONS_GROUP.auth= kerberos pam skey +PKG_OPTIONS_VAR= PKG_OPTIONS.sudo +PKG_SUPPORTED_OPTIONS= ldap nls +PKG_OPTIONS_OPTIONAL_GROUPS= auth +PKG_OPTIONS_GROUP.auth= kerberos pam skey .if ${OPSYS} == "NetBSD" && exists(/usr/include/skey.h) PKG_SUGGESTED_OPTIONS= skey diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk index 02d655a3c70..d38ff57ccf3 100644 --- a/security/tcp_wrappers/builtin.mk +++ b/security/tcp_wrappers/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $ +# $NetBSD: builtin.mk,v 1.10 2019/11/04 21:13:03 rillig Exp $ BUILTIN_PKG:= tcp_wrappers @@ -20,7 +20,7 @@ IS_BUILTIN.tcp_wrappers= no IS_BUILTIN.tcp_wrappers= yes . endif .endif -MAKEVARS+= IS_BUILTIN.tcp_wrappers +MAKEVARS+= IS_BUILTIN.tcp_wrappers ### ### Determine whether we should use the built-in implementation if it @@ -47,4 +47,4 @@ USE_BUILTIN.tcp_wrappers!= \ . endif . endif # PREFER.tcp_wrappers .endif -MAKEVARS+= USE_BUILTIN.tcp_wrappers +MAKEVARS+= USE_BUILTIN.tcp_wrappers diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile index ba6fe2037ec..6255935b2b5 100644 --- a/security/tor-browser/Makefile +++ b/security/tor-browser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/09/18 14:17:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/04 21:13:03 rillig Exp $ DISTNAME= src-firefox-tor-browser-60.8.0esr-8.5-1-build2 PKGNAME= tor-browser-8.5.4 @@ -61,10 +61,10 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-ffunction-sections .include "../../www/firefox60/mozilla-common.mk" .include "options.mk" -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py -CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py +CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py CHECK_WRKREF_SKIP+= lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html diff --git a/security/tor-browser/options.mk b/security/tor-browser/options.mk index 3a4076e5ce1..466b29c933f 100644 --- a/security/tor-browser/options.mk +++ b/security/tor-browser/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2019/06/14 17:22:21 nia Exp $ +# $NetBSD: options.mk,v 1.5 2019/11/04 21:13:03 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tor-browser PKG_SUPPORTED_OPTIONS+= alsa debug debug-info mozilla-jemalloc pulseaudio @@ -29,12 +29,12 @@ CONFIGURE_ARGS+= --disable-jemalloc .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mgcc) -.if ${CC_VERSION:S/gcc-//:S/.//g} >= 480 +. if ${CC_VERSION:S/gcc-//:S/.//g} >= 480 # Modern gcc does not run any "tracking" passes when compiling with -O0, # which makes the generated debug info mostly useless. So explicitly # request them. O0TRACKING=-fvar-tracking-assignments -fvar-tracking -.endif +. endif .endif .if !empty(PKG_OPTIONS:Mdebug) @@ -42,11 +42,11 @@ CONFIGURE_ARGS+= --enable-debug="-g -O0 ${O0TRACKING}" --enable-debug-symbols -- CONFIGURE_ARGS+= --disable-install-strip PLIST.debug= yes .else -.if !empty(PKG_OPTIONS:Mdebug-info) +. if !empty(PKG_OPTIONS:Mdebug-info) CONFIGURE_ARGS+= --enable-debug-symbols -.else +. else CONFIGURE_ARGS+= --disable-debug-symbols -.endif +. endif CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --enable-optimize=-O2 CONFIGURE_ARGS+= --enable-install-strip diff --git a/security/validns/Makefile b/security/validns/Makefile index 02fed30c4ea..8b082a987d7 100644 --- a/security/validns/Makefile +++ b/security/validns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:57 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/04 21:13:03 rillig Exp $ # DISTNAME= validns-0.8 @@ -15,7 +15,7 @@ LICENSE= 2-clause-bsd #BUILD_DEPENDS+= p5-Test-Command-Simple-[0-9]*:../../devel/p5-Test-Command-Simple -#USE_TOOLS+=perl +#USE_TOOLS+= perl INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/security/volatility/Makefile b/security/volatility/Makefile index 7163e5961ec..18279ad7d0d 100644 --- a/security/volatility/Makefile +++ b/security/volatility/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/09/02 13:19:54 adam Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:13:03 rillig Exp $ DISTNAME= volatility-2.4 PKGREVISION= 1 @@ -14,10 +14,10 @@ DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree DEPENDS+= ${PYPKGPREFIX}-distorm3-[0-9]*:../../devel/py-distorm3 -PYDISTUTILSPKG= yes -REPLACE_PYTHON= tools/vtype_diff.py +PYDISTUTILSPKG= yes +REPLACE_PYTHON= tools/vtype_diff.py -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/egg.mk" .include "../../lang/python/application.mk" diff --git a/security/yara/Makefile b/security/yara/Makefile index 99237c8c090..2ebcab01949 100644 --- a/security/yara/Makefile +++ b/security/yara/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/07/11 11:20:06 sevan Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:13:04 rillig Exp $ DISTNAME= yara-${VERSION} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GITHUB:=VirusTotal/} -COMMENT= Pattern matching swiss knife for malware researchers +COMMENT= Pattern matching swiss knife for malware researchers USE_TOOLS+= pkg-config automake autoreconf USE_LIBTOOL= yes diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 3e6ff4fb0f4..efcde72d76c 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/08/11 13:23:02 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/04 21:13:04 rillig Exp $ DISTNAME= zebedee-2.5.3 PKGREVISION= 14 @@ -25,7 +25,7 @@ SUBST_SED.paths= -e 's,tclsh,${TCLSH},g' .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" -PTHREAD_CFLAGS+= -DHAVE_PTHREADS +PTHREAD_CFLAGS+= -DHAVE_PTHREADS .endif .include "../../archivers/bzip2/buildlink3.mk" diff --git a/security/zoneminder/Makefile b/security/zoneminder/Makefile index 78bfe36ad65..0b49c7d9ba4 100644 --- a/security/zoneminder/Makefile +++ b/security/zoneminder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/08/11 13:23:02 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/04 21:13:04 rillig Exp $ # See wip/zoneminder for a draft update to 1.29.0. PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/} @@ -17,7 +17,7 @@ COMMENT= Video camera security and surveillance solution LICENSE= gnu-gpl-v2 # NetBSD tar: Invalid header, starting valid header search. -EXTRACT_USING= gtar +EXTRACT_USING= gtar DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm @@ -138,7 +138,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql # \todo Somehow, this permission setup still fails. # This directory contains state, so use OWN_DIRS instead of MAKE_DIRS. -ZM_CACHE= ${VARBASE}/cache/zoneminder +ZM_CACHE= ${VARBASE}/cache/zoneminder OWN_DIRS_PERMS+= ${ZM_CACHE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 OWN_DIRS_PERMS+= ${ZM_CACHE}/temp ${REAL_ROOT_USER} ${APACHE_GROUP} 775 OWN_DIRS_PERMS+= ${ZM_CACHE}/images ${REAL_ROOT_USER} ${APACHE_GROUP} 775 @@ -197,7 +197,7 @@ SUBST_CLASSES+= script-path SUBST_MESSAGE.script-path= Adjusting paths in scripts. SUBST_STAGE.script-path= pre-configure SUBST_FILES.script-path= ${REPLACE_PERL} ${EXTRA_PERL} -SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g" +SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g" SUBST_CLASSES+= files SUBST_STAGE.files= pre-configure |