--- rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec 2022/06/07 10:34:18 1.8 +++ rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup.spec 2022/06/08 11:55:27 1.9 @@ -1,6 +1,6 @@ %define name smeserver-automysqlbackup %define version 3.0.RC6 -%define release 23 +%define release 24 %define rpmver 3.0.RC6 epoch: 2 @@ -15,8 +15,8 @@ URL: http://sourceforge.n BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base, e-smith-release >= 10 -Requires: pax -Requires: automysqlbackup +Requires: pax +Requires: automysqlbackup BuildRequires: e-smith-devtools Patch0: smeserver-automysqlbackup-AdjustableCronJob.patch Patch1: smeserver-automysqlbackup-enhanced-templates.patch @@ -28,6 +28,7 @@ Patch6: smeserver-automysqlbackup-3.0.RC Patch7: smeserver-automysqlbackup-3.0.RC6-bz11622.patch Patch8: smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-support.patch Patch9: smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-rename-templates.patch +Patch10: smeserver-automysqlbackup-3.0.RC6-bz11970.update-cron.patch %description This RPM is an unofficial addon for the SME Server 10.x. @@ -37,6 +38,13 @@ This script is based on automysqlbackup %changelog +* Tue Jun 07 2022 John Crisp 3.0.RC6-24.sme +- Update cron [SME:11970] +- Fix SQL in Maria 105 +- Remove automysql event and leave just smeserver-automysqlbackup-update +- Fix some createlinks +- Modify inits - but still leaves log errors if version not installed + * Tue Jun 07 2022 John Crisp 3.0.RC6-23.sme - Modify backup directory names [SME: 11970] @@ -124,6 +132,7 @@ rm -rf $RPM_BUILD_ROOT %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build perl createlinks @@ -170,14 +179,14 @@ MYSQLUSER=backupuser echo "=======================================================================" echo " " echo " delete mysql user and revoke all permissions" -# This section deletes backupuser +# This section deletes backupuser for the standard DB mysql -u root -e "REVOKE ALL PRIVILEGES ON *.* FROM '$MYSQLUSER'@'localhost';" mysql -u root -e "DROP USER $MYSQLUSER@localhost;" echo " " echo "Do that for each DB - e.g mysq55, mysql57, mariadb101, maria105 etc" echo " " # Delete custom template fragment -echo " delete db configuration automysqlbackup" +echo " Deleting configuration automysqlbackup" echo " " echo "======================================================================="