--- rpms/smeserver-horde/sme10/smeserver-horde.spec 2016/07/06 12:41:24 1.3 +++ rpms/smeserver-horde/sme10/smeserver-horde.spec 2021/03/10 21:37:53 1.29 @@ -4,13 +4,34 @@ Summary: e-smith specific Horde configur %define name smeserver-horde Name: %{name} %define version 1.0.0 -%define release 3 +%define release 25 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -#Patch1: e-smith-horde-4.8.0_renumber_database_creation.order.patch +Patch0: smeserver-horde-1.0.0-bz10092-smtpdORqpsmtpd.patch +Patch1: smeserver-horde-bz10717-config.phphorde5.2.14compliance.patch +Patch2: smeserver-horde-1.0.0-bz10092-spam_learning.patch +Patch3: smeserver-horde-1.0.0-bz10717-activesync_turba_backends.local.php.patch +Patch4: smeserver-horde-1.0.0-bz10717-task_sharing.patch +Patch5: smeserver-horde-1.0.0-bz10866-php3.patch +Patch6: smeserver-horde-1.0.0-bz10823-strict-warming.patch +Patch7: smeserver-horde-1.0.0-bz10872-enable-php-fpm.patch +Patch8: smeserver-horde-1.0.0-bz10224-bz1005.patch +Patch9: smeserver-horde-1.0.0-bz10908-httpd-auth.patch +Patch10: smeserver-horde-1.0.0-bz10909-smeserver-horde-update.patch +Patch11: smeserver-horde-1.0.0-bz10910-admin.patch +Patch12: smeserver-horde-1.0.0-bz10912-ingo.patch +Patch13: smeserver-horde-1.0.0-bz10943-libsasl-noise.patch +Patch14: smeserver-horde-1.0.0-bz10945-phpbasedir-gpg.patch +Patch15: smeserver-horde-1.0.0-bz10969-remove-hardcoded-ports.patch +Patch16: smeserver-horde-1.0.0-bz11016-rsyslog-deprecated.patch +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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 4.9.44, php-horde-horde >= 5.2, mariadb @@ -22,7 +43,7 @@ Obsoletes: kronolith-h3, smeserver-krono Obsoletes: mnemo-h3, smeserver-mnemo Requires: php-horde-content, php-horde-imp, php-horde-ingo, php-horde-kronolith Requires: php-horde-mnemo, php-horde-nag, php-horde-turba -# optional fucntions we provide +# optional functions we provide Requires: php-horde-Horde-ActiveSync Requires: php-horde-Horde-Service-Facebook Requires: php-horde-Horde-Service-Twitter @@ -31,11 +52,99 @@ Requires: php-pear-Date-Holidays-Germany Requires: php-pear-Date-Holidays-Netherlands, php-pear-Date-Holidays-Norway Requires: php-pear-Date-Holidays-Portugal, php-pear-Date-Holidays-Russia Requires: php-pear-Date-Holidays-Slovenia, php-pear-Date-Holidays-Sweden -Requires: php-pear-Date-Holidays-Turkey +Requires: php-pear-Date-Holidays-France, php-pear-Date-Holidays-Turkey Requires: php-horde-Horde-Text-Filter-Csstidy Requires: timeobjects +# maybe not required, but JHB used to have them in previous installs +Requires: php-pear-Auth-SASL2 +Requires: php-pear-Cache-Lite +Requires: php-pear-Console-GetoptPlus +Requires: php-pear-Crypt-Blowfish +Requires: php-pear-File-CSV +Requires: php-pear-File-Util +Requires: php-pear-HTTP +Requires: php-pear-HTTP-Request2 +Requires: php-pear-HTTP_WebDAV_Server +Requires: php-pear-Log +Requires: php-pear-MDB2 +Requires: php-pear-Net-URL2 +Requires: php-pear-XML-Parser2 +Requires: php-pear-XML-RPC2 +Requires: ImageMagick %changelog +* Wed Mar 10 2021 Jean-Philipe Pialasse 1.0.0-25.sme +- apply the configuration hash of [SME: 11308] +- 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 1.0.0-24.sme +- spamd SpamLearning property migrated to spamassassin SpamLearning [SME: 11376] + +* Sat Feb 20 2021 Jean-Philipe Pialasse 1.0.0-23.sme +- Configuration is not up to date, hash to update [SME: 11308] + +* Fri Dec 11 2020 Jean-Philipe Pialasse 1.0.0-22.sme +- fix wrong template path for php55, php56 and php [SME: 11255] + +* Mon Dec 07 2020 Jean-Philipe Pialasse 1.0.0-20.sme +- fix webmail not accessible after enabling from manager [SME: 11233] + +* Tue Nov 17 2020 Jean-Philipe Pialasse 1.0.0-19.sme +- update rsyslog syntax [SME: 11016] + move fragment so syntax is similar to message + +* Sat Jun 27 2020 Jean-Philipe Pialasse 1.0.0-18.sme +- remove harcoded ports [SME: 10969] + +* Tue Jun 23 2020 Jean-Philipe Pialasse 1.0.0-17.sme +- add gpg to php base dir [SME: 10945] + +* Wed May 13 2020 Jean-Philipe Pialasse 1.0.0-16.sme +- workaround logging noise caused by libsasl [SME: 10943] + +* Fri Mar 27 2020 Jean-Philipe Pialasse 1.0.0-15.sme +- log as admin and not admin@domain for cli tasks [SME: 10910] +- fix ingo imap preferences [SME: 10912] + +* Fri Mar 27 2020 Jean-Philipe Pialasse 1.0.0-14.sme +- allow httpd-auth for calendar, tasks access using rpc.php ... [SME: 10908] +- add smeserver-horde-update event [SME: 10909] + +* Fri Mar 27 2020 Jean-Philipe Pialasse 1.0.0-13.sme +- avoid loss of user parameter on Primary Domain change [SME: 1005] + this will also avoid the loss of parameter if we log with a different virtualhost + horde preference is now stored with the SME username without @domain +- fix bad regex to strip domain [SME: 10224] + also we can now force Primary domain to use as default email + we can strip heading string from virtualhost domain to create email + default identity email will update as long as no other identity is created for the user + +* Wed Mar 11 2020 Jean-Philipe Pialasse 1.0.0-12.sme +- fix typo in php-fpm patch [SME: 10872] + +* Tue Mar 10 2020 Jean-Philipe Pialasse 1.0.0-11.sme +- remove php3 references [SME: 10866] +- remove strict and warning alert from error log [SME: 10823] +- dedicated php-fpm pool for horde [SME: 10872] + +* Tue Jan 28 2020 Jean-Philipe Pialasse 1.0.0-8.sme +- apply patches from John H. Bennett III [SME: 10717] +- cvs admin -ko on patch1 + +* Fri Apr 14 2017 Jean-Philipe Pialasse 1.0.0-6.sme +- revert requires php-pear-Math_BigInteger provided by php-phpseclib-math-biginteger [SME: 9600] + +* Wed Apr 12 2017 Jean-Philipe Pialasse 1.0.0-5.sme +- fix incorrect expansion of backends.local.php with non numerical releases [SME: 10092] +- add requires php-pear-Math_BigInteger [SME: 9600] + +* Sun Jul 24 2016 Jean-Philipe Pialasse 1.0.0-4.sme +- added last optionals dependencies [SME: 9645] +- added France Holidays. + * Wed Jul 06 2016 Jean-Philipe Pialasse 1.0.0-3.sme - added Requires for pear Dates [SME: 9645] - Activesync, timeobjects, Facebook. Twitter, Text-Filter @@ -53,8 +162,32 @@ to work on SME Server 10 %prep %setup - -#%patch1 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -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 %build for i in post-install post-upgrade @@ -66,7 +199,11 @@ perl createlinks %install rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --dir /var/lib/php/horde/session 'attr(0770,root,www)' \ + --dir /var/lib/php/horde/tmp 'attr(0770,root,www)' \ + --dir /var/lib/php/horde/opcache 'attr(0770,root,www)' \ +> %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist %clean