[cyrus-sasl] update to 2.1.25 add cyrus-sasl-scram and cyrus-sasl-gs2 packages

plautrba plautrba at fedoraproject.org
Fri Dec 7 16:27:42 UTC 2012 

commit 0f0cda2c52f765ce1219cf665e77ac793b43194c
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Fri Dec 7 16:37:53 2012 +0100

    update to 2.1.25
    add cyrus-sasl-scram and cyrus-sasl-gs2 packages

 cyrus-sasl-2.1.18-no_rpath.patch                   |   19 ---
 cyrus-sasl-2.1.22-bad-elif.patch                   |   21 ---
 cyrus-sasl-2.1.22-digest-commas.patch              |  148 --------------------
 cyrus-sasl-2.1.22-rimap.patch                      |   38 -----
 cyrus-sasl-2.1.22-typo.patch                       |   12 --
 cyrus-sasl-2.1.22-warnings.patch                   |   84 -----------
 cyrus-sasl-2.1.23-ac-quote.patch                   |   33 -----
 cyrus-sasl-2.1.23-ntlm.patch                       |   12 --
 cyrus-sasl-2.1.23-relro.patch                      |   25 ----
 cyrus-sasl-2.1.25-no_rpath.patch                   |   20 +++
 ...=> cyrus-sasl-2.1.25-release-server_creds.patch |   11 +-
 cyrus-sasl-2.1.25-relro.patch                      |   24 +++
 cyrus-sasl-2.1.25-warnings.patch                   |   62 ++++++++
 cyrus-sasl.spec                                    |   59 +++++---
 14 files changed, 148 insertions(+), 420 deletions(-)
