Hello community,
here is the log from the commit of package apport for openSUSE:Factory checked
in at 2012-12-07 14:06:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apport (Old)
and /work/SRC/openSUSE:Factory/.apport.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apport", Maintainer is "jmate...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/apport/apport.changes 2012-07-25
10:33:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apport.new/apport.changes 2012-12-07
14:06:24.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 7 11:12:04 UTC 2012 - jmate...@suse.com
+
+- use default CA certs instead of a custom one
+ (as per bnc#788860)
+
+-------------------------------------------------------------------
New:
----
apport-use-default-cert.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apport.spec ++++++
--- /var/tmp/diff_new_pack.QZPRTk/_old 2012-12-07 14:06:29.000000000 +0100
+++ /var/tmp/diff_new_pack.QZPRTk/_new 2012-12-07 14:06:29.000000000 +0100
@@ -54,7 +54,6 @@
Source0: %{name}-%{version}%{revno}.tar.bz2
Source1: rc.apport
Source2: crashdb.conf
-Source3: crashdb.pem
Source4: crashdb-gencert
Source99: apport-rpmlintrc
Patch0: apport-report_append.diff
@@ -62,6 +61,7 @@
Patch2: apport-fix_fail_msg.diff
Patch3: apport-cli_use_less.patch
Patch4: apport-anonymize-report.patch
+Patch5: apport-use-default-cert.patch
%description
Apport automatically collects data from crashed processes and compiles
@@ -74,6 +74,7 @@
Summary: Automatic crash handler
Group: System/Monitoring
Requires: apport = %{version}-%{release}
+Requires: ca-certificates
Requires: python-base >= 2.6
Requires: python-m2crypto
Provides: apport-crashdb
@@ -114,6 +115,7 @@
%patch2
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
python setup.py build
@@ -144,7 +146,6 @@
%__install -m755 debian/apport.cron.daily
%{buildroot}%{_sysconfdir}/cron.daily/apport
# openSUSE crashdb files
%__install -m644 %SOURCE2 %{buildroot}%{_sysconfdir}/%{name}/crashdb.conf
-%__install -m644 %SOURCE3 %{buildroot}%{_sysconfdir}/%{name}/crashdb.pem
# rm unneeded files
%__rm -f %{buildroot}%{_datadir}/%{name}/general-hooks/automatix.py
%__rm -rf %{buildroot}%{_datadir}/%{name}/testsuite/
@@ -197,7 +198,6 @@
%files crashdb-opensuse
%defattr(-,root,root)
%config %{_sysconfdir}/%{name}/crashdb.conf
-%config %{_sysconfdir}/%{name}/crashdb.pem
%doc doc/crashdb-conf.txt
%dir %python_sitelib/%{name}/crashdb_impl
%python_sitelib/%{name}/crashdb_impl/*
++++++ apport-use-default-cert.patch ++++++
Index: apport-0.114/apport/crashdb_impl/opensuse_crashdb.py
===================================================================
--- apport-0.114.orig/apport/crashdb_impl/opensuse_crashdb.py 2009-01-13
18:58:10.000000000 +0100
+++ apport-0.114/apport/crashdb_impl/opensuse_crashdb.py 2012-12-06
17:23:42.000000000 +0100
@@ -36,7 +36,9 @@
if not self.report_baseurl:
raise RuntimeError, "No report_baseurl defined"
-
HTTPSValidateCertificateConnection.set_cert_location(options.get('cert_location'))
+ cert_location = options.get('cert_location')
+ if cert_location:
+ HTTPSValidateCertificateConnection.set_cert_location(cert_location)
def upload(self, report, progress_callback = None):
'''Upload given problem report return a handle for it.
Index: apport-0.114/apport/crashdb_impl/HTTPSValidateCertificateConnection.py
===================================================================
--- apport-0.114.orig/apport/crashdb_impl/HTTPSValidateCertificateConnection.py
2009-01-13 18:58:10.000000000 +0100
+++ apport-0.114/apport/crashdb_impl/HTTPSValidateCertificateConnection.py
2012-12-07 12:06:38.000000000 +0100
@@ -24,7 +24,8 @@
"This class allows communication via SSL."
default_port = httplib.HTTPS_PORT
- cert_location = '/etc/ssl/certs/'
+ cert_location = None
+ default_CA_path = '/etc/ssl/certs'
def __init__(self, host, port=None, strict=None,
timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
@@ -36,7 +37,9 @@
# Setup SSL context to demand a certificate
ctx = SSL.Context('sslv23')
ctx.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 10)
-
ctx.load_verify_locations(HTTPSValidateCertificateConnection.cert_location)
+ cafile = HTTPSValidateCertificateConnection.cert_location
+ capath = HTTPSValidateCertificateConnection.default_CA_path
+ ctx.load_verify_locations(cafile = cafile, capath = capath)
# Create real socket
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
++++++ crashdb.conf ++++++
--- /var/tmp/diff_new_pack.QZPRTk/_old 2012-12-07 14:06:29.000000000 +0100
+++ /var/tmp/diff_new_pack.QZPRTk/_new 2012-12-07 14:06:29.000000000 +0100
@@ -9,7 +9,6 @@
'report_baseurl': 'https://crashdb.opensuse.org/log/new',
'comment_baseurl': 'http://crashdb.opensuse.org/log/show/%s',
'comment_rawurl': 'http://crashdb.opensuse.org/log/raw/%s',
- 'cert_location': '/etc/apport/crashdb.pem',
'distro': 'opensuse'
},
'debug': {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
