Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at Wed Aug 17 09:44:36 CEST 2011.
-------- --- osc/osc.changes 2011-07-07 06:52:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc/osc.changes 2011-08-16 15:09:59.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 16 13:08:11 UTC 2011 - [email protected] + +- Add osc-pubkey-parsing.patch, fix PGP pubkey parsing: base64 + checksum shouldn't be in the key data, upstream commit + f707e9a22e185098bbea923b7ff8971f19a87991 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- osc-pubkey-parsing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.qzobuM/_old 2011-08-17 09:42:46.000000000 +0200 +++ /var/tmp/diff_new_pack.qzobuM/_new 2011-08-17 09:42:46.000000000 +0200 @@ -19,12 +19,13 @@ Name: osc Version: 0.132.5 -Release: 1 +Release: 2 License: GPLv2+ Summary: openSUSE Build Service Commander Url: http://www.gitorious.org/opensuse/osc Group: Development/Tools/Other Source: %{name}-%{version}.tar.gz +Patch1: osc-pubkey-parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?mandriva_version} < 02010 BuildRequires: python-urlgrabber @@ -62,11 +63,13 @@ Recommends: obs-service-source_validator %endif %endif -%if 0%{?rhel_version} || 0%{?centos_version} -%if 0%{?rhel_version} < 600 +%if 0%{?rhel_version} && 0%{?rhel_version} < 600 BuildRequires: python-elementtree Requires: python-elementtree %endif +%if 0%{?centos_version} && 0%{?centos_version} < 600 +BuildRequires: python-elementtree +Requires: python-elementtree %endif %if 0%{?suse_version}%{?mandriva_version} BuildRequires: python-m2crypto @@ -75,13 +78,6 @@ BuildRequires: m2crypto Requires: m2crypto > 0.19 %endif -%if 0%{?mandriva_version} -BuildRequires: python-rpm -Requires: python-rpm -%else -BuildRequires: rpm-python -Requires: rpm-python -%endif %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description @@ -93,6 +89,7 @@ %prep %setup -q +%patch1 -p1 %build CFLAGS="%{optflags}" python setup.py build ++++++ osc-pubkey-parsing.patch ++++++ commit f707e9a22e185098bbea923b7ff8971f19a87991 Author: Ludwig Nussel <[email protected]> Date: Fri Aug 5 13:52:42 2011 +0200 fix pgp pubkey parsing the base64 checksum must not be included in the key data. Newer rpm don't like that. diff --git a/osc/checker.py b/osc/checker.py index b4149d2..88eb7cc 100644 --- a/osc/checker.py +++ b/osc/checker.py @@ -61,16 +61,24 @@ class Checker: key = '' line = fd.readline() + crc = None while line: if line[0:12] == "-----END PGP": break line = line.rstrip() - key += line - line = fd.readline() + if (line[0] == '='): + crc = line[1:] + line = fd.readline() + break + else: + key += line + line = fd.readline() fd.close() if not line or line[0:12] != "-----END PGP": raise KeyError(file, "not a pgp public key") + # TODO: compute and compare CRC, see RFC 2440 + bkey = base64.b64decode(key) r = self.ts.pgpImportPubkey(bkey) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
