diff options
| author | cheusov <cheusov@pkgsrc.org> | 2014-10-28 02:08:38 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2014-10-28 02:08:38 +0000 |
| commit | 522736219b40624ddc2a5d0b94f679583d216317 (patch) | |
| tree | 2145a9a28cc5d0f5fd195a05f438b4c13d8ff839 | |
| parent | 19e37b29108f5d7bb9f3b3886e86c6bb2b60b796 (diff) | |
| download | pkgsrc-522736219b40624ddc2a5d0b94f679583d216317.tar.gz | |
IGNORE_OSABI was renamed to CHECK_OSABI
| -rw-r--r-- | pkgtools/osabi/INSTALL | 8 | ||||
| -rw-r--r-- | pkgtools/osabi/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/pkg_install.conf.5.in | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/pkgtools/osabi/INSTALL b/pkgtools/osabi/INSTALL index 4f3bf334329..166c914e4ba 100644 --- a/pkgtools/osabi/INSTALL +++ b/pkgtools/osabi/INSTALL @@ -1,8 +1,14 @@ -# $NetBSD: INSTALL,v 1.3 2013/02/23 05:47:59 obache Exp $ +# $NetBSD: INSTALL,v 1.4 2014/10/28 02:08:38 cheusov Exp $ UNAME="@UNAME@" +PKG_ADMIN="@PKG_ADMIN@" + case ${STAGE} in PRE-INSTALL) + if ${TEST} no = "$($PKG_ADMIN config-var CHECK_OSABI)"; then + exit 0 + fi + OS_VERSION=`${UNAME} -r` PKG_VERSION="${PKGNAME##*-}" case `${UNAME} -s` in diff --git a/pkgtools/osabi/Makefile b/pkgtools/osabi/Makefile index e4d76cab920..e8d7df0d37b 100644 --- a/pkgtools/osabi/Makefile +++ b/pkgtools/osabi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/03/03 03:30:53 obache Exp $ +# $NetBSD: Makefile,v 1.3 2014/10/28 02:08:38 cheusov Exp $ # PKGNAME= osabi-${OPSYS}-${OS_VERSION} @@ -9,6 +9,6 @@ HOMEPAGE= http://www.pkgsrc.org/ COMMENT= Operating System version dummy-package META_PACKAGE= yes -FILES_SUBST+= UNAME=${UNAME:Q} +FILES_SUBST+= UNAME=${UNAME:Q} PKG_ADMIN=${PKG_ADMIN:Q} .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in index e857e04b208..aa6d3f37c5e 100644 --- a/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in +++ b/pkgtools/pkg_install/files/lib/pkg_install.conf.5.in @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_install.conf.5.in,v 1.18 2014/10/27 00:12:47 cheusov Exp $ +.\" $NetBSD: pkg_install.conf.5.in,v 1.19 2014/10/28 02:08:39 cheusov Exp $ .\" .\" Copyright (c) 2008, 2009, 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -93,6 +93,8 @@ Missing license conditions are considered an error. During vulnerability checks, consider packages that have reached end-of-life as vulnerable. This option is enabled by default. +.It Dv CHECK_OSABI +If "no", osabi package does not check OS version. The default is "yes". .It Dv CHECK_VULNERABILITIES Check for vulnerabilities when installing packages. Supported values are: @@ -146,8 +148,6 @@ Use direct connections and ignore .Ev FTP_PROXY and .Ev HTTP_PROXY . -.It Dv IGNORE_OSABI -If "yes", osabi package does not check OS version. .It Dv IGNORE_URL One line per advisory which should be ignored when running .Dl Ic pkg_admin audit |