Accepting request 1084206 from server:mail

- Update to snapshot 3.2.43.7ebf7d9

OBS-URL: https://build.opensuse.org/request/show/1084206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grommunio-web?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2023-05-03 10:56:37 +00:00 committed by Git OBS Bridge
commit 33b4307b79
10 changed files with 100 additions and 66 deletions

View File

@ -4,7 +4,6 @@
<param name="url">https://github.com/grommunio/grommunio-web</param> <param name="url">https://github.com/grommunio/grommunio-web</param>
<param name="filename">grommunio-web</param> <param name="filename">grommunio-web</param>
<param name="revision">master</param> <param name="revision">master</param>
<param name="parent-tag">grommunio-web-3.1</param>
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">grommunio-web-?(.*)</param> <param name="versionrewrite-pattern">grommunio-web-?(.*)</param>
</service> </service>

View File

@ -1,4 +1,4 @@
grommunio-web (3.1.182.52d9180) unstable; urgency=low grommunio-web (0.1.0) unstable; urgency=low
* Current release * Current release

View File

@ -8,11 +8,21 @@ Standards-Version: 3.9.4
Package: grommunio-web Package: grommunio-web
Architecture: all Architecture: all
Section: web Section: web
Depends: system-user-grommunio, ${misc:Depends}, gromox (>= 1.27), php-bcmath, Depends: system-user-groweb, ${misc:Depends}, gromox (>= 1.27), php-bcmath,
php-curl, php-gd, php-iconv, php-json, php-mbstring, php-curl, php-gd, php-iconv, php-json, php-mbstring,
php-sqlite3, php-sysvshm, php-xml, php-zip, mapi-header-php, ${dist:Depends} php-sqlite3, php-sysvshm, php-xml, php-zip, mapi-header-php, ${dist:Depends},
Provides: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual, grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems, grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications, grommunio-web-plugin-filepreviewer system-user-grommunio (>= 3)
Conflicts: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual, grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems, grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications, grommunio-web-plugin-filepreviewer Provides: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual,
Replaces: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual, grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems, grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications, grommunio-web-plugin-filepreviewer grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems,
grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications,
grommunio-web-plugin-filepreviewer
Conflicts: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual,
grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems,
grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications,
grommunio-web-plugin-filepreviewer
Replaces: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual,
grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems,
grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications,
grommunio-web-plugin-filepreviewer
Description: Web access for grommunio Description: Web access for grommunio
Main web application for grommunio Main web application for grommunio

View File

@ -1,8 +1,14 @@
#!/bin/sh #!/bin/sh
chmod 0750 /var/log/grommunio chmod 0750 /var/log/grommunio
mkdir -p /var/lib/grommunio-web/tmp /var/lib/grommunio-web/sqlite-index mkdir -p /var/lib/grommunio-web/tmp /var/lib/grommunio-web/sqlite-index
chown -Rh groweb:groweb /var/lib/grommunio-web chown -h groweb:groweb /var/lib/grommunio-web
chmod 0770 /var/lib/grommunio-web chmod 0770 /var/lib/grommunio-web /var/lib/grommunio-web/tmp \
chmod 0775 /var/lib/grommunio-web/tmp /var/lib/grommunio-web/sqlite-index /var/lib/grommunio-web/sqlite-index /var/lib/grommunio-web/sqlite-session
# clear translation caches # clear translation caches
ipcrm -M 0x950412de 2>/dev/null || : runuser -u groweb -- ipcrm -M 0x950412DE 2>/dev/null || :
# reload nginx and restart fpm as this package ships config snippets
# reloading is not sufficient especially for php-fpm as it does not
# create the socket with the appropriate permissions
systemctl list-units --plain --no-legend --quiet "php*fpm.service" | \
awk '{print$1}' | xargs /usr/bin/systemctl try-restart
/usr/bin/systemctl reload nginx.service

