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 openpkg-web Date: 30-Dec-2002 20:15:06
Branch: HEAD Handle: 2002123019145906
Modified files:
openpkg-src/mysql mysql.patch mysql.spec
openpkg-web news.txt
Removed files:
openpkg-src/mysql mysql-initdb.patch
Log:
switch to %option(s)
Summary:
Revision Changes Path
1.2 +0 -52 openpkg-src/mysql/mysql-initdb.patch
1.2 +56 -6 openpkg-src/mysql/mysql.patch
1.41 +22 -30 openpkg-src/mysql/mysql.spec
1.2446 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
rm -f openpkg-src/mysql/mysql-initdb.patch <<'@@ .'
Index: openpkg-src/mysql/mysql-initdb.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mysql.patch
--- openpkg-src/mysql/mysql.patch 19 Aug 2002 15:06:16 -0000 1.1
+++ openpkg-src/mysql/mysql.patch 30 Dec 2002 19:15:05 -0000 1.2
@@ -1,6 +1,5 @@
-diff -Naur mysql-3.23.52.orig/sql/mini_client.cc mysql-3.23.52/sql/mini_client.cc
---- mysql-3.23.52.orig/sql/mini_client.cc Mon Aug 19 15:47:00 2002
-+++ mysql-3.23.52/sql/mini_client.cc Mon Aug 19 15:48:44 2002
+--- sql/mini_client.cc Mon Aug 19 15:47:00 2002
++++ sql/mini_client.cc Mon Aug 19 15:48:44 2002
@@ -318,7 +318,7 @@
*/
@@ -10,9 +9,8 @@
return(-1);
if (s_err)
-diff -Naur mysql-3.23.52.orig/sql/mysqld.cc mysql-3.23.52/sql/mysqld.cc
---- mysql-3.23.52.orig/sql/mysqld.cc Mon Aug 19 15:47:01 2002
-+++ mysql-3.23.52/sql/mysqld.cc Mon Aug 19 15:49:01 2002
+--- sql/mysqld.cc Mon Aug 19 15:47:01 2002
++++ sql/mysqld.cc Mon Aug 19 15:49:01 2002
@@ -2407,7 +2407,7 @@
{
size_socket length=sizeof(struct sockaddr_in);
@@ -31,3 +29,55 @@
{
sql_perror("Error on new connection socket");
(void) shutdown(new_sock,2);
+--- scripts/mysql_install_db.sh Mon Dec 2 17:40:15 2002
++++ scripts/mysql_install_db.sh Mon Dec 2 17:41:41 2002
+@@ -133,14 +133,13 @@
+ fi
+ fi
+
+-# Create database directories mysql & test
++# Create database directories mysql
+ if test "$IN_RPM" -eq 0
+ 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
+
+@@ -176,8 +175,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');
+- INSERT INTO db VALUES
('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y');"
+ fi
+
+ if test ! -f $mdata/host.frm
+@@ -232,10 +229,8 @@
+ INSERT INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+
+ REPLACE INTO user VALUES
('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
+- REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
++ REPLACE INTO user VALUES
('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');"
+
+- INSERT INTO user VALUES
('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');
+- INSERT INTO user VALUES
('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');"
+ fi
+
+ if test ! -f $mdata/func.frm
+@@ -333,10 +328,8 @@
+ if test "$IN_RPM" -eq 0
+ then
+ echo "You can start the MySQL daemon with:"
+- echo "cd @prefix@ ; $bindir/safe_mysqld &"
++ echo "@l_prefix@/etc/rc mysql start"
+ echo
+- echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench'
directory:"
+- echo "cd sql-bench ; run-all-tests"
+ echo
+ fi
+ echo "Please report any problems with the @scriptdir@/mysqlbug script!"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 mysql.spec
--- openpkg-src/mysql/mysql.spec 20 Dec 2002 19:12:14 -0000 1.40
+++ openpkg-src/mysql/mysql.spec 30 Dec 2002 19:15:05 -0000 1.41
@@ -23,19 +23,16 @@
## SUCH DAMAGE.
##
-# package options
-%ifndef with_berkeleydb
-%define with_berkeleydb yes
-%endif
-
-%ifndef with_innobase
-%define with_innobase no
-%endif
+# package version
+%define V_major 3.23
+%define V_minor 54a
-%ifndef with_gemini
-%define with_gemini no
-%endif
+# package options
+%option with_berkeleydb yes
+%option with_innobase no
+%option with_gemini no
+# package option decisions
%if %{with_berkeleydb} == "yes"
%define mysql_bdb_cache_size 8M
%define mysql_bdb_log_buffer_size 32k
@@ -45,7 +42,6 @@
%define mysql_bdb_log_buffer_size 0
%define mysql_bdb_max_lock 0
%endif
-
%if %{with_berkeleydb} == "yes" || %{with_innobase} == "yes" || %{with_gemini} ==
"yes"
%define mysqld mysqld
%else
@@ -61,22 +57,21 @@
Distribution: OpenPKG [BASE]
Group: Database
License: GPL
-Version: 3.23.54a
-Release: 20021215
+Version: %{V_major}.%{V_minor}
+Release: 20021230
# list of sources
-Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-3.23/mysql-%{version}.tar.gz
+Source0:
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MySQL-%{V_major}/mysql-%{version}.tar.gz
Source1: my.cnf
Source2: my.pwd
Source3: rc.mysql
Patch0: mysql.patch
-Patch1: mysql-initdb.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021204, gcc
-PreReq: OpenPKG, openpkg >= 20021204
+BuildPreReq: OpenPKG, openpkg >= 20021230, gcc
+PreReq: OpenPKG, openpkg >= 20021230
AutoReq: no
AutoReqProv: no
@@ -88,15 +83,11 @@
a SQL server that could handle very big databases with magnitude higher
speed than what any database vendor could offer.
- Options:
- --define 'with_berkeleydb %{with_berkeleydb}'
- --define 'with_innobase %{with_innobase}'
- --define 'with_gemini %{with_gemini}'
+ %options -p15
%prep
%setup -q
- %patch0 -p1
- %patch1 -p1
+ %patch -p0
%build
# determine additional configure options
@@ -154,11 +145,11 @@
# strip installation area
rm -rf $RPM_BUILD_ROOT%{l_prefix}/mysql-test
rm -rf $RPM_BUILD_ROOT%{l_prefix}/sql-bench
- rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
- rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/mysql-%{version}.spec
- rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
- strip $RPM_BUILD_ROOT%{l_prefix}/libexec/* 2> /dev/null || true
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/mysql-%{version}.spec
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/share/mysql/binary-configure
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/* 2>/dev/null || true
# install global configuration
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
@@ -198,14 +189,15 @@
rm -rf $RPM_BUILD_ROOT
%post
+ # create initial database
$RPM_INSTALL_PREFIX/bin/mysql_install_db
chown %{l_rusr}:%{l_rgrp} \
$RPM_INSTALL_PREFIX/etc/mysql/my.cnf \
$RPM_INSTALL_PREFIX/etc/mysql/my.pwd
chown -R %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/mysql/
- # display information about next steps
( echo "The MySQL package includes automated maintenance procedures"
echo "that require administrator access to the database. For this"
echo "to work you must keep a copy (plain text) of the administrator"
echo "account in '$RPM_INSTALL_PREFIX/etc/mysql/my.pwd'."
) | %{l_rpmtool} msg -b -t notice
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2445 -r1.2446 news.txt
--- openpkg-web/news.txt 30 Dec 2002 19:14:40 -0000 1.2445
+++ openpkg-web/news.txt 30 Dec 2002 19:14:59 -0000 1.2446
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<mysql-3.23.54a-20021230>
30-Dec-2002: New package: P<mico-2.3.7-20021230>
30-Dec-2002: Upgraded package: P<perl-xml-20021230-20021230>
30-Dec-2002: Upgraded package: P<perl-dbi-20021230-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
