Author: arekm Date: Wed Dec 15 22:11:33 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix so symlinks and update system users patch
---- Files affected:
packages/mysql:
mysql-system-users.patch (1.4 -> 1.5) , mysql.spec (1.501 -> 1.502)
---- Diffs:
================================================================
Index: packages/mysql/mysql-system-users.patch
diff -u packages/mysql/mysql-system-users.patch:1.4
packages/mysql/mysql-system-users.patch:1.5
--- packages/mysql/mysql-system-users.patch:1.4 Mon Oct 27 21:28:43 2008
+++ packages/mysql/mysql-system-users.patch Wed Dec 15 23:11:28 2010
@@ -1,11 +1,9 @@
-diff -ur mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql
mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql
---- mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql 2007-09-24
12:29:43.000000000 +0200
-+++ mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql 2007-11-24
20:22:08.360937978 +0100
-@@ -7,23 +7,16 @@
- -- containing "@current_hostname" are filtered out by mysql_install_db.
+--- mysql-5.5.8/scripts/mysql_system_tables_data.sql.org 2010-12-16
00:09:23.662631925 +0100
++++ mysql-5.5.8/scripts/mysql_system_tables_data.sql 2010-12-16
00:10:17.763454969 +0100
+@@ -8,23 +8,18 @@
set @current_hostname= @@hostname;
--
+
--- Fill "db" table with default grants for anyone to
--- access database 'test' and 'test_%' if "db" table didn't exist
-CREATE TEMPORARY TABLE tmp_db LIKE db;
@@ -19,16 +17,18 @@
-- from local machine if "users" table didn't exist before
CREATE TEMPORARY TABLE tmp_user LIKE user;
set @current_hostname= @@hostname;
--INSERT INTO tmp_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','Y','Y','','','','',0,0,0,0);
--REPLACE INTO tmp_user SELECT
@current_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','Y','Y','','','','',0,0,0,0
FROM dual WHERE LOWER( @current_hostname) != 'localhost';
--REPLACE INTO tmp_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','Y','Y','','','','',0,0,0,0);
-+INSERT INTO tmp_user VALUES
('localhost','mysql','','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','Y','Y','','','','',0,0,0,0);
-+REPLACE INTO tmp_user SELECT
@current_hostname,'mysql','','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','Y','Y','','','','',0,0,0,0
FROM dual WHERE LOWER( @current_hostname) != 'localhost';
-+REPLACE INTO tmp_user VALUES
('127.0.0.1','mysql','','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','Y','Y','','','','',0,0,0,0);
-+INSERT INTO tmp_user VALUES
('localhost','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
-+REPLACE INTO tmp_user SELECT
@current_hostname,'mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0
FROM dual WHERE LOWER( @current_hostname) != 'localhost';
-+REPLACE INTO tmp_user VALUES
('127.0.0.1','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
+-INSERT INTO tmp_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','Y','Y','Y','','','','',0,0,0,0,'','');
+-REPLACE INTO tmp_user SELECT
@current_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','Y','Y','Y','','','','',0,0,0,0,'',''
FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+-REPLACE INTO tmp_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','Y','Y','Y','','','','',0,0,0,0,'','');
+-REPLACE INTO tmp_user VALUES
('::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','Y','Y','Y','','','','',0,0,0,0,'','');
++INSERT INTO tmp_user VALUES
('localhost','mysql','','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','Y','Y','Y','','','','',0,0,0,0,'','');
++REPLACE INTO tmp_user SELECT
@current_hostname,'mysql','','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','Y','Y','Y','','','','',0,0,0,0,'',''
FROM dual WHERE LOWER( @current_hostname) != 'localhost';
++REPLACE INTO tmp_user VALUES
('127.0.0.1','mysql','','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','Y','Y','Y','','','','',0,0,0,0,'','');
++REPLACE INTO tmp_user VALUES
('::1','mysql','','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','Y','Y','Y','','','','',0,0,0,0,'','');
++INSERT INTO tmp_user VALUES
('localhost','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'','');
++REPLACE INTO tmp_user SELECT
@current_hostname,'mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'',''
FROM dual WHERE LOWER( @current_hostname) != 'localhost';
++REPLACE INTO tmp_user VALUES
('127.0.0.1','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'','');
++REPLACE INTO tmp_user VALUES
('::1','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0,'','');
INSERT INTO tmp_user (host,user) VALUES ('localhost','');
INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE
LOWER(@current_hostname ) != 'localhost';
INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
-
================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.501 packages/mysql/mysql.spec:1.502
--- packages/mysql/mysql.spec:1.501 Wed Dec 15 22:37:37 2010
+++ packages/mysql/mysql.spec Wed Dec 15 23:11:28 2010
@@ -18,7 +18,7 @@
%bcond_without raid # RAID support
%bcond_without ssl # OpenSSL support
%bcond_without tcpd # libwrap (tcp_wrappers) support
-%bcond_without sphinx # Sphinx storage engine support
+%bcond_with sphinx # Sphinx storage engine support
%bcond_with tests # FIXME: don't run correctly
%bcond_with ndb # NDB is now a separate product, this here is
broken, so disable it
#
@@ -506,8 +506,7 @@
%endif
# CHECK ME, obsolete
#%patch5 -p1
-# CHECK ME, NEEDS FIX!
-#%patch6 -p1
+%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -614,7 +613,11 @@
install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc
%endif
-sed -i -e 's,/usr//usr,%{_prefix,g' $RPM_BUILD_ROOT%{_bindir}/mysql_config
+# symlinks point to the .so file, fix it
+ln -sf libmysqlclient.so.16 $RPM_BUILD_ROOT%{_libdir}/libmysqlclient_r.so.16
+ln -sf libmysqlclient.so.16.0.0
$RPM_BUILD_ROOT%{_libdir}/libmysqlclient_r.so.16.0.0
+
+sed -i -e 's,/usr//usr,%{_prefix},g' $RPM_BUILD_ROOT%{_bindir}/mysql_config
sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
# remove known unpackaged files
@@ -1094,6 +1097,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.502 2010/12/15 22:11:28 arekm
+- fix so symlinks and update system users patch
+
Revision 1.501 2010/12/15 21:37:37 arekm
- resurrect more options, bconds, post-fix mysql_config
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-system-users.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.501&r2=1.502&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
