OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Mar-2004 22:26:18
Branch: HEAD Handle: 2004031021261700
Modified files:
openpkg-src/imapd imapd.patch imapd.spec
Log:
add experimental support for ignoring [EMAIL PROTECTED] by means of
option with_ignmad; suggestion from Stefan Buys for
kolab-20040217-2.0.0 issue
Summary:
Revision Changes Path
1.9 +36 -1 openpkg-src/imapd/imapd.patch
1.113 +5 -1 openpkg-src/imapd/imapd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 imapd.patch
--- openpkg-src/imapd/imapd.patch 2 Feb 2004 20:45:59 -0000 1.8
+++ openpkg-src/imapd/imapd.patch 10 Mar 2004 21:26:17 -0000 1.9
@@ -41,7 +41,7 @@
+++ perl/sieve/lib/isieve.c 2004-02-02 20:01:21.000000000 +0100
@@ -41,9 +41,7 @@
- /* $Id: imapd.patch,v 1.8 2004/02/02 20:45:59 rse Exp $ */
+ /* $Id: imapd.patch,v 1.9 2004/03/10 21:26:17 thl Exp $ */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
@@ -76,3 +76,38 @@
fi; \
$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
done
+Index: imap/mboxname.c
+--- imap/mboxname.c.orig 2003-10-22 20:50:08.000000000 +0200
++++ imap/mboxname.c 2004-03-10 21:08:47.000000000 +0100
+@@ -127,6 +127,7 @@
+ domainlen = strlen(result);
+ }
+ }
++#ifndef IGNMAD /* ignore [EMAIL PROTECTED] */
+ if ((cp = strrchr(name, '@'))) {
+ /* mailbox specified as [EMAIL PROTECTED] */
+ namelen = cp - name;
+@@ -149,6 +150,7 @@
+ domainlen = strlen(result);
+ }
+ }
++#endif /* IGNMAD */
+
+ /* if no domain specified, we're in the default domain */
+ }
+@@ -212,6 +214,7 @@
+ domainlen = strlen(result);
+ }
+ }
++#ifndef IGNMAD /* ignore [EMAIL PROTECTED] */
+ if ((cp = strrchr(name, '@'))) {
+ /* mailbox specified as [EMAIL PROTECTED] */
+ namelen = cp - name;
+@@ -234,6 +237,7 @@
+ domainlen = strlen(result);
+ }
+ }
++#endif /* IGNMAD */
+
+ /* if no domain specified, we're in the default domain */
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.112 -r1.113 imapd.spec
--- openpkg-src/imapd/imapd.spec 18 Feb 2004 12:19:01 -0000 1.112
+++ openpkg-src/imapd/imapd.spec 10 Mar 2004 21:26:17 -0000 1.113
@@ -34,11 +34,12 @@
Group: Mail
License: BSD
Version: 2.2.3
-Release: 20040218
+Release: 20040310
# package options
%option with_fsl yes
%option with_group no
+%option with_ignmad no
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
@@ -135,6 +136,9 @@
%build
cflags="%{l_cppflags}"
+%if "%{with_ignmad}" == "yes"
+ cflags="$cflags -DIGNMAD=yes"
+%endif
ldflags="%{l_ldflags} %{l_fsl_ldflags}"
case "%{l_platform -t}" in
*-sunos* ) ldflags="$ldflags -lsocket -lnsl" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
