[Pkg-Cyrus-imapd-Debian-devel] [SVN] r153 - in trunk/cyrus-imapd-2.2.12/debian/patches: 00list
50-FTBFS-gcc-4.0-fix.dpatch 51-multiple_mupdate_err.h-fix.dpatch
pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org
Wed, 22 Jun 2005 06:11:04 -0000
Author: ondrej
Date: Wed Jun 22 08:11:02 2005
New Revision: 153
URL: https://mail.incase.de/viewcvs?root=3Dcyrus22?view=3Drev&rev=3D153
Log:
fix FTBFS: config2header used imapopts before it declared/defined it; fix m=
ultiple include of mupdate_err.h in mupdate-{client,slave}.h (mupdate_err.h=
is et_compile-d and not protected with #ifdef/#define)
Added:
trunk/cyrus-imapd-2.2.12/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch (=
with props)
trunk/cyrus-imapd-2.2.12/debian/patches/51-multiple_mupdate_err.h-fix.d=
patch (with props)
Modified:
trunk/cyrus-imapd-2.2.12/debian/patches/00list
Modified: trunk/cyrus-imapd-2.2.12/debian/patches/00list
URL: https://mail.incase.de/viewcvs?root=3Dcyrus22/trunk/cyrus-imapd-2.2.12=
/debian/patches/00list?view=3Ddiff&rev=3D153&p1=3Dtrunk/cyrus-imapd-2.2.12/=
debian/patches/00list&r1=3D152&p2=3Dtrunk/cyrus-imapd-2.2.12/debian/patches=
/00list&r2=3D153
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/00list Wed Jun 22 08:11:02 2005
@@ -3,3 +3,5 @@
30_update_perlcalling.sh.dpatch
35_masssievec_remove_unused_variable
40_rehash_fix_pathes.dpatch
+50-FTBFS-gcc-4.0-fix.dpatch
+51-multiple_mupdate_err.h-fix.dpatch
Added: trunk/cyrus-imapd-2.2.12/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch
URL: https://mail.incase.de/viewcvs?root=3Dcyrus22/trunk/cyrus-imapd-2.2.12=
/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch?view=3Dauto&rev=3D153
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch (ad=
ded)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/50-FTBFS-gcc-4.0-fix.dpatch Wed=
Jun 22 08:11:02 2005
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-FTBFS-gcc-4.0-fix.dpatch by Ond=C3=85=C2=99ej Sur=C3=83=C2=BD <ondre=
j@sury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS when compiling with gcc-4.0, there is imapopts is used be=
fore declared
+
+@DPATCH@
+diff -urN cyrus22-imapd-2.2.12~/tools/config2header cyrus22-imapd-2.2.12/t=
ools/config2header
+--- cyrus22-imapd-2.2.12~/tools/config2header 2004-06-22 21:02:31.00000000=
0 +0200
++++ cyrus22-imapd-2.2.12/tools/config2header 2005-06-22 07:56:17.180293688=
+0200
+@@ -214,7 +214,6 @@
+ print HFILE <<EOF
+ IMAPOPT_LAST
+ };
+-extern struct imapopt_s imapopts[];
+ =
+ enum enum_value {
+ IMAP_ENUM_ZERO =3D 0,
+@@ -260,6 +259,8 @@
+ =
+ print HFILE <<EOF
+ };
++extern struct imapopt_s imapopts[];
++
+ #endif /* INCLUDED_IMAPOPTIONS_H */
+ EOF
+ ;
Propchange: trunk/cyrus-imapd-2.2.12/debian/patches/50-FTBFS-gcc-4.0-fix.dp=
atch
---------------------------------------------------------------------------=
---
svn:executable =3D *
Added: trunk/cyrus-imapd-2.2.12/debian/patches/51-multiple_mupdate_err.h-fi=
x.dpatch
URL: https://mail.incase.de/viewcvs?root=3Dcyrus22/trunk/cyrus-imapd-2.2.12=
/debian/patches/51-multiple_mupdate_err.h-fix.dpatch?view=3Dauto&rev=3D153
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/debian/patches/51-multiple_mupdate_err.h-fix.d=
patch (added)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/51-multiple_mupdate_err.h-fix.d=
patch Wed Jun 22 08:11:02 2005
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51-multiple_mupdate_err.h-fix.dpatch by Ond=C3=85=C2=99ej Sur=C3=83=C2=
=BD <ondrej@sury.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: mupdate_err.h is already included from mupdate.h
+
+@DPATCH@
+diff -urN cyrus22-imapd-2.2.12~/imap/mupdate-client.c cyrus22-imapd-2.2.12=
/imap/mupdate-client.c
+--- cyrus22-imapd-2.2.12~/imap/mupdate-client.c 2004-08-25 17:35:41.000000=
000 +0200
++++ cyrus22-imapd-2.2.12/imap/mupdate-client.c 2005-06-22 08:00:58.3835442=
96 +0200
+@@ -73,7 +73,6 @@
+ #include "imparse.h"
+ #include "iptostring.h"
+ #include "mupdate.h"
+-#include "mupdate_err.h"
+ #include "prot.h"
+ #include "protocol.h"
+ #include "xmalloc.h"
+diff -urN cyrus22-imapd-2.2.12~/imap/mupdate-slave.c cyrus22-imapd-2.2.12/=
imap/mupdate-slave.c
+--- cyrus22-imapd-2.2.12~/imap/mupdate-slave.c 2004-03-08 20:23:04.0000000=
00 +0100
++++ cyrus22-imapd-2.2.12/imap/mupdate-slave.c 2005-06-22 08:00:52.97136707=
2 +0200
+@@ -73,7 +73,6 @@
+ #include "imparse.h"
+ #include "iptostring.h"
+ #include "mupdate.h"
+-#include "mupdate_err.h"
+ #include "exitcodes.h"
+ =
+ /* Returns file descriptor of kick socket (or does not return) */
Propchange: trunk/cyrus-imapd-2.2.12/debian/patches/51-multiple_mupdate_err=
.h-fix.dpatch
---------------------------------------------------------------------------=
---
svn:executable =3D *