Loading scripts/mysqlaccess.sh +13 −26 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ # **************************** package MySQLaccess; #use strict; use POSIX qw(tmpnam); use File::Temp qw(tempfile tmpnam); use Fcntl; BEGIN { Loading Loading @@ -32,7 +32,6 @@ BEGIN { $ACCESS_U_BCK = 'user_backup'; $ACCESS_D_BCK = 'db_backup'; $DIFF = '/usr/bin/diff'; $TMP_PATH = '/tmp'; #path to writable tmp-directory $MYSQLDUMP = '@bindir@/mysqldump'; #path to mysqldump executable Loading Loading @@ -431,7 +430,7 @@ use IPC::Open3; # no caching on STDOUT $|=1; $MYSQL_CNF = POSIX::tmpnam(); $MYSQL_CNF = tmpnam(); %MYSQL_CNF = (client => { }, mysql => { }, mysqldump => { }, Loading Loading @@ -576,8 +575,6 @@ if (!defined($Param{'host'})) { $Param{'host'}='localhost'; } push(@MySQLaccess::Grant::Error,'not_found_mysql') if !(-x $MYSQL); push(@MySQLaccess::Grant::Error,'not_found_diff') if !(-x $DIFF); push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP); push(@MySQLaccess::Grant::Error,'not_found_tmp') if !(-d $TMP_PATH); push(@MySQLaccess::Grant::Error,'write_err_tmp') if !(-w $TMP_PATH); if (@MySQLaccess::Grant::Error) { MySQLaccess::Report::Print_Error_Messages() ; exit 0; Loading Loading @@ -1776,17 +1773,15 @@ sub Diff_Privileges { @before = sort(@before); @after = sort(@after); $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$"; $after = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$"; #$after = "/tmp/t0"; open(BEFORE,"> $before") || push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing"); open(AFTER,"> $after") || push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing"); print BEFORE join("\n",@before); print AFTER join("\n",@after); close(BEFORE); close(AFTER); ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!"); ($ha, $after) = tempfile("$MySQLaccess::script.XXXXXX") or push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!"); print $hb join("\n",@before); print $ha join("\n",@after); close $hb; close $ha; # ---------------------------------- # compute difference Loading @@ -1799,8 +1794,8 @@ sub Diff_Privileges { # ---------------------------------- # cleanup temp. files unlink(BEFORE); unlink(AFTER); unlink($before); unlink($after); return \@diffs; } Loading Loading @@ -2315,14 +2310,6 @@ BEGIN { => "The diff program <$MySQLaccess::DIFF> could not be found.\n" ."+ Check your path, or\n" ."+ edit the source of this script to point \$DIFF to the diff program.\n" ,'not_found_tmp' => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n" ."+ create this directory (writeable!), or\n" ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n" ,'write_err_tmp' => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n" ."+ make this directory writeable!, or\n" ."+ edit the source of this script to point \$TMP_PATH to another directory.\n" ,'Unrecognized_option' => "Sorry,\n" ."You are using an old version of the mysql-program,\n" Loading support-files/MySQL-shared-compat.spec.sh +18 −10 Original line number Diff line number Diff line Loading @@ -26,7 +26,8 @@ # # Change this to match the version of the shared libs you want to include # %define version4 @MYSQL_NO_DASH_VERSION@ %define version41 @MYSQL_NO_DASH_VERSION@ %define version40 4.0.23 %define version3 3.23.58 Name: MySQL-shared-compat Loading @@ -36,26 +37,31 @@ License: GPL Group: Applications/Databases URL: http://www.mysql.com/ Autoreqprov: on Version: %{version4} Version: %{version41} Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: MySQL-shared, mysql-shared Provides: MySQL-shared Summary: MySQL shared libraries for MySQL %{version4} and %{version3} Source0: MySQL-shared-%{version4}-0.%{_arch}.rpm Source1: MySQL-shared-%{version3}-1.%{_arch}.rpm Summary: MySQL shared client libraries for MySQL %{version41}, %{version40} and %{version3} # We simply use the "MySQL-shared" subpackages as input sources instead of # rebuilding all from source Source0: MySQL-shared-%{version41}-0.%{_arch}.rpm Source1: MySQL-shared-%{version40}-0.%{_arch}.rpm Source2: MySQL-shared-%{version3}-1.%{_arch}.rpm # No need to include the RPMs once more - they can be downloaded seperately # if you want to rebuild this package NoSource: 0 NoSource: 1 NoSource: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package includes the shared libraries for both MySQL %{version3} and MySQL %{version4}. Install this package instead of "MySQL-shared", if you have applications installed that are dynamically linked against MySQL 3.23.xx but you want to upgrade to MySQL 4.0.xx without breaking the library dependencies. This package includes the shared libraries for both MySQL %{version3}, MySQL %{version40} as well as MySQL %{version41}. Install this package instead of "MySQL-shared", if you have applications installed that are dynamically linked against older versions of the MySQL client library but you want to upgrade to MySQL 4.1.xx without breaking the library dependencies. %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; Loading @@ -63,6 +69,8 @@ mkdir -p $RPM_BUILD_ROOT cd $RPM_BUILD_ROOT rpm2cpio %{SOURCE0} | cpio -iv --make-directories rpm2cpio %{SOURCE1} | cpio -iv --make-directories rpm2cpio %{SOURCE2} | cpio -iv --make-directories /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; Loading Loading
scripts/mysqlaccess.sh +13 −26 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ # **************************** package MySQLaccess; #use strict; use POSIX qw(tmpnam); use File::Temp qw(tempfile tmpnam); use Fcntl; BEGIN { Loading Loading @@ -32,7 +32,6 @@ BEGIN { $ACCESS_U_BCK = 'user_backup'; $ACCESS_D_BCK = 'db_backup'; $DIFF = '/usr/bin/diff'; $TMP_PATH = '/tmp'; #path to writable tmp-directory $MYSQLDUMP = '@bindir@/mysqldump'; #path to mysqldump executable Loading Loading @@ -431,7 +430,7 @@ use IPC::Open3; # no caching on STDOUT $|=1; $MYSQL_CNF = POSIX::tmpnam(); $MYSQL_CNF = tmpnam(); %MYSQL_CNF = (client => { }, mysql => { }, mysqldump => { }, Loading Loading @@ -576,8 +575,6 @@ if (!defined($Param{'host'})) { $Param{'host'}='localhost'; } push(@MySQLaccess::Grant::Error,'not_found_mysql') if !(-x $MYSQL); push(@MySQLaccess::Grant::Error,'not_found_diff') if !(-x $DIFF); push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP); push(@MySQLaccess::Grant::Error,'not_found_tmp') if !(-d $TMP_PATH); push(@MySQLaccess::Grant::Error,'write_err_tmp') if !(-w $TMP_PATH); if (@MySQLaccess::Grant::Error) { MySQLaccess::Report::Print_Error_Messages() ; exit 0; Loading Loading @@ -1776,17 +1773,15 @@ sub Diff_Privileges { @before = sort(@before); @after = sort(@after); $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$"; $after = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$"; #$after = "/tmp/t0"; open(BEFORE,"> $before") || push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing"); open(AFTER,"> $after") || push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing"); print BEFORE join("\n",@before); print AFTER join("\n",@after); close(BEFORE); close(AFTER); ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!"); ($ha, $after) = tempfile("$MySQLaccess::script.XXXXXX") or push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!"); print $hb join("\n",@before); print $ha join("\n",@after); close $hb; close $ha; # ---------------------------------- # compute difference Loading @@ -1799,8 +1794,8 @@ sub Diff_Privileges { # ---------------------------------- # cleanup temp. files unlink(BEFORE); unlink(AFTER); unlink($before); unlink($after); return \@diffs; } Loading Loading @@ -2315,14 +2310,6 @@ BEGIN { => "The diff program <$MySQLaccess::DIFF> could not be found.\n" ."+ Check your path, or\n" ."+ edit the source of this script to point \$DIFF to the diff program.\n" ,'not_found_tmp' => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n" ."+ create this directory (writeable!), or\n" ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n" ,'write_err_tmp' => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n" ."+ make this directory writeable!, or\n" ."+ edit the source of this script to point \$TMP_PATH to another directory.\n" ,'Unrecognized_option' => "Sorry,\n" ."You are using an old version of the mysql-program,\n" Loading
support-files/MySQL-shared-compat.spec.sh +18 −10 Original line number Diff line number Diff line Loading @@ -26,7 +26,8 @@ # # Change this to match the version of the shared libs you want to include # %define version4 @MYSQL_NO_DASH_VERSION@ %define version41 @MYSQL_NO_DASH_VERSION@ %define version40 4.0.23 %define version3 3.23.58 Name: MySQL-shared-compat Loading @@ -36,26 +37,31 @@ License: GPL Group: Applications/Databases URL: http://www.mysql.com/ Autoreqprov: on Version: %{version4} Version: %{version41} Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: MySQL-shared, mysql-shared Provides: MySQL-shared Summary: MySQL shared libraries for MySQL %{version4} and %{version3} Source0: MySQL-shared-%{version4}-0.%{_arch}.rpm Source1: MySQL-shared-%{version3}-1.%{_arch}.rpm Summary: MySQL shared client libraries for MySQL %{version41}, %{version40} and %{version3} # We simply use the "MySQL-shared" subpackages as input sources instead of # rebuilding all from source Source0: MySQL-shared-%{version41}-0.%{_arch}.rpm Source1: MySQL-shared-%{version40}-0.%{_arch}.rpm Source2: MySQL-shared-%{version3}-1.%{_arch}.rpm # No need to include the RPMs once more - they can be downloaded seperately # if you want to rebuild this package NoSource: 0 NoSource: 1 NoSource: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package includes the shared libraries for both MySQL %{version3} and MySQL %{version4}. Install this package instead of "MySQL-shared", if you have applications installed that are dynamically linked against MySQL 3.23.xx but you want to upgrade to MySQL 4.0.xx without breaking the library dependencies. This package includes the shared libraries for both MySQL %{version3}, MySQL %{version40} as well as MySQL %{version41}. Install this package instead of "MySQL-shared", if you have applications installed that are dynamically linked against older versions of the MySQL client library but you want to upgrade to MySQL 4.1.xx without breaking the library dependencies. %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; Loading @@ -63,6 +69,8 @@ mkdir -p $RPM_BUILD_ROOT cd $RPM_BUILD_ROOT rpm2cpio %{SOURCE0} | cpio -iv --make-directories rpm2cpio %{SOURCE1} | cpio -iv --make-directories rpm2cpio %{SOURCE2} | cpio -iv --make-directories /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; Loading