---
diff --git a/cyrus-sasl-2.1.25-no_rpath.patch b/cyrus-sasl-2.1.25-no_rpath.patch
new file mode 100644
index 0000000..33ed15d
--- /dev/null
+++ b/cyrus-sasl-2.1.25-no_rpath.patch
@@ -0,0 +1,20 @@
+diff -up cyrus-sasl-2.1.25/cmulocal/cyrus.m4.no_rpath cyrus-sasl-2.1.25/cmulocal/cyrus.m4
+--- cyrus-sasl-2.1.25/cmulocal/cyrus.m4.no_rpath	2010-01-22 16:12:01.000000000 +0100
++++ cyrus-sasl-2.1.25/cmulocal/cyrus.m4	2012-12-06 14:59:47.956102057 +0100
+@@ -32,14 +32,5 @@ AC_DEFUN([CMU_ADD_LIBPATH_TO], [
+ dnl runpath initialization
+ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
+    # CMU GUESS RUNPATH SWITCH
+-  AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, [
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+-    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"],
+-    [andrew_cv_runpath_switch="none"])
+-    ])
+-  LDFLAGS="${SAVE_LDFLAGS}"
+-  ])])
++    andrew_runpath_switch="none"
++  ])
diff --git a/cyrus-sasl-2.1.23-release-server_creds.patch b/cyrus-sasl-2.1.25-release-server_creds.patch
similarity index 53%
rename from cyrus-sasl-2.1.23-release-server_creds.patch
rename to cyrus-sasl-2.1.25-release-server_creds.patch
index 0850725..644c0bf 100644
--- a/cyrus-sasl-2.1.23-release-server_creds.patch
+++ b/cyrus-sasl-2.1.25-release-server_creds.patch
@@ -1,8 +1,9 @@
---- cyrus-sasl/plugins/gssapi.c
-+++ cyrus-sasl/plugins/gssapi.c
-@@ -782,6 +782,11 @@ gssapi_server_mech_step(void *conn_conte
+diff -up cyrus-sasl-2.1.25/plugins/gssapi.c.release-server_creds cyrus-sasl-2.1.25/plugins/gssapi.c
+--- cyrus-sasl-2.1.25/plugins/gssapi.c.release-server_creds	2012-12-07 12:57:14.000000000 +0100
++++ cyrus-sasl-2.1.25/plugins/gssapi.c	2012-12-07 12:58:11.122533870 +0100
+@@ -829,6 +829,11 @@ gssapi_server_mech_step(void *conn_conte
  	}
- 	
+ 
  	if (maj_stat == GSS_S_COMPLETE) {
 +	    /* Release server creds which are no longer needed */
 +            if ( text->server_creds != GSS_C_NO_CREDENTIAL) {
@@ -11,4 +12,4 @@
 +            }
  	    /* Switch to ssf negotiation */
  	    text->state = SASL_GSSAPI_STATE_SSFCAP;
- 	}
+ 
diff --git a/cyrus-sasl-2.1.25-relro.patch b/cyrus-sasl-2.1.25-relro.patch
new file mode 100644
index 0000000..0a305f1
--- /dev/null
+++ b/cyrus-sasl-2.1.25-relro.patch
@@ -0,0 +1,24 @@
+diff -up cyrus-sasl-2.1.25/lib/Makefile.am.relro cyrus-sasl-2.1.25/lib/Makefile.am
+--- cyrus-sasl-2.1.25/lib/Makefile.am.relro	2011-09-05 16:18:10.000000000 +0200
++++ cyrus-sasl-2.1.25/lib/Makefile.am	2012-12-07 12:49:13.693026807 +0100
+@@ -62,7 +62,7 @@ LIB_DOOR= @LIB_DOOR@
+ lib_LTLIBRARIES = libsasl2.la
+ 
+ libsasl2_la_SOURCES = $(common_sources) $(common_headers)
+-libsasl2_la_LDFLAGS = -version-info $(sasl_version)
++libsasl2_la_LDFLAGS = -Wl,-z,relro -version-info $(sasl_version)
+ libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+ libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
+ 
+diff -up cyrus-sasl-2.1.25/plugins/Makefile.am.relro cyrus-sasl-2.1.25/plugins/Makefile.am
+--- cyrus-sasl-2.1.25/plugins/Makefile.am.relro	2011-09-05 16:18:10.000000000 +0200
++++ cyrus-sasl-2.1.25/plugins/Makefile.am	2012-12-07 12:56:16.916231903 +0100
+@@ -49,7 +49,7 @@
+ plugin_version = 2:25:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
++AM_LDFLAGS = -Wl,-z,relro -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
+ 
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
+ 
diff --git a/cyrus-sasl-2.1.25-warnings.patch b/cyrus-sasl-2.1.25-warnings.patch
new file mode 100644
index 0000000..a6fc4ee
--- /dev/null
+++ b/cyrus-sasl-2.1.25-warnings.patch
@@ -0,0 +1,62 @@
+diff -up cyrus-sasl-2.1.25/lib/server.c.warnings cyrus-sasl-2.1.25/lib/server.c
+--- cyrus-sasl-2.1.25/lib/server.c.warnings	2011-09-02 14:58:01.000000000 +0200
++++ cyrus-sasl-2.1.25/lib/server.c	2012-12-06 16:21:07.705102996 +0100
+@@ -646,7 +646,7 @@ static int load_config(const sasl_callba
+             goto done;
+         }
+ 
+-        snprintf(config_filename, len, "%.*s%c%s.conf", path_len, path_to_config, 
++        snprintf(config_filename, len, "%.*s%c%s.conf", (int)path_len, path_to_config, 
+ 	        HIER_DELIMITER, global_callbacks.appname);
+ 
+         /* Ask the application if it's safe to use this file */
+diff -up cyrus-sasl-2.1.25/plugins/gssapi.c.warnings cyrus-sasl-2.1.25/plugins/gssapi.c
+--- cyrus-sasl-2.1.25/plugins/gssapi.c.warnings	2011-05-11 21:25:55.000000000 +0200
++++ cyrus-sasl-2.1.25/plugins/gssapi.c	2012-12-06 16:24:30.223307272 +0100
+@@ -196,7 +196,8 @@ sasl_gss_seterror_(const sasl_utils_t *u
+     OM_uint32 msg_ctx;
+     int ret;
+     char *out = NULL;
+-    size_t len, curlen = 0;
++    size_t len;
++    unsigned curlen = 0;
+     const char prefix[] = "GSSAPI Error: ";
+ 
+     if (!utils) return SASL_OK;
+diff -up cyrus-sasl-2.1.25/plugins/ldapdb.c.warnings cyrus-sasl-2.1.25/plugins/ldapdb.c
+--- cyrus-sasl-2.1.25/plugins/ldapdb.c.warnings	2011-05-11 21:25:55.000000000 +0200
++++ cyrus-sasl-2.1.25/plugins/ldapdb.c	2012-12-06 16:21:07.706102988 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include "plugin_common.h"
+ 
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+ 
+ static char ldapdb[] = "ldapdb";
+diff -up cyrus-sasl-2.1.25/saslauthd/auth_httpform.c.warnings cyrus-sasl-2.1.25/saslauthd/auth_httpform.c
+--- cyrus-sasl-2.1.25/saslauthd/auth_httpform.c.warnings	2006-04-20 16:30:14.000000000 +0200
++++ cyrus-sasl-2.1.25/saslauthd/auth_httpform.c	2012-12-06 16:21:10.520091567 +0100
+@@ -552,7 +552,7 @@ auth_httpform (
+               "Content-Type: application/x-www-form-urlencoded" CRLF
+               "Content-Length: %d" TWO_CRLF
+               "%s",
+-              r_uri, r_host, r_port, strlen(escreq), escreq);
++              r_uri, r_host, r_port, (int)strlen(escreq), escreq);
+ 
+     if (flags & VERBOSE) {
+         syslog(LOG_DEBUG, "auth_httpform: sending %s %s %s",
+diff -up cyrus-sasl-2.1.25/saslauthd/auth_shadow.c.warnings cyrus-sasl-2.1.25/saslauthd/auth_shadow.c
+--- cyrus-sasl-2.1.25/saslauthd/auth_shadow.c.warnings	2009-12-03 20:07:03.000000000 +0100
++++ cyrus-sasl-2.1.25/saslauthd/auth_shadow.c	2012-12-06 16:21:10.521091564 +0100
+@@ -68,6 +68,10 @@
+ #  include <shadow.h>
+ # endif /* ! HAVE_GETUSERPW */
+ 
++# ifdef HAVE_CRYPT_H
++#  include <crypt.h>
++# endif
++
+ # include "auth_shadow.h"
+ # include "globals.h"
+ /* END PUBLIC DEPENDENCIES */
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 6b05b4d..d4eac04 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -7,8 +7,8 @@
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
-Version: 2.1.23
-Release: 36%{?dist}
+Version: 2.1.25
+Release: 1%{?dist}
 License: BSD with advertising
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -24,31 +24,24 @@ Source10: make-no-dlcompatorsrp-tarball.sh
 Source11: saslauthd.tmpfiles
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
 Requires: %{name}-lib = %{version}-%{release}
-Patch11: cyrus-sasl-2.1.18-no_rpath.patch
+Patch11: cyrus-sasl-2.1.25-no_rpath.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
 Patch23: cyrus-sasl-2.1.23-man.patch
 Patch24: cyrus-sasl-2.1.21-sizes.patch
-Patch25: cyrus-sasl-2.1.22-typo.patch
-Patch26: cyrus-sasl-2.1.22-digest-commas.patch
 Patch27: cyrus-sasl-2.1.22-automake-1.10.patch
 Patch28: cyrus-sasl-2.1.21-keytab.patch
-Patch30: cyrus-sasl-2.1.22-rimap.patch
 Patch31: cyrus-sasl-2.1.22-kerberos4.patch
-Patch32: cyrus-sasl-2.1.22-warnings.patch
-Patch33: cyrus-sasl-2.1.22-current-db.patch
+Patch32: cyrus-sasl-2.1.25-warnings.patch
 Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
-Patch35: cyrus-sasl-2.1.22-bad-elif.patch
-Patch36: cyrus-sasl-2.1.23-ac-quote.patch
 Patch37: cyrus-sasl-2.1.23-race.patch
 # removed due to #759334
 #Patch38: cyrus-sasl-2.1.23-pam_rhosts.patch
-Patch39: cyrus-sasl-2.1.23-ntlm.patch
 Patch40: cyrus-sasl-2.1.23-rimap2.patch
 Patch41: cyrus-sasl-2.1.23-db5.patch
-Patch42: cyrus-sasl-2.1.23-relro.patch
+Patch42: cyrus-sasl-2.1.25-relro.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=816250
 Patch43: cyrus-sasl-2.1.23-null-crypt.patch
-Patch44: cyrus-sasl-2.1.23-release-server_creds.patch
+Patch44: cyrus-sasl-2.1.25-release-server_creds.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -148,6 +141,24 @@ The %{name}-ldap package contains the Cyrus SASL plugin which supports using
 a directory server, accessed using LDAP, for storing shared secrets.
 %endif
 
+%package scram
+Requires: %{name}-lib = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: SCRAM auxprop support for Cyrus SASL
+
+%description scram
+The %{name}-scram package contains the Cyrus SASL plugin which supports
+the SCRAM authentication scheme.
+
+%package gs2
+Requires: %{name}-lib = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: GS2 support for Cyrus SASL
+
+%description gs2
+The %{name}-gs2 package contains the Cyrus SASL plugin which supports
+the GS2 authentication scheme.
+
 %package sysvinit
 Summary: The SysV initscript to manage the cyrus SASL authd.
 Group: System Environment/Daemons
@@ -168,20 +179,10 @@ chmod -x include/*.h
 %patch15 -p1 -b .path
 %patch23 -p1 -b .man
 %patch24 -p1 -b .sizes
-%patch25 -p1 -b .typo
-%patch26 -p2 -b .digest-commas
-%patch27 -p1 -b .automake-1.10
-%patch28 -p1 -b .keytab
-%patch30 -p1 -b .rimap
 %patch31 -p1 -b .krb4
 %patch32 -p1 -b .warnings
-%patch33 -p1 -b .current-db
 %patch34 -p1 -b .ldap-timeout
-%patch35 -p1 -b .elif
-%patch36 -p1 -b .ac-quote
 %patch37 -p1 -b .race
-#%patch38 -p1 -b .pam_rhosts
-%patch39 -p1 -b .ntlm
 %patch40 -p1 -b .rimap2
 %patch41 -p1 -b .db5
 %patch42 -p1 -b .relro
@@ -419,6 +420,14 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
 %defattr(-,root,root)
 %{_plugindir2}/*gssapi*.so*
 
+%files scram
+%defattr(-,root,root)
+%{_plugindir2}/libscram.so*
+
+%files gs2
+%defattr(-,root,root)
+%{_plugindir2}/libgs2.so*
+
 %files devel
 %defattr(-,root,root)
 %doc doc/*.txt
@@ -433,6 +442,10 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir}
 /etc/rc.d/init.d/saslauthd
 
 %changelog
+* Fri Dec 07 2012 Petr Lautrbach <plautrba at redhat.com> 2.1.25-1
+- update to 2.1.25
+- add cyrus-sasl-scram and cyrus-sasl-gs2 packages
+
 * Fri Sep 14 2012 Petr Lautrbach <plautrba at redhat.com> 2.1.23-36
 - replace scriptlets with systemd macros (#856666)

More information about the scm-commits mailing list