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: 08-Apr-2005 18:56:05
Branch: HEAD Handle: 2005040817560500
Modified files:
openpkg-src/mysql40 mysql40.patch mysql40.spec
Log:
upgrading package: mysql40 4.0.23a -> 4.0.24
Summary:
Revision Changes Path
1.3 +106 -98 openpkg-src/mysql40/mysql40.patch
1.10 +3 -3 openpkg-src/mysql40/mysql40.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/mysql40.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql40.patch
--- openpkg-src/mysql40/mysql40.patch 13 Jan 2005 12:31:04 -0000 1.2
+++ openpkg-src/mysql40/mysql40.patch 8 Apr 2005 16:56:05 -0000 1.3
@@ -1,70 +1,6 @@
---- scripts/mysql_install_db.sh.dist Wed Jan 29 12:29:21 2003
-+++ scripts/mysql_install_db.sh Wed Feb 5 09:56:12 2003
-@@ -138,9 +138,8 @@
- then
- if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
- if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700
$ldata/mysql ; fi
-- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test
; fi
- if test -w / -a ! -z "$user"; then
-- chown $user $ldata $ldata/mysql $ldata/test;
-+ chown $user $ldata $ldata/mysql
- fi
- fi
-
-@@ -178,8 +177,6 @@
- c_d="$c_d )"
- 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');"
- fi
-
- if test ! -f $mdata/host.frm
-@@ -250,10 +247,7 @@
- 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
('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);
-- REPLACE 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 (host,user) values ('localhost','');
-- INSERT INTO user (host,user) values ('$hostname','');"
-+ REPLACE 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);"
- fi
-
- if test ! -f $mdata/func.frm
-@@ -351,10 +345,7 @@
- if test "$IN_RPM" -eq 0
- then
- echo "You can start the MySQL daemon with:"
-- echo "cd @prefix@ ; $bindir/mysqld_safe &"
-- echo
-- echo "You can test the MySQL daemon with the benchmarks in the
'sql-bench' directory:"
-- echo "cd sql-bench ; perl run-all-tests"
-+ echo "@l_prefix@/etc/rc mysql start"
- echo
- fi
- echo "Please report any problems with the @scriptdir@/mysqlbug script!"
---- scripts/msql2mysql.sh.dist Tue Feb 11 09:50:29 2003
-+++ scripts/msql2mysql.sh Tue Feb 11 09:53:08 2003
-@@ -13,4 +13,4 @@
- # described in the License. Among other things, the License requires that
- # the copyright notice and this notice be preserved on all copies.
-
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
---- mysys/default.c.dist Wed Jan 29 12:29:20 2003
-+++ mysys/default.c Wed Feb 5 09:58:40 2003
-@@ -49,7 +49,7 @@
- #elif defined(__NETWARE__)
- "sys:/etc/",
- #else
--"/etc/",
-+"@l_prefix@/etc/mysql/",
- #endif
- #ifdef DATADIR
- DATADIR,
---- config.h.in.orig 2004-12-09 12:21:30.331530371 +0100
-+++ config.h.in 2004-12-09 12:21:33.941576868 +0100
+Index: config.h.in
+--- config.h.in.orig 2005-03-05 01:38:28 +0100
++++ config.h.in 2005-03-11 20:28:55 +0100
@@ -628,6 +628,9 @@
/* Define to 1 if you have the `setupterm' function. */
#undef HAVE_SETUPTERM
@@ -75,28 +11,9 @@
/* Define to 1 if you have the `sighold' function. */
#undef HAVE_SIGHOLD
---- include/my_pthread.h.orig 2004-10-28 02:48:34.000000000 +0200
-+++ include/my_pthread.h 2004-12-09 12:23:37.673149500 +0100
-@@ -229,7 +229,6 @@
-
- #ifdef HAVE_rts_threads
- #define sigwait org_sigwait
--#include <signal.h>
- #undef sigwait
- #endif
- #undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */
-@@ -240,6 +239,9 @@
- #ifdef HAVE_THR_SETCONCURRENCY
- #include <thread.h> /* Probably solaris */
- #endif
-+#ifdef HAVE_SIGNAL_H
-+#include <signal.h>
-+#endif
- #ifdef HAVE_SCHED_H
- #include <sched.h>
- #endif
---- configure.in.orig 2004-10-28 02:48:38.000000000 +0200
-+++ configure.in 2004-12-09 12:26:09.585078188 +0100
+Index: configure.in
+--- configure.in.orig 2005-03-05 01:38:15 +0100
++++ configure.in 2005-03-11 20:28:55 +0100
@@ -735,7 +735,7 @@
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -106,9 +23,10 @@
stdlib.h stddef.h \
strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h
arpa/inet.h \
sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
---- configure.orig 2004-10-28 02:48:59.000000000 +0200
-+++ configure 2004-12-09 12:22:45.602487633 +0100
-@@ -21408,7 +21408,7 @@
+Index: configure
+--- configure.orig 2005-03-05 01:38:47 +0100
++++ configure 2005-03-11 20:28:55 +0100
+@@ -22313,7 +22313,7 @@
for ac_header in fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
@@ -118,9 +36,9 @@
strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h
arpa/inet.h \
sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
Index: include/Makefile.in
---- include/Makefile.in.orig 2004-10-28 02:48:55 +0200
-+++ include/Makefile.in 2004-12-14 14:27:28 +0100
-@@ -281,14 +281,14 @@
+--- include/Makefile.in.orig 2005-03-05 01:38:37 +0100
++++ include/Makefile.in 2005-03-11 20:28:55 +0100
+@@ -300,14 +300,14 @@
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
errmsg.h my_global.h my_net.h my_alloc.h \
my_getopt.h sslopt-longopts.h my_dir.h \
@@ -138,10 +56,52 @@
thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in
+Index: include/my_pthread.h
+--- include/my_pthread.h.orig 2005-03-05 01:38:14 +0100
++++ include/my_pthread.h 2005-03-11 20:28:55 +0100
+@@ -229,7 +229,6 @@
+
+ #ifdef HAVE_rts_threads
+ #define sigwait org_sigwait
+-#include <signal.h>
+ #undef sigwait
+ #endif
+ #undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */
+@@ -240,6 +239,9 @@
+ #ifdef HAVE_THR_SETCONCURRENCY
+ #include <thread.h> /* Probably solaris */
+ #endif
++#ifdef HAVE_SIGNAL_H
++#include <signal.h>
++#endif
+ #ifdef HAVE_SCHED_H
+ #include <sched.h>
+ #endif
+Index: mysys/default.c
+--- mysys/default.c.orig 2005-03-05 01:38:14 +0100
++++ mysys/default.c 2005-03-11 20:28:55 +0100
+@@ -48,7 +48,7 @@
+ #elif defined(__NETWARE__)
+ "sys:/etc/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
+Index: scripts/msql2mysql.sh
+--- scripts/msql2mysql.sh.orig 2005-03-05 01:38:16 +0100
++++ scripts/msql2mysql.sh 2005-03-11 20:28:55 +0100
+@@ -13,4 +13,4 @@
+ # described in the License. Among other things, the License requires that
+ # the copyright notice and this notice be preserved on all copies.
+
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
[EMAIL PROTECTED]@/replace msqlConnect mysql_connect msqlListDBs
mysql_list_dbs msqlNumRows mysql_num_rows msqlFetchRow mysql_fetch_row
msqlFetchField mysql_fetch_field msqlFreeResult mysql_free_result
msqlListFields mysql_list_fields msqlListTables mysql_list_tables msqlErrMsg
'mysql_error(mysql)' msqlStoreResult mysql_store_result msqlQuery mysql_query
msqlField mysql_field msqlSelect mysql_select msqlSelectDB mysql_select_db
msqlNumFields mysql_num_fields msqlClose mysql_close msqlDataSeek
mysql_data_seek m_field MYSQL_FIELD m_result MYSQL_RES m_row MYSQL_ROW msql
mysql mSQL mySQL MSQL MYSQL msqlCreateDB mysql_create_db msqlDropDB
mysql_drop_db msqlFieldSeek mysql_field_seek -- $*
Index: scripts/mysql_config.sh
---- scripts/mysql_config.sh.orig 2004-10-28 02:48:36 +0200
-+++ scripts/mysql_config.sh 2004-12-14 14:29:04 +0100
-@@ -86,7 +86,7 @@
+--- scripts/mysql_config.sh.orig 2005-03-05 01:38:14 +0100
++++ scripts/mysql_config.sh 2005-03-11 20:28:55 +0100
+@@ -86,9 +86,9 @@
# Create options
@@ -151,3 +111,51 @@
-libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
+libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @LIBS@ @openssl_libs@"
libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e
's; *\$;;'`
+ cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
+ include="-I$pkgincludedir"
+Index: scripts/mysql_install_db.sh
+--- scripts/mysql_install_db.sh.orig 2005-03-05 01:38:15 +0100
++++ scripts/mysql_install_db.sh 2005-03-11 22:18:52 +0100
+@@ -168,9 +168,8 @@
+ # Create database directories mysql & test
+ if test ! -d $ldata; then mkdir $ldata; chmod 700 $ldata ; fi
+ if test ! -d $ldata/mysql; then mkdir $ldata/mysql; chmod 700
$ldata/mysql ; fi
+- if test ! -d $ldata/test; then mkdir $ldata/test; chmod 700 $ldata/test
; fi
+ if test -w / -a ! -z "$user"; then
+- chown $user $ldata $ldata/mysql $ldata/test;
++ chown $user $ldata $ldata/mysql
+ fi
+
+ # Initialize variables
+@@ -207,8 +206,6 @@
+ c_d="$c_d )"
+ 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');"
+ fi
+
+ if test ! -f $mdata/host.frm
+@@ -281,9 +278,7 @@
+ INSERT INTO user (host,user) values ('localhost','');"
+ 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);
+- REPLACE 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 (host,user) values ('localhost','');
+- REPLACE INTO user (host,user) values ('$hostname','');"
++ REPLACE 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);"
+ fi
+ fi
+
+@@ -387,10 +382,7 @@
+ if test "$in_rpm" = "0"
+ then
+ echo "You can start the MySQL daemon with:"
+- echo "cd @prefix@ ; $bindir/mysqld_safe &"
+- echo
+- echo "You can test the MySQL daemon with the benchmarks in the
'sql-bench' directory:"
+- echo "cd sql-bench ; perl run-all-tests"
++ echo "@l_prefix@/etc/rc mysql start"
+ echo
+ fi
+ echo "Please report any problems with the @scriptdir@/mysqlbug script!"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql40/mysql40.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 mysql40.spec
--- openpkg-src/mysql40/mysql40.spec 24 Mar 2005 11:19:36 -0000 1.9
+++ openpkg-src/mysql40/mysql40.spec 8 Apr 2005 16:56:05 -0000 1.10
@@ -24,7 +24,7 @@
# package version
%define V_major 4.0
-%define V_minor 23a
+%define V_minor 24
%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: 20050324
+Release: 20050408
# package options
%option with_server yes
@@ -83,7 +83,6 @@
%track
prog mysql40 = {
- comment = "rse: 4.0.24 fails to build .texi files"
version = %{V_mysql}
url = http://dev.mysql.com/downloads/mysql/%{V_major}.html
regex = mysql-(4\.0\.\d+)\.tar\.gz
@@ -112,6 +111,7 @@
CXXFLAGS="%{l_cxxflags -O}" \
CPPFLAGS="%{l_cppflags ncurses}" \
LDFLAGS="-L`pwd`/bdb/build_unix -L`pwd`/libmysql %{l_ldflags}" \
+ MAKEINFO="true" \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/mysql \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
