[Pkg-mysql-commits] [mariadb-5.5] 05/05: Merged with upstream 5.5.39
Otto Kekäläinen
ottok-guest at moszumanska.debian.org
Thu Aug 7 13:21:03 UTC 2014
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 e8767806aa557435dd636dc32fe794d05b32c790
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date: Thu Aug 7 14:56:36 2014 +0300
Merged with upstream 5.5.39
---
debian/README.Maintainer | 20 +++++++-
debian/changelog | 19 ++++----
debian/patches/20_fix_hppa_architecture_build.diff | 14 ------
.../38_scripts__mysqld_safe.sh__signals.diff | 2 +-
debian/patches/44_scripts__mysql_config__libs.diff | 2 +-
debian/patches/50_mysql-test__db_test.diff | 2 +-
debian/patches/70_build_aria_manpages.diff | 13 ------
debian/patches/75_man_syntax_fixes.diff | 54 ----------------------
.../99_remove_rename_mariadb-server_files_in.diff | 2 +-
debian/patches/series | 2 -
debian/watch | 3 ++
11 files changed, 36 insertions(+), 97 deletions(-)
diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index 9f1c62c..237145e 100644
--- a/debian/README.Maintainer
+++ b/debian/README.Maintainer
@@ -1,6 +1,10 @@
-## Building from sources with git-buildpackage ##
+# README for Debian package maintainers #
+
+This file mostly applies to how the packaging workflow works for the official Debian packages, but it may contain useful information also for anybody doing their own private .deb builds.
+## Building from sources with git-buildpackage ##
+
Clone sources with all branches
sudo apt-get install git-buildpackage
gbp-clone --pristine-tar git://git.debian.org/git/pkg-mysql/mariadb-5.5.git
@@ -30,6 +34,11 @@ If the build fails the easiest way to clean up before a new run is
export DEB_BUILD_OPTIONS="nocheck"
+ If you want to run the build in parallel on 2 CPUs and have verbose output, use:
+ export DEB_BUILD_OPTIONS="parallel=2 verbose"
+
+ The options above can also be combined freely to get required behaviour.
+
## Importing initial sources from upstream the first fime ##
@@ -77,6 +86,15 @@ Note that in above if you want to sync to Github directly you need to have colla
git remote add origin git at github.com:ottok/mariadb-5.5.git
+### Maintaining patches ###
+
+Test that the patches still apply by running:
+ export QUILT_PATCHES=debian/patches
+ quilt import
+ quilt push -a
+
+If there are any rejects, inspect the files and update the patches.
+
### Maintaining symbols file for libmariadbclient18 et al ###
Update symbols file:
diff --git a/debian/changelog b/debian/changelog
index 86435d9..8144fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,9 @@
-mariadb-5.5 (5.5.38-2) unstable; urgency=low
+mariadb-5.5 (5.5.39-1) unstable; urgency=low
+ * New upstream release.
* Fixed wrongly applied fix of MDEV-5957 (Closes: #752203)
- * Add in retrospect corresponding MariaDB CVEs for
- Oracle SPU July 2014 (Closes: #754940)
- - CVE-2014-2494
- - CVE-2014-4207
- - CVE-2014-4243
- - CVE-2014-4258
- - CVE-2014-4260
- -- Otto Kekäläinen <otto at seravo.fi> Sat, 19 Jul 2014 23:43:33 +0300
+ -- Otto Kekäläinen <otto at seravo.fi> Thu, 07 Aug 2014 12:16:19 +0300
mariadb-5.5 (5.5.38-1) unstable; urgency=low
@@ -20,6 +14,13 @@ mariadb-5.5 (5.5.38-1) unstable; urgency=low
* Fixed lots and lots of Lintian warnings
* Disabled TokuDB (Closes: #753222). Remember to re-enable if once
https://mariadb.atlassian.net/browse/MDEV-6449 is closed.
+ * Add in retrospect corresponding MariaDB CVEs for
+ Oracle SPU July 2014 (Closes: #754940)
+ - CVE-2014-2494
+ - CVE-2014-4207
+ - CVE-2014-4243
+ - CVE-2014-4258
+ - CVE-2014-4260
-- Otto Kekäläinen <otto at seravo.fi> Tue, 17 Jun 2014 16:24:35 +0300
diff --git a/debian/patches/20_fix_hppa_architecture_build.diff b/debian/patches/20_fix_hppa_architecture_build.diff
deleted file mode 100644
index cb95a58..0000000
--- a/debian/patches/20_fix_hppa_architecture_build.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Helge Deller <deller at gmx.de>
-Description: mariadb-5.5 FTBFS, patch for hppa architecture attached #751805
-
---- old/storage/xtradb/os/os0stacktrace.c 2014-06-16 16:19:31.288965684 +0200
-+++ new/storage/xtradb/os/os0stacktrace.c 2014-06-16 17:16:44.210474810 +0200
-@@ -85,7 +85,7 @@ os_stacktrace_print(
- caller_address = (void*) uc->uc_mcontext.gregs[REG_RIP] ;
- #elif defined(__hppa__)
- ucontext_t* uc = (ucontext_t*) ucontext;
-- caller_address = (void*) uc->uc_mcontext.sc_iaoq[0] & ~0×3UL ;
-+ caller_address = (void*) (uc->uc_mcontext.sc_iaoq[0] & ~0x3UL);
- #elif (defined (__ppc__)) || (defined (__powerpc__))
- ucontext_t* uc = (ucontext_t*) ucontext;
- caller_address = (void*) uc->uc_mcontext.regs->nip ;
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
index 7dab872..d23cbf2 100755
--- a/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
+++ b/debian/patches/38_scripts__mysqld_safe.sh__signals.diff
@@ -23,7 +23,7 @@
;;
*)
echo "Internal program error (non-fatal):" \
-@@ -805,6 +804,13 @@ then
+@@ -802,6 +801,13 @@ then
fi
#
diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
index 3bc1790..01839f4 100755
--- a/debian/patches/44_scripts__mysql_config__libs.diff
+++ b/debian/patches/44_scripts__mysql_config__libs.diff
@@ -3,7 +3,7 @@ Description: Removes unnecessary library dependencies. See #390692
--- old/scripts/mysql_config.sh 2014-04-17 22:07:38.668960760 +0300
+++ new/scripts/mysql_config.sh 2014-04-17 22:08:33.528958126 +0300
-@@ -106,10 +106,10 @@
+@@ -107,10 +107,10 @@
# Create options
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
diff --git a/debian/patches/50_mysql-test__db_test.diff b/debian/patches/50_mysql-test__db_test.diff
index c171747..0d05e0e 100755
--- a/debian/patches/50_mysql-test__db_test.diff
+++ b/debian/patches/50_mysql-test__db_test.diff
@@ -6,7 +6,7 @@
## DP: suite depends on them.
--- old/mysql-test/mysql-test-run.pl 2009-06-16 14:24:09.000000000 +0200
+++ new/mysql-test/mysql-test-run.pl 2009-07-04 00:03:34.000000000 +0200
-@@ -3578,6 +3578,11 @@ sub mysql_install_db {
+@@ -3567,6 +3567,11 @@ sub mysql_install_db {
mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
$bootstrap_sql_file);
diff --git a/debian/patches/70_build_aria_manpages.diff b/debian/patches/70_build_aria_manpages.diff
deleted file mode 100644
index 6ba143e..0000000
--- a/debian/patches/70_build_aria_manpages.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Otto Kekäläinen <otto at seravo.fi>
-Description: Add existing man pages to CMake to actually include them in pacakge
-
---- old/man/CMakeLists.txt 2014-06-18 14:02:56.249087477 +0300
-+++ new/man/CMakeLists.txt 2014-06-18 14:04:21.901091309 +0300
-@@ -14,6 +14,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
-+ aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
- myisamlog.1 myisampack.1 mysql.server.1
- mysql_convert_table_format.1 mysql_fix_extensions.1
- mysql_install_db.1
diff --git a/debian/patches/75_man_syntax_fixes.diff b/debian/patches/75_man_syntax_fixes.diff
index ceae29c..c5d1ee3 100644
--- a/debian/patches/75_man_syntax_fixes.diff
+++ b/debian/patches/75_man_syntax_fixes.diff
@@ -1,60 +1,6 @@
Author: Colin Watson <cjwatson at debian.org>
Description: Fix man page syntax to make package Lintian clean
---- a/man/aria_pack.1
-+++ b/man/aria_pack.1
-@@ -1,6 +1,6 @@
- .TH ARIA_PACK "1" "May 2014" "aria_pack Ver 1.0" "User Commands"
- .SH NAME
--aria_pack \- manual page for aria_pack Ver 1.0
-+aria_pack \- pack an Aria\-table to take much less space
- .SH SYNOPSIS
- .B aria_pack
- [\fIOPTIONS\fR] \fIfilename\fR...
---- a/man/mysqlbinlog.1
-+++ b/man/mysqlbinlog.1
-@@ -1255,7 +1255,7 @@ indicates a
- FORMAT_DESCRIPTION_EVENT\&. The following table lists the possible type codes\&.
- .TS
- allbox tab(:);
--l l l.
-+l l lx.
- T{
- Type
- T}:T{
-@@ -1389,6 +1389,7 @@ T}
- T{
- 0f
- T}:T{
-+.nf
- FORMAT_DESCRIPTION_EVENT
- T}:T{
- This indicates the start of a log file written by MySQL 5 or later\&.
-@@ -1526,7 +1527,7 @@ Master Pos: The position of the next event in the original master log file\&.
- Flags: 16 flags\&. Currently, the following flags are used\&. The others are reserved for future use\&.
- .TS
- allbox tab(:);
--l l l.
-+l l lx.
- T{
- Flag
- T}:T{
-@@ -1537,6 +1538,7 @@ T}
- T{
- 01
- T}:T{
-+.nf
- LOG_EVENT_BINLOG_IN_USE_F
- T}:T{
- Log file correctly closed\&. (Used only in
-@@ -1558,6 +1560,7 @@ T}
- T{
- 04
- T}:T{
-+.nf
- LOG_EVENT_THREAD_SPECIFIC_F
- T}:T{
- Set if the event is dependent on the connection it was executed in (for
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
@@ -2041,12 +2041,12 @@ T}
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
index 95dd452..3add5c7 100755
--- a/debian/patches/99_remove_rename_mariadb-server_files_in.diff
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -3,7 +3,7 @@ Description: Remove upstream debian/* handling that is obsolete
--- old/CMakeLists.txt 2014-01-29 20:55:56.499842093 +0200
+++ new/CMakeLists.txt 2014-01-31 17:12:27.633594128 +0200
-@@ -431,12 +431,6 @@
+@@ -455,12 +455,6 @@
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
diff --git a/debian/patches/series b/debian/patches/series
index 4a7c2ca..479a9ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,9 @@
-20_fix_hppa_architecture_build.diff
33_scripts__mysql_create_system_tables__no_test.diff
38_scripts__mysqld_safe.sh__signals.diff
41_scripts__mysql_install_db.sh__no_test.diff
44_scripts__mysql_config__libs.diff
50_mysql-test__db_test.diff
61_replace_dash_with_bash_mbug675185.diff
-70_build_aria_manpages.diff
75_man_syntax_fixes.diff
82_extend_default_test_timeout_for_tokudb.diff
99_remove_rename_mariadb-server_files_in.diff
diff --git a/debian/watch b/debian/watch
index 0167e15..db324ed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,3 +5,6 @@ opts=pgpsigurlmangle=s/$/.asc/ uversionmangle=s/-(rc|beta)/$1/ \
# Added string "-5.5." in path as MariaDB has release series 5.5 and 10.x in parallel,
# and we want uscan to check for updates only in the 5-series.
+
+# Automated signature checking with pgpsigurlmangle has been available
+# only since devscripts version 2.13.3
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git
More information about the Pkg-mysql-commits
mailing list