[Pkg-cyrus-sasl2-commits] r408 - in /cyrus-sasl-2.1/trunk/debian: changelog patches/0022_gcc4.4_preprocessor_syntax.dpatch patches/00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Mon Jan 26 11:56:00 2009
New Revision: 408

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=408
Log:
Add patch to use test condition in #elif preprocessor directive.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/patches/00list

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=408&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Jan 26 11:56:00 2009
@@ -12,8 +12,11 @@
   * debian/source.lintian-overrides: Add override for ancient-libtool lintian
     warning.
   * debian/sasl2-bin.postinst: Use set -e.
-
- -- Fabian Fagerholm <fabbe at debian.org>  Sun, 25 Jan 2009 14:50:29 +0200
+  * debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch: Added patch to use
+    test condition for #elif preprocessor directive. Required by GCC 4.4.
+    Thanks to Martin Michlmayr. (Closes: #505042)
+
+ -- Fabian Fagerholm <fabbe at debian.org>  Mon, 26 Jan 2009 13:54:13 +0200
 
 cyrus-sasl2 (2.1.22.dfsg1-23) unstable; urgency=low
 

Added: cyrus-sasl-2.1/trunk/debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch?rev=408&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch Mon Jan 26 11:56:00 2009
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe at paniq.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The #elif preprocessor directive requires a test condition.
+## DP: GCC 4.4 enforces this rule.
+
+ at DPATCH@
+diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
+--- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
++++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
+@@ -2715,7 +2715,7 @@
+ 	"DIGEST-MD5",			/* mech_name */
+ #ifdef WITH_RC4
+ 	128,				/* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else 
+ 	1,
+@@ -4034,7 +4034,7 @@
+ 	"DIGEST-MD5",
+ #ifdef WITH_RC4				/* mech_name */
+ 	128,				/* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 	112,
+ #else
+ 	1,

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0022_gcc4.4_preprocessor_syntax.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=408&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Mon Jan 26 11:56:00 2009
@@ -20,3 +20,4 @@
 0019_ldap_deprecated
 0020_saslauthd_manpage
 0021_no_mutex_changes_after_init
+0022_gcc4.4_preprocessor_syntax