OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Oct-2007 09:11:08
Branch: HEAD Handle: 2007102508110700
Modified files:
openpkg-src/imapd imapd.patch imapd.spec
Log:
upgrading package: imapd 2.3.9 -> 2.3.10
Summary:
Revision Changes Path
1.23 +45 -30 openpkg-src/imapd/imapd.patch
1.180 +3 -10 openpkg-src/imapd/imapd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.22 -r1.23 imapd.patch
--- openpkg-src/imapd/imapd.patch 8 Feb 2007 08:35:47 -0000 1.22
+++ openpkg-src/imapd/imapd.patch 25 Oct 2007 07:11:07 -0000 1.23
@@ -1,6 +1,6 @@
-Index: et/com_err.c
---- et/com_err.c.orig 2004-05-22 05:45:47 +0200
-+++ et/com_err.c 2007-02-08 09:24:55 +0100
+Index: com_err/et/com_err.c
+--- com_err/et/com_err.c.orig 2007-10-17 22:06:31 +0200
++++ com_err/et/com_err.c 2007-10-25 09:02:30 +0200
@@ -51,7 +51,7 @@
#include <string.h>
#include "mit-sipb-copyright.h"
@@ -10,10 +10,10 @@
#include <stdarg.h>
#else
#include <varargs.h>
-Index: et/com_err.h
---- et/com_err.h.orig 2003-02-13 21:15:21 +0100
-+++ et/com_err.h 2007-02-08 09:24:55 +0100
-@@ -99,5 +99,7 @@
+Index: com_err/et/com_err.h
+--- com_err/et/com_err.h.orig 2007-10-17 22:06:31 +0200
++++ com_err/et/com_err.h 2007-10-25 09:02:30 +0200
+@@ -101,5 +101,7 @@
extern void (*reset_com_err_hook ()) ();
#endif
@@ -21,9 +21,21 @@
+
#define __COM_ERR_H
#endif /* ! defined(__COM_ERR_H) */
+Index: configure
+--- configure.orig 2007-10-24 20:12:43 +0200
++++ configure 2007-10-25 09:02:30 +0200
+@@ -9481,7 +9481,7 @@
+ done
+
+ if test "$ac_cv_header_pcreposix_h" == "yes"; then
+- LIBS="$LIBS -lpcre -lpcreposix";
++ LIBS="$LIBS -lpcreposix -lpcre";
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_REGEX
Index: imap/fud.c
--- imap/fud.c.orig 2007-02-05 19:41:46 +0100
-+++ imap/fud.c 2007-02-08 09:24:55 +0100
++++ imap/fud.c 2007-10-25 09:02:30 +0200
@@ -104,26 +104,26 @@
char who[16];
@@ -60,7 +72,7 @@
/* caught a SIGHUP, return */
Index: imap/idled.c
--- imap/idled.c.orig 2007-02-05 19:41:46 +0100
-+++ imap/idled.c 2007-02-08 09:24:55 +0100
++++ imap/idled.c 2007-10-25 09:02:30 +0200
@@ -50,6 +50,7 @@
#include <syslog.h>
#include <sys/stat.h>
@@ -70,8 +82,8 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
Index: imap/mboxname.c
---- imap/mboxname.c.orig 2006-11-30 18:11:19 +0100
-+++ imap/mboxname.c 2007-02-08 09:24:55 +0100
+--- imap/mboxname.c.orig 2007-10-23 18:53:07 +0200
++++ imap/mboxname.c 2007-10-25 09:02:30 +0200
@@ -128,7 +128,11 @@
sprintf(result, "%s!", cp);
}
@@ -86,7 +98,7 @@
Index: imap/sync_log.c
--- imap/sync_log.c.orig 2007-02-05 19:41:48 +0100
-+++ imap/sync_log.c 2007-02-08 09:24:55 +0100
++++ imap/sync_log.c 2007-10-25 09:02:30 +0200
@@ -57,6 +57,7 @@
#include <varargs.h>
#endif
@@ -96,17 +108,20 @@
#include <string.h>
#include <syslog.h>
Index: imap/xversion.sh
---- imap/xversion.sh.orig 2003-10-22 20:03:00 +0200
-+++ imap/xversion.sh 2007-02-08 09:24:55 +0100
-@@ -22,4 +22,4 @@
+--- imap/xversion.sh.orig 2007-10-17 20:45:48 +0200
++++ imap/xversion.sh 2007-10-25 09:02:30 +0200
+@@ -23,7 +23,7 @@
match ($0, pattern) {
printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
}' pattern="$DATEPAT $TIMEPAT" | \
-- sort | tail -1 >> xversion.h
-+ sort | sed -n -e '$p' >> xversion.h
+- sort | tail -1 >> $TMPF
++ sort | sed -n -e '$p' >> $TMPF
+
+ if [ -f xversion.h ] && cmp -s $TMPF xversion.h
+ then
Index: lib/cyrusdb_berkeley.c
---- lib/cyrusdb_berkeley.c.orig 2007-02-05 19:43:26 +0100
-+++ lib/cyrusdb_berkeley.c 2007-02-08 09:24:55 +0100
+--- lib/cyrusdb_berkeley.c.orig 2007-09-27 22:02:45 +0200
++++ lib/cyrusdb_berkeley.c 2007-10-25 09:02:30 +0200
@@ -172,6 +172,7 @@
dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
@@ -115,7 +130,7 @@
if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_LOCKS_MAX)) < 0) {
syslog(LOG_WARNING,
"DBERROR: invalid berkeley_locks_max value, using internal
default");
-@@ -183,6 +184,7 @@
+@@ -191,6 +192,7 @@
abort();
}
}
@@ -125,7 +140,7 @@
syslog(LOG_WARNING,
Index: lib/cyrusdb_skiplist.c
--- lib/cyrusdb_skiplist.c.orig 2007-02-05 19:43:26 +0100
-+++ lib/cyrusdb_skiplist.c 2007-02-08 09:24:55 +0100
++++ lib/cyrusdb_skiplist.c 2007-10-25 09:02:30 +0200
@@ -74,6 +74,13 @@
#define PROB (0.5)
@@ -141,8 +156,8 @@
*
* disk format; all numbers in network byte order
Index: lib/prot.h
---- lib/prot.h.orig 2006-11-30 18:11:22 +0100
-+++ lib/prot.h 2007-02-08 09:24:55 +0100
+--- lib/prot.h.orig 2007-10-16 18:22:01 +0200
++++ lib/prot.h 2007-10-25 09:02:30 +0200
@@ -49,6 +49,7 @@
#include <time.h>
#include <stdio.h>
@@ -152,8 +167,8 @@
#include <sasl/sasl.h>
Index: perl/Makefile.in
---- perl/Makefile.in.orig 2003-10-22 20:50:17 +0200
-+++ perl/Makefile.in 2007-02-08 09:24:55 +0100
+--- perl/Makefile.in.orig 2007-04-23 15:40:27 +0200
++++ perl/Makefile.in 2007-10-25 09:02:30 +0200
@@ -82,7 +82,8 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)"
OPENSSL_INC="$(OPENSSL_INC)" \
@@ -165,8 +180,8 @@
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
Index: perl/sieve/Makefile.in
---- perl/sieve/Makefile.in.orig 2003-10-22 20:50:24 +0200
-+++ perl/sieve/Makefile.in 2007-02-08 09:24:55 +0100
+--- perl/sieve/Makefile.in.orig 2007-04-23 15:40:27 +0200
++++ perl/sieve/Makefile.in 2007-10-25 09:02:30 +0200
@@ -84,7 +84,8 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)"
OPENSSL_INC="$(OPENSSL_INC)" \
@@ -178,11 +193,11 @@
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
Index: perl/sieve/lib/isieve.c
---- perl/sieve/lib/isieve.c.orig 2006-11-30 18:11:24 +0100
-+++ perl/sieve/lib/isieve.c 2007-02-08 09:24:55 +0100
+--- perl/sieve/lib/isieve.c.orig 2007-03-27 21:29:56 +0200
++++ perl/sieve/lib/isieve.c 2007-10-25 09:02:30 +0200
@@ -41,9 +41,7 @@
- /* $Id: isieve.c,v 1.30 2006/11/30 17:11:24 murch Exp $ */
+ /* $Id: isieve.c,v 1.32 2007/03/27 19:29:56 murch Exp $ */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.179 -r1.180 imapd.spec
--- openpkg-src/imapd/imapd.spec 15 Oct 2007 09:45:34 -0000 1.179
+++ openpkg-src/imapd/imapd.spec 25 Oct 2007 07:11:07 -0000 1.180
@@ -32,8 +32,8 @@
Class: BASE
Group: Mail
License: BSD
-Version: 2.3.9
-Release: 20071015
+Version: 2.3.10
+Release: 20071025
# package options
%option with_fsl yes
@@ -61,6 +61,7 @@
%endif
# list of sources
+# (ping [EMAIL PROTECTED] if the Kolab patches are unavailable for the
latest Cyrus IMAPd version)
Source0:
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
Source1: rc.imapd
Source2: cyrus.conf
@@ -68,8 +69,6 @@
Source4: fsl.imapd
Patch0: imapd.patch
Patch1: imapd.patch.group
-## Please ping [EMAIL PROTECTED] if the Kolab patches are unavailable for
the latest
-## cyrus version
Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/KOLAB_cyrus-imapd_2.3.9_Annotations2.patch
Patch3:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/KOLAB_cyrus-cyradm_2.3.9_Annotations.patch
Patch4:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/KOLAB_cyrus-imapd_2.3.9_Logging.patch
@@ -163,12 +162,6 @@
# make sure config2header rebuilds imapopts based on imapoptions
rm -f lib/imapopts.h lib/imapopts.c >/dev/null 2>&1 || true
- # ensure local et/com_err can be found
- %{l_shtool} subst -s \
- -e 's;#include <et/com_err.h>;#include "et/com_err.h";' \
- imap/nntp_err.h imap/mupdate_err.h imap/imap_err.h \
- sieve/sieve_err.h config.h.in configure
-
# fix Berkeley-DB detection
%{l_shtool} subst\
-e 's;-L/usr/local/lib;;g' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
