OBS User unknown 2008-05-08 21:13:43 +00:00 committed by Git OBS Bridge
parent d383587eff
commit bc8f511a66
3 changed files with 45 additions and 2 deletions

View File

@ -0,0 +1,34 @@
Index: gnutls-2.2.2/libextra/openpgp/pgp.c
===================================================================
--- gnutls-2.2.2.orig/libextra/openpgp/pgp.c
+++ gnutls-2.2.2/libextra/openpgp/pgp.c
@@ -489,7 +489,7 @@ gnutls_openpgp_crt_check_hostname (gnutl
{
char dnsname[MAX_CN];
size_t dnsnamesize;
- int ret;
+ int ret = 0;
int i;
/* Check through all included names. */
Index: gnutls-2.2.2/libextra/gnutls_openpgp.c
===================================================================
--- gnutls-2.2.2.orig/libextra/gnutls_openpgp.c
+++ gnutls-2.2.2/libextra/gnutls_openpgp.c
@@ -726,8 +726,6 @@ gnutls_certificate_set_openpgp_keyring_m
gnutls_openpgp_keyring_deinit( c->keyring);
return rc;
}
-
- return 0;
#else
c->keyring_format = format;
@@ -743,6 +741,7 @@ gnutls_certificate_set_openpgp_keyring_m
c->keyring.size = dlen;
#endif
+ return 0;
}
/*-

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 8 14:17:41 CEST 2008 - mkoenig@suse.de
- fix build
-------------------------------------------------------------------
Tue Apr 29 17:43:46 CEST 2008 - cthiel@suse.de

View File

@ -14,13 +14,14 @@
Name: gnutls
BuildRequires: gcc-c++ libgcrypt-devel libopencdk-devel
Version: 2.2.2
Release: 7
Release: 10
License: GPL v3 or later; LGPL v2.1 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.gnutls.org/
Source0: %name-%version.tar.bz2
Patch0: gnutls-char-signedness.patch
Patch2: gnutls-1.6.1-srptool.patch
Patch1: gnutls-1.6.1-srptool.patch
Patch2: gnutls-2.2.2-uninitialized.patch
Summary: The GNU Transport Layer Security Library
Group: Productivity/Networking/Security
AutoReqProv: on
@ -122,6 +123,7 @@ Authors:
%prep
%setup -q
%patch0
%patch1 -p1
%patch2 -p1
%build
@ -209,6 +211,8 @@ rm -rf %buildroot
%_libdir/pkgconfig/gnutls-extra.pc
%changelog
* Thu May 08 2008 mkoenig@suse.de
- fix build
* Tue Apr 29 2008 cthiel@suse.de
- obsolete gnutls-<arch> via baselibs.conf
* Thu Apr 10 2008 ro@suse.de