Date: Fri, 4 Sep 2020 10:18:06 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547522 - head/security/openvas9-manager/files Message-ID: <202009041018.084AI6WT098026@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Fri Sep 4 10:18:05 2020 New Revision: 547522 URL: https://svnweb.freebsd.org/changeset/ports/547522 Log: Fix build with -fno-common Modified: head/security/openvas9-manager/files/patch-CMakeLists.txt head/security/openvas9-manager/files/patch-doc-CMakeLists.txt head/security/openvas9-manager/files/patch-src-CMakeLists.txt head/security/openvas9-manager/files/patch-src-manage_sql.c head/security/openvas9-manager/files/patch-src-manage_sqlite3.c head/security/openvas9-manager/files/patch-src-omp.c head/security/openvas9-manager/files/patch-src-scanner.c head/security/openvas9-manager/files/patch-src-sql_pg.c head/security/openvas9-manager/files/patch-tools+greenbone-certdata-sync.in head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in Modified: head/security/openvas9-manager/files/patch-CMakeLists.txt ============================================================================== --- head/security/openvas9-manager/files/patch-CMakeLists.txt Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-CMakeLists.txt Fri Sep 4 10:18:05 2020 (r547522) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2017-06-21 05:05:37.000000000 -0500 -+++ CMakeLists.txt 2017-07-28 23:43:57.479141000 -0500 -@@ -155,7 +155,7 @@ +--- CMakeLists.txt.orig 2017-06-21 10:05:37 UTC ++++ CMakeLists.txt +@@ -155,7 +155,7 @@ if (NOT LIBDIR) endif (NOT LIBDIR) if (NOT LOCALSTATEDIR) @@ -9,7 +9,7 @@ endif (NOT LOCALSTATEDIR) if (NOT DATADIR) -@@ -291,7 +291,7 @@ +@@ -291,7 +291,7 @@ configure_file (tools/openvas-manage-certs.in tools/op ## Program Modified: head/security/openvas9-manager/files/patch-doc-CMakeLists.txt ============================================================================== --- head/security/openvas9-manager/files/patch-doc-CMakeLists.txt Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-doc-CMakeLists.txt Fri Sep 4 10:18:05 2020 (r547522) @@ -1,6 +1,6 @@ ---- doc/CMakeLists.txt.orig 2016-11-10 04:58:06.000000000 -0500 -+++ doc/CMakeLists.txt 2017-07-28 23:45:09.724252000 -0500 -@@ -208,5 +208,5 @@ +--- doc/CMakeLists.txt.orig 2016-11-10 09:58:06 UTC ++++ doc/CMakeLists.txt +@@ -208,5 +208,5 @@ install (FILES omp.html install (FILES openvasmd.8 greenbone-certdata-sync.8 greenbone-scapdata-sync.8 database-statistics-sqlite.8 openvas-migrate-to-postgres.8 openvas-portnames-update.8 Modified: head/security/openvas9-manager/files/patch-src-CMakeLists.txt ============================================================================== --- head/security/openvas9-manager/files/patch-src-CMakeLists.txt Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-src-CMakeLists.txt Fri Sep 4 10:18:05 2020 (r547522) @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2017-02-01 05:17:47.000000000 -0500 -+++ src/CMakeLists.txt 2017-07-28 23:47:12.492628000 -0500 -@@ -74,7 +74,7 @@ +--- src/CMakeLists.txt.orig 2017-02-01 10:17:47 UTC ++++ src/CMakeLists.txt +@@ -74,7 +74,7 @@ else (BACKEND STREQUAL SQLITE3) endif (BACKEND STREQUAL SQLITE3) add_executable (${BINARY_NAME} openvasmd.c ompd.c) Modified: head/security/openvas9-manager/files/patch-src-manage_sql.c ============================================================================== --- head/security/openvas9-manager/files/patch-src-manage_sql.c Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-src-manage_sql.c Fri Sep 4 10:18:05 2020 (r547522) @@ -1,5 +1,5 @@ ---- src/manage_sql.c 2017-06-20 01:32:02.000000000 -0500 -+++ src/manage_sql.c 2017-08-05 21:19:08.663354000 -0500 +--- src/manage_sql.c.orig 2017-06-20 06:32:02 UTC ++++ src/manage_sql.c @@ -57,6 +57,7 @@ #include <unistd.h> #include <sys/time.h> @@ -8,7 +8,16 @@ #include <openvas/base/openvas_string.h> #include <openvas/base/openvas_file.h> -@@ -1061,7 +1062,7 @@ +@@ -121,7 +122,7 @@ manage_scap_loaded (); + * + * 1 if set via scheduler, 2 if set via event, else 0. + */ +-int authenticate_allow_all; ++extern int authenticate_allow_all; + + const char *threat_message_type (const char *); + +@@ -1061,7 +1062,7 @@ iso_time_internal (time_t *epoch_time, const char **ab static char time_string[100]; tm = localtime (epoch_time); @@ -17,7 +26,7 @@ { if (strftime (time_string, 98, "%FT%TZ", tm) == 0) return NULL; -@@ -25384,7 +25385,7 @@ +@@ -25384,7 +25385,7 @@ report_port_count (report_t report) { return sql_int ("SELECT count (DISTINCT port) FROM results" " WHERE report = %llu AND port != ''" @@ -26,7 +35,7 @@ report, sql_ilike_op ()); } -@@ -25400,7 +25401,7 @@ +@@ -25400,7 +25401,7 @@ prognostic_host_port_count (report_t report, const cha { return sql_int ("SELECT count (DISTINCT port) FROM results" " WHERE report = %llu AND host = '%s'" @@ -35,7 +44,7 @@ report, host, sql_ilike_op ()); -@@ -35110,7 +35111,7 @@ +@@ -35110,7 +35111,7 @@ init_otp_pref_iterator (iterator_t* iterator, " WHERE config_preferences.config = %llu" " AND config_preferences.type = '%s'" " AND (config_preferences.name = nvt_preferences.name" @@ -44,7 +53,7 @@ " AND config_preferences.name != 'max_checks'" " AND config_preferences.name != 'max_hosts'" " UNION" -@@ -47821,12 +47822,12 @@ +@@ -47821,12 +47822,12 @@ modify_schedule (const char *schedule_id, const char * if (duration == -1) duration_string = NULL; else @@ -59,7 +68,7 @@ if ((period_months == -1) || (period_months == 0)) { -@@ -47838,12 +47839,12 @@ +@@ -47838,12 +47839,12 @@ modify_schedule (const char *schedule_id, const char * else { period_months_string = g_strdup ("0"); Modified: head/security/openvas9-manager/files/patch-src-manage_sqlite3.c ============================================================================== --- head/security/openvas9-manager/files/patch-src-manage_sqlite3.c Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-src-manage_sqlite3.c Fri Sep 4 10:18:05 2020 (r547522) @@ -1,10 +1,10 @@ ---- src/manage_sqlite3.c.orig 2015-12-08 07:09:32 UTC +--- src/manage_sqlite3.c.orig 2017-05-02 07:37:19 UTC +++ src/manage_sqlite3.c -@@ -31,6 +31,7 @@ +@@ -30,6 +30,7 @@ + #include "manage_utils.h" #include "manage_acl.h" - #include "tracef.h" +#include <sys/wait.h> #include <sqlite3.h> #include <time.h> - + #include <unistd.h> Modified: head/security/openvas9-manager/files/patch-src-omp.c ============================================================================== --- head/security/openvas9-manager/files/patch-src-omp.c Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-src-omp.c Fri Sep 4 10:18:05 2020 (r547522) @@ -1,6 +1,6 @@ ---- src/omp.c 2017-06-21 04:56:09.000000000 -0500 -+++ src/omp.c 2017-07-28 23:49:52.393994000 -0500 -@@ -18078,11 +18078,11 @@ +--- src/omp.c.orig 2017-06-21 09:56:09 UTC ++++ src/omp.c +@@ -18078,11 +18078,11 @@ handle_get_schedules (omp_parser_t *omp_parser, GError "<timezone_abbrev>%s</timezone_abbrev>", iso, (next_time == 0 ? "over" : iso_time_tz (&next_time, timezone, NULL)), Modified: head/security/openvas9-manager/files/patch-src-scanner.c ============================================================================== --- head/security/openvas9-manager/files/patch-src-scanner.c Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-src-scanner.c Fri Sep 4 10:18:05 2020 (r547522) @@ -1,5 +1,5 @@ ---- src/scanner.c 2016-11-10 04:58:06.000000000 -0500 -+++ src/scanner.c 2017-08-06 21:58:23.868844000 -0500 +--- src/scanner.c.orig 2016-11-10 09:58:06 UTC ++++ src/scanner.c @@ -33,6 +33,7 @@ #include <assert.h> #include <unistd.h> @@ -8,7 +8,7 @@ #include <sys/time.h> #include <sys/stat.h> #include <sys/un.h> -@@ -586,7 +587,6 @@ +@@ -586,7 +587,6 @@ int openvas_scanner_connect_unix () { struct sockaddr_un addr; @@ -16,7 +16,7 @@ openvas_scanner_socket = socket (AF_UNIX, SOCK_STREAM, 0); if (openvas_scanner_socket == -1) -@@ -596,10 +596,12 @@ +@@ -596,10 +596,12 @@ openvas_scanner_connect_unix () return -1; } Modified: head/security/openvas9-manager/files/patch-src-sql_pg.c ============================================================================== --- head/security/openvas9-manager/files/patch-src-sql_pg.c Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-src-sql_pg.c Fri Sep 4 10:18:05 2020 (r547522) @@ -1,5 +1,5 @@ ---- src/sql_pg.c 2017-08-06 01:12:18.411221000 -0500 -+++ src/sql_pg.c 2017-08-06 01:13:41.241337000 -0500 +--- src/sql_pg.c.orig 2017-05-29 06:45:07 UTC ++++ src/sql_pg.c @@ -26,13 +26,13 @@ #include "sql.h" Modified: head/security/openvas9-manager/files/patch-tools+greenbone-certdata-sync.in ============================================================================== --- head/security/openvas9-manager/files/patch-tools+greenbone-certdata-sync.in Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-tools+greenbone-certdata-sync.in Fri Sep 4 10:18:05 2020 (r547522) @@ -1,6 +1,6 @@ ---- tools/greenbone-certdata-sync.in 2016-11-10 04:58:06.000000000 -0500 -+++ tools/greenbone-certdata-sync.in 2017-08-06 13:11:30.155406000 -0500 -@@ -99,7 +99,7 @@ +--- tools/greenbone-certdata-sync.in.orig 2016-11-10 09:58:06 UTC ++++ tools/greenbone-certdata-sync.in +@@ -99,7 +99,7 @@ fi # Delay between retries if [ -z "$SQL_RETRY_DELAY" ]; then @@ -9,7 +9,7 @@ fi # LOG_CMD defines the command to use for logging. To have logger log to stderr -@@ -766,7 +766,7 @@ +@@ -766,7 +766,7 @@ update_cert_db() { for certfile in $CERT_DIR/CB-K*.xml do [ -e "$certfile" ] || break # No file found @@ -18,7 +18,7 @@ filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then -@@ -801,7 +801,7 @@ +@@ -801,7 +801,7 @@ update_cert_db() { for certfile in $CERT_DIR/dfn-cert-*.xml do [ -e "$certfile" ] || break # no file found @@ -27,7 +27,7 @@ filedate=$(( $filedate - ( $filedate % 60 ) )) if [ $filedate -gt $DB_LASTUPDATE ] then -@@ -831,7 +831,7 @@ +@@ -831,7 +831,7 @@ update_cert_db() { update_cvss @@ -36,7 +36,7 @@ reset_sql_tries until [ "$try_sql" -eq 0 ] -@@ -1045,7 +1045,7 @@ +@@ -1045,7 +1045,7 @@ fi if [ -f "$CERT_DB" ] then Modified: head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in ============================================================================== --- head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in Fri Sep 4 10:17:37 2020 (r547521) +++ head/security/openvas9-manager/files/patch-tools+greenbone-scapdata-sync.in Fri Sep 4 10:18:05 2020 (r547522) @@ -1,6 +1,6 @@ ---- tools/greenbone-scapdata-sync.in 2016-11-10 04:58:06.000000000 -0500 -+++ tools/greenbone-scapdata-sync.in 2017-08-06 13:50:52.849680000 -0500 -@@ -89,7 +89,7 @@ +--- tools/greenbone-scapdata-sync.in.orig 2016-11-10 09:58:06 UTC ++++ tools/greenbone-scapdata-sync.in +@@ -89,7 +89,7 @@ VERBOSE=0 # Split CVE data files into parts of this size in kB. 0 = no splitting # The default is 1/30 of the system memory. @@ -9,7 +9,7 @@ # SQLITE3 defines the name of the sqlite binary to call, along with additional # parameters. -@@ -109,7 +109,7 @@ +@@ -109,7 +109,7 @@ fi # Delay between retries if [ -z "$SQL_RETRY_DELAY" ]; then @@ -18,7 +18,7 @@ fi # SCRIPT_NAME is the name the scripts will use to identify itself and to mark -@@ -234,11 +234,6 @@ +@@ -234,11 +234,6 @@ handle_interrupt () { if [ -z "$TMPDIR" ]; then SYNC_TMP_DIR=/tmp @@ -30,7 +30,7 @@ else SYNC_TMP_DIR="$TMPDIR" fi -@@ -1080,11 +1075,11 @@ +@@ -1080,11 +1075,11 @@ update_scap_db_private () { then for ovalfile in $oval_files_sorted_private do @@ -44,7 +44,7 @@ if [ 1 = "$REBUILD_OVAL" ] then -@@ -1153,7 +1148,7 @@ +@@ -1153,7 +1148,7 @@ update_scap_db_private () { DIR_STR_LENGTH=$((`echo "$SCAP_DIR" | wc -c` + 1)) oval_files_shortened="" @@ -53,7 +53,7 @@ then for ovalfile in $oval_files_sorted_private do -@@ -1163,7 +1158,7 @@ +@@ -1163,7 +1158,7 @@ update_scap_db_private () { fi oval_files_clause="" @@ -62,7 +62,7 @@ then oval_files_clause="AND (xml_file NOT IN ($oval_files_shortened))" fi -@@ -1186,7 +1181,7 @@ +@@ -1186,7 +1181,7 @@ update_scap_db_private () { fi # TODO: This is not quite accurate as it uses the timestamp of the non-private data. @@ -71,7 +71,7 @@ reset_sql_tries until [ "$try_sql" -eq 0 ] -@@ -1208,12 +1203,12 @@ +@@ -1208,12 +1203,12 @@ update_scap_db() { CPEBASE="$SCAP_DIR/official-cpe-dictionary_v2.2.xml" if [ -e $CPEBASE ] then @@ -86,7 +86,7 @@ if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1271,13 +1266,13 @@ +@@ -1271,13 +1266,13 @@ update_scap_db() { for cvefile in $SCAP_DIR/nvdcve-2.0-*.xml do [ -e "$cvefile" ] || break # no file found @@ -102,7 +102,7 @@ if [ "0" -ne "$SPLIT_PART_SIZE" ] && [ "$filesize" -gt $(($SPLIT_PART_SIZE * 1024)) ] then log_info "File is larger than ${SPLIT_PART_SIZE}k. Splitting into multiple parts" -@@ -1347,11 +1342,11 @@ +@@ -1347,11 +1342,11 @@ update_scap_db() { for ovalfile in $oval_files_sorted do @@ -116,7 +116,7 @@ if [ 1 = "$REBUILD_OVAL" ] then -@@ -1403,7 +1398,7 @@ +@@ -1403,7 +1398,7 @@ update_scap_db() { update_cvss update_placeholders @@ -125,7 +125,7 @@ reset_sql_tries until [ "$try_sql" -eq 0 ] -@@ -1635,7 +1630,7 @@ +@@ -1635,7 +1630,7 @@ if [ $POSTGRES -eq 0 ] then if [ -f "$SCAP_DB" ] then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009041018.084AI6WT098026>