commit:     eb75e8e9b0072fd6ce2f316e74f4e0b7988b1bbe
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail 
<DOT> com>
AuthorDate: Tue Jan 10 16:38:56 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 09:47:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb75e8e9

net-analyzer/openvas-libraries: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3422

 .../files/openvas-libraries-7.0.4-bsdsource.patch  | 32 ----------------------
 .../files/openvas-libraries-7.0.4-run.patch        | 16 -----------
 .../openvas-libraries-7.0.6-underlinking.patch     | 32 ----------------------
 3 files changed, 80 deletions(-)

diff --git 
a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch 
b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch
deleted file mode 100644
index 6df661f..00000000
--- 
a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-bsdsource.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c 
openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c
---- openvas-libraries-7.0.1.orig/nasl/nasl_builtin_synscan.c   2014-05-24 
01:11:33.049417462 +0200
-+++ openvas-libraries-7.0.1.new/nasl/nasl_builtin_synscan.c    2014-05-24 
17:01:25.409361461 +0200
-@@ -24,7 +24,7 @@
- *
- */
- 
--#define _BSD_SOURCE 1
-+#define _DEFAULT_SOURCE 1
- 
- #include <unistd.h>      /* for close() */
- #include <stdlib.h>      /* for rand() */
-diff -ru openvas-libraries-7.0.1.orig/nasl/nasl_raw.h 
openvas-libraries-7.0.1.new/nasl/nasl_raw.h
---- openvas-libraries-7.0.1.orig/nasl/nasl_raw.h       2014-05-24 
01:11:33.287412716 +0200
-+++ openvas-libraries-7.0.1.new/nasl/nasl_raw.h        2014-05-24 
17:02:33.829967589 +0200
-@@ -20,12 +20,12 @@
- #ifndef OPENVAS_RAW_H
- #define OPENVAS_RAW_H
- #ifdef __linux__
--#ifndef __BSD_SOURCE
--#define __BSD_SOURCE
-+#ifndef __DEFAULT_SOURCE
-+#define __DEFAULT_SOURCE
- #endif
- 
--#ifndef _BSD_SOURCE
--#define _BSD_SOURCE
-+#ifndef _DEFAULT_SOURCE
-+#define _DEFAULT_SOURCE
- #endif
- 
- #ifndef __FAVOR_BSD

diff --git 
a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-run.patch 
b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-run.patch
deleted file mode 100644
index 6ee5b77..00000000
--- a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.4-run.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 940f897..8b2f26b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -180,7 +180,7 @@ set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
- set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
- set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
- set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
--set (OPENVAS_PID_DIR     "${LOCALSTATEDIR}/run")
-+set (OPENVAS_PID_DIR     "/run")
- set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
- 
- set (OPENVAS_NVT_DIR     "${OPENVAS_STATE_DIR}/plugins")

diff --git 
a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
 
b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
deleted file mode 100644
index a9c3815..00000000
--- 
a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
+++ /dev/null
@@ -1,32 +0,0 @@
- base/CMakeLists.txt | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
-index b798f85..c724473 100644
---- a/base/CMakeLists.txt
-+++ b/base/CMakeLists.txt
-@@ -100,24 +100,6 @@ endif (OPENVAS_PID_DIR)
- 
- add_custom_indent_targets (${FILES})
- 
--# Link the test-hosts executable
--if (BUILD_SHARED)
--  add_executable (test-hosts test-hosts.c)
--  target_link_libraries (test-hosts openvas_base_shared openvas_misc_shared 
${GLIB_LDFLAGS} -lgcrypt
--    "${GPGME_LDFLAGS}" -lgnutls "${PCAP_LDFLAGS}" -lresolv -lm ${WMI_LIBS}
--    ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${WINCMD_LIBS}) 
--  set_target_properties (test-hosts PROPERTIES COMPILE_FLAGS
--    "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS} ${KSBA_CFLAGS}")
--endif (BUILD_SHARED)
--if (BUILD_STATIC)
--  add_executable (test-hosts test-hosts.c)
--  target_link_libraries (test-hosts openvas_base_static openvas_misc_static 
${GLIB_LDFLAGS} -lgcrypt
--    "${GPGME_LDFLAGS}" -lgnutls "${PCAP_LDFLAGS}" -lresolv -lm ${WMI_LIBS}
--    ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${WINCMD_LIBS}) 
--  set_target_properties (test-hosts PROPERTIES COMPILE_FLAGS
--    "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS} ${KSBA_CFLAGS}")
--endif (BUILD_STATIC)
--
- ## Install
- if (BUILD_STATIC)
-   install (TARGETS openvas_base_static

Reply via email to