mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-24 11:45:18 +03:00
community/gvmd: upgrade to 21.4.3
This commit is contained in:
Francesco Colista
parent
9229b9bdd2
commit
1a2f75a76d
2 changed files with 3 additions and 118 deletions
|
|
@ -2,8 +2,8 @@
|
|||
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
|
||||
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
|
||||
pkgname=gvmd
|
||||
pkgver=21.4.2
|
||||
pkgrel=1
|
||||
pkgver=21.4.3
|
||||
pkgrel=0
|
||||
pkgdesc="Greenbone Vulnerability Manager"
|
||||
url="https://www.openvas.org/"
|
||||
arch="all"
|
||||
|
|
@ -26,7 +26,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/gvmd/archive/v$pkg
|
|||
greenbone-nvt-sync.conf
|
||||
|
||||
added-missing-includes.patch
|
||||
strptime.patch
|
||||
malloc-trim.patch"
|
||||
|
||||
case "$CARCH" in
|
||||
|
|
@ -89,13 +88,12 @@ EOF
|
|||
|
||||
|
||||
sha512sums="
|
||||
fd752d12187e74f9b43e2fc5fef9fdee0441710a881cc718296cc001b02ef63012ee0492f4a56af4a339d487b0e70060932d37a1ab89abf5fd88f2f3931edcb9 gvmd-21.4.2.tar.gz
|
||||
d76ba46d2def48b0dcdd431b1f91b4e43a9222042b1b2a34bc2e3217059aa72fbde6b3df156525220ae582bdbef3b3853dd4db93ab73c7a2e145fe3318fcf072 gvmd-21.4.3.tar.gz
|
||||
c90247bc8d0797f7d3e3ae0f87fd2bbf58ef67eb7fb60318928b174e366380d1f7cfc23fa9d4c552035d1d1b31577bc097ae9a1e51cfba2c36ed57bba3a52328 gvmd.initd
|
||||
e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6 gvmd.logrotate
|
||||
4fda7d5051f9d1ca069becbcc0e82b20d76fd9f7c7abf4a4f05ab55c17fba54dbe269607ee6360b034e8a1674a38680775e2ffc4120b12c7b679564ba4c87ed4 greenbone-certdata-sync.conf
|
||||
1481eeb4182109295344768465a2db3895f51d39d6d2dee9a5db20db2ac53aec4df50eb2d5823c5a8d1f0897e284ad42c17ab59e3bef77614db6195dfbc5ae05 greenbone-scapdata-sync.conf
|
||||
0734c6dc3ba065daeaeeb80aa23b52b141ff1056bffaa62a7eb6be5acf559a287354df418a40f804269a76644dbdc0f8c0229b380954628d6842168860bd344a greenbone-nvt-sync.conf
|
||||
b5411a618e62e5a64fae3441d7f8a4db1fb7675200d8ce5f8208b09c6459b33920f3a65519c8d17781929917eeb4966e60701e64612c6cfcb77101130f779992 added-missing-includes.patch
|
||||
b31c3a8a1555f8a6e3911356a59e8279430008a485ec1c5ec95f271f0e72b3750d302ded2dd549eed08293cc0610bb6d9fbc7293f2caa3516d18b27cf500d383 strptime.patch
|
||||
73e1d455573dc4f11e86904740ea5ea7163d76fd422b81978f2a2a7127a8b50f6a1ad5f1f259fb86469d4d3ce5754db549158477696bb92b2b783d19b7bdbc63 malloc-trim.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,113 +0,0 @@
|
|||
diff --git a/src/manage.c b/src/manage.c
|
||||
index f0e79b435..e473d4807 100644
|
||||
--- a/src/manage.c
|
||||
+++ b/src/manage.c
|
||||
@@ -5782,7 +5782,11 @@ manage_scap_update_time ()
|
||||
if (strptime (content, "%Y%m%d%H%M", &update_time))
|
||||
{
|
||||
static char time_string[100];
|
||||
- strftime (time_string, 99, "%FT%T.000%z", &update_time);
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ strftime (time_string, 99, "%Y-%m-%dT%T.000", &update_time);
|
||||
+ #else
|
||||
+ strftime (time_string, 99, "%FT%T.000%z", &update_time);
|
||||
+ #endif
|
||||
return time_string;
|
||||
}
|
||||
return "";
|
||||
diff --git a/src/manage_sql.c b/src/manage_sql.c
|
||||
index 1d107a70f..fbf4ceacf 100644
|
||||
--- a/src/manage_sql.c
|
||||
+++ b/src/manage_sql.c
|
||||
@@ -26273,7 +26273,11 @@ host_summary_append (GString *host_summary_buffer, const char *host,
|
||||
struct tm start_tm;
|
||||
|
||||
memset (&start_tm, 0, sizeof (struct tm));
|
||||
- if (strptime (start_iso, "%FT%H:%M:%S", &start_tm) == NULL)
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ if (strptime (start_iso, "%Y-%m-%dT%H:%M:%S", &start_tm) == NULL)
|
||||
+ #else
|
||||
+ if (strptime (start_iso, "%FT%H:%M:%S", &start_tm) == NULL)
|
||||
+ #endif
|
||||
{
|
||||
g_warning ("%s: Failed to parse start", __func__);
|
||||
return;
|
||||
@@ -26293,7 +26297,11 @@ host_summary_append (GString *host_summary_buffer, const char *host,
|
||||
struct tm end_tm;
|
||||
|
||||
memset (&end_tm, 0, sizeof (struct tm));
|
||||
- if (strptime (end_iso, "%FT%H:%M:%S", &end_tm) == NULL)
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ if (strptime (end_iso, "%Y-%m-%dT%H:%M:%S", &end_tm) == NULL)
|
||||
+ #else
|
||||
+ if (strptime (end_iso, "%FT%H:%M:%S", &end_tm) == NULL)
|
||||
+ #endif
|
||||
{
|
||||
g_warning ("%s: Failed to parse end", __func__);
|
||||
return;
|
||||
diff --git a/src/utils.c b/src/utils.c
|
||||
index d44f5bd6f..c2403a0d6 100644
|
||||
--- a/src/utils.c
|
||||
+++ b/src/utils.c
|
||||
@@ -366,20 +366,31 @@ parse_iso_time_tz (const char *text_time, const char *fallback_tz)
|
||||
secs_str && strcmp (secs_str, "")
|
||||
? secs_str : ":00",
|
||||
offset_str ? offset_str : "");
|
||||
-
|
||||
- if (strptime_with_reset ((char*) cleaned_text_time, "%FT%T%z", &tm))
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ if (strptime_with_reset ((char*) cleaned_text_time, "%Y-%m-%dT%T", &tm))
|
||||
+ #else
|
||||
+ if (strptime_with_reset ((char*) cleaned_text_time, "%FT%T%z", &tm))
|
||||
+ #endif
|
||||
{
|
||||
/* ISO time with numeric offset (e.g. 2020-06-01T01:02:03+04:30) */
|
||||
tm.tm_sec = tm.tm_sec - tm.tm_gmtoff;
|
||||
tm.tm_gmtoff = 0;
|
||||
epoch_time = mktime_with_tz (&tm, "UTC");
|
||||
}
|
||||
- else if (strptime_with_reset ((char*) cleaned_text_time, "%FT%TZ", &tm))
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ else if (strptime_with_reset ((char*) cleaned_text_time, "%Y-%m-%dT%T", &tm))
|
||||
+ #else
|
||||
+ else if (strptime_with_reset ((char*) cleaned_text_time, "%FT%TZ", &tm))
|
||||
+ #endif
|
||||
{
|
||||
/* ISO time with "Z" for UTC timezone (e.g. 2020-06-01T01:02:03Z) */
|
||||
epoch_time = mktime_with_tz (&tm, "UTC");
|
||||
}
|
||||
- else if (strptime_with_reset ((char*) cleaned_text_time, "%FT%T", &tm))
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ else if (strptime_with_reset ((char*) cleaned_text_time, "%Y-%m-%dT%T", &tm))
|
||||
+ #else
|
||||
+ else if (strptime_with_reset ((char*) cleaned_text_time, "%FT%T", &tm))
|
||||
+ #endif
|
||||
{
|
||||
/* ISO time without timezone suffix (e.g. 2020-06-01T01:02:03) */
|
||||
epoch_time = mktime_with_tz (&tm, fallback_tz ? fallback_tz : "UTC");
|
||||
@@ -429,7 +440,11 @@ iso_time_internal (time_t *epoch_time, const char **abbrev)
|
||||
if (timezone == 0)
|
||||
#endif
|
||||
{
|
||||
- if (strftime (time_string, 98, "%FT%TZ", &tm) == 0)
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ if (strftime (time_string, 98, "%Y-%m-%dT%T", &tm) == 0)
|
||||
+ #else
|
||||
+ if (strftime (time_string, 98, "%FT%TZ", &tm) == 0)
|
||||
+ #endif
|
||||
return NULL;
|
||||
|
||||
if (abbrev)
|
||||
@@ -439,7 +454,11 @@ iso_time_internal (time_t *epoch_time, const char **abbrev)
|
||||
{
|
||||
int len;
|
||||
|
||||
- if (strftime (time_string, 98, "%FT%T%z", &tm) == 0)
|
||||
+ #if !defined(__GLIBC__)
|
||||
+ if (strftime (time_string, 98, "%Y-%m-%dT%T", &tm) == 0)
|
||||
+ #else
|
||||
+ if (strftime (time_string, 98, "%FT%T%z", &tm) == 0)
|
||||
+ #endif
|
||||
return NULL;
|
||||
|
||||
/* Insert the ISO 8601 colon by hand. */
|
||||
Loading…
Add table
Add a link
Reference in a new issue