[csw-devel] SF.net SVN: gar:[15804] csw/mgar/pkg/mysql5/branches/mysql-5.0.x
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Sep 30 00:13:48 CEST 2011
Revision: 15804
http://gar.svn.sourceforge.net/gar/?rev=15804&view=rev
Author: wahwah
Date: 2011-09-29 22:13:48 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: upgrade to 5.0.92, there's a problem with alternatives
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
Added Paths:
-----------
csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-looking-for-ps-use-basename-0.patch
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-09-29 13:08:03 UTC (rev 15803)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-09-29 22:13:48 UTC (rev 15804)
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-# 5.0.90 doesn't build:
-# http://bugs.mysql.com/bug.php?id=50409
-# Let's wait for 5.0.91.
+# Upstream bug filed:
+# http://bugs.mysql.com/bug.php?id=62567
PROJ_NAME = mysql
NAME = $(PROJ_NAME)5
@@ -13,6 +12,8 @@
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
CATEGORIES = server
+# PACKAGING_PLATFORMS = solaris9-sparc solaris10-sparc
+
# Useful when making a series of builds on the same day
# GARFLAVOR ?= DBG
@@ -26,11 +27,11 @@
endef
# Change prefix to /opt/csw/$(NAME)
-prefix = /opt/csw/$(NAME)
+prefix = $(BUILD_PREFIX)/$(NAME)
localstatedir = /var$(prefix)
sysconfdir = /etc$(prefix)
-libdir = /opt/csw/lib
-includedir = /opt/csw/include
+libdir = $(BUILD_PREFIX)/lib
+includedir = $(BUILD_PREFIX)/include
# --bindir=/opt/csw/mysql5/bin
# --datadir=/opt/csw/mysql5/share
@@ -43,9 +44,9 @@
# --sharedstatedir=/opt/csw/mysql5/share
# Where to put the init script
-global_sysconfdir = /etc/opt/csw
+global_sysconfdir = /etc$(BUILD_PREFIX)
# Where to link the binaries
-global_bindir = /opt/csw/bin
+global_bindir = $(BUILD_PREFIX)/bin
INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
@@ -53,13 +54,13 @@
PKGFILES_CSWlibmysqlclient15 += $(call baseisadirs,$(libdir),libmysqlclient\.so\.15(\.\d+)*)
SPKG_DESC_CSWlibmysqlclient15 += MySQL $(BASE_VERSION) client library, libmysqlclient.so.15
RUNTIME_DEP_PKGS_CSWlibmysqlclient15 += CSWzlib
-OBSOLETED_BY_CSWlibmysqlclient15 += CSWmysql5rt
+OBSOLETED_BY_CSWlibmysqlclient15 += CSW$(NAME)rt
PACKAGES += CSWlibmysqlclient-r15
PKGFILES_CSWlibmysqlclient-r15 += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.15(\.\d+)*)
SPKG_DESC_CSWlibmysqlclient-r15 += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.15
RUNTIME_DEP_PKGS_CSWlibmysqlclient-r15 += CSWzlib
-OBSOLETED_BY_CSWlibmysqlclient-r15 += CSWmysql5rt
+OBSOLETED_BY_CSWlibmysqlclient-r15 += CSW$(NAME)rt
PACKAGES += CSW$(NAME)client
SPKG_DESC_CSW$(NAME)client = MySQL $(BASE_VERSION) client binaries
@@ -103,8 +104,9 @@
PATCHFILES = 0001-Use-libc-not-libcrypt.patch
PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
-PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
+# PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch
+PATCHFILES += 0004-looking-for-ps-use-basename-0.patch
SPKG_DESC_CSW$(NAME)bench = MySQL $(BASE_VERSION) benchmarking
SPKG_DESC_CSW$(NAME)devel = MySQL $(BASE_VERSION) header files
@@ -162,8 +164,8 @@
CONFIGURE_ARGS += --with-low-memory
CONFIGURE_ARGS += --with-pthread
CONFIGURE_ARGS += --with-readline
-CONFIGURE_ARGS += --with-zlib-dir=/opt/csw
-CONFIGURE_ARGS += --with-ssl=/opt/csw
+CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX)
CONFIGURE_ARGS += --with-plugins=max-no-ndb
CONFIGURE_ARGS += --with-comment="(OpenCSW)"
CONFIGURE_ARGS += --with-mysqld-user=mysql
@@ -194,30 +196,17 @@
PROTOTYPE_PERMS_dbdir = 0700
PROTOTYPE_CLASS_dbdir = ugfiles
-CHECKPKG_OVERRIDES_CSWmysql5 += surplus-dependency|CSWmysql5client
-CHECKPKG_OVERRIDES_CSWmysql5bench += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWmysql5
-CHECKPKG_OVERRIDES_CSWmysql5test += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWmysql5test += surplus-dependency|CSWmysql5
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSW$(NAME)client
+CHECKPKG_OVERRIDES_CSW$(NAME)bench += file-with-bad-content
+CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSW$(NAME)
+CHECKPKG_OVERRIDES_CSW$(NAME)test += file-with-bad-content
+CHECKPKG_OVERRIDES_CSW$(NAME)test += surplus-dependency|CSW$(NAME)
-CHECKPKG_OVERRIDES_CSWmysql5client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/info/mysql.info
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/myisam_ftdump.1
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqld_multi.1
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqld_safe.1
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqldumpslow.1
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man8/mysqlmanager.8
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/mysql/mysqld_multi.server
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/sparcv8/mysqlbug
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/sparcv9/mysqlbug
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/export/home|root/opt/csw/mysql5/share/info/mysql.info
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/share|root/opt/csw/mysql5/share/info/mysql.info
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/share|root/opt/csw/mysql5/share/man/man1/mysql_tzinfo_to_sql.1
-CHECKPKG_OVERRIDES_CSWmysql5devel += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1
+CHECKPKG_OVERRIDES_CSW$(NAME)client += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysqlaccess.1
+# This could be reviewed.
+CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
+CHECKPKG_OVERRIDES_CSW$(NAME)devel += file-with-bad-content|/usr/local|root/opt/csw/mysql5/share/man/man1/mysql_config.1
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/i386/mysqlbug
-CHECKPKG_OVERRIDES_CSWmysql5 += file-with-bad-content|/usr/local|root/opt/csw/mysql5/bin/amd64/mysqlbug
-
EXECUTABLES += comp_err
EXECUTABLES += innochecksum
EXECUTABLES += msql2mysql
Added: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-looking-for-ps-use-basename-0.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-looking-for-ps-use-basename-0.patch (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/0004-looking-for-ps-use-basename-0.patch 2011-09-29 22:13:48 UTC (rev 15804)
@@ -0,0 +1,48 @@
+From 111c7574ea02e17df8b2aff8e1b94d6118024f7b Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 28 Sep 2011 23:26:47 +0200
+Subject: [PATCH] looking for ps, use `basename $0`
+
+Upstream bug filed:
+http://bugs.mysql.com/bug.php?id=62567
+
+---
+ configure.in | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index cfae77d..8e6dd43 100644
+--- a/configure.in
++++ b/configure.in
+@@ -518,23 +518,23 @@ AC_PATH_PROG(PS, ps, ps)
+ AC_MSG_CHECKING("how to check if pid exists")
+ PS=$ac_cv_path_PS
+ # Linux style
+-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
++if $PS wwwp $$ 2> /dev/null | grep -- "`basename $0`" > /dev/null
+ then
+ FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ # Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
++elif $PS -fp $$ 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+ FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ # BSD style
+-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
++elif $PS -uaxww 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+ FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+ # SysV style
+-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
++elif $PS -ef 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+ FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+ # Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
++elif $PS $$ 2> /dev/null | grep -- `basename $0` > /dev/null
+ then
+ FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ else
+--
+1.7.6.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list