--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/07/11 15:56:58 1.30 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/12/11 05:23:03 1.31 @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 16 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -12,6 +12,7 @@ Patch0: smeserver-mysql-2.7.0-bz11899-sc Patch1: smeserver-mysql-2.7.0-bz11922-mysqlinit.patch Patch2: smeserver-mysql-2.7.0-bz11936.patch Patch3: smeserver-mysql-2.7.0-bz11953-mysql.init-logging.patch +Patch4: smeserver-mysql-2.7.0-bz12262-skipnetworking.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -37,6 +38,7 @@ mysql. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build for ver in 101 102 103 105 @@ -144,10 +146,14 @@ echo " [mariadb-$vers]" > root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-05mariadb echo "basedir=$basedir" > root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-07basedir echo "datadir=$datadir" > root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-08datadir -cp -a root/etc/e-smith/templates/etc/my.cnf/009socket root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-09socket -sed -i root$ver/etc/e-smith/templates/etc/my.cnf/$ver-09socket \ - -e "s_mariadb_{'mariadb${ver}\-mariadb'}_" \ - -e "s_^socket.*_socket=${socket}_" +#cp -a root/etc/e-smith/templates/etc/my.cnf/009socket root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-09socket +#sed -i root$ver/etc/e-smith/templates/etc/my.cnf/$ver-09socket \ +# -e "s_mariadb_{'mariadb${ver}\-mariadb'}_" \ +# -e "s_^socket.*_socket=${socket}_" +cp rootscl/etc/e-smith/templates/etc/my.conf/_VER_09socket root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-09socket +sed -i root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-09socket \ + -e "s_!!!VER!!!_${ver}_g" \ + -e "s_!!!PORT!!!_${port}_g" cp rootscl/etc/e-smith/templates/etc/my.conf/_VER_-10port root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-10port sed -i root$ver/etc/e-smith/templates/etc/my.cnf/${ver}-10port \ -e "s_!!!VER!!!_${ver}_g" \ @@ -347,6 +353,9 @@ Koozali SME Server configuration package %changelog +* Sun Dec 11 2022 Jean-Philippe Pialasse 2.7.0-17.sme +- fix mariadb overriding skip-networking for other versions [SME: 12262] + * Mon Jul 11 2022 Jean-Philippe Pialasse 2.7.0-16.sme - use dedicated log file for *mysql.init [SME: 11953]