The following commit has been merged in the master branch:
commit 5fafd5806bf84da881bec6b0aec7417f0f2e6ff7
Merge: 21efcd23204347632f6ffefaeb494954ce5f3894 4b72aff0f0c7b1bc7d4c9e5f7ca851645d45cef7
Author: James McCoy <jamessan at debian.org>
Date: Sat Sep 1 10:55:43 2012 -0400
Merge branch 'annotate-output'
Conflicts:
debian/changelog
Signed-off-by: James McCoy <jamessan at debian.org>
diff --combined debian/changelog
index d4155c0,fac1e57..afd007e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,13 +1,53 @@@
- devscripts (2.12.2) UNRELEASED; urgency=low
++devscripts (2.12.3) UNRELEASED; urgency=low
+
+ [ Benjamin Drung ]
+ * licensecheck:
+ - Don't truncate other licenses on Public domain or WTFPL presence.
+ Thanks to Garrett Holmstrom from Fedora for the patch.
+ - Remove trailing spaces.
+ - add --machine option that outputs results in a machine readable format.
+ Thanks to Eric Lavarde for the patch. (Closes: #583750)
+ - Trim trailing period from some GPL notices' versions.
+
+ [ Richard W.M. Jones ]
+ * licensecheck: Check OCaml programs by default (*.ml, *.mli).
+
+ [ Ville Skyttä ]
+ * Spelling fixes.
+ * licensecheck: Trim trailing comma from some GPL notices' versions.
+
+ [ David Prévot ]
+ * licensecheck.1: Consistency fix.
+ * French translation update.
+
+ [ Cyril Brulebois ]
+ * getbuildlog: When several build logs are available, save all of them
+ instead of downloading them all but only keeping the oldest. (Closes:
+ #683231)
+
+ [ Christoph Berg ]
+ * debcheckout: When --package is given, use this package name rather than
+ trying to guess it from the url. Useful for URLs like
+ http://anonscm.debian.org/bzr/pkg-postgresql/postgresql-9.2/sid-pgapt/.
+ * origtargz: New script: fetch the orig tarball of a Debian package from
+ various sources, and unpack it
+ * po4a/Makefile: use po4a --keep=0 so the build system doesn't die with
+ untranslated scripts
+ * dcmd: Reimplement endswith() with case. The original missed quoting and
+ made my brain hurt.
+
+ -- Benjamin Drung <bdrung at debian.org> Thu, 26 Jul 2012 12:17:51 +0200
+
+ devscripts (2.12.2) unstable; urgency=high
+
+ * annotate-output: Fix to prevent symlink attack: don't delete
+ safely-created file and reuse its name. Instead, create temporary
+ directory and create FIFOs therein. Also, be sure to remove temporaries
+ upon catchable signal. Thanks to Jim Meyering for the patch. Fixes
+ CVE-2012-3500.
+
+ -- James McCoy <jamessan at debian.org> Sun, 26 Aug 2012 11:16:17 -0400
+
devscripts (2.12.1) unstable; urgency=low
* debchange:
@@@ -715,7 -685,7 +725,7 @@@ devscripts (2.10.69) unstable; urgency=
* Update French translation. (Closes: #599234, #600033)
[ Patrick Schoenfeld ]
- * Replace occurences of old FSF address with the FSF recommendation
+ * Replace occurrences of old FSF address with the FSF recommendation
what should be written inside of source files.
(Closes: #502512)
--
Git repository for devscripts