Attachment 146344 Details for Bug 224044 – A patch against cyrus-imapd-2.3.7-4

[patch] A patch against cyrus-imapd-2.3.7-4

cyrus-imapd-kpop.patch (text/plain), 2.50 KB, created by Miloslav Trmač on 2007-01-23 19:39:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2007-01-23 19:39:39 UTC

Size: 2.50 KB

patch

obsolete

>diff -urN ./cyrus-imapd.spec /home/mitr/data/rpm/sources/cyrus-imapd.spec
>--- ./cyrus-imapd.spec	2006-10-05 01:00:10.000000000 +0200
>+++ /home/mitr/data/rpm/sources/cyrus-imapd.spec	2007-01-23 20:26:19.000000000 +0100
>@@ -146,6 +146,7 @@
> 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-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
>@@ -260,6 +261,7 @@
> %patch13 -p0 -b .allow_auth_plain
> %patch14 -p1 -b .authid_normalize
> %patch15 -p1 -b .make_md5_defaults
>+%patch16 -p1 -b .krb4
> # fixed upstream
> #%patch100 -p1 -b .make_md5
> # fixed upstream
>@@ -282,6 +284,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 +318,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
>diff -urN ./cyrus-imapd-2.3.7-krb4.patch /home/mitr/data/rpm/sources/cyrus-imapd-2.3.7-krb4.patch
>--- ./cyrus-imapd-2.3.7-krb4.patch	1970-01-01 01:00:00.000000000 +0100
>+++ /home/mitr/data/rpm/sources/cyrus-imapd-2.3.7-krb4.patch	2007-01-22 15:41:19.000000000 +0100
>@@ -0,0 +1,22 @@
>+--- 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 */

Actions: View | Diff

Attachments on bug 224044: 146344