security/gvm: update to 21.4.2
The following ports part of security gvm were updated security/gvmd: Update to 21.4.3 security/gvm-libs: Update to 21.4.2 security/openvas: Update to 21.4.2 security/py-ospd-openvas: Update to 21.4.2 security/py-ospd: Update to 21.4.3 security/greenbone-security-assistant: Update to 21.4.2 - Fix build on FreeBSD 11 [1] PR: 257653 Reported by: John Hein <jcfyecrayz _ at _ liamekaens.com> [1]
This commit is contained in:
parent
762a03caae
commit
a65d2f7cde
20 changed files with 89 additions and 47 deletions
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= greenbone-security-assistant
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 21.4.1
|
||||
DISTVERSION= 21.4.2
|
||||
CATEGORIES= security
|
||||
MASTER_SITES= LOCAL/acm/gsa/:yarn_cache
|
||||
DISTFILES= ${PORTNAME}-cache${EXTRACT_SUFX}:yarn_cache
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
TIMESTAMP = 1625787172
|
||||
TIMESTAMP = 1630801223
|
||||
SHA256 (greenbone-security-assistant-cache.tar.gz) = 998f02274f7104678ba260f7e42d8bc269cb4e79a668660bae5fd39e084f585b
|
||||
SIZE (greenbone-security-assistant-cache.tar.gz) = 61976509
|
||||
SHA256 (greenbone-gsa-v21.4.1_GH0.tar.gz) = eae9220cdf2543b6dc3b089f194b70a26b7297fb37bcddcc699330421f952fb8
|
||||
SIZE (greenbone-gsa-v21.4.1_GH0.tar.gz) = 2638660
|
||||
SHA256 (greenbone-gsa-v21.4.2_GH0.tar.gz) = 16c8b70c6f68b73d6e2e487c2c0cb9b8490157d0d82cb12e13f5da4b2f3a96ca
|
||||
SIZE (greenbone-gsa-v21.4.2_GH0.tar.gz) = 2678531
|
||||
|
|
|
@ -1,30 +1,31 @@
|
|||
--- gsad/CMakeLists.txt 2020-08-11 10:23:07.000000000 -0500
|
||||
+++ gsad/CMakeLists.txt 2021-01-05 18:03:53.919183000 -0500
|
||||
@@ -86,7 +86,7 @@
|
||||
--- gsad/CMakeLists.txt 2021-08-03 07:18:37.000000000 -0500
|
||||
+++ gsad/CMakeLists.txt 2021-09-04 19:24:39.154779000 -0500
|
||||
@@ -96,7 +96,7 @@
|
||||
set (GSAD_CONFIG_DIR "${SYSCONFDIR}/gvm/")
|
||||
|
||||
if (NOT GSAD_PID_DIR)
|
||||
- set (GSAD_PID_DIR "${LOCALSTATEDIR}/run")
|
||||
+ set (GSAD_PID_DIR "${LOCALSTATEDIR}/run/gvm")
|
||||
endif (NOT GSAD_PID_DIR)
|
||||
|
||||
if (NOT GVM_RUN_DIR)
|
||||
@@ -124,15 +124,14 @@
|
||||
- set (GVM_RUN_DIR "/run/gvm")
|
||||
+ set (GVM_RUN_DIR "${LOCALSTATEDIR}/run/gvm")
|
||||
endif (NOT GVM_RUN_DIR)
|
||||
|
||||
if (NOT GSAD_PID_DIR)
|
||||
@@ -135,15 +135,15 @@
|
||||
endif (NOT GVM_CA_CERTIFICATE)
|
||||
|
||||
|
||||
-configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf)
|
||||
+#configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf.sample)
|
||||
+#configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf)
|
||||
|
||||
## Install
|
||||
|
||||
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
|
||||
- DESTINATION ${GSAD_CONFIG_DIR})
|
||||
+#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf.sample
|
||||
+#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
|
||||
+# DESTINATION ${GSAD_CONFIG_DIR})
|
||||
|
||||
add_subdirectory (src)
|
||||
-add_subdirectory (config)
|
||||
+#add_subdirectory (config)
|
||||
|
||||
add_subdirectory (doc)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= gvm
|
||||
DISTVERSION= 21.4.1
|
||||
DISTVERSION= 21.4.2
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= security
|
||||
PKGNAMESUFFIX= -libs
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1624923931
|
||||
SHA256 (greenbone-gvm-libs-v21.4.1_GH0.tar.gz) = e646d5ca38742c1a98438cea65c8fa22b12f9cfd1754559ba5891658fbf1f466
|
||||
SIZE (greenbone-gvm-libs-v21.4.1_GH0.tar.gz) = 295135
|
||||
TIMESTAMP = 1630799652
|
||||
SHA256 (greenbone-gvm-libs-v21.4.2_GH0.tar.gz) = a868b25dd000a81c4a0962cff18726edc2fe14b3cdeb58669bcef4b6349c344a
|
||||
SIZE (greenbone-gvm-libs-v21.4.2_GH0.tar.gz) = 296966
|
||||
|
|
|
@ -1,14 +1,29 @@
|
|||
--- util/passwordbasedauthentication.c 2021-07-08 17:07:24.145438000 -0500
|
||||
+++ util/passwordbasedauthentication.c 2021-07-08 17:08:24.809605000 -0500
|
||||
@@ -26,7 +26,11 @@
|
||||
--- util/passwordbasedauthentication.c 2021-08-03 06:50:41.000000000 -0500
|
||||
+++ util/passwordbasedauthentication.c 2021-09-04 20:54:26.630524000 -0500
|
||||
@@ -26,7 +26,13 @@
|
||||
// UFC_crypt defines crypt_r when only when __USE_GNU is set
|
||||
// this shouldn't affect other implementations
|
||||
#define __USE_GNU
|
||||
+#if defined(__FreeBSD__)
|
||||
+#if HAS_CRYPT_R
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
+#else
|
||||
#include <crypt.h>
|
||||
+#endif
|
||||
// INVALID_HASH is used on verify when the given hash is a NULL pointer.
|
||||
// This is done to not directly jump to exit with a INVALID_HASH result
|
||||
// but rather keep calculating to make it a little bit harder to guess
|
||||
@@ -173,6 +179,7 @@
|
||||
return strlen (setting) > 1 && setting[0] == '$';
|
||||
}
|
||||
|
||||
+#if HAS_CRYPT_R
|
||||
char *
|
||||
pba_hash (struct PBASettings *setting, const char *password)
|
||||
{
|
||||
@@ -276,3 +283,4 @@
|
||||
free (tmp);
|
||||
return result;
|
||||
}
|
||||
+#endif /* #if HAS_CRYPT_R */
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
--- util/passwordbasedauthentication.h 2021-09-04 20:50:39.448395000 -0500
|
||||
+++ util/passwordbasedauthentication.h 2021-09-04 20:50:57.245603000 -0500
|
||||
@@ -18,6 +18,12 @@
|
||||
#ifndef _GVM_PASSWORDBASEDAUTHENTICATION_H
|
||||
#define _GVM_PASSWORDBASEDAUTHENTICATION_H
|
||||
|
||||
+#if defined(__FreeBSD__) && __FreeBSD__ < 12
|
||||
+#define HAS_CRYPT_R 0
|
||||
+#else
|
||||
+#define HAS_CRYPT_R 1
|
||||
+#endif
|
||||
+
|
||||
/* max amount of applied pepper */
|
||||
#define MAX_PEPPER_SIZE 4
|
||||
/* is used when count is 0 on init*/
|
|
@ -38,19 +38,19 @@ include/gvm/util/uuidutils.h
|
|||
include/gvm/util/xmlutils.h
|
||||
lib/libgvm_base.so
|
||||
lib/libgvm_base.so.21
|
||||
lib/libgvm_base.so.21.4.1
|
||||
lib/libgvm_base.so.21.4.2
|
||||
lib/libgvm_boreas.so
|
||||
lib/libgvm_boreas.so.21
|
||||
lib/libgvm_boreas.so.21.4.1
|
||||
lib/libgvm_boreas.so.21.4.2
|
||||
lib/libgvm_gmp.so
|
||||
lib/libgvm_gmp.so.21
|
||||
lib/libgvm_gmp.so.21.4.1
|
||||
lib/libgvm_gmp.so.21.4.2
|
||||
lib/libgvm_osp.so
|
||||
lib/libgvm_osp.so.21
|
||||
lib/libgvm_osp.so.21.4.1
|
||||
lib/libgvm_osp.so.21.4.2
|
||||
lib/libgvm_util.so
|
||||
lib/libgvm_util.so.21
|
||||
lib/libgvm_util.so.21.4.1
|
||||
lib/libgvm_util.so.21.4.2
|
||||
libdata/pkgconfig/libgvm_base.pc
|
||||
libdata/pkgconfig/libgvm_boreas.pc
|
||||
libdata/pkgconfig/libgvm_gmp.pc
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= gvm
|
||||
PORTVERSION= 21.4.1
|
||||
PORTVERSION= 21.4.2
|
||||
CATEGORIES= security
|
||||
|
||||
MAINTAINER= acm@FreeBSD.org
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= gvmd
|
||||
DISTVERSION= 21.4.2
|
||||
DISTVERSION= 21.4.3
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= security
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1625766249
|
||||
SHA256 (greenbone-gvmd-v21.4.2_GH0.tar.gz) = 14a8d62752a5a8171d72f2ad04b0256a1436a654e1965e76004c60b2870d988c
|
||||
SIZE (greenbone-gvmd-v21.4.2_GH0.tar.gz) = 1020668
|
||||
TIMESTAMP = 1630799976
|
||||
SHA256 (greenbone-gvmd-v21.4.3_GH0.tar.gz) = 3e69be5248695116d14820c09ed228c22f1422ee4b0f337ad22c2ee27dd74028
|
||||
SIZE (greenbone-gvmd-v21.4.3_GH0.tar.gz) = 1026412
|
||||
|
|
|
@ -3,7 +3,7 @@ bin/gvm-manage-certs
|
|||
@sample etc/gvm/pwpolicy.conf.sample
|
||||
lib/libgvm-pg-server.so
|
||||
lib/libgvm-pg-server.so.21
|
||||
lib/libgvm-pg-server.so.21.4.2
|
||||
lib/libgvm-pg-server.so.21.4.3
|
||||
sbin/greenbone-certdata-sync
|
||||
sbin/greenbone-feed-sync
|
||||
sbin/greenbone-scapdata-sync
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= openvas
|
||||
DISTVERSION= 21.4.1
|
||||
DISTVERSION= 21.4.2
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= security
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1624923901
|
||||
SHA256 (greenbone-openvas-scanner-v21.4.1_GH0.tar.gz) = 403e340d163313b613e4a263b58b76d0b88ba98afd3789ea880fe20072400644
|
||||
SIZE (greenbone-openvas-scanner-v21.4.1_GH0.tar.gz) = 450892
|
||||
TIMESTAMP = 1630800896
|
||||
SHA256 (greenbone-openvas-scanner-v21.4.2_GH0.tar.gz) = 50e98a1926a8a60a0cb095c2aaa934f313758a9f9f561de590cda85268b9c37a
|
||||
SIZE (greenbone-openvas-scanner-v21.4.2_GH0.tar.gz) = 452492
|
||||
|
|
|
@ -4,10 +4,10 @@ bin/openvas-nasl-lint
|
|||
@sample %%ETCDIR%%/openvas_log.conf.sample
|
||||
lib/libopenvas_misc.so
|
||||
lib/libopenvas_misc.so.21
|
||||
lib/libopenvas_misc.so.21.4.1
|
||||
lib/libopenvas_misc.so.21.4.2
|
||||
lib/libopenvas_nasl.so
|
||||
lib/libopenvas_nasl.so.21
|
||||
lib/libopenvas_nasl.so.21.4.1
|
||||
lib/libopenvas_nasl.so.21.4.2
|
||||
sbin/openvas
|
||||
share/man/man1/openvas-nasl-lint.1.gz
|
||||
share/man/man1/openvas-nasl.1.gz
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= ospd-openvas
|
||||
DISTVERSION= 21.4.1
|
||||
DISTVERSION= 21.4.2
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= security python
|
||||
#MASTER_SITES= CHEESESHOP
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1624924612
|
||||
SHA256 (greenbone-ospd-openvas-v21.4.1_GH0.tar.gz) = 6af9d4de0460aa463f7c59c1de41b2d63ba8a5553453b035bc9130b4b4da27f6
|
||||
SIZE (greenbone-ospd-openvas-v21.4.1_GH0.tar.gz) = 90601
|
||||
TIMESTAMP = 1630800865
|
||||
SHA256 (greenbone-ospd-openvas-v21.4.2_GH0.tar.gz) = 0f796a9883374e2bbe4d11dfb7a26394e27cb78de59366a9cfd66a84b4f53f5c
|
||||
SIZE (greenbone-ospd-openvas-v21.4.2_GH0.tar.gz) = 91040
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= ospd
|
||||
DISTVERSION= 21.4.1
|
||||
DISTVERSION= 21.4.3
|
||||
CATEGORIES= security net python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1624924217
|
||||
SHA256 (ospd-21.4.1.tar.gz) = ece48bf03ea39a945a94077a229b367297c1f6310e790337fb7d1d0005c893d4
|
||||
SIZE (ospd-21.4.1.tar.gz) = 100036
|
||||
TIMESTAMP = 1630802185
|
||||
SHA256 (ospd-21.4.3.tar.gz) = 54f81cb618662b4c0bb8e2d1552b5e770206777c4bd1bfa05004f2cb05999789
|
||||
SIZE (ospd-21.4.3.tar.gz) = 100437
|
||||
|
|
11
security/py-ospd/files/patch-setup.py
Normal file
11
security/py-ospd/files/patch-setup.py
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- setup.py.orig 2021-09-04 19:49:01.514046000 -0500
|
||||
+++ setup.py 2021-09-04 20:24:10.187804000 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
from setuptools import setup
|
||||
|
||||
packages = \
|
||||
-['ospd', 'ospd.command', 'tests', 'tests.command']
|
||||
+['ospd', 'ospd.command']
|
||||
|
||||
package_data = \
|
||||
{'': ['*']}
|
Loading…
Reference in a new issue