From nobody Sat Oct 15 14:37:59 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MqQpc1yZDz4fksF; Sat, 15 Oct 2022 14:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MqQpc1KP3z3jRh; Sat, 15 Oct 2022 14:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665844680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKrSEtsmqjyUifV8hB53Hta8sIBGkLmHF+mBdjV+sMc=; b=hQi4Qap6ckc5KWSxiDVLTaq5pfeu0tBO8M8AObt7wrG6QzhMc5F2ak4kTnyMlKg8N9YqrB s/3L9Qjhl9eOwcKJt9dQfY0BDj079UQx7SO3ZYHR35/vtS9JUmOw/I7GFpIJiXiIeQK7/X ERX/vCTRWl1ZXosYlvByq6MLFzsMCj947A2Yna3Sap8/Jqa95/GnvRYrBliWup3+gSiVWv vnV7CE/DUtocGbj1R87Rh765MtBWYD6GTSW8L3rXTKddvd9O5eIrsZoKF57qmMoIRB2oRG zc3F34G2SNOWeArXwwdY1XYaDZQZCRKd8D8cLp0Sc/Zt79gORvw03zaz3wwAtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MqQpc0MF1z18PY; Sat, 15 Oct 2022 14:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29FEbxOe025262; Sat, 15 Oct 2022 14:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FEbxS7025261; Sat, 15 Oct 2022 14:37:59 GMT (envelope-from git) Date: Sat, 15 Oct 2022 14:37:59 GMT Message-Id: <202210151437.29FEbxS7025261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: e4b4b252c8b3 - 2022Q4 - security/gvm-libs: fix build on armv7 (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: e4b4b252c8b3ed0b7afb4b17a28ae8bfa8d79027 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665844680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKrSEtsmqjyUifV8hB53Hta8sIBGkLmHF+mBdjV+sMc=; b=iAjm6F3TmhOrvCfEfep35qQ5gQ4U1TSL2IiDSgZ5Jn5sqm0GdfX/rSLtWPQHWG41kCTMrE 5lSOsrxaY80/TmB0gJzALL2RCNdv/90pKiGg4ZzKCJM3mnmosZbwr/VjEeNsckpN/lE+FL 7uSp7DNBsM/moXkLE5Kzjs2YwkS7VeCAahSixwDIz6aDoDXYecpLtJALLquWn8Fjpt4ntB X1c1JY8K/Heg/8R7FYMOHkbls4VV0cIFE3J3h+gNDzWIciM10TCIot5VLEEvjQDzXdnABm VJq9an6i/ACEVObLgy9qtPGwWLSJMkwXay1vO8r2NNNgUUonBs9NRDVir/A8Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665844680; a=rsa-sha256; cv=none; b=VERx6ZvwmItrC5YvirHvhPk/r0VxoLzOjvaFM11t9/i94cDF2wC+GpVn5zyUut+T1C2OUu /xZLDDfvpxshEpC+D7ZG/6fQvXyaKrOhby2V1AdCQzTP8Lvdu3UNoFWm0FD6B35yWOr3gP F1e5NNErY4ua2+p1q2kty7tKqCeee7tOCyVSCWg0hFK53UhRzA+TS3yYoLxczznqpVn935 hj26lhhi7A7cn+bCYqiprUirpwCbj+5uH5tErRqScaBQ2m3j4s0JJ614Dsi+bdJeGrpFx8 PHHyhWNLUL6NNwu461ovl5BioVw9hI2sQeHoRw8QSCogLEkN8WDoYjtI5XpszA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4b4b252c8b3ed0b7afb4b17a28ae8bfa8d79027 commit e4b4b252c8b3ed0b7afb4b17a28ae8bfa8d79027 Author: Robert Clausecker AuthorDate: 2022-09-30 09:35:56 +0000 Commit: Dima Panov CommitDate: 2022-10-15 14:37:26 +0000 security/gvm-libs: fix build on armv7 (+) - add missing type casts for sizeof(time_t) > sizeof(long) - neuter -Werror as per policy - while we are at it, pet portlint Approved by: maintainer timeout (acm) Submitted by: Robert Clausecker PR: 266725 MFH: 2022Q4 (cherry picked from commit a774bfbbb08cf1c3529696f9ddc205ca460a6743) --- security/gvm-libs/Makefile | 7 +++---- security/gvm-libs/files/patch-CMakeLists.txt | 20 ++++++++++++++------ .../gvm-libs/files/patch-boreas_alivedetection.c | 15 +++++++++++++-- security/gvm-libs/files/patch-boreas_cli.c | 13 +++++++++++++ 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile index 1a290c73bf98..0bd9c4002eea 100644 --- a/security/gvm-libs/Makefile +++ b/security/gvm-libs/Makefile @@ -1,11 +1,11 @@ PORTNAME= gvm -DISTVERSION= 22.4.0 DISTVERSIONPREFIX= v +DISTVERSION= 22.4.0 CATEGORIES= security PKGNAMESUFFIX= -libs MAINTAINER= acm@FreeBSD.org -COMMENT= libraries module for the GVM solution +COMMENT= Libraries module for the GVM solution WWW= https://github.com/greenbone/gvm-libs LICENSE= GPLv2+ @@ -23,11 +23,10 @@ LIB_DEPENDS= libassuan.so:security/libassuan \ libpaho-mqtt3a.so:net/libpaho-mqtt3 RUN_DEPENDS= doxygen>0:devel/doxygen +USES= cmake gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= greenbone GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX} - -USES= cmake gnome pkgconfig USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes diff --git a/security/gvm-libs/files/patch-CMakeLists.txt b/security/gvm-libs/files/patch-CMakeLists.txt index ff6ae5cf896c..24fc762b8322 100644 --- a/security/gvm-libs/files/patch-CMakeLists.txt +++ b/security/gvm-libs/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2021-10-11 09:38:23.000000000 -0500 -+++ CMakeLists.txt 2021-11-04 10:31:40.191911000 -0500 -@@ -134,7 +134,7 @@ +--- CMakeLists.txt.orig 2022-07-18 08:40:56 UTC ++++ CMakeLists.txt +@@ -136,7 +136,7 @@ if (SYSCONF_INSTALL_DIR) endif (SYSCONF_INSTALL_DIR) if (NOT SYSCONFDIR) @@ -9,7 +9,7 @@ endif (NOT SYSCONFDIR) if (NOT EXEC_PREFIX) -@@ -174,7 +174,7 @@ +@@ -176,7 +176,7 @@ if (NOT DATADIR) endif (NOT DATADIR) if (NOT GVM_RUN_DIR) @@ -17,8 +17,8 @@ + set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm") endif (NOT GVM_RUN_DIR) - if (NOT GVM_PID_DIR) -@@ -187,7 +187,7 @@ + if (NOT GVM_SYSCONF_DIR) +@@ -185,7 +185,7 @@ endif (NOT GVM_SYSCONF_DIR) if (NOT REDIS_SOCKET_PATH) @@ -27,3 +27,11 @@ endif () add_definitions (-DREDIS_SOCKET_PATH="${REDIS_SOCKET_PATH}") +@@ -208,7 +208,6 @@ set ( + -std=c11 \ + -Wall \ + -Wextra \ +- -Werror \ + -Wpedantic \ + -Wmissing-prototypes \ + -Wshadow \ diff --git a/security/gvm-libs/files/patch-boreas_alivedetection.c b/security/gvm-libs/files/patch-boreas_alivedetection.c index e222f389dc3d..1abd9def81af 100644 --- a/security/gvm-libs/files/patch-boreas_alivedetection.c +++ b/security/gvm-libs/files/patch-boreas_alivedetection.c @@ -1,5 +1,5 @@ ---- boreas/alivedetection.c.orig 2020-12-30 23:49:07.498953000 -0500 -+++ boreas/alivedetection.c 2020-12-30 23:50:37.570417000 -0500 +--- boreas/alivedetection.c.orig 2022-07-18 08:40:56 UTC ++++ boreas/alivedetection.c @@ -39,7 +39,12 @@ #include #include @@ -14,3 +14,14 @@ #include #include #include +@@ -290,8 +295,8 @@ scan (alive_test_t alive_test) + + gettimeofday (&end_time, NULL); + +- g_message ("Alive scan %s finished in %ld seconds: %d alive hosts of %d.", +- scan_id, end_time.tv_sec - start_time.tv_sec, ++ g_message ("Alive scan %s finished in %lld seconds: %d alive hosts of %d.", ++ scan_id, (long long)(end_time.tv_sec - start_time.tv_sec), + g_hash_table_size (scanner.hosts_data->alivehosts), + number_of_targets); + g_free (scan_id); diff --git a/security/gvm-libs/files/patch-boreas_cli.c b/security/gvm-libs/files/patch-boreas_cli.c new file mode 100644 index 000000000000..1a21e7e09af8 --- /dev/null +++ b/security/gvm-libs/files/patch-boreas_cli.c @@ -0,0 +1,13 @@ +--- boreas/cli.c.orig 2022-09-30 08:26:50 UTC ++++ boreas/cli.c +@@ -162,8 +162,8 @@ run_cli_scan (scanner_t *scanner, alive_test_t alive_t + scanner->hosts_data->alivehosts); + gettimeofday (&end_time, NULL); + if (scanner->print_results == 1) +- printf ("Alive scan finished in %ld seconds: %d alive hosts of %d.\n", +- end_time.tv_sec - start_time.tv_sec, ++ printf ("Alive scan finished in %lld seconds: %d alive hosts of %d.\n", ++ (long long)(end_time.tv_sec - start_time.tv_sec), + number_of_targets - number_of_dead_hosts, number_of_targets); + + return error;