diff --git a/.gitignore b/.gitignore index fe0074a..91a5fe9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /greenbone-security-assistant-6.0.9.tar.gz /greenbone-security-assistant-6.0.10.tar.gz /greenbone-security-assistant-6.0.11.tar.gz +/greenbone-security-assistant-7.0.2.tar.gz diff --git a/openvas-gsa-pki.patch b/openvas-gsa-pki.patch index 919e1f6..9efdc4b 100644 --- a/openvas-gsa-pki.patch +++ b/openvas-gsa-pki.patch @@ -1,23 +1,17 @@ -Put the certificates to the /etc/pki as suggested by: -http://fedoraproject.org/wiki/PackagingDrafts/Certificates -For example Nessus2 package in Fedora is using the same. - -diff -ru greenbone-security-assistant-6.0.4.orig/CMakeLists.txt greenbone-security-assistant-6.0.4.new/CMakeLists.txt ---- greenbone-security-assistant-6.0.4.orig/CMakeLists.txt 2015-07-16 01:22:51.400136989 +0200 -+++ greenbone-security-assistant-6.0.4.new/CMakeLists.txt 2015-07-16 01:22:37.917334011 +0200 -@@ -231,10 +231,12 @@ - set (GSA_DATA_DIR "${DATADIR}/openvas/gsa") - set (GSA_LOCALE_DIR "${DATADIR}/locale") +diff -ru greenbone-security-assistant-7.0.2/CMakeLists.txt greenbone-security-assistant-7.0.2.new/CMakeLists.txt +--- greenbone-security-assistant-7.0.2/CMakeLists.txt 2016-12-27 10:31:26.000000000 +0100 ++++ greenbone-security-assistant-7.0.2.new/CMakeLists.txt 2017-04-23 23:50:33.262168626 +0200 +@@ -232,7 +232,13 @@ + set (GSA_LOCALE_DIR "${GSA_DATA_DIR}/${GSA_LOCALE_SUBDIR}") + set (GSA_CHROOT_LOCALE_DIR "/${GSA_LOCALE_SUBDIR}") +set (OPENVAS_CERT_DIR "${SYSCONFDIR}/pki/openvas") + # TODO: Eventually use own certificates --set (OPENVAS_SERVER_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/servercert.pem") --set (OPENVAS_SERVER_KEY "${OPENVAS_STATE_DIR}/private/CA/serverkey.pem") --set (OPENVAS_CA_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/cacert.pem") +set (OPENVAS_SERVER_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/servercert.pem") +set (OPENVAS_SERVER_KEY "${OPENVAS_CERT_DIR}/private/CA/serverkey.pem") +set (OPENVAS_CA_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/cacert.pem") - - # TODO: Eventually have all configurations collected here: - set (GSA_CONFIG_DIR "${SYSCONFDIR}/openvas/") ++ + set (OPENVAS_SERVER_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/servercert.pem") + set (OPENVAS_SERVER_KEY "${OPENVAS_STATE_DIR}/private/CA/serverkey.pem") + set (OPENVAS_CA_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/cacert.pem") diff --git a/openvas-gsa.spec b/openvas-gsa.spec index 4b3a779..ab3f9ab 100644 --- a/openvas-gsa.spec +++ b/openvas-gsa.spec @@ -1,6 +1,6 @@ #This number is the sequence number on intevation.org to download a file -%global tar_download 2363 -%global tar_version 6.0.11 +%global tar_download 2429 +%global tar_version 7.0.2 %global up_name greenbone-security-assistant %global short_name gsad @@ -8,7 +8,7 @@ #Name not same as upstream package to match the naming convention of the OpenVAS suite Name: openvas-gsa Version: %{tar_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Greenbone Security Assistant (GSA) is GUI to the OpenVAS License: GPLv2+ @@ -28,13 +28,6 @@ Source1: %{name}.initd # Not reported upstream as it is RedHat/Fedora specific Patch1: %{name}-pki.patch -# Fix the order of definitions -# already patched upstream -Patch2: %{name}-glib.patch - -# patch MHD_create_response_from_data => MHD_create_response_from_buffer -Patch3: %{name}-libmicrohttpd.patch - BuildRequires: openvas-libraries-devel >= 7.0 BuildRequires: cmake >= 2.6.0 @@ -46,6 +39,8 @@ BuildRequires: doxygen BuildRequires: xmltoman BuildRequires: gpgme-devel BuildRequires: gettext +BuildRequires: python-polib + Requires: logrotate Requires: texlive-changepage @@ -72,8 +67,6 @@ from the OpenVAS infrastructure into presentable HTML. %prep %setup -q -n %{up_name}-%{version} %patch1 -p1 -b .pki -%patch2 -p1 -b .glib -%patch3 -p1 -b .libmicrohttpd #Fix encoding issues iconv -f Windows-1250 -t utf-8 < CHANGES > CHANGES.utf8 touch -r CHANGES CHANGES.utf8 @@ -174,6 +167,9 @@ fi %changelog +* Sun Apr 23 2017 Michal Ambroz - 7.0.2-1 +- bump to OpenVas-9 version 7.0.2 + * Sat Feb 11 2017 Fedora Release Engineering - 6.0.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 2e67d67..42a14b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86503d0b6e2e36cc96f049f0656a6fd6 greenbone-security-assistant-6.0.11.tar.gz +SHA512 (greenbone-security-assistant-7.0.2.tar.gz) = e3ccc8704845d8271a8628a19f7a79aea6c19f2cd52f4c69ee698b314c3b8de1099831394c8b474fa79fb1bba4dc5c42e88351edeca82e1c1b4f46f625f746ae