From 99499cd1d3f8e4d691f1b0d672ab22488e58b4d81a9770d990be1c5972f9ffb6 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 14 Nov 2017 14:38:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/security/openscap?expand=0&rev=190

---
 openscap-productid-cvrf.patch | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/openscap-productid-cvrf.patch b/openscap-productid-cvrf.patch
index 5bf41f3..73a07e9 100644
--- a/openscap-productid-cvrf.patch
+++ b/openscap-productid-cvrf.patch
@@ -1,15 +1,18 @@
-diff -ru openscap-1.2.16/utils/oscap-cvrf.c openscap-1.2.16.xx/utils/oscap-cvrf.c
---- openscap-1.2.16/utils/oscap-cvrf.c	2017-11-14 12:48:32.000000000 +0100
-+++ openscap-1.2.16.xx/utils/oscap-cvrf.c	2017-11-14 14:59:57.353065728 +0100
-@@ -60,6 +60,7 @@
+Index: openscap-1.2.16/utils/oscap-cvrf.c
+===================================================================
+--- openscap-1.2.16.orig/utils/oscap-cvrf.c
++++ openscap-1.2.16/utils/oscap-cvrf.c
+@@ -59,7 +59,8 @@ static struct oscap_module CVRF_EVALUATE
+ 	.func = app_cvrf_evaluate,
  	.help = "Options:\n"
  		"   --index\r\t\t\t\t - Use index file to evaluate a directory of CVRF files.\n"
- 		"   --results\r\t\t\t\t - Filename to which evaluation results will be saved.\n",
+-		"   --results\r\t\t\t\t - Filename to which evaluation results will be saved.\n",
++		"   --results\r\t\t\t\t - Filename to which evaluation results will be saved.\n"
 +		"   --productid\r\t\t\t\t - Product ID to use (currently not yet auto-detected).\n",
  };
  
  static struct oscap_module CVRF_EXPORT_MODULE = {
-@@ -98,10 +99,18 @@
+@@ -98,10 +99,18 @@ static int app_cvrf_evaluate(const struc
  	// Temporary hardcoded CPE until CPE name can be found without input by CVRF functions
  	// themselves
  	const char *os_name = "Red Hat Enterprise Linux Desktop Supplementary (v. 6)";
@@ -31,7 +34,7 @@ diff -ru openscap-1.2.16/utils/oscap-cvrf.c openscap-1.2.16.xx/utils/oscap-cvrf.
  
  	if (oscap_source_save_as(export_source, action->cvrf_action->f_results) == -1) {
  		result = OSCAP_ERROR;
-@@ -180,6 +189,7 @@
+@@ -180,6 +189,7 @@ enum cvrf_opt {
  	CVRF_OPT_INDEX,
  	CVRF_OPT_RESULT_FILE,
  	CVRF_OPT_OUTPUT_FILE,
@@ -39,7 +42,7 @@ diff -ru openscap-1.2.16/utils/oscap-cvrf.c openscap-1.2.16.xx/utils/oscap-cvrf.
  };
  
  bool getopt_cvrf(int argc, char **argv, struct oscap_action *action) {
-@@ -191,6 +201,7 @@
+@@ -191,6 +201,7 @@ bool getopt_cvrf(int argc, char **argv,
  		{"index", 0, NULL, CVRF_OPT_INDEX},
  		{"results", 1, NULL, CVRF_OPT_RESULT_FILE},
  		{"output", 1, NULL, CVRF_OPT_OUTPUT_FILE},
@@ -47,7 +50,7 @@ diff -ru openscap-1.2.16/utils/oscap-cvrf.c openscap-1.2.16.xx/utils/oscap-cvrf.
  		{0, 0, 0, 0}
  	};
  
-@@ -206,6 +217,9 @@
+@@ -206,6 +217,9 @@ bool getopt_cvrf(int argc, char **argv,
  			case CVRF_OPT_OUTPUT_FILE:
  				cvrf_action->f_output = optarg;
  				break;
@@ -57,10 +60,11 @@ diff -ru openscap-1.2.16/utils/oscap-cvrf.c openscap-1.2.16.xx/utils/oscap-cvrf.
  			default:
  				return oscap_module_usage(action->module, stderr, NULL);
  		}
-diff -ru openscap-1.2.16/utils/oscap-tool.h openscap-1.2.16.xx/utils/oscap-tool.h
---- openscap-1.2.16/utils/oscap-tool.h	2017-11-14 12:48:32.000000000 +0100
-+++ openscap-1.2.16.xx/utils/oscap-tool.h	2017-11-14 14:58:35.981147877 +0100
-@@ -104,6 +104,7 @@
+Index: openscap-1.2.16/utils/oscap-tool.h
+===================================================================
+--- openscap-1.2.16.orig/utils/oscap-tool.h
++++ openscap-1.2.16/utils/oscap-tool.h
+@@ -104,6 +104,7 @@ struct cvrf_action {
  	char *f_cvrf;
  	char *f_results;
  	char *f_output;