rpms/cyrus-imapd/FC-6 cyrus-imapd-2.3.7-db4.5.patch, NONE, 1.1 cyrus-imapd-2.3.7-krb4.patch, NONE, 1.1 cyrus-imapd-2.3.7-makeinstallfix.patch, NONE, 1.1 cyrus-imapd.spec, 1.16, 1.17
Tomas Janousek (tjanouse)
fedora-extras-commits at redhat.com
Wed Jan 24 13:52:12 UTC 2007
Author: tjanouse
Update of /cvs/extras/rpms/cyrus-imapd/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19213
Modified Files:
cyrus-imapd.spec
Added Files:
cyrus-imapd-2.3.7-db4.5.patch cyrus-imapd-2.3.7-krb4.patch
cyrus-imapd-2.3.7-makeinstallfix.patch
Log Message:
* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-8
- compile with kerberos support
* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-7
- fixed Makefile typo (caused multiarch conflict)
* Mon Jan 08 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-6
- #218046: applied patches to compile with db4-4.5
* Tue Dec 5 2006 John Dennis <jdennis at redhat.com> - 2.3.7-5
- Resolves: bug# 218046: Cyrus-imapd in rawhide needs to be rebuilt
against new snmp package
cyrus-imapd-2.3.7-db4.5.patch:
--- NEW FILE cyrus-imapd-2.3.7-db4.5.patch ---
--- cyrus-imapd-2.3.7/cmulocal/berkdb.m4.db4.5 2006-05-23 15:27:15.000000000 +0200
+++ cyrus-imapd-2.3.7/cmulocal/berkdb.m4 2007-01-08 11:57:05.000000000 +0100
@@ -213,7 +213,7 @@
fi
saved_LIBS=$LIBS
- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ for dbname in db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
do
LIBS="$saved_LIBS -l$dbname"
AC_TRY_LINK([#include <db.h>],
--- cyrus-imapd-2.3.7/lib/cyrusdb_berkeley.c.db4.5 2006-02-28 13:58:07.000000000 +0100
+++ cyrus-imapd-2.3.7/lib/cyrusdb_berkeley.c 2007-01-08 12:00:29.000000000 +0100
@@ -173,7 +173,15 @@
syslog(LOG_WARNING,
"DBERROR: invalid berkeley_locks_max value, using internal default");
} else {
+#if DB_VERSION_MAJOR >= 4
+ r = dbenv->set_lk_max_locks(dbenv, opt);
+ if (!r)
+ r = dbenv->set_lk_max_lockers(dbenv, opt);
+ if (!r)
+ r = dbenv->set_lk_max_objects(dbenv, opt);
+#else
r = dbenv->set_lk_max(dbenv, opt);
+#endif
if (r) {
dbenv->err(dbenv, r, "set_lk_max");
syslog(LOG_ERR, "DBERROR: set_lk_max(): %s", db_strerror(r));
cyrus-imapd-2.3.7-krb4.patch:
--- NEW FILE cyrus-imapd-2.3.7-krb4.patch ---
--- cyrus-imapd-2.3.7/imap/version.c.krb4 2005-02-16 22:06:19.000000000 +0100
+++ cyrus-imapd-2.3.7/imap/version.c 2007-01-22 15:36:27.000000000 +0100
@@ -169,7 +169,7 @@
"; lock = %s", lock_method_desc);
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
"; nonblock = %s", nonblock_method_desc);
-#ifdef HAVE_KRB
+#if 0
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
" (%s)", krb4_version);
#endif
--- cyrus-imapd-2.3.7/imap/pop3d.c.krb4 2007-01-22 15:41:14.000000000 +0100
+++ cyrus-imapd-2.3.7/imap/pop3d.c 2007-01-22 15:41:15.000000000 +0100
@@ -88,8 +88,6 @@
#include "sync_log.h"
#ifdef HAVE_KRB
-/* kerberos des is purported to conflict with OpenSSL DES */
-#define DES_DEFS
#include <krb.h>
/* MIT's kpop authentication kludge */
cyrus-imapd-2.3.7-makeinstallfix.patch:
--- NEW FILE cyrus-imapd-2.3.7-makeinstallfix.patch ---
--- cyrus-imapd-2.3.7/lib/Makefile.in.makeinstallfix 2006-03-17 18:29:40.000000000 +0100
+++ cyrus-imapd-2.3.7/lib/Makefile.in 2007-01-10 21:03:48.000000000 +0100
@@ -99,7 +99,7 @@
LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
$(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h \
- $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
+ $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
imapopts.h
LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
xstrlcat.o xstrlcpy.o assert.o @IPV6_OBJS@
Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/FC-6/cyrus-imapd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cyrus-imapd.spec 4 Oct 2006 23:00:10 -0000 1.16
+++ cyrus-imapd.spec 24 Jan 2007 13:51:42 -0000 1.17
@@ -1,6 +1,6 @@
Name: cyrus-imapd
Version: 2.3.7
-Release: 4%{?dist}
+Release: 8%{?dist}
# ********************** BUILD TIME OPTIONS START **********************
@@ -146,6 +146,9 @@
Patch13: allow_auth_plain_proxying.patch
Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
+Patch16: cyrus-imapd-2.3.7-db4.5.patch
+Patch17: cyrus-imapd-2.3.7-makeinstallfix.patch
+Patch18: cyrus-imapd-2.3.7-krb4.patch
# Patches >= 100 are / will be fixed in CVS
Patch100: cyrus-imapd-2.3.1-make_md5.patch
Patch101: cyrus-imapd-2.3.1-backend_sigsegv.patch
@@ -156,6 +159,7 @@
BuildRequires: %{_dbver}-devel, openssl-devel, pkgconfig
BuildRequires: flex, bison, groff >= 1.15-8, automake
BuildRequires: openldap-devel
+BuildRequires: krb5-devel
%if %{SNMP}
BuildRequires: %{_snmpver}-snmp-devel
%ifarch i386 x86_64
@@ -260,6 +264,9 @@
%patch13 -p0 -b .allow_auth_plain
%patch14 -p1 -b .authid_normalize
%patch15 -p1 -b .make_md5_defaults
+%patch16 -p1 -b .db4.5
+%patch17 -p1 -b .makeinstallfix
+%patch18 -p1 -b .krb4
# fixed upstream
#%patch100 -p1 -b .make_md5
# fixed upstream
@@ -282,6 +289,7 @@
CFLAGS="$(pkg-config --cflags openssl) $CFLAGS"; export CFLAGS
LDFLAGS="$(pkg-config --libs-only-L openssl) $LDFLAGS"; export LDFLAGS
fi
+CPPFLAGS="-I%{_includedir}/kerberosIV $CPPFLAGS"; export CPPFLAGS
CCDLFLAGS="-rdynamic"; export CCDLFLAGS
%if %{USEPIE}
%ifnarch ppc ppc64
@@ -315,7 +323,8 @@
--with-service-path=%{_cyrexecdir} \
--with-bdb-incdir=%{_includedir}/%{_dbver} \
--with-extraident="Invoca-RPM-%{version}-%{release}" \
- --with-syslogfacility=%{SYSLOGFACILITY}
+ --with-syslogfacility=%{SYSLOGFACILITY} \
+ --with-krbimpl=mit
%{__make} -C man -f Makefile.dist
%{__make} -C doc -f Makefile.dist
@@ -806,6 +815,19 @@
%{_mandir}/man1/*
%changelog
+* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-8
+- compile with kerberos support
+
+* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-7
+- fixed Makefile typo (caused multiarch conflict)
+
+* Mon Jan 08 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-6
+- #218046: applied patches to compile with db4-4.5
+
+* Tue Dec 5 2006 John Dennis <jdennis at redhat.com> - 2.3.7-5
+- Resolves: bug# 218046: Cyrus-imapd in rawhide needs to be rebuilt
+ against new snmp package
+
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2.3.7-4
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
More information about the scm-commits
mailing list