[Pkg-mediawiki-commits] r558 - in mediawiki: branches/wheezy/debian trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2014-09-01 07:24:20 +0000 (Mon, 01 Sep 2014)
New Revision: 558

Modified:
   mediawiki/branches/wheezy/debian/changelog
   mediawiki/trunk/debian/changelog
Log:
import the two NMUs


Modified: mediawiki/branches/wheezy/debian/changelog
===================================================================
--- mediawiki/branches/wheezy/debian/changelog	2014-07-02 09:38:51 UTC (rev 557)
+++ mediawiki/branches/wheezy/debian/changelog	2014-09-01 07:24:20 UTC (rev 558)
@@ -1,9 +1,21 @@
-mediawiki (1:1.19.17+dfsg-0+deb7u2) UNRELEASED; urgency=medium
+mediawiki (1:1.19.18+dfsg-0+deb7u2) UNRELEASED; urgency=low
 
   * Remove Romain Beauxis’ bouncing eMail address
+  * Acknowledge NMU (1:1.19.18+dfsg-0+deb7u1) – thanks!
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 02 Jul 2014 11:37:16 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 01 Sep 2014 09:23:49 +0200
 
+mediawiki (1:1.19.18+dfsg-0+deb7u1) wheezy-security; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Imported Upstream version 1.19.18+dfsg
+    (Closes: #752622, #758510)
+    - CVE-2014-5241 (bug 68187) SECURITY: Prepend jsonp callback with comment.
+    - CVE-2014-5243 (bug 65778) SECURITY: Copy prevent-clickjacking between
+      OutputPage and ParserOutput.
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 19 Aug 2014 06:47:09 +0200
+
 mediawiki (1:1.19.17+dfsg-0+deb7u1) wheezy-security; urgency=medium
 
   * New upstream security and maintenance release:

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2014-07-02 09:38:51 UTC (rev 557)
+++ mediawiki/trunk/debian/changelog	2014-09-01 07:24:20 UTC (rev 558)
@@ -1,9 +1,21 @@
-mediawiki (1:1.19.17+dfsg-2) UNRELEASED; urgency=medium
+mediawiki (1:1.19.18+dfsg-1) UNRELEASED; urgency=medium
 
   * Remove Romain Beauxis’ bouncing eMail address
+  * Acknowledge NMU (1:1.19.18+dfsg-0.1) – thanks!
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 02 Jul 2014 11:37:26 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 01 Sep 2014 09:21:43 +0200
 
+mediawiki (1:1.19.18+dfsg-0.1) unstable; urgency=high
+
+  * Non-maintainer upload with maintainers approval.
+  * Imported Upstream version 1.19.18+dfsg
+    (Closes: #758510)
+    - CVE-2014-5241 (bug 68187) SECURITY: Prepend jsonp callback with comment.
+    - CVE-2014-5243 (bug 65778) SECURITY: Copy prevent-clickjacking between
+      OutputPage and ParserOutput.
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Sun, 24 Aug 2014 06:47:35 +0200
+
 mediawiki (1:1.19.17+dfsg-1) unstable; urgency=medium
 
   * New upstream security and maintenance release: