[openvas-manager] * Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 5.0.1-1 - Update spec file - Update to
Fabian Affolter
fab at fedoraproject.org
Mon May 26 20:35:00 UTC 2014
commit 3dea84279ab69784dc0ff8b7fd295cf1cb0cfebf
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date: Mon May 26 22:34:48 2014 +0200
* Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 5.0.1-1
- Update spec file
- Update to latest upstream release 5.0.1
.gitignore | 1 +
openvas-manager.spec | 161 +++++++++++++++++++-------------------------------
sources | 2 +-
3 files changed, 64 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14a9c94..e623f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/openvas-manager-3.0.4.tar.gz
/openvas-manager-4.0+beta4.tar.gz
/openvas-manager-4.0+beta5.tar.gz
+/openvas-manager-5.0.1.tar.gz
diff --git a/openvas-manager.spec b/openvas-manager.spec
index 0dac637..ae9cc02 100644
--- a/openvas-manager.spec
+++ b/openvas-manager.spec
@@ -1,55 +1,47 @@
-%define tar_version 4.0+beta5
-
-Name: openvas-manager
-Summary: Manager Module for the Open Vulnerability Assessment System (OpenVAS)
-Version: 4.0
-Release: 4.beta5%{?dist}
-URL: http://www.openvas.org
-License: GPLv2+
-Group: System Environment/Libraries
-
-#Source0: http://wald.intevation.org/frs/download.php/1260/%{name}-%{version}.tar.gz
-Source0: http://wald.intevation.org/frs/download.php/1260/%{name}-%{tar_version}.tar.gz
-Source1: openvas-manager.initd
-Source2: openvas-manager.logrotate
-Source3: openvas-manager.sysconfig
-Source4: openvas-manager.service
-
-#Patch to avoid compile-time errors about variable set but not used
-Patch0: openvas-manager-notused.patch
-
-#Put certs to /etc/pki as suggested by http://fedoraproject.org/wiki/PackagingDrafts/Certificates
-#Not reported upstream as it is RedHat/Fedora specific
-Patch1: openvas-manager-pki.patch
-
-Patch2: openvas-manager-gpgerror.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: openvas-libraries-devel
-BuildRequires: cmake >= 2.6.0
-BuildRequires: glib2-devel
-BuildRequires: sqlite-devel
-BuildRequires: gnutls-devel
-BuildRequires: libuuid-devel
-BuildRequires: libpcap-devel
-BuildRequires: libksba-devel
-BuildRequires: gpgme-devel
-BuildRequires: libgpg-error-devel
-BuildRequires: doxygen
-BuildRequires: pkgconfig
-BuildRequires: xmltoman
-Requires: logrotate
-Requires: /usr/bin/xsltproc
-
-
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-# This is actually needed for the %triggerun script but Requires(triggerun)
-# is not valid. We can use %post because this particular %triggerun script
-# should fire just after this package is installed.
-Requires(post): systemd-sysv
-
+#%global tar_version 4.0+beta5
+
+Name: openvas-manager
+Version: 5.0.1
+Release: 1%{?dist}
+Summary: Manager Module for the Open Vulnerability Assessment System (OpenVAS)
+
+License: GPLv2+
+URL: http://www.openvas.org
+Source0: http://wald.intevation.org/frs/download.php/1653/%{name}-%{version}.tar.gz
+#Source0: http://wald.intevation.org/frs/download.php/1653/%{name}-%{tar_version}.tar.gz
+Source2: openvas-manager.logrotate
+Source3: openvas-manager.sysconfig
+Source4: openvas-manager.service
+
+# Patch to avoid compile-time errors about variable set but not used -%{version}
+Patch0: openvas-manager-notused.patch
+
+# Put certs to /etc/pki as suggested by http://fedoraproject.org/wiki/PackagingDrafts/Certificates
+# Not reported upstream as it is RedHat/Fedora specific
+Patch1: openvas-manager-pki.patch
+Patch2: openvas-manager-gpgerror.patch
+
+BuildRequires: openvas-libraries-devel >= 7.0
+BuildRequires: cmake >= 2.6.0
+BuildRequires: glib2-devel
+BuildRequires: sqlite-devel
+BuildRequires: gnutls-devel
+BuildRequires: libuuid-devel
+BuildRequires: libpcap-devel
+BuildRequires: libksba-devel
+BuildRequires: gpgme-devel
+BuildRequires: libgpg-error-devel
+BuildRequires: doxygen
+BuildRequires: pkgconfig
+BuildRequires: xmltoman
+BuildRequires: systemd
+
+Requires: logrotate
+Requires: /usr/bin/xsltproc
+
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%description
The OpenVAS Manager is the central service that consolidates plain vulnerability
@@ -61,8 +53,6 @@ with regard to filtering or sorting scan results. The Manager also controls
a SQL database (sqlite-based) where all configuration and scan result data is
centrally stored.
-
-
%package sysvinit
Summary: SysV style init script for %{name}
Group: Documentation
@@ -75,12 +65,10 @@ Requires(preun): initscripts
SysV style init script for %{name}.
It needs to be installed only if systemd is not used as the system init process.
-
-
%prep
-#%setup -q
-%setup -q -n %{name}-%{tar_version}
-#%patch0 -p1 -b .notused
+#%setup -q -n %{name}-%{tar_version}
+%setup -q
+%patch0 -p1 -b .notused
%patch1 -p1 -b .pki
%patch2 -p1 -b .gpgerror
@@ -90,19 +78,17 @@ export CFLAGS="$RPM_OPT_FLAGS -Werror=unused-but-set-variable"
make %{?_smp_mflags} VERBOSE=1
%install
-rm -rf %{buildroot}
-
make install DESTDIR=%{buildroot} INSTALL="install -p"
-#Config directory
+# Config directory
mkdir -p %{buildroot}/%{_sysconfdir}/openvas
chmod 755 %{buildroot}/%{_sysconfdir}/openvas
-#Log direcotry
+# Log direcotry
mkdir -p %{buildroot}/%{_var}/log/openvas
touch %{buildroot}%{_var}/log/openvas/openvasmd.log
-#Runtime lib directory
+# Runtime lib directory
mkdir -p %{buildroot}/%{_var}/lib/openvas/mgr
# Install startup script
@@ -111,46 +97,27 @@ install -Dp -m 755 %{SOURCE1} %{buildroot}/%{_initddir}/%{name}
# Install systemd
install -Dp -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}/%{name}.service
-
-# install log rotation stuff
-install -m 644 -Dp %{SOURCE2} \
- %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
+# Install log rotation stuff
+install -m 644 -Dp %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
# Install sysconfig configration
install -Dp -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
-#Fix permissions on templates
+# Fix permissions on templates
chmod -R a+r %{buildroot}%{_datadir}/openvas/openvasmd
find %{buildroot}%{_datadir}/openvas/openvasmd -name generate | xargs chmod 755
-#Clean installed doc directory
+# Clean installed doc directory
rm -rf %{buildroot}%{_datadir}/doc/%{name}
-
-%clean
-[ "%{buildroot}" = "/" ] || rm -rf %{buildroot}
-
-
%post
-%systemd_post openvas-manager.service
+%systemd_post %{name}.service
%preun
-%systemd_preun openvas-manager.service
+%systemd_preun %{name}.service
%postun
-%systemd_postun_with_restart openvas-manager.service
-
-%triggerun -- openvas-manager < 2.0.4-3
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply openvas-manager
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save openvas-manager >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del openvas-manager >/dev/null 2>&1 || :
-/bin/systemctl try-restart openvas-manager.service >/dev/null 2>&1 || :
-
-
+%systemd_postun_with_restart %{name}.service
%post sysvinit
# This adds the proper /etc/rc*.d links for the script
@@ -158,24 +125,20 @@ if [ "$1" -eq 1 ] ; then
/sbin/chkconfig --add openvas-manager
fi
-
%preun sysvinit
if [ "$1" -eq 0 ] ; then
/sbin/service openvas-manager stop >/dev/null 2>&1
/sbin/chkconfig --del openvas-manager
fi
-
%postun sysvinit
# only for upgrades not erasure
if [ "$1" -eq 1 ] ; then
/sbin/service openvas-manager condrestart >/dev/null 2>&1
fi
-
%files
-%defattr(-,root,root)
-#INSTALL file contains post-installation guide for whole openvas
+# INSTALL file contains post-installation guide for whole openvas
%doc CHANGES COPYING README ChangeLog TODO INSTALL
%doc doc/*.png doc/*.sql doc/*.html doc/report-format-HOWTO doc/about-cert-feed.txt
%doc report_formats
@@ -187,7 +150,6 @@ fi
%dir %{_datadir}/openvas
%dir %{_datadir}/openvas/scap
%dir %{_datadir}/openvas/cert
-
%config(noreplace) %{_sysconfdir}/openvas/openvasmd_log.conf
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_unitdir}/%{name}.service
@@ -201,13 +163,14 @@ fi
%{_datadir}/openvas/cert/*
%ghost %{_var}/log/openvas/openvasmd.log
-
%files sysvinit
-%defattr(-,root,root)
%{_initrddir}/%{name}
-
%changelog
+* Wed May 21 2014 Fabian Affolter <mail at fabian-affolter.ch> - 5.0.1-1
+- Update spec file
+- Update to latest upstream release 5.0.1
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-4.beta5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index f29d695..93f80f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1dcdfc15dcc5ccb14bdbef47cef59e4 openvas-manager-4.0+beta5.tar.gz
+f7f2cc32141bd44b3d22829dacc4ea1c openvas-manager-5.0.1.tar.gz
More information about the scm-commits
mailing list