OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jul-2003 16:10:10
Branch: HEAD Handle: 2003072215100900
Added files:
openpkg-src/imapd imapd.patch.vhost
Modified files:
openpkg-src/imapd imapd.spec
Removed files:
openpkg-src/imapd vhosthack.patch
Log:
cleanup packaging
Summary:
Revision Changes Path
1.1 +35 -0 openpkg-src/imapd/imapd.patch.vhost
1.89 +10 -11 openpkg-src/imapd/imapd.spec
1.3 +0 -30 openpkg-src/imapd/vhosthack.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.patch.vhost
============================================================================
$ cvs diff -u -r0 -r1.1 imapd.patch.vhost
--- /dev/null 2003-07-22 16:10:09.000000000 +0200
+++ imapd.patch.vhost 2003-07-22 16:10:10.000000000 +0200
@@ -0,0 +1,35 @@
+This little patch allows the Cyrus IMAP LMTP daemon to accept
+"<user>@<domain>" as the username instead of just "<user>" in order
+to allow one to have distinct mailboxes for "[EMAIL PROTECTED]" and
+"[EMAIL PROTECTED]". This is especially useful with MTAs like Postfix which
+nicely allow delivery to same usernames of different domains.
+
+--- imap/lmtpengine.c Wed Jun 25 05:34:01 2003
++++ imap/lmtpengine.c Fri Jul 4 11:42:39 2003
+@@ -536,7 +536,7 @@
+ if (!*p++) return 0;
+ }
+ else {
+- while (*p && *p != '@' && *p != '>') {
++ while (*p && /* *p != '@' && */ *p != '>') {
+ if (*p == '\\') {
+ if (!*++p) return 0;
+ }
+@@ -557,7 +557,7 @@
+ if (*p++ != ']') return 0;
+ }
+ else {
+- while (isalnum((int) *p) || *p == '.' || *p == '-') p++;
++ while (isalnum((int) *p) || *p == '.' || *p == '-' || *p == '_') p++;
+ }
+ }
+
+@@ -1160,7 +1160,7 @@
+ }
+
+ /* Now finish the remainder of the localpart */
+- while (*addr != '@' && *addr != '>') {
++ while (/* *addr != '@' && */ *addr != '>') {
+ if (*addr == '\\') addr++;
+ *dest++ = *addr++;
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.88 -r1.89 imapd.spec
--- openpkg-src/imapd/imapd.spec 22 Jul 2003 08:10:48 -0000 1.88
+++ openpkg-src/imapd/imapd.spec 22 Jul 2003 14:10:09 -0000 1.89
@@ -36,8 +36,8 @@
Release: 20030722
# package options
-%option with_fsl yes
-%option with_vhost_hack no
+%option with_fsl yes
+%option with_vhost no
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
@@ -46,7 +46,7 @@
Source3: imapd.conf
Source4: fsl.imapd
Patch0: imapd.patch
-Patch1: vhosthack.patch
+Patch1: imapd.patch.vhost
# build information
Prefix: %{l_prefix}
@@ -73,7 +73,10 @@
%prep
%setup -q -n cyrus-imapd-%{version}
- %patch -p0
+ %patch0 -p0
+%if "%{with_vhost}" == "yes"
+ %patch1 -p0
+%endif
%{l_shtool} subst \
-e 's;db-4.1;db;g' \
configure
@@ -114,11 +117,6 @@
-e '/config_init/s;"deliver";"cyrdeliver";' \
imap/deliver.c
-%if "%{with_vhost_hack}" == "yes"
- # allow @ in LMTP mailbox names
- %{l_patch} -p1 <%{PATCH vhosthack.patch}
-%endif
-
%build
cflags="%{l_cppflags}"
ldflags="%{l_ldflags} %{l_fsl_ldflags}"
@@ -161,7 +159,6 @@
export SASL_LIB="%{l_ldflags} -lsasl2"
export OPENSSL_INC="%{l_cppflags}"
export OPENSSL_LIB="%{l_ldflags} -lssl -lcrypto"
-
%{l_prefix}/bin/perl-openpkg install -d perl/imap
( cd perl/sieve
# FIXME: private information from perl-openpkg
@@ -173,10 +170,13 @@
%{l_prefix}/bin/perl-openpkg install -d perl/sieve/acap
%{l_prefix}/bin/perl-openpkg epilog
+ # install package
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
cyrus_prefix=$RPM_BUILD_ROOT%{l_prefix}
+
+ # create additional directories
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/imapd \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
@@ -189,7 +189,6 @@
$RPM_BUILD_ROOT%{l_prefix}/bin/sieveshell
# offer a sane configuration
-
l_hostname=`%{l_shtool} echo -e %h`
l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
%{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ .
rm -f openpkg-src/imapd/vhosthack.patch <<'@@ .'
Index: openpkg-src/imapd/vhosthack.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
