From a69d14d8ccfd9da393c59b1d91fae8193ba39d39 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Wed, 8 Mar 2017 08:01:50 +0000 Subject: community/greenbone-security-assistant: upgrade to 7.0.2 --- .../000-sys_siglist.patch | 13 ++++++ .../001-fortify-source.patch | 13 ------ .../001-malloc-trim.patch | 16 +++++++ .../002-sys_siglist.patch | 13 ------ community/greenbone-security-assistant/APKBUILD | 49 ++++++---------------- 5 files changed, 41 insertions(+), 63 deletions(-) create mode 100644 community/greenbone-security-assistant/000-sys_siglist.patch delete mode 100644 community/greenbone-security-assistant/001-fortify-source.patch create mode 100644 community/greenbone-security-assistant/001-malloc-trim.patch delete mode 100644 community/greenbone-security-assistant/002-sys_siglist.patch (limited to 'community/greenbone-security-assistant') diff --git a/community/greenbone-security-assistant/000-sys_siglist.patch b/community/greenbone-security-assistant/000-sys_siglist.patch new file mode 100644 index 0000000000..1af39b98b9 --- /dev/null +++ b/community/greenbone-security-assistant/000-sys_siglist.patch @@ -0,0 +1,13 @@ +diff --git a/src/gsad.c b/src/gsad.c +index 73bbff2..65a0d22 100644 +--- a/src/gsad.c ++++ b/src/gsad.c +@@ -6249,7 +6249,7 @@ main (int argc, char **argv) + { + if (termination_signal) + { +- g_debug ("Received %s signal.\n", sys_siglist[termination_signal]); ++ g_debug ("Received %s signal.\n", strsignal(termination_signal)); + gsad_cleanup (); + /* Raise signal again, to exit with the correct return value. */ + signal (termination_signal, SIG_DFL); diff --git a/community/greenbone-security-assistant/001-fortify-source.patch b/community/greenbone-security-assistant/001-fortify-source.patch deleted file mode 100644 index afd1af231d..0000000000 --- a/community/greenbone-security-assistant/001-fortify-source.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 549833c..a4e7882 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -487,7 +487,7 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/zones.xml - - ## Program - --set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") -+set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") - - set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall") diff --git a/community/greenbone-security-assistant/001-malloc-trim.patch b/community/greenbone-security-assistant/001-malloc-trim.patch new file mode 100644 index 0000000000..2d64f11178 --- /dev/null +++ b/community/greenbone-security-assistant/001-malloc-trim.patch @@ -0,0 +1,16 @@ +diff --git a/src/gsad_base.c b/src/gsad_base.c +index 15433f9..6500902 100644 +--- a/src/gsad_base.c ++++ b/src/gsad_base.c +@@ -312,8 +312,9 @@ xsl_transform_with_stylesheet (const char *xml_text, + + xsltFreeStylesheet (cur); + xmlFreeDoc (res); ++#ifdef __GLIBC__ + malloc_trim (0); +- ++#endif + return (char *) doc_txt_ptr; + #else + int content_fd; + diff --git a/community/greenbone-security-assistant/002-sys_siglist.patch b/community/greenbone-security-assistant/002-sys_siglist.patch deleted file mode 100644 index e5720e57f6..0000000000 --- a/community/greenbone-security-assistant/002-sys_siglist.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gsad.c b/src/gsad.c -index 7536183..4722a8d 100644 ---- a/src/gsad.c -+++ b/src/gsad.c -@@ -5296,7 +5296,7 @@ main (int argc, char **argv) - if (termination_signal) - { - g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Received %s signal.\n", -- sys_siglist[termination_signal]); -+ strsignal(termination_signal)); - gsad_cleanup (); - /* Raise signal again, to exit with the correct return value. */ - signal (termination_signal, SIG_DFL); diff --git a/community/greenbone-security-assistant/APKBUILD b/community/greenbone-security-assistant/APKBUILD index 43a531a2c1..9da4e30732 100644 --- a/community/greenbone-security-assistant/APKBUILD +++ b/community/greenbone-security-assistant/APKBUILD @@ -2,39 +2,27 @@ # Maintainer: Francesco Colista pkgname=greenbone-security-assistant _pkgname=gsad -pkgver=6.0.11 -_pkgid=2363 +pkgver=7.0.2 +_pkgid=2429 pkgrel=0 pkgdesc="Greenbone Security Assistant (gsa) - OpenVAS web frontend" url="http://www.openvas.org/" arch="all" license="GPL" -depends="" -depends_dev="" -makedepends="$depends_dev cmake doxygen xmltoman openvas-libraries-dev +makedepends="cmake doxygen xmltoman openvas-libraries-dev libxslt-dev libmicrohttpd-dev" -install="" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-doc" source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz $_pkgname.initd $_pkgname.confd $_pkgname.logrotate - 001-fortify-source.patch - 002-sys_siglist.patch" + 000-sys_siglist.patch + 001-malloc-trim.patch" -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" + cd "$builddir" cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc \ @@ -44,29 +32,16 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/$_pkgname.logrotate" "$pkgdir/etc/logrotate.d/$_pkgname" install -Dm755 "$srcdir/$_pkgname.initd" "$pkgdir/etc/init.d/$_pkgname" install -Dm755 "$srcdir/$_pkgname.confd" "$pkgdir/etc/conf.d/$_pkgname" - } -md5sums="86503d0b6e2e36cc96f049f0656a6fd6 greenbone-security-assistant-6.0.11.tar.gz -8102119cb9d33f6860b879b976001e73 gsad.initd -b7ebc9e1b657f3d5fac432842030192c gsad.confd -acbc1dc7c674d55675ec931a34c10790 gsad.logrotate -cc7b793ba26393891a079fe990a0c305 001-fortify-source.patch -bd17aa7ac9a70e97776480c49a263604 002-sys_siglist.patch" -sha256sums="45806f6cad9116c3d43bc016bb494ab8bb1edfeea927aeb5a641ac4fd8a07a72 greenbone-security-assistant-6.0.11.tar.gz -033244a85159be21cd0a5037613115e8d45b503b885eabfdffa294249caade1e gsad.initd -e5441e7870f7e83f0c4a37721bc0f505de6dd69786baadeb14901b3ae88e1058 gsad.confd -520799df540fc9d665d03095c368d3f7b61badd28fc9e4d1dbd095e374e7eff2 gsad.logrotate -40b340828d4711bffc579a3c3709bafee5983d1501bcd387f41b7e9350dabeda 001-fortify-source.patch -8573e2c4effc3ecf21a90380b46fd1851e364b4007bee7cf7eace19ac2ffe727 002-sys_siglist.patch" -sha512sums="182e338b0de0a7a5793425489dcdb1de8cf0173ade32e1cc49092f8c36268cc380aa0cf74e0b79802a9608403cc6a64a10143ffd3db8f43d02e4f604ddaac847 greenbone-security-assistant-6.0.11.tar.gz +sha512sums="e3ccc8704845d8271a8628a19f7a79aea6c19f2cd52f4c69ee698b314c3b8de1099831394c8b474fa79fb1bba4dc5c42e88351edeca82e1c1b4f46f625f746ae greenbone-security-assistant-7.0.2.tar.gz d4bd227aeb31393bc147cb638515871bb7a8096a8ebc9bfb9e15f7d41e8c0e289042c2490ee46ca69b039d31d4c7b401523c7496732ee695af8743a75eb83ba5 gsad.initd 60758afbeaf7b0938bee3f9f16d444bb0265a274dd85f2acf878583648b5a4cc2ebc5430fd21a04b3e37d242055466a7b2b2636361bbbd6acb8197c4bf83111c gsad.confd 0d459084f95e00dfb06912b9d89af011fac117a32687ffd3da3887c24e80c074b681c0d87532a4a7511e42c540f8d8b2ceaa04208fff531b94047a08decddd0f gsad.logrotate -7f43460d0a71a29b79345c64342186dcfbdc5345703d35a1493f39df76ac5e4c1b998e1d8d8915ceca31e29d936218c20597412afb93b434cd35f16f666e1cd0 001-fortify-source.patch -51da67628959894b8e9b6de102372f9bad6922379199141706686d4dcdb4ca545e8503510d345a96f16397a782e99574b1ca8c93f5983402c50d9fa9930c1cb5 002-sys_siglist.patch" +7074ab472761d44f401dd34feeba62c5c47f97ec9aec9a8be51bc1ceb8d32ebd4de162fb6563cd58859354dccd3f3874e5012433c81e45bfaab368188a9b481f 000-sys_siglist.patch +e2cf8dd79a029d8c6dd7c3a67424a1b345da60582eedc7419395a751a118d0e2fbf21cd7e68db81ae5e403858107a9ecbbd4aaafa3f2b851a77c6ab953ed0dd8 001-malloc-trim.patch" -- cgit v1.2.3