[csw-devel] SF.net SVN: gar:[20098] csw/mgar/pkg/mysql5/branches/mysql-5.5.x

[wahwah at users.sourceforge.net]

Revision: 20098
          http://gar.svn.sourceforge.net/gar/?rev=20098&view=rev
Author:   wahwah
Date:     2013-01-12 16:07:53 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: a fix for mysqld_safe

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-01-12 15:57:59 UTC (rev 20097)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-01-12 16:07:53 UTC (rev 20098)
@@ -75,6 +75,7 @@
 CHECKPKG_OVERRIDES_CSWmysql-dev += file-with-bad-content|/usr/local|root$(mandir)/man1/mysql_config.1
 PATCHFILES += 0003-I-HATE-CMAKE.patch
 PATCHFILES += 0003-WHY-IS-CMAKE-TRYING-TO-BE-SMARTER-THAN-ME.patch
+PATCHFILES += 0003-Use-bash-for-mysqld_safe.patch
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)

Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/0003-Use-bash-for-mysqld_safe.patch	2013-01-12 16:07:53 UTC (rev 20098)
@@ -0,0 +1,23 @@
+From 58df96577920a495ee5d84680bf8d806c494a46c Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sat, 12 Jan 2013 17:03:06 +0100
+Subject: [PATCH] Use bash for mysqld_safe
+
+/bin/sh on solaris has own 'test' syntax, and fails with what's in the script.
+---
+ scripts/mysqld_safe.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
+index b5262bf..019be32 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
+ #
+-- 
+1.8.0
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.