Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at Fri May 20 14:43:50 CEST 2011.
-------- --- mysql-community-server/mysql-community-server.changes 2011-02-21 01:39:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/mysql-community-server/mysql-community-server.changes 2011-05-11 12:32:15.000000000 +0200 @@ -2 +2 @@ -Mon Feb 21 01:39:16 CET 2011 - [email protected] +Mon May 9 08:32:16 CEST 2011 - [email protected] @@ -4 +4,39 @@ -- add default_plugins.cnf as source to specfile +- updated to 5.5.12, see + http://dev.mysql.com/doc/refman/5.5/en/mysql-nutshell.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-12.html + +------------------------------------------------------------------- +Mon Mar 14 14:56:48 CET 2011 - [email protected] + +- updated to 5.1.56, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-56.html + +------------------------------------------------------------------- +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 Feb 22 10:51:11 CET 2011 - [email protected] + +- updated to 5.1.55, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-55.html + +------------------------------------------------------------------- +Mon Feb 21 13:50:01 CET 2011 - [email protected] + +- fixed init script to work with SELinux (bnc#635645) + +------------------------------------------------------------------- +Wed Jan 19 10:43:43 CET 2011 - [email protected] + +- updated to 5.1.54, see + http://dev.mysql.com/doc/refman/5.1/en/news-5-1-54.html + +------------------------------------------------------------------- +Wed Jan 19 10:42:26 CET 2011 - [email protected] + +- fixed init script to + - allow running as different user/group + - create TMPDIR correctly calling whatdependson for head-i586 Old: ---- mysql-5.1.53.tar.bz2 New: ---- mysql-5.5.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.0DZF9f/_old 2011-05-20 14:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZF9f/_new 2011-05-20 14:41:58.000000000 +0200 @@ -18,7 +18,8 @@ # norootforbuild # Few definitions which will alter build -%define prefered 1 +%define prefered 0 +%define use_cmake 1 %define cluster 0 %define builtin_plugins partition,csv,heap,myisam,innobase @@ -31,13 +32,13 @@ Name: mysql-community-server Summary: A True Multiuser, Multithreaded SQL Database Server -Version: 5.1.53 -Release: 6 -%define srv_vers 5.1.53 +Version: 5.5.12 +Release: 1 +%define srv_vers 5.5.12 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 +# http://dev.mysql.com/get/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz/from/pick Source: mysql-%{version}.tar.bz2 Source2: baselibs.conf Source3: README.debug @@ -48,23 +49,19 @@ Source9: mysql-patches.tar.bz2 Source10: build.inc Source11: install.inc -%if 0%{?suse_version} > 1120 || 0%{?fedora_version} > 11 Source12: series -%else -Source12: old-ssl.series -Source13: default_plugins.cnf -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils %else -PreReq: /usr/sbin/useradd /usr/sbin/usermod /usr/sbin/groupadd +#PreReq: /usr/sbin/useradd /usr/sbin/usermod /usr/sbin/groupadd %endif -PreReq: coreutils sed grep +#PreReq: coreutils sed grep %if 0%{?suse_version} PreReq: %install_info_prereq %insserv_prereq %endif -BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel zlib-devel +BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel +BuildRequires: cmake zlib-devel %if 0%{?suse_version} BuildRequires: pwdutils tcpd-devel %endif @@ -126,7 +123,7 @@ # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release Obsoletes: mysql-devel < %srv_vers -Requires: libmysqlclient16 = %version libmysqlclient_r16 = %version glibc-devel zlib-devel openssl-devel +Requires: libmysqlclient18 = %version libmysqlclient_r18 = %version glibc-devel zlib-devel openssl-devel Summary: MySQL Development Header Files and Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/C and C++ @@ -165,15 +162,17 @@ %description -n libmysqld-devel This package contains the development header files and libraries for developing application that embed the MySQL server +%endif #------------------------------------------------------------------------------- -%package -n libmysqlclient16 + +%package -n libmysqlclient18 #------------------------------------------------------------------------------- Summary: MySQL Shared Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/Other -%description -n libmysqlclient16 +%description -n libmysqlclient18 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MySQL. @@ -184,13 +183,13 @@ #------------------------------------------------------------------------------- -%package -n libmysqlclient_r16 +%package -n libmysqlclient_r18 #------------------------------------------------------------------------------- Summary: MySQL Shared Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/Other -%description -n libmysqlclient_r16 +%description -n libmysqlclient_r18 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MySQL. @@ -199,9 +198,7 @@ Michael Widenius <[email protected]> David Axmark <[email protected]> -%endif #------------------------------------------------------------------------------- - %package client #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT @@ -246,7 +243,7 @@ %if %{defined mdkversion} %package debuging -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT + %else %package debug @@ -401,9 +398,8 @@ cp %_sourcedir/README.SuSE . cp %_sourcedir/suse-test-run . # apply patches from series -ln -s mysql-patches/patches . -cp %{S:12} patches/series -mysql-patches/apply-series.sh patches/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 @@ -477,35 +473,35 @@ rmdir /var/run/mysql/restart || : fi -%if 0%{prefered} > 0 #------------------------------------------------------------------------------- -%post -n libmysqlclient16 +%post -n libmysqlclient18 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmysqlclient16 +%postun -n libmysqlclient18 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%post -n libmysqlclient_r16 +%post -n libmysqlclient_r18 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmysqlclient_r16 +%postun -n libmysqlclient_r18 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- +%if 0%{prefered} > 0 #------------------------------------------------------------------------------- %post -n libmysqld0 @@ -596,10 +592,11 @@ %defattr(-,root,root) %_libdir/libmysqld.so.* #------------------------------------------------------------------------------- +%endif #------------------------------------------------------------------------------- -%files -n libmysqlclient16 +%files -n libmysqlclient18 #------------------------------------------------------------------------------- %defattr(-, root, root) %{_libdir}/libmysqlclient.so.* @@ -607,12 +604,11 @@ #------------------------------------------------------------------------------- -%files -n libmysqlclient_r16 +%files -n libmysqlclient_r18 #------------------------------------------------------------------------------- %defattr(-, root, root) %{_libdir}/libmysqlclient_r.so.* #------------------------------------------------------------------------------- -%endif #------------------------------------------------------------------------------- ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.0DZF9f/_old 2011-05-20 14:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZF9f/_new 2011-05-20 14:41:58.000000000 +0200 @@ -3,9 +3,11 @@ %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 -Wno-unused-parameter" export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" + +%if 0%{use_cmake} < 1 +autoreconf -f -i # Make the compile a function, since we do multiple builds BuildMySQL() { # The --enable-assembler simply does nothing on systems that do not @@ -80,3 +82,31 @@ cd .. %endif +%else # cmake build + +BuildMySQL() { + mkdir _build$1 + pushd _build$1 + shift + cmake -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_READLINE=0 \ + -DWITH_LIBEDIT=0 \ + -DINSTALL_LAYOUT=RPM \ + -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ + -DWITH_COMMENT="openSUSE MySQL rpm" \ + -DWITH_EXTRA_CHARSET=all \ + -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ + -DWITH_EMBEDDED_SERVER=true \ + -DDENABLE_DOWNLOADS=false \ + "$@" .. + make %{?jobs:-j%jobs} + nm --numeric-sort sql/mysqld > sql/mysqld.sym + popd +} + +BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share +BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug +%endif ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.0DZF9f/_old 2011-05-20 14:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZF9f/_new 2011-05-20 14:41:58.000000000 +0200 @@ -65,7 +65,7 @@ %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 644 "${DOCS[@]}" ${DOCDIR} || true 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 @@ -119,5 +119,8 @@ ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then + mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf +fi mkdir -p '%buildroot'/etc/mysql [ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql ++++++ mysql-5.1.53.tar.bz2 -> mysql-5.5.12.tar.bz2 ++++++ mysql-community-server/mysql-5.1.53.tar.bz2 /mounts/work_src_done/STABLE/mysql-community-server/mysql-5.5.12.tar.bz2 differ: char 11, line 1 ++++++ mysql-patches.tar.bz2 ++++++ ++++ 2903 lines of diff (skipped) ++++++ old-ssl.series ++++++ --- /var/tmp/diff_new_pack.0DZF9f/_old 2011-05-20 14:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZF9f/_new 2011-05-20 14:41:58.000000000 +0200 @@ -18,4 +18,4 @@ mysql-community-server-5.1.51-plugins-avoid-version.patch mysql-community-server-5.1.51-upgrade-exit-status.patch mysql-community-server-5.1.52-utf8-test-results.patch -mysql-community-server-5.1.53-compilation-fix.patch +mysql-community-server-5.1.56-compilation-fix.patch ++++++ rc.mysql-multi ++++++ --- /var/tmp/diff_new_pack.0DZF9f/_old 2011-05-20 14:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZF9f/_new 2011-05-20 14:41:58.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 } @@ -251,8 +253,6 @@ datadir=/var/lib/mysql mysql_daemon_user=mysql mysql_daemon_group=mysql - mkdir -m 755 -p /var/run/mysql - chown $mysql_daemon_user:$mysql_daemon_group /var/run/mysql pid_file=/var/run/mysql/mysqld.pid socket=/var/run/mysql/mysql.sock print_defaults=/usr/bin/my_print_defaults @@ -267,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" @@ -279,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; } @@ -378,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; } @@ -419,6 +423,7 @@ chmod 640 "$log_upgrade" fi + export TMPDIR="$TEMPDIR" echo -n "Starting service MySQL " @@ -443,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 ++++++ --- /var/tmp/diff_new_pack.0DZF9f/_old 2011-05-20 14:41:58.000000000 +0200 +++ /var/tmp/diff_new_pack.0DZF9f/_new 2011-05-20 14:41:58.000000000 +0200 @@ -1,22 +1,13 @@ -mysql-community-server-5.1.30-federated-workaround.patch 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.5.6-utf8-test-results.patch mysql-community-server-5.1.36-hotcopy.patch -mysql-community-server-5.1.45-cnf.patch -mysql-community-server-5.1.45-group.patch +mysql-community-server-5.5.6-cnf.patch +mysql-community-server-5.5.8-group.patch mysql-community-server-5.1.45-multi-configuration.patch -mysql-community-server-5.1.45-safe-process-in-bin.patch +mysql-community-server-5.5.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch -mysql-community-server-5.1.50-strncat-overflow.patch +mysql-community-server-5.5.6-strncat-overflow.patch mysql-community-server-5.1.51-install_db-quiet.patch -mysql-community-server-5.1.51-libmysql-no-pkglibdir.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 -mysql-community-server-5.1.51-plugins-avoid-version.patch mysql-community-server-5.1.51-upgrade-exit-status.patch -mysql-community-server-5.1.52-utf8-test-results.patch -mysql-community-server-5.1.53-ssl-compilation-fix.patch -mysql-community-server-5.1.53-compilation-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
