23210108 Upgrade openscap to 1.2.9 (forgot a patch)
authorJacob Varughese <jacob.varughese@oracle.com>
Mon, 27 Jun 2016 15:32:14 -0700
changeset 6295 5bc187901764
parent 6294 ff05e37b1eac
child 6297 8825fdb03f6c
23210108 Upgrade openscap to 1.2.9 (forgot a patch)
components/openscap/patches/common-debug.c.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/patches/common-debug.c.patch	Mon Jun 27 15:32:14 2016 -0700
@@ -0,0 +1,44 @@
+--- openscap-1.2.9/src/common/debug.c.~1~	2016-04-21 04:51:58.321492428 -0700
++++ openscap-1.2.9/src/common/debug.c	2016-06-08 13:17:18.681401563 -0700
[email protected]@ -30,7 +30,10 @@
+ # include <string.h>
+ # include <stdlib.h>
+ # include <sys/types.h>
++# include <sys/fcntl.h>
++# include <sys/stat.h>
+ # include <sys/file.h>
++# include <fcntl.h>
+ # include <unistd.h>
+ # include <time.h>
+ # include <errno.h>
[email protected]@ -169,7 +172,11 @@
+ 	default:
+ 		l = '0';
+ 	}
++#if !defined(__SVR4) && !defined (__sun)
+ 	fprintf(__debuglog_fp, "%c: %s: ", l, program_invocation_short_name);
++#else
++	fprintf(__debuglog_fp, "%c: %ld: ", l, (long) getpid());
++#endif
+ 	for (int i = 0; i < indent; i++) {
+ 		fprintf(__debuglog_fp, "  ");
+ 	}
[email protected]@ -186,6 +193,7 @@
+ #else
+ 	snprintf(thread_name, THREAD_NAME_LEN, "unknown");
+ #endif
++#if !defined(__SVR4) && !defined (__sun)
+ 	/* XXX: non-portable usage of pthread_t */
+ 	fprintf(__debuglog_fp, " [%s(%ld):%s(%llx):%s:%zu:%s]",
+ 		program_invocation_short_name, (long) getpid(), thread_name,
[email protected]@ -193,6 +201,10 @@
+ #else
+ 	fprintf(__debuglog_fp, " [%ld:%s:%zu:%s]", (long) getpid(),
+ 		f, line, fn);
++#endif
++#else
++	fprintf(__debuglog_fp, " [%ld:%s:%zu:%s]", (long) getpid(),
++		f, line, fn);
+ #endif
+ }
+