--- rpms/smeserver-horde/sme10/smeserver-horde.spec	2021/02/22 04:32:30	1.27
+++ rpms/smeserver-horde/sme10/smeserver-horde.spec	2022/05/27 02:10:21	1.40
@@ -4,7 +4,7 @@ Summary: e-smith specific Horde configur
 %define name smeserver-horde
 Name: %{name}
 %define version 1.0.0
-%define release 24
+%define release 33
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -30,10 +30,19 @@ Patch16: smeserver-horde-1.0.0-bz11016-r
 Patch17: smeserver-horde-1.0.0-bz11233-webmail-manager.patch
 Patch18: smeserver-horde-1.0.0-bz11255.patch
 Patch19: smeserver-horde-1.0.0-bz11308-configurationhash.patch
+Patch20: smeserver-horde-1.0.0-bz10945-bz11443-bz11433-bz11431.patch
+Patch21: smeserver-horde-1.0.0-bz11422-logging.patch
+Patch22: smeserver-horde-1.0.0-bz11489.patch
+Patch23: smeserver-horde-1.0.0-bz11628-ingofilters-sieve.patch
+Patch24: smeserver-horde-1.0.0-bz11738-multi-admin-user.patch
+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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, php-horde-horde >= 5.2, mariadb
+Requires: e-smith-apache >= 2.6.0-19
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 Obsoletes: horde-h3, e-smith-horde, imp-h3, e-smith-imp
@@ -69,8 +78,41 @@ Requires: php-pear-MDB2
 Requires: php-pear-Net-URL2
 Requires: php-pear-XML-Parser2
 Requires: php-pear-XML-RPC2
+Requires: ImageMagick
 
 %changelog
+* 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]
+
+* Sat Apr 16 2022 Terry Fage <terry@fage.id.au> 1.0.0-31.sme
+- fix previous patch error extra line [SME: 11694]
+
+* Tue Apr 05 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-30.sme
+- fix alarm noise when disabled [SME: 11694]
+
+* Sun Nov 07 2021 Greg Simpson <gsimpson@mophilly.com> 1.0.0-29.sme
+- Syntax error, unexpected '(T_STRING), expecting ')' [SME: 11738]
+- thanks to zsolt vasarhelyi for patch test
+
+* Sat Sep 18 2021 Terry Fage <terryf@ozemail.com.au> 1.0.0-28.sme
+- Ingo filters TLS error if sieve is enabled [SME: 11628]
+
+* Wed Mar 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-27.sme
+- fix missing call to perl module emsith::php  [SME: 11489]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-26.sme
+- clean rsyslog syntax for horde [SME: 11422]
+
+* Wed Mar 10 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-25.sme
+- improved php basedir, with filtering of noise for gpg [SME: 10945]
+- force SSL for horde [SME: 11443]
+- fix horde not honoring switch to php-fpm 5.4 [SME: 11433]
+- update mail settings for the php-pool [SME: 11431]
+
 * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-24.sme
 - spamd SpamLearning property migrated to spamassassin SpamLearning [SME: 11376]
 
@@ -98,7 +140,7 @@ Requires: php-pear-XML-RPC2
 
 * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-15.sme
 - log as admin and not admin@domain for cli tasks [SME: 10910]
-- fix ingo imap preferences [SME:10912]
+- fix ingo imap preferences [SME: 10912]
 
 * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-14.sme
 - allow httpd-auth for calendar, tasks access using rpc.php ... [SME: 10908]
@@ -172,11 +214,18 @@ to work on SME Server 10
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-
 mkdir -p root/var/lib/php/horde/session
 mkdir -p root/var/lib/php/horde/opcache
 mkdir -p root/var/lib/php/horde/tmp
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 %build
 for i in post-install post-upgrade