diff options
author | adam <adam@pkgsrc.org> | 2004-07-22 14:59:53 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2004-07-22 14:59:53 +0000 |
commit | 1383a1ac33a2f459503e9155cd4a7c4c1beefaf7 (patch) | |
tree | df6576c886a430c7cd61403540caa3724fbad15a /security | |
parent | 047727a34186d2934e066ee97504d2ed4d6c9071 (diff) | |
download | pkgsrc-1383a1ac33a2f459503e9155cd4a7c4c1beefaf7.tar.gz |
Changes 2.0.12:
* Fixed a bug in ./configure which would sometimes assume that GTK is not
installed whereas it actually is
* Fixed a race condition in nessus-adduser for users who do not configure
their TMPDIR variable (thanks to Cyrille Barthelemy)
* Fixed a bug in nessus-update-plugins which would not update the plugins
properly on all systems (thanks to Keith Butler)
* Fixed the installer to compile Nessus with GTK support if gtk-config OR
pkg-config is installed.
Diffstat (limited to 'security')
-rw-r--r-- | security/libnasl/Makefile | 4 | ||||
-rw-r--r-- | security/libnasl/PLIST | 4 | ||||
-rw-r--r-- | security/libnasl/buildlink3.mk | 8 | ||||
-rw-r--r-- | security/libnasl/distinfo | 6 | ||||
-rw-r--r-- | security/nessus-core/MESSAGE | 4 | ||||
-rw-r--r-- | security/nessus-core/Makefile | 3 | ||||
-rw-r--r-- | security/nessus-core/PLIST | 6 | ||||
-rw-r--r-- | security/nessus-core/buildlink3.mk | 9 | ||||
-rw-r--r-- | security/nessus-core/distinfo | 6 | ||||
-rw-r--r-- | security/nessus-libraries/PLIST | 8 | ||||
-rw-r--r-- | security/nessus-libraries/buildlink3.mk | 4 | ||||
-rw-r--r-- | security/nessus-libraries/distinfo | 6 | ||||
-rw-r--r-- | security/nessus-plugins/MESSAGE | 9 | ||||
-rw-r--r-- | security/nessus-plugins/PLIST | 7 | ||||
-rw-r--r-- | security/nessus-plugins/distinfo | 6 | ||||
-rw-r--r-- | security/nessus/Makefile.common | 4 |
16 files changed, 51 insertions, 43 deletions
diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile index 355fd0099f1..789cadec62b 100644 --- a/security/libnasl/Makefile +++ b/security/libnasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/05/19 16:23:34 adam Exp $ +# $NetBSD: Makefile,v 1.10 2004/07/22 15:00:20 adam Exp $ DISTNAME= libnasl-${VERS} .include "../nessus/Makefile.common" @@ -9,5 +9,5 @@ WRKSRC= ${WRKDIR}/libnasl GNU_CONFIGURE= yes USE_BUILDLINK3= yes -.include "../nessus-libraries/buildlink3.mk" +.include "../../security/nessus-libraries/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/libnasl/PLIST b/security/libnasl/PLIST index 4435583dc0b..14a406e4d2a 100644 --- a/security/libnasl/PLIST +++ b/security/libnasl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/07/20 11:48:10 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2004/07/22 15:00:20 adam Exp $ bin/nasl bin/nasl-config include/nessus/nasl.h @@ -6,6 +6,6 @@ lib/libnasl.a lib/libnasl.la lib/libnasl.so lib/libnasl.so.2 -lib/libnasl.so.2.11 +lib/libnasl.so.2.12 man/man1/nasl-config.1 man/man1/nasl.1 diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk index f1ce3d8fd2b..9c920538c0b 100644 --- a/security/libnasl/buildlink3.mk +++ b/security/libnasl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 05:52:55 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/07/22 15:00:20 adam Exp $ # XXX BUILDLINK_DEPMETHOD.libnasl?= build BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ @@ -12,9 +12,11 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnasl} BUILDLINK_PACKAGES+= libnasl .if !empty(LIBNASL_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libnasl+= libnasl>=2.0.9 -BUILDLINK_RECOMMENDED.libnasl?= libnasl>=2.0.9nb1 +BUILDLINK_DEPENDS.libnasl+= libnasl>=2.0.12 +BUILDLINK_RECOMMENDED.libnasl?= libnasl>=2.0.12 BUILDLINK_PKGSRCDIR.libnasl?= ../../security/libnasl .endif # LIBNASL_BUILDLINK3_MK +.include "../../security/nessus-libraries/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/libnasl/distinfo b/security/libnasl/distinfo index fd6b3f01744..7950ea54b4d 100644 --- a/security/libnasl/distinfo +++ b/security/libnasl/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2004/07/20 11:48:10 adam Exp $ +$NetBSD: distinfo,v 1.14 2004/07/22 15:00:20 adam Exp $ -SHA1 (libnasl-2.0.11.tar.gz) = db4934626c26ec4fe9682feb2c854e5cd0046fd8 -Size (libnasl-2.0.11.tar.gz) = 343145 bytes +SHA1 (libnasl-2.0.12.tar.gz) = 7c06f1d19d244dbf4d3cf3c24bcb97f19ce6a5d8 +Size (libnasl-2.0.12.tar.gz) = 343144 bytes SHA1 (patch-aa) = dd13fb7ddaf21f313e392e76138bbb66c7bdfbcb diff --git a/security/nessus-core/MESSAGE b/security/nessus-core/MESSAGE index a61095b469a..9db2c36932d 100644 --- a/security/nessus-core/MESSAGE +++ b/security/nessus-core/MESSAGE @@ -1,11 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2004/04/23 22:16:00 reed Exp $ +$NetBSD: MESSAGE,v 1.6 2004/07/22 15:00:50 adam Exp $ Nessus may have placed some files in /var/nessus, ${PREFIX}/etc/nessus, ${PREFIX}/com/nessus and ${PREFIX}/lib/nessus/reports. If you do not need these files any more, be sure to remove them: - rm -fr /var/nessus + rm -fr ${VARBASE}/nessus rm -fr ${PREFIX}/etc/nessus rm -fr ${PREFIX}/lib/nessus/reports rm -fr ${PREFIX}/com/nessus diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile index 0fb29cb0885..b4cb3502043 100644 --- a/security/nessus-core/Makefile +++ b/security/nessus-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/07/20 11:48:38 adam Exp $ +# $NetBSD: Makefile,v 1.14 2004/07/22 15:00:50 adam Exp $ DISTNAME= nessus-core-${VERS} .include "../nessus/Makefile.common" @@ -17,6 +17,5 @@ CONFIGURE_ENV+= ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \ RCD_SCRIPTS= nessusd .include "../../security/libnasl/buildlink3.mk" -.include "../../security/nessus-libraries/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/nessus-core/PLIST b/security/nessus-core/PLIST index 0ba0cab1808..4b38131d4e1 100644 --- a/security/nessus-core/PLIST +++ b/security/nessus-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/04/23 22:07:58 reed Exp $ +@comment $NetBSD: PLIST,v 1.11 2004/07/22 15:00:50 adam Exp $ bin/nessus bin/nessus-mkcert-client bin/nessus-mkrand @@ -27,5 +27,5 @@ sbin/nessusd @unexec ${RMDIR} %D/lib/nessus 2>/dev/null || ${TRUE} @exec ${MKDIR} %D/etc/nessus @unexec ${RMDIR} %D/etc/nessus 2>/dev/null || ${TRUE} -@exec ${MKDIR} /var/nessus -@unexec ${RMDIR} /var/nessus 2>/dev/null || ${TRUE} +@exec ${MKDIR} ${VARBASE}/nessus +@unexec ${RMDIR} ${VARBASE}/nessus 2>/dev/null || ${TRUE} diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk index a10adc60316..c3f89ac2ec0 100644 --- a/security/nessus-core/buildlink3.mk +++ b/security/nessus-core/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 05:52:55 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/07/22 15:00:50 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NESSUS_CORE_BUILDLINK3_MK:= ${NESSUS_CORE_BUILDLINK3_MK}+ @@ -11,13 +11,12 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnessus-core} BUILDLINK_PACKAGES+= nessus-core .if !empty(NESSUS_CORE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.nessus-core+= nessus-core>=2.0.9 -BUILDLINK_RECOMMENDED.nessus-core?= nessus-core>=2.0.9nb1 +BUILDLINK_DEPENDS.nessus-core+= nessus-core>=2.0.12 +BUILDLINK_RECOMMENDED.nessus-core?= nessus-core>=2.0.12 BUILDLINK_PKGSRCDIR.nessus-core?= ../../security/nessus-core .endif # NESSUS_CORE_BUILDLINK3_MK .include "../../security/libnasl/buildlink3.mk" -.include "../../security/nessus-libraries/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/nessus-core/distinfo b/security/nessus-core/distinfo index 206ff4ca630..2fd351cc99a 100644 --- a/security/nessus-core/distinfo +++ b/security/nessus-core/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2004/07/20 11:48:38 adam Exp $ +$NetBSD: distinfo,v 1.14 2004/07/22 15:00:50 adam Exp $ -SHA1 (nessus-core-2.0.11.tar.gz) = 4e6dcfb87ba396d6def8ad5484cea4039c2e7efb -Size (nessus-core-2.0.11.tar.gz) = 649252 bytes +SHA1 (nessus-core-2.0.12.tar.gz) = 64481020b33ba65c64949970abdeab78ee083480 +Size (nessus-core-2.0.12.tar.gz) = 649412 bytes SHA1 (patch-aa) = 9de405b5786aedad69d10eae74b3b8fa7ba0ac84 diff --git a/security/nessus-libraries/PLIST b/security/nessus-libraries/PLIST index a2e5f0d13ba..7ab820caae6 100644 --- a/security/nessus-libraries/PLIST +++ b/security/nessus-libraries/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/07/20 11:47:41 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2004/07/22 14:59:53 adam Exp $ bin/nessus-config include/nessus/getopt.h include/nessus/harglists.h @@ -11,17 +11,17 @@ lib/libhosts_gatherer.a lib/libhosts_gatherer.la lib/libhosts_gatherer.so lib/libhosts_gatherer.so.2 -lib/libhosts_gatherer.so.2.11 +lib/libhosts_gatherer.so.2.12 lib/libnessus.a lib/libnessus.la lib/libnessus.so lib/libnessus.so.2 -lib/libnessus.so.2.11 +lib/libnessus.so.2.12 lib/libpcap-nessus.a lib/libpcap-nessus.la lib/libpcap-nessus.so lib/libpcap-nessus.so.2 -lib/libpcap-nessus.so.2.11 +lib/libpcap-nessus.so.2.12 man/man1/nessus-config.1 @dirrm include/nessus/net @dirrm include/nessus diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk index a462bf37fe6..995899df7d9 100644 --- a/security/nessus-libraries/buildlink3.mk +++ b/security/nessus-libraries/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/05/20 12:49:09 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/07/22 14:59:53 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NESSUS_LIBRARIES_BUILDLINK3_MK:= ${NESSUS_LIBRARIES_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnessus-libraries} BUILDLINK_PACKAGES+= nessus-libraries .if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.nessus-libraries+= nessus-libraries>=2.0.10 +BUILDLINK_DEPENDS.nessus-libraries+= nessus-libraries>=2.0.12 BUILDLINK_PKGSRCDIR.nessus-libraries?= ../../security/nessus-libraries .endif # NESSUS_LIBRARIES_BUILDLINK3_MK diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo index 416d462a2b5..b201df0b0f4 100644 --- a/security/nessus-libraries/distinfo +++ b/security/nessus-libraries/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2004/07/20 11:47:41 adam Exp $ +$NetBSD: distinfo,v 1.16 2004/07/22 14:59:53 adam Exp $ -SHA1 (nessus-libraries-2.0.11.tar.gz) = aa3d9113a4325deada768cf0a9747d3e9b2e2539 -Size (nessus-libraries-2.0.11.tar.gz) = 418922 bytes +SHA1 (nessus-libraries-2.0.12.tar.gz) = a392ba312e0a5b99cfe275957488a53af0a6557e +Size (nessus-libraries-2.0.12.tar.gz) = 418922 bytes SHA1 (patch-aa) = c525abf1ccfe4c3921609b91e335fa19b0bcab87 SHA1 (patch-ac) = ec174bd6ddb7303f53a5e474451ad0f306575682 diff --git a/security/nessus-plugins/MESSAGE b/security/nessus-plugins/MESSAGE new file mode 100644 index 00000000000..c6486fc0050 --- /dev/null +++ b/security/nessus-plugins/MESSAGE @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2004/07/22 15:01:17 adam Exp $ + +Nessus may have placed some files in ${PREFIX}/lib/nessus/plugins/.desc. +If you do not need these files any more, be sure to remove them: + + rm -fr ${PREFIX}/lib/nessus/plugins/.desc + +=========================================================================== diff --git a/security/nessus-plugins/PLIST b/security/nessus-plugins/PLIST index 0b2309c55e3..8c5f44864bf 100644 --- a/security/nessus-plugins/PLIST +++ b/security/nessus-plugins/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2004/07/20 11:49:12 adam Exp $ +@comment $NetBSD: PLIST,v 1.13 2004/07/22 15:01:17 adam Exp $ bin/nessus-build lib/nessus/plugins_factory/Makefile lib/nessus/plugins_factory/libtool @@ -6,7 +6,6 @@ lib/nessus/plugins_factory/nessus.tmpl man/man1/nessus-build.1 man/man8/nessus-update-plugins.8 sbin/nessus-update-plugins -@dirrm var/nessus @dirrm lib/nessus/plugins_factory -@dirrm lib/nessus/plugins -@dirrm lib/nessus +@exec ${MKDIR} %D/lib/nessus/plugins/.desc +@unexec ${RMDIR} %D/lib/nessus/plugins/.desc 2>/dev/null || ${TRUE} diff --git a/security/nessus-plugins/distinfo b/security/nessus-plugins/distinfo index 5e5a1bf8ba3..fda26b81fbd 100644 --- a/security/nessus-plugins/distinfo +++ b/security/nessus-plugins/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2004/07/20 11:49:12 adam Exp $ +$NetBSD: distinfo,v 1.14 2004/07/22 15:01:17 adam Exp $ -SHA1 (nessus-plugins-2.0.11.tar.gz) = 4dcbee7f58b20f13de142ec1cb2754e0e09c2a1d -Size (nessus-plugins-2.0.11.tar.gz) = 1761035 bytes +SHA1 (nessus-plugins-2.0.12.tar.gz) = d3e214968397c866659a3d5826b54eb6b0184385 +Size (nessus-plugins-2.0.12.tar.gz) = 1767376 bytes diff --git a/security/nessus/Makefile.common b/security/nessus/Makefile.common index 87a72674c1e..ff59c59917f 100644 --- a/security/nessus/Makefile.common +++ b/security/nessus/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2004/07/20 11:51:46 adam Exp $ +# $NetBSD: Makefile.common,v 1.22 2004/07/22 15:01:45 adam Exp $ # # Common Makefile for: # * nessus-core @@ -6,7 +6,7 @@ # * nessus-plugins # * libnasl -VERS= 2.0.11 +VERS= 2.0.12 CATEGORIES= security x11 net MASTER_SITES?= ftp://ftp.nessus.org/pub/nessus/nessus-${VERS}/src/ \ |