Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grommunio-web for openSUSE:Factory checked in at 2023-05-03 12:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grommunio-web (Old) and /work/SRC/openSUSE:Factory/.grommunio-web.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grommunio-web" Wed May 3 12:56:37 2023 rev:3 rq:1084206 version:3.2.43.7ebf7d9 Changes: -------- --- /work/SRC/openSUSE:Factory/grommunio-web/grommunio-web.changes 2023-01-26 14:00:45.688898386 +0100 +++ /work/SRC/openSUSE:Factory/.grommunio-web.new.1533/grommunio-web.changes 2023-05-03 12:56:55.727709641 +0200 @@ -1,0 +2,8 @@ +Fri Apr 21 08:37:15 UTC 2023 - Jan Engelhardt <jeng...@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 + +------------------------------------------------------------------- Old: ---- grommunio-web-3.1.182.52d9180.tar.xz New: ---- grommunio-web-3.2.43.7ebf7d9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grommunio-web.spec ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.523714319 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.527714342 +0200 @@ -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 %endif Name: grommunio-web -Version: 3.1.182.52d9180 +Version: 3.2.43.7ebf7d9 Release: 0 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 @@ -29,49 +29,19 @@ URL: http://www.grommunio.com/ Source: %name-%version.tar.xz -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 -%define phpdir /etc/php8 -BuildRequires: php8-gettext -%else -# i.e. SUSE15, RHEL, etc. -%define phpdir /etc/php7 +%if 0%{?suse_version} >= 1590 || 0%{?sle_version} >= 150400 +%define fpmdir /etc/php8/fpm/php-fpm.d %endif %if 0%{?sle_version} && 0%{?sle_version} < 150400 -BuildRequires: php7-gettext -BuildRequires: php7-json -%endif -%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 +%define fpmdir /etc/php7/fpm/php-fpm.d %endif -BuildRequires: mapi-header-php -BuildRequires: php -BuildRequires: xz -%if 0%{?suse_version} >= 1220 -BuildRequires: libxml2-tools -%else -BuildRequires: libxml2 +%if 0%{?rhel} || 0%{?fedora_version} +%define fpmdir /etc/php-fpm.d %endif -BuildArch: noarch -Requires(pre): user(groweb) -Requires: gromox >= 1.27 -Requires: mapi-header-php -%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 +BuildArch: noarch +%if 0%{?suse_version} >= 1590 || 0%{?sle_version} >= 150400 +BuildRequires: php8-gettext Requires: php8-bcmath Requires: php8-ctype Requires: php8-curl @@ -87,6 +57,8 @@ Requires: php8-zlib %endif %if 0%{?sle_version} && 0%{?sle_version} < 150400 +BuildRequires: php7-gettext +BuildRequires: php7-json Requires: php7-bcmath Requires: php7-ctype Requires: php7-curl @@ -102,6 +74,40 @@ Requires: php7-zip Requires: php7-zlib %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 plugindir %_datadir/%name/plugins @@ -115,7 +121,7 @@ %prep %autosetup -p1 find . -type f "(" -name "*.js" -o -name "*.php" ")" \ - -exec chmod a-x "{}" "+"; + -exec chmod a-x "{}" "+" # Set git revision echo "%version-%release" >version echo "%version-%release" | sha1sum | cut -b 1-8 >cachebuster @@ -138,8 +144,8 @@ install -Dpvm 644 build/grommunio-web-upstream.conf "$b/usr/share/grommunio-common/nginx/upstreams.d/grommunio-web.conf" # PHP-FPM -mkdir -pv "$b/%phpdir/fpm/php-fpm.d/" -install -Dpvm 644 build/pool-grommunio-web.conf "$b/%phpdir/fpm/php-fpm.d/pool-grommunio-web.conf" +mkdir -pv "$b/%fpmdir" +install -Dpvm 644 build/pool-grommunio-web.conf "$b/%fpmdir/pool-grommunio-web.conf" # web config mkdir -pv "$b/%_sysconfdir/grommunio-web" @@ -171,13 +177,15 @@ %post # clear translation caches 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 %dir %_sysconfdir/grommunio-web -%dir %phpdir -%dir %phpdir/fpm -%dir %phpdir/fpm/php-fpm.d/ -%attr(0640,root,root) %phpdir/fpm/php-fpm.d/pool-grommunio-web.conf +%_sysconfdir/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-desktopnotifications.php @@ -196,9 +204,9 @@ %dir %_datadir/grommunio-common/nginx/upstreams.d/ %_datadir/grommunio-common/nginx/upstreams.d/grommunio-web.conf %dir %attr(0770,groweb,groweb) /var/lib/grommunio-web -%dir %attr(0775,groweb,groweb) /var/lib/grommunio-web/tmp -%dir %attr(0775,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/tmp +%dir %attr(0770,groweb,groweb) /var/lib/grommunio-web/sqlite-index +%dir %attr(0770,groweb,groweb) /var/lib/grommunio-web/session %dir %_datadir/%name %exclude %_datadir/%name/LICENSE.txt ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.555714507 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.559714530 +0200 @@ -4,7 +4,6 @@ <param name="url">https://github.com/grommunio/grommunio-web</param> <param name="filename">grommunio-web</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="versionrewrite-pattern">grommunio-web-?(.*)</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.579714648 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.583714671 +0200 @@ -1,4 +1,4 @@ -grommunio-web (3.1.182.52d9180) unstable; urgency=low +grommunio-web (0.1.0) unstable; urgency=low * Current release ++++++ debian.control ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.611714836 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.615714859 +0200 @@ -8,12 +8,22 @@ Package: grommunio-web Architecture: all 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-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 -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 + php-sqlite3, php-sysvshm, php-xml, php-zip, mapi-header-php, ${dist:Depends}, + system-user-grommunio (>= 3) +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 +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 Main web application for grommunio ++++++ debian.grommunio-web.postinst ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.663715141 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.667715165 +0200 @@ -1,9 +1,15 @@ #!/bin/sh chmod 0750 /var/log/grommunio mkdir -p /var/lib/grommunio-web/tmp /var/lib/grommunio-web/sqlite-index -chown -Rh groweb:groweb /var/lib/grommunio-web -chmod 0770 /var/lib/grommunio-web -chmod 0775 /var/lib/grommunio-web/tmp /var/lib/grommunio-web/sqlite-index +chown -h groweb:groweb /var/lib/grommunio-web +chmod 0770 /var/lib/grommunio-web /var/lib/grommunio-web/tmp \ + /var/lib/grommunio-web/sqlite-index /var/lib/grommunio-web/sqlite-session # 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 ++++++ debian.rules ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.679715235 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.683715258 +0200 @@ -37,11 +37,14 @@ 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/" 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" # 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/" + cp -a build/sysuser.conf "${INSTDIR}/usr/lib/sysusers.d/grommunio-web.conf" # web config mv -v $(INSTDIR)$(WABASE)/config.php.dist $(INSTDIR)$(WACONFBASE)/config.php ++++++ grommunio-web-3.1.182.52d9180.tar.xz -> grommunio-web-3.2.43.7ebf7d9.tar.xz ++++++ /work/SRC/openSUSE:Factory/grommunio-web/grommunio-web-3.1.182.52d9180.tar.xz /work/SRC/openSUSE:Factory/.grommunio-web.new.1533/grommunio-web-3.2.43.7ebf7d9.tar.xz differ: char 15, line 1 ++++++ grommunio-web.dsc ++++++ --- /var/tmp/diff_new_pack.QjrCsh/_old 2023-05-03 12:56:56.735715564 +0200 +++ /var/tmp/diff_new_pack.QjrCsh/_new 2023-05-03 12:56:56.735715564 +0200 @@ -3,7 +3,7 @@ Binary: grommunio-web Architecture: all DEBTRANSFORM-RELEASE: 1 -Version: 3.1.182.52d9180 +Version: 3.2.43.7ebf7d9 Maintainer: grommunio <d...@grommunio.com> Homepage: https://grommunio.com/ Standards-Version: 3.9.4