Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for parse_iso_time_tz error with musl library #1644

Merged
merged 3 commits into from
Jul 29, 2021
Merged

Fix for parse_iso_time_tz error with musl library #1644

merged 3 commits into from
Jul 29, 2021

Conversation

fcolista
Copy link
Contributor

This patch fixes the error when parsing the time in a format like:
2019-01-18T17:29:00+00:00 with musl.

This behavior is described in the issue #1609

What:

Fixes for #1609

@fcolista fcolista requested a review from a team as a code owner July 28, 2021 09:24
@timopollmeier timopollmeier added backport-to-oldstable This pull request will be backported to the oldstable branch backport-to-21.04 labels Jul 28, 2021
@timopollmeier
Copy link
Member

Hello, @fcolista! Thank you for your patch. It looks good to me, but could you also add a changelog entry in the 20.08 section, please?

@fcolista
Copy link
Contributor Author

fcolista commented Jul 28, 2021

hi @timopollmeier thanks for your feedback!
Just to be sure, is this what you mean?

x86_64-edge:~/gitrepos/github/gvmd$ git diff
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3557daba..3ee1d4722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Improve VT version handling for CVE & OVAL results [#1496](https://github.com/greenbone/gvmd/pull/1496)
 - Fix migration to DB version 242 from gvmd 20.08 [#1498](https://github.com/greenbone/gvmd/pull/1498)
 - Update subject alternative name in certificate generation [#1503](https://github.com/greenbone/gvmd/pull/1503)
+- Fix for parse_iso_time_tz error with musl library [#1644](https://github.com/greenbone/gvmd/pull/1644)
 
 ### Removed
 - Remove Network Source Interface from gvmd [#1511](https://github.com/greenbone/gvmd/pull/1511)

@Dexus
Copy link
Contributor

Dexus commented Jul 28, 2021

hi @timopollmeier thanks for your feedback!
Just to be sure, is this what you mean?

x86_64-edge:~/gitrepos/github/gvmd$ git diff
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3557daba..3ee1d4722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Improve VT version handling for CVE & OVAL results [#1496](https://github.com/greenbone/gvmd/pull/1496)
 - Fix migration to DB version 242 from gvmd 20.08 [#1498](https://github.com/greenbone/gvmd/pull/1498)
 - Update subject alternative name in certificate generation [#1503](https://github.com/greenbone/gvmd/pull/1503)
+- Fix for parse_iso_time_tz error with musl library [#1644](https://github.com/greenbone/gvmd/pull/1644)
 
 ### Removed
 - Remove Network Source Interface from gvmd [#1511](https://github.com/greenbone/gvmd/pull/1511)

Hi @fcolista he means you should add it to https://github.com/greenbone/gvmd/blob/master/CHANGELOG.md#2083-unreleased as it will backported to v20.8.3 and v21.4.3

fcolista and others added 2 commits July 28, 2021 21:50
This patch fixes the error when parsing the time in a format like:
2019-01-18T17:29:00+00:00  with musl.

This behavior is described in the issue #1609
CHANGELOG.md Outdated Show resolved Hide resolved
@bjoernricks bjoernricks enabled auto-merge July 29, 2021 06:02
@bjoernricks bjoernricks merged commit 7e7ca55 into greenbone:master Jul 29, 2021
bjoernricks added a commit that referenced this pull request Jul 29, 2021
Fix for parse_iso_time_tz error with musl library (backport #1644)
timopollmeier added a commit that referenced this pull request Jul 29, 2021
Fix for parse_iso_time_tz error with musl library (backport #1644)
@fcolista fcolista deleted the musl-fix-strptime branch July 29, 2021 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-to-oldstable This pull request will be backported to the oldstable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants