From f70943afd11c2ce1de961b3dc556f5cdbd794b668c86d05c89b4f34f60815963 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 10 Mar 2023 00:16:45 +0000 Subject: [PATCH 1/3] - Update to release 2.6 OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=37 --- debian.control | 3 ++- debian.gromox.postinst | 6 +++--- gromox-2.5.tar.asc | 7 ------- gromox-2.5.tar.zst | 3 --- gromox-2.6.tar.asc | 7 +++++++ gromox-2.6.tar.zst | 3 +++ gromox.changes | 17 +++++++++++++++++ gromox.dsc | 2 +- gromox.spec | 2 +- 9 files changed, 34 insertions(+), 16 deletions(-) delete mode 100644 gromox-2.5.tar.asc delete mode 100644 gromox-2.5.tar.zst create mode 100644 gromox-2.6.tar.asc create mode 100644 gromox-2.6.tar.zst diff --git a/debian.control b/debian.control index 31c4eca..3e4f738 100644 --- a/debian.control +++ b/debian.control @@ -10,7 +10,8 @@ Architecture: any 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.12) + system-user-grommunio, system-user-gromox, w3m, + libhx32 (>= 4.12) Provides: php-mapi-gromox Description: Groupware server (backend) with RPCH, IMAP and Z-MAPI support . diff --git a/debian.gromox.postinst b/debian.gromox.postinst index 22b0ffa..d356906 100644 --- a/debian.gromox.postinst +++ b/debian.gromox.postinst @@ -10,14 +10,14 @@ set_perms() MODE="$3" FILE="$4" if ! dpkg-statoverride --list "$FILE" >/dev/null 2>&1; then - chown -R "$USER:$GROUP" "$FILE" - chmod -R $MODE "$FILE" + chown -h "$USER:$GROUP" "$FILE" + chmod $MODE "$FILE" fi } xpostinst() { -set_perms root gromox 0770 /etc/gromox || : +set_perms root grommunio 0770 /etc/gromox || : for i in /var/lib/gromox \ /var/lib/gromox/queue \ /var/lib/gromox/queue/cache \ diff --git a/gromox-2.5.tar.asc b/gromox-2.5.tar.asc deleted file mode 100644 index ee6cad7..0000000 --- a/gromox-2.5.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZAUpXwAKCRD3bv5dDCI6 -jzalAQCdA+IPHbuvf0BA8oFH85p4msl3BcnAfnGPNi7kusdLpgEA+eSkTplA1tEu -B9mG9fUHGSpL9/NPPlQePkyVg8OT+QE= -=W3dP ------END PGP SIGNATURE----- diff --git a/gromox-2.5.tar.zst b/gromox-2.5.tar.zst deleted file mode 100644 index 3dd7243..0000000 --- a/gromox-2.5.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:727403ab5c797acd1988bc2b39217b6d352248e42e21261de04cf32d63c57b64 -size 2004450 diff --git a/gromox-2.6.tar.asc b/gromox-2.6.tar.asc new file mode 100644 index 0000000..f425bff --- /dev/null +++ b/gromox-2.6.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZAptDQAKCRD3bv5dDCI6 +j7jRAP9aYAwmu4NVO99HLLVzHLiFPvSxx+SbqnZ4epUaH6XE1AEA0XLNnmnopj5x +sBXUyg8VdIELu4eWuSwgIx7NsewHTQs= +=VFyS +-----END PGP SIGNATURE----- diff --git a/gromox-2.6.tar.zst b/gromox-2.6.tar.zst new file mode 100644 index 0000000..1fdaa50 --- /dev/null +++ b/gromox-2.6.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f6678e95afb6389e22e255d2783a689d737be367aa1c0fb15e2559967f3b626 +size 2002565 diff --git a/gromox.changes b/gromox.changes index f96dab1..312dbc8 100644 --- a/gromox.changes +++ b/gromox.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Mar 9 23:44:07 UTC 2023 - Jan Engelhardt + +- Update to release 2.6 + * exmdb_provider: filter duplicate propids when they occur in + the mailbox, resolving a failure to export (broken) + recipients to MSG, and resolving _one_ instance of OL sync + error 80070057. + * oxvcard: PidLidBusinessCardDisplayDefinition named property + was not assigned the right namespace (PSETID_ADDRESS) + * oxcmail: do not abort export routine if SMIME message is + lacking an SMIME body (just treat it as empty instead) + * oxcical: do not abort export routine if IPM.*.Resp.* has no + attendee + * exmdb_local: perform online lookup of named properties, + resolving vcarduid being erroneously assigned propid 0 + ------------------------------------------------------------------- Sun Mar 5 23:23:42 UTC 2023 - Jan Engelhardt diff --git a/gromox.dsc b/gromox.dsc index 8eabe2d..38898d1 100644 --- a/gromox.dsc +++ b/gromox.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: gromox Architecture: any -Version: 1.24 +Version: 2.6 DEBTRANSFORM-RELEASE: 1 Maintainer: Gromox Homepage: https://gromox.com diff --git a/gromox.spec b/gromox.spec index 6e56cf5..1f6f275 100644 --- a/gromox.spec +++ b/gromox.spec @@ -19,7 +19,7 @@ %define _libexecdir %_prefix/libexec Name: gromox -Version: 2.5 +Version: 2.6 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 From 6e06289f5301aef32aef8ec0d71ef723dd860f9722b77fe73db7070808b3702b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 Mar 2023 09:13:55 +0000 Subject: [PATCH 2/3] - Add 0001-snapshot-safer-parsing-of-snapshot.cfg.patch [boo#1209051] OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=38 --- ...apshot-safer-parsing-of-snapshot.cfg.patch | 32 +++++++++++++++++++ gromox.changes | 6 ++++ gromox.spec | 3 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-snapshot-safer-parsing-of-snapshot.cfg.patch diff --git a/0001-snapshot-safer-parsing-of-snapshot.cfg.patch b/0001-snapshot-safer-parsing-of-snapshot.cfg.patch new file mode 100644 index 0000000..44ab01b --- /dev/null +++ b/0001-snapshot-safer-parsing-of-snapshot.cfg.patch @@ -0,0 +1,32 @@ +From 61b4c3b06c260fcc3d5c13cf455ea919e34d3cc8 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 13 Mar 2023 07:09:08 +0100 +Subject: [PATCH] snapshot: safer parsing of snapshot.cfg + +--- + tools/gromox-snapshot | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git tools/gromox-snapshot tools/gromox-snapshot +index 44dc904dd..0fe3fac78 100755 +--- tools/gromox-snapshot ++++ tools/gromox-snapshot +@@ -9,7 +9,14 @@ retention_hours=0 + subvolume_root="/var/lib/gromox" + snapshot_archive="/var/lib/gromox-snapshots" + if [ -e /etc/gromox/snapshot.cfg ]; then +- . /etc/gromox/snapshot.cfg ++ str=$(awk -F= '{if($1=="subvolume_root"){print$2}}' /etc/gromox/snapshot.cfg) ++ if [ -n "$str" ]; then ++ subvolume_root="$str" ++ fi ++ str=$(awk -F= '{if($1=="snapshot_archive"){print$2}}' /etc/gromox/snapshot.cfg) ++ if [ -n "$str" ]; then ++ snapshot_archive="$str" ++ fi + fi + DB="$subvolume_root" + S="$snapshot_archive" +-- +2.39.2 + diff --git a/gromox.changes b/gromox.changes index 312dbc8..1d10529 100644 --- a/gromox.changes +++ b/gromox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 13 09:13:31 UTC 2023 - Jan Engelhardt + +- Add 0001-snapshot-safer-parsing-of-snapshot.cfg.patch + [boo#1209051] + ------------------------------------------------------------------- Thu Mar 9 23:44:07 UTC 2023 - Jan Engelhardt diff --git a/gromox.spec b/gromox.spec index 1f6f275..496d1d9 100644 --- a/gromox.spec +++ b/gromox.spec @@ -28,6 +28,7 @@ URL: https://grommunio.com/ Source: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.zst Source2: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.asc Source8: %name.keyring +Patch1: 0001-snapshot-safer-parsing-of-snapshot.cfg.patch BuildRequires: automake >= 1.11 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -115,7 +116,7 @@ grommunio-web. The grommunio appliance ships these essentials and has a ready-to-run installation of Gromox. %prep -%autosetup -p1 +%autosetup -p0 %build autoreconf -fi From 24be27798a843969bef4874fbbe19c350f65f62ac87ce6b55b74d443fd541ce0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 Mar 2023 12:39:13 +0000 Subject: [PATCH 3/3] - Updated directory permissions OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=39 --- debian.gromox.postinst | 8 +++++--- gromox.changes | 1 + gromox.spec | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian.gromox.postinst b/debian.gromox.postinst index d356906..b918e31 100644 --- a/debian.gromox.postinst +++ b/debian.gromox.postinst @@ -17,18 +17,20 @@ set_perms() xpostinst() { -set_perms root grommunio 0770 /etc/gromox || : +set_perms grommunio gromox 0755 /etc/gromox || : for i in /var/lib/gromox \ + /var/lib/gromox/domain \ + /var/lib/gromox/user \ /var/lib/gromox/queue \ /var/lib/gromox/queue/cache \ /var/lib/gromox/queue/clone \ /var/lib/gromox/queue/insulation \ /var/lib/gromox/queue/mess \ /var/lib/gromox/queue/save \ - /var/lib/gromox/queue/timer \ - /var/log/gromox; do + /var/lib/gromox/queue/timer; do set_perms gromox gromox 0770 "$i" || : done +set_perms gromox gromox 0750 /var/log/gromox || : # %post if test -x /usr/bin/systemd-tmpfiles; then diff --git a/gromox.changes b/gromox.changes index 1d10529..5f1f272 100644 --- a/gromox.changes +++ b/gromox.changes @@ -3,6 +3,7 @@ Mon Mar 13 09:13:31 UTC 2023 - Jan Engelhardt - Add 0001-snapshot-safer-parsing-of-snapshot.cfg.patch [boo#1209051] +- Updated directory permissions ------------------------------------------------------------------- Thu Mar 9 23:44:07 UTC 2023 - Jan Engelhardt diff --git a/gromox.spec b/gromox.spec index 496d1d9..8734cc0 100644 --- a/gromox.spec +++ b/gromox.spec @@ -226,9 +226,9 @@ fi %files %_sysconfdir/php* -# Group write permission is exercised by grommunio-admin-api. -# pam.cfg needs to be readable by all -%attr(0775,root,grommunio) %dir %_sysconfdir/%name/ +# grommunio permission is exercised by grommunio-admin-api. +# pam.cfg needs to be readable by all (hence d0755). +%attr(0755,grommunio,gromox) %dir %_sysconfdir/%name/ %_sbindir/gromox-* %_libdir/*.so.* %_libdir/%name/ @@ -240,7 +240,7 @@ fi %_tmpfilesdir/*.conf %_unitdir/* %attr(0770,gromox,gromox) /var/lib/gromox/ -%attr(0770,gromox,gromox) /var/log/gromox/ +%attr(0750,gromox,gromox) /var/log/gromox/ %if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1550 %dir %_libexecdir %endif