--- rpms/e-smith-mysql/sme10/e-smith-mysql.spec 2016/04/11 19:12:05 1.6 +++ rpms/e-smith-mysql/sme10/e-smith-mysql.spec 2021/08/17 15:15:50 1.26 @@ -1,16 +1,30 @@ -# $Id: e-smith-mysql.spec,v 1.5 2016/03/31 12:57:40 unnilennium Exp $ +# $Id: e-smith-mysql.spec,v 1.25 2021/03/19 02:48:48 jpp Exp $ Summary: e-smith specific mysql configuration and templates. %define name e-smith-mysql Name: %{name} %define version 2.6.0 -%define release 5 +%define release 22 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz -Patch0: e-smith-mysql-2.6.0-mariadb1.patch +Patch0: e-smith-mysql-2.6.0-mariadb1.patch +Patch1: e-smith-mysql-2.6.0-mysqld2mariadb.patch +Patch2: e-smith-mysql-2.6.0-use_default_innodb_settings.patch +Patch3: e-smith-mysql-2.6.0-mariadb_forgotten_var.patch +Patch4: e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch +Patch5: e-smith-mysql-2.6.0.bz9688.skipredirect.patch +Patch6: e-smith-mysql-2.6.0-bz11145-updateevent.patch +Patch7: e-smith-mysql-2.6.0-bz11021-mariadb2systemd.patch +Patch8: e-smith-mysql-2.6.0-bz11120-mysql.init2systemd.patch +Patch9: e-smith-mysql-2.6.0-bz7827-dumpfailure.patch +Patch10: e-smith-mysql-2.6.0-bz455-bz4606-bz11404-bz11425.patch +Patch11: e-smith-mysql-2.6.0.bz11453-sme9restoreerror.patch +Patch12: e-smith-mysql-2.6.0-bz11468.patch +Patch13: e-smith-mysql-2.6.0.bz11672-max_allowed_packet.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: mariadb-server @@ -21,6 +35,69 @@ BuildRequires: e-smith-devtools >= 1.13. AutoReqProv: no %changelog +* Tue Aug 17 2021 John Crisp 2.6.0-22.sme +- Remove template and set default max_allowed_packet=16M + +* Thu Mar 18 2021 Jean-Philippe Pialasse 2.6.0-21.sme +- fix wrong path for set password [SME: 11468] + +* Sat Mar 14 2021 Jean-Philipe Pialasse 2.6.0-20.sme +- fix restore of sme9 backup fails to start mysql.init [SME: 11453] + +* Thu Mar 04 2021 Jean-Philipe Pialasse 2.6.0-19.sme +- add property to enable mysqld slow queries log [SME: 455] + simply use SlowQueries as the amount of second and it is enabled + remove property to stop logging +- more mysqld/mariadb parameter available with properties /templates [SME: 4606] +- ease 4 databit characters with innodb [SME: 11404] +- redirect mariadb log from systemd to file [SME: 11425] + +* Wed Jan 27 2021 Jean-Philipe Pialasse 2.6.0-18.sme +- fix backup fails in pre-backup in mysqldump [SME: 7827] + +* Sun Dec 13 2020 Jean-Philipe Pialasse 2.6.0-17.sme +- expand 10mysql_upgrade and restart mysql.init on e-smith-mysql-update [SME: 11120] + this to make sure mariadb upgrade fully and prevent residual 10mysql_upgrade stay in the way + +* Wed Dec 09 2020 Jean-Philipe Pialasse 2.6.0-16.sme +- fix issue with 10mysql_upgrade crashing mariadb [SME: 11120] + also removed noise from spec file + +* Mon Dec 07 2020 Jean-Philipe Pialasse 2.6.0-15.sme +- e-smith-update event [SME: 11145] +- mariadb systemd integration [SME: 11021] + move set.password and template + create /usr/lib/systemd/system/mariadb.service.d/sme.conf + create /sbin/e-smith/systemd/mariadb-initialize + chmod + cleanup and remove old /var/service/mariadb +- mysql.init systemd integration [SME: 11120] + create mysql_init.service + + +* Sun Jul 24 2016 Jean-Philipe Pialasse 2.6.0-13.sme +- systemd skip redirect [SME: 9688] + +* Sat Jul 23 2016 stephane de Labrusse 2.6.0-12.sme +- Corrected a typo in e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch +- [SME: 9671] + +* Thu Jul 21 2016 Jean-Philipe Pialasse 2.6.0-11.sme +- fix broken link /etc/init.d/supervise/mariadb [SME: 9686] + +* Mon Jul 18 2016 stephane de Labrusse 2.6.0-10.sme +- Remove Dummy database from backup and restoration [SME: 9671] +- Added e-smith-mysql-2.6.0.bz9671.RemoveDummyMysqlDatabase.patch + +* Mon Jul 18 2016 Jean-Philipe Pialasse 2.6.0-8.sme +- fix forgotten mysqld variables in various scripts [SME: 9438] +- e-smith-mysql-2.6.0-mariadb_forgotten_var.patch + +* Mon Apr 11 2016 Daniel Berteaud 2.6.0-7.sme +- Use default InnoDB settings [SME: 9439] + +* Mon Apr 11 2016 Daniel Berteaud 2.6.0-6.sme +- Rename mysqld to mariadb [SME: 9438] + * Mon Apr 11 2016 Daniel Berteaud 2.6.0-5.sme - Remove uneeded scriplets %post and %postun [SME: 9422] @@ -728,7 +805,37 @@ mysql. %prep %setup %patch0 -p1 - +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +# mysqld renamed to mariadb [SME: 9438] +# TODO: remove on next tarball creation +rm -f root/service/mysqld +rm -rf root/var/service/mysqld +rm -rf root/var/run/ +rm -rf root/var/log/mysqld +rm -f root/etc/rc.d/init.d/supervise/mysqld +rm -f root/etc/rc.d/rc7.d/S50mysqld +mkdir -p root/var/log/mariadb.run +%patch6 -p1 +# move mariadb to systemd +%patch7 -p1 +rm -rf root/etc/e-smith/templates.metadata/var/service +rm -rf root/etc/e-smith/templates/var/service/mariadb +rm -rf root/var/service +rm -rf root/service +rm -rf root/etc/rc.d/init.d/supervise +rm -rf root/var/log +# move mysql.init +%patch8 -p1 +rm -rf root/etc/rc.d/rc7.d +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %build perl createlinks @@ -737,14 +844,8 @@ perl createlinks rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir /var/run/mysqld 'attr(0755,mysql,mysql)' \ - --file /var/service/mysqld/run 'attr(0755,root,root)' \ - --file /var/service/mysqld/control/t 'attr(0750,root,root)' \ - --file /var/service/mysqld/control/d 'attr(0750,root,root)' \ - --file /var/service/mysqld/control/i 'attr(0750,root,root)' \ - --file /var/service/mysqld/control/q 'attr(0750,root,root)' \ - --file /var/service/mysqld/log/run 'attr(0755,root,root)' \ - --dir '/var/log/mysqld' 'attr(2750,smelog,smelog)' \ + --file /sbin/e-smith/systemd/mariadb-initialize 'attr(0554,root,root)' \ + --dir '/var/log/mariadb.run' 'attr(2750,smelog,smelog)' \ --dir '/home/e-smith/db/mysql' 'attr(0750,root,root)' \ > %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist @@ -752,6 +853,14 @@ echo "%doc COPYING" >> %{name}- %clean rm -rf $RPM_BUILD_ROOT +%pre +if [ $1 -gt 1 ] ; then + if [ -e /var/service/mariadb/run ] ; then + /usr/bin/sv d mariadb + /usr/bin/sv d mariadb/log + fi +fi + %post %postun