community/openvas-manager: upgrade to 7.0.1

This commit is contained in:
Francesco Colista 2017-03-08 07:52:53 +00:00
parent 5b0c8cb711
commit 052dea00bb
2 changed files with 81 additions and 32 deletions

View File

@ -0,0 +1,72 @@
diff --git a/src/manage_sql.c b/src/manage_sql.c
index 0ad35e7..c84d722 100644
--- a/src/manage_sql.c
+++ b/src/manage_sql.c
@@ -15920,7 +15920,7 @@ cleanup_manage_process (gboolean cleanup)
void
manage_cleanup_process_error (int signal)
{
- g_debug ("Received %s signal.\n", sys_siglist[signal]);
+ g_debug ("Received %s signal.\n", strsignal(signal));
if (sql_is_open ())
{
if (current_scanner_task)
diff --git a/src/openvasmd.c b/src/openvasmd.c
index 891a747..d3feba1 100644
--- a/src/openvasmd.c
+++ b/src/openvasmd.c
@@ -780,7 +780,7 @@ setup_signal_handler (int signal, void (*handler) (int), int block)
if (sigaction (signal, &action, NULL) == -1)
{
g_critical ("%s: failed to register %s handler\n",
- __FUNCTION__, sys_siglist[signal]);
+ __FUNCTION__, strsignal(signal));
exit (EXIT_FAILURE);
}
}
@@ -811,7 +811,7 @@ setup_signal_handler_info (int signal,
if (sigaction (signal, &action, NULL) == -1)
{
g_critical ("%s: failed to register %s handler\n",
- __FUNCTION__, sys_siglist[signal]);
+ __FUNCTION__, strsignal(signal));
exit (EXIT_FAILURE);
}
}
@@ -1238,7 +1238,7 @@ serve_and_schedule ()
if (termination_signal)
{
g_debug ("Received %s signal.\n",
- sys_siglist[termination_signal]);
+ strsignal(termination_signal));
cleanup ();
/* Raise signal again, to exit with the correct return value. */
setup_signal_handler (termination_signal, SIG_DFL, 0);
@@ -1248,7 +1248,7 @@ serve_and_schedule ()
if (sighup_update_nvt_cache)
{
- g_debug ("Received %s signal.\n", sys_siglist[SIGHUP]);
+ g_debug ("Received %s signal.\n", strsignal(SIGHUP));
sighup_update_nvt_cache = 0;
fork_update_nvt_cache ();
}
@@ -1307,7 +1307,7 @@ serve_and_schedule ()
if (termination_signal)
{
g_debug ("Received %s signal.\n",
- sys_siglist[termination_signal]);
+ strsignal(termination_signal));
cleanup ();
/* Raise signal again, to exit with the correct return value. */
setup_signal_handler (termination_signal, SIG_DFL, 0);
@@ -1317,7 +1317,7 @@ serve_and_schedule ()
if (sighup_update_nvt_cache)
{
- g_debug ("Received %s signal.\n", sys_siglist[SIGHUP]);
+ g_debug ("Received %s signal.\n", strsignal(SIGHUP));
sighup_update_nvt_cache = 0;
fork_update_nvt_cache ();
}

View File

@ -2,9 +2,9 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=openvas-manager
_pkgname=openvasmd
pkgver=6.0.9
_pkgid=2359
pkgrel=1
pkgver=7.0.1
_pkgid=2426
pkgrel=0
pkgdesc="A layer between the OpenVAS Scanner and various client applications"
url="http://www.openvas.org/"
arch="all"
@ -19,21 +19,11 @@ source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-${pkgver}.t
$_pkgname.initd
$_pkgname.confd
$_pkgname.logrotate
001-sys-siglist.patch
002-fortify-source.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
}
000-sys-siglist.patch"
builddir="$srcdir"/$pkgname-$pkgver
build() {
cd "$_builddir"
cd "$builddir"
cmake -DCMAKE_BUILD_TYPE=Release \
-DSBINDIR=/usr/bin \
-DCMAKE_INSTALL_PREFIX=/usr \
@ -43,7 +33,7 @@ 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"
@ -51,21 +41,8 @@ package() {
}
md5sums="ce1902b947ff5b87906e74f811becbc1 openvas-manager-6.0.9.tar.gz
1daea41f920aac1d675bf4bb8af05063 openvasmd.initd
8534212d73d54166afd624bbe3964cc7 openvasmd.confd
f57ae79654fb9a6249ce883ebb393d3d openvasmd.logrotate
0113d65199172756cb797b4bb30d4007 001-sys-siglist.patch
bec2936ebf70209835b963ddbebf3b31 002-fortify-source.patch"
sha256sums="b7ec99317f035091417bce4bf9549373e534a6fa2ce4e03850154a6a017cb8ba openvas-manager-6.0.9.tar.gz
3611840794e1c08082417f776cb124171707cde1699c0c3ea737e178fe40ede7 openvasmd.initd
6ffaacaca5c58b54b3aa34a262172994dc6c6e286d036cd9aeecf3dda215fdb9 openvasmd.confd
8dce4905097d7e622a87d661903193480806968c55f085bd4ad167ea3864f84d openvasmd.logrotate
8c13641fc26660fe2f600fc9a4e7d5901e0892b6195ad401c92edec75e9f402d 001-sys-siglist.patch
78919051580bb1077f6061d9285f9343d155ee3c955e2a440ef067f58efe1a4b 002-fortify-source.patch"
sha512sums="1111ad3ef4e1286cc71129ecd552bac00386347c30b6e8b706a8fa989d58fff19fff2e1c5cbdfde921d83c5812358cb089e5bc45ae56bb5b87b3bfe5fab1ece8 openvas-manager-6.0.9.tar.gz
sha512sums="c9276a6b5376d5cd6a42cfbd8b26e09c977bd97c3b30002087e5010cc32148c976bf24f8ecbbe0557a4465c1861e96e3d33ce0b83ecb22e895b0a947a1480859 openvas-manager-7.0.1.tar.gz
932ba8dd818faf5158472da4d1305c6f6c84834334721aa358e2e9f1d7419cdd6e366f4e9ea9b19412e00010f919dc9155346ed0566eca533e973abe80f3ee67 openvasmd.initd
5946db68bb5f7b3bf7cbae208a0fea6c9e023631d9fcd610539d2cf7c6290c8f7c2f55e0b4c7011c2263584b9eb42c7eae07db338917e8cc49acb63eb3950e1f openvasmd.confd
a86f156ca822b7b9844dc1cb1cb65c0d2bc146fa4dde64fec851b13b3eaa54fd984946b9336a2ffd0efbaf1c2053ab417067519fb18b807c5c1ce66cf1ee4a9b openvasmd.logrotate
bb68fb95e48cf6b0602023d566b05fb675b55a703b0ecf616d0ff42fd7fc023396d2ef8ea089e074739e980a086d9911894050c23c03c842e5c7393be6d85639 001-sys-siglist.patch
a3ab3773f339efa98abdba77aaf383f6c1d76c7f15557ac6f8bc80199158066d6ac3a7981e1af4ac4e397b66acb48c1cba125848b30e935829a75a5a7e8322dc 002-fortify-source.patch"
f4ce7cb1fc4f34e5679f9e1005cf2ea57cbb3b5807910d5d44cea9499f2ff780feac6b93d1a66d5533106414f60631b274d993b281e4bd5089cd7827d08a5306 000-sys-siglist.patch"