Merge lp:~abychko/percona-server/percona-server-5.6-lintian into lp:percona-server/5.6

[Alexey Bychko]

fixed packaging and lintian errors

[Laurynas Biveinis (laurynas-biveinis)]

    - have_QC_Disabled.inc having the executable bit should be fixed
      not by chmod -x in debian/rules but by removing the bit from
      the file in the bzr repo instead (here
      http://bugs.mysql.com/bug.php?id=71112 applies and not
      http://bugs.mysql.com/bug.php?id=71113)

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

Addressed review comment myself as requested at https://code.launchpad.net/~laurynas-biveinis/percona-server/percona-server-5.6-lintian/+merge/204897

review: Needs Resubmitting

Unmerged revisions

538. By Alexey Bychko on 2014-02-04

[-] cleaned commented code produced output garbage
[-] cleaned nonexisting cmake variables in debian/rules
[-] LINUX_NATIVE_AIO is removed from debian/rules, because it set automatically in ./storage/innobase/CMakeLists.txt:29
[+] added cmake policy definition to fix not-useful warnings about INTERFACE_LINK_LIBRARIES policy. upstream fix is incorrect, it doesn't work with Ubuntu saucy version set to 2.6.11.1
[+] added VERBOSE=1 to make command
[-] removed static mysqld build and related cmake option
[-] | server | removed mysqld directory from /var/run (lintian)
[+] | server | added /etc/mysql/conf.d directory to the package
[*] fixed percona-server-server-5.6.postinst: line 220: unexpected EOF while looking for matching ``'
[*] fixed debian-maint user creation
[+] added dh_lintian build step
[*] fixed reasonable lintian warnings and errors
[*] fixed indentation for debian/rules, converted to <TAB>s, as per debian spec

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-20 03:15:04 +0000
+++ CMakeLists.txt	2014-02-05 05:14:36 +0000
@@ -19,6 +19,11 @@
  CMAKE_POLICY(VERSION 2.8)
 endif()
 
+#fix for http://bugs.mysql.com/bug.php?id=71089
+IF(NOT(CMAKE_VERSION VERSION_LESS "2.8.12"))
+  CMAKE_POLICY(SET CMP0022 OLD)
+ENDIF()
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2014-01-28 10:42:55 +0000
+++ build-ps/debian/control	2014-02-05 05:14:36 +0000
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Percona Server Development Team <[e-mail]>
 Uploaders: Stewart Smith <[e-mail]>, Alexey Bychko <[e-mail]>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, ghostscript,  gawk, bison, lsb-release, cmake, gcc, g++, libaio-dev[linux-any], libpam-dev, libssl-dev
+Build-Depends: libtool (>= 1.4.2-7), procps,  debhelper (>= 7.0.50~), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, ghostscript,  gawk, bison, lsb-release, cmake, gcc (>= 4.4), g++ (>= 4.4), libaio-dev[linux-any], libpam-dev, libssl-dev
 Standards-Version: 3.9.4
 Homepage: http://www.percona.com/software/percona-server/
 Vcs-Bzr: lp:percona-server/5.6
@@ -80,7 +80,7 @@
 Architecture: any
 Suggests: tinyca
 Pre-Depends: percona-server-common-5.6 (>= ${source:Version}), adduser (>= 3.4.0), debconf
-Depends: percona-server-client-5.6 (>= ${source:Version}), libdbi-perl, libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), percona-server-common-5.6 (>= ${source:Version}), adduser (>= 3.40), debconf
+Depends: percona-server-client-5.6 (>= ${source:Version}), libdbi-perl, libdbd-mysql-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10)
 Conflicts: mysql-server, mysql-server-4.1, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
 Provides: mysql-server
 Replaces: mysql-server, mysql-server-5.0, mysql-server-core-5.1, percona-xtradb-server-5.0, percona-server-server-5.1, percona-server-server-5.5
@@ -123,7 +123,7 @@
 
 Package: percona-server-test-5.6
 Architecture: any
