[Pkg-mediawiki-commits] r526 - mediawiki/branches/wheezy/debian

[Thorsten Glaser]

Author: tg
Date: 2014-03-28 09:45:17 +0000 (Fri, 28 Mar 2014)
New Revision: 526

Added:
   mediawiki/branches/wheezy/debian/upstream/
Modified:
   mediawiki/branches/wheezy/debian/changelog
   mediawiki/branches/wheezy/debian/rules
   mediawiki/branches/wheezy/debian/watch
Log:
backport to stable

Modified: mediawiki/branches/wheezy/debian/changelog
===================================================================
--- mediawiki/branches/wheezy/debian/changelog	2014-03-28 08:56:44 UTC (rev 525)
+++ mediawiki/branches/wheezy/debian/changelog	2014-03-28 09:45:17 UTC (rev 526)
@@ -1,3 +1,20 @@
+mediawiki (1:1.19.14+dfsg-0+deb7u1) wheezy-security; urgency=high
+
+  * New upstream security fix release (Closes: #742857):
+    - (bug 62497) SECURITY: Add CSRF token on Special:ChangePassword
+    - (bug 62467) Set a title for the context during import on the cli
+    - (bug 61362) Don't find links in the middle of api.php links
+    - (bug 60771) disallow iframe and unusual namespaces in SVG
+    - (bug 61346) make token comparison use constant time
+  * Fix bugs (file permissions; superfluous COPYING files) lintian
+    pointed out (backported from sid)
+  * Backport debian/rules get-orig-source-*, debian/upstream/signing-key.asc
+    and debian/watch changes from sid, to prepare for sid (or experimental)
+    switching to MediaWiki 1.23 (in which case further updates for stable
+    will need to be made using this SVN branch)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 28 Mar 2014 10:36:48 +0100
+
 mediawiki (1:1.19.11+dfsg-0+deb7u1) wheezy-security; urgency=high
 
   [ Thorsten Glaser ]

Modified: mediawiki/branches/wheezy/debian/rules
===================================================================
--- mediawiki/branches/wheezy/debian/rules	2014-03-28 08:56:44 UTC (rev 525)
+++ mediawiki/branches/wheezy/debian/rules	2014-03-28 09:45:17 UTC (rev 526)
@@ -31,14 +31,6 @@
 	done
 	# Remove Makefiles
 	find debian/mediawiki/ -iname makefile -exec rm {} \;
-	# License added to copyright file:
-	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
-	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/cyrl/LICENSE
-	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/ksh/LICENSE
-	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/COPYING
-	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/LICENSE
-	rm -f debian/mediawiki/var/lib/mediawiki/extensions/ParserFunctions/COPYING
-	rm -f debian/mediawiki/var/lib/mediawiki/extensions/Nuke/COPYING
 	# Put debian version for mediawiki version..
 	sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
 			-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
@@ -54,10 +46,55 @@
 		dh_link usr/share/mediawiki/extensions-core/"$$coreextension" \
 		    var/lib/mediawiki/extensions/"$$coreextension"; \
 	done
+	# includes/libs is provided by mediawiki-classes
+	rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs
+	# licences added to debian/copyright file
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/Gadgets/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/Nuke/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/ParserFunctions/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/Renameuser/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/extensions-core/WikiEditor/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/maintenance/cssjanus/LICENSE
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/cyrl/LICENSE
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/ksh/LICENSE
+	# fixup permissions
+	chmod a-x debian/mediawiki/usr/share/mediawiki/extensions-core/Nuke/Nuke*.php
 
 override_dh_installdeb:
 	find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".gitignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
 	dh_installdeb
 
+# DevRef §6.7.8.2.
+.PHONY: get-orig-source-tg
+get-orig-source-tg:
+	# rely on “uscan --verbose” to download, including pgp signature check
+	test -s ../mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz
+	mksh -o pipefail -e -x -c 'DEB_UPSTREAM_VERSION=${DEB_UPSTREAM_VERSION}; \
+		rm -rf debian/tmp; mkdir debian/tmp; cd debian/tmp; \
+		paxtar xzf ../../../mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz; \
+		rm -f mediawiki-${DEB_UPSTREAM_VERSION}/skins/common/images/cc-*; \
+		mv mediawiki-${DEB_UPSTREAM_VERSION} mediawiki-${DEB_UPSTREAM_VERSION}.orig; \
+		find mediawiki-${DEB_UPSTREAM_VERSION}.orig -type f | \
+		    sort | paxcpio -oC512 -Hustar -Mdist | \
+		    xz -6e >../../mediawiki_${DEB_UPSTREAM_VERSION}+dfsg.orig.tar.xz; \
+		cd ..; rm -rf tmp'
+	@ls -l mediawiki_${DEB_UPSTREAM_VERSION}+dfsg.orig.tar.xz
+.PHONY: get-orig-source-jmw
+get-orig-source-jmw:
+	$(eval TMPDIR=$(shell mktemp -d))
+	$(eval MWTAR=mediawiki_${DEB_UPSTREAM_VERSION}.orig.tar.gz)
+	$(eval DFSGTAR=mediawiki_${DEB_UPSTREAM_VERSION}+dfsg.orig.tar.xz)
+	@uscan --rename --download-current-version --destdir=${TMPDIR} > /dev/null
+	@cd ${TMPDIR} && ( \
+		tar zxf ${MWTAR}; \
+		rm -f mediawiki-${DEB_UPSTREAM_VERSION}/skins/common/images/cc-*; \
+        mv mediawiki-${DEB_UPSTREAM_VERSION} mediawiki-${DEB_UPSTREAM_VERSION}.orig; \
+		tar Jcf ${DFSGTAR} mediawiki-${DEB_UPSTREAM_VERSION}.orig; \
+	)
+	@mv ${TMPDIR}/${DFSGTAR} ../
+	@rm -r ${TMPDIR}
+
 %:
 	dh $@

Modified: mediawiki/branches/wheezy/debian/watch
===================================================================
--- mediawiki/branches/wheezy/debian/watch	2014-03-28 08:56:44 UTC (rev 525)
+++ mediawiki/branches/wheezy/debian/watch	2014-03-28 09:45:17 UTC (rev 526)
@@ -1,4 +1,4 @@
 version=3
 
 opts="dversionmangle=s/^[0-9]+://;s/\+dfsg$//,pgpsigurlmangle=s/$/.sig/" \
-http://dumps.wikimedia.org/mediawiki/1.19/ mediawiki-([0-9.]*).tar.gz
+http://releases.wikimedia.org/mediawiki/1.19/ mediawiki-([0-9.]*).tar.gz