diff --git a/_service b/_service index 774e725..5a13a69 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git https://github.com/grommunio/gromox master - gromox-1.4 + gromox-1.8 @PARENT_TAG@.@TAG_OFFSET@.%h gromox-?(.*) diff --git a/debian.changelog b/debian.changelog index f8fe4ae..4449c32 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -gromox (1.4.0-0) unstable; urgency=low +gromox (1.8.0.1550bb02-0) unstable; urgency=low * Initial package. diff --git a/debian.control b/debian.control index 7b21ddc..dbda7b7 100644 --- a/debian.control +++ b/debian.control @@ -11,6 +11,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, php-cli, php-fpm, php-mysql, php-simplexml, php-soap, system-user-gromox, w3m, libhx32 (>= 4.0) +Provides: php7-mapi-gromox Description: Groupware server (backend) with RPCH, IMAP and Z-MAPI support . Gromox is the central groupware server component of grommunio. It is diff --git a/debian.gromox.postinst b/debian.gromox.postinst index 04dd2b6..e17e3b5 100644 --- a/debian.gromox.postinst +++ b/debian.gromox.postinst @@ -8,5 +8,5 @@ chmod 0770 /var/lib/gromox /var/log/gromox || : if test -x /usr/bin/systemctl; then systemd-tmpfiles --create tmpfiles-gromox.conf || : systemctl daemon-reload || : - systemctl try-restart gromox-adaptor.service gromox-delivery.service gromox-delivery-queue.service gromox-event.service gromox-http.service gromox-imap.service gromox-midb.service gromox-pop3.service gromox-timer.service gromox-zcore.service grommunio-chat.service php7.4-fpm.service 2>/dev/null || : + systemctl try-restart gromox-adaptor.service gromox-delivery.service gromox-delivery-queue.service gromox-event.service gromox-http.service gromox-imap.service gromox-midb.service gromox-pop3.service gromox-timer.service gromox-zcore.service grommunio-chat.service php7.4-fpm.service saslauthd.service 2>/dev/null || : fi diff --git a/gromox-1.4.0.66f7fe55.tar.xz b/gromox-1.4.0.66f7fe55.tar.xz deleted file mode 100644 index cbd1841..0000000 --- a/gromox-1.4.0.66f7fe55.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71cfd018b497ebd3746f44f1f654c9b192136b36b955696304289113ee9beda1 -size 976820 diff --git a/gromox-1.8.0.1550bb02.tar.xz b/gromox-1.8.0.1550bb02.tar.xz new file mode 100644 index 0000000..2226602 --- /dev/null +++ b/gromox-1.8.0.1550bb02.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e163c83cee5046afb9059139aa9af1cddb92579d34779a7abb094cb805e2c8aa +size 1001336 diff --git a/gromox.dsc b/gromox.dsc index 7b53f7f..580511e 100644 --- a/gromox.dsc +++ b/gromox.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: gromox Architecture: any -Version: 1.4 +Version: 1.8.0.1550bb02 DEBTRANSFORM-RELEASE: 1 Maintainer: Gromox Homepage: https://gromox.com diff --git a/gromox.spec b/gromox.spec index dc5a9ac..e993530 100644 --- a/gromox.spec +++ b/gromox.spec @@ -3,7 +3,7 @@ %define _libexecdir %_prefix/libexec Name: gromox -Version: 1.4.0.66f7fe55 +Version: 1.8.0.1550bb02 Release: 0 Summary: Groupware server backend with RPC, IMAP,POP3, PHP-MAPI support License: AGPL-3.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later @@ -81,6 +81,7 @@ b="%buildroot" mkdir -pv "$b/%_pamdir" mv "$b/%_libdir/security"/* "$b/%_pamdir/" %endif +# done in system-user-gromox (which exists for ease of building for multiple distros) rm -fv "%buildroot/%_sysusersdir/sysusers-gromox.conf" for i in /var/lib/gromox /var/lib/gromox/domain \ /var/lib/gromox/queue /var/lib/gromox/queue/clone \ @@ -115,7 +116,12 @@ mkdir -p "$b/%_sysconfdir/%name" "$b/%_datadir/%name" if ! test -x /usr/bin/systemctl; then exit 0 fi -/usr/bin/systemctl try-restart grommunio-chat.service php-fpm.service || : +# saslauthd re-opens pam_gromox.so everytime, however +# libgromox_common.so stays resident because of STB_UNIQUE symbols, +# therefore saslauthd can run into the problem that a new version of +# the pam module will be combined with a too old version of gromox +# libs. No good solution in sight.. +/usr/bin/systemctl try-restart grommunio-chat.service php-fpm.service saslauthd.service 2>/dev/null || : %preun %if 0%{?service_del_preun:1}