summaryrefslogtreecommitdiff
path: root/imapd
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2005-08-30 18:50:56 (GMT)
committerSteffen Hansen <steffen@kdab.com>2005-08-30 18:50:56 (GMT)
commitdd1d4a5c35c3a82f1a54f9443943036f443b132f (patch)
treea8f5b840a384b9cea0b15265827841a3799e4418 /imapd
parentc3da0ab16e38c1184b982df4c65a1c9ec7f41cb9 (diff)
downloadserver-dd1d4a5c35c3a82f1a54f9443943036f443b132f.tar.gz
Fix for Issue901 (wrong reconstruct and quota binaries called)
Diffstat (limited to 'imapd')
-rw-r--r--imapd/kolab.patch30
1 files changed, 21 insertions, 9 deletions
diff --git a/imapd/kolab.patch b/imapd/kolab.patch
index 140fc3a..337be3d 100644
--- a/imapd/kolab.patch
+++ b/imapd/kolab.patch
@@ -1,6 +1,6 @@
---- ../imapd.orig/imapd.spec 2005-02-21 18:02:27.000000000 +0100
-+++ imapd.spec 2005-06-10 04:00:13.000000000 +0200
-@@ -3,6 +3,9 @@
+--- ../imapd.orig/imapd.spec 2005-06-15 20:55:40.000000000 +0200
++++ imapd.spec 2005-08-30 02:09:35.000000000 +0200
+@@ -2,6 +2,9 @@
## imapd.spec -- OpenPKG RPM Package Specification
## Copyright (c) 2000-2005 OpenPKG Foundation e.V. <http://openpkg.net/>
## Copyright (c) 2000-2005 Ralf S. Engelschall <http://engelschall.com/>
@@ -10,7 +10,7 @@
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
-@@ -34,13 +37,16 @@ Class: BASE
+@@ -33,13 +36,16 @@ Class: BASE
Group: Mail
License: BSD
Version: 2.2.12
@@ -32,7 +32,7 @@
# list of sources
Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-%{version}.tar.gz
-@@ -50,6 +56,11 @@ Source3: imapd.conf
+@@ -49,6 +55,11 @@ Source3: imapd.conf
Source4: fsl.imapd
Patch0: imapd.patch
Patch1: imapd.patch.group
@@ -44,7 +44,7 @@
# build information
Prefix: %{l_prefix}
-@@ -62,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss
+@@ -61,6 +72,10 @@ PreReq: sasl, db >= 4.2.52, openss
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
@@ -55,7 +55,7 @@
AutoReq: no
AutoReqProv: no
-@@ -88,6 +102,7 @@ AutoReqProv: no
+@@ -87,6 +102,7 @@ AutoReqProv: no
%{l_shtool} subst \
-e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
lib/auth_unix.c
@@ -63,7 +63,7 @@
%endif
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -95,10 +110,21 @@ AutoReqProv: no
+@@ -94,10 +110,21 @@ AutoReqProv: no
sleep 1
touch configure
%endif
@@ -85,4 +85,16 @@
+ -e 's;-l\$dbname;%{l_prefix}/lib/lib$dbname.a;g' \
configure
- # ensure local com_err can be used
+ # ensure local et/com_err can be found
+@@ -158,6 +185,11 @@ AutoReqProv: no
+ -e '/config_init/s;"deliver";"cyrdeliver";' \
+ imap/deliver.c
+
++ %{l_shtool} subst \
++ -e '/snprintf(buf, sizeof(buf), "%s/s;/reconstruct";/cyrreconstruct";' \
++ -e '/snprintf(buf, sizeof(buf), "%s/s;/quota";/cyrquota";' \
++ imap/imapd.c
++
+ %build
+ cflags="%{l_cppflags}"
+ %if "%{with_atvdom}" == "yes"