[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-libraries/files/, net-analyzer/openvas-libraries/

[Joonas Niilola]

commit:     513fbbd268213f9f97c277f62bfc4ce01ead20af
Author:     Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com>
AuthorDate: Sat Aug 10 14:16:55 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 04:54:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513fbbd2

net-analyzer/openvas-libraries: drop old 8.0.5

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-analyzer/openvas-libraries/Manifest            |  1 -
 .../files/openvas-libraries-7.0.4-libssh.patch     | 16 -----
 .../files/openvas-libraries-8.0.1-include.patch    | 70 ----------------------
 .../openvas-libraries-8.0.5-underlinking.patch     | 45 --------------
 .../openvas-libraries-8.0.5.ebuild                 | 63 -------------------
 5 files changed, 195 deletions(-)

diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index 2f17b77b5a7..042bb42a270 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -1,2 +1 @@
-DIST openvas-libraries-8.0.5.tar.gz 603947 BLAKE2B 493a6b2f5cea7e78ce69b9fe730a4d6df89601e0c48cfbc3b0ab1480326c32bb479768c4a54d08bfcb67db0b2ad4ca28990ead57554abd9fd877e7f79b339d8f SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b
 DIST openvas-libraries-9.0.3.tar.gz 643948 BLAKE2B c05fbcd2a1b9c2292ac2d7ea3c7f4fe2ff4c5a41b0dd5610283712ce136fe4184d46b9fdcfb74bf2a4a6d7c016497df31caff121d9c7b013280164b49f874f4f SHA512 bca213309e06a39d2dcd790cacb01f2a71471622887424e41cc025a2bc25feb6a9b2c1d904f739df6fd87d8ec7af5171b31d1f5d08411c5143e4be1e6723397a

diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
deleted file mode 100644
index d89459fe2bd..00000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-libssh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://www.mail-archive.com/openvas-discuss@×××××××××××××××.org/msg05828.html
-Fixes build issue with the newer version of libssh
-
-diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c openvas-libraries-7.0.1.new/nasl/nasl_ssh.c
---- openvas-libraries-7.0.1.orig/nasl/nasl_ssh.c	2014-04-14 19:15:40.000000000 +0200
-+++ openvas-libraries-7.0.1.new/nasl/nasl_ssh.c	2014-05-23 00:13:56.791111974 +0200
-@@ -1861,7 +1861,8 @@
-     return NULL;
-   session = session_table[tbl_slot].session;
- 
--  banner = ssh_get_serverbanner (session);
-+  //banner = ssh_get_serverbanner (session);
-+  banner = (char*) ssh_get_serverbanner (session);
-   if (!banner)
-     return NULL;
- 

diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
deleted file mode 100644
index e03dd085e3b..00000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.1-include.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- base/CMakeLists.txt | 2 ++
- nasl/CMakeLists.txt | 5 +++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index c2dccf5..4f17892 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -56,6 +56,7 @@ endif (MINGW)
- 
- if (BUILD_STATIC)
-   add_library (openvas_base_static STATIC ${FILES})
-+  set_target_properties (openvas_base_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-   set_target_properties (openvas_base_static PROPERTIES OUTPUT_NAME "openvas_base")
-   set_target_properties (openvas_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   set_target_properties (openvas_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
-@@ -63,6 +64,7 @@ endif (BUILD_STATIC)
- 
- if (BUILD_SHARED)
-   add_library (openvas_base_shared SHARED ${FILES})
-+  set_target_properties (openvas_base_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-   set_target_properties (openvas_base_shared PROPERTIES OUTPUT_NAME "openvas_base")
-   set_target_properties (openvas_base_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   set_target_properties (openvas_base_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
-diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
-index 52fa5c6..afd18c2 100644
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -41,7 +41,7 @@ endif (SNMP)
- # The "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" is necessary for GPGME!
- # The "-fno-strict-aliasing" silences warnings caused by macros defined in byteorder.h.
- # Once the warnings have been addressed this flag should be removed.
--set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing")
-+set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1 -fno-strict-aliasing ${GPGME_CFLAGS}")
- 
- ## Compile the parser - note that there are (better) CMake macros to achieve
- ## that
-@@ -103,7 +103,7 @@ link_directories (${LIBDIR} ../base ../misc)
- 
- if (BUILD_STATIC)
-    add_library (openvas_nasl_static STATIC ${FILES})
--
-+   set_target_properties (openvas_nasl_static PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-    set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
-    set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-    set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
-@@ -118,6 +118,7 @@ endif (BUILD_STATIC)
- 
- if (BUILD_SHARED)
-   add_library (openvas_nasl_shared SHARED ${FILES})
-+  set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GPGME_CFLAGS}")
-   set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl")
-   set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-   set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
- base/gpgme_util.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/base/gpgme_util.h b/base/gpgme_util.h
-index 56e1b85..ab4e9fa 100644
---- a/base/gpgme_util.h
-+++ b/base/gpgme_util.h
-@@ -33,7 +33,7 @@
- #ifndef _OPENVAS_LIBRARIES_GPGME_UTIL_H
- #define _OPENVAS_LIBRARIES_GPGME_UTIL_H
- 
--#include <gpgme.h>
-+#include <gpgme/gpgme.h>
- 
- gpgme_ctx_t openvas_init_gpgme_ctx (void);
- gpgme_ctx_t openvas_init_gpgme_sysconf_ctx (void);

diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
deleted file mode 100644
index 817815edb31..00000000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-8.0.5-underlinking.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- base/CMakeLists.txt | 10 +++++-----
- misc/CMakeLists.txt |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index 07febee..40305b7 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -73,7 +73,7 @@ if (BUILD_SHARED)
-       assuan libgpg-error ole32 ws2_32 ffi z shlwapi dnsapi winmm)
-     target_link_libraries (openvas_base_shared openvas_omp_shared ${W32LIBS})
-   else (MINGW)
--    target_link_libraries (openvas_base_shared openvas_omp_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
-+    target_link_libraries (openvas_base_shared openvas_omp_shared ${LIBSSH_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${GNUTLS_LDFLAGS} ${ZLIB_LDFLAGS} ${GPGME_LDFLAGS})
-   endif (MINGW)
- endif (BUILD_SHARED)
- 
-@@ -87,10 +87,10 @@ add_custom_indent_targets (${FILES})
- 
- # Link the test-hosts executable
- # TODO: This is currently only built for BUILD_SHARED
--if (BUILD_SHARED)
--  add_executable (test-hosts test-hosts.c)
--  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared ${GLIB_LDFLAGS})
--endif (BUILD_SHARED)
-+#if (BUILD_SHARED)
-+#  add_executable (test-hosts test-hosts.c)
-+#  target_link_libraries (test-hosts openvas_base_shared ${GNUTLS_LDFLAGS} openvas_misc_shared openvas_omp_shared ${GLIB_LDFLAGS})
-+#endif (BUILD_SHARED)
- 
- ## Install
- if (BUILD_STATIC)
-diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
-index 7aaca2c..e7a0870 100644
---- a/misc/CMakeLists.txt
-+++ b/misc/CMakeLists.txt
-@@ -126,7 +126,7 @@ if (BUILD_SHARED)
-   else (MINGW)
-     target_link_libraries (openvas_misc_shared ${GNUTLS_LDFLAGS} openvas_base_shared ${UUID_LDFLAGS}
-                            ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${LDAP_LDFLAGS}
--                           ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
-+                           ${GLIB_LDFLAGS} ${REDIS_LDFLAGS} ${GCRYPT_LDFLAGS})
-   endif (MINGW)
- endif (BUILD_SHARED)
- 

diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
deleted file mode 100644
index 988e909151b..00000000000
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DL_ID=2191
-inherit cmake-utils
-
-DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="ldap"
-
-DEPEND="
-	app-crypt/gpgme
-	>=dev-libs/glib-2.16
-	>=dev-libs/hiredis-0.10.1
-	dev-libs/libgcrypt:0
-	dev-libs/libksba
-	net-analyzer/net-snmp
-	net-libs/gnutls
-	net-libs/libpcap
-	>=net-libs/libssh-0.5.0
-	ldap? (	net-nds/openldap )
-"
-RDEPEND="${DEPEND}
-	!net-analyzer/openvas-libnasl
-"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P}
-
-DOCS=( ChangeLog CHANGES README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
-	"${FILESDIR}"/${PN}-8.0.1-include.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed \
-		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
-	)
-	cmake-utils_src_configure
-}