--- rpms/smeserver-horde/sme10/smeserver-horde.spec	2022/04/17 21:45:21	1.39
+++ rpms/smeserver-horde/sme10/smeserver-horde.spec	2024/04/28 02:59:41	1.42
@@ -4,7 +4,7 @@ Summary: e-smith specific Horde configur
 %define name smeserver-horde
 Name: %{name}
 %define version 1.0.0
-%define release 32
+%define release 35
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -38,6 +38,8 @@ Patch24: smeserver-horde-1.0.0-bz11738-m
 Patch25: smeserver-horde-1.0.0-bz11694-alarm.patch
 Patch26: smeserver-horde-1.0.0-bz11694-remindfix.patch
 Patch27: smeserver-horde-1.0.0-bz11945-require.patch
+Patch28: smeserver-horde-1.0.0-bz12293-php_path.patch
+Patch29: smeserver-horde-1.0.0-bz12595.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -81,6 +83,16 @@ Requires: php-pear-XML-RPC2
 Requires: ImageMagick
 
 %changelog
+* Sat Apr 27 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.0-35.sme
+- fix password file readable by all locally [SME: 12595]
+
+* Sun Feb 05 2023 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-34.sme
+- use php full path for mysql.init scripts [SME: 12296]
+
+* Thu May 26 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-33.sme
+- fix invalid domain if ForcePrimaryDomain is enabled [SME: 11980]
+- fix $ldapServer is commented out if Horde ForcePrimaryDomain is disabled [SME: 11981]
+
 * Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-32.sme
 - use httpd 2.4 access control syntax [SME: 11945]
 
@@ -222,6 +234,8 @@ mkdir -p root/var/lib/php/horde/tmp
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
+%patch29 -p1
 
 %build
 for i in post-install post-upgrade
@@ -244,6 +258,9 @@ echo "%doc COPYING"          >> %{name}-
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+#workaround for bug 12595
+[[ `/usr/bin/stat --print=%A /usr/share/horde/smeserver/mysql_set_horde_password.sql | /usr/bin/cut -c 8` = "r" ]] && /sbin/e-smith/config delprop horde DbPassword
+
 %preun
 %post