Skip to content

Commit c902d5a

Browse files
knielsenottok
authored andcommitted
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 cfd4fcb). 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.
1 parent 64094e1 commit c902d5a

File tree

5 files changed

+2
-24
lines changed

5 files changed

+2
-24
lines changed

debian/control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Build-Depends: bison,
88
debhelper (>= 9),
99
dh-apparmor,
1010
dh-systemd,
11-
dpatch,
1211
gdb,
1312
libaio-dev [linux-any],
1413
libboost-dev,

debian/patches/00list

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/patches/61_replace_dash_with_bash_mbug675185.dpatch

Lines changed: 0 additions & 20 deletions
This file was deleted.

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,6 @@ get-orig-source:
182182
# white list file only starting from Debian Stretch and Ubuntu Xenial.
183183
# To find more, grep build logs for 'but is not installed to anywhere'.
184184
%:
185-
dh $@ --parallel --with dpatch --with systemd --list-missing
185+
dh $@ --parallel --with systemd --list-missing
186186

187187
# vim: ts=8

scripts/mysqld_safe.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
33
# This file is public domain and comes with NO WARRANTY of any kind
44
#

0 commit comments

Comments
 (0)