From e839a8e262c2822657a24017e012816f4155b6d095f205d3ef012d9cd68b425a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 12 Jan 2023 11:52:36 +0000 Subject: [PATCH 1/3] - Update to release 2.1 OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=25 --- gromox-1.37.tar.asc | 7 ------- gromox-1.37.tar.zst | 3 --- gromox-2.1.tar.asc | 7 +++++++ gromox-2.1.tar.zst | 3 +++ gromox.changes | 13 +++++++++++++ gromox.spec | 34 +++++++++++++++++++++++----------- 6 files changed, 46 insertions(+), 21 deletions(-) delete mode 100644 gromox-1.37.tar.asc delete mode 100644 gromox-1.37.tar.zst create mode 100644 gromox-2.1.tar.asc create mode 100644 gromox-2.1.tar.zst diff --git a/gromox-1.37.tar.asc b/gromox-1.37.tar.asc deleted file mode 100644 index 0379a60..0000000 --- a/gromox-1.37.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCY57+GgAKCRD3bv5dDCI6 -j0NCAP4vaIc6B2bGTAcYzQgiM4liYSc8q8j/Q7ZPl94bPbT7WAEArjxOm9RfTbuv -t33C2jZftR78cQTJq+VMhWCa3QWn0gY= -=Dipo ------END PGP SIGNATURE----- diff --git a/gromox-1.37.tar.zst b/gromox-1.37.tar.zst deleted file mode 100644 index 2c6c28f..0000000 --- a/gromox-1.37.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10ea54f664111a9884d5b56abf530346b94da8497e7f31b2edbae8954d8f38a4 -size 1954679 diff --git a/gromox-2.1.tar.asc b/gromox-2.1.tar.asc new file mode 100644 index 0000000..a2ac08f --- /dev/null +++ b/gromox-2.1.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCY7/yDgAKCRD3bv5dDCI6 +j+HmAP9G9l1FhUn3vnWqxPbi5skrxYVIx0abyVQydOdnsOjYiwEAj3Id3vM+DeBX +X3kKcrJ5DyKFQKR0b7bbzkZdI3BaSwA= +=AHGG +-----END PGP SIGNATURE----- diff --git a/gromox-2.1.tar.zst b/gromox-2.1.tar.zst new file mode 100644 index 0000000..5401fff --- /dev/null +++ b/gromox-2.1.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed5e653f267336ef706d96c7409605071194dd6f97bdef43e30e22507a3444e5 +size 1998255 diff --git a/gromox.changes b/gromox.changes index af03e64..81add73 100644 --- a/gromox.changes +++ b/gromox.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jan 12 11:39:59 UTC 2023 - Jan Engelhardt + +- Update to release 2.1 + * exmdb_provider: support for private store message and folder + softdelete (and thus the Recover Deleted Items feature in OL) + * mapi_lib: parse "Received" headers into + PR_MESSAGE_DELIVERY_TIME for the sake of EML imports + * emsmdb: work around OL crash with Recover Deleted Items dialog + * emsmdb: rework interpretation of PR_SENT_REPRESENTING on + IPM.Schedule objects (relates to the organizer of a meeting + when such meeting is forwarded) + ------------------------------------------------------------------- Sun Dec 18 12:25:44 UTC 2022 - Jan Engelhardt diff --git a/gromox.spec b/gromox.spec index b05ff70..73a85fb 100644 --- a/gromox.spec +++ b/gromox.spec @@ -1,7 +1,7 @@ # # spec file for package gromox # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define _libexecdir %_prefix/libexec Name: gromox -Version: 1.37 +Version: 2.1 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 @@ -55,6 +55,7 @@ BuildRequires: pkgconfig(jsoncpp) >= 1.4.0 BuildRequires: pkgconfig(libHX) >= 4.3 BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libolecf) BuildRequires: pkgconfig(libpff) BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libzstd) @@ -67,19 +68,30 @@ BuildRequires: user(gromox) %if 0%{?suse_version} Requires: glibc-locale-base %endif -Requires: php-cli >= 7.4 -Requires: php-fpm -%if 0%{?suse_version} -Requires: php-mysql -Requires: php-posix -%else -Requires: php-mysqlnd +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 +# Require php-cli/fpm (and modules) that have a chance of loading mapi.so +# which means same generation as the one we built with. +Requires: php8-cli php8-fpm php8-mysql php8-posix php8-soap %endif +%if 0%{?suse_version} && 0%{?sle_version} < 150400 +Requires: php-cli +Requires: php7-fpm +Requires: php7-mysql +Requires: php7-posix +Requires: php7-soap +%endif +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?redhat_version} +Requires: php-cli +Requires: php-fpm +Requires: php-mysqlnd +Requires: php-posix Requires: php-soap +%endif Requires: w3m Requires(pre): user(grommunio) Requires(pre): user(gromox) Requires(pre): group(gromox) +Provides: bundled(tzcode) = 2022c %{?systemd_ordering} %if !0%{?_pamdir:1} %define _pamdir /%_lib/security @@ -104,7 +116,7 @@ ready-to-run installation of Gromox. %build autoreconf -fi %configure CFLAGS="%optflags -Og" CXXFLAGS="%optflags -Og" -%make_build +%make_build V=1 %install b="%buildroot" @@ -134,7 +146,7 @@ mkdir -p "$b/%_sysconfdir/%name" "$b/%_datadir/%name" mkdir -p "$b/etc/php8/fpm/php-fpm.d" cp -a "$b/usr/share/gromox/fpm-gromox.conf.sample" "$b/etc/php8/fpm/php-fpm.d/gromox.conf" %endif -%if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1550 +%if 0%{?suse_version} && 0%{?sle_version} < 150400 mkdir -p "$b/etc/php7/fpm/php-fpm.d" cp -a "$b/usr/share/gromox/fpm-gromox.conf.sample" "$b/etc/php7/fpm/php-fpm.d/gromox.conf" %endif From 891a1aa3d29b98c81bf065f28d3af26518bc8fd29fb0fc34e83ecc24ca4aac02 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 12 Jan 2023 11:54:01 +0000 Subject: [PATCH 2/3] update deb data OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=26 --- debian.changelog | 2 +- debian.gromox.postinst | 47 +++++++++++++++++++++++++++++++++--------- debian.rules | 4 +++- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/debian.changelog b/debian.changelog index b97ecd7..0380384 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -gromox (1.28) unstable; urgency=low +gromox (1.36.23.3447095) unstable; urgency=low * Initial package. diff --git a/debian.gromox.postinst b/debian.gromox.postinst index e459293..d07df6c 100644 --- a/debian.gromox.postinst +++ b/debian.gromox.postinst @@ -1,10 +1,24 @@ #!/bin/sh -# %files -chown root:gromox /etc/gromox || : -chmod 0770 /etc/gromox || : -vd="/var/lib/gromox \ - /var/lib/gromox/domain \ +set -e +. /usr/share/debconf/confmodule + +set_perms() +{ + USER="$1" + GROUP="$2" + MODE="$3" + FILE="$4" + if ! dpkg-statoverride --list "$FILE" >/dev/null 2>&1; then + chown -R "$USER:$GROUP" "$FILE" + chmod -R $MODE "$FILE" + fi +} + +xpostinst() +{ +set_perms root gromox 0770 /etc/gromox || : +for i in /var/lib/gromox \ /var/lib/gromox/queue \ /var/lib/gromox/queue/cache \ /var/lib/gromox/queue/clone \ @@ -12,11 +26,9 @@ vd="/var/lib/gromox \ /var/lib/gromox/queue/mess \ /var/lib/gromox/queue/save \ /var/lib/gromox/queue/timer \ - /var/lib/gromox/user \ - /var/log/gromox" -chown gromox:gromox $vd || : -chmod 0770 $vd || : -chmod 0770 /var/lib/gromox /var/log/gromox || : + /var/log/gromox; do + set_perms gromox gromox 0770 "$i" || : +done # %post if test -x /usr/bin/systemd-tmpfiles; then @@ -32,5 +44,20 @@ if test -x /usr/bin/systemctl; then gromox-pop3.service gromox-timer.service gromox-zcore.service \ grommunio-chat.service \ php7.4-fpm.service php8.0-fpm.service php8.1-fpm.service \ + php8.2-fpm.service \ saslauthd.service 2>/dev/null || : fi +} + + +case "$1" in +configure|reconfigure) + xpostinst + ;; +abort-upgrade|abort-remove|abort-deconfigure) + ;; +*) + echo "postinst called with unknown argument \"$1\"" >&2 + exit 1 + ;; +esac diff --git a/debian.rules b/debian.rules index abd8565..2a9c083 100644 --- a/debian.rules +++ b/debian.rules @@ -1,13 +1,15 @@ #!/usr/bin/make -f export DH_VERBOSE=1 phpdir := $(shell readlink -f $$(php-config --ini-path)/..) +INSTDIR := debian/gromox %: dh $@ --parallel --with autoreconf override_dh_auto_install: dh_auto_install - find ${INSTDIR} -type f -name "*.la" -delete + find ${INSTDIR} -type f -name "*.la" -print -delete + perl -i -lpe 's{Type=simple}{Type=simple\nRestart=on-failure}' ${INSTDIR}/lib/systemd/system/*.service for i in /etc/gromox /var/lib/gromox /var/lib/gromox/domain \ /var/lib/gromox/queue /var/lib/gromox/queue/clone \ /var/lib/gromox/queue/mess /var/lib/gromox/queue/save \ From 9b6905466e1c064cf5b2f58651745d4385e2a71dd98918ea72f7b099e0450e70 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 15 Jan 2023 10:11:44 +0000 Subject: [PATCH 3/3] Repair 15.4 test logic OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=27 --- gromox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gromox.spec b/gromox.spec index 73a85fb..7b5bc85 100644 --- a/gromox.spec +++ b/gromox.spec @@ -73,7 +73,7 @@ Requires: glibc-locale-base # which means same generation as the one we built with. Requires: php8-cli php8-fpm php8-mysql php8-posix php8-soap %endif -%if 0%{?suse_version} && 0%{?sle_version} < 150400 +%if 0%{?sle_version} && 0%{?sle_version} < 150400 Requires: php-cli Requires: php7-fpm Requires: php7-mysql @@ -146,7 +146,7 @@ mkdir -p "$b/%_sysconfdir/%name" "$b/%_datadir/%name" mkdir -p "$b/etc/php8/fpm/php-fpm.d" cp -a "$b/usr/share/gromox/fpm-gromox.conf.sample" "$b/etc/php8/fpm/php-fpm.d/gromox.conf" %endif -%if 0%{?suse_version} && 0%{?sle_version} < 150400 +%if 0%{?sle_version} && 0%{?sle_version} < 150400 mkdir -p "$b/etc/php7/fpm/php-fpm.d" cp -a "$b/usr/share/gromox/fpm-gromox.conf.sample" "$b/etc/php7/fpm/php-fpm.d/gromox.conf" %endif