- updated to 1.10.0

- updated info patch
- removed obsolete heimdal-check patch
- reenabled apidocs by default

diff --git a/gsasl-heimdal-check.patch b/gsasl-heimdal-check.patch
deleted file mode 100644 (file)
index 14b1427..0000000
--- a/gsasl-heimdal-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-In recent Heimdal Kerberos GSS_C_NT_HOSTBASED_SERVICE is a macro
---- gsasl-1.8.1/lib/m4/gss-extra.m4.orig       2010-11-01 20:22:42.000000000 +0100
-+++ gsasl-1.8.1/lib/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

diff --git a/gsasl-info.patch b/gsasl-info.patch
index d1cd5b10693653d66e9da94b7672bef043c715b7..56c1f4e5b5ae697f85e006037f34921822b0bc9e 100644 (file)
--- a/gsasl-info.patch
+++ b/gsasl-info.patch
@@ -1,5 +1,5 @@
---- gsasl-1.4.4/doc/gsasl.texi.orig    2010-03-15 21:28:02.000000000 +0100
-+++ gsasl-1.4.4/doc/gsasl.texi 2010-07-26 15:08:24.000000000 +0200
+--- gsasl-1.10.0/doc/gsasl.texi.orig   2021-01-01 16:07:23.000000000 +0100
++++ gsasl-1.10.0/doc/gsasl.texi        2021-01-07 10:14:36.123073551 +0100
 @@ -24,14 +24,14 @@
  @end quotation
  @end copying
@@ -28,7 +28,25 @@
  
  Appendices
  
-@@ -2028,7 +2028,7 @@
+@@ -1580,7 +1580,7 @@
+ @code{gsasl_scram_secrets_from_password},
+ @code{gsasl_scram_secrets_from_salted_password} (@pxref{Utilities}) or
+ using the @code{--mkpasswd} parameter for the @code{gsasl} utility
+-(@pxref{Invoking gsasl}).
++(@pxref{gsasl}).
+ 
+ @item @code{GSASL_CB_TLS_UNIQUE}
+ 
+@@ -1970,7 +1970,7 @@
+ can also be derived by using the
+ @code{gsasl_scram_secrets_from_password} function (@pxref{Utilities}),
+ or through the @code{--mkpasswd} parameter for the @code{gsasl} utility
+-(@pxref{Invoking gsasl}).
++(@pxref{gsasl}).
+ 
+ In the server, the @code{GSASL_AUTHID} property (and, when provided by
+ the client, the @code{GSASL_AUTHZID} property) will be set in order for
+@@ -2476,7 +2476,7 @@
  @c **********************************************************
  @c ********************  Invoking gsasl  ********************
  @c **********************************************************

diff --git a/gsasl.spec b/gsasl.spec
index bf85a97e920dae90d2d016fd577ff56ecf8615fe..782ad084b78ffabee83a3641c4b4b440de93e7c6 100644 (file)
--- a/gsasl.spec
+++ b/gsasl.spec
@@ -1,45 +1,53 @@
 #
 # Conditional build:
-%bcond_with    apidocs         # disable gtk-doc
-%bcond_with    gss             # use gss instead of Heimdal as GSSAPI implementation
-%bcond_with    kerberos5       # with KERBEROS_V5 mechanism (based on shishi, currently broken)
-%bcond_without heimdal         # do not use Heimdal either
-%bcond_without ntlm            # without NTLM mechanism
-%bcond_without static_libs     # don't build static libraries
-
+%bcond_without apidocs         # API documentation
+%bcond_without kerberos5       # GSSAPI mechanism
+%bcond_with    gss             # GNU GSS as GSSAPI implementation
+%bcond_without heimdal         # Heimdal as GSSAPI implementation (default)
+%bcond_with    krb5            # MIT Kerberos as GSSAPI implementation
+%bcond_with    shishi          # KERBEROS_V5 mechanism (based on shishi, currently broken)
+%bcond_without ntlm            # NTLM mechanism
+%bcond_without static_libs     # static library
+
+%if %{with gss} || %{with krb5}
+%undefine      with_heimdal
+%endif
+%if %{without kerberos5}
+%undefine      with_gss
+%undefine      with_heimdal
+%undefine      with_krb5
+%endif
 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.8.1
