rpms/cyrus-sasl/devel cyrus-sasl-2.1.22-warnings.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 cyrus-sasl.spec, 1.71, 1.72 sasl-mechlist.c, 1.1, 1.2 sources, 1.21, 1.22 cyrus-sasl-2.1.22-db_bundle.patch, 1.2, NONE

Wed Sep 10 13:44:45 UTC 2008

Author: tmraz

Update of /cvs/pkgs/rpms/cyrus-sasl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9334

Modified Files:
	.cvsignore cyrus-sasl.spec sasl-mechlist.c sources 
Added Files:
	cyrus-sasl-2.1.22-warnings.patch 
Removed Files:
	cyrus-sasl-2.1.22-db_bundle.patch 
Log Message:
* Wed Sep 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
- fix most critical build warnings (#433583)
- use external db4


cyrus-sasl-2.1.22-warnings.patch:

--- NEW FILE cyrus-sasl-2.1.22-warnings.patch ---
diff -up cyrus-sasl-2.1.22/lib/auxprop.c.warnings cyrus-sasl-2.1.22/lib/auxprop.c
--- cyrus-sasl-2.1.22/lib/auxprop.c.warnings	2006-03-14 15:23:55.000000000 +0100
+++ cyrus-sasl-2.1.22/lib/auxprop.c	2008-09-10 14:31:01.000000000 +0200
@@ -46,6 +46,7 @@
 #include <sasl.h>
 #include <prop.h>
 #include <ctype.h>
+#include <stdio.h>
 #include "saslint.h"
 
 struct proppool 
diff -up cyrus-sasl-2.1.22/lib/server.c.warnings cyrus-sasl-2.1.22/lib/server.c
--- cyrus-sasl-2.1.22/lib/server.c.warnings	2006-05-17 18:46:13.000000000 +0200
+++ cyrus-sasl-2.1.22/lib/server.c	2008-09-10 14:39:02.000000000 +0200
@@ -517,7 +517,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.22/plugins/gssapi.c.warnings cyrus-sasl-2.1.22/plugins/gssapi.c
--- cyrus-sasl-2.1.22/plugins/gssapi.c.warnings	2004-07-21 16:39:06.000000000 +0200
+++ cyrus-sasl-2.1.22/plugins/gssapi.c	2008-09-10 14:20:59.000000000 +0200
@@ -190,7 +190,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: ";
     
     len = sizeof(prefix);
diff -up cyrus-sasl-2.1.22/plugins/ldapdb.c.warnings cyrus-sasl-2.1.22/plugins/ldapdb.c
--- cyrus-sasl-2.1.22/plugins/ldapdb.c.warnings	2005-02-19 03:26:31.000000000 +0100
+++ cyrus-sasl-2.1.22/plugins/ldapdb.c	2008-09-10 14:52:33.000000000 +0200
@@ -21,6 +21,7 @@
 
 #include "plugin_common.h"
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 static char ldapdb[] = "ldapdb";
diff -up cyrus-sasl-2.1.22/saslauthd/lak.c.warnings cyrus-sasl-2.1.22/saslauthd/lak.c
--- cyrus-sasl-2.1.22/saslauthd/lak.c.warnings	2005-05-15 07:49:51.000000000 +0200
+++ cyrus-sasl-2.1.22/saslauthd/lak.c	2008-09-10 14:52:51.000000000 +0200
@@ -55,6 +55,7 @@
 #include <openssl/des.h>
 #endif
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 #include <lber.h>
 #include <sasl.h>
diff -up cyrus-sasl-2.1.22/saslauthd/auth_httpform.c.warnings cyrus-sasl-2.1.22/saslauthd/auth_httpform.c
--- cyrus-sasl-2.1.22/saslauthd/auth_httpform.c.warnings	2006-04-19 21:51:13.000000000 +0200
+++ cyrus-sasl-2.1.22/saslauthd/auth_httpform.c	2008-09-10 14:45:57.000000000 +0200
@@ -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.22/saslauthd/auth_shadow.c.warnings cyrus-sasl-2.1.22/saslauthd/auth_shadow.c
--- cyrus-sasl-2.1.22/saslauthd/auth_shadow.c.warnings	2006-04-19 21:36:36.000000000 +0200
+++ cyrus-sasl-2.1.22/saslauthd/auth_shadow.c	2008-09-10 14:47:47.000000000 +0200
@@ -63,6 +63,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 */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	9 Jul 2008 13:11:39 -0000	1.18
+++ .cvsignore	10 Sep 2008 13:44:15 -0000	1.19
@@ -1,2 +1 @@
 cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
-db-4.7.25.tar.gz


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cyrus-sasl.spec	29 Aug 2008 10:47:03 -0000	1.71
+++ cyrus-sasl.spec	10 Sep 2008 13:44:15 -0000	1.72
@@ -1,11 +1,10 @@
 %define _plugindir2 %{_libdir}/sasl2
-%define db_version 4.7.25
 %define bootstrap_cyrus_sasl 0
 
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.22
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -13,7 +12,6 @@
 # new tarball.
 Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
 Source4: saslauthd.init
-Source6: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source7: sasl-mechlist.c
 Source8: sasl-checkpass.c
 Source9: saslauthd.sysconfig
@@ -30,10 +28,13 @@
 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
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
 BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig
 BuildRequires: mysql-devel, postgresql-devel, zlib-devel
+BuildRequires: db4-devel
 %if ! %{bootstrap_cyrus_sasl}
 BuildRequires: openldap-devel
 %endif
@@ -131,10 +132,10 @@
 support Kerberos 4 authentication.
 
 %prep
-%setup -q -a 6
+%setup -q
 chmod -x doc/*.html
 chmod -x include/*.h
-%patch10 -p1 -b .db_bundle
+#%patch10 -p1 -b .db_bundle
 %patch11 -p1 -b .no_rpath
 %patch15 -p1 -b .path
 %patch24 -p1 -b .sizes
@@ -144,6 +145,7 @@
 %patch28 -p1 -b .keytab
 %patch30 -p1 -b .rimap
 %patch31 -p1 -b .krb4
+%patch32 -p1 -b .warnings
 
 # FIXME - we remove these files directly so that we can avoid using the -f
 # flag, which has a nasty habit of overwriting files like COPYING.
@@ -170,19 +172,6 @@
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 
-# Bundling copy of Berkeley DB, for sasldb support.
-topdir=`pwd`
-pushd db-%{db_version}/build_unix
-../dist/configure \
-        --with-mutex=UNIX/fcntl --disable-shared --enable-static --with-pic \
-        --with-uniquename=_cyrus_sasl_sasldb_rh \
-        --prefix=${topdir}/db-instroot \
-        --includedir=${topdir}/db-instroot/include \
-        --libdir=${topdir}/db-instroot/lib
-make
-make install
-popd
-
 # Find Kerberos.
 krb5_prefix=`krb5-config --prefix`
 if test x$krb5_prefix = x%{_prefix} ; then
@@ -234,8 +223,6 @@
         --with-gss_impl=mit \
         --with-rc4 \
         --with-dblib=berkeley \
-        --with-bdb-incdir=${topdir}/db-instroot/include \
-        --with-bdb-libdir=${topdir}/db-instroot/lib \
         --with-saslauthd=/var/run/saslauthd --without-pwcheck \
 %if ! %{bootstrap_cyrus_sasl}
         --with-ldap \
@@ -393,6 +380,10 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Wed Sep 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-18
+- fix most critical build warnings (#433583)
+- use external db4
+
 * Fri Aug 29 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.22-17
 - always link against the internal db4 (#459163)
 - rediff patches for no fuzz


Index: sasl-mechlist.c
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sasl-mechlist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sasl-mechlist.c	9 Sep 2004 04:05:41 -0000	1.1
+++ sasl-mechlist.c	10 Sep 2008 13:44:15 -0000	1.2
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 static int
 my_getopt(void *context, const char *plugin_name,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	9 Jul 2008 13:11:39 -0000	1.21
+++ sources	10 Sep 2008 13:44:15 -0000	1.22
@@ -1,2 +1 @@
 4dde83929ded5435e4c72e7cc06b0ebb  cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz
-ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz


--- cyrus-sasl-2.1.22-db_bundle.patch DELETED ---


