summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/libnasl/Makefile3
-rw-r--r--security/libnasl/buildlink3.mk6
-rw-r--r--security/nessus-core/Makefile5
-rw-r--r--security/nessus-core/buildlink3.mk6
-rw-r--r--security/nessus-libraries/Makefile4
-rw-r--r--security/nessus-libraries/buildlink3.mk6
-rw-r--r--security/nessus-plugins/Makefile6
-rw-r--r--security/nessus-plugins/distinfo10
-rw-r--r--security/nessus-plugins/patches/patch-ab15
-rw-r--r--security/nessus/Makefile5
10 files changed, 40 insertions, 26 deletions
diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index 679a728826c..85494d9c6bf 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2008/10/10 11:34:50 adam Exp $
+# $NetBSD: Makefile,v 1.23 2008/10/13 22:32:54 bad Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../security/nessus/Makefile.common"
DISTNAME= libnasl-${VERS}
+PKGREVISION= 1
COMMENT= Nessus Attack Scripting Language library
diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk
index afac83fa1f8..b000b90530a 100644
--- a/security/libnasl/buildlink3.mk
+++ b/security/libnasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:09:38 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2008/10/13 22:32:54 bad Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNASL_BUILDLINK3_MK:= ${LIBNASL_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= libnasl
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnasl
.if !empty(LIBNASL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libnasl+= libnasl>=2.2.9
-BUILDLINK_ABI_DEPENDS.libnasl?= libnasl>=2.2.9nb1
+BUILDLINK_API_DEPENDS.libnasl+= libnasl>=2.2.11
+BUILDLINK_ABI_DEPENDS.libnasl?= libnasl>=2.2.11nb1
BUILDLINK_PKGSRCDIR.libnasl?= ../../security/libnasl
.endif # LIBNASL_BUILDLINK3_MK
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index ab5f418824f..d062c518be6 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2008/10/10 11:34:50 adam Exp $
+# $NetBSD: Makefile,v 1.35 2008/10/13 22:32:54 bad Exp $
.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-core-${VERS}
+PKGREVISION= 1
COMMENT= Core module of the Nessus Network Security Scanner
@@ -23,7 +24,7 @@ RCD_SCRIPTS= nessusd
PKG_SYSCONFSUBDIR?= nessus
OWN_DIRS_PERMS+= ${VARBASE}/nessus ${ROOT_USER} ${ROOT_GROUP} 0700
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR} ${ROOT_USER} ${ROOT_GROUP} 0755
OWN_DIRS+= ${PREFIX}/lib/nessus \
${PREFIX}/lib/nessus/reports \
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index 96323971bbb..ce8970aa212 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:09:39 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2008/10/13 22:32:54 bad Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NESSUS_CORE_BUILDLINK3_MK:= ${NESSUS_CORE_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= nessus-core
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nessus-core
.if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.nessus-core+= nessus-core>=2.2.7
-BUILDLINK_ABI_DEPENDS.nessus-core?= nessus-core>=2.2.9nb1
+BUILDLINK_API_DEPENDS.nessus-core+= nessus-core>=2.2.11
+BUILDLINK_ABI_DEPENDS.nessus-core?= nessus-core>=2.2.11nb1
BUILDLINK_PKGSRCDIR.nessus-core?= ../../security/nessus-core
.endif # NESSUS_CORE_BUILDLINK3_MK
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index c242ad8f0c8..b5c99e19aa0 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.30 2008/10/10 11:34:50 adam Exp $
+# $NetBSD: Makefile,v 1.31 2008/10/13 22:32:54 bad Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-libraries-${VERS}
+PKGREVISION= 1
+
COMMENT= Libs required by the Nessus Network security scanner
WRKSRC= ${WRKDIR}/nessus-libraries
diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk
index 92b31fce385..66f9bbbe120 100644
--- a/security/nessus-libraries/buildlink3.mk
+++ b/security/nessus-libraries/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:09:39 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2008/10/13 22:32:54 bad Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NESSUS_LIBRARIES_BUILDLINK3_MK:= ${NESSUS_LIBRARIES_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= nessus-libraries
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nessus-libraries
.if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.nessus-libraries+= nessus-libraries>=2.2.3
-BUILDLINK_ABI_DEPENDS.nessus-libraries?= nessus-libraries>=2.2.9nb1
+BUILDLINK_API_DEPENDS.nessus-libraries+= nessus-libraries>=2.2.11
+BUILDLINK_ABI_DEPENDS.nessus-libraries?= nessus-libraries>=2.2.11nb1
BUILDLINK_PKGSRCDIR.nessus-libraries?= ../../security/nessus-libraries
.endif # NESSUS_LIBRARIES_BUILDLINK3_MK
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
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index d0afcef6d9b..68f7165e983 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.34 2008/07/14 12:56:12 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2008/10/13 22:32:54 bad Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../security/nessus/Makefile.common"
DISTNAME= nessus-${VERS}
+PKGREVISION= 1
MASTER_SITES= # empty
DISTFILES= # empty
COMMENT= The Nessus Network Security Scanner
-DEPENDS+= nessus-plugins-${VERS}{,nb*}:../../security/nessus-plugins
+DEPENDS+= nessus-plugins-${VERS}nb*:../../security/nessus-plugins
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes