OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Mar-2006 13:20:58
Branch: HEAD Handle: 2006031112205700
Modified files:
openpkg-src/mysql mysql.patch mysql.spec rc.mysql
Log:
upgrade MySQL (package 'mysql') from 4.1 to 5.0. MySQL 4.1 is still
available as package 'mysql4' for backward compatibility reasons.
Summary:
Revision Changes Path
1.22 +43 -145 openpkg-src/mysql/mysql.patch
1.140 +7 -3 openpkg-src/mysql/mysql.spec
1.27 +3 -3 openpkg-src/mysql/rc.mysql
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.21 -r1.22 mysql.patch
--- openpkg-src/mysql/mysql.patch 11 Nov 2005 12:46:28 -0000 1.21
+++ openpkg-src/mysql/mysql.patch 11 Mar 2006 12:20:57 -0000 1.22
@@ -1,28 +1,28 @@
Index: include/Makefile.in
---- include/Makefile.in.orig 2005-10-10 00:47:19 +0200
-+++ include/Makefile.in 2005-11-07 18:12:04 +0100
-@@ -330,14 +330,14 @@
+--- include/Makefile.in.orig 2005-11-15 01:14:00 +0100
++++ include/Makefile.in 2005-11-21 21:19:28 +0100
+@@ -349,14 +349,14 @@
errmsg.h my_global.h my_net.h my_alloc.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-- sql_state.h mysql_time.h $(BUILT_SOURCES)
-+ sql_state.h mysql_time.h my_aes.h rijndael.h
$(BUILT_SOURCES)
+- mysql_time.h $(BUILT_SOURCES)
++ mysql_time.h my_aes.h rijndael.h $(BUILT_SOURCES)
noinst_HEADERS = config-win.h config-os2.h config-netware.h \
- nisam.h heap.h merge.h my_bitmap.h\
+ heap.h my_bitmap.h\
myisam.h myisampack.h myisammrg.h ft_global.h\
mysys_err.h my_base.h help_start.h help_end.h \
- my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
- my_aes.h my_tree.h hash.h thr_alarm.h \
-+ my_nosys.h my_alarm.h queues.h sha1.h \
-+ my_tree.h hash.h thr_alarm.h \
- thr_lock.h t_ctype.h violite.h md5.h \
- mysql_version.h.in my_handler.h my_time.h
++ my_nosys.h my_alarm.h queues.h \
++ my_tree.h hash.h thr_alarm.h \
+ thr_lock.h t_ctype.h violite.h md5.h base64.h \
+ mysql_version.h.in my_handler.h my_time.h decimal.h
Index: include/my_global.h
---- include/my_global.h.orig 2005-10-10 00:46:23 +0200
-+++ include/my_global.h 2005-11-07 18:12:04 +0100
-@@ -680,9 +680,8 @@
+--- include/my_global.h.orig 2005-11-15 01:12:30 +0100
++++ include/my_global.h 2005-11-21 21:18:29 +0100
+@@ -721,9 +721,8 @@
#define FLT_MAX ((float)3.40282346638528860e+38)
#endif
@@ -31,11 +31,23 @@
#define isinf(X) 0
-#endif
- /*
- Max size that must be added to a so that we know Size to make
+ /* Define missing math constants. */
+ #ifndef M_PI
+Index: mysys/default.c
+--- mysys/default.c.orig 2005-11-15 01:12:32 +0100
++++ mysys/default.c 2005-11-21 21:18:29 +0100
+@@ -1001,7 +1001,7 @@
+ if ((env= getenv("ETC")))
+ *ptr++= env;
+ #endif
+- *ptr++= "/etc/";
++ *ptr++= "@l_prefix@/etc/mysql/";
+ #endif
+ if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
+ *ptr++= env;
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2005-10-10 00:46:25 +0200
-+++ scripts/mysql_config.sh 2005-11-07 18:12:04 +0100
+--- scripts/mysql_config.sh.orig 2005-11-15 01:12:33 +0100
++++ scripts/mysql_config.sh 2005-11-21 21:18:29 +0100
@@ -93,11 +93,11 @@
# Create options
@@ -51,149 +63,35 @@
cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
include="-I$pkgincludedir"
Index: scripts/mysql_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2005-10-10 00:46:35
+0200
-+++ scripts/mysql_create_system_tables.sh 2005-11-07 18:12:04 +0100
-@@ -71,9 +71,6 @@
+--- scripts/mysql_create_system_tables.sh.orig 2005-11-15 01:12:45
+0100
++++ scripts/mysql_create_system_tables.sh 2005-11-21 21:18:29 +0100
+@@ -77,9 +77,6 @@
c_d="$c_d ) engine=MyISAM"
c_d="$c_d CHARACTER SET utf8 COLLATE utf8_bin"
c_d="$c_d comment='Database privileges';"
-
-- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
-- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');"
+- i_d="INSERT INTO db VALUES
('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');"
fi
if test ! -f $mdata/host.frm
-@@ -150,17 +147,13 @@
+@@ -167,17 +164,13 @@
then
- i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
- INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-- REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+ i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+- REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
- INSERT INTO user (host,user) values ('localhost','');
- INSERT INTO user (host,user) values ('$hostname','');"
-+ REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
++ REPLACE INTO user VALUES
('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);"
else
- i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
+ i_u="INSERT INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);"
if test "$windows" = "0"
then
i_u="$i_u
-- INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
+- INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
- INSERT INTO user (host,user) values ('$hostname','');
- INSERT INTO user (host,user) values ('localhost','');"
-+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
++ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);"
else
i_u="$i_u
- INSERT INTO user VALUES
('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
-Index: scripts/mysqld_safe.sh
---- scripts/mysqld_safe.sh.orig 2005-10-10 00:46:44 +0200
-+++ scripts/mysqld_safe.sh 2005-11-07 18:12:04 +0100
-@@ -121,7 +121,7 @@
- # Next try where the source installs put it
- elif test -d $MY_BASEDIR_VERSION/var/mysql
- then
-- DATADIR=$MY_BASEDIR_VERSION/var
-+ DATADIR=$MY_BASEDIR_VERSION/var/mysql
- # Or just give up and use our compiled-in default
- else
- [EMAIL PROTECTED]@
-Index: mysys/Makefile.in
---- mysys/Makefile.in.orig 2005-10-10 00:47:23 +0200
-+++ mysys/Makefile.in 2005-11-10 11:50:57 +0100
-@@ -247,6 +247,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-+ -DETCDIR="\"$(MYSQLETCdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
- -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-@@ -452,6 +453,7 @@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
- zlib_dir = @zlib_dir@
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: mysys/default.c
---- mysys/default.c.orig 2005-11-10 10:26:30 +0100
-+++ mysys/default.c 2005-11-10 11:53:32 +0100
-@@ -48,7 +48,7 @@
- #elif defined(__NETWARE__)
- "sys:/etc/",
- #else
--"/etc/",
-+ETCDIR,
- #endif
- #ifdef DATADIR
- DATADIR,
-Index: libmysql/Makefile.in
---- libmysql/Makefile.in.orig 2005-10-10 00:47:20 +0200
-+++ libmysql/Makefile.in 2005-11-10 12:13:57 +0100
-@@ -213,6 +213,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-+ -DETCDIR="\"$(MYSQLETCdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
-
-@@ -420,6 +421,7 @@
- INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
-
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: libmysql_r/Makefile.in
---- libmysql_r/Makefile.in.orig 2005-10-10 00:47:20 +0200
-+++ libmysql_r/Makefile.in 2005-11-10 12:14:34 +0100
-@@ -211,6 +211,7 @@
- DARWIN_MWCC_FALSE = @DARWIN_MWCC_FALSE@
- DARWIN_MWCC_TRUE = @DARWIN_MWCC_TRUE@
- DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-+ -DETCDIR="\"$(MYSQLETCdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
- -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
-
-@@ -419,6 +420,7 @@
- -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes) @ZLIB_INCLUDES@
-
-+MYSQLETCdir = $(sysconfdir)
- MYSQLDATAdir = $(localstatedir)
- MYSQLSHAREdir = $(pkgdatadir)
- MYSQLBASEdir = $(prefix)
-Index: bdb/mutex/mut_fcntl.c
---- bdb/mutex/mut_fcntl.c.orig 2005-10-10 00:46:27 +0200
-+++ bdb/mutex/mut_fcntl.c 2005-11-11 13:44:07 +0100
-@@ -101,7 +101,7 @@
-
- /* Acquire an exclusive kernel lock. */
- k_lock.l_type = F_WRLCK;
-- if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock))
-+ if (fcntl(dbenv->lockfhp->fd, F_SETLKW, &k_lock) == -1)
- return (__os_get_errno());
-
- /* If the resource is still available, it's ours. */
-@@ -112,7 +112,7 @@
-
- /* Release the kernel lock. */
- k_lock.l_type = F_UNLCK;
-- if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock))
-+ if (fcntl(dbenv->lockfhp->fd, F_SETLK, &k_lock) == -1)
- return (__os_get_errno());
-
- /*
-Index: bdb/os/os_open.c
---- bdb/os/os_open.c.orig 2005-10-10 00:46:27 +0200
-+++ bdb/os/os_open.c 2005-11-11 13:44:07 +0100
-@@ -93,7 +93,7 @@
- if (LF_ISSET(DB_OSO_TRUNC))
- oflags |= O_TRUNC;
-
--#ifdef HAVE_O_DIRECT
-+#if defined(HAVE_O_DIRECT) && defined(__FreeBSD__)
- if (LF_ISSET(DB_OSO_DIRECT))
- oflags |= O_DIRECT;
- #endif
+ INSERT INTO user VALUES
('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.139 -r1.140 mysql.spec
--- openpkg-src/mysql/mysql.spec 8 Feb 2006 07:29:32 -0000 1.139
+++ openpkg-src/mysql/mysql.spec 11 Mar 2006 12:20:57 -0000 1.140
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 4.1
-%define V_minor 18
+%define V_major 5.0
+%define V_minor 19
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20060208
+Release: 20060311
# package options
%option with_server yes
@@ -90,6 +90,10 @@
%patch -p0
%build
+ # patch file search path
+ %{l_shtool} subst %{l_value -s -a} \
+ mysys/default.c
+
# determine additional configure options
case "%{l_platform -t}" in
*-freebsd* ) opt="--with-client-ldflags=-static
--with-mysqld-ldflags=-static" ;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/rc.mysql
============================================================================
$ cvs diff -u -r1.26 -r1.27 rc.mysql
--- openpkg-src/mysql/rc.mysql 21 Jul 2005 19:42:24 -0000 1.26
+++ openpkg-src/mysql/rc.mysql 11 Mar 2006 12:20:57 -0000 1.27
@@ -29,7 +29,7 @@
[EMAIL PROTECTED]@/var/mysql/common.log
[EMAIL PROTECTED]@/var/mysql/update.log
-%status -u @l_susr@ -o
+%status -u @l_rusr@ -o
mysql_usable="unknown"
mysql_active="no"
@l_prefix@/bin/mysqladmin \
@@ -49,7 +49,7 @@
@l_prefix@/bin/mysqld_safe >/dev/null 2>&1 \
[EMAIL PROTECTED]@ \
--pid-file="$mysql_pid_file" \
- --err-log="$mysql_err_log" &
+ --log-error="$mysql_err_log" &
%stop -p 600 -u @l_susr@
rcService mysql enable yes || exit 0
@@ -61,7 +61,7 @@
--defaults-extra-file=${mysql_pwd_file} \
shutdown
-%restart -p 400 -u @l_susr@
+%restart -p 400 -u @l_rusr@
rcService mysql enable yes || exit 0
rcService mysql active no && exit 0
rc mysql stop start
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
