[Pkg-cyrus-sasl2-commits] r582 - in /cyrus-sasl-2.1/branches/package-consolidate/debian: changelog patches/0024_allow_detection_of_heimdal.dpatch patches/00list

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sat Aug 21 22:08:37 2010
New Revision: 582

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=582
Log:
  + Build against new heimdal-multidev (Closes: #591147)
* Properly detect presence of Heimdal (Closes: #590912); thanks tremendously
  to Russ Allbery for the patch

Added:
    cyrus-sasl-2.1/branches/package-consolidate/debian/patches/0024_allow_detection_of_heimdal.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/branches/package-consolidate/debian/changelog
    cyrus-sasl-2.1/branches/package-consolidate/debian/patches/00list

Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/changelog?rev=582&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/changelog (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/changelog Sat Aug 21 22:08:37 2010
@@ -1,6 +1,9 @@
-cyrus-sasl2 (2.1.23.dfsg1-6) UNRELEASED; urgency=low
+cyrus-sasl2 (2.1.23.dfsg1-6) unstable; urgency=low
 
   * Merge cyrus-sasl2 and cyrus-sasl2-heimdal source packages (Closes: #568358)
+    + Build against new heimdal-multidev (Closes: #591147)
+  * Properly detect presence of Heimdal (Closes: #590912); thanks tremendously
+    to Russ Allbery for the patch
 
  -- Roberto C. Sanchez <roberto at connexer.com>  Thu, 19 Aug 2010 20:45:57 -0400
 

Added: cyrus-sasl-2.1/branches/package-consolidate/debian/patches/0024_allow_detection_of_heimdal.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/patches/0024_allow_detection_of_heimdal.dpatch?rev=582&op=file
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/patches/0024_allow_detection_of_heimdal.dpatch (added)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/patches/0024_allow_detection_of_heimdal.dpatch Sat Aug 21 22:08:37 2010
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0024_allow_detection_of_heimdal.dpatch by  <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A patch to allow recognition of Heimdal with the heimdal-multidev 
+## DP: package
+
+ at DPATCH@
+
+Index: plugins/gssapi.c                                                         
+===================================================================             
+--- plugins/gssapi.c    (revision 580)                                          
++++ plugins/gssapi.c    (working copy)                                          
+@@ -86,7 +86,7 @@                                                               
+                                                                                
+ static const char * GSSAPI_BLANK_STRING = "";                                  
+                                                                                
+-#ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE                                        
++#if !defined(HAVE_GSS_C_NT_HOSTBASED_SERVICE) &&                               
+!defined(GSS_C_NT_HOSTBASED_SERVICE)                                            
+ extern gss_OID gss_nt_service_name;                                            
+ #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name                         
+ #endif

Propchange: cyrus-sasl-2.1/branches/package-consolidate/debian/patches/0024_allow_detection_of_heimdal.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/branches/package-consolidate/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/branches/package-consolidate/debian/patches/00list?rev=582&op=diff
==============================================================================
--- cyrus-sasl-2.1/branches/package-consolidate/debian/patches/00list (original)
+++ cyrus-sasl-2.1/branches/package-consolidate/debian/patches/00list Sat Aug 21 22:08:37 2010
@@ -20,3 +20,4 @@
 0019_ldap_deprecated
 0021_no_mutex_changes_after_init
 0022_gcc4.4_preprocessor_syntax
+0024_allow_detection_of_heimdal