commit kopano for openSUSE:Factory
Hello community, here is the log from the commit of package kopano for openSUSE:Factory checked in at 2018-05-30 12:23:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopano (Old) and /work/SRC/openSUSE:Factory/.kopano.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kopano" Wed May 30 12:23:19 2018 rev:13 rq:612879 version:8.6.1.99 Changes: -------- --- /work/SRC/openSUSE:Factory/kopano/kopano.changes 2018-03-20 21:55:47.711543635 +0100 +++ /work/SRC/openSUSE:Factory/.kopano.new/kopano.changes 2018-05-30 12:29:58.432554434 +0200 @@ -1,0 +2,49 @@ +Mon May 28 22:38:07 UTC 2018 - jengelh@inai.de + +- Update to new upstream snapshot 8.6.1.99 + * Fixes: + * Fix crash due to ODR violation + * libserver: drop all remains of clientupdatestatus table + * gateway: fix crash when new client immediately disconnects + * mapi: avoid garbage at end of malformed RTF + * Enhancements: + * kopano-dbadm: new diagnostics program for offline database + modification + * kopano-server: allow use of --ignore-da to skip schema update + that won't complete + * build: support ICU 61 + * propmap: expose kopanoHidden LDAP attribute as PR_EC_AB_HIDDEN + * Changes: + * daemons: disable SSL renegotiation for OpenSSL 1.1+ + * server: invalid port strings are now rejected + * client: quiesce verbose logon failure messages + * boot: set default and UTF-8 locale for services + +------------------------------------------------------------------- +Fri Apr 6 10:11:29 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 8.6.1 + * Fixes: + * backup: ignore error when server cannot find attachments + * server: search folders were not loaded on startup + * monitor: handle absence of config file + * dagent: do not treat -d option like -c was given + * server: fix a case where an old kopano-server would refuse to + start with a newer database even if --ignore-da was used + * server: fix server/client getting slower when named properties + are created multiple times [KC-1108] + * client: fix data corruption when server returns high named + property IDs [KC-1107] + * Changes (generally requires admin action): + * inetmapi: stop treating empty indexed_headers as "X-*" + * dagent: cease indexing X-Headers by default + * dagent: turn indexed_headers from a prefix list into an + exact-match set + * If you need certain e-mail headers copied into named + properties, they MUST be explicitly listed _one by one_ in + dagent.cfg:indexed_headers now. + * Enhancements: + * server: reorder SQL log messages so the error is shown first, + and do say when the message was truncated + +------------------------------------------------------------------- Old: ---- kopanocore-8.6.0.0.tar.xz New: ---- debian.libkcrosie0.install kopanocore-8.6.1.99.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopano.spec ++++++ --- /var/tmp/diff_new_pack.4Tbr63/_old 2018-05-30 12:30:00.068494343 +0200 +++ /var/tmp/diff_new_pack.4Tbr63/_new 2018-05-30 12:30:00.076494049 +0200 @@ -17,14 +17,10 @@ # -%define version_unconverted 8.6.0.0 -# Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif +%define version_unconverted 8.6.1.99 Name: kopano -Version: 8.6.0.0 +Version: 8.6.1.99 Release: 0 Summary: Groupware server suite License: AGPL-3.0-only @@ -50,17 +46,9 @@ BuildRequires: ncurses-devel BuildRequires: openldap2-devel BuildRequires: pam-devel -BuildRequires: popt-devel -%if 0%{?suse_version} > 1320 || %{?is_opensuse} BuildRequires: php7-devel -%else -%if "%_repository" == "RHEL_6_PHP_70" || "%_repository" == "RHEL_7_PHP_70" -BuildRequires: rh-php70-php-devel -%else -BuildRequires: php-devel -%endif -%endif BuildRequires: pkgconfig +BuildRequires: popt-devel #define with_python2 0 #BuildRequires: python-devel >= 2.4 #BuildRequires: python-setuptools @@ -70,6 +58,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %endif +BuildRequires: libtidy-devel BuildRequires: swig BuildRequires: xz BuildRequires: zlib-devel @@ -102,26 +91,15 @@ # Satisfy Requires(pre) for bs_worker's rpmlint run BuildRequires: pwdutils %endif -%if "%_repository" == "RHEL_6" || "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_6_PHP_70" -BuildRequires: devtoolset-7-gcc-c++ -%else -BuildRequires: gcc-c++ >= 4.8 -%endif %if 0%{?suse_version} %define apache_group www %else %define apache_group apache %endif -%if "%_repository" == "RHEL_6_PHP_56" || "%_repository" == "RHEL_7_PHP_56" - %define phpconfig /opt/rh/rh-php56/root/usr/bin/php-config -%else -%if "%_repository" == "RHEL_6_PHP_70" || "%_repository" == "RHEL_7_PHP_70" - %define phpconfig /opt/rh/rh-php70/root/usr/bin/php-config -%else - %define phpconfig php-config -%endif +%if !0%{?kc_phpconfig:1} + %define kc_phpconfig php-config %endif -%define phpextdir %(%phpconfig --extension-dir) +%define phpextdir %(%kc_phpconfig --extension-dir) %description Kopano provides email storage on the server side and brings its own @@ -139,7 +117,7 @@ %description archiver The Kopano Archiver provides a Hierarchical Storage Management (HSM) -solution for the Kopano Core. +solution for Kopano Core. To decrease the database size of your production Kopano server, the Kopano Archiver copies or moves messages to a secondary Kopano @@ -235,6 +213,7 @@ Requires: libkcicalmapi0 = %version-%release Requires: libkcinetmapi0 = %version-%release Requires: libkcmapi0 = %version-%release +Requires: libkcrosie0 = %version-%release Requires: libkcserver0 = %version-%release Requires: libkcsoap0 = %version-%release Requires: libkcssl0 = %version-%release @@ -438,6 +417,11 @@ Summary: Admin command-line utils for Kopano Core Group: Productivity/Networking/Email/Servers Requires: kopano-common = %version +%if 0%{?prefer_python3} +Requires: python3-kopano = %version +%else +Requires: python2-kopano = %version +%endif %description utils Command-line clients to control and check the Kopano server. @@ -467,7 +451,6 @@ %package -n libmapi1 Summary: Kopano's implementation of the Messaging API Group: System/Libraries -Requires: kopano-client >= %version %description -n libmapi1 MAPI allows client programs to become (e-mail) messaging-enabled, @@ -488,6 +471,15 @@ %description -n libkcarchivercore0 Library with shared archiver functionality for Kopano Core. +%package -n libkcrosie0 +Summary: Kopano HTML sanitizer interface +Group: System/Libraries + +%description -n libkcrosie0 +This library contains the API to filter HTML mail using libtidy; +specifically, it contains the definitions which tags and attributes +to retain. + %package -n libkcserver0 Summary: The Kopano Server library Group: System/Libraries @@ -631,6 +623,7 @@ # CO6's ncurses-config is messed up export LIBS="-ltinfo" %endif +echo "kc_phpconfig=%kc_phpconfig" for pyint in %{?with_python3:python3} %{?with_python2:python2}; do %if 0%{?rhel_version} == 600 || 0%{?centos_version} == 600 @@ -649,7 +642,7 @@ --docdir="%_docdir/%name" \ --with-userscript-prefix="%_sysconfdir/kopano/userscripts" \ --with-quotatemplate-prefix="%_sysconfdir/kopano/quotamail" \ - --with-php-config="%phpconfig" --enable-release \ + --with-php-config="%kc_phpconfig" --enable-release \ PYTHON="$(which $pyint)" PYTHON_CFLAGS="$PYTHON_CFLAGS" PYTHON_LIBS="$PYTHON_LIBS" echo "%version" >version @@ -692,12 +685,6 @@ %nil # distro-specifics -%if 0%{?suse_version} -install -Dpm0644 installer/linux/sysconfig.txt "%buildroot/%_fillupdir/sysconfig.kopano" -%endif -%if 0%{?centos_version} || 0%{?fedora_version} -install -Dpm0644 installer/linux/sysconfig.txt "%buildroot/%_sysconfdir/sysconfig/kopano" -%endif %if 0%{?centos_version} == 600 for i in dagent gateway ical monitor presence search server spamd spooler; do install -Dpm0755 "installer/linux/kopano-$i.init.rhel" "%buildroot/%_initddir/kopano-$i" @@ -711,6 +698,8 @@ Environment=LD_LIBRARY_PATH=/opt/rh/rh-php56/root/usr/lib64 Environment=PATH=/usr/local/sbin:/usr/local/bin:/opt/rh/rh-php56/root/usr/sbin:/opt/rh/rh-php56/root/usr/bin:/usr/sbin:/usr/bin EOF +perl -i -pe 's{^#!/usr/bin/php}{#!/opt/rh/rh-php56/root/usr/bin/php}' \ + "$b/%_bindir/kopano-mr-accept" "$b/%_bindir/kopano-mr-process" %endif %if "%_repository" == "RHEL_7_PHP_70" mkdir -p "$b/%_prefix/lib/systemd/system/kopano-dagent.service.d" @@ -720,6 +709,8 @@ Environment=LD_LIBRARY_PATH=/opt/rh/rh-php70/root/usr/lib64 Environment=PATH=/usr/local/sbin:/usr/local/bin:/opt/rh/rh-php70/root/usr/sbin:/opt/rh/rh-php70/root/usr/bin:/usr/sbin:/usr/bin EOF +perl -i -pe 's{^#!/usr/bin/php}{#!/opt/rh/rh-php70/root/usr/bin/php}' \ + "$b/%_bindir/kopano-mr-accept" "$b/%_bindir/kopano-mr-process" %endif %if "%_repository" == "RHEL_7_PHP_71" mkdir -p "$b/%_prefix/lib/systemd/system/kopano-dagent.service.d" @@ -729,6 +720,8 @@ Environment=LD_LIBRARY_PATH=/opt/rh/rh-php71/root/usr/lib64 Environment=PATH=/usr/local/sbin:/usr/local/bin:/opt/rh/rh-php71/root/usr/sbin:/opt/rh/rh-php71/root/usr/bin:/usr/sbin:/usr/bin EOF +perl -i -pe 's{^#!/usr/bin/php}{#!/opt/rh/rh-php71/root/usr/bin/php}' \ + "$b/%_bindir/kopano-mr-accept" "$b/%_bindir/kopano-mr-process" %endif %if 0%{?fdupes:1} @@ -773,15 +766,21 @@ -g kopano -r kopano -s /sbin/nologin %post common -%if 0%{?suse_version} -%fillup_only -%endif chown -Rh kopano:kopano /var/log/kopano 2>/dev/null || : chown kopano:kopano /var/lib/kopano 2>/dev/null || : if [ -x /usr/bin/systemd-tmpfiles ]; then /usr/bin/systemd-tmpfiles --create kopano-tmpfiles.conf || : fi +%triggerpostun common -- kopano-common +if [ "$1" -ne 2 ]; then exit 0; fi +# putback previously existing cfgs after they get untracked once +if [ ! -e "%_sysconfdir/sysconfig/kopano" -a \ + -e "%_sysconfdir/sysconfig/kopano.rpmsave" ]; then + mv -v "%_sysconfdir/sysconfig/kopano.rpmsave" \ + "%_sysconfdir/sysconfig/kopano" +fi + %post contacts -p /sbin/ldconfig %postun contacts -p /sbin/ldconfig @@ -1109,6 +1108,8 @@ %postun -n libkcarchiver0 -p /sbin/ldconfig %post -n libkcarchivercore0 -p /sbin/ldconfig %postun -n libkcarchivercore0 -p /sbin/ldconfig +%post -n libkcrosie0 -p /sbin/ldconfig +%postun -n libkcrosie0 -p /sbin/ldconfig %post -n libkcserver0 -p /sbin/ldconfig %postun -n libkcserver0 -p /sbin/ldconfig %post -n libkcsoap0 -p /sbin/ldconfig @@ -1195,9 +1196,6 @@ %defattr(-,root,root) %config(noreplace) %_sysconfdir/logrotate.d/* %doc AGPL-3 -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} -%config(noreplace) %_sysconfdir/sysconfig/kopano -%endif %dir %_prefix/lib/systemd/ %dir %_prefix/lib/systemd/system/ %_prefix/lib/sysusers.d/ @@ -1205,10 +1203,10 @@ %_mandir/man5/kopano-coredump.5* %_mandir/man7/kopano.7* %_mandir/man7/mapi.7* -%if 0%{?suse_version} -%_fillupdir/sysconfig.kopano -%endif %attr(0750,kopano,kopano) %dir %_localstatedir/log/kopano/ +%dir %_docdir/kopano +%dir %_docdir/kopano/example-config +%_docdir/kopano/example-config/sysconfig.txt %files contacts %defattr(-,root,root) @@ -1249,7 +1247,6 @@ %_docdir/kopano/example-config/dagent.cfg %dir %_docdir/kopano/example-config/apparmor.d/ %_docdir/kopano/example-config/apparmor.d/usr.sbin.kopano-dagent -# Don't ask why utils is not in kopano-utils.. %if 0%{?prefer_python3} %python3_sitelib/kopano_utils/ %python3_sitelib/kopano_utils-*.egg-info @@ -1267,6 +1264,7 @@ %_libdir/libmapi.so %_libdir/libkcarchivercore.so %_libdir/libkcarchiver.so +%_libdir/libkcrosie.so %_libdir/libkcserver.so %_libdir/libkcsoap.so %_libdir/libkcsync.so @@ -1461,6 +1459,9 @@ %attr(0750,kopano,kopano) %dir %_localstatedir/lib/kopano/ %attr(0750,kopano,kopano) %dir %_localstatedir/lib/kopano/spamd/ %_mandir/man*/kopano-spamd.* +%dir %_docdir/kopano +%dir %_docdir/kopano/example-config +%_docdir/kopano/example-config/spamd.cfg %if 0%{?prefer_python3} %python3_sitelib/kopano_spamd/ %python3_sitelib/kopano_spamd*.egg-info @@ -1495,6 +1496,7 @@ %_sbindir/kopano-admin %_sbindir/kopano-cachestat %_sbindir/kopano-cli +%_sbindir/kopano-dbadm %_sbindir/kopano-fix-ipm-subtree %_sbindir/kopano-localize-folders %_sbindir/kopano-mailbox-permissions @@ -1507,6 +1509,7 @@ %_mandir/man*/kopano-cachestat.* %exclude %_mandir/man*/kopano-cfgchecker.* %_mandir/man*/kopano-cli.* +%_mandir/man*/kopano-dbadm.* %_mandir/man*/kopano-fsck.* %_mandir/man*/kopano-mailbox-permissions.* %_mandir/man*/kopano-oof.* @@ -1549,6 +1552,10 @@ %defattr(-,root,root) %_libdir/libkcarchivercore.so.0* +%files -n libkcrosie0 +%defattr(-,root,root) +%_libdir/libkcrosie.so.0* + %files -n libkcserver0 %defattr(-,root,root) %_libdir/libkcserver.so.0* @@ -1594,13 +1601,8 @@ %endif %endif %endif -%if 0%{?suse_version} >= 1330 -%dir %_sysconfdir/php7 -%dir %_sysconfdir/php7/conf.d -%config(noreplace) %_sysconfdir/php7/conf.d/mapi.ini -%endif %if 0%{?suse_version} -%if 0%{?is_opensuse} || "%_repository" == "SLE_12_PHP7" +%if 0%{?suse_version} >= 1330 || "%_repository" == "SLE_12_PHP7" || "%_repository" == "openSUSE_Leap_42.3" %dir %_sysconfdir/php7 %dir %_sysconfdir/php7/conf.d %config(noreplace) %_sysconfdir/php7/conf.d/mapi.ini ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.4Tbr63/_old 2018-05-30 12:30:00.124492285 +0200 +++ /var/tmp/diff_new_pack.4Tbr63/_new 2018-05-30 12:30:00.124492285 +0200 @@ -1,5 +1,5 @@ pkgname=kopano -pkgver=8.6.0.0 +pkgver=8.6.1.99 pkgrel=0 pkgdesc='Kopano' arch=('x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.4Tbr63/_old 2018-05-30 12:30:00.144491551 +0200 +++ /var/tmp/diff_new_pack.4Tbr63/_new 2018-05-30 12:30:00.148491403 +0200 @@ -3,7 +3,8 @@ <param name="scm">git</param> <param name="url">https://stash.kopano.io/scm/kc/kopanocore.git</param> <param name="revision">kc-8.6.x</param> - <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> + <param name="parent-tag">kopanocore-8.6.1</param> + <param name="versionformat">8.6.1.@TAG_OFFSET@</param> Reply
participants (1)
-
root