OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jul-2003 13:11:04
Branch: HEAD Handle: 2003070412110400
Modified files:
openpkg-src/imapd imapd.spec vhosthack.patch
Log:
Fix vhost build problems by rewriting patch and adjusting the specfile
Summary:
Revision Changes Path
1.75 +1 -1 openpkg-src/imapd/imapd.spec
1.2 +8 -7 openpkg-src/imapd/vhosthack.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 imapd.spec
--- openpkg-src/imapd/imapd.spec 4 Jul 2003 09:39:41 -0000 1.74
+++ openpkg-src/imapd/imapd.spec 4 Jul 2003 11:11:04 -0000 1.75
@@ -114,7 +114,7 @@
%if "%{with_vhost_hack}" == "yes"
# allow @ in LMTP mailbox names
- %{l_patch} -p0 <%{SOURCE vhosthack.patch}
+ %{l_patch} -p1 <%{SOURCE vhosthack.patch}
%endif
%build
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/vhosthack.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 vhosthack.patch
--- openpkg-src/imapd/vhosthack.patch 8 Apr 2003 12:49:02 -0000 1.1
+++ openpkg-src/imapd/vhosthack.patch 4 Jul 2003 11:11:04 -0000 1.2
@@ -1,6 +1,7 @@
---- imap/lmtpengine.c.dist Wed Jun 5 20:32:15 2002
-+++ imap/lmtpengine.c Sun Jun 23 02:15:51 2002
-@@ -440,7 +440,7 @@
+diff -Naur cyrus-imapd-2.1.14.orig/imap/lmtpengine.c
cyrus-imapd-2.1.14/imap/lmtpengine.c
+--- cyrus-imapd-2.1.14.orig/imap/lmtpengine.c Wed Jun 25 05:34:01 2003
++++ cyrus-imapd-2.1.14/imap/lmtpengine.c Fri Jul 4 11:42:39 2003
+@@ -536,7 +536,7 @@
if (!*p++) return 0;
}
else {
@@ -9,7 +10,7 @@
if (*p == '\\') {
if (!*++p) return 0;
}
-@@ -461,7 +461,7 @@
+@@ -557,7 +557,7 @@
if (*p++ != ']') return 0;
}
else {
@@ -18,10 +19,10 @@
}
}
-@@ -942,7 +942,7 @@
+@@ -1160,7 +1160,7 @@
}
- }
- else {
+
+ /* Now finish the remainder of the localpart */
- while (*addr != '@' && *addr != '>') {
+ while (/* *addr != '@' && */ *addr != '>') {
if (*addr == '\\') addr++;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
