OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 26-Mar-2009 18:57:06
Branch: HEAD Handle: 2009032617570600
Modified files:
openpkg-src/imapd imapd.patch imapd.spec
Log:
upgrading package: imapd 2.3.13 -> 2.3.14
Summary:
Revision Changes Path
1.24 +52 -56 openpkg-src/imapd/imapd.patch
1.193 +2 -2 openpkg-src/imapd/imapd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.23 -r1.24 imapd.patch
--- openpkg-src/imapd/imapd.patch 25 Oct 2007 07:11:07 -0000 1.23
+++ openpkg-src/imapd/imapd.patch 26 Mar 2009 17:57:06 -0000 1.24
@@ -1,7 +1,7 @@
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 @@
+--- com_err/et/com_err.c.orig 2008-03-24 19:53:40 +0100
++++ com_err/et/com_err.c 2009-03-26 18:45:35 +0100
+@@ -52,7 +52,7 @@
#include <string.h>
#include "mit-sipb-copyright.h"
@@ -11,9 +11,9 @@
#else
#include <varargs.h>
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 @@
+--- com_err/et/com_err.h.orig 2008-03-24 19:53:40 +0100
++++ com_err/et/com_err.h 2009-03-26 18:45:35 +0100
+@@ -104,5 +104,7 @@
extern void (*reset_com_err_hook ()) ();
#endif
@@ -22,9 +22,9 @@
#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 @@
+--- configure.orig 2009-03-25 12:37:47 +0100
++++ configure 2009-03-26 18:45:35 +0100
+@@ -11907,7 +11907,7 @@
done
if test "$ac_cv_header_pcreposix_h" == "yes"; then
@@ -32,11 +32,11 @@
+ LIBS="$LIBS -lpcreposix -lpcre";
cat >>confdefs.h <<\_ACEOF
- #define ENABLE_REGEX
+ #define ENABLE_REGEX /**/
Index: imap/fud.c
---- imap/fud.c.orig 2007-02-05 19:41:46 +0100
-+++ imap/fud.c 2007-10-25 09:02:30 +0200
-@@ -104,26 +104,26 @@
+--- imap/fud.c.orig 2009-02-09 06:01:56 +0100
++++ imap/fud.c 2009-03-26 18:46:21 +0100
+@@ -104,23 +104,23 @@
char who[16];
@@ -50,30 +50,26 @@
struct sockaddr_storage sfrom;
socklen_t sfromsiz = sizeof(sfrom);
int r;
-- char buf[MAXLOGNAME + MAXDOMNAME+ MAX_MAILBOX_NAME + 1];
+- char buf[MAXLOGNAME + MAXDOMNAME + MAX_MAILBOX_BUFFER];
- char username[MAXLOGNAME + MAXDOMNAME];
-+ char buf[MY_MAXLOGNAME + MY_MAXDOMNAME+ MAX_MAILBOX_NAME + 1];
++ char buf[MY_MAXLOGNAME + MY_MAXDOMNAME + MAX_MAILBOX_BUFFER];
+ char username[MY_MAXLOGNAME + MY_MAXDOMNAME];
- char mbox[MAX_MAILBOX_NAME+1];
+ char mbox[MAX_MAILBOX_BUFFER];
char *q;
int off;
-- int maxuserlen = MAXLOGNAME + config_virtdomains ? MAXDOMNAME : 0;
-+ int maxuserlen = MY_MAXLOGNAME + config_virtdomains ? MY_MAXDOMNAME
: 0;
+- int maxuserlen = MAXLOGNAME;
++ int maxuserlen = MY_MAXLOGNAME;
+
+ if (config_virtdomains)
+- maxuserlen += MAXDOMNAME + 1; /* @ + DOM */
++ maxuserlen += MY_MAXDOMNAME + 1; /* @ + DOM */
while(1) {
/* For safety */
-- memset(username,'\0',MAXLOGNAME + MAXDOMNAME);
-+ memset(username,'\0',MY_MAXLOGNAME + MY_MAXDOMNAME);
- memset(mbox,'\0',MAX_MAILBOX_NAME+1);
-- memset(buf, '\0', MAXLOGNAME + MAX_MAILBOX_NAME + 1);
-+ memset(buf, '\0', MY_MAXLOGNAME + MAX_MAILBOX_NAME + 1);
-
- if (signals_poll() == SIGHUP) {
- /* caught a SIGHUP, return */
Index: imap/idled.c
---- imap/idled.c.orig 2007-02-05 19:41:46 +0100
-+++ imap/idled.c 2007-10-25 09:02:30 +0200
-@@ -50,6 +50,7 @@
+--- imap/idled.c.orig 2008-03-24 18:09:16 +0100
++++ imap/idled.c 2009-03-26 18:45:35 +0100
+@@ -52,6 +52,7 @@
#include <syslog.h>
#include <sys/stat.h>
#include <stdlib.h>
@@ -82,9 +78,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
Index: imap/mboxname.c
---- 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 @@
+--- imap/mboxname.c.orig 2009-02-09 06:01:58 +0100
++++ imap/mboxname.c 2009-03-26 18:45:35 +0100
+@@ -131,7 +131,11 @@
sprintf(result, "%s!", cp);
}
}
@@ -97,9 +93,9 @@
namelen = cp - name;
Index: imap/sync_log.c
---- imap/sync_log.c.orig 2007-02-05 19:41:48 +0100
-+++ imap/sync_log.c 2007-10-25 09:02:30 +0200
-@@ -57,6 +57,7 @@
+--- imap/sync_log.c.orig 2009-02-09 06:01:59 +0100
++++ imap/sync_log.c 2009-03-26 18:45:35 +0100
+@@ -58,6 +58,7 @@
#include <varargs.h>
#endif
#include <stdlib.h>
@@ -108,9 +104,9 @@
#include <string.h>
#include <syslog.h>
Index: imap/xversion.sh
---- 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 @@
+--- imap/xversion.sh.orig 2008-03-24 18:09:20 +0100
++++ imap/xversion.sh 2009-03-26 18:45:35 +0100
+@@ -62,7 +62,7 @@
match ($0, pattern) {
printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
}' pattern="$DATEPAT $TIMEPAT" | \
@@ -120,9 +116,9 @@
if [ -f xversion.h ] && cmp -s $TMPF xversion.h
then
Index: lib/cyrusdb_berkeley.c
---- 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 @@
+--- lib/cyrusdb_berkeley.c.orig 2009-03-10 03:56:22 +0100
++++ lib/cyrusdb_berkeley.c 2009-03-26 18:45:35 +0100
+@@ -173,6 +173,7 @@
dbenv->set_lk_detect(dbenv, CONFIG_DEADLOCK_DETECTION);
@@ -130,7 +126,7 @@
if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_LOCKS_MAX)) < 0) {
syslog(LOG_WARNING,
"DBERROR: invalid berkeley_locks_max value, using internal
default");
-@@ -191,6 +192,7 @@
+@@ -192,6 +193,7 @@
abort();
}
}
@@ -139,9 +135,9 @@
if ((opt = libcyrus_config_getint(CYRUSOPT_BERKELEY_TXNS_MAX)) < 0) {
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-10-25 09:02:30 +0200
-@@ -74,6 +74,13 @@
+--- lib/cyrusdb_skiplist.c.orig 2008-10-08 17:47:08 +0200
++++ lib/cyrusdb_skiplist.c 2009-03-26 18:45:35 +0100
+@@ -75,6 +75,13 @@
#define PROB (0.5)
@@ -156,8 +152,8 @@
*
* disk format; all numbers in network byte order
Index: lib/prot.h
---- lib/prot.h.orig 2007-10-16 18:22:01 +0200
-+++ lib/prot.h 2007-10-25 09:02:30 +0200
+--- lib/prot.h.orig 2008-03-24 18:43:09 +0100
++++ lib/prot.h 2009-03-26 18:45:35 +0100
@@ -49,6 +49,7 @@
#include <time.h>
#include <stdio.h>
@@ -167,9 +163,9 @@
#include <sasl/sasl.h>
Index: perl/Makefile.in
---- 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 @@
+--- perl/Makefile.in.orig 2008-04-04 14:47:07 +0200
++++ perl/Makefile.in 2009-03-26 18:45:35 +0100
+@@ -84,7 +84,8 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)"
OPENSSL_INC="$(OPENSSL_INC)" \
SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)"
CC="$(CC)" \
@@ -180,8 +176,8 @@
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
Index: perl/sieve/Makefile.in
---- perl/sieve/Makefile.in.orig 2007-04-23 15:40:27 +0200
-+++ perl/sieve/Makefile.in 2007-10-25 09:02:30 +0200
+--- perl/sieve/Makefile.in.orig 2008-04-04 14:47:16 +0200
++++ perl/sieve/Makefile.in 2009-03-26 18:45:35 +0100
@@ -84,7 +84,8 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)"
OPENSSL_INC="$(OPENSSL_INC)" \
@@ -193,11 +189,11 @@
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
Index: perl/sieve/lib/isieve.c
---- 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
+--- perl/sieve/lib/isieve.c.orig 2009-02-16 19:18:10 +0100
++++ perl/sieve/lib/isieve.c 2009-03-26 18:45:35 +0100
@@ -41,9 +41,7 @@
-
- /* $Id: isieve.c,v 1.32 2007/03/27 19:29:56 murch Exp $ */
+ * $Id: isieve.c,v 1.36 2009/02/16 18:18:10 murch Exp $
+ */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.192 -r1.193 imapd.spec
--- openpkg-src/imapd/imapd.spec 20 Oct 2008 18:16:12 -0000 1.192
+++ openpkg-src/imapd/imapd.spec 26 Mar 2009 17:57:06 -0000 1.193
@@ -31,8 +31,8 @@
Class: BASE
Group: Mail
License: BSD
-Version: 2.3.13
-Release: 20081020
+Version: 2.3.14
+Release: 20090326
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
