[Pkg-mediawiki-commits] r484 - mediawiki/trunk/debian

[Jonathan Wiltshire]

Author: jmw
Date: 2013-09-28 20:33:11 +0000 (Sat, 28 Sep 2013)
New Revision: 484

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/rules
Log:
Rework get-orig-source to use more conventional tools (nothing about standard, except uscan), improve legibility, and use safe temporary directories
There is one unsafe action still, the 'mv' to put the tarball in ../, but we can't do a great deal about that


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-24 18:06:17 UTC (rev 483)
+++ mediawiki/trunk/debian/changelog	2013-09-28 20:33:11 UTC (rev 484)
@@ -1,3 +1,12 @@
+mediawiki (1:1.19.8+dfsg-3) UNRELEASED; urgency=low
+
+  * Re-work debian/rule:get-orig-source:
+    - use more conventional tools
+    - improve legibility
+    - safer use of temporary directories
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sat, 28 Sep 2013 21:30:15 +0100
+
 mediawiki (1:1.19.8+dfsg-2) unstable; urgency=low
 
   [ Thorsten Glaser ]

Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules	2013-09-24 18:06:17 UTC (rev 483)
+++ mediawiki/trunk/debian/rules	2013-09-28 20:33:11 UTC (rev 484)
@@ -50,19 +50,18 @@
 # DevRef §6.7.8.2.
 .PHONY: get-orig-source
 get-orig-source:
-	mksh -o pipefail -e -x -c 'DEB_UPSTREAM_VERSION=${DEB_UPSTREAM_VERSION}; \
-		rm -rf debian/tmp; mkdir debian/tmp; cd debian/tmp; \
-		[[ -s ../../../mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz ]] && \
-		    ln -s ../../../mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz || \
-		    wget http://dumps.wikimedia.org/mediawiki/$${DEB_UPSTREAM_VERSION%.*}/mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz; \
-		paxtar xzf mediawiki-${DEB_UPSTREAM_VERSION}.tar.gz; \
+	$(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; \
-		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
+        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 $@