-Depends: percona-server-client-5.6 (>= ${source:Version}), percona-server-server-5.6 (>= ${source:Version}), ${misc:Depends}
+Depends: percona-server-client-5.6 (>= ${source:Version}), percona-server-server-5.6 (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Percona Server database test suite
  Percona Server is a fast, stable and true multi-user, multi-threaded SQL
  database server. SQL (Structured Query Language) is the most popular database

=== removed file 'build-ps/debian/libperconaserverclient18.1.postinst'
--- build-ps/debian/libperconaserverclient18.1.postinst	2013-12-11 03:53:50 +0000
+++ build-ps/debian/libperconaserverclient18.1.postinst	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash -e
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-ldconfig
-
-exit 0
-
-# vim: ts=4
-
-

=== modified file 'build-ps/debian/percona-server-client-5.6.lintian-overrides'
--- build-ps/debian/percona-server-client-5.6.lintian-overrides	2013-12-11 03:37:16 +0000
+++ build-ps/debian/percona-server-client-5.6.lintian-overrides	2014-02-05 05:14:36 +0000
@@ -1,14 +1,7 @@
-percona-server-client-5.6: package-has-a-duplicate-relation
+package-has-a-duplicate-relation
 
 # we are MySQL, so we're going to hit false-positives
-embedded-library binary: usr/bin/mysql
-embedded-library binary: usr/bin/mysql_client_test
-embedded-library binary: usr/bin/mysqladmin
-embedded-library binary: usr/bin/mysqlcheck
-embedded-library binary: usr/bin/mysqldump
-embedded-library binary: usr/bin/mysqlimport
-embedded-library binary: usr/bin/mysqlshow
-embedded-library binary: usr/bin/mysqlslap
+embedded-library
 
 # We should get man pages for these binaries.
 binary-without-manpage usr/bin/mysqlanalyze

=== added file 'build-ps/debian/percona-server-common-5.6.lintian-overrides'
--- build-ps/debian/percona-server-common-5.6.lintian-overrides	1970-01-01 00:00:00 +0000
+++ build-ps/debian/percona-server-common-5.6.lintian-overrides	2014-02-05 05:14:36 +0000
@@ -0,0 +1,1 @@
+empty-binary-package

=== modified file 'build-ps/debian/percona-server-server-5.6.dirs'
--- build-ps/debian/percona-server-server-5.6.dirs	2013-05-10 13:29:38 +0000
+++ build-ps/debian/percona-server-server-5.6.dirs	2014-02-05 05:14:36 +0000
@@ -1,1 +1,3 @@
-var/run/mysqld
+var/run
+etc/mysql/conf.d
+

=== modified file 'build-ps/debian/percona-server-server-5.6.lintian-overrides'
--- build-ps/debian/percona-server-server-5.6.lintian-overrides	2013-12-11 03:37:16 +0000
+++ build-ps/debian/percona-server-server-5.6.lintian-overrides	2014-02-05 05:14:36 +0000
@@ -4,9 +4,10 @@
 percona-server-server-5.6: statically-linked-binary ./usr/sbin/mysqld
 
 # we are mysqld, we are going to look like libmysqlclient
-embedded-library binary: usr/bin/mysqlbinlog
-embedded-library binary: usr/bin/mysqltest
-embedded-library binary: usr/sbin/mysqld
+embedded-library 
+
+#to supress false positive
+duplicate-updaterc.d-calls-in-postrm
 
 extra-license-file usr/share/doc/percona-server-server-5.6/COPYING.gz
 extra-license-file usr/share/doc/percona-server-server-5.6/COPYING.innodb-deadlock-count-patch

=== modified file 'build-ps/debian/percona-server-server-5.6.postinst'
--- build-ps/debian/percona-server-server-5.6.postinst	2013-12-22 23:31:06 +0000
+++ build-ps/debian/percona-server-server-5.6.postinst	2014-02-05 05:14:36 +0000
@@ -197,18 +197,18 @@
         "USE mysql\n" \
         "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
     replace_query=`echo -e \
-        "USE mysql\n" \
+        "USE mysql;\n" \
         "REPLACE INTO user SET " \
         "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \
         "  Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \
         "  Create_priv='Y', Drop_priv='Y', Reload_priv='Y', Shutdown_priv='Y', " \
         "  Process_priv='Y',  File_priv='Y', Grant_priv='Y', References_priv='Y', " \
-        "  Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', "\
-        "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
-        "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
-        "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
-        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y', Create_tablespace_priv='Y' "`;
-        "  ssl_cipher='', x509_issuer='', x509_subject=''; "`
+        "  Index_priv='Y', Alter_priv='Y', Super_priv='Y', Show_db_priv='Y', " \
+        "  Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', " \
+        "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', " \
+        "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', " \
+        "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y', Create_tablespace_priv='Y', " \
+        "  ssl_cipher='', x509_issuer='', x509_subject=''; " `
     fix_privs=`echo -e \
         "USE mysql;\n" \
         "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
@@ -231,15 +231,16 @@
   ;;
 
   *)
-    echo "postinst called with unknown argument '$1'" 1>&2
+    echo "postinst called with unknown argument $1" 1>&2
     exit 1
   ;;
 esac
 
 # here we check to see if we can connect as root without a password
 # this should catch upgrades from previous versions where the root
-# password wasn't set.  if there is a password, or if the connection
+# password was not set.  if there is a password, or if the connection
 # fails for any other reason, nothing happens.
+
 if [ "$1" = "configure" ]; then
        if test_mysql_access; then
                db_input medium percona-server-server/root_password || true

=== modified file 'build-ps/debian/percona-server-server-5.6.postrm'
--- build-ps/debian/percona-server-server-5.6.postrm	2013-12-11 03:37:16 +0000
+++ build-ps/debian/percona-server-server-5.6.postrm	2014-02-05 05:14:36 +0000
@@ -19,9 +19,9 @@
 stop_server() {
   set +e
   if [ -x /usr/sbin/invoke-rc.d ]; then
-    invoke-rc.d percona-server stop
+    invoke-rc.d mysql stop
   else
-    /etc/init.d/percona-server stop
+    /etc/init.d/mysql stop
   fi
   errno=$?
   set -e
@@ -69,7 +69,7 @@
 
   # (normally) Automatically added by dh_installinit
   if [ "$1" = "purge" ] ; then
-        update-rc.d percona-server remove >/dev/null || exit 0
+        update-rc.d mysql remove >/dev/null || exit 0
   fi
   # (normally) End automatically added section
 fi

=== added file 'build-ps/debian/percona-server-test-5.6.lintian-overrides'
--- build-ps/debian/percona-server-test-5.6.lintian-overrides	1970-01-01 00:00:00 +0000
+++ build-ps/debian/percona-server-test-5.6.lintian-overrides	2014-02-05 05:14:36 +0000
@@ -0,0 +1,3 @@
+arch-dependent-file-in-usr-share usr/share/mysql-test/lib/My/SafeProcess/my_safe_process
+
+

=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-01-28 10:42:55 +0000
+++ build-ps/debian/rules	2014-02-05 05:14:36 +0000
@@ -14,14 +14,9 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
-#ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
-#    USE_THIS_GCC_VERSION:=-4.4
-#endif
-
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
 
-
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
@@ -52,19 +47,6 @@
 
 builddir = builddir
 
-# This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
-# so it is disabled by default although, according to MySQL, it brings >10%
-# performance gain if enabled. See #299382.
-ifeq ($(STATIC_MYSQLD), 1)
-    USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
-endif
-
-# See http://blogs.innodb.com/wp/2010/04/innodb-performance-aio-linux/
-# Also #659565
-ifneq (,$(findstring linux-gnu,$(DEB_HOST_GNU_TYPE)))
-    USE_LINUX_NATIVE_AIO:=-DLINUX_NATIVE_AIO=ON
-endif
-
 configure: patch configure-stamp
 
 configure-stamp:
@@ -84,32 +66,22 @@
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		\
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-	       	-DMYSQL_USER=mysql \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DWITH_LIBWRAP=ON \
-		-DWITH_READLINE=OFF \
-		-DWITH_LIBEDIT=OFF \
-		$(USE_STATIC_MYSQLD) \
-		$(USE_LINUX_NATIVE_AIO) \
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=system \
-	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
-	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
-	    -DSYSTEM_TYPE="debian-linux-gnu" \
-	    -DINSTALL_LAYOUT=RPM \
-	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
-	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-        -DWITH_EMBEDDED_SERVER=OFF \
-	    -DWITH_ARCHIVE_STORAGE_ENGINE=ON \
-	    -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
-	    -DWITH_FEDERATED_STORAGE_ENGINE=ON \
-            -DWITH_PAM=ON \
+		-DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
+		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+		-DSYSTEM_TYPE="debian-linux-gnu" \
+		-DINSTALL_LAYOUT=RPM \
+		-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DWITH_EMBEDDED_SERVER=OFF \
+		-DWITH_ARCHIVE_STORAGE_ENGINE=ON \
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
+		-DWITH_FEDERATED_STORAGE_ENGINE=ON \
+		-DWITH_PAM=ON \
 		-DWITH_EXTRA_CHARSETS=all ..'
-		
-	#       --sysconfdir=/etc/mysql  -- Appends /etc/mysql after ~/ in the my.cnf search patch!
-	#
-	#	--with-debug
-	
 	touch $@
 
 build: build-arch build-indep
@@ -124,7 +96,7 @@
 	--exclude=debian . \
 	--transform="s,^\./,percona-server-5.6/,"
 
-	cd $(builddir) && $(MAKE) $(MAKE_JFLAG)
+	cd $(builddir) && $(MAKE) $(MAKE_JFLAG) VERBOSE=1
 
 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Don't know why the following is necessary...
@@ -230,7 +202,7 @@
 
 	# Work around MySQL bug 71113, x bit set on example configs
 	chmod -x $(TMP)/usr/share/mysql/mysql-log-rotate
-
+	chmod -x $(TMP)/usr/share/mysql-test/include/have_QC_Disabled.inc
 	dh_movefiles
 
 # Build architecture-independent files here.
@@ -278,6 +250,7 @@
 	dh_installlogcheck -a
 	dh_installchangelogs -a
 	dh_strip -a
+	dh_lintian
 	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
 	dh_compress -a
 	dh_fixperms -a