diff --git a/openvas-scanner-4.0.1-bsdsource.patch b/openvas-scanner-4.0.1-bsdsource.patch deleted file mode 100644 index f90b35e..0000000 --- a/openvas-scanner-4.0.1-bsdsource.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.bsdsource/CMakeLists.txt ---- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 -+++ openvas-scanner-4.0.1.bsdsource/CMakeLists.txt 2014-05-26 16:11:23.018940789 +0200 -@@ -235,7 +235,7 @@ - set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -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 -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE") -+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_DEFAULT_SOURCE -D_ISOC99_SOURCE") - - add_subdirectory (src) - diff --git a/openvas-scanner-4.0.1-mkcertclient.patch b/openvas-scanner-4.0.1-mkcertclient.patch deleted file mode 100644 index 97a154e..0000000 --- a/openvas-scanner-4.0.1-mkcertclient.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.mkcert/CMakeLists.txt ---- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 -+++ openvas-scanner-4.0.1.mkcert/CMakeLists.txt 2014-05-26 16:04:23.093548608 +0200 -@@ -258,7 +258,6 @@ - # DESTINATION ${OPENVAS_SYSCONF_DIR}) - - install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert -- ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client - ${CMAKE_BINARY_DIR}/tools/openvas-nvt-sync - DESTINATION ${SBINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -@@ -269,7 +268,15 @@ - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - --install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8 -+install (FILES ${CMAKE_SOURCE_DIR}/tools/openvas-mkcert-client -+ DESTINATION ${BINDIR} -+ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -+ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ -+install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert-client.1 -+ DESTINATION ${DATADIR}/man/man1 ) -+ -+install (FILES ${CMAKE_SOURCE_DIR}/doc/openvassd.8 - DESTINATION ${DATADIR}/man/man8 ) - - install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8 -Only in openvas-scanner-4.0.1.mkcert/: CMakeLists.txt~ diff --git a/openvas-scanner-4.0.1-pki.patch b/openvas-scanner-4.0.1-pki.patch deleted file mode 100644 index 8575010..0000000 --- a/openvas-scanner-4.0.1-pki.patch +++ /dev/null @@ -1,55 +0,0 @@ -Put the certificates to the /etc/pki as suggested by: -http://fedoraproject.org/wiki/PackagingDrafts/Certificates -diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.pki/CMakeLists.txt ---- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 -+++ openvas-scanner-4.0.1.pki/CMakeLists.txt 2014-05-26 15:48:26.184941485 +0200 -@@ -157,15 +157,16 @@ - set (OPENVAS_CACHE_DIR "${LOCALSTATEDIR}/cache/openvas") - set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run") - set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas") -+set (OPENVAS_CERT_DIR "${SYSCONFDIR}/pki/openvas") - - set (OPENVAS_NVT_DIR "${OPENVAS_STATE_DIR}/plugins") - - set (OPENVAS_LIB_INSTALL_DIR "${LIBDIR}") --set (OPENVAS_SCANNER_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/servercert.pem") --set (OPENVAS_SCANNER_KEY "${OPENVAS_STATE_DIR}/private/CA/serverkey.pem") --set (OPENVAS_CLIENT_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/clientcert.pem") --set (OPENVAS_CLIENT_KEY "${OPENVAS_STATE_DIR}/private/CA/clientkey.pem") --set (OPENVAS_CA_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/cacert.pem") -+set (OPENVAS_SCANNER_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/servercert.pem") -+set (OPENVAS_SCANNER_KEY "${OPENVAS_CERT_DIR}/private/CA/serverkey.pem") -+set (OPENVAS_CLIENT_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/clientcert.pem") -+set (OPENVAS_CLIENT_KEY "${OPENVAS_CERT_DIR}/private/CA/clientkey.pem") -+set (OPENVAS_CA_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/cacert.pem") - - set (OPENVASSD_MESSAGES "${OPENVAS_LOG_DIR}/openvassd.messages") - set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump") -diff -ru openvas-scanner-4.0.1/tools/openvas-mkcert-client.in openvas-scanner-4.0.1.pki/tools/openvas-mkcert-client.in ---- openvas-scanner-4.0.1/tools/openvas-mkcert-client.in 2014-01-21 12:26:20.000000000 +0100 -+++ openvas-scanner-4.0.1.pki/tools/openvas-mkcert-client.in 2014-05-26 15:49:28.089433621 +0200 -@@ -26,8 +26,8 @@ - - umask 022 - --OPENVASPRIV="@OPENVAS_STATE_DIR@/private/CA" --OPENVASPUB="@OPENVAS_STATE_DIR@/CA" -+OPENVASPRIV="@OPENVAS_CERT_DIR@/private/CA" -+OPENVASPUB="@OPENVAS_CERT_DIR@/CA" - - usage() - { -diff -ru openvas-scanner-4.0.1/tools/openvas-mkcert.in openvas-scanner-4.0.1.pki/tools/openvas-mkcert.in ---- openvas-scanner-4.0.1/tools/openvas-mkcert.in 2014-01-21 12:26:20.000000000 +0100 -+++ openvas-scanner-4.0.1.pki/tools/openvas-mkcert.in 2014-05-26 15:51:35.264444646 +0200 -@@ -44,8 +44,8 @@ - datadir=@DATADIR@ - bindir=@BINDIR@ - sbindir=@SBINDIR@ --OPENVASPRIV="@OPENVAS_STATE_DIR@/private/CA" --OPENVASPUB="@OPENVAS_STATE_DIR@/CA" -+OPENVASPRIV="@OPENVAS_CERT_DIR@/private/CA" -+OPENVASPUB="@OPENVAS_CERT_DIR@/CA" - - BASEDIR=${TMPDIR-/tmp}/openvas-mkcert.$$ - diff --git a/openvas-scanner-4.0.1-rulesdir.patch b/openvas-scanner-4.0.1-rulesdir.patch deleted file mode 100644 index 90f998f..0000000 --- a/openvas-scanner-4.0.1-rulesdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.rules/CMakeLists.txt ---- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 -+++ openvas-scanner-4.0.1.rules/CMakeLists.txt 2014-05-26 16:07:37.454116277 +0200 -@@ -171,6 +171,10 @@ - set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump") - set (OPENVASSD_CONF "${OPENVAS_SYSCONF_DIR}/openvassd.conf") - -+if (NOT OPENVASSD_RULES) -+ set (OPENVASSD_RULES "${OPENVAS_DATA_DIR}/openvassd.rules") -+endif (NOT OPENVASSD_RULES) -+ - set (NVT_TIMEOUT "320") - - message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}") - diff --git a/openvas-scanner-bsdsource.patch b/openvas-scanner-bsdsource.patch index 6a91ddd..f90b35e 100644 --- a/openvas-scanner-bsdsource.patch +++ b/openvas-scanner-bsdsource.patch @@ -1,7 +1,7 @@ -diff -up openvas-scanner-3.4+beta2/CMakeLists.txt.bsdsource openvas-scanner-3.4+beta2/CMakeLists.txt ---- openvas-scanner-3.4+beta2/CMakeLists.txt.bsdsource 2014-04-25 12:23:19.000000000 +0200 -+++ openvas-scanner-3.4+beta2/CMakeLists.txt 2014-04-25 12:40:02.366598043 +0200 -@@ -252,7 +252,7 @@ configure_file (tools/openvas-nvt-sync.i +diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.bsdsource/CMakeLists.txt +--- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 ++++ openvas-scanner-4.0.1.bsdsource/CMakeLists.txt 2014-05-26 16:11:23.018940789 +0200 +@@ -235,7 +235,7 @@ set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") diff --git a/openvas-scanner-mkcertclient.patch b/openvas-scanner-mkcertclient.patch new file mode 100644 index 0000000..97a154e --- /dev/null +++ b/openvas-scanner-mkcertclient.patch @@ -0,0 +1,29 @@ +diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.mkcert/CMakeLists.txt +--- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 ++++ openvas-scanner-4.0.1.mkcert/CMakeLists.txt 2014-05-26 16:04:23.093548608 +0200 +@@ -258,7 +258,6 @@ + # DESTINATION ${OPENVAS_SYSCONF_DIR}) + + install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert +- ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client + ${CMAKE_BINARY_DIR}/tools/openvas-nvt-sync + DESTINATION ${SBINDIR} + PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE +@@ -269,7 +268,15 @@ + PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +-install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8 ++install (FILES ${CMAKE_SOURCE_DIR}/tools/openvas-mkcert-client ++ DESTINATION ${BINDIR} ++ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE ++ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++ ++install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert-client.1 ++ DESTINATION ${DATADIR}/man/man1 ) ++ ++install (FILES ${CMAKE_SOURCE_DIR}/doc/openvassd.8 + DESTINATION ${DATADIR}/man/man8 ) + + install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8 +Only in openvas-scanner-4.0.1.mkcert/: CMakeLists.txt~ diff --git a/openvas-scanner-notused.patch b/openvas-scanner-notused.patch deleted file mode 100644 index ac2e0c1..0000000 --- a/openvas-scanner-notused.patch +++ /dev/null @@ -1,158 +0,0 @@ -New version of gcc used for fedora 15 is reporting errors with -Werror also for -variables set, but never used. -Where it was obvious I fixed the code. In other cases avoid this error by: -(void)variable; -diff -ru openvas-scanner-3.2.2/src/attack.c openvas-scanner-3.2.2.new/src/attack.c ---- openvas-scanner-3.2.2/src/attack.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/attack.c 2011-03-26 13:00:43.000000000 +0100 -@@ -939,7 +939,9 @@ - { - int max_hosts = 0; - int num_tested = 0; -+ /* variable set but not used - int host_pending = 0; -+ */ - char hostname[1024]; - char *hostlist; - struct in6_addr host_ip; -@@ -1139,7 +1141,9 @@ - } - } - -+ /* variable set but not used - host_pending = 0; -+ */ - memcpy (&addrs.ip6, &host_ip, sizeof (struct in6_addr)); - - /* Do we have the right to test this host ? */ -@@ -1156,9 +1160,11 @@ - int s; - char *MAC = NULL; - int mac_err = -1; -+ /*variable set but not used - struct in_addr addr; - - addr.s_addr = host_ip.s6_addr32[3]; -+ */ - if (preferences_use_mac_addr (preferences) - && v6_is_local_ip (&host_ip)) - { -diff -ru openvas-scanner-3.2.2/src/nasl_plugins.c openvas-scanner-3.2.2.new/src/nasl_plugins.c ---- openvas-scanner-3.2.2/src/nasl_plugins.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/nasl_plugins.c 2011-03-26 13:05:19.000000000 +0100 -@@ -253,6 +253,10 @@ - - if (preferences_benice (NULL)) - nice_retval = nice (-5); -+ -+ /* avoid compilation error as variable nice_retval is set but not used now */ -+ (void)nice_retval; -+ - // @todo: Check value of nice_retval to see if it was successful. - // Keep in mind that even -1 can mean success here; see man page of nice - // for details. -diff -ru openvas-scanner-3.2.2/src/ntp_11.c openvas-scanner-3.2.2.new/src/ntp_11.c ---- openvas-scanner-3.2.2/src/ntp_11.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/ntp_11.c 2011-03-26 13:12:06.000000000 +0100 -@@ -812,11 +812,11 @@ - while (plugins->next) - { - struct arglist *args = plugins->value; -- struct arglist *d, *deps; -+ struct arglist *deps; - if (!args) - goto nxt; - -- d = deps = plug_get_deps (args); -+ deps = plug_get_deps (args); - if (deps == NULL) - goto nxt; - -diff -ru openvas-scanner-3.2.2/src/openvassd.c openvas-scanner-3.2.2.new/src/openvassd.c ---- openvas-scanner-3.2.2/src/openvassd.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/openvassd.c 2011-03-26 13:13:56.000000000 +0100 -@@ -429,6 +429,10 @@ - /* Everyone runs with a nicelevel of 10 */ - if (preferences_benice (prefs)) - nice_retval = nice (10); -+ -+ /* avoid compilation error as variable nice_retval is set but not used */ -+ (void) nice_retval; -+ - // @todo: Check value of nice_retval to see if it was successful. - // Keep in mind that even -1 can mean success here; see man page of nice - // for details. -diff -ru openvas-scanner-3.2.2/src/oval_plugins.c openvas-scanner-3.2.2.new/src/oval_plugins.c ---- openvas-scanner-3.2.2/src/oval_plugins.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/oval_plugins.c 2011-03-26 13:18:28.000000000 +0100 -@@ -442,6 +442,9 @@ - ("This OVAL file contains the following definitions:\n", - g_strndup (descriptions, 3100), - "\n(list cut due to memory limitations)", NULL); -+ -+ /* avoid compilation error as variable description is set but never used */ -+ (void) description; - } - else - { -diff -ru openvas-scanner-3.2.2/src/preferences.c openvas-scanner-3.2.2.new/src/preferences.c ---- openvas-scanner-3.2.2/src/preferences.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/preferences.c 2011-03-26 21:31:23.000000000 +0100 -@@ -452,7 +452,10 @@ - int - preferences_drop_privileges (struct arglist *preferences, char *oid) - { -+ /* variable set but never used - char *pref; -+ */ -+ - int ret = 0; - - if (preferences == NULL) -@@ -464,7 +467,9 @@ - ret = 1; - } - -+ /* variable set but never used - pref = arg_get_value (preferences, "drop_privileges"); -+ */ - return ret; - } - -diff -ru openvas-scanner-3.2.2/src/shared_socket.c openvas-scanner-3.2.2.new/src/shared_socket.c ---- openvas-scanner-3.2.2/src/shared_socket.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/shared_socket.c 2011-03-26 21:35:51.000000000 +0100 -@@ -96,10 +96,15 @@ - - char *buffer = NULL; - int bufsz = 0; -+ /* variable set but never used - int e; -+ */ - int type; - -+ /* variable set but never used - e = internal_recv (soc, &buffer, &bufsz, &type); -+ */ -+ internal_recv (soc, &buffer, &bufsz, &type); - if ((type & INTERNAL_COMM_MSG_SHARED_SOCKET) == 0 - || (type & INTERNAL_COMM_SHARED_SOCKET_DORECVMSG) == 0) - { -diff -ru openvas-scanner-3.2.2/src/sighand.c openvas-scanner-3.2.2.new/src/sighand.c ---- openvas-scanner-3.2.2/src/sighand.c 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/src/sighand.c 2011-03-26 21:39:53.000000000 +0100 -@@ -46,9 +46,14 @@ - void - let_em_die (int pid) - { -+ /* variable x set but never used - int status, x; - - x = waitpid (pid, &status, WNOHANG); -+ */ -+ -+ int status; -+ waitpid (pid, &status, WNOHANG); - } - - diff --git a/openvas-scanner-nvtfeed.patch b/openvas-scanner-nvtfeed.patch deleted file mode 100644 index 064fe11..0000000 --- a/openvas-scanner-nvtfeed.patch +++ /dev/null @@ -1,23 +0,0 @@ -Separate directories for different security feeds -diff -ru openvas-scanner-3.2.2/tools/greenbone-nvt-sync openvas-scanner-3.2.2.new/tools/greenbone-nvt-sync ---- openvas-scanner-3.2.2/tools/greenbone-nvt-sync 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/tools/greenbone-nvt-sync 2011-03-19 13:49:59.000000000 +0100 -@@ -110,6 +110,7 @@ - if [ -z $NVT_DIR ] - then - NVT_DIR=`$SCANNER_BINARY -s | grep plugins_folder | sed 's/plugins\_folder\ *=\ *//'` -+ NVT_DIR="${NVT_DIR}/gsf" - if [ -z $NVT_DIR ] - then - stderr_write "== greenbone-nvt-sync $VERSION ================================================" -diff -ru openvas-scanner-3.2.2/tools/openvas-nvt-sync.in openvas-scanner-3.2.2.new/tools/openvas-nvt-sync.in ---- openvas-scanner-3.2.2/tools/openvas-nvt-sync.in 2011-02-21 10:40:34.000000000 +0100 -+++ openvas-scanner-3.2.2.new/tools/openvas-nvt-sync.in 2011-03-19 13:51:26.000000000 +0100 -@@ -38,6 +38,7 @@ - # configure NVT_DIR where we will sync NVTs - if [ -z "$NVT_DIR" ]; then - NVT_DIR="@OPENVAS_NVT_DIR@" -+ NVT_DIR="${NVT_DIR}/nvt" - fi - - # The URL of the plugin feed diff --git a/openvas-scanner-pki.patch b/openvas-scanner-pki.patch new file mode 100644 index 0000000..8575010 --- /dev/null +++ b/openvas-scanner-pki.patch @@ -0,0 +1,55 @@ +Put the certificates to the /etc/pki as suggested by: +http://fedoraproject.org/wiki/PackagingDrafts/Certificates +diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.pki/CMakeLists.txt +--- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 ++++ openvas-scanner-4.0.1.pki/CMakeLists.txt 2014-05-26 15:48:26.184941485 +0200 +@@ -157,15 +157,16 @@ + set (OPENVAS_CACHE_DIR "${LOCALSTATEDIR}/cache/openvas") + set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run") + set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas") ++set (OPENVAS_CERT_DIR "${SYSCONFDIR}/pki/openvas") + + set (OPENVAS_NVT_DIR "${OPENVAS_STATE_DIR}/plugins") + + set (OPENVAS_LIB_INSTALL_DIR "${LIBDIR}") +-set (OPENVAS_SCANNER_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/servercert.pem") +-set (OPENVAS_SCANNER_KEY "${OPENVAS_STATE_DIR}/private/CA/serverkey.pem") +-set (OPENVAS_CLIENT_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/clientcert.pem") +-set (OPENVAS_CLIENT_KEY "${OPENVAS_STATE_DIR}/private/CA/clientkey.pem") +-set (OPENVAS_CA_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/cacert.pem") ++set (OPENVAS_SCANNER_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/servercert.pem") ++set (OPENVAS_SCANNER_KEY "${OPENVAS_CERT_DIR}/private/CA/serverkey.pem") ++set (OPENVAS_CLIENT_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/clientcert.pem") ++set (OPENVAS_CLIENT_KEY "${OPENVAS_CERT_DIR}/private/CA/clientkey.pem") ++set (OPENVAS_CA_CERTIFICATE "${OPENVAS_CERT_DIR}/CA/cacert.pem") + + set (OPENVASSD_MESSAGES "${OPENVAS_LOG_DIR}/openvassd.messages") + set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump") +diff -ru openvas-scanner-4.0.1/tools/openvas-mkcert-client.in openvas-scanner-4.0.1.pki/tools/openvas-mkcert-client.in +--- openvas-scanner-4.0.1/tools/openvas-mkcert-client.in 2014-01-21 12:26:20.000000000 +0100 ++++ openvas-scanner-4.0.1.pki/tools/openvas-mkcert-client.in 2014-05-26 15:49:28.089433621 +0200 +@@ -26,8 +26,8 @@ + + umask 022 + +-OPENVASPRIV="@OPENVAS_STATE_DIR@/private/CA" +-OPENVASPUB="@OPENVAS_STATE_DIR@/CA" ++OPENVASPRIV="@OPENVAS_CERT_DIR@/private/CA" ++OPENVASPUB="@OPENVAS_CERT_DIR@/CA" + + usage() + { +diff -ru openvas-scanner-4.0.1/tools/openvas-mkcert.in openvas-scanner-4.0.1.pki/tools/openvas-mkcert.in +--- openvas-scanner-4.0.1/tools/openvas-mkcert.in 2014-01-21 12:26:20.000000000 +0100 ++++ openvas-scanner-4.0.1.pki/tools/openvas-mkcert.in 2014-05-26 15:51:35.264444646 +0200 +@@ -44,8 +44,8 @@ + datadir=@DATADIR@ + bindir=@BINDIR@ + sbindir=@SBINDIR@ +-OPENVASPRIV="@OPENVAS_STATE_DIR@/private/CA" +-OPENVASPUB="@OPENVAS_STATE_DIR@/CA" ++OPENVASPRIV="@OPENVAS_CERT_DIR@/private/CA" ++OPENVASPUB="@OPENVAS_CERT_DIR@/CA" + + BASEDIR=${TMPDIR-/tmp}/openvas-mkcert.$$ + diff --git a/openvas-scanner-rulesdir.patch b/openvas-scanner-rulesdir.patch new file mode 100644 index 0000000..90f998f --- /dev/null +++ b/openvas-scanner-rulesdir.patch @@ -0,0 +1,15 @@ +diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.rules/CMakeLists.txt +--- openvas-scanner-4.0.1/CMakeLists.txt 2014-04-23 16:00:47.000000000 +0200 ++++ openvas-scanner-4.0.1.rules/CMakeLists.txt 2014-05-26 16:07:37.454116277 +0200 +@@ -171,6 +171,10 @@ + set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump") + set (OPENVASSD_CONF "${OPENVAS_SYSCONF_DIR}/openvassd.conf") + ++if (NOT OPENVASSD_RULES) ++ set (OPENVASSD_RULES "${OPENVAS_DATA_DIR}/openvassd.rules") ++endif (NOT OPENVASSD_RULES) ++ + set (NVT_TIMEOUT "320") + + message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}") + diff --git a/openvas-scanner.spec b/openvas-scanner.spec index 8c8dba6..396188d 100644 --- a/openvas-scanner.spec +++ b/openvas-scanner.spec @@ -18,24 +18,20 @@ Source5: openvas-nvt-sync-cron Source6: openvas-nvt-sync-cronjob Source7: openvas-scanner.service -# Separate nvt and gsf feeds to separate directories -# Separation of feeds is currently not possible because nasl script_dependencies doesn't search in all include_folders -#Patch0: openvas-scanner-nvtfeed.patch - # Put certs to /etc/pki as suggested by http://fedoraproject.org/wiki/PackagingDrafts/Certificates # Not reported upstream as it is RedHat/Fedora specific -Patch1: openvas-scanner-%{version}-pki.patch +Patch1: openvas-scanner-pki.patch # Put openvas-mkcert-client to bin directory instead of sbin and install its man page # Reported upstream http://wald.intevation.org/tracker/?func=detail&aid=1941&group_id=29&atid=220 -Patch2: openvas-scanner-%{version}-mkcertclient.patch +Patch2: openvas-scanner-mkcertclient.patch # Allow compile time definition of the directory to store openvassd.rules # Reported upstream http://wald.intevation.org/tracker/?func=detail&aid=1940&group_id=29&atid=220 -Patch3: openvas-scanner-%{version}-rulesdir.patch +Patch3: openvas-scanner-rulesdir.patch # Replace _BSD_SOURCE and _SVID_SOURCE with _DEFAULT_SOURCE otherwise build fails with Werror -Patch4: openvas-scanner-%{version}-bsdsource.patch +Patch4: openvas-scanner-bsdsource.patch BuildRequires: openvas-libraries-devel >= 7.0 BuildRequires: cmake >= 2.6.0