1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Apply debian/patches/61_replace_dash_with_bash_mbug675185.dpatch

We have carried along this patch as a patch inside our sources
since 2012 (commit cfd4fcb0bc).

The validity of this has thus been vetted in production for years
and the review done now did not find otherwise.

A race in dash causes mysqld_safe to occasionally loop infinitely.
Fix by using bash instead.

https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185

As this is the last patch, we can also clean away usage of dpatch.
This commit is contained in:
Kristien Nielsen
2018-04-10 19:38:14 +03:00
committed by Otto Kekäläinen
parent 64094e12c0
commit c902d5a4de
5 changed files with 2 additions and 24 deletions

1
debian/control vendored
View File

@@ -8,7 +8,6 @@ Build-Depends: bison,
debhelper (>= 9), debhelper (>= 9),
dh-apparmor, dh-apparmor,
dh-systemd, dh-systemd,
dpatch,
gdb, gdb,
libaio-dev [linux-any], libaio-dev [linux-any],
libboost-dev, libboost-dev,

View File

@@ -1 +0,0 @@
61_replace_dash_with_bash_mbug675185.dpatch

View File

@@ -1,20 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 61_replace_dash_with_bash_mbug675185.dpatch by <knielsen@knielsen-hq.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: 61_replace_dash_with_bash_mbug675185
## DP: A race in dash causes mysqld_safe to occasionally loop infinitely.
## DP: Fix by using bash instead.
## DP: https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/675185
@DPATCH@
=== modified file 'scripts/mysqld_safe.sh'
--- old/scripts/mysqld_safe.sh 2010-04-09 11:47:18 +0000
+++ new/scripts/mysqld_safe.sh 2010-11-21 09:40:50 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
# This file is public domain and comes with NO WARRANTY of any kind
#

2
debian/rules vendored
View File

@@ -182,6 +182,6 @@ get-orig-source:
# white list file only starting from Debian Stretch and Ubuntu Xenial. # white list file only starting from Debian Stretch and Ubuntu Xenial.
# To find more, grep build logs for 'but is not installed to anywhere'. # To find more, grep build logs for 'but is not installed to anywhere'.
%: %:
dh $@ --parallel --with dpatch --with systemd --list-missing dh $@ --parallel --with systemd --list-missing
# vim: ts=8 # vim: ts=8

View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB # Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
# This file is public domain and comes with NO WARRANTY of any kind # This file is public domain and comes with NO WARRANTY of any kind
# #