Browse Source

Add patch 02_newer_git, fixing compatibility with newer versions of git. Closes: #907954

Jelmer Vernooij 6 years ago
parent
commit
5d84dce4ab
3 changed files with 26 additions and 0 deletions
  1. 7 0
      debian/changelog
  2. 18 0
      debian/patches/02_newer_git
  3. 1 0
      debian/patches/series

+ 7 - 0
debian/changelog

@@ -1,3 +1,10 @@
+dulwich (0.19.6-2) UNRELEASED; urgency=medium
+
+  * Add patch 02_newer_git, fixing compatibility with newer versions of
+    git. Closes: #907954
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Wed, 05 Sep 2018 21:23:16 +0100
+
 dulwich (0.19.6-1) unstable; urgency=medium
 
   * Migrate to pybuild.

+ 18 - 0
debian/patches/02_newer_git

@@ -0,0 +1,18 @@
+Description: Fix compatibility with newer versions of git, which expect CONTENT_LENGTH to be set to 0 for empty body requests.
+Origin: commit, revision id: git-v1:76ea02025eb4651913f9cf21454562d572ef4f3d
+Author: Jelmer Vernooij <jelmer@jelmer.uk>
+Last-Update: 2018-09-05
+X-Bzr-Revision-Id: git-v1:76ea02025eb4651913f9cf21454562d572ef4f3d
+
+=== modified file 'dulwich/tests/compat/test_client.py'
+--- old/dulwich/tests/compat/test_client.py	2018-06-15 22:19:41 +0000
++++ new/dulwich/tests/compat/test_client.py	2018-09-05 20:17:23 +0000
+@@ -500,6 +500,7 @@
+             data = self.rfile.read(nbytes)
+         else:
+             data = None
++            env['CONTENT_LENGTH'] = '0'
+         # throw away additional data [see bug #427345]
+         while select.select([self.rfile._sock], [], [], 0)[0]:
+             if not self.rfile._sock.recv(1):
+

+ 1 - 0
debian/patches/series

@@ -1 +1,2 @@
 01_no_urllib3_pypy
+02_newer_git