OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Jan-2005 09:57:14
Branch: HEAD Handle: 2005011508571300
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
Log:
upgrading package: mysql 4.1.8a -> 4.1.9
Summary:
Revision Changes Path
1.13 +39 -84 openpkg-src/mysql/mysql.patch
1.114 +2 -2 openpkg-src/mysql/mysql.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 mysql.patch
--- openpkg-src/mysql/mysql.patch 13 Jan 2005 12:29:48 -0000 1.12
+++ openpkg-src/mysql/mysql.patch 15 Jan 2005 08:57:13 -0000 1.13
@@ -1,56 +1,45 @@
-Index: mysys/default.c
---- mysys/default.c.orig 2004-06-27 23:56:50 +0200
-+++ mysys/default.c 2004-07-01 19:20:13 +0200
-@@ -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 2004-06-27 23:57:02 +0200
-+++ scripts/msql2mysql.sh 2004-07-01 19:20:13 +0200
-@@ -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.
+Index: include/Makefile.in
+--- include/Makefile.in.orig 2005-01-11 23:06:33 +0100
++++ include/Makefile.in 2005-01-15 09:36:06 +0100
+@@ -325,14 +325,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)
[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_install_db.sh
---- scripts/mysql_install_db.sh.orig 2004-06-27 23:56:51 +0200
-+++ scripts/mysql_install_db.sh 2004-07-01 19:20:13 +0200
-@@ -186,9 +186,8 @@
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ nisam.h heap.h merge.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
- 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
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig 2005-01-11 23:06:00 +0100
++++ scripts/mysql_config.sh 2005-01-15 09:38:51 +0100
+@@ -86,9 +86,9 @@
- if test ! -f $mdata/db.frm
-@@ -262,10 +261,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!"
+ # Create options
+
+-libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
++libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys $client_libs"
+ libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's;
*\$;;'`
+-libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @ZLIB_LIBS@
@openssl_libs@"
++libs_r="$ldflags -L$pkglibdir -lmysqlclient_r -lmysys @LIBS@ @ZLIB_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_create_system_tables.sh
---- scripts/mysql_create_system_tables.sh.orig 2004-06-27 23:57:01
+0200
-+++ scripts/mysql_create_system_tables.sh 2004-07-01 19:23:36 +0200
-@@ -70,9 +70,6 @@
- c_d="$c_d KEY User (User)"
- c_d="$c_d )"
+--- scripts/mysql_create_system_tables.sh.orig 2005-01-11 23:06:03
+0100
++++ scripts/mysql_create_system_tables.sh 2005-01-15 09:36:06 +0100
+@@ -71,9 +71,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');
@@ -58,7 +47,7 @@
fi
if test ! -f $mdata/host.frm
-@@ -147,17 +144,13 @@
+@@ -150,17 +147,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);
@@ -78,37 +67,3 @@
else
i_u="$i_u
INSERT INTO user VALUES
('%','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);
-Index: include/Makefile.in
---- include/Makefile.in.orig 2004-12-14 13:41:12 +0100
-+++ include/Makefile.in 2004-12-17 09:48:10 +0100
-@@ -324,14 +324,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)
-
- noinst_HEADERS = config-win.h config-os2.h config-netware.h \
- nisam.h heap.h merge.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
-
-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 @@
-
- # Create options
-
--libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
-+libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys $client_libs"
- libs=`echo "$libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's;
*\$;;'`
--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; *\$;;'`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.113 -r1.114 mysql.spec
--- openpkg-src/mysql/mysql.spec 13 Jan 2005 12:29:48 -0000 1.113
+++ openpkg-src/mysql/mysql.spec 15 Jan 2005 08:57:13 -0000 1.114
@@ -25,7 +25,7 @@
# package version
%define V_major 4.1
-%define V_minor 8a
+%define V_minor 9
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20050113
+Release: 20050115
# package options
%option with_server yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