+Version:       1.10.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: 624baa51e6ff53d2b2bbab005ea5190b
+Source0:       https://ftp.gnu.org/gnu/gsasl/%{name}-%{version}.tar.gz
+# Source0-md5: 70918edd489eabceb622945940871348
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-heimdal-check.patch
 Patch2:                %{name}-link.patch
 URL:           http://www.gnu.org/software/gsasl/
-BuildRequires: autoconf >= 2.61
-BuildRequires: automake >= 1:1.10
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.13
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: gnutls-devel >= 1.2.0
+BuildRequires: gettext-tools >= 0.19.8
+BuildRequires: gnutls-devel >= 3.4
 %{?with_gss:BuildRequires:     gss-devel >= 1.0.0}
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.1}
+%{?with_heimdal:BuildRequires: heimdal-devel}
 %{!?with_apidocs:BuildRequires:        help2man}
+%{?with_krb5:BuildRequires:    krb5-devel}
 # used by examples/saml20 (noinst only)
 #BuildRequires:        lasso-devel >= 2.2.1
 BuildRequires: libgcrypt-devel >= 1.3.0
 BuildRequires: libidn-devel >= 0.1.0
 %{?with_ntlm:BuildRequires:    libntlm-devel >= 0.3.5}
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2
 BuildRequires: pkgconfig
-%if %{without gss}
-# alternatively, gss or krb5 can be used for GSSAPI
-%{?with_heimdal:BuildRequires: heimdal-devel}
-%endif
-%{?with_kerberos5:BuildRequires:       shishi-devel}
+BuildRequires: rpmbuild(macros) >= 1.752
+%{?with_shishi:BuildRequires:  shishi-devel}
 BuildRequires: texinfo
 Requires(post,postun): /sbin/ldconfig
 Requires:      libgcrypt >= 1.3.0
@@ -101,7 +109,7 @@ 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}
-%{?with_kerberos5:Requires:    shishi-devel}
+%{?with_shishi:Requires:       shishi-devel}
 Obsoletes:     libgsasl-devel
 
 %description devel
@@ -129,9 +137,7 @@ Summary:    API documentation for GNU SASL library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki GNU SASL
 Group:         Documentation
 Conflicts:     gsasl-devel < 1.8.0-5
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description apidocs
 API documentation for GNU SASL library.
@@ -142,17 +148,12 @@ Dokumentacja API biblioteki GNU SASL.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %{__rm} po/stamp-po
 # use system file (from gettext-tools)
 %{__rm} lib/m4/lib-link.m4
 
-# remove it when "linking libtool libraries using a non-POSIX archiver ..." warning is gone
-# (after gsasl or libtool change)
-%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac lib/configure.ac
-
 %build
 %{__gettextize}
 %{__libtoolize}
@@ -166,19 +167,14 @@ cd lib
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd -
+cd ..
 %configure \
        --disable-silent-rules \
        %{?with_apidocs:--enable-gtk-doc} \
        %{!?with_ntlm:--disable-ntlm} \
        %{!?with_static_libs:--disable-static} \
-       %{?with_kerberos5:--enable-kerberos_v5} \
-%if %{with gss}
-       --with-gssapi-impl=gss
-%else
-       %{?with_heimdal:--with-gssapi-impl=heimdal} \
-       %{!?with_heimdal:--with-gssapi-impl=no} \
-%endif
+       %{?with_shishi:--enable-kerberos_v5} \
+       --with-gssapi-impl=%{?with_gss:gss}%{?with_heimdal:heimdal}%{?with_krb5:mit}%{!?with_kerberos5:no} \
        --with-html-dir=%{_gtkdocdir} \
        --with-libgcrypt
 
@@ -211,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README* THANKS
+%doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/gsasl
 %attr(755,root,root) %{_libdir}/libgsasl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgsasl.so.7