[SVN] r467 - in /branches: idled/debian/ idled/debian/patches/
sarge-2.2.13/debian/ sarge-2.2.13/debian/patches/
debian at incase.de
debian at incase.de
Fri May 19 15:12:30 UTC 2006
Author: sven
Date: Fri May 19 17:12:09 2006
New Revision: 467
URL: https://mail.incase.de/viewcvs?rev=467&root=cyrus22&view=rev
Log:
Merge /trunk updates until r465 into sarge and idle branches
Added:
branches/idled/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
- copied unchanged from r465, trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
branches/sarge-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
- copied unchanged from r465, trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
Modified:
branches/idled/debian/changelog
branches/idled/debian/patches/00list
branches/idled/debian/patches/99-update-autoconf.dpatch
branches/sarge-2.2.13/debian/changelog
branches/sarge-2.2.13/debian/patches/00list
branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch
Modified: branches/idled/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/idled/debian/changelog?rev=467&root=cyrus22&r1=466&r2=467&view=diff
==============================================================================
--- branches/idled/debian/changelog (original)
+++ branches/idled/debian/changelog Fri May 19 17:12:09 2006
@@ -12,9 +12,11 @@
* Use configurable idle patch from OndÅej Surý
* Move expiry from ctl_deliver to cyr_expire as suggested by upstreams
upgrade information.
- * Add upstream patch to fix a small issue with linking and libRSAglue
-
- -- Sven Mueller <debian at incase.de> Wed, 17 May 2006 21:09:32 +0200
+ * Add upstream patch to fix a small issue with linking and libRSAglue
+ * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
+ <guenther at sendmail.com>)
+
+ -- Sven Mueller <debian at incase.de> Fri, 19 May 2006 15:27:16 +0200
cyrus-imapd-2.2 (2.2.13-2idled1) stable; urgency=low
Modified: branches/idled/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/00list?rev=467&root=cyrus22&r1=466&r2=467&view=diff
==============================================================================
--- branches/idled/debian/patches/00list (original)
+++ branches/idled/debian/patches/00list Fri May 19 17:12:09 2006
@@ -4,6 +4,7 @@
0004-upstream-fetchnews-timezone-dst-fix.dpatch
0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
0010-upstream-fix-libRSAglue-linkage.dpatch
+0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
03-fix_docs.dpatch
Modified: branches/idled/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/branches/idled/debian/patches/99-update-autoconf.dpatch?rev=467&root=cyrus22&r1=466&r2=467&view=diff
==============================================================================
--- branches/idled/debian/patches/99-update-autoconf.dpatch (original)
+++ branches/idled/debian/patches/99-update-autoconf.dpatch Fri May 19 17:12:09 2006
@@ -6,18 +6,18 @@
## DP: (64bit-quota and potentially DRAC)
@DPATCH@
-diff -urNad idled/aclocal.m4 /tmp/dpep.DD9HDc/idled/aclocal.m4
+diff -urNad idled/aclocal.m4 /tmp/dpep.62pPlg/idled/aclocal.m4
--- idled/aclocal.m4 2006-05-08 00:44:59.000000000 +0200
-+++ /tmp/dpep.DD9HDc/idled/aclocal.m4 2006-05-17 21:30:13.621891817 +0200
++++ /tmp/dpep.62pPlg/idled/aclocal.m4 2006-05-19 15:55:29.722882784 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
-diff -urNad idled/autom4te.cache/output.0 /tmp/dpep.DD9HDc/idled/autom4te.cache/output.0
+diff -urNad idled/autom4te.cache/output.0 /tmp/dpep.62pPlg/idled/autom4te.cache/output.0
--- idled/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/autom4te.cache/output.0 2006-05-17 21:30:13.648889281 +0200
++++ /tmp/dpep.62pPlg/idled/autom4te.cache/output.0 2006-05-19 15:55:29.754879798 +0200
@@ -0,0 +1,18636 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -18655,9 +18655,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad idled/autom4te.cache/output.1 /tmp/dpep.DD9HDc/idled/autom4te.cache/output.1
+diff -urNad idled/autom4te.cache/output.1 /tmp/dpep.62pPlg/idled/autom4te.cache/output.1
--- idled/autom4te.cache/output.1 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/autom4te.cache/output.1 2006-05-17 21:30:13.722882330 +0200
++++ /tmp/dpep.62pPlg/idled/autom4te.cache/output.1 2006-05-19 15:55:29.783877092 +0200
@@ -0,0 +1,18690 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -37349,9 +37349,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad idled/autom4te.cache/requests /tmp/dpep.DD9HDc/idled/autom4te.cache/requests
+diff -urNad idled/autom4te.cache/requests /tmp/dpep.62pPlg/idled/autom4te.cache/requests
--- idled/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/autom4te.cache/requests 2006-05-17 21:30:36.792715252 +0200
++++ /tmp/dpep.62pPlg/idled/autom4te.cache/requests 2006-05-19 15:57:00.705391824 +0200
@@ -0,0 +1,293 @@
+# This file was generated by Autom4te Sat Jan 8 16:59:54 PST 2005.
+# It contains the lists of macros which have been traced.
@@ -37384,18 +37384,18 @@
+ ],
+ {
+ 'CMU_USE_DB' => 1,
++ 'AC_TYPE_OFF_T' => 1,
+ 'AC_C_VOLATILE' => 1,
-+ 'AC_TYPE_OFF_T' => 1,
++ 'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'CMU_DB_LIB_WHERE' => 1,
-+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'AC_REPLACE_FNMATCH' => 1,
+ 'AC_DEFUN' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FUNC_STAT' => 1,
+ 'AC_FUNC_WAIT3' => 1,
++ 'AM_AUTOMAKE_VERSION' => 1,
++ 'AC_STRUCT_TM' => 1,
+ 'AC_FUNC_LSTAT' => 1,
-+ 'AC_STRUCT_TM' => 1,
-+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_FUNC_STRTOD' => 1,
+ 'AC_CHECK_HEADERS' => 1,
+ 'CMU_LIBSSL_LIB_WHERE1' => 1,
@@ -37406,25 +37406,25 @@
+ 'AC_PROG_AWK' => 1,
+ '_m4_warn' => 1,
+ 'CMU_LIBSSL_LIB_WHERE' => 1,
++ 'AC_HEADER_MAJOR' => 1,
+ 'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
-+ 'AC_HEADER_MAJOR' => 1,
+ 'CMU_SASL2_REQUIRE_VER' => 1,
+ 'CMU_KRB_INC_WHERE' => 1,
+ 'AC_PROG_GCC_TRADITIONAL' => 1,
+ 'IPv6_CHECK_FUNC' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_STRUCT_ST_BLOCKS' => 1,
++ 'AC_CONFIG_AUX_DIR' => 1,
+ 'AC_PROG_MAKE_SET' => 1,
-+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'sinclude' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
+ 'CMU_GUESS_RUNPATH_SWITCH' => 1,
++ 'AC_FUNC_FORK' => 1,
+ 'AC_DECL_SYS_SIGLIST' => 1,
-+ 'AC_FUNC_FORK' => 1,
+ 'CMU_KRB_INC_WHERE1' => 1,
++ 'AC_FUNC_VPRINTF' => 1,
++ 'AU_DEFUN' => 1,
+ 'CYRUS_BERKELEY_DB_OPTS' => 1,
-+ 'AU_DEFUN' => 1,
-+ 'AC_FUNC_VPRINTF' => 1,
+ 'IPv6_CHECK_SOCKLEN_T' => 1,
+ 'AC_INIT' => 1,
+ 'AC_STRUCT_TIMEZONE' => 1,
@@ -37447,32 +37447,32 @@
+ 'AC_FUNC_UTIME_NULL' => 1,
+ 'AC_FUNC_SELECT_ARGTYPES' => 1,
+ 'CMU_AFS_WHERE' => 1,
++ 'AC_HEADER_STAT' => 1,
+ 'AC_FUNC_STRFTIME' => 1,
-+ 'AC_HEADER_STAT' => 1,
+ 'CMU_LIBSSL_INC_WHERE1' => 1,
+ 'AC_C_INLINE' => 1,
+ 'CMU_C___ATTRIBUTE__' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1,
+ 'AM_GNU_GETTEXT' => 1,
++ 'AC_FUNC_OBSTACK' => 1,
++ 'CMU_KRB_LIB_WHERE1' => 1,
+ 'AC_CHECK_LIB' => 1,
-+ 'CMU_KRB_LIB_WHERE1' => 1,
-+ 'AC_FUNC_OBSTACK' => 1,
++ 'AC_FUNC_MALLOC' => 1,
+ 'CMU_TEST_INCPATH' => 1,
-+ 'AC_FUNC_MALLOC' => 1,
++ 'AC_FUNC_GETGROUPS' => 1,
+ 'CMU_ADD_LIBPATH' => 1,
-+ 'AC_FUNC_GETGROUPS' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
+ 'AC_FUNC_FSEEKO' => 1,
++ 'AM_PROG_CC_C_O' => 1,
++ 'CMU_CHECK_HEADER_NOCACHE' => 1,
+ 'SASL_GSSAPI_CHK' => 1,
-+ 'CMU_CHECK_HEADER_NOCACHE' => 1,
-+ 'AM_PROG_CC_C_O' => 1,
++ 'AM_CONDITIONAL' => 1,
++ 'AC_FUNC_MKTIME' => 1,
+ 'CYRUS_BERKELEY_DB_CHK' => 1,
-+ 'AC_FUNC_MKTIME' => 1,
-+ 'AM_CONDITIONAL' => 1,
+ 'AC_HEADER_SYS_WAIT' => 1,
++ 'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
-+ 'AC_PROG_LN_S' => 1,
+ 'm4_include' => 1,
+ 'AC_HEADER_DIRENT' => 1,
+ 'CMU_KRB_RD_REQ_PROTO' => 1,
@@ -37511,28 +37511,28 @@
+ 'CMU_DB4_LIB_WHERE1' => 1,
+ 'SASL_SET_GSSAPI_LIBS' => 1,
+ 'AC_FUNC_REALLOC' => 1,
++ 'AC_CONFIG_LINKS' => 1,
++ 'CMU_KRB_LIB_WHERE' => 1,
+ 'CMU_KRB_SENDAUTH_PROTO' => 1,
-+ 'CMU_KRB_LIB_WHERE' => 1,
-+ 'AC_CONFIG_LINKS' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'CMU_SASL2' => 1,
++ 'CMU_DB_INC_WHERE1' => 1,
+ 'AC_PROG_CPP' => 1,
-+ 'CMU_DB_INC_WHERE1' => 1,
++ 'AC_C_CONST' => 1,
++ 'AC_PROG_LEX' => 1,
+ 'AC_TYPE_PID_T' => 1,
-+ 'AC_PROG_LEX' => 1,
-+ 'AC_C_CONST' => 1,
+ 'CMU_LIBWRAP' => 1,
+ 'AC_FUNC_SETVBUF_REVERSED' => 1,
+ 'AC_PROG_INSTALL' => 1,
+ 'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
+ 'CMU_C_FPIC' => 1,
++ 'AH_OUTPUT' => 1,
+ 'CMU_KRB4' => 1,
-+ 'AH_OUTPUT' => 1,
+ 'AC_ISC_POSIX' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
-+ 'CMU_NEEDS_AFS' => 1,
-+ 'AC_CHECK_FUNCS' => 1
++ 'AC_CHECK_FUNCS' => 1,
++ 'CMU_NEEDS_AFS' => 1
+ }
+ ], 'Autom4te::Request' ),
+ bless( [
@@ -37549,19 +37549,19 @@
+ {
+ 'm4_pattern_forbid' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
++ 'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
-+ 'AC_C_VOLATILE' => 1,
+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'AC_REPLACE_FNMATCH' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FUNC_STAT' => 1,
++ 'AC_FUNC_WAIT3' => 1,
+ 'AC_HEADER_TIME' => 1,
-+ 'AC_FUNC_WAIT3' => 1,
++ 'AC_FUNC_LSTAT' => 1,
++ 'AC_STRUCT_TM' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
-+ 'AC_STRUCT_TM' => 1,
-+ 'AC_FUNC_LSTAT' => 1,
++ 'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
-+ 'AC_FUNC_GETMNTENT' => 1,
+ 'AC_FUNC_STRTOD' => 1,
+ 'AC_CHECK_HEADERS' => 1,
+ 'AC_FUNC_STRNLEN' => 1,
@@ -37580,17 +37580,17 @@
+ 'AC_STRUCT_ST_BLOCKS' => 1,
+ 'AC_TYPE_SIGNAL' => 1,
+ 'AC_TYPE_UID_T' => 1,
++ 'AC_PROG_MAKE_SET' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
-+ 'AC_PROG_MAKE_SET' => 1,
++ 'm4_pattern_allow' => 1,
+ 'sinclude' => 1,
-+ 'm4_pattern_allow' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
+ 'AC_PROG_CC' => 1,
++ 'AC_FUNC_FORK' => 1,
+ 'AC_DECL_SYS_SIGLIST' => 1,
-+ 'AC_FUNC_FORK' => 1,
++ 'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
-+ 'AC_FUNC_STRCOLL' => 1,
+ 'AC_PROG_YACC' => 1,
+ 'AC_INIT' => 1,
+ 'AC_STRUCT_TIMEZONE' => 1,
@@ -37612,33 +37612,33 @@
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_FUNC_UTIME_NULL' => 1,
+ 'AC_FUNC_SELECT_ARGTYPES' => 1,
++ 'AC_HEADER_STAT' => 1,
+ 'AC_FUNC_STRFTIME' => 1,
-+ 'AC_HEADER_STAT' => 1,
++ 'AC_PROG_CPP' => 1,
+ 'AC_C_INLINE' => 1,
-+ 'AC_PROG_CPP' => 1,
++ 'AC_PROG_LEX' => 1,
++ 'AC_C_CONST' => 1,
+ 'AC_TYPE_PID_T' => 1,
-+ 'AC_C_CONST' => 1,
-+ 'AC_PROG_LEX' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1,
+ 'AC_FUNC_SETVBUF_REVERSED' => 1,
+ 'AC_PROG_INSTALL' => 1,
+ 'AM_GNU_GETTEXT' => 1,
++ 'AC_FUNC_OBSTACK' => 1,
+ 'AC_CHECK_LIB' => 1,
-+ 'AC_FUNC_OBSTACK' => 1,
+ 'AC_FUNC_MALLOC' => 1,
+ 'AC_FUNC_GETGROUPS' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_FUNC_FSEEKO' => 1,
+ 'AM_PROG_CC_C_O' => 1,
++ 'AC_FUNC_MKTIME' => 1,
++ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
-+ 'AC_CANONICAL_SYSTEM' => 1,
-+ 'AC_FUNC_MKTIME' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_HEADER_SYS_WAIT' => 1,
++ 'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
-+ 'AC_PROG_LN_S' => 1,
+ 'm4_include' => 1,
+ 'AC_HEADER_DIRENT' => 1,
+ 'AC_CHECK_FUNCS' => 1
@@ -37646,9 +37646,9 @@
+ ], 'Autom4te::Request' )
+ );
+
-diff -urNad idled/autom4te.cache/traces.0 /tmp/dpep.DD9HDc/idled/autom4te.cache/traces.0
+diff -urNad idled/autom4te.cache/traces.0 /tmp/dpep.62pPlg/idled/autom4te.cache/traces.0
--- idled/autom4te.cache/traces.0 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/autom4te.cache/traces.0 2006-05-17 21:30:13.728881767 +0200
++++ /tmp/dpep.62pPlg/idled/autom4te.cache/traces.0 2006-05-19 15:55:29.790876439 +0200
@@ -0,0 +1,2900 @@
+m4trace:/usr/share/aclocal/isc-posix.m4:24: -1- AC_DEFUN([AC_ISC_POSIX], [
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
@@ -40550,9 +40550,9 @@
+You should run autoupdate.], [])
+m4trace:configure.in:1229: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:1229: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad idled/autom4te.cache/traces.1 /tmp/dpep.DD9HDc/idled/autom4te.cache/traces.1
+diff -urNad idled/autom4te.cache/traces.1 /tmp/dpep.62pPlg/idled/autom4te.cache/traces.1
--- idled/autom4te.cache/traces.1 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/autom4te.cache/traces.1 2006-05-17 21:30:13.731881485 +0200
++++ /tmp/dpep.62pPlg/idled/autom4te.cache/traces.1 2006-05-19 15:55:29.793876159 +0200
@@ -0,0 +1,1152 @@
+m4trace:aclocal.m4:14: -1- m4_include([cmulocal/berkdb.m4])
+m4trace:aclocal.m4:15: -1- m4_include([cmulocal/bsd_sockets.m4])
@@ -41706,9 +41706,9 @@
+You should run autoupdate.], [])
+m4trace:configure.in:1229: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:1229: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad idled/config.guess /tmp/dpep.DD9HDc/idled/config.guess
+diff -urNad idled/config.guess /tmp/dpep.62pPlg/idled/config.guess
--- idled/config.guess 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/config.guess 2006-05-17 21:30:36.801714407 +0200
++++ /tmp/dpep.62pPlg/idled/config.guess 2006-05-19 15:57:00.714390984 +0200
@@ -0,0 +1,1465 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
@@ -43175,9 +43175,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad idled/config.h.in /tmp/dpep.DD9HDc/idled/config.h.in
+diff -urNad idled/config.h.in /tmp/dpep.62pPlg/idled/config.h.in
--- idled/config.h.in 2006-05-08 00:44:59.000000000 +0200
-+++ /tmp/dpep.DD9HDc/idled/config.h.in 2006-05-17 21:30:13.737880921 +0200
++++ /tmp/dpep.62pPlg/idled/config.h.in 2006-05-19 15:55:29.799875599 +0200
@@ -153,8 +153,8 @@
/* Do we have TCP wrappers? */
#undef HAVE_LIBWRAP
@@ -43226,9 +43226,9 @@
};
#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad idled/config.sub /tmp/dpep.DD9HDc/idled/config.sub
+diff -urNad idled/config.sub /tmp/dpep.62pPlg/idled/config.sub
--- idled/config.sub 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.DD9HDc/idled/config.sub 2006-05-17 21:30:36.799714595 +0200
++++ /tmp/dpep.62pPlg/idled/config.sub 2006-05-19 15:57:00.713391077 +0200
@@ -0,0 +1,1569 @@
+#! /bin/sh
+# Configuration validation subroutine script.
@@ -44799,9 +44799,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad idled/configure /tmp/dpep.DD9HDc/idled/configure
+diff -urNad idled/configure /tmp/dpep.62pPlg/idled/configure
--- idled/configure 2006-05-08 00:44:59.000000000 +0200
-+++ /tmp/dpep.DD9HDc/idled/configure 2006-05-17 21:30:13.754879325 +0200
++++ /tmp/dpep.62pPlg/idled/configure 2006-05-19 15:55:29.815874106 +0200
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=467&root=cyrus22&r1=466&r2=467&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Fri May 19 17:12:09 2006
@@ -4,9 +4,11 @@
* Backport of 2.2.13-3 to sarge
* Move expiry from ctl_deliver to cyr_expire as suggested by upstreams
upgrade information.
- * Add upstream patch to fix a small issue with linking and libRSAglue
-
- -- Sven Mueller <debian at incase.de> Wed, 17 May 2006 21:09:32 +0200
+ * Add upstream patch to fix a small issue with linking and libRSAglue
+ * Add upstream patch to compile with MIT krb5 1.4.3 (Philip Guenther
+ <guenther at sendmail.com>)
+
+ -- Sven Mueller <debian at incase.de> Fri, 19 May 2006 15:27:16 +0200
cyrus-imapd-2.2 (2.2.13-3) unstable; urgency=high
Modified: branches/sarge-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/00list?rev=467&root=cyrus22&r1=466&r2=467&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/00list (original)
+++ branches/sarge-2.2.13/debian/patches/00list Fri May 19 17:12:09 2006
@@ -4,6 +4,7 @@
0004-upstream-fetchnews-timezone-dst-fix.dpatch
0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
0010-upstream-fix-libRSAglue-linkage.dpatch
+0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
01-fix_Makefile.in.dpatch
02-add_mkinstalldirs.dpatch
03-fix_docs.dpatch
Modified: branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch?rev=467&root=cyrus22&r1=466&r2=467&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch Fri May 19 17:12:09 2006
@@ -6,18 +6,18 @@
## DP: (64bit-quota and potentially DRAC)
@DPATCH@
-diff -urNad sarge-2.2.13/aclocal.m4 /tmp/dpep.Zde48E/sarge-2.2.13/aclocal.m4
+diff -urNad sarge-2.2.13/aclocal.m4 /tmp/dpep.FYPeej/sarge-2.2.13/aclocal.m4
--- sarge-2.2.13/aclocal.m4 2006-04-23 21:11:53.000000000 +0200
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/aclocal.m4 2006-05-17 21:26:44.028580540 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/aclocal.m4 2006-05-19 15:53:28.706175088 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
-diff -urNad sarge-2.2.13/autom4te.cache/output.0 /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/output.0
+diff -urNad sarge-2.2.13/autom4te.cache/output.0 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.0
--- sarge-2.2.13/autom4te.cache/output.0 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/output.0 2006-05-17 21:26:43.760605713 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.0 2006-05-19 15:53:28.736172289 +0200
@@ -0,0 +1,18639 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -18658,9 +18658,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad sarge-2.2.13/autom4te.cache/output.1 /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/output.1
+diff -urNad sarge-2.2.13/autom4te.cache/output.1 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.1
--- sarge-2.2.13/autom4te.cache/output.1 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/output.1 2006-05-17 21:26:48.813131080 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/output.1 2006-05-19 15:53:28.765169584 +0200
@@ -0,0 +1,18693 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -37355,9 +37355,9 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNad sarge-2.2.13/autom4te.cache/requests /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/requests
+diff -urNad sarge-2.2.13/autom4te.cache/requests /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/requests
--- sarge-2.2.13/autom4te.cache/requests 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/requests 2006-05-17 21:26:51.131913255 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/requests 2006-05-19 15:53:57.522486346 +0200
@@ -0,0 +1,293 @@
+# This file was generated by Autom4te Sat Jan 8 16:59:54 PST 2005.
+# It contains the lists of macros which have been traced.
@@ -37390,18 +37390,18 @@
+ ],
+ {
+ 'CMU_USE_DB' => 1,
++ 'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
-+ 'AC_C_VOLATILE' => 1,
++ 'CMU_DB_LIB_WHERE' => 1,
+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
-+ 'CMU_DB_LIB_WHERE' => 1,
+ 'AC_REPLACE_FNMATCH' => 1,
+ 'AC_DEFUN' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FUNC_STAT' => 1,
+ 'AC_FUNC_WAIT3' => 1,
++ 'AC_FUNC_LSTAT' => 1,
++ 'AC_STRUCT_TM' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
-+ 'AC_STRUCT_TM' => 1,
-+ 'AC_FUNC_LSTAT' => 1,
+ 'AC_FUNC_STRTOD' => 1,
+ 'AC_CHECK_HEADERS' => 1,
+ 'CMU_LIBSSL_LIB_WHERE1' => 1,
@@ -37412,25 +37412,25 @@
+ 'AC_PROG_AWK' => 1,
+ '_m4_warn' => 1,
+ 'CMU_LIBSSL_LIB_WHERE' => 1,
++ 'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
+ 'AC_HEADER_MAJOR' => 1,
-+ 'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
+ 'CMU_SASL2_REQUIRE_VER' => 1,
+ 'CMU_KRB_INC_WHERE' => 1,
+ 'AC_PROG_GCC_TRADITIONAL' => 1,
+ 'IPv6_CHECK_FUNC' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_STRUCT_ST_BLOCKS' => 1,
++ 'AC_PROG_MAKE_SET' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
-+ 'AC_PROG_MAKE_SET' => 1,
+ 'sinclude' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
+ 'CMU_GUESS_RUNPATH_SWITCH' => 1,
++ 'AC_DECL_SYS_SIGLIST' => 1,
+ 'AC_FUNC_FORK' => 1,
-+ 'AC_DECL_SYS_SIGLIST' => 1,
+ 'CMU_KRB_INC_WHERE1' => 1,
++ 'CYRUS_BERKELEY_DB_OPTS' => 1,
++ 'AU_DEFUN' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
-+ 'AU_DEFUN' => 1,
-+ 'CYRUS_BERKELEY_DB_OPTS' => 1,
+ 'IPv6_CHECK_SOCKLEN_T' => 1,
+ 'AC_INIT' => 1,
+ 'AC_STRUCT_TIMEZONE' => 1,
@@ -37453,32 +37453,32 @@
+ 'AC_FUNC_UTIME_NULL' => 1,
+ 'AC_FUNC_SELECT_ARGTYPES' => 1,
+ 'CMU_AFS_WHERE' => 1,
++ 'AC_FUNC_STRFTIME' => 1,
+ 'AC_HEADER_STAT' => 1,
-+ 'AC_FUNC_STRFTIME' => 1,
+ 'CMU_LIBSSL_INC_WHERE1' => 1,
+ 'AC_C_INLINE' => 1,
+ 'CMU_C___ATTRIBUTE__' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1,
+ 'AM_GNU_GETTEXT' => 1,
++ 'AC_CHECK_LIB' => 1,
++ 'CMU_KRB_LIB_WHERE1' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
-+ 'CMU_KRB_LIB_WHERE1' => 1,
-+ 'AC_CHECK_LIB' => 1,
++ 'CMU_TEST_INCPATH' => 1,
+ 'AC_FUNC_MALLOC' => 1,
-+ 'CMU_TEST_INCPATH' => 1,
++ 'CMU_ADD_LIBPATH' => 1,
+ 'AC_FUNC_GETGROUPS' => 1,
-+ 'CMU_ADD_LIBPATH' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
+ 'AC_FUNC_FSEEKO' => 1,
++ 'SASL_GSSAPI_CHK' => 1,
++ 'CMU_CHECK_HEADER_NOCACHE' => 1,
+ 'AM_PROG_CC_C_O' => 1,
-+ 'CMU_CHECK_HEADER_NOCACHE' => 1,
-+ 'SASL_GSSAPI_CHK' => 1,
++ 'CYRUS_BERKELEY_DB_CHK' => 1,
++ 'AC_FUNC_MKTIME' => 1,
+ 'AM_CONDITIONAL' => 1,
-+ 'AC_FUNC_MKTIME' => 1,
-+ 'CYRUS_BERKELEY_DB_CHK' => 1,
+ 'AC_HEADER_SYS_WAIT' => 1,
++ 'AC_FUNC_MEMCMP' => 1,
+ 'AC_PROG_LN_S' => 1,
-+ 'AC_FUNC_MEMCMP' => 1,
+ 'm4_include' => 1,
+ 'AC_HEADER_DIRENT' => 1,
+ 'CMU_KRB_RD_REQ_PROTO' => 1,
@@ -37517,28 +37517,28 @@
+ 'CMU_DB4_LIB_WHERE1' => 1,
+ 'SASL_SET_GSSAPI_LIBS' => 1,
+ 'AC_FUNC_REALLOC' => 1,
++ 'CMU_KRB_SENDAUTH_PROTO' => 1,
++ 'CMU_KRB_LIB_WHERE' => 1,
+ 'AC_CONFIG_LINKS' => 1,
-+ 'CMU_KRB_LIB_WHERE' => 1,
-+ 'CMU_KRB_SENDAUTH_PROTO' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'CMU_SASL2' => 1,
++ 'AC_PROG_CPP' => 1,
+ 'CMU_DB_INC_WHERE1' => 1,
-+ 'AC_PROG_CPP' => 1,
++ 'AC_TYPE_PID_T' => 1,
++ 'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
-+ 'AC_PROG_LEX' => 1,
-+ 'AC_TYPE_PID_T' => 1,
+ 'CMU_LIBWRAP' => 1,
+ 'AC_FUNC_SETVBUF_REVERSED' => 1,
+ 'AC_PROG_INSTALL' => 1,
+ 'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
+ 'CMU_C_FPIC' => 1,
++ 'CMU_KRB4' => 1,
+ 'AH_OUTPUT' => 1,
-+ 'CMU_KRB4' => 1,
+ 'AC_ISC_POSIX' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
-+ 'AC_CHECK_FUNCS' => 1,
-+ 'CMU_NEEDS_AFS' => 1
++ 'CMU_NEEDS_AFS' => 1,
++ 'AC_CHECK_FUNCS' => 1
+ }
+ ], 'Autom4te::Request' ),
+ bless( [
@@ -37555,19 +37555,19 @@
+ {
+ 'm4_pattern_forbid' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
++ 'AC_TYPE_OFF_T' => 1,
+ 'AC_C_VOLATILE' => 1,
-+ 'AC_TYPE_OFF_T' => 1,
+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'AC_REPLACE_FNMATCH' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FUNC_STAT' => 1,
++ 'AC_HEADER_TIME' => 1,
+ 'AC_FUNC_WAIT3' => 1,
-+ 'AC_HEADER_TIME' => 1,
++ 'AM_AUTOMAKE_VERSION' => 1,
++ 'AC_STRUCT_TM' => 1,
+ 'AC_FUNC_LSTAT' => 1,
-+ 'AC_STRUCT_TM' => 1,
-+ 'AM_AUTOMAKE_VERSION' => 1,
++ 'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
-+ 'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_STRTOD' => 1,
+ 'AC_CHECK_HEADERS' => 1,
+ 'AC_FUNC_STRNLEN' => 1,
@@ -37586,17 +37586,17 @@
+ 'AC_STRUCT_ST_BLOCKS' => 1,
+ 'AC_TYPE_SIGNAL' => 1,
+ 'AC_TYPE_UID_T' => 1,
++ 'AC_CONFIG_AUX_DIR' => 1,
+ 'AC_PROG_MAKE_SET' => 1,
-+ 'AC_CONFIG_AUX_DIR' => 1,
++ 'sinclude' => 1,
+ 'm4_pattern_allow' => 1,
-+ 'sinclude' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
+ 'AC_PROG_CC' => 1,
++ 'AC_DECL_SYS_SIGLIST' => 1,
+ 'AC_FUNC_FORK' => 1,
-+ 'AC_DECL_SYS_SIGLIST' => 1,
++ 'AC_FUNC_VPRINTF' => 1,
+ 'AC_FUNC_STRCOLL' => 1,
-+ 'AC_FUNC_VPRINTF' => 1,
+ 'AC_PROG_YACC' => 1,
+ 'AC_INIT' => 1,
+ 'AC_STRUCT_TIMEZONE' => 1,
@@ -37618,33 +37618,33 @@
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_FUNC_UTIME_NULL' => 1,
+ 'AC_FUNC_SELECT_ARGTYPES' => 1,
++ 'AC_FUNC_STRFTIME' => 1,
+ 'AC_HEADER_STAT' => 1,
-+ 'AC_FUNC_STRFTIME' => 1,
++ 'AC_C_INLINE' => 1,
+ 'AC_PROG_CPP' => 1,
-+ 'AC_C_INLINE' => 1,
++ 'AC_TYPE_PID_T' => 1,
++ 'AC_C_CONST' => 1,
+ 'AC_PROG_LEX' => 1,
-+ 'AC_C_CONST' => 1,
-+ 'AC_TYPE_PID_T' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1,
+ 'AC_FUNC_SETVBUF_REVERSED' => 1,
+ 'AC_PROG_INSTALL' => 1,
+ 'AM_GNU_GETTEXT' => 1,
++ 'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
-+ 'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_MALLOC' => 1,
+ 'AC_FUNC_GETGROUPS' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_FUNC_FSEEKO' => 1,
+ 'AM_PROG_CC_C_O' => 1,
++ 'AM_CONDITIONAL' => 1,
++ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_FUNC_MKTIME' => 1,
-+ 'AC_CANONICAL_SYSTEM' => 1,
-+ 'AM_CONDITIONAL' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_HEADER_SYS_WAIT' => 1,
++ 'AC_FUNC_MEMCMP' => 1,
+ 'AC_PROG_LN_S' => 1,
-+ 'AC_FUNC_MEMCMP' => 1,
+ 'm4_include' => 1,
+ 'AC_HEADER_DIRENT' => 1,
+ 'AC_CHECK_FUNCS' => 1
@@ -37652,9 +37652,9 @@
+ ], 'Autom4te::Request' )
+ );
+
-diff -urNad sarge-2.2.13/autom4te.cache/traces.0 /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/traces.0
+diff -urNad sarge-2.2.13/autom4te.cache/traces.0 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.0
--- sarge-2.2.13/autom4te.cache/traces.0 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/traces.0 2006-05-17 21:26:43.760605713 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.0 2006-05-19 15:53:28.772168931 +0200
@@ -0,0 +1,2900 @@
+m4trace:/usr/share/aclocal/isc-posix.m4:24: -1- AC_DEFUN([AC_ISC_POSIX], [
+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
@@ -40556,9 +40556,9 @@
+You should run autoupdate.], [])
+m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad sarge-2.2.13/autom4te.cache/traces.1 /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/traces.1
+diff -urNad sarge-2.2.13/autom4te.cache/traces.1 /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.1
--- sarge-2.2.13/autom4te.cache/traces.1 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/autom4te.cache/traces.1 2006-05-17 21:26:48.813131080 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/autom4te.cache/traces.1 2006-05-19 15:53:28.775168651 +0200
@@ -0,0 +1,1152 @@
+m4trace:aclocal.m4:14: -1- m4_include([cmulocal/berkdb.m4])
+m4trace:aclocal.m4:15: -1- m4_include([cmulocal/bsd_sockets.m4])
@@ -41712,9 +41712,9 @@
+You should run autoupdate.], [])
+m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
+m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad sarge-2.2.13/config.guess /tmp/dpep.Zde48E/sarge-2.2.13/config.guess
+diff -urNad sarge-2.2.13/config.guess /tmp/dpep.FYPeej/sarge-2.2.13/config.guess
--- sarge-2.2.13/config.guess 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/config.guess 2006-05-17 21:26:51.140912410 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/config.guess 2006-05-19 15:53:57.531485506 +0200
@@ -0,0 +1,1465 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
@@ -43181,9 +43181,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad sarge-2.2.13/config.h.in /tmp/dpep.Zde48E/sarge-2.2.13/config.h.in
+diff -urNad sarge-2.2.13/config.h.in /tmp/dpep.FYPeej/sarge-2.2.13/config.h.in
--- sarge-2.2.13/config.h.in 2006-04-23 21:11:53.000000000 +0200
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/config.h.in 2006-05-17 21:26:32.660648442 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/config.h.in 2006-05-19 15:53:28.780168184 +0200
@@ -153,8 +153,8 @@
/* Do we have TCP wrappers? */
#undef HAVE_LIBWRAP
@@ -43232,9 +43232,9 @@
};
#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad sarge-2.2.13/config.sub /tmp/dpep.Zde48E/sarge-2.2.13/config.sub
+diff -urNad sarge-2.2.13/config.sub /tmp/dpep.FYPeej/sarge-2.2.13/config.sub
--- sarge-2.2.13/config.sub 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/config.sub 2006-05-17 21:26:51.138912597 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/config.sub 2006-05-19 15:53:57.529485693 +0200
@@ -0,0 +1,1569 @@
+#! /bin/sh
+# Configuration validation subroutine script.
@@ -44805,9 +44805,9 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad sarge-2.2.13/configure /tmp/dpep.Zde48E/sarge-2.2.13/configure
+diff -urNad sarge-2.2.13/configure /tmp/dpep.FYPeej/sarge-2.2.13/configure
--- sarge-2.2.13/configure 2006-04-23 21:11:53.000000000 +0200
-+++ /tmp/dpep.Zde48E/sarge-2.2.13/configure 2006-05-17 21:26:51.127913631 +0200
++++ /tmp/dpep.FYPeej/sarge-2.2.13/configure 2006-05-19 15:53:28.796166692 +0200
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list