[Pkg-mysql-commits] [mariadb-5.5] 01/01: Streamline rules file and recover explicit override_dh_auto_build so tests won't run too soon.

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 21c251a852b2bcbafa8b9e0049be0471f5bdca3e
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Thu Aug 7 21:07:17 2014 +0300

    Streamline rules file and recover explicit override_dh_auto_build so tests won't run too soon.
---
 debian/changelog |  2 ++
 debian/rules     | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd292da..b033c7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mariadb-5.5 (5.5.39-1) unstable; urgency=low
 
   * New upstream release.
+    * Fixes an error when handling MyISAM temporary files can be
+      exploited to execute arbitrary code (Secunia Advisory SA60599)
   * Add patch to fix kFreeBSD builds
   * Fixed wrongly applied fix of MDEV-5957 (Closes: #752203)
 
diff --git a/debian/rules b/debian/rules
index 4d054a3..999c32c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,14 +87,12 @@ override_dh_auto_clean:
 	dh_testroot
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 	rm -rf $(BUILDDIR)
-	debconf-updatepo
-
-override_dh_auto_configure: configure-stamp
+	debconf-updatepo # Update po-files when clean runs before each build
 
 override_dh_prep:
         # Don't clean /tmp/ away, it is needed by all binary packages
 
-configure-stamp:
+override_dh_auto_configure:
 	@echo "RULES.$@"
 	dh_testdir
 	
@@ -116,7 +114,7 @@ configure-stamp:
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 	    $(USE_STATIC_MYSQLD) \
-	    $(MAKEFLAGS) \
+	    -$(MAKEFLAGS) \
 	    $(TOKUDB_OPT) \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
@@ -127,6 +125,11 @@ configure-stamp:
 		-DDEB=1 ..'
 	touch $@
 
+# This is needed, otherwise 'make test' will run before binaries have been built
+override_dh_auto_build:
+	@echo "RULES.$@"
+	cd $(builddir) && $(MAKE)
+	touch $@
 
 override_dh_auto_test:
 	@echo "RULES.$@"
@@ -134,9 +137,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ;
 endif
 
-override_dh_auto_install: auto_install-stamp
-
-auto_install-stamp:
+override_dh_auto_install:
 	@echo "RULES.$@"
 	dh_testdir
 	dh_testroot
@@ -215,11 +216,6 @@ override_dh_installinit-arch:
 override_dh_installcron-arch:
 	dh_installcron --name mysql-server
 
-binary:	binary-indep binary-arch
-
-get-orig-source:
-	uscan --force-download --verbose
-
 %:
 	dh $@ --parallel
 

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git