From 0746d79ed1428e0010570a50d705891e3c75cacd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 05:45:26 +0000 Subject: import openscap-1.2.10-2.el7 --- diff --git a/.gitignore b/.gitignore index d94e044..27df50c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/openscap-1.2.9.tar.gz +SOURCES/openscap-1.2.10.tar.gz diff --git a/.openscap.metadata b/.openscap.metadata index 71fef07..0bf8c95 100644 --- a/.openscap.metadata +++ b/.openscap.metadata @@ -1 +1 @@ -d9d4aa979f3545e2584eb8a086cb1f58bfd8e843 SOURCES/openscap-1.2.9.tar.gz +d75375b87afa7032de659ee36258caf2bc6a2b7f SOURCES/openscap-1.2.10.tar.gz diff --git a/SOURCES/openscap-1.2.10-oscap-docker-urllib.patch b/SOURCES/openscap-1.2.10-oscap-docker-urllib.patch new file mode 100644 index 0000000..7c6a662 --- /dev/null +++ b/SOURCES/openscap-1.2.10-oscap-docker-urllib.patch @@ -0,0 +1,34 @@ +From fea6c0359ff145c723f3d8df3f2e1496bc797f41 Mon Sep 17 00:00:00 2001 +From: Martin Preisler +Date: Fri, 29 Jul 2016 14:42:36 -0400 +Subject: [PATCH] Use build_opener() in get_cve_input.py, it's simpler and + honors proxy settings + +See https://bugzilla.redhat.com/show_bug.cgi?id=1351952 +--- + utils/oscap_docker_python/get_cve_input.py | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/utils/oscap_docker_python/get_cve_input.py b/utils/oscap_docker_python/get_cve_input.py +index 8d72bd0..1b55f03 100644 +--- a/utils/oscap_docker_python/get_cve_input.py ++++ b/utils/oscap_docker_python/get_cve_input.py +@@ -113,13 +113,8 @@ class getInputCVE(object): + if self.DEBUG: + stderr.write("No file in cache, fetching {0}\n".format(dest_file)) + return False +- opener = urllib.OpenerDirector() +- opener.add_handler(urllib.HTTPHandler()) +- opener.add_handler(urllib.HTTPSHandler()) +- opener.add_handler(urllib.HTTPDefaultErrorHandler()) +- # Extra for handling redirects +- opener.add_handler(urllib.HTTPErrorProcessor()) +- opener.add_handler(urllib.HTTPRedirectHandler()) ++ ++ opener = urllib.build_opener() + # Add the header + opener.addheaders = self.hdr2 + # Grab the header +-- +2.7.4 + diff --git a/SOURCES/openscap-1.2.9-oscap-docker-argparse.patch b/SOURCES/openscap-1.2.9-oscap-docker-argparse.patch deleted file mode 100644 index 701300f..0000000 --- a/SOURCES/openscap-1.2.9-oscap-docker-argparse.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fa334865b1eb24c6eabfe4c80a339c84ffc2d250 Mon Sep 17 00:00:00 2001 -From: Martin Preisler -Date: Tue, 31 May 2016 13:05:56 -0400 -Subject: [PATCH] oscap-docker fixed to be source compatible with py2 and py3 - -set_defaults is problematic on subparsers in argparse, it changed -behavior in python2 and python3 -upstream discussion: http://bugs.python.org/issue9351#msg244786 ---- - utils/oscap-docker.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/utils/oscap-docker.in b/utils/oscap-docker.in -index 4ed62fe..f4b0f80 100644 ---- a/utils/oscap-docker.in -+++ b/utils/oscap-docker.in -@@ -65,7 +65,6 @@ if __name__ == '__main__': - parser = argparse.ArgumentParser(description='oscap docker', - epilog='See `man oscap` to learn \ - more about OSCAP-ARGUMENTS') -- parser.set_defaults(func=parser.print_help) - subparser = parser.add_subparsers(help="commands") - - # Scan CVEs in image -@@ -98,6 +97,10 @@ if __name__ == '__main__': - - args, unknown = parser.parse_known_args() - -+ if "func" not in args: -+ parser.print_help() -+ sys.exit(2) -+ - try: - ping_docker() - diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec index ed4a715..cd9fd7a 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -5,14 +5,14 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \ Name: openscap -Version: 1.2.9 -Release: 5%{?dist} +Version: 1.2.10 +Release: 2%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ URL: http://www.open-scap.org/ Source0: http://fedorahosted.org/releases/o/p/openscap/%{name}-%{version}.tar.gz -Patch1: openscap-1.2.9-oscap-docker-argparse.patch +Patch1: openscap-1.2.10-oscap-docker-urllib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig libxml2-devel libxslt-devel perl-XML-Parser BuildRequires: rpm-devel @@ -256,12 +256,22 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libopenscap_sce.so.* %changelog -* Tue May 31 2016 Martin Preisler - 1.2.9-5 -- changed spec Release to avoid conflicts +* Mon Sep 05 2016 Jan Černý - 1.2.10-2 +- fix oscap-docker to follow the proxy settings (#1351952) -* Tue May 31 2016 Martin Preisler - 1.2.9-3 +* Thu Jun 30 2016 Jan Černý - 1.2.10-1 +- upgrade to the latest upstream release + +* Tue May 31 2016 Martin Preisler - 1.2.9-7 +- fixed dates in the changlog +- changed Release to 7 to avoid conflicts + +* Tue May 31 2016 Martin Preisler - 1.2.9-4 - worked around a change in behavior in argparse between different versions of python2 (#1278147) +* Thu May 05 2016 Martin Preisler - 1.2.9-3 +- fixed loading SDS session multiple times (#1250072) + * Tue Apr 26 2016 Jan Černý - 1.2.9-2 - fix specfile