rpms/cyrus-imapd/devel cyrus-imapd-2.3.7-krb4.patch, NONE, 1.1 cyrus-imapd.spec, 1.19, 1.20

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15615

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.7-krb4.patch 
Log Message:
* Wed Jan 24 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.7-8
- compile with kerberos support


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 */


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cyrus-imapd.spec	24 Jan 2007 09:50:32 -0000	1.19
+++ cyrus-imapd.spec	24 Jan 2007 12:52:37 -0000	1.20
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -148,6 +148,7 @@
 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
@@ -158,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
@@ -264,6 +266,7 @@
 %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
@@ -286,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
@@ -319,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
@@ -810,6 +815,9 @@
 %{_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)