From 850a770a1aaf02e1787a728dd104aacc4b18e463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Wed, 6 Feb 2019 07:54:57 +0200 Subject: [PATCH] Update changelog and refresh patches after 10.1.38 import --- debian/changelog | 10 +++++ debian/patches/libmariadbclient-rename.patch | 4 +- .../mytop-merge_src:mytop_improvements.patch | 40 +++++++++---------- ...emove_rename_mariadb-server_files_in.patch | 2 +- ...cripts__mysql_install_db.sh__no_test.patch | 2 +- 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e5547cb0..d44ca542b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +mariadb-10.1 (10.1.38-0+deb9u1) stretch-security; urgency=high + + * SECURITY UPDATE: New upstream release 10.1.38. Includes fixes for + the following security vulnerabilities (Closes: #920933); + - CVE-2019-2537 + - CVE-2019-2529 + * Update correct branch name in gbp.conf + + -- Otto Kekäläinen Wed, 06 Feb 2019 07:53:10 +0200 + mariadb-10.1 (10.1.37-0+deb9u1) stretch-security; urgency=high * SECURITY UPDATE: New upstream release 10.1.37. Includes fixes for diff --git a/debian/patches/libmariadbclient-rename.patch b/debian/patches/libmariadbclient-rename.patch index 6c852581e..a2528d558 100644 --- a/debian/patches/libmariadbclient-rename.patch +++ b/debian/patches/libmariadbclient-rename.patch @@ -28,8 +28,8 @@ Subject: libmariadbclient-rename MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") --TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix) -+TARGET_LINK_LIBRARIES(mysqltest mariadbclient pcre pcreposix) +-TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) ++TARGET_LINK_LIBRARIES(mysqltest mariadbclient pcreposix pcre) SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) diff --git a/debian/patches/mytop-merge_src:mytop_improvements.patch b/debian/patches/mytop-merge_src:mytop_improvements.patch index c28d90f78..581fef711 100644 --- a/debian/patches/mytop-merge_src:mytop_improvements.patch +++ b/debian/patches/mytop-merge_src:mytop_improvements.patch @@ -6,8 +6,6 @@ Subject: mytop-merge_src:mytop_improvements scripts/mytop.sh | 184 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 132 insertions(+), 52 deletions(-) -diff --git a/scripts/mytop.sh b/scripts/mytop.sh -index 17a87e9..e8cc902 100644 --- a/scripts/mytop.sh +++ b/scripts/mytop.sh @@ -15,6 +15,7 @@ mytop - display MariaDB server performan @@ -172,7 +170,7 @@ index 17a87e9..e8cc902 100644 - printf(" Sorts: %5.0f qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f\n", + printf(" Sorts: %6.0f qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f\n", - ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta, + ( $STATUS{Sort_rows} - $OLD_STATUS{Sort_rows} ) / $t_delta, ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta, ( # slow now (qps) @@ -1020,7 +1062,7 @@ sub GetData() @@ -213,7 +211,7 @@ index 17a87e9..e8cc902 100644 if (defined($data->{Master_Host})) { if (defined($data->{Seconds_Behind_Master})) -@@ -1210,6 +1252,11 @@ sub GetData() +@@ -1211,6 +1253,11 @@ sub GetData() # my $host = $thread->{Host}; my $host = gethostbyaddr(inet_aton($thread->{Host}), AF_INET); # $host =~ s/^([^.]+).*/$1/; @@ -225,7 +223,7 @@ index 17a87e9..e8cc902 100644 $thread->{Host} = $host; } -@@ -1233,18 +1280,19 @@ sub GetData() +@@ -1234,18 +1281,19 @@ sub GetData() ## break EXPLAIN if you try to explain a mangled query. It ## may be re-enabled later as an option. @@ -252,7 +250,7 @@ index 17a87e9..e8cc902 100644 ## stow it in the cache $qcache{$thread->{Id}} = $thread->{Info}; -@@ -1371,7 +1419,7 @@ sub GetInnoDBStatus() +@@ -1372,7 +1420,7 @@ sub GetInnoDBStatus() } } @@ -261,7 +259,7 @@ index 17a87e9..e8cc902 100644 open P, "|$config{pager}" or die "$!"; print keys %{$data[0]}; -@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by +@@ -1723,7 +1771,7 @@ Help for mytop version $main::VERSION by e - explain the query that a thread is running E - display current replication error f - show full query info for a given thread @@ -270,7 +268,7 @@ index 17a87e9..e8cc902 100644 h - show only a specifc host's connections H - toggle the mytop header i - toggle the display of idle (sleeping) threads -@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by +@@ -1738,7 +1786,7 @@ Help for mytop version $main::VERSION by r - reset the status counters (via FLUSH STATUS on your server) R - change reverse IP lookup s - change the delay between screen updates @@ -279,7 +277,7 @@ index 17a87e9..e8cc902 100644 t - switch to thread view (default) u - show only a specific user V - show variables -@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by +@@ -1746,7 +1794,7 @@ Help for mytop version $main::VERSION by ! - Skip an error that has stopped replications (at your own risk) L - show full queries (do not strip to terminal width) @@ -288,7 +286,7 @@ index 17a87e9..e8cc902 100644 This version comes as part of the ${GREEN}MariaDB${RESET} distribution. ]; -@@ -1805,6 +1853,9 @@ sub Hashes($) +@@ -1806,6 +1854,9 @@ sub Hashes($) sub Execute($) { my $sql = shift; @@ -298,7 +296,7 @@ index 17a87e9..e8cc902 100644 my $sth = $dbh->prepare($sql); if (not $sth) { ReadMode($RM_RESET); die $DBI::errstr; } -@@ -1861,7 +1912,7 @@ B [options] +@@ -1862,7 +1913,7 @@ B [options] =head1 AVAILABILITY @@ -307,7 +305,7 @@ index 17a87e9..e8cc902 100644 This version comes as part of the B distribution. See B. -@@ -1875,6 +1926,7 @@ In order for B to function proper +@@ -1876,6 +1927,7 @@ In order for B to function proper following: * Perl 5.005 or newer @@ -315,7 +313,7 @@ index 17a87e9..e8cc902 100644 * Getopt::Long * DBI and DBD::mysql * Term::ReadKey from CPAN -@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments on +@@ -2017,46 +2069,49 @@ have two dashes `--'. Short arguments on =over @@ -377,7 +375,7 @@ index 17a87e9..e8cc902 100644 If you're running B on the same host as MariaDB, you may wish to have it use the MariaDB socket directly rather than a standard TCP/IP -@@ -2070,7 +2125,7 @@ Default: none. +@@ -2071,7 +2126,7 @@ Default: none. =item B<--header> or B<--noheader> @@ -386,7 +384,7 @@ index 17a87e9..e8cc902 100644 with the B key while B is running. Default: header. -@@ -2096,7 +2151,7 @@ Default: idle. +@@ -2097,7 +2152,7 @@ Default: idle. Specify if you want to be prompted to type in your database password. This provides a little bit more security since it not only prevents the password from viewable in a process list, but also doesn't require @@ -395,7 +393,7 @@ index 17a87e9..e8cc902 100644 You will B be prompted if a password has not been specified in your config file or through another command line option. -@@ -2110,6 +2165,27 @@ with hostnames but toggling this option. +@@ -2111,6 +2166,27 @@ with hostnames but toggling this option. Default: noresolve @@ -423,7 +421,7 @@ index 17a87e9..e8cc902 100644 =back Command-line arguments will always take precedence over config file -@@ -2153,6 +2229,13 @@ you want them to, of course). +@@ -2154,6 +2230,13 @@ you want them to, of course). You may have white space on either side of the C<=> in lines of the config file. @@ -437,7 +435,7 @@ index 17a87e9..e8cc902 100644 =head2 Shortcut Keys The following keys perform various actions while B is -@@ -2204,8 +2287,8 @@ running queries appear at the top of the +@@ -2205,8 +2288,8 @@ running queries appear at the top of the =item B @@ -448,7 +446,7 @@ index 17a87e9..e8cc902 100644 summarize that data rather than producing raw output. =item B -@@ -2258,8 +2341,8 @@ Show only threads owned by a giver user. +@@ -2259,8 +2342,8 @@ Show only threads owned by a giver user. The B key has a command-line counterpart: B<-s>. @@ -459,7 +457,7 @@ index 17a87e9..e8cc902 100644 =head1 BUGS -@@ -2292,9 +2375,6 @@ width. If you have fairly long database/ +@@ -2293,9 +2376,6 @@ width. If you have fairly long database/ may appear odd. I have no good idea as to how best to deal with that yet. Suggestions are welcome. @@ -469,7 +467,7 @@ index 17a87e9..e8cc902 100644 You should be able to specify the columns you'd like to see in the display and the order in which they appear. If you only have one username that connects to your database, it's probably not worth -@@ -2411,12 +2491,12 @@ terminals don't freak out. +@@ -2412,12 +2492,12 @@ terminals don't freak out. =item jon r. luini diff --git a/debian/patches/remove_rename_mariadb-server_files_in.patch b/debian/patches/remove_rename_mariadb-server_files_in.patch index 2169c7200..1256c8dbb 100644 --- a/debian/patches/remove_rename_mariadb-server_files_in.patch +++ b/debian/patches/remove_rename_mariadb-server_files_in.patch @@ -8,7 +8,7 @@ Subject: remove_rename_mariadb-server_files_in --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -450,12 +450,6 @@ CONFIGURE_FILE( +@@ -456,12 +456,6 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY) diff --git a/debian/patches/scripts__mysql_install_db.sh__no_test.patch b/debian/patches/scripts__mysql_install_db.sh__no_test.patch index 7bc74efcb..68d30932d 100644 --- a/debian/patches/scripts__mysql_install_db.sh__no_test.patch +++ b/debian/patches/scripts__mysql_install_db.sh__no_test.patch @@ -13,7 +13,7 @@ Subject: scripts__mysql_install_db.sh__no_test --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh -@@ -419,7 +419,7 @@ then +@@ -429,7 +429,7 @@ then fi # Create database directories -- GitLab