Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at Wed Aug 17 09:42:36 CEST 2011.
-------- --- mariadb/mariadb.changes 2010-05-26 11:54:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/mariadb/mariadb.changes 2011-08-16 15:52:19.000000000 +0200 @@ -1,0 +2,128 @@ +Tue Aug 16 15:50:27 CEST 2011 - [email protected] + +- not building embedded server as we don't ship it anyway and it + adds some unresolvable dependencies + +------------------------------------------------------------------- +Wed Jul 27 13:51:14 CEST 2011 - [email protected] + +- requiring %{version} and not %{srv_vers} + - dependencies are resolvable now + +------------------------------------------------------------------- +Sat Jul 16 23:14:42 UTC 2011 - [email protected] + +- Fix strict-aliasing warnings +- allow using the "pool of threads" feature that requires libevent + +------------------------------------------------------------------- +Wed Jun 22 19:19:50 CEST 2011 - [email protected] + +- updated to MariaDB 5.2.7 + * Release notes: + http://kb.askmonty.org/v/mariadb-527-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-527-changelog + +------------------------------------------------------------------- +Sun May 15 18:53:40 CEST 2011 - [email protected] + +- updated to MariaDB 5.2.6 + * Release notes: + http://kb.askmonty.org/v/mariadb-526-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-526-changelog + +------------------------------------------------------------------- +Mon Mar 14 16:47:16 CET 2011 - [email protected] + +- updated to MariaDB 5.2.5 + * Release notes: + http://kb.askmonty.org/v/mariadb-525-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-525-changelog + +------------------------------------------------------------------- +Wed Feb 23 16:20:02 CET 2011 - [email protected] + +- fixed init script to + - work with SELinux (bnc#635645) + - allow running as different user/group + - create TMPDIR correctly + +------------------------------------------------------------------- +Wed Feb 23 10:59:13 UTC 2011 - [email protected] + +- remove runlevel 2 from default start in init script or it isn't + usable on openSUSE 11.4 and later + +------------------------------------------------------------------- +Tue Dec 7 11:27:24 CET 2010 - [email protected] + +- updated to MariaDB 5.2.4 + * Release notes: + http://kb.askmonty.org/v/mariadb-524-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-524-changelog + +------------------------------------------------------------------- +Wed Nov 10 11:58:13 CET 2010 - [email protected] + +- updated to MariaDB 5.2.3 + * Release notes: + http://kb.askmonty.org/v/mariadb-523-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-523-changelog + +------------------------------------------------------------------- +Thu Oct 21 11:07:15 CEST 2010 - [email protected] + +- fixed building on Mandriva + +------------------------------------------------------------------- +Mon Oct 18 22:53:09 CEST 2010 - [email protected] + +- rewritten spec file + - build and install parts are in separate file now + - patches in the archive + - contains more documentation + - contains tags + - adding/removing patches just at in one configuration file + +------------------------------------------------------------------- +Wed Sep 29 12:15:59 CEST 2010 - [email protected] + +- updated to MariaDB 5.1.50 + - based on MySQL 5.1.50 maintenance update + - changelog: + http://kb.askmonty.org/v/mariadb-5150-changelog + - release notes: + http://kb.askmonty.org/v/mariadb-5150-release-notes +- fixed init script to work on SELinux machines (bnc#635645) + +------------------------------------------------------------------- +Thu Aug 12 11:54:38 CEST 2010 - [email protected] + +- updated to MariaDB 5.1.49 + - based on MySQL 5.1.49 maintenance update + - changelog: + http://kb.askmonty.org/v/mariadb-5149-changelog + - release notes: + http://kb.askmonty.org/v/mariadb-5149-release-notes + +------------------------------------------------------------------- +Wed Jun 2 10:38:05 CEST 2010 - [email protected] + +- updated to MariaDB 5.1.47 + - based on MySQL 5.1.47 maintenance update + - changelog: + http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Changelog + - release notes: + http://askmonty.org/wiki/Manual:MariaDB_5.1.47_Release_Notes + +------------------------------------------------------------------- +Wed May 26 14:02:25 CEST 2010 - [email protected] + +- Fixed build for Fedora12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- abi_test.patch libmysql-no-pkglibdir.patch mariadb-5.1.44b.tar.bz2 mysql-5.1.31-shebang.patch mysql-5.1.33-safe-process-in-bin.patch mysql-5.1.33-scripts-paths.patch mysql-5.1.33-ssl-lib64-macro.patch mysql-5.1.35-test-utf8.patch mysql-5.1.35-test-variables-big.patch mysql-5.1.36-bmove512.patch mysql-5.1.36-hotcopy.patch mysql-5.1.42-myslq-test.patch mysql-cnf.patch mysql-enable-plugins.patch mysql-group.patch mysql-install_db-quiet.patch mysql-logrotate.patch mysql-multi-configuration.patch mysql-plugins-avoid-version.patch mysql_config.patch mysql_upgrade-exit-status.patch mysqld_multi.patch New: ---- build.inc changes.factory default_plugins.cnf install.inc mariadb-5.2.7.tar.bz2 mariadb-strict-aliasing.patch mysql-patches.tar.bz2 series ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.mfSz9f/_old 2011-08-17 09:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.mfSz9f/_new 2011-08-17 09:38:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mariadb (Version 5.1.44) +# spec file for package mariadb # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ # Few definitions which will alter build %define prefered 0 %define cluster 0 -%define srv_vers 5.1.44 +%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -31,63 +31,24 @@ Name: mariadb Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.1.44 -Release: 2 +Version: 5.2.7 +Release: 1 +%define srv_vers 5.1.57 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers Url: http://www.mysql.com -# http://dev.mysql.com/get/Downloads/MySQL-5.1/%{name}-%{version}.tar.gz/from/pick -Source: mariadb-%{version}b.tar.bz2 +# http://askmonty.org/downloads/r/http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.47/kvm-tarbake-jaunty-x86/%{name}-%{version}.tar.gz +Source: mariadb-%{version}.tar.bz2 Source2: baselibs.conf Source3: README.debug Source4: suse-test-run Source5: mysql.SuSEfirewall2 Source7: rc.mysql-multi Source8: README.SuSE -# Polishing default config file -Patch2: mysql-cnf.patch -Patch3: mysql-multi-configuration.patch -# Adds option to set group to something else similarly to the user settings -Patch4: mysql-group.patch -# Warning about initscript in mysql_install_db disabled, since the SUSE RPM comes with an init script installed -Patch5: mysql-install_db-quiet.patch -# Checks flush-logs exit status in support-files/mysql-log-rotate.sh -Patch7: mysql-logrotate.patch -# Adds reload funcionality to mysqld_multi.sh perl script and adds --datadir support -Patch8: mysqld_multi.patch -# Disables failure on one test during update and improves error message during update a little bit -Patch13: mysql_upgrade-exit-status.patch -# Changes pkglib_LIBRARIES into lib_LIBRARIES in libmysql -Patch18: libmysql-no-pkglibdir.patch -# Adds option -avoid-version to LDFLAGS for plugins blackhole, archive and example -Patch19: mysql-plugins-avoid-version.patch -# This patch loads plugins by default if there is no settings regarding plugins. -Patch23: mysql-enable-plugins.patch -# PATCH-FIX-UPSTREAM mysql-5.1.31-shebang.patch [] [email protected] -- adds mising shebangs -Patch25: mysql-5.1.31-shebang.patch -# PATCH-FIX-UPSTREAM mysql-5.1.35-test-variables-big.patch [upstream bug #38811] -- different way to test whether server crashed -# http://bugs.mysql.com/bug.php?id=38811 -Patch27: mysql-5.1.35-test-variables-big.patch -# PATCH-FIX-SUSE mysql-5.1.32-myslq-test.patch [email protected] -- installs tests into datadir not into prefix -Patch28: mysql-5.1.42-myslq-test.patch -# PATCH-FIX-UPSTREAM mysql-5.1.33-scripts-paths.patch [ upstream#45616 ] [email protected] -- fixes build of scripts when compilation occurs somewhere else -# http://bugs.mysql.com/bug.php?id=45616 -Patch29: mysql-5.1.33-scripts-paths.patch -# PATCH-FIX-SUSE mysql-5.1.33-safe-process-in-bin.patch [] [email protected] -- this will let us move one binary to /usr/bin instead of /usr/share/mysql-test/... -Patch30: mysql-5.1.33-safe-process-in-bin.patch -# PATCH-FIX-SUSE mysql-5.1.33-ssl-lib64-macro.patch [] [email protected] -- search for ssl libraries also in lib64 -Patch31: mysql-5.1.33-ssl-lib64-macro.patch -# PATCH-FIX-SUSE mysql-5.1.35-test-utf8.patch [] [email protected] -- we use utf-8 by default which produces different output with few tests -Patch35: mysql-5.1.35-test-utf8.patch -# PATCH-FIX-UPSTREAM mysql-5.1.36-bmove512.patch [ upstream#19975 ] [email protected] -- using standard memcpy instead of bmove512 as it should be beeter -# http://bugs.mysql.com/bug.php?id=19975 -Patch37: mysql-5.1.36-bmove512.patch -# PATCH-FIX-UPSTREAM mysql-5.1.36-hotcopy.patch [ upstream#43594, bnc#525325 ] [email protected] -- hotcopy ignores log tables -# http://bugs.mysql.com/bug.php?id=43594 -Patch38: mysql-5.1.36-hotcopy.patch -# PATCH-FIX-UPSTREAM mysql_config.patch [ upstream#39175, bnc#420313 ] [email protected] -- Fix linking options. -Patch39: mysql_config.patch -Patch45: abi_test.patch +Source9: mysql-patches.tar.bz2 +Source10: build.inc +Source11: install.inc +Source12: series BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils @@ -100,11 +61,14 @@ %endif BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel %if 0%{?suse_version} -BuildRequires: pwdutils tcpd-devel +BuildRequires: libevent-devel pwdutils tcpd-devel %endif %if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 BuildRequires: fdupes %endif +%if 0%{?fedora_version} > 11 +BuildRequires: sqlite +%endif %if 0%{?suse_version} > 1030 Recommends: logrotate %else @@ -115,6 +79,7 @@ Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} Conflicts: otherproviders(mysql) +Patch1: mariadb-strict-aliasing.patch %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL @@ -124,6 +89,7 @@ This package only contains the server-side programs. %if ! 0%{?prefered} > 0 + #------------------------------------------------------------------------------- %package -n libmariadbclient16 @@ -159,13 +125,14 @@ %endif %if 0%{?prefered} > 0 + #------------------------------------------------------------------------------- %package -n libmysqlclient-devel #------------------------------------------------------------------------------- # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release -Requires: libmysqlclient16 = %srv_vers libmysqlclient_r16 = %srv_vers glibc-devel zlib-devel openssl-devel +Requires: libmysqlclient16 = %{version} libmysqlclient_r16 = %{version} glibc-devel zlib-devel openssl-devel Summary: MariaDB Development Header Files and Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/C and C++ @@ -185,7 +152,7 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB embedded server development files # the headers files are the shared -Requires: libmysqlclient-devel = %srv_vers +Requires: libmysqlclient-devel = %{version} Group: Development/Libraries/C and C++ %description -n libmysqld0 @@ -199,8 +166,8 @@ License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB embedded server development files # the headers files are the shared -Requires: libmysqlclient-devel = %srv_vers -Requires: libmysqld0 = %srv_vers +Requires: libmysqlclient-devel = %{version} +Requires: libmysqld0 = %{version} Group: Development/Libraries/C and C++ %description -n libmysqld-devel @@ -241,6 +208,7 @@ David Axmark <[email protected]> %endif + #------------------------------------------------------------------------------- %package client @@ -282,16 +250,31 @@ David Axmark <[email protected]> #------------------------------------------------------------------------------- +%if %{defined mdkversion} + +%package debuging + +%else + %package debug +%endif #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB server with debug options turned on Group: Productivity/Databases/Servers -Requires: %{name} = %{srv_vers} +Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} Conflicts: otherproviders(mysql-debug) +%if %{defined mdkversion} + +%description debuging + +%else + %description debug + +%endif A version of the mysql server that has some debug code turned on. It should be only used to track down problems with the standard servers. Note that merely installing this package won't replace the @@ -303,18 +286,18 @@ Michael Widenius <[email protected]> David Axmark <[email protected]> - #------------------------------------------------------------------------------- + %package test #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB testsuite Group: Productivity/Databases/Servers -Requires: %{name} = %{srv_vers} -Requires: %{name}-client = %{srv_vers} +Requires: %{name} = %{version} +Requires: %{name}-client = %{version} Requires: perl-DBD-mysql -Requires: %{name}-tools = %{srv_vers} -Requires: %{name}-bench = %{srv_vers} +Requires: %{name}-tools = %{version} +Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} Conflicts: otherproviders(mysql-test) @@ -351,6 +334,7 @@ David Axmark <[email protected]> %if 0%{?cluster} > 0 + #------------------------------------------------------------------------------- %package ndb-storage @@ -409,34 +393,17 @@ advanced user. They should be used with caution. %endif + #------------------------------------------------------------------------------- %prep #------------------------------------------------------------------------------- -%setup -q -n mariadb-%{version}b +%setup -q -n mariadb-%version -D -a 9 cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . -%patch2 -%patch3 -%patch4 -%patch5 -%patch7 -%patch8 -%patch13 -%patch18 -%patch19 -%patch23 -%patch25 -p1 -%patch27 -%patch28 -%patch29 -%patch30 -%patch31 -%patch35 -%patch37 -%patch38 -%patch39 -%patch45 -p1 +# apply patches from series +mysql-patches/tools/quilt-setup.sh "%{S:12}" +mysql-patches/tools/apply-series.sh "%{S:12}" # remove unneeded manpages ('make install' basically installs everything under # man/*) rm -f man/mysqlman.1 # dummy fallback manpage @@ -453,216 +420,19 @@ sed -i 's|mysqlclient|mariadbclient|g' $i done %endif +%patch1 #------------------------------------------------------------------------------- %build #------------------------------------------------------------------------------- -%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 -%define socketpath /var/lib/mysql -%else -%define socketpath /var/run/mysql -%endif -autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing" -export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" -# Make the compile a function, since we do multiple builds -BuildMySQL() { - # The --enable-assembler simply does nothing on systems that do not - # support assembler speedups. - suffix="$1"; shift - mkdir _build$suffix - pushd _build$suffix - ../configure \ - --enable-assembler \ - --without-readline \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ - --libexecdir=/usr/sbin \ - --localstatedir=/var/lib/mysql \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --sysconfdir=/etc \ - --with-mysqld-user=mysql \ - --with-mysqld-group=mysql \ - --without-debug \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --with-charset=utf8 \ - --with-collation=utf8_unicode_ci \ - --with-extra-charsets=all \ - --with-unix-socket-path=%{socketpath}/mysql.sock \ - --enable-thread-safe-client \ - --with-comment="SUSE MariaDB RPM" \ - --with-libwrap \ - --with-server-suffix=$suffix \ -%ifarch s390 s390x - --with-atomic-ops=rwlocks \ -%else - --with-atomic-ops=smp \ -%endif - --with-ssl=/usr \ - --with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \ - HOSTNAME="/bin/hostname -f" \ - "$@" - # Add this for MyISAM RAID support: - # --with-raid - # benchdir does not fit in above model. Fix when we make a separate package - make %{?jobs:-j%jobs} - nm --numeric-sort sql/mysqld > sql/mysqld.sym - # needed for make check, which is not VPATH aware - # copy the files unconditionally so that manual 'make check' after - # the build works, too - cp -a ../mysql-test/* mysql-test/ - cp -a ../sql/share/{english,charsets} sql/share/ - cp -a ../scripts/*.sql scripts/ -%if %{?_with_testsuite:1}0 - pushd mysql-test; perl ./mysql-test-run.pl --force; popd -%endif - popd -} -# Build the client, extra tools, libraries -BuildMySQL "" --with-embedded-server -# build mysqld-debug -BuildMySQL "-debug" --with-debug --without-embedded-server - -%if 0%{?prefered} > 0 -mkdir -p _buildlibmysqld/tmp -cd _buildlibmysqld/tmp -ar -x ../../_build/libmysqld/libmysqld.a -gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ -*.o \ --lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc -cd .. -rm -rf tmp -cd .. -%endif +%{expand:%(cat %_sourcedir/build.inc)} #------------------------------------------------------------------------------- %install #------------------------------------------------------------------------------- -# install the debug server first, so that we don't overwrite the standard -# /usr/sbin/mysqld -mkdir -p %buildroot%_libdir/mysql -make -C _build-debug/sql install DESTDIR=%buildroot -mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug -install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym -# install the client, extra tools, libraries and the standard server -make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ -install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym -# remove most static libs (FIXME: don't build them at all...) -rm -f %buildroot%_libdir/libmysqlclient*a -rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la -rm -f %buildroot%_libdir/mysql/plugin/*a -# XXX: package these? The ndb tools are linked statically atm -rm -f %buildroot%_libdir/mysql/libndbclient.* -rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr -ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr -ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run -mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} -# generate filelist for binaries and their manpages (easier than enumerating -# all the binaries and manapages manually, esp. when there are new manpages in -# each release) -filelist() -{ - echo '%%defattr(-, root, root)' - pushd %buildroot >/dev/null - for i; do - if test -e usr/sbin/"$i"; then - echo /usr/sbin/"$i" - fi - if test -e usr/bin/"$i"; then - echo /usr/bin/"$i" - fi - if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then - echo "%%doc %_mandir/*/$i.[1-9]*" - fi - done - popd >/dev/null -} -filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip >mysql.files -filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files -filelist mysql_config >libmysqlclient-devel.files -filelist mysqlslap >mysql-bench.files -filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files -# all binaries that don't need to be in a "default" install (mysql.rpm + -# mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files -filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files -filelist ndb_mgmd >mysql-ndb-management.files -filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files -### files not installed by make install -# Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) -DOCDIR=%buildroot%_defaultdocdir/%name -install -d -m 755 ${DOCDIR} -install -d -m 755 %buildroot/etc/logrotate.d -install -d -m 755 %buildroot/etc/init.d -install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?prefered} > 0 -install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so -%endif -install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf -install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf -install -m 644 "${DOCS[@]}" ${DOCDIR} -install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql -ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql -# this is used by the init script -install -m 755 -d %buildroot/var/run/mysql -# SuSEfirewall service description -install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ - %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql -# testsuite -mkdir -p '%buildroot'/usr/share/mysql-test/ -install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/ -# XXX this should go under /var/..., but some tests get confused by a symlink -# var -> ../../../var/... -#ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var -mkdir '%buildroot'/usr/share/mysql-test/var -# Final fixes -find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete -%if 0%{?suse_version} > 1030 -%fdupes -s '%buildroot'/usr/share/mysql-test -%endif -%if 0%{?fedora_version} > 8 -fdupes -q -n -r '%buildroot'/usr/share/mysql-test -%endif -dos2unixConversion() { - %{__sed} -i 's/\r//g' "$1" -} -for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do - dos2unixConversion "$i" -done -%if ! 0%{cluster} > 0 -cat mysql-ndb-storage.files mysql-ndb-management.files \ - mysql-ndb-tools.files mysql-ndb-extra.files | \ - sed 's|^%%doc\ ||' | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -%endif -%if ! 0%{prefered} > 0 -cat libmysqlclient-devel.files | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -rm -rf '%buildroot'/%_libdir/libmysqld.* -rm -rf '%buildroot'/%_libdir/libmysqlclient* -rm -rf '%buildroot'/%_libdir/libmariadbclient.{a,la,so} -rm -rf '%buildroot'/%_libdir/libmariadbclient_r*.{a,la,so} -rm -rf '%buildroot'/%_includedir -rm -rf '%buildroot'/%_datadir/man/*/mysql_config* -rm -rf '%buildroot'/%_datadir/aclocal -%endif -sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql -ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair -ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze -ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +%{expand:%(cat %_sourcedir/install.inc)} #------------------------------------------------------------------------------- @@ -699,7 +469,7 @@ %posttrans #------------------------------------------------------------------------------- -%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade chown -R mysql:mysql /var/lib/mysql @@ -714,6 +484,7 @@ fi %if ! 0%{prefered} > 0 + #------------------------------------------------------------------------------- %post -n libmariadbclient16 @@ -741,8 +512,10 @@ #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- + %endif %if 0%{prefered} > 0 + #------------------------------------------------------------------------------- %post -n libmysqlclient16 @@ -791,7 +564,7 @@ %postun #------------------------------------------------------------------------------- if [ $1 = 0 ]; then - %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.gz + %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* %{insserv_cleanup} fi #------------------------------------------------------------------------------- @@ -809,13 +582,14 @@ #------------------------------------------------------------------------------- %defattr(-, root, root) %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf +%dir %attr(0750, root, mysql) /etc/mysql +%config(noreplace) %attr(0640, root, mysql) /etc/mysql/* %config /etc/logrotate.d/mysql %doc %{_defaultdocdir}/%{name} -%doc %{_infodir}/mysql.info.gz +%doc %{_infodir}/mysql.info.* /etc/init.d/mysql /usr/sbin/rcmysql /usr/share/mysql/ -%dir %attr(755,mysql,mysql)/var/run/mysql %dir %{_libdir}/mysql %{_libdir}/mysql/mysqld.sym %config /etc/sysconfig/SuSEfirewall2.d/services/mysql @@ -904,8 +678,13 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- +%if %{defined mdkversion} + +%files debuging +%else %files debug +%endif #------------------------------------------------------------------------------- %defattr(-, root, root) /usr/sbin/mysqld-debug ++++++ build.inc ++++++ %if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 %define socketpath /var/lib/mysql %else %define socketpath /var/run/mysql %endif autoreconf -f -i export WARN_DIS=" -Wno-unused-parameter " %if 0%{?suse_version} > 1140 export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable " %endif export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" # Make the compile a function, since we do multiple builds BuildMySQL() { # The --enable-assembler simply does nothing on systems that do not # support assembler speedups. suffix="$1"; shift mkdir _build$suffix pushd _build$suffix ../configure \ --with-libevent \ --enable-assembler \ --without-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ --localstatedir=/var/lib/mysql \ --mandir=%{_mandir} \ --prefix=%{_prefix} \ --sysconfdir=/etc \ --with-mysqld-user=mysql \ --with-mysqld-group=mysql \ --without-debug \ --datadir=/usr/share \ --includedir=/usr/include \ --with-charset=utf8 \ --with-collation=utf8_unicode_ci \ --with-extra-charsets=all \ --with-unix-socket-path=%{socketpath}/mysql.sock \ --enable-thread-safe-client \ --with-comment="SUSE MySQL RPM" \ --with-libwrap \ --with-server-suffix=$suffix \ %ifarch s390 s390x --with-atomic-ops=rwlocks \ %else --with-atomic-ops=smp \ %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: # --with-raid # benchdir does not fit in above model. Fix when we make a separate package make %{?jobs:-j%jobs} nm --numeric-sort sql/mysqld > sql/mysqld.sym # needed for make check, which is not VPATH aware # copy the files unconditionally so that manual 'make check' after # the build works, too cp -a ../mysql-test/* mysql-test/ for i in ../sql/share/{english,charsets}; do [ -d $i ] && cp -a $i sql/share/ done cp -a ../scripts/*.sql scripts/ %if %{?_with_testsuite:1}0 pushd mysql-test; perl ./mysql-test-run.pl --force; popd %endif popd } # Build the client, extra tools, libraries BuildMySQL "" --without-embedded-server # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server %if 0%{?prefered} > 0 mkdir -p _buildlibmysqld/tmp cd _buildlibmysqld/tmp ar -x ../../_build/libmysqld/libmysqld.a gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ *.o \ -lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc cd .. rm -rf tmp cd .. %endif ++++++ changes.factory ++++++ ++++ 1620 lines (skipped) ++++++ default_plugins.cnf ++++++ [server] plugin-load=blackhole=ha_blackhole.so plugin-load=federated=ha_federated.so plugin-load=archive=ha_archive.so ++++++ install.inc ++++++ # install the debug server first, so that we don't overwrite the standard # /usr/sbin/mysqld mkdir -p %buildroot%_libdir/mysql make -C _build-debug/sql install DESTDIR=%buildroot mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la rm -f %buildroot%_libdir/mysql/plugin/*a # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run rm -f %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} # generate filelist for binaries and their manpages (easier than enumerating # all the binaries and manapages manually, esp. when there are new manpages in # each release) filelist() { echo '%%defattr(-, root, root)' pushd %buildroot >/dev/null for i; do if test -e usr/sbin/"$i"; then echo /usr/sbin/"$i" fi if test -e usr/bin/"$i"; then echo /usr/bin/"$i" fi if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then echo "%%doc %_mandir/*/$i.[1-9]*" fi done popd >/dev/null } filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat >mysql.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow >mysql-client.files filelist mysql_config >libmysqlclient-devel.files filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d install -d -m 755 %buildroot/etc/init.d install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql %if 0%{?prefered} > 0 install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so %endif install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf install -m 644 "${DOCS[@]}" ${DOCDIR} install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql # SuSEfirewall service description install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql # testsuite mkdir -p '%buildroot'/usr/share/mysql-test/ install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/ # XXX this should go under /var/..., but some tests get confused by a symlink # var -> ../../../var/... #ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var mkdir '%buildroot'/usr/share/mysql-test/var # Final fixes find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete %if 0%{?suse_version} > 1030 %fdupes -s '%buildroot'/usr/share/mysql-test %endif %if 0%{?fedora_version} > 8 fdupes -q -n -r '%buildroot'/usr/share/mysql-test %endif dos2unixConversion() { %{__sed} -i 's/\r//g' "$1" } for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do dos2unixConversion "$i" done %if ! 0%{cluster} > 0 cat mysql-ndb-storage.files mysql-ndb-management.files \ mysql-ndb-tools.files mysql-ndb-extra.files | \ sed 's|^%%doc\ ||' | while read tmp; do cd '%buildroot' rm -f .$tmp done %endif %if ! 0%{prefered} > 0 cat libmysqlclient-devel.files | while read tmp; do cd '%buildroot' rm -f .$tmp done rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize mkdir -p '%buildroot'/etc/mysql [ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql ++++++ mariadb-5.1.44b.tar.bz2 -> mariadb-5.2.7.tar.bz2 ++++++ mariadb/mariadb-5.1.44b.tar.bz2 /mounts/work_src_done/STABLE/mariadb/mariadb-5.2.7.tar.bz2 differ: char 11, line 1 ++++++ mariadb-strict-aliasing.patch ++++++ --- storage/pbxt/src/Makefile.am.orig +++ storage/pbxt/src/Makefile.am @@ -40,17 +40,19 @@ libpbxt_la_SOURCES = $(non_mysql_interna # These are the warning Drizzle uses: # DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter -libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN -libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99 +libpbxt_la_CXXFLAGS = -shared $(AM_CXXFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN +libpbxt_la_CFLAGS = -shared $(AM_CFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN -std=c99 libpbxt_la_LDFLAGS = -module noinst_LTLIBRARIES = libpbxt_s.la libpbxt_s_embedded.la libpbxt_s_common.la libpbxt_s_common_la_SOURCES = $(non_mysql_internal_sources) +libpbxt_s_common_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing libpbxt_s_la_SOURCES = $(mysql_internal_sources) +libpbxt_s_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing libpbxt_s_la_LIBADD = libpbxt_s_common.la libpbxt_s_embedded_la_SOURCES = $(mysql_internal_sources) -libpbxt_s_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@ +libpbxt_s_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing @plugin_embedded_defs@ libpbxt_s_embedded_la_LIBADD = libpbxt_s_common.la EXTRA_DIST = pbms_enabled.cc win_inttypes.h --- storage/innodb_plugin/buf/buf0flu.c.orig +++ storage/innodb_plugin/buf/buf0flu.c @@ -112,7 +112,9 @@ buf_flush_insert_in_flush_rbt( p_node = rbt_prev(buf_pool->flush_rbt, c_node); if (p_node != NULL) { - prev = *rbt_value(buf_page_t*, p_node); + buf_page_t** value; + value = rbt_value(buf_page_t*, p_node); + prev = *value; ut_a(prev != NULL); } --- storage/sphinx/Makefile.am.orig +++ storage/sphinx/Makefile.am @@ -35,17 +35,17 @@ pkgplugin_LTLIBRARIES = @plugin_sphinx_s ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \ -L$(top_builddir)/libservices -lmysqlservices -ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -fno-strict-aliasing -DMYSQL_DYNAMIC_PLUGIN ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_sphinx_la_SOURCES = ha_sphinx.cc sphinx_la_LDFLAGS = -module -avoid-version -sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) +sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing sphinx_la_CFLAGS = $(AM_CFLAGS) sphinx_la_SOURCES = snippets_udf.cc noinst_LTLIBRARIES = @plugin_sphinx_static_target@ -libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS) +libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing libsphinx_la_CFLAGS = $(AM_CFLAGS) libsphinx_la_SOURCES= ha_sphinx.cc --- storage/xtradb/buf/buf0flu.c.orig +++ storage/xtradb/buf/buf0flu.c @@ -113,7 +113,9 @@ buf_flush_insert_in_flush_rbt( p_node = rbt_prev(buf_pool->flush_rbt, c_node); if (p_node != NULL) { - prev = *rbt_value(buf_page_t*, p_node); + buf_page_t** value; + value = rbt_value(buf_page_t*, p_node); + prev = *value; ut_a(prev != NULL); } ++++++ rc.mysql-multi ++++++ --- /var/tmp/diff_new_pack.mfSz9f/_old 2011-08-17 09:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.mfSz9f/_new 2011-08-17 09:38:38.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 1995-2010 SuSE Linux AG Nuernberg, Germany. +# Copyright (c) 1995-2011 SuSE Linux AG Nuernberg, Germany. # # Author: Lenz Grimmer # Maintainer: Michal Hrusecky <[email protected]> @@ -16,7 +16,7 @@ # Provides: mysql # Required-Start: $network $remote_fs # Required-Stop: $network $remote_fs -# Default-Start: 2 3 5 +# Default-Start: 3 5 # Default-Stop: # Short-Description: Start the MySQL database server # Description: Start the MySQL database server @@ -61,11 +61,13 @@ parse_arguments() { for arg do case "$arg" in - --basedir=*) basedir="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; - --datadir=*) datadir="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; - --pid-file=*) pid_file="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; - --socket=*) socket="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; - --log-error=*) log_error="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --basedir=*) basedir="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --datadir=*) datadir="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --pid-file=*) pid_file="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --socket=*) socket="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --log-error=*) log_error="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --user=*) mysql_daemon_user="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; + --group=*) mysql_daemon_group="`echo "$arg" | sed -e 's/^[^=]*=//'`" ;; esac done } @@ -265,7 +267,9 @@ log_query="${log_base}-query.log" parse_arguments `$print_defaults $defaults mysqld mysql_server` - export TMPDIR="`cat /var/run/mysql/tmpdir 2> /dev/null`" + mkdir -m 755 -p /var/run/mysql + chown $mysql_daemon_user:$mysql_daemon_group /var/run/mysql + export TEMPDIR="`cat /var/run/mysql/tmpdir 2> /dev/null`" # Safeguard (relative paths, core dumps..) cd "$basedir" @@ -277,14 +281,15 @@ rc_status -v && rc_exit # prepare tmp dir - if [ "$TMPDIR" ] && [ -d "$TMPDIR" ] && \ - [ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then - rm -rf "$TMPDIR" + unset TMPDIR + if [ "$TEMPDIR" ] && [ -d "$TEMPDIR" ] && \ + [ "`ls -ld "$TEMPDIR" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then + rm -rf "$TEMPDIR" fi - TMPDIR="`mktemp -d -p /var/tmp mysql.XXXXXX | tee /var/run/mysql/tmpdir`" - [ -z "$TMPDIR" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$TMPDIR" - [ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || { - echo "Can't create secure $TMPDIR" + TEMPDIR="`mktemp -d -p /var/tmp mysql.XXXXXX | tee /var/run/mysql/tmpdir`" + [ -z "$TEMPDIR" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$TEMPDIR" + [ "`ls -ld "$TEMPDIR" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || { + echo "Can't create secure $TEMPDIR" rc_failed; rc_status -v; rc_exit; } @@ -376,8 +381,9 @@ fi fi protected="`mktemp -d -p /var/tmp mysql-protected.XXXXXX | tee /var/run/mysql/protecteddir`" + export TMPDIR="$TEMPDIR" [ -z "$protected" ] || chown "$mysql_daemon_user:$mysql_daemon_group" "$protected" - [ "`ls -ld "$protected" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || { + [ "`ls -ld "$protected" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || { echo "Can't create secure $protected" | tee -a "$log_upgrade" rc_failed; rc_status -v; rc_exit; } @@ -417,6 +423,7 @@ chmod 640 "$log_upgrade" fi + export TMPDIR="$TEMPDIR" echo -n "Starting service MySQL " @@ -441,9 +448,9 @@ stop) echo -n "Shutting down service MySQL " kill_mysql - if [ "$TMPDIR" ] && [ -d "$TMPDIR" ] && \ - [ "`ls -ld "$TMPDIR" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then - rm -rf "$TMPDIR" + if [ "$TEMPDIR" ] && [ -d "$TEMPDIR" ] && \ + [ "`ls -ld "$TEMPDIR" | grep "^drwx------[\\.\+]\?[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ]; then + rm -rf "$TEMPDIR" fi # Remember status and be verbose rc_status -v ++++++ series ++++++ mysql-community-server-5.1.31-shebang.patch mysql-community-server-5.1.33-scripts-paths.patch mysql-community-server-5.1.33-ssl-lib64-macro.patch mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch mariadb-5.2.6-group.patch mysql-community-server-5.1.45-multi-configuration.patch mariadb-5.2.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch mysql-community-server-5.1.51-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch mariadb-5.2.6-plugins-avoid-version.patch mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mariadb-5.2.4-libmysql-no-pkglibdir.patch mysql-community-server-5.1.53-ssl-compilation-fix.patch mariadb-5.2.6-compilation-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
