openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

switch to %option(s)

master
Dr. Ralf S. Engelschall 23 years ago
parent
6591d41cb4
commit
1af74efba3
3 changed files with 78 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      mysql/mysql-initdb.patch
  2. 62
      mysql/mysql.patch
  3. 52
      mysql/mysql.spec

52
mysql/mysql-initdb.patch
Unescape View File

@ -1,52 +0,0 @@
--- mysql/scripts/mysql_install_db.sh Mon Dec 2 17:40:15 2002
+++ mysql.new/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!"

62
mysql/mysql.patch
Unescape View File

@ -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 @@ diff -Naur mysql-3.23.52.orig/sql/mini_client.cc mysql-3.23.52/sql/mini_client.c
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 @@ diff -Naur mysql-3.23.52.orig/sql/mysqld.cc mysql-3.23.52/sql/mysqld.cc
{
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!"

52
mysql/mysql.spec
Unescape View File

@ -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 @@ Packager: The OpenPKG Project
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 @@ AutoReqProv: no
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 @@ AutoReqProv: no
# 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 @@ AutoReqProv: no
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

Write Preview
Loading…
Cancel
Save