From: Raspbian forward pporter Date: Thu, 18 May 2017 14:32:12 +0000 (+0000) Subject: Merge version 1:1.7.10.4-1+wheezy3+rpi1 and 1:1.7.10.4-1+wheezy4 to produce 1:1.7... X-Git-Tag: archive/raspbian/1%1.7.10.4-1+wheezy4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=793fc93dacfa561ea7ca70b8956d737e14991871;p=git.git Merge version 1:1.7.10.4-1+wheezy3+rpi1 and 1:1.7.10.4-1+wheezy4 to produce 1:1.7.10.4-1+wheezy4+rpi1 --- 793fc93dacfa561ea7ca70b8956d737e14991871 diff --cc debian/changelog index 51317c4,d163b97..9b4d206 --- a/debian/changelog +++ b/debian/changelog @@@ -1,25 -1,12 +1,35 @@@ - git (1:1.7.10.4-1+wheezy3+rpi1) wheezy-staging; urgency=medium ++git (1:1.7.10.4-1+wheezy4+rpi1) wheezy-staging; urgency=medium + + [changes brought forward from 1:1.7.10.4-1+wheezy1+rpi1 by Peter Michael Green at Sun, 25 Nov 2012 13:13:58 +0000] + * Disable testsuite + + [changes brought forward from 1:1.7.10.4-1+wheezy1+rpi2 by Peter Michael Green at Sun, 14 Apr 2013 13:54:01 +0000] + * Adopt patches from sid version 1:1.7.10.4-2 for new subversion, renumber + them to high numbers so they stay at the end of the list in the face of + future wheezy changes. + * 0113...0130: new from the upstream 'master' branch: git svn: + adapt to svn 1.7 changes: + * normalize paths and URLs passed to Subversion (thx Michael G. + Schwern; closes: #678137) + * use correct "svn cp" syntax when checking git svn's mangling + of @-signs in branch names (svn became stricter). + * commit filetype changes between a regular file and symlink as + replacement (deletion followed by addition) instead of + modification of files. Otherwise, clients pulling the change + with "svn update" hit an assertion failure (svn issue 4091). + * Renable testsuite + - -- Raspbian forward porter Mon, 21 Mar 2016 18:44:19 +0000 ++ -- Raspbian forward porter Thu, 18 May 2017 14:32:09 +0000 ++ + git (1:1.7.10.4-1+wheezy4) wheezy-security; urgency=high + + * Non-maintainer upload by the LTS team. + * Fix CVE-2017-8386: + Timo Schmid of ERNW GmbH discovered that the Git git-shell, a restricted + login shell for Git-only SSH access, allows a user to run an interactive + pager by causing it to spawn "git upload-pack --help". + + -- Markus Koschany Wed, 10 May 2017 18:40:45 +0200 git (1:1.7.10.4-1+wheezy3) wheezy-security; urgency=high