diff options
| author | Kristien Nielsen <knielsen@knielsen-hq.org> | 2018-04-10 19:38:14 +0300 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2018-05-28 11:32:21 +0300 |
| commit | c902d5a4ded2a492eb47379910111717dbded2d3 (patch) | |
| tree | 2a0780cdaf92d776481fb0173a9a605e945776bc | |
| parent | 64094e12c0e265e4e41ff1d780598ba945344dc6 (diff) | |
| download | mariadb-git-c902d5a4ded2a492eb47379910111717dbded2d3.tar.gz | |
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 cfd4fcb0bc3d).
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.
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rwxr-xr-x | debian/patches/61_replace_dash_with_bash_mbug675185.dpatch | 20 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
5 files changed, 2 insertions, 24 deletions
diff --git a/debian/control b/debian/control index ae9c8276828..7f079b2e719 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: bison, debhelper (>= 9), dh-apparmor, dh-systemd, - dpatch, gdb, libaio-dev [linux-any], libboost-dev, diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 4ec44da5783..00000000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -61_replace_dash_with_bash_mbug675185.dpatch diff --git a/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch b/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch deleted file mode 100755 index 2a4ee8cd648..00000000000 --- a/debian/patches/61_replace_dash_with_bash_mbug675185.dpatch +++ /dev/null @@ -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 - # - diff --git a/debian/rules b/debian/rules index b4ef2e5da6d..4c29038cd2f 100755 --- a/debian/rules +++ b/debian/rules @@ -182,6 +182,6 @@ get-orig-source: # white list file only starting from Debian Stretch and Ubuntu Xenial. # 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 diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 2abdfd7faf5..696ac552fad 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -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 # |