Author: arekm Date: Fri Sep 2 18:28:52 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4; fix build with gnutls 3.0
---- Files affected:
packages/shishi:
shishi.spec (1.67 -> 1.68) , shishi-gnutls.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/shishi/shishi.spec
diff -u packages/shishi/shishi.spec:1.67 packages/shishi/shishi.spec:1.68
--- packages/shishi/shishi.spec:1.67 Fri Sep 2 19:23:04 2011
+++ packages/shishi/shishi.spec Fri Sep 2 20:28:47 2011
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Shishi - implementacja RFC 1510(bis) (uwierzytelniania
Kerberos V5)
Name: shishi
Version: 1.0.0
-Release: 3
+Release: 4
Epoch: 0
License: GPL v3+
Group: Libraries
@@ -12,6 +12,7 @@
Source1: %{name}-shishid.init
Source2: %{name}-shishid.sysconfig
Patch0: %{name}-info.patch
+Patch1: %{name}-gnutls.patch
URL: http://josefsson.org/shishi/
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.10
@@ -130,6 +131,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# doesn't build on sparc (too few B* constants) and wasn't packaged anyway
%{__perl} -pi -e 's/^(SUBDIRS.*) rsh-redone/$1/' extra/Makefile.am
@@ -253,6 +255,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.68 2011/09/02 18:28:47 arekm
+- rel 4; fix build with gnutls 3.0
+
Revision 1.67 2011/09/02 17:23:04 arekm
- release 3
================================================================
Index: packages/shishi/shishi-gnutls.patch
diff -u /dev/null packages/shishi/shishi-gnutls.patch:1.3
--- /dev/null Fri Sep 2 20:28:52 2011
+++ packages/shishi/shishi-gnutls.patch Fri Sep 2 20:28:47 2011
@@ -0,0 +1,21 @@
+--- shishi-1.0.0/src/starttls.c~ 2010-04-29 08:43:49.000000000 +0200
++++ shishi-1.0.0/src/starttls.c 2011-09-02 20:27:19.587913703 +0200
+@@ -36,6 +36,7 @@
+ gnutls_x509_crt cert;
+ size_t i;
+ int rc;
++ unsigned int status;
+
+ cert_list = gnutls_certificate_get_peers (session, &cert_list_size);
+ if (!cert_list)
+@@ -195,8 +196,8 @@
+
+ gnutls_x509_crt_deinit (cert);
+
+- rc = gnutls_certificate_verify_peers (session);
+- if (rc != GNUTLS_E_SUCCESS)
++ rc = gnutls_certificate_verify_peers2 (session, &status);
++ if (rc < 0)
+ syslog (LOG_ERR, "TLS client certificate verify failed (%d): %s",
+ rc, gnutls_strerror (rc));
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/shishi/shishi.spec?r1=1.67&r2=1.68&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/shishi/shishi-gnutls.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
