diff options
author | bad <bad> | 2008-10-13 22:32:54 +0000 |
---|---|---|
committer | bad <bad> | 2008-10-13 22:32:54 +0000 |
commit | 418162074102ae174bc02feb871cf2bc25135309 (patch) | |
tree | d31bea13566d196c0896960615b02ccfbf801069 /security/nessus-plugins | |
parent | 1b90544867644d00b300bd57f61a4bbdfa4660c3 (diff) | |
download | pkgsrc-418162074102ae174bc02feb871cf2bc25135309.tar.gz |
Fix botched update of nessus.
Need to BUILDLINK_ABI_DEPENDS on the 2.2.11 versions of the libraries.
Bump PKGREVISION wholesale to disambiguate the fixed packages from the botched
ones and depend on them.
Use GPLed version of the plugins instead of the non-free version.
While here fix permissions of PKG_SYSCONFDIR in nessus-core/Makefile.
Diffstat (limited to 'security/nessus-plugins')
-rw-r--r-- | security/nessus-plugins/Makefile | 6 | ||||
-rw-r--r-- | security/nessus-plugins/distinfo | 10 | ||||
-rw-r--r-- | security/nessus-plugins/patches/patch-ab | 15 |
3 files changed, 20 insertions, 11 deletions
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile index dfc87e341c1..8304d7e10b7 100644 --- a/security/nessus-plugins/Makefile +++ b/security/nessus-plugins/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.35 2008/10/10 11:34:50 adam Exp $ +# $NetBSD: Makefile,v 1.36 2008/10/13 22:32:54 bad Exp $ .include "../../security/nessus/Makefile.common" -DISTNAME= nessus-plugins-${VERS} +DISTNAME= nessus-plugins-GPL-${VERS} +PKGNAME= nessus-plugins-${VERS} +PKGREVISION= 1 # nmap.nasl was removed from the pack, # http://www.nessus.org/documentation/?doc=nmap-usage DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} nmap.nasl diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo index 9ad71eae6d3..6a14bbf5ff5 100644 --- a/security/nessus-plugins/distinfo +++ b/security/nessus-plugins/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.24 2008/10/10 11:34:50 adam Exp $ +$NetBSD: distinfo,v 1.25 2008/10/13 22:32:54 bad Exp $ -SHA1 (nessus-plugins-2.2.11.tar.gz) = 5037f7b6551c1cb303e5f5b853b7493e56aa02d9 -RMD160 (nessus-plugins-2.2.11.tar.gz) = 480aa0b57412de681fd6bc7b1b3b5fdec78626db -Size (nessus-plugins-2.2.11.tar.gz) = 7647308 bytes +SHA1 (nessus-plugins-GPL-2.2.11.tar.gz) = f62395a913c501abef052ae2a07749f99eacb699 +RMD160 (nessus-plugins-GPL-2.2.11.tar.gz) = ef1e38672379128d911e9efc67a46d3430818dc6 +Size (nessus-plugins-GPL-2.2.11.tar.gz) = 1097689 bytes SHA1 (nmap.nasl) = 18a3eb6c03256e89d596804aa879c0d2b3126140 RMD160 (nmap.nasl) = d3a0e8227b223e67754b073ca7920e073f8d8172 Size (nmap.nasl) = 16378 bytes SHA1 (patch-aa) = e2f564fff440728373abb49947c714d7002fc9da -SHA1 (patch-ab) = 63260fa70de7d786925869d514be823837448967 +SHA1 (patch-ab) = e7dd724f787b78f6335a5d4eaeb396e072bbc5d4 diff --git a/security/nessus-plugins/patches/patch-ab b/security/nessus-plugins/patches/patch-ab index 7c35a3ec903..d5c39fc9e25 100644 --- a/security/nessus-plugins/patches/patch-ab +++ b/security/nessus-plugins/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2008/10/10 11:35:39 adam Exp $ +$NetBSD: patch-ab,v 1.2 2008/10/13 22:32:54 bad Exp $ ---- Makefile.orig 2008-10-06 16:00:43.000000000 +0200 -+++ Makefile -@@ -23,7 +23,7 @@ install-dirs: +--- Makefile.orig 2008-03-08 01:10:04.000000000 +0000 ++++ Makefile 2008-09-09 16:30:11.000000000 +0000 +@@ -23,13 +23,13 @@ $(DESTDIR)${libdir}/nessus/plugins install-nasl: install-dirs @@ -11,3 +11,10 @@ $NetBSD: patch-ab,v 1.1 2008/10/10 11:35:39 adam Exp $ $(INSTALL) -o $(installuser) -m 444 $$scripts \ $(DESTDIR)${libdir}/nessus/plugins; \ done + + install-inc: install-dirs +- for scripts in scripts/*.inc scripts/*.nlib; do \ ++ for scripts in scripts/*.inc; do \ + $(INSTALL) -o $(installuser) -m 444 $$scripts \ + $(DESTDIR)${libdir}/nessus/plugins; \ + done |