[SVN] r886 - in /trunk/cyrus-imapd-2.2.13/debian: changelog control patches/99-berkelydb-4.8.dpatch patches/99-update-autoconf.dpatch rules
debian at incase.de
debian at incase.de
Sat Jan 23 23:06:08 UTC 2010
Author: myon
Date: Sun Jan 24 00:06:04 2010
New Revision: 886
URL: https://mail.incase.de/viewcvs?rev=886&root=cyrus22&view=rev
Log:
* Switch to BerkeleyDB 4.7, the version OpenLDAP uses.
* Upload to unstable for the libkrb transition.
Modified:
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/control
trunk/cyrus-imapd-2.2.13/debian/patches/99-berkelydb-4.8.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch
trunk/cyrus-imapd-2.2.13/debian/rules
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=886&root=cyrus22&r1=885&r2=886&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Sun Jan 24 00:06:04 2010
@@ -1,11 +1,13 @@
-cyrus-imapd-2.2 (2.2.13-19) unreleased; urgency=low
-
+cyrus-imapd-2.2 (2.2.13-19) unstable; urgency=low
+
+ * Switch to BerkeleyDB 4.7, the version OpenLDAP uses.
* Add patch by Cristian Rigamonti to fix logcheck rules for "defaultbc
doesn't exist" error message. (Closes: #511030)
* Update Vietnamese debconf translation, thanks Clytie Siddall.
(Closes: #548052)
-
- -- Christoph Berg <myon at debian.org> Sat, 23 Jan 2010 14:01:40 +0100
+ * Upload to unstable for the libkrb transition.
+
+ -- Christoph Berg <myon at debian.org> Sat, 23 Jan 2010 23:35:21 +0100
cyrus-imapd-2.2 (2.2.13-18) experimental; urgency=low
Modified: trunk/cyrus-imapd-2.2.13/debian/control
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/control?rev=886&root=cyrus22&r1=885&r2=886&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/control (original)
+++ trunk/cyrus-imapd-2.2.13/debian/control Sun Jan 24 00:06:04 2010
@@ -4,7 +4,7 @@
Maintainer: Debian Cyrus Team <pkg-cyrus-imapd-debian-devel at lists.alioth.debian.org>
Uploaders: Henrique de Moraes Holschuh <hmh at debian.org>, Sven Mueller <sven at debian.org>, Benjamin Seidenberg <benjamin at debian.org>, OndÃ…=C2™ej Surý <ondrej at debian.org>, Christoph Berg <myon at debian.org>
Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 5), quilt, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.8-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
+Build-Depends: debhelper (>= 5), quilt, tcl-dev | tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.7-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, libsnmp-dev | libsnmp9-dev, perl, xutils-dev | xutils, flex, bison, autotools-dev, po-debconf, transfig, ghostscript | gs-gpl, groff, libkvm-dev [kfreebsd-i386], libkvm-dev [kfreebsd-amd64], heimdal-dev
Vcs-Browser: https://mail.incase.de/viewcvs/trunk/?root=cyrus22
Vcs-Svn: https://mail.incase.de/svn/cyrus22/trunk
Homepage: http://cyrusimap.web.cmu.edu/
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/99-berkelydb-4.8.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/99-berkelydb-4.8.dpatch?rev=886&root=cyrus22&r1=885&r2=886&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/99-berkelydb-4.8.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/99-berkelydb-4.8.dpatch Sun Jan 24 00:06:04 2010
@@ -3,13 +3,14 @@
@DPATCH@
--- a/cmulocal/berkdb.m4
+++ b/cmulocal/berkdb.m4
-@@ -213,7 +213,11 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
+@@ -213,7 +213,12 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
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.8 db4.8 db48 \
++ for dbname in \
+ db-4.7 db4.7 db47 \
++ db-4.8 db4.8 db48 \
+ db-4.6 db4.6 db46 \
+ 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
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch?rev=886&root=cyrus22&r1=885&r2=886&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch Sun Jan 24 00:06:04 2010
@@ -6175,7 +6175,7 @@
CFLAGS=$save_CFLAGS
fi
-@@ -3490,6332 +4812,1889 @@ if test "$ac_cv_fpic" = "yes"; then
+@@ -3490,6332 +4812,1890 @@ if test "$ac_cv_fpic" = "yes"; then
else
FPIC_CFLAGS=""
fi
@@ -8636,8 +8636,9 @@
+ fi
+
+ saved_LIBS=$LIBS
-+ for dbname in db-4.8 db4.8 db48 \
++ for dbname in \
+ db-4.7 db4.7 db47 \
++ db-4.8 db4.8 db48 \
+ db-4.6 db4.6 db46 \
+ 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
@@ -13858,7 +13859,7 @@
cyrus_cv_sys_sco=no
fi
rm -f conftest.err conftest.$ac_ext
-@@ -9824,49 +6703,25 @@ fi
+@@ -9824,49 +6704,25 @@ fi
if test $cyrus_cv_sys_sco = yes; then
spt_type=SPT_SCO
fi
@@ -13916,7 +13917,7 @@
cyrus_cv_sys_setproctitle=no
fi
rm -f conftest.err conftest.$ac_ext
-@@ -9875,8 +6730,8 @@ fi
+@@ -9875,8 +6731,8 @@ fi
if test $cyrus_cv_sys_setproctitle = no; then
spt_type=SPT_NONE
fi
@@ -13927,7 +13928,7 @@
fi
if test "$spt_type" != ""; then
-@@ -9886,16 +6741,12 @@ _ACEOF
+@@ -9886,16 +6742,12 @@ _ACEOF
fi
@@ -13949,7 +13950,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/file.h>
-@@ -9911,54 +6762,26 @@ fcntl(0, F_GETFL, 0)&FNDELAY
+@@ -9911,54 +6763,26 @@ fcntl(0, F_GETFL, 0)&FNDELAY
return 0;
}
_ACEOF
@@ -14015,7 +14016,7 @@
/* end confdefs.h. */
#include <time.h>
-@@ -9972,55 +6795,27 @@ tm.tm_gmtoff = 0;
+@@ -9972,55 +6796,27 @@ tm.tm_gmtoff = 0;
return 0;
}
_ACEOF
@@ -14082,7 +14083,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -10048,48 +6843,31 @@ if (strncmp(base+4, "test", 4) != 0) exi
+@@ -10048,48 +6844,31 @@ if (strncmp(base+4, "test", 4) != 0) exi
exit(0);}
_ACEOF
@@ -14144,7 +14145,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -10118,242 +6896,51 @@ if (strncmp(base, "xyzz", 4) != 0) exit(
+@@ -10118,242 +6897,51 @@ if (strncmp(base, "xyzz", 4) != 0) exit(
exit(0);}
_ACEOF
@@ -14407,7 +14408,7 @@
fi
-@@ -10361,180 +6948,57 @@ fi
+@@ -10361,180 +6949,57 @@ fi
fi
@@ -14608,7 +14609,7 @@
fi
-@@ -10544,241 +7008,96 @@ fi
+@@ -10544,241 +7009,96 @@ fi
cant_find_sigvec=no
@@ -14886,7 +14887,7 @@
cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
else
-@@ -10800,34 +7119,32 @@ fi
+@@ -10800,34 +7120,32 @@ fi
# all authentication goes through SASL
@@ -14937,7 +14938,7 @@
if test "x$with_afs" != "xno"; then
if test ! -d $with_afs; then
-@@ -10850,19 +7167,15 @@ if test "x$with_afs" != "xno"; then
+@@ -10850,19 +7168,15 @@ if test "x$with_afs" != "xno"; then
AFS_LIBS="$AFS_LIBS -lc -lucb"
fi
@@ -14962,7 +14963,7 @@
/* end confdefs.h. */
IOMGR_Initialize();
int
-@@ -10873,60 +7186,34 @@ IOMGR_Initialize()
+@@ -10873,60 +7187,34 @@ IOMGR_Initialize()
return 0;
}
_ACEOF
@@ -15033,7 +15034,7 @@
fi
else
-@@ -10934,9 +7221,7 @@ _ACEOF
+@@ -10934,9 +7222,7 @@ _ACEOF
@@ -15044,7 +15045,7 @@
fi
LIBS="$SAVE_LIBS"
-@@ -10960,75 +7245,45 @@ if test "x$with_ldap" != "xno"; then
+@@ -10960,75 +7246,45 @@ if test "x$with_ldap" != "xno"; then
CPPFLAGS=$LDAP_CPPFLAGS
LDFLAGS=$LDAP_LDFLAGS
@@ -15137,7 +15138,7 @@
-@@ -11045,116 +7300,85 @@ if test "x$with_afs" != "xno" -o "x$with
+@@ -11045,116 +7301,85 @@ if test "x$with_afs" != "xno" -o "x$with
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
@@ -15290,7 +15291,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
_ACEOF
-@@ -11165,105 +7389,73 @@ fi
+@@ -11165,105 +7390,73 @@ fi
if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
@@ -15423,7 +15424,7 @@
else
for krbhloc in include/kerberosIV include
-@@ -11275,8 +7467,8 @@ else
+@@ -11275,8 +7468,8 @@ else
done
fi
@@ -15434,7 +15435,7 @@
if test -n "${cyrus_krbinclude}"; then
CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-@@ -11298,237 +7490,73 @@ else
+@@ -11298,237 +7491,73 @@ else
fi
if test "$with_des" != no; then
@@ -15700,7 +15701,7 @@
fi
-@@ -11539,11 +7567,11 @@ SASL_GSSAPI_LIBS_SET="yes"
+@@ -11539,11 +7568,11 @@ SASL_GSSAPI_LIBS_SET="yes"
IMAP_PROGS=""
@@ -15717,7 +15718,7 @@
OPENSSL_INC=
OPENSSL_LIB=
-@@ -11551,71 +7579,43 @@ case "$with_openssl" in
+@@ -11551,71 +7580,43 @@ case "$with_openssl" in
no) with_openssl="no";;
""|yes)
LIB_RSAREF=""
@@ -15805,7 +15806,7 @@
LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
else
cmu_have_rsaref=no
-@@ -11623,141 +7623,85 @@ fi
+@@ -11623,141 +7624,85 @@ fi
with_openssl="yes"
@@ -15979,7 +15980,7 @@
LIBS="-lssl ${LIBS}"
else
with_openssl="no"
-@@ -11788,28 +7732,22 @@ fi
+@@ -11788,28 +7733,22 @@ fi
LIBS="${LIBS} -lssl -lcrypto";;
esac
@@ -16015,7 +16016,7 @@
fi
fi
-@@ -11817,12 +7755,12 @@ fi
+@@ -11817,12 +7756,12 @@ fi
@@ -16033,7 +16034,7 @@
if test -n "$EGD_SOCKET" ; then
cat >>confdefs.h <<_ACEOF
-@@ -11832,11 +7770,11 @@ _ACEOF
+@@ -11832,11 +7771,11 @@ _ACEOF
fi
@@ -16050,7 +16051,7 @@
if test -z "$with_zephyr"; then
if test -f /usr/local/lib/libzephyr.a; then
with_zephyr="/usr/local"
-@@ -11848,71 +7786,43 @@ ZEPHYR_LIBS=""
+@@ -11848,71 +7787,43 @@ ZEPHYR_LIBS=""
ZEPHYR_CPPFLAGS=""
case "$with_zephyr" in
no) true;;
@@ -16138,7 +16139,7 @@
ZEPHYR_LIBS="-lzephyr"
else
with_zephyr="no"
-@@ -11929,425 +7839,116 @@ esac
+@@ -11929,425 +7840,116 @@ esac
if test "$with_zephyr" != "no"; then
@@ -16643,7 +16644,7 @@
fi
-@@ -12356,10 +7957,10 @@ fi
+@@ -12356,10 +7958,10 @@ fi
# Extract the first word of "compile_et", so it can be a program name with args.
set dummy compile_et; ac_word=$2
@@ -16658,7 +16659,7 @@
else
case $COMPILE_ET in
[\\/]* | ?:[\\/]*)
-@@ -12371,40 +7972,41 @@ for as_dir in $PATH
+@@ -12371,40 +7973,41 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16713,7 +16714,7 @@
else
case $COMPILE_ET in
[\\/]* | ?:[\\/]*)
-@@ -12416,37 +8018,38 @@ for as_dir in $PATH
+@@ -12416,37 +8019,38 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16765,7 +16766,7 @@
else
case $COMPILE_ET in
[\\/]* | ?:[\\/]*)
-@@ -12458,29 +8061,30 @@ for as_dir in $PATH
+@@ -12458,29 +8062,30 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16805,7 +16806,7 @@
else
# use ours
with_com_err=yes
-@@ -12490,15 +8094,15 @@ fi
+@@ -12490,15 +8095,15 @@ fi
if test "${with_com_err}" = "no"; then
@@ -16827,7 +16828,7 @@
with_com_err="yes" # build it ourselves
fi
fi
-@@ -12535,45 +8139,21 @@ esac
+@@ -12535,45 +8140,21 @@ esac
@@ -16879,7 +16880,7 @@
cyrus_cv_lib_syslog=no
fi
rm -f conftest.err conftest.$ac_ext
-@@ -12585,522 +8165,188 @@ if test $cyrus_cv_lib_syslog = no; then
+@@ -12585,522 +8166,188 @@ if test $cyrus_cv_lib_syslog = no; then
DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
fi
@@ -17489,7 +17490,7 @@
LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
else
cmu_have_crypt=no
-@@ -13112,21 +8358,21 @@ fi
+@@ -13112,21 +8359,21 @@ fi
@@ -17521,7 +17522,7 @@
if test "$gssapi" != no; then
platform=
-@@ -13149,12 +8395,10 @@ if test "$gssapi" != no; then
+@@ -13149,12 +8396,10 @@ if test "$gssapi" != no; then
platform=__aix
;;
*)
@@ -17537,7 +17538,7 @@
fi
;;
esac
-@@ -13178,292 +8422,18 @@ echo "$as_me: error: CyberSafe was force
+@@ -13178,292 +8423,18 @@ echo "$as_me: error: CyberSafe was force
fi
fi
fi
@@ -17837,7 +17838,7 @@
fi
-@@ -13484,72 +8454,43 @@ if test "$gssapi" != no; then
+@@ -13484,72 +8455,43 @@ if test "$gssapi" != no; then
#
# The choice is reflected in GSSAPIBASE_LIBS
@@ -17926,7 +17927,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
_ACEOF
-@@ -13575,71 +8516,43 @@ fi
+@@ -13575,71 +8517,43 @@ fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
gss_failed=0
@@ -18014,7 +18015,7 @@
gss_impl="heimdal"
else
gss_failed=1
-@@ -13651,72 +8564,86 @@ fi
+@@ -13651,72 +8565,86 @@ fi
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
@@ -18146,7 +18147,7 @@
gss_impl="mit"
else
gss_failed=1
-@@ -13747,139 +8674,83 @@ fi
+@@ -13747,139 +8675,83 @@ fi
# library (older CyberSafe)
unset ac_cv_lib_gss_csf_gss_acq_user
@@ -18318,7 +18319,7 @@
gss_impl="cybersafe"
else
gss_failed=1
-@@ -13901,71 +8772,43 @@ fi
+@@ -13901,71 +8773,43 @@ fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
gss_failed=0
@@ -18406,7 +18407,7 @@
gss_impl="seam"
else
gss_failed=1
-@@ -13977,8 +8820,8 @@ fi
+@@ -13977,8 +8821,8 @@ fi
fi
if test "$gss_impl" = "mit"; then
@@ -18417,7 +18418,7 @@
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-@@ -14002,14 +8845,14 @@ fi
+@@ -14002,14 +8846,14 @@ fi
gssapi="no"
GSSAPIBASE_LIBS=
GSSAPIBASE_STATIC_LIBS=
@@ -18436,7 +18437,7 @@
fi
fi
-@@ -14019,11 +8862,7 @@ fi
+@@ -14019,11 +8863,7 @@ fi
#
if test "$gssapi" != "no"; then
if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
@@ -18449,7 +18450,7 @@
/* end confdefs.h. */
#include <gssapi/gssapi.h>
#ifdef GSS_C_NT_HOSTBASED_SERVICE
-@@ -14031,55 +8870,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -14031,55 +8871,41 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -18515,7 +18516,7 @@
fi
rm -f conftest*
-@@ -14087,11 +8912,7 @@ rm -f conftest*
+@@ -14087,11 +8913,7 @@ rm -f conftest*
fi
if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
@@ -18528,7 +18529,7 @@
/* end confdefs.h. */
#include <gssapi/gssapi.h>
#ifdef GSS_C_NT_USER_NAME
-@@ -14099,238 +8920,105 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -14099,238 +8921,105 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -18827,7 +18828,7 @@
_ACEOF
fi
-@@ -14338,8 +9026,8 @@ done
+@@ -14338,8 +9027,8 @@ done
LIBS="$cmu_save_LIBS"
else
@@ -18838,7 +18839,7 @@
fi
-@@ -14347,25 +9035,25 @@ fi
+@@ -14347,25 +9036,25 @@ fi
@@ -18874,7 +18875,7 @@
SASLFLAGS=""
LIB_SASL=""
-@@ -14392,296 +9080,22 @@ if test ${with_staticsasl} != "no"; then
+@@ -14392,296 +9081,22 @@ if test ${with_staticsasl} != "no"; then
with_staticsasl="/usr"
fi
@@ -19180,7 +19181,7 @@
fi
fi
-@@ -14690,8 +9104,8 @@ fi
+@@ -14690,8 +9105,8 @@ fi
@@ -19191,7 +19192,7 @@
if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-@@ -14722,347 +9136,47 @@ if test -d ${with_sasl}; then
+@@ -14722,347 +9137,47 @@ if test -d ${with_sasl}; then
fi
# be sure to check for a SASLv2 specific function
@@ -19559,7 +19560,7 @@
ac_cv_found_sasl=yes
else
ac_cv_found_sasl=no
-@@ -15117,22 +9231,15 @@ CPPFLAGS="$cmu_saved_CPPFLAGS"
+@@ -15117,22 +9232,15 @@ CPPFLAGS="$cmu_saved_CPPFLAGS"
if test "$ac_cv_found_sasl" != "yes"; then
@@ -19585,7 +19586,7 @@
/* end confdefs.h. */
#include <sasl/sasl.h>
-@@ -15145,39 +9252,17 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -15145,39 +9253,17 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
#ifndef SASL_VERSION_STEP
#error SASL_VERSION_STEP not defined
@@ -19635,7 +19636,7 @@
fi
rm -f conftest.err conftest.$ac_ext
-@@ -15189,80 +9274,48 @@ cmu_saved_LDFLAGS=$LDFLAGS
+@@ -15189,80 +9275,48 @@ cmu_saved_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $LIB_SASL"
@@ -19734,7 +19735,7 @@
fi
-@@ -15270,31 +9323,31 @@ LDFLAGS=$cmu_saved_LDFLAGS
+@@ -15270,31 +9324,31 @@ LDFLAGS=$cmu_saved_LDFLAGS
@@ -19777,7 +19778,7 @@
else
if test -n "$PERL"; then
ac_cv_prog_PERL="$PERL" # Let the user override the test.
-@@ -15304,26 +9357,28 @@ for as_dir in $PATH
+@@ -15304,26 +9358,28 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19814,7 +19815,7 @@
test -n "$PERL" && break
done
test -n "$PERL" || PERL="with_perl=notfound"
-@@ -15331,8 +9386,8 @@ test -n "$PERL" || PERL="with_perl=notfo
+@@ -15331,8 +9387,8 @@ test -n "$PERL" || PERL="with_perl=notfo
fi
fi
if test "$with_perl" = "notfound"; then
@@ -19825,7 +19826,7 @@
elif test "${with_perl}" != "no"; then
EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
PERL_SUBDIRS="imap"
-@@ -15352,600 +9407,103 @@ else
+@@ -15352,600 +9408,103 @@ else
PERL_DEPSUBDIRS="none"
fi
@@ -20497,7 +20498,7 @@
else
test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-@@ -15961,8 +9519,8 @@ else
+@@ -15961,8 +9520,8 @@ else
ac_cv_cmu_lib_subdir=$with_lib_subdir
fi
fi
@@ -20508,7 +20509,7 @@
CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-@@ -15970,224 +9528,60 @@ CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
+@@ -15970,224 +9529,60 @@ CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
@@ -20756,7 +20757,7 @@
else
with_libwrap=no
fi
-@@ -16199,83 +9593,53 @@ fi
+@@ -16199,83 +9594,53 @@ fi
LIBS="$cmu_save_LIBS"
fi
@@ -20861,7 +20862,7 @@
LIB_WRAP="${LIB_WRAP} -lnsl"
fi
-@@ -16286,30 +9650,30 @@ fi
+@@ -16286,30 +9651,30 @@ fi
@@ -20906,7 +20907,7 @@
else
case $SNMP_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -16322,35 +9686,36 @@ for as_dir in $as_dummy
+@@ -16322,35 +9687,36 @@ for as_dir in $as_dummy
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20954,7 +20955,7 @@
SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-@@ -16359,18 +9724,16 @@ echo $ECHO_N "checking NET SNMP librarie
+@@ -16359,18 +9725,16 @@ echo $ECHO_N "checking NET SNMP librarie
CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
LIB_UCDSNMP=$SNMP_LIBS
@@ -20980,7 +20981,7 @@
fi
else
if test "$with_snmp" != no; then
-@@ -16379,211 +9742,47 @@ echo "$as_me: WARNING: Could not find th
+@@ -16379,211 +9743,47 @@ echo "$as_me: WARNING: Could not find th
LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
fi
cmu_save_LIBS="$LIBS"
@@ -21210,7 +21211,7 @@
else
with_snmp=no
fi
-@@ -16595,83 +9794,53 @@ fi
+@@ -16595,83 +9795,53 @@ fi
LIBS="$cmu_save_LIBS"
fi
@@ -21315,7 +21316,7 @@
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
fi
-@@ -16727,9 +9896,8 @@ IMAP_LIBS="${LIB_SASL} ${LIBS}"
+@@ -16727,9 +9897,8 @@ IMAP_LIBS="${LIB_SASL} ${LIBS}"
@@ -21326,7 +21327,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -16748,39 +9916,59 @@ _ACEOF
+@@ -16748,39 +9917,59 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -21404,7 +21405,7 @@
fi
fi
rm -f confcache
-@@ -16789,32 +9977,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
+@@ -16789,32 +9978,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -21443,7 +21444,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -16822,12 +9996,15 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -16822,12 +9997,15 @@ LTLIBOBJS=$ac_ltlibobjs
@@ -21462,7 +21463,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -16837,230 +10014,376 @@ cat >$CONFIG_STATUS <<_ACEOF
+@@ -16837,230 +10015,376 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -22016,7 +22017,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -17069,31 +10392,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
+@@ -17069,31 +10393,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -22058,7 +22059,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17101,45 +10413,46 @@ generated by GNU Autoconf 2.59. Invocat
+@@ -17101,45 +10414,46 @@ generated by GNU Autoconf 2.59. Invocat
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -22131,7 +22132,7 @@
Configuration files:
$config_files
-@@ -17147,84 +10460,85 @@ $config_files
+@@ -17147,84 +10461,85 @@ $config_files
Configuration headers:
$config_headers
@@ -22257,7 +22258,7 @@
esac
shift
-@@ -17238,39 +10552,53 @@ if $ac_cs_silent; then
+@@ -17238,39 +10553,53 @@ if $ac_cs_silent; then
fi
_ACEOF
@@ -22332,7 +22333,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -17281,632 +10609,539 @@ if $ac_need_defaults; then
+@@ -17281,632 +10610,539 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -23442,7 +23443,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -17926,6 +11161,10 @@ if test "$no_create" != yes; then
+@@ -17926,6 +11162,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=886&root=cyrus22&r1=885&r2=886&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Sun Jan 24 00:06:04 2010
@@ -26,7 +26,7 @@
EXTRA_IDENT:="Debian-$(DEBVERSION)"
# DB engine version
-DBENGINE=BerkeleyDB4.8
+DBENGINE=BerkeleyDB4.7
DEBUGFLAGS=-g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -276,6 +276,7 @@
xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
#
dh_install -i --sourcedir=$(TMPPKG)
+ find debian/cyrus-doc-2.2/usr/share/doc/cyrus-doc-2.2 -name .svn | xargs -r rm -rf
binary-indep: install-indep
dh_testdir -i
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list