diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debian/copyright | 8 | ||||
| -rw-r--r-- | debian/patches/cherry-pick-9982ab6f-missing-changelog-entry | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 39 insertions, 5 deletions
@@ -2,11 +2,6 @@ * unposted: Config/version.mk: 5.0.7 -2014-10-06 Mikael Magnusson <mikachu@gmail.com> - - * 33365: Src/exec.c: avoid buffer overflow for very long fds in >& - fd syntax. - 2014-10-06 Peter Stephenson <p.stephenson@samsung.com> * unposted (discussed offline): README: update description of diff --git a/debian/copyright b/debian/copyright index 5a302ec4b..a0d881576 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,6 +25,14 @@ Copyright: 1996 Robert Leslie <rob@mars.org> 2012-2013 Richard Hartmann <richih@debian.org> License: Expat +Files: debian/patches/cherry-pick-* +Copyright: 1992-2014 The Zsh Development Group (Paul Falstad, Richard + Coleman, Zoltán Hidvégi, Andrew Main, Peter W. Stephenson, + Sven Wischnowsky, and others). All rights reserved. + Individual authors, whether or not specifically named, + retain copyright in all changes. +License: Zsh + Files: Src/compat.c Comment: This applies to portions of Src/compat.c, the remainder is under the copyright of The Zsh Development Group and licensed under diff --git a/debian/patches/cherry-pick-9982ab6f-missing-changelog-entry b/debian/patches/cherry-pick-9982ab6f-missing-changelog-entry new file mode 100644 index 000000000..59156b922 --- /dev/null +++ b/debian/patches/cherry-pick-9982ab6f-missing-changelog-entry @@ -0,0 +1,30 @@ +Origin: commit 9982ab6fb5266298c056326ed265fc8560202603 +Author: Mikael Magnusson <mikachu@gmail.com> +Reviewd-by: Axel Beckert <abe@debian.org> +Description: unposted: ChangeLog entry for 33365 + This patch is cherry-picked because it actually should belong to + 5.0.7 as it adds one missing (and not unimportant) changelog entry + for the 5.0.7 release. + . + This was initially part of the 5.0.7 merge from upstream into debian, + but Jenkins insisted on building against the zsh-5.0.7 tag. + . + We may need to cherry-pick 9982ab6f in the debian branch before + merging the zsh-5.0.8 tag. + +diff --git a/ChangeLog b/ChangeLog +index 2d25d1d..969273b 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -2,6 +2,11 @@ + + * unposted: Config/version.mk: 5.0.7 + ++2014-10-06 Mikael Magnusson <mikachu@gmail.com> ++ ++ * 33365: Src/exec.c: avoid buffer overflow for very long fds in >& ++ fd syntax. ++ + 2014-10-06 Peter Stephenson <p.stephenson@samsung.com> + + * unposted (discussed offline): README: update description of diff --git a/debian/patches/series b/debian/patches/series index 8d7c83249..5e195e34f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ replace-texi2html-with-makeinfo +cherry-pick-9982ab6f-missing-changelog-entry |