forked from pool/mariadb
Accepting request 199808 from server:database
- comment out old settings dir if it doesn't exist
- fixed commenting out of incompatible options
- updated to MariaDB 5.5.33
* Release notes:
http://kb.askmonty.org/v/mariadb-5533-release-notes
* Changelog:
http://kb.askmonty.org/v/mariadb-5533-changelog
* not using TokuDB and jmalloc
- better version detection
- drop /etc/mysql dir, use upstream /etc/my.cfn.d only
- Build with -DOPENSSL_LOAD_CONF so mariadb respects
and load the system's openSSL configuration.
OBS-URL: https://build.opensuse.org/request/show/199808
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=33
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
62bac6bb9b
@ -9,7 +9,7 @@ export EXTRA_FLAGS=" -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unus
|
||||
%ifarch ppc64
|
||||
export EXTRA_FLAGS=" -mminimal-toc "
|
||||
%endif
|
||||
export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS "
|
||||
export CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS "
|
||||
export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"
|
||||
|
||||
%if 0%{use_cmake} < 1
|
||||
@ -101,6 +101,7 @@ BuildMySQL() {
|
||||
shift
|
||||
cmake -DWITH_SSL=system \
|
||||
-DWITH_ZLIB=system \
|
||||
-DWITH_JEMALLOC=no \
|
||||
-DWITH_READLINE=0 \
|
||||
-DWITH_LIBEDIT=0 \
|
||||
-DINSTALL_LAYOUT=RPM \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a5824b02d7cfe00333ac4adfec1856311fd27fafea7affc1656c5543a44db4a6
|
||||
oid sha256:d2dececd5b4555523534954a2ca936322440699114cc12b5caf9dfc21ce42e05
|
||||
size 318
|
||||
|
||||
@ -88,6 +88,7 @@ for i in "${DOCS[@]}"; do
|
||||
install -m 644 "${i}" "${DOCDIR}" || true
|
||||
done
|
||||
install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql
|
||||
sed -i 's|@MYSQLVER@|%{version}|' %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
|
||||
@ -145,11 +146,14 @@ fi
|
||||
rm -rf '%buildroot'/etc/my.cnf.d
|
||||
mkdir -p '%buildroot'/etc/my.cnf.d
|
||||
bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf -
|
||||
%if %have_info < 1
|
||||
[ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f '%buildroot'/usr/share/info/mysql.info*
|
||||
%endif
|
||||
if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
|
||||
echo '%%dir %%_libdir/mysql' >> mysql-client.files
|
||||
echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files
|
||||
echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files
|
||||
fi
|
||||
rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}*
|
||||
rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true
|
||||
rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ae38e45391899f5377ed75e6974100af165f654842517db2b53033159257d72
|
||||
size 21314660
|
||||
3
mariadb-5.5.33.tar.bz2
Normal file
3
mariadb-5.5.33.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:963281f1d90efa207735ffbaa4add4c3a676953f3f16e84cf332dcda09b06eb7
|
||||
size 37239746
|
||||
@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 08:03:20 UTC 2013 - mhrusecky@suse.com
|
||||
|
||||
- comment out old settings dir if it doesn't exist
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 18 23:33:33 CEST 2013 - mhrusecky@suse.cz
|
||||
|
||||
- fixed commenting out of incompatible options
|
||||
- updated to MariaDB 5.5.33
|
||||
* Release notes:
|
||||
http://kb.askmonty.org/v/mariadb-5533-release-notes
|
||||
* Changelog:
|
||||
http://kb.askmonty.org/v/mariadb-5533-changelog
|
||||
* not using TokuDB and jmalloc
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 10:37:12 CEST 2013 - mhrusecky@suse.cz
|
||||
|
||||
- better version detection
|
||||
- drop /etc/mysql dir, use upstream /etc/my.cfn.d only
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 22 03:04:45 UTC 2013 - crrodriguez@opensuse.org
|
||||
|
||||
- Build with -DOPENSSL_LOAD_CONF so mariadb respects
|
||||
and load the system's openSSL configuration.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:52:43 CEST 2013 - mhrusecky@suse.cz
|
||||
|
||||
|
||||
26
mariadb.spec
26
mariadb.spec
@ -16,9 +16,10 @@
|
||||
#
|
||||
|
||||
# Few definitions which will alter build
|
||||
%define prefered 1
|
||||
%define use_cmake 1
|
||||
%define cluster 0
|
||||
%define prefered 01
|
||||
%define use_cmake 01
|
||||
%define cluster 00
|
||||
%define have_info 0
|
||||
%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
|
||||
%define use_extra_provides 1
|
||||
%define extra_provides mariadb_55
|
||||
@ -34,9 +35,9 @@ Name: mariadb
|
||||
Summary: Server part of MariaDB
|
||||
License: SUSE-GPL-2.0-with-FLOSS-exception
|
||||
Group: Productivity/Databases/Servers
|
||||
Version: 5.5.32
|
||||
Version: 5.5.33
|
||||
Release: 0
|
||||
%define srv_vers 5.5.32
|
||||
%define srv_vers 5.5.33
|
||||
Url: http://www.mariab.org
|
||||
Source: mariadb-%{version}.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
@ -54,6 +55,9 @@ Source14: my.ini
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version}
|
||||
PreReq: pwdutils
|
||||
%if %have_info
|
||||
PreReq: %install_info_prereq %insserv_prereq
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -399,6 +403,8 @@ done
|
||||
%endif
|
||||
# Broken test that needs sources
|
||||
rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
|
||||
# Present only in newer MariaDB, big change, needs fixing & testing
|
||||
rm -rf storage/tokudb
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build.inc)}
|
||||
@ -445,6 +451,10 @@ if posix.access("/usr/sbin/rcmysql", "x") then
|
||||
end
|
||||
|
||||
%posttrans
|
||||
%if %have_info
|
||||
[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
|
||||
%endif
|
||||
if [ -d /var/lib/mysql ]; then
|
||||
touch /var/lib/mysql/.run-mysql_upgrade
|
||||
chown -R --no-dereference mysql:mysql /var/lib/mysql
|
||||
@ -484,6 +494,9 @@ fi
|
||||
|
||||
%postun
|
||||
if [ $1 = 0 ]; then
|
||||
%if %have_info
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.*
|
||||
%endif
|
||||
%{insserv_cleanup}
|
||||
rm -f "/var/lib/systemd/migrated/mysql.service"
|
||||
if [ -x /usr/bin/systemctl ]; then
|
||||
@ -502,6 +515,9 @@ fi
|
||||
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/*
|
||||
%config /etc/logrotate.d/mysql
|
||||
%doc %{_defaultdocdir}/%{name}
|
||||
%if %have_info
|
||||
%doc %{_infodir}/mysql.info.*
|
||||
%endif
|
||||
/etc/init.d/mysql
|
||||
/usr/sbin/rcmysql
|
||||
%dir /usr/share/%{name}
|
||||
|
||||
1
my.ini
1
my.ini
@ -98,6 +98,5 @@ log = /var/log/mysqld_multi.log
|
||||
# socket = /var/lib/mysql-databases/mysqld6/mysql.sock
|
||||
# user = mysql
|
||||
|
||||
!includedir /etc/mysql
|
||||
!includedir /etc/my.cnf.d
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:166945cf5ab12a72f10c01211781dc3da69d71e6d24e55756220d2865af8654e
|
||||
size 13346
|
||||
oid sha256:5e9984c1676d989cc011b229902b741f17d35b4c547a8a57d3f32e9f9ed66a92
|
||||
size 12386
|
||||
|
||||
@ -334,7 +334,7 @@ else
|
||||
chown -R --no-dereference mysql:mysql "$log_dir"
|
||||
done
|
||||
|
||||
MYSQLVER="`mysqld --version | sed 's|.*Ver\ *\([^\ ]*\)\.[0-9]\+[\-\ ].*|\1|'`"
|
||||
MYSQLVER="`echo @MYSQLVER@ | sed 's|\.[0-9]\+$||'`"
|
||||
|
||||
# We assume a fresh install if the directory $datadir/mysql
|
||||
# does not exist and create the privilege database
|
||||
@ -351,6 +351,7 @@ else
|
||||
# user confirmation.
|
||||
if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then
|
||||
if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \
|
||||
[ -f "$datadir/mysql_upgrade_info" ] && \
|
||||
[ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
|
||||
echo
|
||||
echo "You are upgrading from different stable version of MySQL!"
|
||||
@ -369,8 +370,10 @@ else
|
||||
echo >> "$log_upgrade"
|
||||
echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade"
|
||||
echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"
|
||||
sed -i -e 's|^\([^#]*skip-locking\)|\1\nskip-external-locking|' \
|
||||
-e 's|^\([^#]*skip-federated\)|#\1|' /etc/my.cnf
|
||||
sed -i -e 's|^\([[:blank:]]*\)skip-locking|\1skip-external-locking|' \
|
||||
-e 's|^\([[:blank:]]*skip-federated\)|#\1|' /etc/my.cnf
|
||||
[ -d /etc/mysql ] || \
|
||||
sed -i 's|^\([[:blank:]]*!includedir\ /etc/mysql[[:blank:]]*\)$|#\1|' /etc/my.cnf
|
||||
# Check logs for inconsistencies
|
||||
SRCLOGS=""
|
||||
ALL_SRCLOGS=""
|
||||
@ -483,6 +486,8 @@ else
|
||||
chmod 750 "$datadir"
|
||||
chown -R --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$datadir"
|
||||
rm -f /var/adm/update-messages/mysql-*
|
||||
[ "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ] || \
|
||||
echo -n "@MYSQLVER@" > "$datadir/mysql_upgrade_info"
|
||||
rm -f /var/lib/mysql/.run-mysql_upgrade
|
||||
rm -f /var/lib/mysql/.force_upgrade
|
||||
rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past
|
||||
|
||||
3
series
3
series
@ -9,6 +9,5 @@ mariadb-5.5.32-upgrade-exit-status.patch
|
||||
mariadb-5.2.3-cnf.patch
|
||||
mysql-community-server-5.5.6-safe-process-in-bin.patch
|
||||
mariadb-5.5.28-group.patch
|
||||
mariadb-5.5.32-deharcode-libdir.patch
|
||||
mariadb-5.5.33-deharcode-libdir.patch
|
||||
mysql-5.5.31-upgrade-datadir.patch
|
||||
mysql-5.5-dump.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user