SHA256
1
0
forked from pool/gpg2
OBS User unknown 2009-01-22 12:04:18 +00:00 committed by Git OBS Bridge
parent b74eae0c5f
commit 23ddf0e745
3 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,15 @@
# Patch from upstream - fixes broken make check on ppc, s390, s390x
Index: common/convert.c
===================================================================
--- common/convert.c (revision 4915)
+++ common/convert.c (working copy)
@@ -194,7 +194,9 @@
;
if (*s && (!isascii (*s) || !isspace (*s)) )
return NULL; /* Not followed by Nul or white space. */
- need_nul = !(s[-2] == '0' && s[-1] == '0');
+ /* We need to append a nul character. However we don't want that if
+ the hexstring already ends with "00". */
+ need_nul = ((s == hexstring) || !(s[-2] == '0' && s[-1] == '0'));
if (need_nul)
count++;

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 19 16:16:11 CET 2009 - puzel@suse.cz
- add gnupg-2.0.10-fix-convert.patch
- fix broken 'make check' on ppc, s390 and s390x
-------------------------------------------------------------------
Tue Jan 13 10:38:38 CET 2009 - puzel@suse.cz

View File

@ -20,7 +20,7 @@
Name: gpg2
Version: 2.0.10
Release: 1
Release: 2
BuildRequires: expect fdupes pth
BuildRequires: libgpg-error-devel >= 1.4
BuildRequires: libgcrypt-devel >= 1.4.0
@ -49,6 +49,7 @@ Patch7: gnupg-2.0.4-install_tools.diff
Patch9: gnupg-2.0.4-default-tty.diff
Patch10: gnupg-2.0.9-RSA_ES.patch
Patch11: gnupg-2.0.9-langinfo.patch
Patch12: gnupg-2.0.10-fix-convert.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -71,6 +72,7 @@ Authors:
%patch9
%patch10 -p1
%patch11
%patch12
%build
# Required for patch7:
@ -152,6 +154,9 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress
%config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
%changelog
* Mon Jan 19 2009 puzel@suse.cz
- add gnupg-2.0.10-fix-convert.patch
- fix broken 'make check' on ppc, s390 and s390x
* Tue Jan 13 2009 puzel@suse.cz
- update to 2.0.10
* New keyserver helper gpg2keys_kdns as generic DNS CERT