Add all Debian changes from 3.0.19-2 to 3.0.24-1

[privoxy.git] / debian / patches / 32_bind_fixup.patch

diff --git a/debian/patches/32_bind_fixup.dpatch b/debian/patches/32_bind_fixup.patch
old mode 100755 (executable)
new mode 100644 (file)
similarity index 59%
rename from debian/patches/32_bind_fixup.dpatch
rename to debian/patches/32_bind_fixup.patch
index 2c5bad6..317b6e0
--- a/debian/patches/32_bind_fixup.dpatch
+++ b/debian/patches/32_bind_fixup.patch
@@ -1,14 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 32_bind_fixup.dpatch by  <roland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Work around bind problems on startup (Closes: #534735)
+Author: Roland Rosenfeld <roland@debian.org>
+Description: Work around bind problems on startup (Closes: #534735)
+Bug-Debian: http://bugs.debian.org/534735
 
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/jbsockets.c privoxy/jbsockets.c
---- privoxy~/jbsockets.c
-+++ privoxy/jbsockets.c
-@@ -757,20 +757,7 @@
+--- a/jbsockets.c
++++ b/jbsockets.c
+@@ -867,20 +867,7 @@ int bind_port(const char *hostnam, int p
     }
  
     memset(&hints, 0, sizeof(struct addrinfo));