[Pkg-mediawiki-commits] r369 - geshi/trunk/debian

[Jan Dittberner]

Author: jandd
Date: 2012-08-25 13:00:35 +0000 (Sat, 25 Aug 2012)
New Revision: 369

Modified:
   geshi/trunk/debian/changelog
   geshi/trunk/debian/control
   geshi/trunk/debian/control.in
   geshi/trunk/debian/rules
Log:
* Fix "Local File Inclusion Vulnerability in contrib script" use debian/rules
  to remove contrib/cssgen.php from bundled examples (Closes: #685324)
* debian/control: add myself to Uploaders

Modified: geshi/trunk/debian/changelog
===================================================================
--- geshi/trunk/debian/changelog	2012-08-08 12:29:45 UTC (rev 368)
+++ geshi/trunk/debian/changelog	2012-08-25 13:00:35 UTC (rev 369)
@@ -1,3 +1,11 @@
+geshi (1.0.8.4-2) unstable; urgency=low
+
+  * Fix "Local File Inclusion Vulnerability in contrib script" use debian/rules
+    to remove contrib/cssgen.php from bundled examples (Closes: #685324)
+  * debian/control: add myself to Uploaders
+
+ -- Jan Dittberner <jandd at debian.org>  Sat, 25 Aug 2012 14:55:54 +0200
+
 geshi (1.0.8.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: geshi/trunk/debian/control
===================================================================
--- geshi/trunk/debian/control	2012-08-08 12:29:45 UTC (rev 368)
+++ geshi/trunk/debian/control	2012-08-25 13:00:35 UTC (rev 369)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
-Uploaders: Romain Beauxis <toots at rastageeks.org>
+Uploaders: Romain Beauxis <toots at rastageeks.org>, Jan Dittberner <jandd at debian.org>
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 7.0.1)
 Homepage: http://qbnz.com/highlighter/
 Standards-Version: 3.8.2

Modified: geshi/trunk/debian/control.in
===================================================================
--- geshi/trunk/debian/control.in	2012-08-08 12:29:45 UTC (rev 368)
+++ geshi/trunk/debian/control.in	2012-08-25 13:00:35 UTC (rev 369)
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
-Uploaders: Romain Beauxis <toots at rastageeks.org>
+Uploaders: Romain Beauxis <toots at rastageeks.org>, Jan Dittberner <jandd at debian.org>
 Build-Depends: @cdbs@
 Homepage: http://qbnz.com/highlighter/
 Standards-Version: 3.8.2

Modified: geshi/trunk/debian/rules
===================================================================
--- geshi/trunk/debian/rules	2012-08-08 12:29:45 UTC (rev 368)
+++ geshi/trunk/debian/rules	2012-08-25 13:00:35 UTC (rev 369)
@@ -9,6 +9,9 @@
 
 DEB_INSTALL_CHANGELOGS_php-geshi := docs/CHANGES
 
+clean::
+	# fix #685324
+	rm -f contrib/cssgen.php
 
 binary-predeb/php-geshi::
 	find debian/php-geshi -depth \( -name ".cvsignore" -o -name ".arch-ids" -o -name '*.swp' \) -exec rm -rf {} \;