pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
greenbone-security-assistant: Prepare
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Wed Oct 12 03:58:03 2016 +0200
Changeset: 5c457de6a122760c5451a346224965215442e29d
Modified Files:
greenbone-security-assistant/Makefile
greenbone-security-assistant/distinfo
Removed Files:
greenbone-security-assistant/patches/patch-CMakeLists.txt
greenbone-security-assistant/patches/patch-doc_CMakeLists.txt
greenbone-security-assistant/patches/patch-src_CMakeLists.txt
greenbone-security-assistant/patches/patch-src_manage.c
greenbone-security-assistant/patches/patch-src_manage__migrators.c
greenbone-security-assistant/patches/patch-src_manage__sql.c
greenbone-security-assistant/patches/patch-src_manage__sqlite3.c
Log Message:
greenbone-security-assistant: Prepare
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5c457de6a122760c5451a346224965215442e29d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
greenbone-security-assistant/Makefile | 28 +++-------------------
greenbone-security-assistant/distinfo | 15 ++++--------
.../patches/patch-CMakeLists.txt | 15 ------------
.../patches/patch-doc_CMakeLists.txt | 16 -------------
.../patches/patch-src_CMakeLists.txt | 18 --------------
.../patches/patch-src_manage.c | 19 ---------------
.../patches/patch-src_manage__migrators.c | 28 ----------------------
.../patches/patch-src_manage__sql.c | 16 -------------
.../patches/patch-src_manage__sqlite3.c | 16 -------------
9 files changed, 7 insertions(+), 164 deletions(-)
diffs:
diff --git a/greenbone-security-assistant/Makefile b/greenbone-security-assistant/Makefile
index c91e6a3..9ad15ed 100644
--- a/greenbone-security-assistant/Makefile
+++ b/greenbone-security-assistant/Makefile
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.17 2016/09/19 13:04:27 wiz Exp $
-DISTNAME= openvas-manager-6.0.9
+DISTNAME= greenbone-security-assistant-6.0.11
CATEGORIES= security
-MASTER_SITES= http://wald.intevation.org/frs/download.php/2359/
+MASTER_SITES= http://wald.intevation.org/frs/download.php/2363/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.openvas.org/
@@ -12,31 +12,9 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= YES
BUILD_DEFS+= VARBASE
USE_LANGUAGES= c++ c
-USE_TOOLS+= pkg-config gsed:run
+USE_TOOLS+= pkg-config
CMAKE_ARGS+= -DLOCALSTATEDIR:PATH=${VARBASE}
-REPLACE_PYTHON+= tools/extra/xml_split
-
-EGDIR= ${PREFIX}/share/examples/openvas-manager
-
-OWN_DIRS= ${PKG_SYSCONFDIR}/openvas
-
-CONF_FILES+= ${EGDIR}/openvasmd_log.conf ${PKG_SYSCONFDIR}/openvas/openvasmd_log.conf
-CONF_FILES+= ${EGDIR}/pwpolicy.conf ${PKG_SYSCONFDIR}/openvas/pwpolicy.conf
-
-SUBST_CLASSES+= confdir
-SUBST_FILES.confdir= CMakeLists.txt
-SUBST_SED.confdir= -e 's,DESTINATION $${OPENVAS_SYSCONF_DIR},DESTINATION ${EGDIR}/,'
-SUBST_STAGE.confdir= post-patch
-
-SUBST_CLASSES+= gnused
-SUBST_FILES.gnused= tools/openvas-portnames-update.in
-SUBST_SED.gnused= -e 's,sed -s,${TOOLS_PATH.gsed} -s,' # parameter "-s" is a gnu extension
-SUBST_STAGE.gnused= post-patch
-
-.include "../../textproc/libxslt/buildlink3.mk" # tool xsltproc used
-.include "../../lang/python/application.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
.include "../../wip/openvas-libraries/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/greenbone-security-assistant/distinfo b/greenbone-security-assistant/distinfo
index a6e193f..6178e86 100644
--- a/greenbone-security-assistant/distinfo
+++ b/greenbone-security-assistant/distinfo
@@ -1,13 +1,6 @@
$NetBSD: distinfo,v 1.6 2015/11/04 01:17:52 agc Exp $
-SHA1 (openvas-manager-6.0.9.tar.gz) = bb8b1652e2c6539a80fe861584a844f1ae38c4ff
-RMD160 (openvas-manager-6.0.9.tar.gz) = c9c230ecf4ddce8c2ce1b3ae6cadd55d142e8081
-SHA512 (openvas-manager-6.0.9.tar.gz) = 1111ad3ef4e1286cc71129ecd552bac00386347c30b6e8b706a8fa989d58fff19fff2e1c5cbdfde921d83c5812358cb089e5bc45ae56bb5b87b3bfe5fab1ece8
-Size (openvas-manager-6.0.9.tar.gz) = 1954878 bytes
-SHA1 (patch-CMakeLists.txt) = 97d41cd6ca02c8ee85c04ba0b1c2a90ce927a7bd
-SHA1 (patch-doc_CMakeLists.txt) = c1e2af99b86f3c0fcd60d80621fbc70e2f202b19
-SHA1 (patch-src_CMakeLists.txt) = a76c0b0fa6eda9736c6c9bdd9cea1d396e701dd9
-SHA1 (patch-src_manage.c) = 7b2a9f7abc6e25cc1217ddde89299f7772260f9a
-SHA1 (patch-src_manage__migrators.c) = ca42e85b32d6750aad7a8f338084e380110dda13
-SHA1 (patch-src_manage__sql.c) = 868b20a4a0583664fe7c7151f855927716e46cc2
-SHA1 (patch-src_manage__sqlite3.c) = 5ca8910449c2034ece9e8a56b9aab0017afa960e
+SHA1 (greenbone-security-assistant-6.0.11.tar.gz) = 2da768d158ce32abe04eb9f6a84db5cfe50775a1
+RMD160 (greenbone-security-assistant-6.0.11.tar.gz) = d0cb51103f6e74e04e92d257a0371408324606e5
+SHA512 (greenbone-security-assistant-6.0.11.tar.gz) = 182e338b0de0a7a5793425489dcdb1de8cf0173ade32e1cc49092f8c36268cc380aa0cf74e0b79802a9608403cc6a64a10143ffd3db8f43d02e4f604ddaac847
+Size (greenbone-security-assistant-6.0.11.tar.gz) = 1493006 bytes
diff --git a/greenbone-security-assistant/patches/patch-CMakeLists.txt b/greenbone-security-assistant/patches/patch-CMakeLists.txt
deleted file mode 100644
index f442bef..0000000
--- a/greenbone-security-assistant/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Require CMake 3.0 for detecting libbacktrace support.
-
---- CMakeLists.txt.orig 2016-08-25 12:15:46.000000000 +0000
-+++ CMakeLists.txt
-@@ -27,7 +27,7 @@ message ("-- Configuring the Manager..."
-
- project (openvas-manager C)
-
--cmake_minimum_required (VERSION 2.6)
-+cmake_minimum_required (VERSION 3.0)
-
- if (POLICY CMP0005)
- cmake_policy (SET CMP0005 OLD)
diff --git a/greenbone-security-assistant/patches/patch-doc_CMakeLists.txt b/greenbone-security-assistant/patches/patch-doc_CMakeLists.txt
deleted file mode 100644
index 0bb5f78..0000000
--- a/greenbone-security-assistant/patches/patch-doc_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix path to install man-pages.
-
---- doc/CMakeLists.txt.orig 2015-08-03 05:52:11.000000000 +0000
-+++ doc/CMakeLists.txt
-@@ -163,6 +163,8 @@ install (FILES omp.html
- DESTINATION share/doc/openvas-manager/html/
- COMPONENT doc)
-
-+include(GNUInstallDirs)
-+
- install (FILES openvasmd.8
-- DESTINATION share/man/man8/
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8/
- COMPONENT doc)
diff --git a/greenbone-security-assistant/patches/patch-src_CMakeLists.txt b/greenbone-security-assistant/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index cda766e..0000000
--- a/greenbone-security-assistant/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Link with libbacktrace (if needed).
-
---- src/CMakeLists.txt.orig 2015-12-08 07:09:32.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -65,8 +65,10 @@ add_library (otp STATIC otp.c)
-
- ## Program
-
-+find_package(Backtrace)
-+
- add_executable (openvasmd openvasmd.c ompd.c)
--target_link_libraries (openvasmd ovas-mngr-comm omp otp manage ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${GCRYPT_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
-+target_link_libraries (openvasmd ovas-mngr-comm omp otp manage ${GNUTLS_LDFLAGS} ${GPGME_LDFLAGS} ${GCRYPT_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} ${Backtrace_LIBRARY})
-
- set_target_properties (openvasmd PROPERTIES LINKER_LANGUAGE C)
-
diff --git a/greenbone-security-assistant/patches/patch-src_manage.c b/greenbone-security-assistant/patches/patch-src_manage.c
deleted file mode 100644
index de1606c..0000000
--- a/greenbone-security-assistant/patches/patch-src_manage.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Don't overwrite _*_SOURCE, it breaks build on NetBSD.
-
---- src/manage.c.orig 2016-08-25 12:15:47.000000000 +0000
-+++ src/manage.c
-@@ -37,10 +37,12 @@
- * running the tasks.
- */
-
-+#if !defined(__NetBSD__)
- /* time.h in glibc2 needs this for strptime. */
- #define _XOPEN_SOURCE
- /* pthread_sigmask () needs this with glibc < 2.19 */
- #define _GNU_SOURCE
-+#endif
-
- #include "manage.h"
- #include "scanner.h"
diff --git a/greenbone-security-assistant/patches/patch-src_manage__migrators.c b/greenbone-security-assistant/patches/patch-src_manage__migrators.c
deleted file mode 100644
index 79b7448..0000000
--- a/greenbone-security-assistant/patches/patch-src_manage__migrators.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Don't overwrite _*_SOURCE, it breaks build on NetBSD.
-
---- src/manage_migrators.c.orig 2015-08-03 05:52:13.000000000 +0000
-+++ src/manage_migrators.c
-@@ -119,8 +119,10 @@
- * (name UNIQUE, password);
- */
-
-+#if !defined(__NetBSD__)
- /* time.h in glibc2 needs this for strptime. */
- #define _XOPEN_SOURCE
-+#endif
-
- #include <time.h>
- #include <stdlib.h>
-@@ -132,6 +134,10 @@
- #include <ctype.h>
- #include <dirent.h>
-
-+#if defined(__NetBSD__)
-+#include <sys/wait.h>
-+#endif
-+
- #include "manage_sql.h"
- #include "sql.h"
- #include "tracef.h"
diff --git a/greenbone-security-assistant/patches/patch-src_manage__sql.c b/greenbone-security-assistant/patches/patch-src_manage__sql.c
deleted file mode 100644
index a092944..0000000
--- a/greenbone-security-assistant/patches/patch-src_manage__sql.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Require <libgen.h> for basename(3) on NetBSD.
-
---- src/manage_sql.c.orig 2016-08-25 12:15:46.000000000 +0000
-+++ src/manage_sql.c
-@@ -58,6 +58,9 @@
- #include <unistd.h>
- #include <sys/time.h>
- #include <grp.h>
-+#if defined(__NetBSD__)
-+#include <libgen.h>
-+#endif
-
- #include <openvas/base/openvas_string.h>
- #include <openvas/base/openvas_file.h>
diff --git a/greenbone-security-assistant/patches/patch-src_manage__sqlite3.c b/greenbone-security-assistant/patches/patch-src_manage__sqlite3.c
deleted file mode 100644
index 7002c2b..0000000
--- a/greenbone-security-assistant/patches/patch-src_manage__sqlite3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Don't overwrite _*_SOURCE, it breaks build on NetBSD.
-
---- src/manage_sqlite3.c.orig 2016-08-25 12:15:47.000000000 +0000
-+++ src/manage_sqlite3.c
-@@ -23,7 +23,9 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#if !defined(__NetBSD__)
- #define _XOPEN_SOURCE /* Glibc2 needs this for strptime. */
-+#endif
-
- #include "sql.h"
- #include "manage.h"
Home |
Main Index |
Thread Index |
Old Index