From d4e59709bada318aaa8ff9ae8c772240caa243302304c13cb9b9cb420c6b46b0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 29 Apr 2013 09:21:46 +0000 Subject: [PATCH 1/2] - updated to 0.9.7 - bugfixes OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=75 --- openscap-0.9.6.tar.gz | 3 --- openscap-0.9.6.tar.gz.sha1sum | 1 - openscap-0.9.7.tar.gz | 3 +++ openscap-0.9.7.tar.gz.sha1sum | 1 + openscap.changes | 6 ++++++ openscap.spec | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 openscap-0.9.6.tar.gz delete mode 100644 openscap-0.9.6.tar.gz.sha1sum create mode 100644 openscap-0.9.7.tar.gz create mode 100644 openscap-0.9.7.tar.gz.sha1sum diff --git a/openscap-0.9.6.tar.gz b/openscap-0.9.6.tar.gz deleted file mode 100644 index c2cd2f2..0000000 --- a/openscap-0.9.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4da3d416d3861ff919ea19f77adf6e393cd103bb164973a3946d3049e49e110e -size 12425425 diff --git a/openscap-0.9.6.tar.gz.sha1sum b/openscap-0.9.6.tar.gz.sha1sum deleted file mode 100644 index d727478..0000000 --- a/openscap-0.9.6.tar.gz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -62d90fc9b02942b49121c54148f36c8dbe600141 openscap-0.9.6.tar.gz diff --git a/openscap-0.9.7.tar.gz b/openscap-0.9.7.tar.gz new file mode 100644 index 0000000..98e5f5e --- /dev/null +++ b/openscap-0.9.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d9ae804026d69e60d44e27cf489e65dd1c2865895cde2cb174ff90fd7868a6a +size 12122561 diff --git a/openscap-0.9.7.tar.gz.sha1sum b/openscap-0.9.7.tar.gz.sha1sum new file mode 100644 index 0000000..38b1ad2 --- /dev/null +++ b/openscap-0.9.7.tar.gz.sha1sum @@ -0,0 +1 @@ +259a7afe278e35e9d848005be542e088f8aee030 openscap-0.9.7.tar.gz diff --git a/openscap.changes b/openscap.changes index 9b0d76e..5019132 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 29 09:21:35 UTC 2013 - meissner@suse.com + +- updated to 0.9.7 + - bugfixes + ------------------------------------------------------------------- Thu Apr 25 11:28:31 UTC 2013 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 350d335..3921aea 100644 --- a/openscap.spec +++ b/openscap.spec @@ -20,7 +20,7 @@ %define with_bindings 0 Name: openscap -Version: 0.9.6 +Version: 0.9.7 Release: 1.0 Source: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz Source5: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz.sha1sum From 973b9bbcd4eb04580e186afb60f305070677955f425efe698774fc340fcd90bc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 6 May 2013 11:09:31 +0000 Subject: [PATCH 2/2] Accepting request 174495 from systemsmanagement:spacewalk - fix build on SLE11 - possible 64Bit issue - fix-missing-include.dif OBS-URL: https://build.opensuse.org/request/show/174495 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=76 --- fix-missing-include.dif | 12 ++++++++++++ openscap.changes | 6 ++++++ openscap.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 fix-missing-include.dif diff --git a/fix-missing-include.dif b/fix-missing-include.dif new file mode 100644 index 0000000..328a3be --- /dev/null +++ b/fix-missing-include.dif @@ -0,0 +1,12 @@ +Index: openscap-0.9.7/src/OVAL/probes/unix/linux/rpminfo.c +=================================================================== +--- openscap-0.9.7.orig/src/OVAL/probes/unix/linux/rpminfo.c ++++ openscap-0.9.7/src/OVAL/probes/unix/linux/rpminfo.c +@@ -66,6 +66,7 @@ + #include + #include + #include ++#include + + #ifndef HAVE_HEADERFORMAT + # define HAVE_LIBRPM44 1 /* hack */ diff --git a/openscap.changes b/openscap.changes index 5019132..f5da3d7 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 4 15:37:25 UTC 2013 - mc@suse.com + +- fix build on SLE11 - possible 64Bit issue + - fix-missing-include.dif + ------------------------------------------------------------------- Mon Apr 29 09:21:35 UTC 2013 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 3921aea..7a59876 100644 --- a/openscap.spec +++ b/openscap.spec @@ -33,6 +33,7 @@ Source3: scap-yast2sec-xccdf.xml Source4: scap-yast2sec-oval.xml # # +Patch0: fix-missing-include.dif Url: http://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel @@ -146,6 +147,7 @@ commonly used and require additional dependencies. %prep %setup -q +%patch0 -p1 %build