SHA256
1
0
forked from pool/gromox

Accepting request 1071127 from server:mail

- Update to release 2.6

OBS-URL: https://build.opensuse.org/request/show/1071127
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gromox?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2023-03-14 17:16:14 +00:00 committed by Git OBS Bridge
commit 0d24f6a9f3
10 changed files with 83 additions and 23 deletions

View File

@ -0,0 +1,32 @@
From 61b4c3b06c260fcc3d5c13cf455ea919e34d3cc8 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
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

View File

@ -10,7 +10,8 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, Depends: ${misc:Depends}, ${shlibs:Depends},
php-cli, php-fpm, php-mysql, php-simplexml, php-soap, 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 Provides: php-mapi-gromox
Description: Groupware server (backend) with RPCH, IMAP and Z-MAPI support Description: Groupware server (backend) with RPCH, IMAP and Z-MAPI support
. .

View File

@ -10,25 +10,27 @@ set_perms()
MODE="$3" MODE="$3"
FILE="$4" FILE="$4"
if ! dpkg-statoverride --list "$FILE" >/dev/null 2>&1; then if ! dpkg-statoverride --list "$FILE" >/dev/null 2>&1; then
chown -R "$USER:$GROUP" "$FILE" chown -h "$USER:$GROUP" "$FILE"
chmod -R $MODE "$FILE" chmod $MODE "$FILE"
fi fi
} }
xpostinst() xpostinst()
{ {
set_perms root gromox 0770 /etc/gromox || : set_perms grommunio gromox 0755 /etc/gromox || :
for i in /var/lib/gromox \ for i in /var/lib/gromox \
/var/lib/gromox/domain \
/var/lib/gromox/user \
/var/lib/gromox/queue \ /var/lib/gromox/queue \
/var/lib/gromox/queue/cache \ /var/lib/gromox/queue/cache \
/var/lib/gromox/queue/clone \ /var/lib/gromox/queue/clone \
/var/lib/gromox/queue/insulation \ /var/lib/gromox/queue/insulation \
/var/lib/gromox/queue/mess \ /var/lib/gromox/queue/mess \
/var/lib/gromox/queue/save \ /var/lib/gromox/queue/save \
/var/lib/gromox/queue/timer \ /var/lib/gromox/queue/timer; do
/var/log/gromox; do
set_perms gromox gromox 0770 "$i" || : set_perms gromox gromox 0770 "$i" || :
done done
set_perms gromox gromox 0750 /var/log/gromox || :
# %post # %post
if test -x /usr/bin/systemd-tmpfiles; then if test -x /usr/bin/systemd-tmpfiles; then

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZAUpXwAKCRD3bv5dDCI6
jzalAQCdA+IPHbuvf0BA8oFH85p4msl3BcnAfnGPNi7kusdLpgEA+eSkTplA1tEu
B9mG9fUHGSpL9/NPPlQePkyVg8OT+QE=
=W3dP
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:727403ab5c797acd1988bc2b39217b6d352248e42e21261de04cf32d63c57b64
size 2004450

7
gromox-2.6.tar.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZAptDQAKCRD3bv5dDCI6
j7jRAP9aYAwmu4NVO99HLLVzHLiFPvSxx+SbqnZ4epUaH6XE1AEA0XLNnmnopj5x
sBXUyg8VdIELu4eWuSwgIx7NsewHTQs=
=VFyS
-----END PGP SIGNATURE-----

3
gromox-2.6.tar.zst Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f6678e95afb6389e22e255d2783a689d737be367aa1c0fb15e2559967f3b626
size 2002565

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Mon Mar 13 09:13:31 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-snapshot-safer-parsing-of-snapshot.cfg.patch
[boo#1209051]
- Updated directory permissions
-------------------------------------------------------------------
Thu Mar 9 23:44:07 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- 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 <jengelh@inai.de> Sun Mar 5 23:23:42 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
Format: 1.0 Format: 1.0
Source: gromox Source: gromox
Architecture: any Architecture: any
Version: 1.24 Version: 2.6
DEBTRANSFORM-RELEASE: 1 DEBTRANSFORM-RELEASE: 1
Maintainer: Gromox <null@gromox.com> Maintainer: Gromox <null@gromox.com>
Homepage: https://gromox.com Homepage: https://gromox.com

View File

@ -19,7 +19,7 @@
%define _libexecdir %_prefix/libexec %define _libexecdir %_prefix/libexec
Name: gromox Name: gromox
Version: 2.5 Version: 2.6
Release: 0 Release: 0
Summary: Groupware server backend with RPC, IMAP,POP3, PHP-MAPI support 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 License: AGPL-3.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later
@ -28,6 +28,7 @@ URL: https://grommunio.com/
Source: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.zst 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 Source2: https://github.com/grommunio/gromox/releases/download/%name-%version/%name-%version.tar.asc
Source8: %name.keyring Source8: %name.keyring
Patch1: 0001-snapshot-safer-parsing-of-snapshot.cfg.patch
BuildRequires: automake >= 1.11 BuildRequires: automake >= 1.11
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -115,7 +116,7 @@ grommunio-web. The grommunio appliance ships these essentials and has a
ready-to-run installation of Gromox. ready-to-run installation of Gromox.
%prep %prep
%autosetup -p1 %autosetup -p0
%build %build
autoreconf -fi autoreconf -fi
@ -225,9 +226,9 @@ fi
%files %files
%_sysconfdir/php* %_sysconfdir/php*
# Group write permission is exercised by grommunio-admin-api. # grommunio permission is exercised by grommunio-admin-api.
# pam.cfg needs to be readable by all # pam.cfg needs to be readable by all (hence d0755).
%attr(0775,root,grommunio) %dir %_sysconfdir/%name/ %attr(0755,grommunio,gromox) %dir %_sysconfdir/%name/
%_sbindir/gromox-* %_sbindir/gromox-*
%_libdir/*.so.* %_libdir/*.so.*
%_libdir/%name/ %_libdir/%name/
@ -239,7 +240,7 @@ fi
%_tmpfilesdir/*.conf %_tmpfilesdir/*.conf
%_unitdir/* %_unitdir/*
%attr(0770,gromox,gromox) /var/lib/gromox/ %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 %if 0%{?suse_version} >= 1500 && 0%{?suse_version} < 1550
%dir %_libexecdir %dir %_libexecdir
%endif %endif