[SVN] r874 - in /trunk/cyrus-imapd-2.2.13/debian: changelog patches/26-local-getline.dpatch patches/series
debian at incase.de
debian at incase.de
Fri Jan 22 21:17:56 UTC 2010
Author: myon
Date: Fri Jan 22 22:17:54 2010
New Revision: 874
URL: https://mail.incase.de/viewcvs?rev=874&root=cyrus22&view=rev
Log:
* Convert to use quilt, and update the patch headers to use clean paths.
(Closes: #563303)
* Add patch by Mathieu Parent to fix conflicting getline definition.
(Closes: #552865)
Added:
trunk/cyrus-imapd-2.2.13/debian/patches/26-local-getline.dpatch
Modified:
trunk/cyrus-imapd-2.2.13/debian/changelog
trunk/cyrus-imapd-2.2.13/debian/patches/series
Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=874&root=cyrus22&r1=873&r2=874&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Fri Jan 22 22:17:54 2010
@@ -8,9 +8,12 @@
[ Christoph Berg ]
* Add myself to Uploaders.
- * Convert to use quilt.
-
- -- Christoph Berg <myon at debian.org> Fri, 22 Jan 2010 21:44:15 +0100
+ * Convert to use quilt, and update the patch headers to use clean paths.
+ (Closes: #563303)
+ * Add patch by Mathieu Parent to fix conflicting getline definition.
+ (Closes: #552865)
+
+ -- Christoph Berg <myon at debian.org> Fri, 22 Jan 2010 22:16:02 +0100
cyrus-imapd-2.2 (2.2.13-17) unstable; urgency=high
Added: trunk/cyrus-imapd-2.2.13/debian/patches/26-local-getline.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/26-local-getline.dpatch?rev=874&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/26-local-getline.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/26-local-getline.dpatch Fri Jan 22 22:17:54 2010
@@ -1,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 26-local-getline.dpatch by Mathieu Parent <sathieu at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename conflicting function getline
+## DP: See http://bugs.debian.org/552865 and http://bugs.debian.org/552848
+
+ at DPATCH@
+diff -urNad kolab-cyrus-imapd-2.2.13~/contrib/sieve-spamasssassin kolab-cyrus-imapd-2.2.13/contrib/sieve-spamasssassin
+--- kolab-cyrus-imapd-2.2.13~/contrib/sieve-spamasssassin 2002-05-10 00:00:46.000000000 +0200
++++ kolab-cyrus-imapd-2.2.13/contrib/sieve-spamasssassin 2009-11-11 19:52:40.000000000 +0100
+@@ -85,7 +85,7 @@
+ + /* spam support */
+ +
+ + static int
+-+ getline (int s, char *buf, int len)
+++ local_getline (int s, char *buf, int len)
+ + {
+ + char *bp = buf;
+ + int ret = 1;
+@@ -129,8 +129,8 @@
+ + int score;
+ + int threshold;
+ +
+-+ if (! getline (s, buf, sizeof (buf))) {
+-+ syslog (LOG_ERR, "read_response: response getline failed");
+++ if (! local_getline (s, buf, sizeof (buf))) {
+++ syslog (LOG_ERR, "read_response: response local_getline failed");
+ + return SIEVE_FAIL;
+ + }
+ + if (sscanf (buf, "SPAMD/%d.%d %d %*s", &major, &minor, &response) != 3) {
+@@ -143,8 +143,8 @@
+ + major, minor);
+ + return SIEVE_FAIL;
+ + }
+-+ if (! getline (s, buf, sizeof (buf))) {
+-+ syslog (LOG_ERR, "read_response: header getline failed");
+++ if (! local_getline (s, buf, sizeof (buf))) {
+++ syslog (LOG_ERR, "read_response: header local_getline failed");
+ + return SIEVE_FAIL;
+ + }
+ + if (sscanf (buf, "Spam: %5s ; %d / %d", is_spam, &score, &threshold) != 3) {
+diff -urNad kolab-cyrus-imapd-2.2.13~/makedepend/def.h kolab-cyrus-imapd-2.2.13/makedepend/def.h
+--- kolab-cyrus-imapd-2.2.13~/makedepend/def.h 2003-02-13 21:15:43.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/makedepend/def.h 2009-11-11 19:51:34.000000000 +0100
+@@ -161,7 +161,7 @@
+
+ char *copy();
+ char *base_name();
+-char *getline();
++char *local_getline();
+ struct symtab *slookup();
+ struct symtab *isdefined();
+ struct symtab *fdefined();
+diff -urNad kolab-cyrus-imapd-2.2.13~/makedepend/main.c kolab-cyrus-imapd-2.2.13/makedepend/main.c
+--- kolab-cyrus-imapd-2.2.13~/makedepend/main.c 2003-02-13 21:15:44.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/makedepend/main.c 2009-11-11 19:51:03.000000000 +0100
+@@ -548,7 +548,7 @@
+ * Get the next line. We only return lines beginning with '#' since that
+ * is all this program is ever interested in.
+ */
+-char *getline(filep)
++char *local_getline(filep)
+ register struct filepointer *filep;
+ {
+ register char *p, /* walking pointer */
+diff -urNad kolab-cyrus-imapd-2.2.13~/makedepend/parse.c kolab-cyrus-imapd-2.2.13/makedepend/parse.c
+--- kolab-cyrus-imapd-2.2.13~/makedepend/parse.c 2003-02-13 21:15:44.000000000 +0100
++++ kolab-cyrus-imapd-2.2.13/makedepend/parse.c 2009-11-11 19:51:19.000000000 +0100
+@@ -82,7 +82,7 @@
+ register int type;
+ boolean recfailOK;
+
+- while (line = getline(filep)) {
++ while (line = local_getline(filep)) {
+ switch(type = deftype(line, filep, file_red, file, TRUE)) {
+ case IF:
+ doif:
+@@ -204,7 +204,7 @@
+ register char *line;
+ register int type;
+
+- while (line = getline(filep)) {
++ while (line = local_getline(filep)) {
+ switch(type = deftype(line, filep, file_red, file, FALSE)) {
+ case IF:
+ case IFFALSE:
+
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/series
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/series?rev=874&root=cyrus22&r1=873&r2=874&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/series (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/series Fri Jan 22 22:17:54 2010
@@ -49,6 +49,7 @@
23-configurable_idled.dpatch
24-configurable-referrals.dpatch
25-update_install-sh.dpatch
+26-local-getline.dpatch
30-update_perlcalling.sh.dpatch
35-masssievec_remove_unused_variable.dpatch
40-rehash_fix_pathes.dpatch
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list