From 6ae3baf74c1f22632415311b04982b99548a354e289618bde98d5bb33fa917fe Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 24 Mar 2023 01:14:38 +0000 Subject: [PATCH] - Update to release 2.7 OBS-URL: https://build.opensuse.org/package/show/server:mail/gromox?expand=0&rev=43 --- ...ld-resolve-compile-error-with-gcc-13.patch | 23 ------------- ...apshot-safer-parsing-of-snapshot.cfg.patch | 32 ------------------- gromox-2.6.tar.asc | 7 ---- gromox-2.6.tar.zst | 3 -- gromox-2.7.tar.asc | 7 ++++ gromox-2.7.tar.zst | 3 ++ gromox.changes | 13 ++++++++ gromox.spec | 4 +-- 8 files changed, 24 insertions(+), 68 deletions(-) delete mode 100644 0001-build-resolve-compile-error-with-gcc-13.patch delete mode 100644 0001-snapshot-safer-parsing-of-snapshot.cfg.patch delete mode 100644 gromox-2.6.tar.asc delete mode 100644 gromox-2.6.tar.zst create mode 100644 gromox-2.7.tar.asc create mode 100644 gromox-2.7.tar.zst diff --git a/0001-build-resolve-compile-error-with-gcc-13.patch b/0001-build-resolve-compile-error-with-gcc-13.patch deleted file mode 100644 index f7141aa..0000000 --- a/0001-build-resolve-compile-error-with-gcc-13.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 34d37b8d49dbc8e8733372ba97333af1ecff1f0e Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 20 Mar 2023 21:54:33 +0100 -Subject: [PATCH] build: resolve compile error with gcc-13 - -include/gromox/authmgr.hpp:42:9: error: 'uint8_t' does not name a type ---- - include/gromox/authmgr.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git include/gromox/authmgr.hpp include/gromox/authmgr.hpp -index 623cc8a39..39e58c68b 100644 ---- include/gromox/authmgr.hpp -+++ include/gromox/authmgr.hpp -@@ -1,4 +1,5 @@ - #pragma once -+#include - #include - - /** --- -2.40.0 - diff --git a/0001-snapshot-safer-parsing-of-snapshot.cfg.patch b/0001-snapshot-safer-parsing-of-snapshot.cfg.patch deleted file mode 100644 index 44ab01b..0000000 --- a/0001-snapshot-safer-parsing-of-snapshot.cfg.patch +++ /dev/null @@ -1,32 +0,0 @@ -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-2.6.tar.asc b/gromox-2.6.tar.asc deleted file mode 100644 index f425bff..0000000 --- a/gromox-2.6.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------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 deleted file mode 100644 index 1fdaa50..0000000 --- a/gromox-2.6.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f6678e95afb6389e22e255d2783a689d737be367aa1c0fb15e2559967f3b626 -size 2002565 diff --git a/gromox-2.7.tar.asc b/gromox-2.7.tar.asc new file mode 100644 index 0000000..5cb2b24 --- /dev/null +++ b/gromox-2.7.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZBz3/gAKCRD3bv5dDCI6 +jxCRAQD1K3nd0kAv41ScGe7wKCqOzRsDz7bJFJDeTNgpsKOZyAD9EIleJqjydywO +tQSZwaz1Qf+iMpqbq1uFEQ/5Z4X4YAU= +=u503 +-----END PGP SIGNATURE----- diff --git a/gromox-2.7.tar.zst b/gromox-2.7.tar.zst new file mode 100644 index 0000000..aa999f7 --- /dev/null +++ b/gromox-2.7.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d727a5be2d5e8f11d7d7eab7a47f824c014072b112471140b076147828f02abc +size 2008952 diff --git a/gromox.changes b/gromox.changes index 68524eb..e1aca26 100644 --- a/gromox.changes +++ b/gromox.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 24 01:13:00 UTC 2023 - Jan Engelhardt + +- Update to release 2.7 + * exmdb_provider: default to mbox_contention_reject=0 + * zcore: make mapi_message_imtoinet operate on message instances, + not messages + * oxcmail: do not fail exporting DSNs with unresolvable addresses + * oxcical: do not fail exporting calendar objects with + unresolvable addresses +- Delete 0001-build-resolve-compile-error-with-gcc-13.patch, + 0001-snapshot-safer-parsing-of-snapshot.cfg.patch (merged) + ------------------------------------------------------------------- Mon Mar 20 21:24:52 UTC 2023 - Jan Engelhardt diff --git a/gromox.spec b/gromox.spec index f7d55ee..0803d23 100644 --- a/gromox.spec +++ b/gromox.spec @@ -19,7 +19,7 @@ %define _libexecdir %_prefix/libexec Name: gromox -Version: 2.6 +Version: 2.7 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 @@ -28,8 +28,6 @@ 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 -Patch2: 0001-build-resolve-compile-error-with-gcc-13.patch BuildRequires: automake >= 1.11 BuildRequires: fdupes BuildRequires: gcc-c++