rpms/openvas-scanner/EL-5 openvas-scanner-nvtfeed.patch, NONE, 1.1 openvas-scanner.spec, 1.1, 1.2
rebus
rebus at fedoraproject.org
Sun Apr 25 01:19:44 UTC 2010
- Previous message: rpms/curl/F-13 curl-7.20.1-82e9b78.patch, NONE, 1.1 curl-7.20.1-test-delay.patch, NONE, 1.1 curl.spec, 1.144, 1.145 curl-7.19.7-s390-sleep.patch, 1.3, NONE
- Next message: rpms/openvas-scanner/F-12 openvas-scanner-nvtfeed.patch, NONE, 1.1 openvas-scanner.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rebus
Update of /cvs/pkgs/rpms/openvas-scanner/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30048
Modified Files:
openvas-scanner.spec
Added Files:
openvas-scanner-nvtfeed.patch
Log Message:
Move NVT and GSF plugins to dedicated folders to separate public feed from the
binaries distributed with the package.
openvas-scanner-nvtfeed.patch:
greenbone-nvt-sync | 2 ++
openvas-nvt-sync.in | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
--- NEW FILE openvas-scanner-nvtfeed.patch ---
diff -ru openvas-scanner-3.0.2.orig/tools/greenbone-nvt-sync openvas-scanner-3.0.2/tools/greenbone-nvt-sync
--- openvas-scanner-3.0.2.orig/tools/greenbone-nvt-sync 2010-03-19 10:25:31.000000000 +0100
+++ openvas-scanner-3.0.2/tools/greenbone-nvt-sync 2010-04-16 16:51:41.000000000 +0200
@@ -196,6 +196,8 @@
fi
NVT_DIR=`$SCANNER_BINARY -s | grep plugins_folder | sed 's/plugins\_folder\ *=\ *//'`
+NVT_DIR="${NVT_DIR}/gsf
+
if [ -z $NVT_DIR ]
then
echo
diff -ru openvas-scanner-3.0.2.orig/tools/openvas-nvt-sync.in openvas-scanner-3.0.2/tools/openvas-nvt-sync.in
--- openvas-scanner-3.0.2.orig/tools/openvas-nvt-sync.in 2010-03-22 03:58:31.000000000 +0100
+++ openvas-scanner-3.0.2/tools/openvas-nvt-sync.in 2010-04-16 17:13:33.000000000 +0200
@@ -42,7 +42,7 @@
# configure NVT_DIR where we will sync NVTs
if [ -z "$NVT_DIR" ]; then
- NVT_DIR="$libdir/openvas/plugins"
+ NVT_DIR="$libdir/openvas/plugins/nvt"
fi
# The URL of the plugin feed
@@ -57,12 +57,14 @@
fi
if [ -z "$TMPDIR" ]; then
- SYNC_TMP_DIR=/tmp
# If we have mktemp, create a temporary dir (safer)
if [ -n "`which mktemp`" ]; then
- SYNC_TMP_DIR=`mktemp -d openvas-nvt-sync` || { echo "ERROR: Cannot create temporary directory for file download" >&2; exit 1 ; }
- trap "rm -rf $SYNC_TMP_DIR" 0 1 2 5 15
+ SYNC_TMP_DIR=`mktemp -d /tmp/openvas-nvt-sync.XXXXXX` || { echo "ERROR: Cannot create temporary directory for file download" >&2; exit 1 ; }
+ else
+ SYNC_TMP_DIR=/tmp/openvas-nvt-sync
+ mkdir -p $SYNC_TMP_DIR
fi
+ trap "rm -rf $SYNC_TMP_DIR" 0 1 2 5 15
else
SYNC_TMP_DIR="$TMPDIR"
fi
Index: openvas-scanner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvas-scanner/EL-5/openvas-scanner.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openvas-scanner.spec 18 Apr 2010 08:52:54 -0000 1.1
+++ openvas-scanner.spec 25 Apr 2010 01:19:43 -0000 1.2
@@ -1,7 +1,7 @@
Name: openvas-scanner
Summary: Open Vulnerability Assessment (OpenVAS) Scanner
Version: 3.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: http://wald.intevation.org/frs/download.php/724/%{name}-%{version}.tar.gz
Source1: openvas-initd.sh
Source2: openvassd.conf
@@ -9,6 +9,7 @@ Source3: openvas.logrotate
Source4: openvas-scanner.sysconfig
Source5: openvas-nvt-sync-cron
Source6: openvas-nvt-sync-cronjob
+Patch0: openvas-scanner-nvtfeed.patch
URL: http://www.openvas.org
License: GPLv2
Group: System Environment/Libraries
@@ -23,6 +24,12 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
+#Required by the openvas-nvt-sync and greenbone-nvt-sync
+Requires: /usr/bin/md5sum
+Requires: /usr/bin/rsync
+Requires: /usr/bin/wget
+Requires: /usr/bin/curl
+
%filter_provides_in %{_libdir}/openvas/plugins
%filter_setup
@@ -31,6 +38,7 @@ Scanner module for the Open Vulnerabilit
%prep
%setup -q
+%patch0 -p 1 -b .nvtfeed
for i in CHANGES ChangeLog; do
iconv -f iso8859-1 -t utf-8 $i > $i.utf8 && \
@@ -48,6 +56,10 @@ make install DESTDIR=%{buildroot} INSTAL
find %{buildroot} -name '*.la' -exec rm -f {} ';'
chmod 755 %{buildroot}/%{_libdir}/openvas/plugins
+#Make directories for the NVT feeds
+mkdir -p %{buildroot}/%{_libdir}/openvas/plugins/nvt
+mkdir -p %{buildroot}/%{_libdir}/openvas/plugins/gsf
+
# Make plugin cache directory
mkdir -p %{buildroot}/%{_var}/cache/openvas
@@ -126,9 +138,14 @@ fi
%config(noreplace) %{_sysconfdir}/logrotate.d/openvas-scanner
%dir %{_libdir}/openvas
%dir %{_libdir}/openvas/plugins
+%dir %{_libdir}/openvas/plugins/nvt
+%dir %{_libdir}/openvas/plugins/gsf
%attr(644,root,root) %{_libdir}/openvas/plugins/*.nes
%changelog
+* Thu Apr 16 2010 Michal Ambroz <rebus at, seznam.cz> - 3.0.2-4
+- subdirectories for nvt feeds
+
* Fri Apr 16 2010 Stjepan Gros <stjepan.gros at gmail.com> - 3.0.2-3
- Reverted plugin permissions to 644
- Removed non-existing provides
- Previous message: rpms/curl/F-13 curl-7.20.1-82e9b78.patch, NONE, 1.1 curl-7.20.1-test-delay.patch, NONE, 1.1 curl.spec, 1.144, 1.145 curl-7.19.7-s390-sleep.patch, 1.3, NONE
- Next message: rpms/openvas-scanner/F-12 openvas-scanner-nvtfeed.patch, NONE, 1.1 openvas-scanner.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list