diff options
author | joerg <joerg> | 2008-03-15 16:27:42 +0000 |
---|---|---|
committer | joerg <joerg> | 2008-03-15 16:27:42 +0000 |
commit | c2cd8a402fae14754e0484f4290d2ae067a2e1e4 (patch) | |
tree | 34393cfaace98068b87e86e1ba3c87ca1a745941 /mk/bulk | |
parent | d710a13331099e49e531e05d982086b46c3cc9d0 (diff) | |
download | pkgsrc-c2cd8a402fae14754e0484f4290d2ae067a2e1e4.tar.gz |
Remove remaining compat code for old pkg_install versions.
Diffstat (limited to 'mk/bulk')
-rw-r--r-- | mk/bulk/pre-build | 20 | ||||
-rw-r--r-- | mk/bulk/sort-packages | 13 | ||||
-rw-r--r-- | mk/bulk/upload | 21 |
3 files changed, 15 insertions, 39 deletions
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build index 9c7f9e1bfc6..e0f8a4c9b9d 100644 --- a/mk/bulk/pre-build +++ b/mk/bulk/pre-build @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: pre-build,v 1.71 2008/01/04 15:49:08 rillig Exp $ +# $NetBSD: pre-build,v 1.72 2008/03/15 16:27:43 joerg Exp $ # # Clean up system to be ready for bulk pkg build # @@ -74,20 +74,14 @@ mkdir -p "${BULKFILESDIR}" _INFO_VER=`${PKG_INFO} -V`; echo "pre-build> Making sure vulnerability-list is upto date:" if [ -z "$UPDATE_VULNERABILITY_LIST" -o "$UPDATE_VULNERABILITY_LIST" = yes ]; then - if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER}; then - ( cd "${USR_PKGSRC}/security/audit-packages" \ - && ${BMAKE} bulk-install \ - && env PKGVULNDIR="${DISTDIR}" download-vulnerability-list ) - else - _PKGVULNDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR` - download-vulnerability-list ${DOWNLOAD_VULNERABILITY_LIST_FLAGS} - if [ "x${_PKGVULNDIR}" != "x${DISTDIR}" ]; then - cp ${_PKGVULNDIR}/pkg-vulnerabilities ${DISTDIR} - fi + _PKGVULNDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR` + download-vulnerability-list ${DOWNLOAD_VULNERABILITY_LIST_FLAGS} + if [ "x${_PKGVULNDIR}" != "x${DISTDIR}" ]; then + cp ${_PKGVULNDIR}/pkg-vulnerabilities ${DISTDIR} fi - echo 'pre-build> done.' + echo 'pre-build> done.' else - echo 'pre-build> (skipped)' + echo 'pre-build> (skipped)' fi # On non-NetBSD platforms we need to keep the bootstrap-files! diff --git a/mk/bulk/sort-packages b/mk/bulk/sort-packages index 4dbc343de67..ed2e952c47d 100644 --- a/mk/bulk/sort-packages +++ b/mk/bulk/sort-packages @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: sort-packages,v 1.11 2007/10/09 19:19:13 martti Exp $ +# $NetBSD: sort-packages,v 1.12 2008/03/15 16:27:43 joerg Exp $ # This program scans all binary packages in the current directory and # creates three lists of files in OUTDIR: @@ -69,16 +69,7 @@ for pkg in *${PKG_SUFX}; do pkg_prefix="${pkg%%-*}" category="regular" _INFO_VER=`${PKG_INFO} -V`; - if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER}; then - # XXX: The egrep command is only needed here because - # audit-packages before pkg_install-20070714 is so - # awfully slow. - if egrep "^({.*${pkg_prefix}.*}|${pkg_prefix}|{.*}${pkg_prefix})" ${PKGVULNDIR}/pkg-vulnerabilities >/dev/null 4>&1; then - vuln=`${AUDIT_PACKAGES} -p "${pkg}"` - fi - else - vuln=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -p "${pkg}"` - fi + vuln=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -p "${pkg}"` if [ -n "${vuln}" ]; then category="vulnerable" fi diff --git a/mk/bulk/upload b/mk/bulk/upload index f1adf14054c..476794f0c98 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: upload,v 1.42 2008/01/04 15:49:08 rillig Exp $ +# $NetBSD: upload,v 1.43 2008/03/15 16:27:43 joerg Exp $ # # Upload non-restricted binary pkgs to ftp server @@ -150,11 +150,7 @@ MD5="digest md5"; SHA1="digest sha1"; _INFO_VER=`${PKG_INFO} -V`; -if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER}; then - REQUIRED_PACKAGES="pkgtools/lintpkgsrc net/rsync security/audit-packages" -else - REQUIRED_PACKAGES="pkgtools/lintpkgsrc net/rsync" -fi +REQUIRED_PACKAGES="pkgtools/lintpkgsrc net/rsync" opsys=`uname -s` case "$opsys" in @@ -243,15 +239,10 @@ done echo "upload> Making sure vulnerability-list is up-to-date:" if [ -z "$UPDATE_VULNERABILITY_LIST" -o "$UPDATE_VULNERABILITY_LIST" = "yes" ] then - if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${_INFO_VER} - then - env PKGVULNDIR=${distdir} download-vulnerability-list - else - _PKGVULNDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR` - download-vulnerability-list ${DOWNLOAD_VULNERABILITY_LIST_FLAGS} - if [ "x${_PKGVULNDIR}" != "x${distdir}" ]; then - cp ${_PKGVULNDIR}/pkg-vulnerabilities ${distdir} - fi + _PKGVULNDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR` + download-vulnerability-list ${DOWNLOAD_VULNERABILITY_LIST_FLAGS} + if [ "x${_PKGVULNDIR}" != "x${distdir}" ]; then + cp ${_PKGVULNDIR}/pkg-vulnerabilities ${distdir} fi echo " done." else |