View File

@ -37,11 +37,14 @@ override_dh_auto_install:
mkdir -pv "${INSTDIR}/usr/share/grommunio-common/nginx/locations.d" mkdir -pv "${INSTDIR}/usr/share/grommunio-common/nginx/locations.d"
install -Dpvm 644 build/grommunio-web.conf "${INSTDIR}/usr/share/grommunio-common/nginx/locations.d/" install -Dpvm 644 build/grommunio-web.conf "${INSTDIR}/usr/share/grommunio-common/nginx/locations.d/"
mkdir -pv "${INSTDIR}/usr/share/grommunio-common/nginx/upstreams.d" mkdir -pv "${INSTDIR}/usr/share/grommunio-common/nginx/upstreams.d"
sed -i "s#/run/php-fpm/#/run/php/#g" build/grommunio-web-upstream.conf
install -Dpvm 644 build/grommunio-web-upstream.conf "${INSTDIR}/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf" install -Dpvm 644 build/grommunio-web-upstream.conf "${INSTDIR}/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf"
# PHP-FPM # PHP-FPM
mkdir -pv "${INSTDIR}/${phpdir}/fpm/pool.d" mkdir -pv "${INSTDIR}/${phpdir}/fpm/pool.d" "${INSTDIR}/usr/lib/sysusers.d"
sed -i "s#/run/php-fpm/#/run/php/#g" build/pool-grommunio-web.conf
install -Dpvm 644 build/pool-grommunio-web.conf "${INSTDIR}/${phpdir}/fpm/pool.d/" install -Dpvm 644 build/pool-grommunio-web.conf "${INSTDIR}/${phpdir}/fpm/pool.d/"
cp -a build/sysuser.conf "${INSTDIR}/usr/lib/sysusers.d/grommunio-web.conf"
# web config # web config
mv -v $(INSTDIR)$(WABASE)/config.php.dist $(INSTDIR)$(WACONFBASE)/config.php mv -v $(INSTDIR)$(WABASE)/config.php.dist $(INSTDIR)$(WACONFBASE)/config.php

View File

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

View File

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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Apr 21 08:37:15 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update to snapshot 3.2.43.7ebf7d9
* Fix all-day events spanning over two days
* Change default sort order for search results
* rules: do not filter shared private stores
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 10:19:31 UTC 2023 - Jan Engelhardt <jengelh@inai.de> Wed Jan 25 10:19:31 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -3,7 +3,7 @@ Source: grommunio-web
Binary: grommunio-web Binary: grommunio-web
Architecture: all Architecture: all
DEBTRANSFORM-RELEASE: 1 DEBTRANSFORM-RELEASE: 1
Version: 3.1.182.52d9180 Version: 3.2.43.7ebf7d9
Maintainer: grommunio <dev@grommunio.com> Maintainer: grommunio <dev@grommunio.com>
Homepage: https://grommunio.com/ Homepage: https://grommunio.com/
Standards-Version: 3.9.4 Standards-Version: 3.9.4

View File

