Author: qboosh Date: Sat Jan 8 19:38:22 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 1.6.0 - added heimdal-check patch to fix build with heimdal kerberos
---- Files affected: packages/gsasl: gsasl.spec (1.60 -> 1.61) , gsasl-heimdal-check.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gsasl/gsasl.spec diff -u packages/gsasl/gsasl.spec:1.60 packages/gsasl/gsasl.spec:1.61 --- packages/gsasl/gsasl.spec:1.60 Wed Nov 24 12:52:37 2010 +++ packages/gsasl/gsasl.spec Sat Jan 8 20:38:17 2011 @@ -10,19 +10,20 @@ Summary: GNU SASL - implementation of the Simple Authentication and Security Layer Summary(pl.UTF-8): GNU SASL - implementacja Simple Authentication and Security Layer Name: gsasl -Version: 1.4.4 -Release: 2 +Version: 1.6.0 +Release: 1 License: LGPL v2.1+ (library), GPL v3+ (gsasl tool) Group: Libraries Source0: http://ftp.gnu.org/gnu/gsasl/%{name}-%{version}.tar.gz -# Source0-md5: ab3e343717c0f67614e1398cfbab83b6 +# Source0-md5: 5a4cc39af4ba8dbd8b66380baf3c3c7d Patch0: %{name}-info.patch +Patch1: %{name}-heimdal-check.patch URL: http://www.gnu.org/software/gsasl/ BuildRequires: autoconf >= 2.61 BuildRequires: automake >= 1:1.10 BuildRequires: gettext-devel >= 0.17 BuildRequires: gnutls-devel >= 1.2.0 -%{?with_gss:BuildRequires: gss-devel >= 0.0.0} +%{?with_gss:BuildRequires: gss-devel >= 1.0.0} %{?with_apidocs:BuildRequires: gtk-doc >= 1.1} BuildRequires: libgcrypt-devel >= 1.3.0 BuildRequires: libidn-devel >= 0.1.0 @@ -85,7 +86,7 @@ License: LGPL v2.1+ Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%{?with_gss:Requires: gss-devel >= 0.0.0} +%{?with_gss:Requires: gss-devel >= 1.0.0} Requires: libgcrypt-devel >= 1.3.0 Requires: libidn-devel >= 0.1.0 %{?with_ntlm:Requires: libntlm-devel >= 0.3.5} @@ -116,8 +117,9 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -rm -f po/stamp-po +%{__rm} po/stamp-po %build %{__gettextize} @@ -134,6 +136,7 @@ %{__automake} cd - %configure \ + --disable-silent-rules \ %{?with_apidocs:--enable-gtk-doc} \ %{!?with_ntlm:--disable-ntlm} \ %{!?with_static_libs:--disable-static} \ @@ -196,6 +199,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.61 2011/01/08 19:38:17 qboosh +- updated to 1.6.0 +- added heimdal-check patch to fix build with heimdal kerberos + Revision 1.60 2010/11/24 11:52:37 hawk - release 2 ================================================================ Index: packages/gsasl/gsasl-heimdal-check.patch diff -u /dev/null packages/gsasl/gsasl-heimdal-check.patch:1.1 --- /dev/null Sat Jan 8 20:38:22 2011 +++ packages/gsasl/gsasl-heimdal-check.patch Sat Jan 8 20:38:17 2011 @@ -0,0 +1,26 @@ +In recent Heimdal Kerberos GSS_C_NT_HOSTBASED_SERVICE is a macro +--- gsasl-1.6.0/lib/gl/m4/gss-extra.m4.orig 2010-11-01 20:22:42.000000000 +0100 ++++ gsasl-1.6.0/lib/gl/m4/gss-extra.m4 2011-01-08 17:32:13.805903205 +0100 +@@ -19,7 +19,6 @@ + AC_CHECK_FUNCS([gss_decapsulate_token]) + AC_CHECK_FUNCS([gss_oid_equal]) + AC_CHECK_FUNCS([gss_inquire_mech_for_saslname]) +- AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE]) + if test "$gssapi_impl" != "gss"; then + AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h]) + if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then +@@ -27,6 +26,14 @@ + AC_MSG_WARN([Cannot find gssapi.h or gssapi/gssapi.h, disabling GSSAPI]) + fi + fi ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([ ++#ifdef HAVE_GSSAPI_H ++#include <gssapi.h> ++#else ++#include <gssapi/gssapi.h> ++#endif ++], [gss_OID x = GSS_C_NT_HOSTBASED_SERVICE])], ++[AC_DEFINE([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [1], [Have GSS_C_NT_HOSTBASED_SERVICE symbol])]) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gsasl/gsasl.spec?r1=1.60&r2=1.61&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
