New upstream version 5.6.1

3 files changed, 12 insertions, 9 deletions

diff --git a/src/sw-collector/Makefile.in b/src/sw-collector/Makefile.in
index 73016ad72..28169508a 100644
--- a/src/sw-collector/Makefile.in
+++ b/src/sw-collector/Makefile.in
@@ -252,9 +252,11 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FUZZING_LDFLAGS = @FUZZING_LDFLAGS@
 GEM = @GEM@
 GENHTML = @GENHTML@
 GPERF = @GPERF@
+GPERF_LEN_TYPE = @GPERF_LEN_TYPE@
 GPRBUILD = @GPRBUILD@
 GREP = @GREP@
 INSTALL = @INSTALL@
diff --git a/src/sw-collector/sw-collector.8.in b/src/sw-collector/sw-collector.8.in
index 8560ba095..b9041c77b 100644
--- a/src/sw-collector/sw-collector.8.in
+++ b/src/sw-collector/sw-collector.8.in
@@ -1,4 +1,4 @@
-.TH SW-COLLECTOR 1 "2017-07-15" "@PACKAGE_VERSION@" "strongSwan"
+.TH SW-COLLECTOR 8 "2017-08-25" "@PACKAGE_VERSION@" "strongSwan"
 .
 .SH "NAME"
 .
@@ -56,34 +56,34 @@ Prints usage information and a short summary of the available commands.
 .BI "\-v, \-\-debug " level
 Set debug level, default: 2.
 .TP
-.B "\-q, \-\-quiet
+.B "\-q, \-\-quiet"
 Disable debug output to stderr.
 .TP
-.B "\-i, \-\-installed
+.B "\-i, \-\-installed"
 Apply command to installed software packages, only.
 .TP
-.B "\-r, \-\-removed
+.B "\-r, \-\-removed"
 Apply command to removed software packages, only.
 .TP
-.B "\-f, \-\-full
+.B "\-f, \-\-full"
 Generate ISO 19770-2:2015 SWID tags with full file information (possible for
 installed software packages, only).
 .TP
-.B "\-l, \-\-list
+.B "\-l, \-\-list"
 Lists all software packages stored in the collector database showing their
 installation status.
 .TP
-.B "\-u, \-\-unregistered
+.B "\-u, \-\-unregistered"
 Lists all software packages residing in the local collector database but for
 which no SWID tags exist yet in a central collector database reachable via a
 REST interface. 
 .TP
-.B "\-g, \-\-generate
+.B "\-g, \-\-generate"
 Generates ISO 19770-2:2015 SWID tags for all software packages residing in the
 local collector database but for which no SWID tags exist in a central collector
 database reachable via a REST interface.
 .TP
-.B "\-m, \-\-migrate
+.B "\-m, \-\-migrate"
 Can be used to migrate collector database versions. Currently all architecture
 suffixes are removed from dpkg package names.
 .
diff --git a/src/sw-collector/sw-collector.c b/src/sw-collector/sw-collector.c
index e673dd657..a42f1068a 100644
--- a/src/sw-collector/sw-collector.c
+++ b/src/sw-collector/sw-collector.c
@@ -249,6 +249,7 @@ static int extract_history(sw_collector_db_t *db)
 	history = sw_collector_history_create(db, 1);
 	if (!history)
 	{
+		chunk_unmap(h);
 		return EXIT_FAILURE;
 	}