[SCM] log4shib Debian packaging branch, master, updated. debian/1.0.6-1-6-g5ce102f

[Russ Allbery]

The following commit has been merged in the master branch:
commit 592f36778042f6bec64c9cacb1f466120e7ae7f7
Author: Russ Allbery <rra at stanford.edu>
Date:   Tue Jun 18 16:01:29 2013 -0700

    Increase the buffer for storing the pthread ID
    
    * Increase the buffer for the thread ID to handle platforms where a long
      is 64 bits.  This should hopefully fix the FTBFS on ia64.

diff --git a/debian/changelog b/debian/changelog
index eddce2c..8030307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ log4shib (1.0.7-1) unstable; urgency=low
 
   * New upstream release.
     - Mark log sockets close-on-exec.
+  * Increase the buffer for the thread ID to handle platforms where a long
+    is 64 bits.  This should hopefully fix the FTBFS on ia64.
 
- -- Russ Allbery <rra at debian.org>  Tue, 18 Jun 2013 15:14:06 -0700
+ -- Russ Allbery <rra at debian.org>  Tue, 18 Jun 2013 16:02:09 -0700
 
 log4shib (1.0.6-1) unstable; urgency=low
 
diff --git a/src/PThreads.cpp b/src/PThreads.cpp
index 334c89d..f862b51 100644
--- a/src/PThreads.cpp
+++ b/src/PThreads.cpp
@@ -6,8 +6,8 @@ namespace log4shib {
     namespace threading {
 
         std::string getThreadId() {
-            char buffer[16];
-            ::sprintf(buffer, "%ld", pthread_self());
+            char buffer[32];
+            ::sprintf(buffer, "%ld", (long) pthread_self());
             return std::string(buffer);     
         }
 

-- 
log4shib Debian packaging