commit 1a9d1bae3fc29bab4dadb38218b12c42cdfc340f
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Thu Jan 2 17:32:58 2014 +0100
- fix/hack configure for libgcrypt 1.6
- rel 4
libgcrypt-1.6.patch | 15 +++++++++++++++
shishi.spec | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/shishi.spec b/shishi.spec
index 0244bad..f7cab7e 100644
--- a/shishi.spec
+++ b/shishi.spec
@@ -2,7 +2,7 @@ Summary: Shishi - an implementation of RFC 1510(bis)
(Kerberos V5 authentication
Summary(pl.UTF-8): Shishi - implementacja RFC 1510(bis) (uwierzytelniania
Kerberos V5)
Name: shishi
Version: 1.0.2
-Release: 3
+Release: 4
Epoch: 0
License: GPL v3+
Group: Libraries
@@ -11,6 +11,7 @@ Source0:
http://ftp.gnu.org/gnu/shishi/%{name}-%{version}.tar.gz
Source1: %{name}-shishid.init
Source2: %{name}-shishid.sysconfig
Patch0: %{name}-info.patch
+Patch1: libgcrypt-1.6.patch
URL: http://josefsson.org/shishi/
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.11
@@ -129,6 +130,7 @@ Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5).
%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
diff --git a/libgcrypt-1.6.patch b/libgcrypt-1.6.patch
new file mode 100644
index 0000000..f596f4e
--- /dev/null
+++ b/libgcrypt-1.6.patch
@@ -0,0 +1,15 @@
+--- shishi-1.0.2/gl/m4/gc.m4~ 2013-04-03 00:48:10.000000000 +0200
++++ shishi-1.0.2/gl/m4/gc.m4 2014-01-02 17:26:39.579388941 +0100
+@@ -9,12 +9,6 @@
+ if test "$libgcrypt" != no; then
+ AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
+ #include <gcrypt.h>
+-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
+- will fail on startup if we don't have 1.4.4 or later, so
+- test for it early. */
+-#if !defined GCRY_MODULE_ID_USER
+-error too old libgcrypt
+-#endif
+ ])
+ fi
+ ])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shishi.git/commitdiff/1a9d1bae3fc29bab4dadb38218b12c42cdfc340f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
