Subject: Collected Debian patches for log4shib
Author: Russ Allbery <rra@debian.org>

The packaging for log4shib is maintained in Git using multiple branches
for fixes, which makes it complex to separate the changes into individual
patches.  They are therefore all included in a single Debian patch.

For full commit history and separated commits, see the packaging Git
repository.
--- log4shib-1.0.7.orig/Makefile.am
+++ log4shib-1.0.7/Makefile.am
@@ -2,12 +2,12 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
 if DOC
-SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc 
+SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc 
 else
-SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
+SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
 endif
 
-DIST_SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
+DIST_SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
 
 bin_SCRIPTS = log4shib-config
 
--- log4shib-1.0.7.orig/configure.ac
+++ log4shib-1.0.7/configure.ac
@@ -168,7 +168,6 @@ include/Makefile
 include/log4shib/Makefile
 include/log4shib/threading/Makefile
 tests/Makefile
-debian/Makefile
 msvc6/Makefile
 msvc6/log4shib/Makefile
 msvc6/log4shibDLL/Makefile
--- log4shib-1.0.7.orig/src/PThreads.cpp
+++ log4shib-1.0.7/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);     
         }
 
