~otto/maria/5.5.37-0ubuntu0.14.04.1

« back to all changes in this revision

Viewing changes to debian/patches/61_replace_dash_with_bash_mbug675185.diff

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2013-12-22 10:28:14 UTC
  • Revision ID: package-import@ubuntu.com-20131222102814-dvryvsdyl8m3u2az
Tags: 5.5.32-1
[ Otto Kekäläinen ]
* Initial package for Debian (Closes: #565308), based on upstream
  packaging:
  - mariadb-5.3 by Sergei Golubchik
  - mariadb-5.2 by Kristian Nielsen
  - mariadb-5.1 by Peter Lieverdink
* Bring packaging up-to-date inline with mysql-5.5 packaging.
* Refine control file and tidy lintian warnings
* Rename libmysqlclient18 -> libmariadbclient18.
* Add suitable Breaks/Replaces/Provides to support migration
  to/from mysql-server-5.5.
* Plus multiple other updates based on feedback from Debian maintainers

[ James Page ]
* d/control,rules: Cherry picked fix from mysql-5.5 packaging to disable
  x86 assembler in taocrypt on i386 architectures, removing need for
  gcc-4.4 dependency.
* d/control: Add myself to uploaders.
* d/control: Update Vcs fields for new location on git.debian.org.

Show diffs side-by-side

added added

removed removed

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