@ -16,12 +16,12 @@
# #
%if 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version} %if 0%{?rhel} || 0%{?fedora_version}
%global __brp_mangle_shebangs_exclude_from sabredav|vobject|generate_vcards %global __brp_mangle_shebangs_exclude_from sabredav|vobject|generate_vcards
%endif %endif
Name: grommunio-web Name: grommunio-web
Version: 3.1.182.52d9180 Version: 3.2.43.7ebf7d9
Release: 0 Release: 0
Summary: Web client for access to grommunio features from the web Summary: Web client for access to grommunio features from the web
License: AGPL-3.0-or-later AND GPL-3.0-only AND LGPL-2.1-only AND MIT License: AGPL-3.0-or-later AND GPL-3.0-only AND LGPL-2.1-only AND MIT
@ -29,49 +29,19 @@ Group: Productivity/Networking/Email/Clients
URL: http://www.grommunio.com/ URL: http://www.grommunio.com/
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 %if 0%{?suse_version} >= 1590 || 0%{?sle_version} >= 150400
%define phpdir /etc/php8 %define fpmdir /etc/php8/fpm/php-fpm.d
BuildRequires: php8-gettext
%else
# i.e. SUSE15, RHEL, etc.
%define phpdir /etc/php7
%endif %endif
%if 0%{?sle_version} && 0%{?sle_version} < 150400 %if 0%{?sle_version} && 0%{?sle_version} < 150400
BuildRequires: php7-gettext %define fpmdir /etc/php7/fpm/php-fpm.d
BuildRequires: php7-json
%endif %endif
%if 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora_version}
BuildRequires: fdupes %define fpmdir /etc/php-fpm.d
BuildRequires: java >= 1.9.0
BuildRequires: java-devel >= 1.9.0
%else
BuildRequires: java-11-openjdk-devel
BuildRequires: php-cli
BuildRequires: php-json
%endif %endif
BuildRequires: mapi-header-php
BuildRequires: php
BuildRequires: xz
%if 0%{?suse_version} >= 1220
BuildRequires: libxml2-tools
%else
BuildRequires: libxml2
%endif
BuildArch: noarch
Requires(pre): user(groweb) BuildArch: noarch
Requires: gromox >= 1.27 %if 0%{?suse_version} >= 1590 || 0%{?sle_version} >= 150400
Requires: mapi-header-php BuildRequires: php8-gettext
%if 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version}
Requires: php-bcmath
Requires: php-common
Requires: php-ctype
Requires: php-curl
Requires: php-mbstring
Requires: php-sodium
Requires: php-sqlite3
%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
Requires: php8-bcmath Requires: php8-bcmath
Requires: php8-ctype Requires: php8-ctype
Requires: php8-curl Requires: php8-curl
@ -87,6 +57,8 @@ Requires: php8-zip
Requires: php8-zlib Requires: php8-zlib
%endif %endif
%if 0%{?sle_version} && 0%{?sle_version} < 150400 %if 0%{?sle_version} && 0%{?sle_version} < 150400
BuildRequires: php7-gettext
BuildRequires: php7-json
Requires: php7-bcmath Requires: php7-bcmath
Requires: php7-ctype Requires: php7-ctype
Requires: php7-curl Requires: php7-curl
@ -102,6 +74,40 @@ Requires: php7-sysvshm
Requires: php7-zip Requires: php7-zip
Requires: php7-zlib Requires: php7-zlib
%endif %endif
%if 0%{?rhel} || 0%{?fedora_version}
BuildRequires: php-gettext
Requires: php-bcmath
Requires: php-common
Requires: php-ctype
Requires: php-curl
Requires: php-gd
Requires: php-mbstring
Requires: php-sodium
Requires: php-sqlite3
Requires: php-xml
%endif
Requires(pre): user(groweb)
Requires: gromox >= 1.27
BuildRequires: mapi-header-php
Requires: mapi-header-php
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: java >= 1.9.0
BuildRequires: java-devel >= 1.9.0
%else
BuildRequires: java-11-openjdk-devel
BuildRequires: php-cli
BuildRequires: php-json
%endif
BuildRequires: php
BuildRequires: xz
%if 0%{?suse_version} >= 1500
BuildRequires: libxml2-tools
%else
BuildRequires: libxml2
%endif
%define langdir %_datadir/%name/server/language %define langdir %_datadir/%name/server/language
%define plugindir %_datadir/%name/plugins %define plugindir %_datadir/%name/plugins
@ -115,7 +121,7 @@ through a web browser.
%prep %prep
%autosetup -p1 %autosetup -p1
find . -type f "(" -name "*.js" -o -name "*.php" ")" \ find . -type f "(" -name "*.js" -o -name "*.php" ")" \
-exec chmod a-x "{}" "+"; -exec chmod a-x "{}" "+"
# Set git revision # Set git revision
echo "%version-%release" >version echo "%version-%release" >version
echo "%version-%release" | sha1sum | cut -b 1-8 >cachebuster echo "%version-%release" | sha1sum | cut -b 1-8 >cachebuster
@ -138,8 +144,8 @@ mkdir -pv "$b/usr/share/grommunio-common/nginx/upstreams.d"
install -Dpvm 644 build/grommunio-web-upstream.conf "$b/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf" install -Dpvm 644 build/grommunio-web-upstream.conf "$b/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf"
# PHP-FPM # PHP-FPM
mkdir -pv "$b/%phpdir/fpm/php-fpm.d/" mkdir -pv "$b/%fpmdir"
install -Dpvm 644 build/pool-grommunio-web.conf "$b/%phpdir/fpm/php-fpm.d/pool-grommunio-web.conf" install -Dpvm 644 build/pool-grommunio-web.conf "$b/%fpmdir/pool-grommunio-web.conf"
# web config # web config
mkdir -pv "$b/%_sysconfdir/grommunio-web" mkdir -pv "$b/%_sysconfdir/grommunio-web"
@ -171,13 +177,15 @@ done
%post %post
# clear translation caches # clear translation caches
runuser -u groweb -- ipcrm -M 0x950412DE 2>/dev/null || : runuser -u groweb -- ipcrm -M 0x950412DE 2>/dev/null || :
# reload nginx and restart fpm as this package ships config snippets
# reloading is not sufficient especially for php-fpm as it does not
# create the socket with the appropriate permissions
/usr/bin/systemctl try-restart php-fpm.service 2>/dev/null || :
/usr/bin/systemctl reload nginx.service 2>/dev/null || :
%files %files
%dir %_sysconfdir/grommunio-web %dir %_sysconfdir/grommunio-web
%dir %phpdir %_sysconfdir/php*
%dir %phpdir/fpm
%dir %phpdir/fpm/php-fpm.d/
%attr(0640,root,root) %phpdir/fpm/php-fpm.d/pool-grommunio-web.conf
%config(noreplace) %attr(0644,root,root) %_sysconfdir/grommunio-web/config-archive.php %config(noreplace) %attr(0644,root,root) %_sysconfdir/grommunio-web/config-archive.php
%config(noreplace) %attr(0644,root,root) %_sysconfdir/grommunio-web/config-chat.php %config(noreplace) %attr(0644,root,root) %_sysconfdir/grommunio-web/config-chat.php
%config(noreplace) %attr(0644,root,root) %_sysconfdir/grommunio-web/config-desktopnotifications.php %config(noreplace) %attr(0644,root,root) %_sysconfdir/grommunio-web/config-desktopnotifications.php
@ -196,9 +204,9 @@ runuser -u groweb -- ipcrm -M 0x950412DE 2>/dev/null || :
%dir %_datadir/grommunio-common/nginx/upstreams.d/ %dir %_datadir/grommunio-common/nginx/upstreams.d/
%_datadir/grommunio-common/nginx/upstreams.d/grommunio-web.conf %_datadir/grommunio-common/nginx/upstreams.d/grommunio-web.conf
%dir %attr(0770,groweb,groweb) /var/lib/grommunio-web %dir %attr(0770,groweb,groweb) /var/lib/grommunio-web
%dir %attr(0775,groweb,groweb) /var/lib/grommunio-web/tmp %dir %attr(0770,groweb,groweb) /var/lib/grommunio-web/tmp
%dir %attr(0775,groweb,groweb) /var/lib/grommunio-web/sqlite-index %dir %attr(0770,groweb,groweb) /var/lib/grommunio-web/sqlite-index
%dir %attr(0775,groweb,groweb) /var/lib/grommunio-web/session %dir %attr(0770,groweb,groweb) /var/lib/grommunio-web/session
%dir %_datadir/%name %dir %_datadir/%name
%exclude %_datadir/%name/LICENSE.txt %exclude %_datadir/%name/LICENSE.txt