July 2019 - openSUSE Commits - openSUSE Mailing Lists

commit flatpak for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package flatpak for openSUSE:Factory checked in at 2019-07-08 15:02:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak (Old) and /work/SRC/openSUSE:Factory/.flatpak.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flatpak" Mon Jul 8 15:02:38 2019 rev:33 rq:713230 version:1.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak/flatpak.changes 2019-06-22 11:21:05.669187161 +0200 +++ /work/SRC/openSUSE:Factory/.flatpak.new.4615/flatpak.changes 2019-07-08 15:02:39.618682910 +0200 @@ -1,0 +2,22 @@ +Wed Jul 3 08:27:20 UTC 2019 - Antonio Larrosa <alarrosa(a)suse.com> + +- Update to version 1.4.2: + * Support extra_data in extensions. + * Handle double slashes ("//") in XDG_DATA_DIRS. + * Fix detection of local related refs. + +------------------------------------------------------------------- +Thu Jun 14 09:33:16 UTC 2019 - Antonio Larrosa <alarrosa(a)suse.com> + +- Add a _dbusconfigdir variable in the spec file so we install the + flatpak-system-helper config file in a location actually read by + dbus, which didn't support having config files in /usr/share + until 1.9.18 (first introduced in SLE15). +- Remove the systemd environment generator if building with + systemd < 233 which doesn't support environment generators. +- Rename the libflapak-doc.xml file which has a typo in the name + upstream. +- BuildRequire libgpgme-devel, not libqgpgme-devel which is not + really needed. + +------------------------------------------------------------------- Old: ---- flatpak-1.4.1.tar.xz New: ---- flatpak-1.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak.spec ++++++ --- /var/tmp/diff_new_pack.eFVWbe/_old 2019-07-08 15:02:40.142683702 +0200 +++ /var/tmp/diff_new_pack.eFVWbe/_new 2019-07-08 15:02:40.142683702 +0200 @@ -16,9 +16,23 @@ # +# dbus only used config files in /etc until 1.9.18 +%if %{pkg_vcmp dbus-1 < 1.9.18} +%define _dbusconfigdir %{_sysconfdir}/dbus-1/system.d +%else +%define _dbusconfigdir %{_datadir}/dbus-1/system.d +%endif + +# systemd only supports environment generators since version 233 +%if %{pkg_vcmp systemd < 233} +%define support_environment_generators 0 +%else +%define support_environment_generators 1 +%endif + %define libname libflatpak0 Name: flatpak -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: OSTree based application bundles management License: LGPL-2.1-or-later @@ -33,7 +47,7 @@ BuildRequires: intltool >= 0.35.0 BuildRequires: libcap-devel BuildRequires: libdwarf-devel -BuildRequires: libqgpgme-devel >= 1.1.8 +BuildRequires: libgpgme-devel >= 1.1.8 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: xsltproc @@ -118,6 +132,9 @@ %patch0 -p1 sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-* +# UPSTREAM: https://github.com/flatpak/flatpak/pull/2963 +mv doc/reference/libflapak-docs.xml doc/reference/libflatpak-docs.xml + %build %define _lto_cflags %{nil} NOCONFIGURE=1 ./autogen.sh @@ -127,7 +144,7 @@ --disable-document-portal \ --with-system-bubblewrap \ --with-priv-mode=none \ - --with-dbus-config-dir=%{_datadir}/dbus-1/system.d + --with-dbus-config-dir=%{_dbusconfigdir} make %{?_smp_mflags} %install @@ -142,6 +159,10 @@ # w/o password entry. mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules +%if !%{support_environment_generators} +rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/ +%endif + %find_lang %{name} %post -n %{libname} -p /sbin/ldconfig @@ -179,7 +200,7 @@ %{_datadir}/dbus-1/services/org.freedesktop.Flatpak.service %{_datadir}/dbus-1/services/org.freedesktop.portal.Flatpak.service %{_datadir}/dbus-1/system-services/org.freedesktop.Flatpak.SystemHelper.service -%{_datadir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf +%{_dbusconfigdir}/org.freedesktop.Flatpak.SystemHelper.conf # policykit rules %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy %{_datadir}/polkit-1/rules.d/60-org.freedesktop.Flatpak.rules @@ -200,7 +221,9 @@ %{_userunitdir}/flatpak-session-helper.service %{_userunitdir}/flatpak-portal.service %ghost %dir %{_localstatedir}/lib/flatpak +%if %{support_environment_generators} %{_libexecdir}/systemd/user-environment-generators/60-flatpak +%endif %files -n %{libname} %{_libdir}/libflatpak.so.* ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eFVWbe/_old 2019-07-08 15:02:40.182683763 +0200 +++ /var/tmp/diff_new_pack.eFVWbe/_new 2019-07-08 15:02:40.182683763 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/flatpak/flatpak.git</param> <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">refs/tags/1.4.1</param> + <param name="revision">refs/tags/1.4.2</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.eFVWbe/_old 2019-07-08 15:02:40.202683794 +0200 +++ /var/tmp/diff_new_pack.eFVWbe/_new 2019-07-08 15:02:40.206683799 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/flatpak/flatpak.git</param> - <param name="changesrevision">2bfa0060b089a20de5fbf18d018f8f1b108d2480</param></service></servicedata> + <param name="changesrevision">f70978b4ad892cca6837153a3a1f7bc33ac347e8</param></service></servicedata> ++++++ flatpak-1.4.1.tar.xz -> flatpak-1.4.2.tar.xz ++++++ ++++ 9495 lines of diff (skipped)

1 0

commit fuse-overlayfs for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package fuse-overlayfs for openSUSE:Factory checked in at 2019-07-08 15:02:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fuse-overlayfs (Old) and /work/SRC/openSUSE:Factory/.fuse-overlayfs.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fuse-overlayfs" Mon Jul 8 15:02:33 2019 rev:2 rq:713215 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fuse-overlayfs/fuse-overlayfs.changes 2019-06-06 18:19:27.820648405 +0200 +++ /work/SRC/openSUSE:Factory/.fuse-overlayfs.new.4615/fuse-overlayfs.changes 2019-07-08 15:02:34.414675042 +0200 @@ -1,0 +2,19 @@ +Mon Jun 17 06:43:31 UTC 2019 - Sascha Grunert <sgrunert(a)suse.com> + +- Update to v0.4.1: + - create_directory: do not redeclare variable buf + - fuse-overlayfs: accept option "dev" + - fuse-overlayfs: add check to readdir for the node parent + - fuse-overlayfs: add cleanup for layers + - fuse-overlayfs: drop usage of static arrays for paths + - fuse-overlayfs: refactor some xattrs common code + - fuse-overlayfs: start using GCC autocleanup + - fuse-overlayfs: use cleanup function for initializing node + - fuse-overlays: fix interaction of unlink(2) with readdir(2) + - main: add missing debug messages + - main: do the unlink only after we created the temporary file + - main: fix a fd leak + - main: ignore EINVAL when copying xattrs + - setattr: use fd from fi->fh for ftruncate() whenever possible + +------------------------------------------------------------------- Old: ---- fuse-overlayfs-0.3.tar.xz New: ---- fuse-overlayfs-0.4.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse-overlayfs.spec ++++++ --- /var/tmp/diff_new_pack.xcHZbk/_old 2019-07-08 15:02:34.890675761 +0200 +++ /var/tmp/diff_new_pack.xcHZbk/_new 2019-07-08 15:02:34.898675773 +0200 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: fuse-overlayfs -Version: 0.3 +Version: 0.4.1 Release: 0 Summary: FUSE implementation for overlayfs License: GPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xcHZbk/_old 2019-07-08 15:02:34.954675858 +0200 +++ /var/tmp/diff_new_pack.xcHZbk/_new 2019-07-08 15:02:34.958675865 +0200 @@ -3,8 +3,8 @@ <param name="url">https://github.com/containers/fuse-overlayfs.git</param> <param name="scm">git</param> <param name="filename">fuse-overlayfs</param> - <param name="versionformat">0.3</param> - <param name="revision">v0.3</param> + <param name="versionformat">0.4.1</param> + <param name="revision">v0.4.1</param> </service> <service name="set_version" mode="disabled"> <param name="basename">fuse-overlayfs</param> ++++++ fuse-overlayfs-0.3.tar.xz -> fuse-overlayfs-0.4.1.tar.xz ++++++ ++++ 2901 lines of diff (skipped)

1 0

commit libxslt for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package libxslt for openSUSE:Factory checked in at 2019-07-08 15:02:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxslt (Old) and /work/SRC/openSUSE:Factory/.libxslt.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxslt" Mon Jul 8 15:02:27 2019 rev:58 rq:713210 version:1.1.33 Changes: -------- --- /work/SRC/openSUSE:Factory/libxslt/libxslt-python.changes 2019-04-17 10:04:47.366530885 +0200 +++ /work/SRC/openSUSE:Factory/.libxslt.new.4615/libxslt-python.changes 2019-07-08 15:02:28.870666660 +0200 @@ -1,0 +2,18 @@ +Tue Jul 2 15:02:27 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com> + +- Security fix: [bsc#1140101, CVE-2019-13118] + * Fix uninitialized read with UTF-8 grouping chars. Read of + uninitialized stack data due to too narrow xsl:number + instruction and an invalid character + * Added libxslt-CVE-2019-13118.patch + +------------------------------------------------------------------- +Tue Jul 2 15:00:56 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez(a)suse.com> + +- Security fix: [bsc#1140095, CVE-2019-13117] + * Fix uninitialized read of xsl:number token. An xsl number with + certain format strings could lead to a uninitialized read in + xsltNumberFormatInsertNumbers + * Added libxslt-CVE-2019-13117.patch + +------------------------------------------------------------------- libxslt.changes: same change New: ---- libxslt-CVE-2019-13117.patch libxslt-CVE-2019-13118.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.TJm1Ty/_old 2019-07-08 15:02:29.694667906 +0200 +++ /var/tmp/diff_new_pack.TJm1Ty/_new 2019-07-08 15:02:29.702667917 +0200 @@ -34,6 +34,10 @@ Patch2: libxslt-random-seed.patch # PATCH-FIX-UPSTREAM bsc#1132160 CVE-2019-11068 Fix security framework bypass Patch4: libxslt-CVE-2019-11068.patch +# PATCH-FIX-UPSTREAM bsc#1140095 CVE-2019-13117 Fix uninitialized read of xsl:number token +Patch5: libxslt-CVE-2019-13117.patch +# PATCH-FIX-UPSTREAM bsc#1140101 CVE-2019-13118 Fix uninitialized read with UTF-8 grouping chars +Patch6: libxslt-CVE-2019-13118.patch BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool @@ -61,6 +65,8 @@ %patch1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build autoreconf -fvi ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.TJm1Ty/_old 2019-07-08 15:02:29.734667965 +0200 +++ /var/tmp/diff_new_pack.TJm1Ty/_new 2019-07-08 15:02:29.738667972 +0200 @@ -36,6 +36,10 @@ Patch3: libxslt-random-seed.patch # PATCH-FIX-UPSTREAM bsc#1132160 CVE-2019-11068 Fix security framework bypass Patch4: libxslt-CVE-2019-11068.patch +# PATCH-FIX-UPSTREAM bsc#1140095 CVE-2019-13117 Fix uninitialized read of xsl:number token +Patch5: libxslt-CVE-2019-13117.patch +# PATCH-FIX-UPSTREAM bsc#1140101 CVE-2019-13118 Fix uninitialized read with UTF-8 grouping chars +Patch6: libxslt-CVE-2019-13118.patch BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool @@ -105,6 +109,8 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build autoreconf -fvi ++++++ libxslt-CVE-2019-13117.patch ++++++ >From c5eb6cf3aba0af048596106ed839b4ae17ecbcb1 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer <wellnhofer(a)aevum.de> Date: Sat, 27 Apr 2019 11:19:48 +0200 Subject: [PATCH] Fix uninitialized read of xsl:number token Found by OSS-Fuzz. --- libxslt/numbers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libxslt/numbers.c b/libxslt/numbers.c index 89e1f668..75c31eba 100644 --- a/libxslt/numbers.c +++ b/libxslt/numbers.c @@ -382,7 +382,10 @@ xsltNumberFormatTokenize(const xmlChar *format, tokens->tokens[tokens->nTokens].token = val - 1; ix += len; val = xmlStringCurrentChar(NULL, format+ix, &len); - } + } else { + tokens->tokens[tokens->nTokens].token = (xmlChar)'0'; + tokens->tokens[tokens->nTokens].width = 1; + } } else if ( (val == (xmlChar)'A') || (val == (xmlChar)'a') || (val == (xmlChar)'I') || -- 2.21.0 ++++++ libxslt-CVE-2019-13118.patch ++++++ >From 6ce8de69330783977dd14f6569419489875fb71b Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer <wellnhofer(a)aevum.de> Date: Mon, 3 Jun 2019 13:14:45 +0200 Subject: [PATCH] Fix uninitialized read with UTF-8 grouping chars The character type in xsltFormatNumberConversion was too narrow and an invalid character/length combination could be passed to xsltNumberFormatDecimal, resulting in an uninitialized read. Found by OSS-Fuzz. --- libxslt/numbers.c | 5 +++-- tests/docs/bug-222.xml | 1 + tests/general/bug-222.out | 2 ++ tests/general/bug-222.xsl | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tests/docs/bug-222.xml create mode 100644 tests/general/bug-222.out create mode 100644 tests/general/bug-222.xsl diff --git a/libxslt/numbers.c b/libxslt/numbers.c index f1ed8846..20b99d5a 100644 --- a/libxslt/numbers.c +++ b/libxslt/numbers.c @@ -1298,13 +1298,14 @@ OUTPUT_NUMBER: number = floor((scale * number + 0.5)) / scale; if ((self->grouping != NULL) && (self->grouping[0] != 0)) { + int gchar; len = xmlStrlen(self->grouping); - pchar = xsltGetUTF8Char(self->grouping, &len); + gchar = xsltGetUTF8Char(self->grouping, &len); xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], format_info.integer_digits, format_info.group, - pchar, len); + gchar, len); } else xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], format_info.integer_digits, diff --git a/tests/docs/bug-222.xml b/tests/docs/bug-222.xml new file mode 100644 index 00000000..69d62f2c --- /dev/null +++ b/tests/docs/bug-222.xml @@ -0,0 +1 @@ +<doc/> diff --git a/tests/general/bug-222.out b/tests/general/bug-222.out new file mode 100644 index 00000000..e3139698 --- /dev/null +++ b/tests/general/bug-222.out @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +1⠢0 diff --git a/tests/general/bug-222.xsl b/tests/general/bug-222.xsl new file mode 100644 index 00000000..e32dc473 --- /dev/null +++ b/tests/general/bug-222.xsl @@ -0,0 +1,6 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + <xsl:decimal-format name="f" grouping-separator="⠢"/> + <xsl:template match="/"> + <xsl:value-of select="format-number(10,'#⠢0','f')"/> + </xsl:template> +</xsl:stylesheet> -- 2.21.0

1 0

commit postfix for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2019-07-08 15:02:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix" Mon Jul 8 15:02:13 2019 rev:173 rq:713198 version:3.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2019-06-28 16:11:41.944520513 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new.4615/postfix.changes 2019-07-08 15:02:14.670645189 +0200 @@ -1,0 +2,21 @@ +Wed Jul 3 08:43:58 UTC 2019 - Michael Ströder <michael(a)stroeder.com> + +- Update to 3.4.6: + * Workaround for implementations that hang Postfix while shutting + down a TLS session, until Postfix times out. With + "tls_fast_shutdown_enable = yes" (the default), Postfix no + longer waits for the TLS peer to respond to a TLS 'close' + request. This is recommended with TLSv1.0 and later. + * Fixed a too-strict censoring filter that broke multiline Milter + responses for header/body events. Problem report by Andreas + Thienemann. + * The code to reset Postfix SMTP server command counts was not + called after a HaProxy handshake failure, causing stale numbers + to be reported. Problem report by Joseph Ward. + * postconf(5) documentation: tlsext_padding is not a tls_ssl_options + feature. + * smtp(8) documentation: updated the BUGS section text about + Postfix support to reuse open TLS connections. + * Portability: added "#undef sun" to util/unix_dgram_connect.c. + +------------------------------------------------------------------- Old: ---- postfix-3.4.5.tar.gz New: ---- postfix-3.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.7yLxNc/_old 2019-07-08 15:02:15.810646913 +0200 +++ /var/tmp/diff_new_pack.7yLxNc/_new 2019-07-08 15:02:15.814646919 +0200 @@ -53,7 +53,7 @@ %bcond_with libnsl %endif Name: postfix -Version: 3.4.5 +Version: 3.4.6 Release: 0 Summary: A fast, secure, and flexible mailer License: IPL-1.0 OR EPL-2.0 ++++++ postfix-3.4.5.tar.gz -> postfix-3.4.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/HISTORY new/postfix-3.4.6/HISTORY --- old/postfix-3.4.5/HISTORY 2019-03-30 15:33:58.000000000 +0100 +++ new/postfix-3.4.6/HISTORY 2019-06-28 01:36:26.000000000 +0200 @@ -24208,3 +24208,43 @@ could exhaust LMTP server resources, resulting in two-second pauses between email deliveries. This problem was investigated by Juliana Rodrigueiro. File: smtp/smtp_connect.c. + +20190331 + + Documentation: tlsext_padding is not a tls_ssl_options + feature. File: proto/postconf.proto. + +20190401 + + Portability: added "#undef sun" to util/unix_dgram_connect.c. + +20190403 + + Bugfix (introduced: Postfix 2.3): a censoring filter broke + multiline Milter responses for header/body events. Problem + report by Andreas Thienemann. Files: util/printable.c, + util/stringops.h, smtpd/smtpd.c + + Bugfix (introduced: Postfix 3.3): "smtp_mx_address_limit = + 0" no longer meant 'unlimited'. Problem report by Luc Pardon. + File: smtp/smtp_addr.c. + +20190615 + + Documentation: updated the BUGS section in the smtp(8) manpage + about TLS connection reuse. File: smtp/smtp.c. + + Workaround for implementations that hang Postfix while + shutting down a TLS session, until Postfix times out. With + "tls_fast_shutdown_enable = yes" (the default), Postfix no + longer waits for the TLS peer to respond to a TLS 'close' + request. This is recommended with TLSv1.0 and later. Files: + global/mail_params.h, tls/tls_session.c, and documentation. + +20190621 + + Bugfix (introduced: Postfix 3.0): the code to reset Postfix + SMTP server command counts was not called after a HaProxy + handshake failure, causing stale numbers to be reported. + The command counts are now reset in the function that reports + the counts. File: smtpd/smtpd.c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/RELEASE_NOTES new/postfix-3.4.6/RELEASE_NOTES --- old/postfix-3.4.5/RELEASE_NOTES 2019-02-10 23:43:45.000000000 +0100 +++ new/postfix-3.4.6/RELEASE_NOTES 2019-06-28 01:19:08.000000000 +0200 @@ -16,6 +16,16 @@ If you upgrade from Postfix 3.2 or earlier, read RELEASE_NOTES-3.3 before proceeding. +TLS Workaround for Postfix 3.4.6, 3.3.5, 3.2.10 and 3.1.13 +----------------------------------------------------------- + +This release introduces a workaround for implementations that hang +Postfix while shutting down a TLS session, until Postfix times out. +With "tls_fast_shutdown_enable = yes" (the default), Postfix no +longer waits for a remote TLS peer to respond to a TLS 'close' +request. This behavior is recommended with TLSv1.0 and later. Specify +"tls_fast_shutdown_enable = no" to get historical Postfix behavior. + License change --------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/conf/main.cf new/postfix-3.4.6/conf/main.cf --- old/postfix-3.4.5/conf/main.cf 2017-02-19 02:58:20.000000000 +0100 +++ new/postfix-3.4.6/conf/main.cf 2019-06-02 14:40:36.000000000 +0200 @@ -249,7 +249,7 @@ # # By default (mynetworks_style = subnet), Postfix "trusts" SMTP # clients in the same IP subnetworks as the local machine. -# On Linux, this does works correctly only with interfaces specified +# On Linux, this works correctly only with interfaces specified # with the "ifconfig" command. # # Specify "mynetworks_style = class" when Postfix should "trust" SMTP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/html/lmtp.8.html new/postfix-3.4.6/html/lmtp.8.html --- old/postfix-3.4.5/html/lmtp.8.html 2019-02-10 18:18:26.000000000 +0100 +++ new/postfix-3.4.6/html/lmtp.8.html 2019-06-30 01:30:31.000000000 +0200 @@ -120,9 +120,8 @@ ter is notified of bounces, protocol problems, and of other trouble. BUGS - SMTP and LMTP connection caching does not work with TLS. The necessary - support for TLS object passivation and re-activation does not exist - without closing the session, which defeats the purpose. + SMTP and LMTP connection reuse for TLS (without closing the SMTP or + LMTP connection) is not supported before Postfix 3.4. SMTP and LMTP connection caching assumes that SASL credentials are valid for all destinations that map onto the same IP address and TCP @@ -595,6 +594,12 @@ Optional name to send to the remote SMTP server in the TLS Server Name Indication (SNI) extension. + Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: + + <a href="postconf.5.html#tls_fast_shutdown_enable">tls_fast_shutdown_enable</a> (yes) + A workaround for implementations that hang Postfix while shuting + down a TLS session, until Postfix times out. + OBSOLETE STARTTLS CONTROLS The following configuration parameters exist for compatibility with Postfix versions before 2.3. Support for these will be removed in a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/html/postconf.5.html new/postfix-3.4.6/html/postconf.5.html --- old/postfix-3.4.5/html/postconf.5.html 2019-03-24 23:59:02.000000000 +0100 +++ new/postfix-3.4.6/html/postconf.5.html 2019-06-29 15:33:39.000000000 +0200 @@ -18531,6 +18531,21 @@ </DD> +<DT><a name="tls_fast_shutdown_enable">tls_fast_shutdown_enable</a> +(default: yes)</DT><DD> + + A workaround for implementations that hang Postfix while shuting +down a TLS session, until Postfix times out. With this enabled, +Postfix will not wait for the remote TLS peer to respond to a TLS +'close' notification. This behavior is recommended for TLSv1.0 and +later. + + This feature was introduced with Postfix 3.4.6, 3.3.5, 3.2.10, +and 3.1.13. + + +</DD> + <DT><a name="tls_high_cipherlist">tls_high_cipherlist</a> (default: see "postconf -d" output)</DT><DD> @@ -18890,9 +18905,6 @@ <dt>PRIORITIZE_CHACHA</dt> <dd>Postfix ≥ 3.4. See SSL_CTX_set_options(3).</dd> -<dt>TLSEXT_PADDING</dt> <dd>Postfix ≥ 3.4. See -SSL_CTX_set_options(3).</dd> - </dl> This feature is available in Postfix 2.11 and later. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/html/smtp.8.html new/postfix-3.4.6/html/smtp.8.html --- old/postfix-3.4.5/html/smtp.8.html 2019-02-10 18:18:26.000000000 +0100 +++ new/postfix-3.4.6/html/smtp.8.html 2019-06-30 01:30:31.000000000 +0200 @@ -120,9 +120,8 @@ ter is notified of bounces, protocol problems, and of other trouble. BUGS - SMTP and LMTP connection caching does not work with TLS. The necessary - support for TLS object passivation and re-activation does not exist - without closing the session, which defeats the purpose. + SMTP and LMTP connection reuse for TLS (without closing the SMTP or + LMTP connection) is not supported before Postfix 3.4. SMTP and LMTP connection caching assumes that SASL credentials are valid for all destinations that map onto the same IP address and TCP @@ -595,6 +594,12 @@ Optional name to send to the remote SMTP server in the TLS Server Name Indication (SNI) extension. + Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: + + <a href="postconf.5.html#tls_fast_shutdown_enable">tls_fast_shutdown_enable</a> (yes) + A workaround for implementations that hang Postfix while shuting + down a TLS session, until Postfix times out. + OBSOLETE STARTTLS CONTROLS The following configuration parameters exist for compatibility with Postfix versions before 2.3. Support for these will be removed in a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/html/smtpd.8.html new/postfix-3.4.6/html/smtpd.8.html --- old/postfix-3.4.5/html/smtpd.8.html 2019-02-10 23:53:18.000000000 +0100 +++ new/postfix-3.4.6/html/smtpd.8.html 2019-06-30 01:22:10.000000000 +0200 @@ -589,6 +589,12 @@ clients via the TLS Server Name Indication (SNI) extension to the appropriate keys and certificate chains. + Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: + + <a href="postconf.5.html#tls_fast_shutdown_enable">tls_fast_shutdown_enable</a> (yes) + A workaround for implementations that hang Postfix while shuting + down a TLS session, until Postfix times out. + OBSOLETE STARTTLS CONTROLS The following configuration parameters exist for compatibility with Postfix versions before 2.3. Support for these will be removed in a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/html/tlsproxy.8.html new/postfix-3.4.6/html/tlsproxy.8.html --- old/postfix-3.4.5/html/tlsproxy.8.html 2019-02-22 01:27:46.000000000 +0100 +++ new/postfix-3.4.6/html/tlsproxy.8.html 2019-06-30 01:23:07.000000000 +0200 @@ -337,6 +337,12 @@ usage policy by next-hop destination and by remote TLS server hostname. + Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: + + <a href="postconf.5.html#tls_fast_shutdown_enable">tls_fast_shutdown_enable</a> (yes) + A workaround for implementations that hang Postfix while shuting + down a TLS session, until Postfix times out. + OBSOLETE STARTTLS SUPPORT CONTROLS These parameters are supported for compatibility with <a href="smtpd.8.html">smtpd(8)</a> legacy parameters. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/man/man5/postconf.5 new/postfix-3.4.6/man/man5/postconf.5 --- old/postfix-3.4.5/man/man5/postconf.5 2019-03-24 23:59:03.000000000 +0100 +++ new/postfix-3.4.6/man/man5/postconf.5 2019-06-29 15:33:39.000000000 +0200 @@ -12930,6 +12930,15 @@ encouraged to not change this setting. .PP This feature is available in Postfix 2.3 and later. +.SH tls_fast_shutdown_enable (default: yes) +A workaround for implementations that hang Postfix while shuting +down a TLS session, until Postfix times out. With this enabled, +Postfix will not wait for the remote TLS peer to respond to a TLS +'close' notification. This behavior is recommended for TLSv1.0 and +later. +.PP +This feature was introduced with Postfix 3.4.6, 3.3.5, 3.2.10, +and 3.1.13. .SH tls_high_cipherlist (default: see "postconf \-d" output) The OpenSSL cipherlist for "high" grade ciphers. This defines the meaning of the "high" setting in smtpd_tls_ciphers, @@ -13221,10 +13230,6 @@ .IP "\fBPRIORITIZE_CHACHA\fR" Postfix >= 3.4. See SSL_CTX_\fBset_options\fR(3). .br -.IP "\fBTLSEXT_PADDING\fR" -Postfix >= 3.4. See -SSL_CTX_\fBset_options\fR(3). -.br .br .PP This feature is available in Postfix 2.11 and later. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/man/man8/smtp.8 new/postfix-3.4.6/man/man8/smtp.8 --- old/postfix-3.4.5/man/man8/smtp.8 2019-02-10 18:18:26.000000000 +0100 +++ new/postfix-3.4.6/man/man8/smtp.8 2019-06-29 15:33:39.000000000 +0200 @@ -127,9 +127,8 @@ .SH BUGS .ad .fi -SMTP and LMTP connection caching does not work with TLS. The necessary -support for TLS object passivation and re\-activation does not -exist without closing the session, which defeats the purpose. +SMTP and LMTP connection reuse for TLS (without closing the +SMTP or LMTP connection) is not supported before Postfix 3.4. SMTP and LMTP connection caching assumes that SASL credentials are valid for all destinations that map onto the same IP @@ -526,6 +525,11 @@ .IP "\fBsmtp_tls_servername (empty)\fR" Optional name to send to the remote SMTP server in the TLS Server Name Indication (SNI) extension. +.PP +Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: +.IP "\fBtls_fast_shutdown_enable (yes)\fR" +A workaround for implementations that hang Postfix while shuting +down a TLS session, until Postfix times out. .SH "OBSOLETE STARTTLS CONTROLS" .na .nf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/man/man8/smtpd.8 new/postfix-3.4.6/man/man8/smtpd.8 --- old/postfix-3.4.5/man/man8/smtpd.8 2019-02-10 23:53:17.000000000 +0100 +++ new/postfix-3.4.6/man/man8/smtpd.8 2019-06-29 15:33:39.000000000 +0200 @@ -527,6 +527,11 @@ Optional lookup tables that map names received from remote SMTP clients via the TLS Server Name Indication (SNI) extension to the appropriate keys and certificate chains. +.PP +Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: +.IP "\fBtls_fast_shutdown_enable (yes)\fR" +A workaround for implementations that hang Postfix while shuting +down a TLS session, until Postfix times out. .SH "OBSOLETE STARTTLS CONTROLS" .na .nf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/man/man8/tlsproxy.8 new/postfix-3.4.6/man/man8/tlsproxy.8 --- old/postfix-3.4.5/man/man8/tlsproxy.8 2019-02-22 01:27:45.000000000 +0100 +++ new/postfix-3.4.6/man/man8/tlsproxy.8 2019-06-29 15:33:40.000000000 +0200 @@ -302,6 +302,11 @@ Optional lookup tables with the Postfix \fBtlsproxy\fR(8) client TLS usage policy by next\-hop destination and by remote TLS server hostname. +.PP +Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: +.IP "\fBtls_fast_shutdown_enable (yes)\fR" +A workaround for implementations that hang Postfix while shuting +down a TLS session, until Postfix times out. .SH "OBSOLETE STARTTLS SUPPORT CONTROLS" .na .nf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/mantools/postlink new/postfix-3.4.6/mantools/postlink --- old/postfix-3.4.5/mantools/postlink 2019-02-10 18:11:46.000000000 +0100 +++ new/postfix-3.4.6/mantools/postlink 2019-06-25 14:05:54.000000000 +0200 @@ -765,6 +765,7 @@ s;\btls_ssl_options\b;<a href="postconf.5.html#tls_ssl_options">$&</a>;g; s;\btls_dane_digest_agility\b;<a href="postconf.5.html#tls_dane_digest_agility">$&</a>;g; s;\btls_dane_trust_anchor_digest_enable\b;<a href="postconf.5.html#tls_dane_trust_anchor_digest_enable">$&</a>;g; + s;\btls_fast_shutdown_enable\b;<a href="postconf.5.html#tls_fast_shutdown_enable">$&</a>;g; s;\bfrozen_delivered_to\b;<a href="postconf.5.html#frozen_delivered_to">$&</a>;g; s;\breset_owner_alias\b;<a href="postconf.5.html#reset_owner_alias">$&</a>;g; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/proto/postconf.proto new/postfix-3.4.6/proto/postconf.proto --- old/postfix-3.4.5/proto/postconf.proto 2019-03-21 17:41:06.000000000 +0100 +++ new/postfix-3.4.6/proto/postconf.proto 2019-06-28 23:19:58.000000000 +0200 @@ -16130,9 +16130,6 @@ <dt>PRIORITIZE_CHACHA</dt> <dd>Postfix ≥ 3.4. See SSL_CTX_set_options(3).</dd> -<dt>TLSEXT_PADDING</dt> <dd>Postfix ≥ 3.4. See -SSL_CTX_set_options(3).</dd> - </dl> This feature is available in Postfix 2.11 and later. @@ -16245,6 +16242,17 @@ This feature is available in Postfix 3.0 and later. +%PARAM tls_fast_shutdown_enable yes + + A workaround for implementations that hang Postfix while shuting +down a TLS session, until Postfix times out. With this enabled, +Postfix will not wait for the remote TLS peer to respond to a TLS +'close' notification. This behavior is recommended for TLSv1.0 and +later. + + This feature was introduced with Postfix 3.4.6, 3.3.5, 3.2.10, +and 3.1.13. + %PARAM default_delivery_status_filter Optional filter to replace the delivery status code or explanatory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/global/mail_params.h new/postfix-3.4.6/src/global/mail_params.h --- old/postfix-3.4.5/src/global/mail_params.h 2019-02-11 14:05:13.000000000 +0100 +++ new/postfix-3.4.6/src/global/mail_params.h 2019-06-27 23:38:33.000000000 +0200 @@ -3331,6 +3331,13 @@ extern char *var_tls_dane_digests; /* + * The default is backwards-incompatible. + */ +#define VAR_TLS_FAST_SHUTDOWN "tls_fast_shutdown" +#define DEF_TLS_FAST_SHUTDOWN 1 +extern bool var_tls_fast_shutdown; + + /* * Sendmail-style mail filter support. */ #define VAR_SMTPD_MILTERS "smtpd_milters" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/global/mail_version.h new/postfix-3.4.6/src/global/mail_version.h --- old/postfix-3.4.5/src/global/mail_version.h 2019-03-30 15:38:23.000000000 +0100 +++ new/postfix-3.4.6/src/global/mail_version.h 2019-06-29 15:57:49.000000000 +0200 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20190330" -#define MAIL_VERSION_NUMBER "3.4.5" +#define MAIL_RELEASE_DATE "20190629" +#define MAIL_VERSION_NUMBER "3.4.6" #ifdef SNAPSHOT #define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/smtp/smtp.c new/postfix-3.4.6/src/smtp/smtp.c --- old/postfix-3.4.5/src/smtp/smtp.c 2019-02-10 18:18:26.000000000 +0100 +++ new/postfix-3.4.6/src/smtp/smtp.c 2019-06-29 15:33:39.000000000 +0200 @@ -109,9 +109,8 @@ /* the postmaster is notified of bounces, protocol problems, and of /* other trouble. /* BUGS -/* SMTP and LMTP connection caching does not work with TLS. The necessary -/* support for TLS object passivation and re-activation does not -/* exist without closing the session, which defeats the purpose. +/* SMTP and LMTP connection reuse for TLS (without closing the +/* SMTP or LMTP connection) is not supported before Postfix 3.4. /* /* SMTP and LMTP connection caching assumes that SASL credentials /* are valid for all destinations that map onto the same IP @@ -496,6 +495,11 @@ /* .IP "\fBsmtp_tls_servername (empty)\fR" /* Optional name to send to the remote SMTP server in the TLS Server /* Name Indication (SNI) extension. +/* .PP +/* Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: +/* .IP "\fBtls_fast_shutdown_enable (yes)\fR" +/* A workaround for implementations that hang Postfix while shuting +/* down a TLS session, until Postfix times out. /* OBSOLETE STARTTLS CONTROLS /* .ad /* .fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/smtp/smtp_addr.c new/postfix-3.4.6/src/smtp/smtp_addr.c --- old/postfix-3.4.5/src/smtp/smtp_addr.c 2017-12-27 22:53:13.000000000 +0100 +++ new/postfix-3.4.6/src/smtp/smtp_addr.c 2019-04-04 00:03:38.000000000 +0200 @@ -623,7 +623,7 @@ if (var_smtp_rand_addr) addr_list = dns_rr_shuffle(addr_list); addr_list = dns_rr_sort(addr_list, SMTP_COMPARE_ADDR(misc_flags)); - if (var_smtp_balance_inet_proto) + if (var_smtp_mxaddr_limit > 0 && var_smtp_balance_inet_proto) addr_list = smtp_balance_inet_proto(addr_list, misc_flags, var_smtp_mxaddr_limit); } @@ -683,7 +683,7 @@ /* The following changes the order of equal-preference hosts. */ if (inet_proto_info()->ai_family_list[1] != 0) addr_list = dns_rr_sort(addr_list, SMTP_COMPARE_ADDR(misc_flags)); - if (var_smtp_balance_inet_proto) + if (var_smtp_mxaddr_limit > 0 && var_smtp_balance_inet_proto) addr_list = smtp_balance_inet_proto(addr_list, misc_flags, var_smtp_mxaddr_limit); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/smtpd/smtpd.c new/postfix-3.4.6/src/smtpd/smtpd.c --- old/postfix-3.4.5/src/smtpd/smtpd.c 2019-03-30 13:05:29.000000000 +0100 +++ new/postfix-3.4.6/src/smtpd/smtpd.c 2019-06-29 15:33:39.000000000 +0200 @@ -493,6 +493,11 @@ /* Optional lookup tables that map names received from remote SMTP /* clients via the TLS Server Name Indication (SNI) extension to the /* appropriate keys and certificate chains. +/* .PP +/* Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: +/* .IP "\fBtls_fast_shutdown_enable (yes)\fR" +/* A workaround for implementations that hang Postfix while shuting +/* down a TLS session, until Postfix times out. /* OBSOLETE STARTTLS CONTROLS /* .ad /* .fi @@ -3528,6 +3533,11 @@ int saved_err; const CLEANUP_STAT_DETAIL *detail; +#define IS_SMTP_REJECT(s) \ + (((s)[0] == '4' || (s)[0] == '5') \ + && ISDIGIT((s)[1]) && ISDIGIT((s)[2]) \ + && ((s)[3] == '\0' || (s)[3] == ' ' || (s)[3] == '-')) + if (state->err == CLEANUP_STAT_OK && SMTPD_STAND_ALONE(state) == 0 && (err = smtpd_check_eod(state)) != 0) { @@ -3598,7 +3608,10 @@ if (state->err == 0) { why = vstring_alloc(10); state->err = mail_stream_finish(state->dest, why); - printable(STR(why), ' '); + if (IS_SMTP_REJECT(STR(why))) + printable_except(STR(why), ' ', "\r\n"); + else + printable(STR(why), ' '); } else mail_stream_cleanup(state->dest); state->dest = 0; @@ -3633,11 +3646,6 @@ * * See also: qmqpd.c */ -#define IS_SMTP_REJECT(s) \ - (((s)[0] == '4' || (s)[0] == '5') \ - && ISDIGIT((s)[1]) && ISDIGIT((s)[2]) \ - && ((s)[3] == '\0' || (s)[3] == ' ' || (s)[3] == '-')) - if (state->err == CLEANUP_STAT_OK) { state->error_count = 0; state->error_mask = 0; @@ -5413,15 +5421,6 @@ case 0: /* - * Reset the per-command counters. - */ - for (cmdp = smtpd_cmd_table; /* see below */ ; cmdp++) { - cmdp->success_count = cmdp->total_count = 0; - if (cmdp->name == 0) - break; - } - - /* * In TLS wrapper mode, turn on TLS using code that is shared with * the STARTTLS command. This code does not return when the handshake * fails. @@ -5818,6 +5817,15 @@ if (cmdp->name == 0) break; } + + /* + * Reset the per-command counters. + */ + for (cmdp = smtpd_cmd_table; /* see below */ ; cmdp++) { + cmdp->success_count = cmdp->total_count = 0; + if (cmdp->name == 0) + break; + } /* * Log total numbers, so that logfile analyzers will see something even diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/tls/Makefile.in new/postfix-3.4.6/src/tls/Makefile.in --- old/postfix-3.4.5/src/tls/Makefile.in 2019-03-08 01:04:25.000000000 +0100 +++ new/postfix-3.4.6/src/tls/Makefile.in 2019-06-25 14:05:54.000000000 +0200 @@ -572,6 +572,7 @@ tls_session.o: ../../include/argv.h tls_session.o: ../../include/check_arg.h tls_session.o: ../../include/dns.h +tls_session.o: ../../include/mail_params.h tls_session.o: ../../include/msg.h tls_session.o: ../../include/myaddrinfo.h tls_session.o: ../../include/mymalloc.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/tls/tls_misc.c new/postfix-3.4.6/src/tls/tls_misc.c --- old/postfix-3.4.5/src/tls/tls_misc.c 2019-02-22 01:22:18.000000000 +0100 +++ new/postfix-3.4.6/src/tls/tls_misc.c 2019-06-25 23:51:24.000000000 +0200 @@ -46,6 +46,8 @@ /* char *var_tls_mgr_service; /* char *var_tls_tkt_cipher; /* char *var_openssl_path; +/* char *var_tls_server_sni_maps; +/* bool var_tls_fast_shutdown; /* /* TLS_APPL_STATE *tls_alloc_app_context(ssl_ctx, log_mask) /* SSL_CTX *ssl_ctx; @@ -289,6 +291,7 @@ char *var_tls_tkt_cipher; char *var_openssl_path; char *var_tls_server_sni_maps; +bool var_tls_fast_shutdown; static MAPS *tls_server_sni_maps; @@ -625,6 +628,7 @@ VAR_TLS_BC_PKEY_FPRINT, DEF_TLS_BC_PKEY_FPRINT, &var_tls_bc_pkey_fprint, VAR_TLS_PREEMPT_CLIST, DEF_TLS_PREEMPT_CLIST, &var_tls_preempt_clist, VAR_TLS_MULTI_WILDCARD, DEF_TLS_MULTI_WILDCARD, &var_tls_multi_wildcard, + VAR_TLS_FAST_SHUTDOWN, DEF_TLS_FAST_SHUTDOWN, &var_tls_fast_shutdown, 0, }; static int init_done; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/tls/tls_session.c new/postfix-3.4.6/src/tls/tls_session.c --- old/postfix-3.4.5/src/tls/tls_session.c 2018-12-26 20:21:49.000000000 +0100 +++ new/postfix-3.4.6/src/tls/tls_session.c 2019-06-25 14:05:54.000000000 +0200 @@ -71,6 +71,10 @@ #include <msg.h> #include <mymalloc.h> +/* Global library. */ + +#include <mail_params.h> + /* TLS library. */ #define TLS_INTERNAL @@ -95,6 +99,18 @@ msg_panic("%s: stream has no active TLS context", myname); /* + * According to RFC 2246 (TLS 1.0), there is no requirement to wait for + * the peer's close-notify. If the application protocol provides + * sufficient session termination signaling, then there's no need to + * duplicate that at the TLS close-notify layer. + * + * https://tools.ietf.org/html/rfc2246#section-7.2.1 + * https://tools.ietf.org/html/rfc4346#section-7.2.1 + * https://tools.ietf.org/html/rfc5246#section-7.2.1 + * + * Specify 'tls_fast_shutdown = no' to enable the historical behavior + * described below. + * * Perform SSL_shutdown() twice, as the first attempt will send out the * shutdown alert but it will not wait for the peer's shutdown alert. * Therefore, when we are the first party to send the alert, we must call @@ -104,7 +120,7 @@ */ if (!failure) { retval = tls_bio_shutdown(vstream_fileno(stream), timeout, TLScontext); - if (retval == 0) + if (!var_tls_fast_shutdown && retval == 0) tls_bio_shutdown(vstream_fileno(stream), timeout, TLScontext); } tls_free_context(TLScontext); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/tlsproxy/tlsproxy.c new/postfix-3.4.6/src/tlsproxy/tlsproxy.c --- old/postfix-3.4.5/src/tlsproxy/tlsproxy.c 2019-02-22 01:24:38.000000000 +0100 +++ new/postfix-3.4.6/src/tlsproxy/tlsproxy.c 2019-06-29 15:33:40.000000000 +0200 @@ -282,6 +282,11 @@ /* Optional lookup tables with the Postfix \fBtlsproxy\fR(8) client TLS /* usage policy by next-hop destination and by remote TLS server /* hostname. +/* .PP +/* Introduced with Postfix 3.4.6, 3.3.5, 3.2.10, and 3.1.13: +/* .IP "\fBtls_fast_shutdown_enable (yes)\fR" +/* A workaround for implementations that hang Postfix while shuting +/* down a TLS session, until Postfix times out. /* OBSOLETE STARTTLS SUPPORT CONTROLS /* .ad /* .fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/util/printable.c new/postfix-3.4.6/src/util/printable.c --- old/postfix-3.4.5/src/util/printable.c 2015-01-14 01:19:23.000000000 +0100 +++ new/postfix-3.4.6/src/util/printable.c 2019-04-10 23:30:23.000000000 +0200 @@ -11,6 +11,11 @@ /* char *printable(buffer, replacement) /* char *buffer; /* int replacement; +/* +/* char *printable_except(buffer, replacement, except) +/* char *buffer; +/* int replacement; +/* const char *except; /* DESCRIPTION /* printable() replaces non-printable characters /* in its input with the given replacement. @@ -24,6 +29,8 @@ /* .IP replacement /* Replacement value for characters in \fIbuffer\fR that do not /* pass the ASCII isprint(3) test or that are not valid UTF8. +/* .IP except +/* Null-terminated sequence of non-replaced ASCII characters. /* LICENSE /* .ad /* .fi @@ -33,12 +40,18 @@ /* IBM T.J. Watson Research /* P.O. Box 704 /* Yorktown Heights, NY 10598, USA +/* +/* Wietse Venema +/* Google, Inc. +/* 111 8th Avenue +/* New York, NY 10011, USA /*--*/ /* System library. */ #include "sys_defs.h" #include <ctype.h> +#include <string.h> /* Utility library. */ @@ -46,8 +59,21 @@ int util_utf8_enable = 0; +/* printable - binary compatibility */ + +#undef printable + +char *printable(char *, int); + char *printable(char *string, int replacement) { + return (printable_except(string, replacement, (char *) 0)); +} + +/* printable_except - pass through printable or other preserved characters */ + +char *printable_except(char *string, int replacement, const char *except) +{ unsigned char *cp; int ch; @@ -57,7 +83,7 @@ */ cp = (unsigned char *) string; while ((ch = *cp) != 0) { - if (ISASCII(ch) && ISPRINT(ch)) { + if (ISASCII(ch) && (ISPRINT(ch) || (except && strchr(except, ch)))) { /* ok */ } else if (util_utf8_enable && ch >= 194 && ch <= 254 && cp[1] >= 128 && cp[1] < 192) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/util/stringops.h new/postfix-3.4.6/src/util/stringops.h --- old/postfix-3.4.5/src/util/stringops.h 2017-12-27 23:29:45.000000000 +0100 +++ new/postfix-3.4.6/src/util/stringops.h 2019-04-10 23:23:22.000000000 +0200 @@ -20,7 +20,7 @@ * External interface. */ extern int util_utf8_enable; -extern char *printable(char *, int); +extern char *printable_except(char *, int, const char *); extern char *neuter(char *, const char *, int); extern char *lowercase(char *); extern char *casefoldx(int, VSTRING *, const char *, ssize_t); @@ -32,6 +32,9 @@ extern char *mystrtokq(char **, const char *, const char *); extern char *translit(char *, const char *, const char *); +#define printable(string, replacement) \ + printable_except((string), (replacement), (char *) 0) + #ifndef HAVE_BASENAME #define basename postfix_basename extern char *basename(const char *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-3.4.5/src/util/unix_dgram_connect.c new/postfix-3.4.6/src/util/unix_dgram_connect.c --- old/postfix-3.4.5/src/util/unix_dgram_connect.c 2019-01-29 23:24:42.000000000 +0100 +++ new/postfix-3.4.6/src/util/unix_dgram_connect.c 2019-04-01 23:48:27.000000000 +0200 @@ -60,6 +60,7 @@ int unix_dgram_connect(const char *path, int block_mode) { const char myname[] = "unix_dgram_connect"; +#undef sun struct sockaddr_un sun; ssize_t path_len; int sock;

1 0

commit libXt for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package libXt for openSUSE:Factory checked in at 2019-07-08 15:02:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXt (Old) and /work/SRC/openSUSE:Factory/.libXt.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libXt" Mon Jul 8 15:02:07 2019 rev:11 rq:713196 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libXt/libXt.changes 2017-11-30 12:33:30.851829909 +0100 +++ /work/SRC/openSUSE:Factory/.libXt.new.4615/libXt.changes 2019-07-08 15:02:08.670636118 +0200 @@ -1,0 +2,7 @@ +Wed Jul 3 09:33:33 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com> + +- Update to version 1.2.0 + * bug fixes +- supersedes U_libXt_code-cleanup.patch + +------------------------------------------------------------------- Old: ---- U_libXt_code-cleanup.patch libXt-1.1.5.tar.bz2 New: ---- libXt-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXt.spec ++++++ --- /var/tmp/diff_new_pack.9Zzbf4/_old 2019-07-08 15:02:09.354637151 +0200 +++ /var/tmp/diff_new_pack.9Zzbf4/_new 2019-07-08 15:02:09.362637164 +0200 @@ -1,7 +1,7 @@ # # spec file for package libXt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libXt %define lname libXt6 -Version: 1.1.5 +Version: 1.2.0 Release: 0 Summary: X Toolkit Intrinsics library License: MIT @@ -29,7 +29,6 @@ #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXt/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.… Source1: baselibs.conf -Patch: U_libXt_code-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake, libtool @@ -52,8 +51,8 @@ %package -n %lname Summary: X Toolkit Intrinsics library -Group: System/Libraries # O/P added for 12.2 +Group: System/Libraries Provides: xorg-x11-libXt = 7.6_%version-%release Obsoletes: xorg-x11-libXt < 7.6_%version-%release @@ -86,7 +85,6 @@ %prep %setup -q -%patch -p1 %build %configure --docdir=%_docdir/%name --disable-static ++++++ libXt-1.1.5.tar.bz2 -> libXt-1.2.0.tar.bz2 ++++++ ++++ 69947 lines of diff (skipped)

1 0

commit python-mccabe for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package python-mccabe for openSUSE:Factory checked in at 2019-07-08 15:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mccabe (Old) and /work/SRC/openSUSE:Factory/.python-mccabe.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mccabe" Mon Jul 8 15:02:02 2019 rev:8 rq:713189 version:0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mccabe/python-mccabe.changes 2017-04-19 17:56:34.458798710 +0200 +++ /work/SRC/openSUSE:Factory/.python-mccabe.new.4615/python-mccabe.changes 2019-07-08 15:02:03.482628273 +0200 @@ -1,0 +2,5 @@ +Wed Jul 3 09:10:58 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com> + +- Fix the test run with new pytest + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mccabe.spec ++++++ --- /var/tmp/diff_new_pack.SleJH0/_old 2019-07-08 15:02:04.362629604 +0200 +++ /var/tmp/diff_new_pack.SleJH0/_new 2019-07-08 15:02:04.370629616 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-mccabe # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,12 +23,12 @@ Summary: McCabe checker, plugin for flake8 License: MIT Group: Development/Languages/Python -Url: https://github.com/flintwork/mccabe -Source: https://pypi.io/packages/source/m/mccabe/mccabe-%{version}.tar.gz -BuildRequires: %{python_module pytest-runner} +URL: https://github.com/flintwork/mccabe +Source: https://files.pythonhosted.org/packages/source/m/mccabe/mccabe-%{version}.t… +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -38,19 +38,22 @@ %prep %setup -q -n mccabe-%{version} +# do not require pytest-runner for setup +sed -i 's:pytest-runner::' setup.py %build %python_build %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%python_exec %{_bindir}/py.test +%pytest %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE README.rst +%license LICENSE +%doc README.rst %{python_sitelib}/* %changelog

1 0

commit salt for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2019-07-08 15:01:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "salt" Mon Jul 8 15:01:56 2019 rev:89 rq:713188 version:2019.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2019-06-25 22:17:15.416702351 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.4615/salt.changes 2019-07-08 15:01:57.966619933 +0200 @@ -1,0 +2,16 @@ +Wed Jul 3 08:53:13 UTC 2019 - Pablo Suárez Hernández <pablo.suarezhernandez(a)suse.com> + +- Allow passing kwargs to pkg.list_downloaded for Zypper (bsc#1140193) + +- Added: + * allow-passing-kwargs-to-pkg.list_downloaded-bsc-1140.patch + +------------------------------------------------------------------- +Fri Jun 28 15:26:59 UTC 2019 - Pablo Suárez Hernández <pablo.suarezhernandez(a)suse.com> + +- Do not make "ansiblegate" module to crash on Python3 minions (bsc#1139761) + +- Added: + * do-not-make-ansiblegate-to-crash-on-python3-minions.patch + +------------------------------------------------------------------- New: ---- allow-passing-kwargs-to-pkg.list_downloaded-bsc-1140.patch do-not-make-ansiblegate-to-crash-on-python3-minions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.WwRjfD/_old 2019-07-08 15:02:00.246623380 +0200 +++ /var/tmp/diff_new_pack.WwRjfD/_new 2019-07-08 15:02:00.250623386 +0200 @@ -198,6 +198,10 @@ Patch65: virt.volume_infos-fix-for-single-vm.patch # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/161 Patch66: provide-the-missing-features-required-for-yomi-yet-o.patch +# PATCH_FIX_UPSTREAM: https://github.com/saltstack/salt/pull/53661 +Patch67: do-not-make-ansiblegate-to-crash-on-python3-minions.patch +# PATCH_FIX_UPSTREAM: https://github.com/saltstack/salt/pull/53693 +Patch68: allow-passing-kwargs-to-pkg.list_downloaded-bsc-1140.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -734,6 +738,8 @@ %patch64 -p1 %patch65 -p1 %patch66 -p1 +%patch67 -p1 +%patch68 -p1 %build %if 0%{?build_py2} ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.WwRjfD/_old 2019-07-08 15:02:00.326623501 +0200 +++ /var/tmp/diff_new_pack.WwRjfD/_new 2019-07-08 15:02:00.330623508 +0200 @@ -1 +1 @@ -9254ebb1efeefa8f3a97e0c301de5f7376f14669 \ No newline at end of file +0ae10b837a49c10246690aabc972d2cb02bb75de \ No newline at end of file ++++++ allow-passing-kwargs-to-pkg.list_downloaded-bsc-1140.patch ++++++ >From 9e2139213bc2eeb8afbf10fdff663ebe7ed23887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernandez(a)suse.com> Date: Wed, 3 Jul 2019 09:34:50 +0100 Subject: [PATCH] Allow passing kwargs to pkg.list_downloaded (bsc#1140193) Add unit test for pkg.list_downloaded with kwargs --- salt/modules/zypperpkg.py | 2 +- tests/unit/modules/test_zypperpkg.py | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/salt/modules/zypperpkg.py b/salt/modules/zypperpkg.py index 9d0407e674..6bc7211f59 100644 --- a/salt/modules/zypperpkg.py +++ b/salt/modules/zypperpkg.py @@ -2553,7 +2553,7 @@ def download(*packages, **kwargs): ) -def list_downloaded(root=None): +def list_downloaded(root=None, **kwargs): ''' .. versionadded:: 2017.7.0 diff --git a/tests/unit/modules/test_zypperpkg.py b/tests/unit/modules/test_zypperpkg.py index d2ae06a98e..0a3053680f 100644 --- a/tests/unit/modules/test_zypperpkg.py +++ b/tests/unit/modules/test_zypperpkg.py @@ -766,6 +766,33 @@ Repository 'DUMMY' not found by its alias, number, or URI. self.assertEqual(len(list_patches), 3) self.assertDictEqual(list_patches, PATCHES_RET) + @patch('salt.utils.path.os_walk', MagicMock(return_value=[('test', 'test', 'test')])) + @patch('os.path.getsize', MagicMock(return_value=123456)) + @patch('os.path.getctime', MagicMock(return_value=1234567890.123456)) + @patch('fnmatch.filter', MagicMock(return_value=['/var/cache/zypper/packages/foo/bar/test_package.rpm'])) + def test_list_downloaded_with_kwargs(self): + ''' + Test downloaded packages listing. + + :return: + ''' + DOWNLOADED_RET = { + 'test-package': { + '1.0': { + 'path': '/var/cache/zypper/packages/foo/bar/test_package.rpm', + 'size': 123456, + 'creation_date_time_t': 1234567890, + 'creation_date_time': '2009-02-13T23:31:30', + } + } + } + + with patch.dict(zypper.__salt__, {'lowpkg.bin_pkg_info': MagicMock(return_value={'name': 'test-package', + 'version': '1.0'})}): + list_downloaded = zypper.list_downloaded(kw1=True, kw2=False) + self.assertEqual(len(list_downloaded), 1) + self.assertDictEqual(list_downloaded, DOWNLOADED_RET) + @patch('salt.utils.path.os_walk', MagicMock(return_value=[('test', 'test', 'test')])) @patch('os.path.getsize', MagicMock(return_value=123456)) @patch('os.path.getctime', MagicMock(return_value=1234567890.123456)) -- 2.21.0 ++++++ do-not-make-ansiblegate-to-crash-on-python3-minions.patch ++++++ >From 189a19b6e8d28cc49e5ad5f2a683e1dfdce66a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernandez(a)suse.com> Date: Fri, 28 Jun 2019 15:17:56 +0100 Subject: [PATCH] Do not make ansiblegate to crash on Python3 minions Fix pylint issues Move MockTimedProc implementation to tests.support.mock Add unit test for ansible caller --- salt/modules/ansiblegate.py | 14 +++++++-- tests/support/mock.py | 31 +++++++++++++++++++ tests/unit/modules/test_ansiblegate.py | 41 ++++++++++++++++++++++++++ tests/unit/modules/test_cmdmod.py | 34 +-------------------- 4 files changed, 84 insertions(+), 36 deletions(-) diff --git a/salt/modules/ansiblegate.py b/salt/modules/ansiblegate.py index 771db6d6aa..88e8147573 100644 --- a/salt/modules/ansiblegate.py +++ b/salt/modules/ansiblegate.py @@ -147,6 +147,10 @@ class AnsibleModuleCaller(object): :param kwargs: keywords to the module :return: ''' + if six.PY3: + python_exec = 'python3' + else: + python_exec = 'python' module = self._resolver.load_module(module) if not hasattr(module, 'main'): @@ -162,9 +166,13 @@ class AnsibleModuleCaller(object): ["echo", "{0}".format(js_args)], stdout=subprocess.PIPE, timeout=self.timeout) proc_out.run() + if six.PY3: + proc_out_stdout = proc_out.stdout.decode() + else: + proc_out_stdout = proc_out.stdout proc_exc = salt.utils.timed_subprocess.TimedProc( - ['python', module.__file__], - stdin=proc_out.stdout, stdout=subprocess.PIPE, timeout=self.timeout) + [python_exec, module.__file__], + stdin=proc_out_stdout, stdout=subprocess.PIPE, timeout=self.timeout) proc_exc.run() try: @@ -263,7 +271,7 @@ def help(module=None, *args): description = doc.get('description') or '' del doc['description'] ret['Description'] = description - ret['Available sections on module "{}"'.format(module.__name__.replace('ansible.modules.', ''))] = doc.keys() + ret['Available sections on module "{}"'.format(module.__name__.replace('ansible.modules.', ''))] = [i for i in doc.keys()] else: for arg in args: info = doc.get(arg) diff --git a/tests/support/mock.py b/tests/support/mock.py index 38b68bd5c4..4b44c112ee 100644 --- a/tests/support/mock.py +++ b/tests/support/mock.py @@ -510,6 +510,37 @@ class MockOpen(object): ret.extend(fh_.writelines_calls) return ret +class MockTimedProc(object): + ''' + Class used as a stand-in for salt.utils.timed_subprocess.TimedProc + ''' + class _Process(object): + ''' + Used to provide a dummy "process" attribute + ''' + def __init__(self, returncode=0, pid=12345): + self.returncode = returncode + self.pid = pid + + def __init__(self, stdout=None, stderr=None, returncode=0, pid=12345): + if stdout is not None and not isinstance(stdout, bytes): + raise TypeError('Must pass stdout to MockTimedProc as bytes') + if stderr is not None and not isinstance(stderr, bytes): + raise TypeError('Must pass stderr to MockTimedProc as bytes') + self._stdout = stdout + self._stderr = stderr + self.process = self._Process(returncode=returncode, pid=pid) + + def run(self): + pass + + @property + def stdout(self): + return self._stdout + + @property + def stderr(self): + return self._stderr # reimplement mock_open to support multiple filehandles mock_open = MockOpen diff --git a/tests/unit/modules/test_ansiblegate.py b/tests/unit/modules/test_ansiblegate.py index 1fbb083eb7..70b47f8bc2 100644 --- a/tests/unit/modules/test_ansiblegate.py +++ b/tests/unit/modules/test_ansiblegate.py @@ -29,6 +29,7 @@ from tests.support.unit import TestCase, skipIf from tests.support.mock import ( patch, MagicMock, + MockTimedProc, NO_MOCK, NO_MOCK_REASON ) @@ -36,6 +37,7 @@ from tests.support.mock import ( import salt.modules.ansiblegate as ansible import salt.utils.platform from salt.exceptions import LoaderError +from salt.ext import six @skipIf(NO_MOCK, NO_MOCK_REASON) @@ -137,3 +139,42 @@ description: ''' with patch('salt.modules.ansiblegate.ansible', None): assert ansible.__virtual__() == 'ansible' + + def test_ansible_module_call(self): + ''' + Test Ansible module call from ansible gate module + + :return: + ''' + + class Module(object): + ''' + An ansible module mock. + ''' + __name__ = 'one.two.three' + __file__ = 'foofile' + + def main(): + pass + + ANSIBLE_MODULE_ARGS = '{"ANSIBLE_MODULE_ARGS": ["arg_1", {"kwarg1": "foobar"}]}' + + proc = MagicMock(side_effect=[ + MockTimedProc( + stdout=ANSIBLE_MODULE_ARGS.encode(), + stderr=None), + MockTimedProc(stdout='{"completed": true}'.encode(), stderr=None) + ]) + + with patch.object(ansible, '_resolver', self.resolver), \ + patch.object(ansible._resolver, 'load_module', MagicMock(return_value=Module())): + _ansible_module_caller = ansible.AnsibleModuleCaller(ansible._resolver) + with patch('salt.utils.timed_subprocess.TimedProc', proc): + ret = _ansible_module_caller.call("one.two.three", "arg_1", kwarg1="foobar") + if six.PY3: + proc.assert_any_call(['echo', '{"ANSIBLE_MODULE_ARGS": {"kwarg1": "foobar", "_raw_params": "arg_1"}}'], stdout=-1, timeout=1200) + proc.assert_any_call(['python3', 'foofile'], stdin=ANSIBLE_MODULE_ARGS, stdout=-1, timeout=1200) + else: + proc.assert_any_call(['echo', '{"ANSIBLE_MODULE_ARGS": {"_raw_params": "arg_1", "kwarg1": "foobar"}}'], stdout=-1, timeout=1200) + proc.assert_any_call(['python', 'foofile'], stdin=ANSIBLE_MODULE_ARGS, stdout=-1, timeout=1200) + assert ret == {"completed": True, "timeout": 1200} diff --git a/tests/unit/modules/test_cmdmod.py b/tests/unit/modules/test_cmdmod.py index 8da672dd22..a20afaca0f 100644 --- a/tests/unit/modules/test_cmdmod.py +++ b/tests/unit/modules/test_cmdmod.py @@ -24,6 +24,7 @@ from tests.support.paths import FILES from tests.support.mock import ( mock_open, Mock, + MockTimedProc, MagicMock, NO_MOCK, NO_MOCK_REASON, @@ -36,39 +37,6 @@ MOCK_SHELL_FILE = '# List of acceptable shells\n' \ '/bin/bash\n' -class MockTimedProc(object): - ''' - Class used as a stand-in for salt.utils.timed_subprocess.TimedProc - ''' - class _Process(object): - ''' - Used to provide a dummy "process" attribute - ''' - def __init__(self, returncode=0, pid=12345): - self.returncode = returncode - self.pid = pid - - def __init__(self, stdout=None, stderr=None, returncode=0, pid=12345): - if stdout is not None and not isinstance(stdout, bytes): - raise TypeError('Must pass stdout to MockTimedProc as bytes') - if stderr is not None and not isinstance(stderr, bytes): - raise TypeError('Must pass stderr to MockTimedProc as bytes') - self._stdout = stdout - self._stderr = stderr - self.process = self._Process(returncode=returncode, pid=pid) - - def run(self): - pass - - @property - def stdout(self): - return self._stdout - - @property - def stderr(self): - return self._stderr - - @skipIf(NO_MOCK, NO_MOCK_REASON) class CMDMODTestCase(TestCase, LoaderModuleMockMixin): ''' -- 2.21.0

1 0

commit gsoap for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package gsoap for openSUSE:Factory checked in at 2019-07-08 15:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gsoap (Old) and /work/SRC/openSUSE:Factory/.gsoap.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gsoap" Mon Jul 8 15:01:50 2019 rev:54 rq:713175 version:2.8.86 Changes: -------- --- /work/SRC/openSUSE:Factory/gsoap/gsoap.changes 2019-05-20 10:26:03.217962855 +0200 +++ /work/SRC/openSUSE:Factory/.gsoap.new.4615/gsoap.changes 2019-07-08 15:01:52.162611157 +0200 @@ -1,0 +2,14 @@ +Wed Jun 26 07:39:10 UTC 2019 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to new upstream release 2.8.86 + * Added `soap::client_addr` string to specify a IPv4 or IPv6 or + a host address to bind to before connecting. This can be used + at the client side to bind to an address before connecting to + a server endpoint, similar to `soap::client_port`. + * Fixed wsdl2h compilation issue with C++17. + * Fixed a problem with the `SOAP_SSL_DEFAULT` settings + parameter used with `soap_ssl_client_context` and + `soap_ssl_server_context` that may lead to a weaker setting + than specified. + +------------------------------------------------------------------- Old: ---- gsoap-2.8.84.tar.xz New: ---- gsoap-2.8.86.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsoap.spec ++++++ --- /var/tmp/diff_new_pack.SCilEq/_old 2019-07-08 15:01:53.230612772 +0200 +++ /var/tmp/diff_new_pack.SCilEq/_new 2019-07-08 15:01:53.230612772 +0200 @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_84 -Version: 2.8.84 +%define lname libgsoap-2_8_86 +Version: 2.8.86 Release: 0 Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception ++++++ gsoap-2.8.84.tar.xz -> gsoap-2.8.86.tar.xz ++++++ /work/SRC/openSUSE:Factory/gsoap/gsoap-2.8.84.tar.xz /work/SRC/openSUSE:Factory/.gsoap.new.4615/gsoap-2.8.86.tar.xz differ: char 27, line 1 ++++++ sanitize_source.sh ++++++ --- /var/tmp/diff_new_pack.SCilEq/_old 2019-07-08 15:01:53.298612875 +0200 +++ /var/tmp/diff_new_pack.SCilEq/_new 2019-07-08 15:01:53.298612875 +0200 @@ -13,7 +13,7 @@ exit 1; fi; -version="2.8.84" +version="2.8.86" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"

1 0

commit apache2 for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2019-07-08 15:01:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2" Mon Jul 8 15:01:45 2019 rev:157 rq:713174 version:2.4.39 Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2019-05-17 23:36:23.746133634 +0200 +++ /work/SRC/openSUSE:Factory/.apache2.new.4615/apache2.changes 2019-07-08 15:01:46.518602624 +0200 @@ -1,0 +2,7 @@ +Wed Jun 26 07:34:16 UTC 2019 - pgajdos(a)suse.com + +- fix typo +- modified sources + % apache2-README-instances.txt + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-README-instances.txt ++++++ --- /var/tmp/diff_new_pack.Gooesi/_old 2019-07-08 15:01:48.106605025 +0200 +++ /var/tmp/diff_new_pack.Gooesi/_new 2019-07-08 15:01:48.106605025 +0200 @@ -26,7 +26,7 @@ NOTES: * /etc/sysconfig/apache2@<instancename> can hold any sysconfig variable /etc/sysconfig/apache2 can, including module loading and MPM setting, -* default instance do not have to run when running other instances +* default instance does not have to run when running other instances * a2enmod, a2dismod and apachectl operates over default instance if not specified otherwise via HTTPD_INSTANCE. For example,

1 0

commit meson for openSUSE:Factory
by root 08 Jul '19

08 Jul '19

Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2019-07-08 15:01:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meson" Mon Jul 8 15:01:39 2019 rev:44 rq:713160 version:0.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson.changes 2019-05-17 23:37:11.526108459 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new.4615/meson.changes 2019-07-08 15:01:40.670593782 +0200 @@ -1,0 +2,34 @@ +Wed Jun 26 10:51:31 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Update to versoin 0.51.0: + + (C) Preprocessor flag handling. + + Sanity checking compilers with user flags. + + New sourceset module. + + n_debug=if-release and buildtype=plain means no asserts. + + target_type in build_targets accepts the value 'shared_module'. + + New modules kwarg for python.find_installation. + + Support for the Intel Compiler on Windows (ICL). + + Added basic support for the Xtensa CPU toolchain. + + Dependency objects now have a get_variable method. + + CMake prefix path overrides. + + Tests that should fail but did not are now errors. + + New target keyword argument: link_language. + + New module to parse kconfig output files. + + Add new meson subprojects foreach command. + + Added c17 and c18 as c_std values for recent GCC and Clang + Versions. + + gpgme dependency now supports gpgme-config. + + Can link against custom targets. + + Removed the deprecated --target-files API. + + Generators have a new depends keyword argument. + + Specifying options per mer machine. + + subproject.get_variable() now accepts a fallback argument. + + Add keyword static to find_library. + + Fortran include statements recursively parsed. + + CMake subprojects. + + Multipe cross files can be specified. +- Rebase meson-suse-ify-macros.patch. +- Add python3-setuptools unconditionally to BuildRequires for the + test suite. + +------------------------------------------------------------------- Old: ---- meson-0.50.1.tar.gz meson-0.50.1.tar.gz.asc New: ---- meson-0.51.0.tar.gz meson-0.51.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.sHWv8j/_old 2019-07-08 15:01:41.478595003 +0200 +++ /var/tmp/diff_new_pack.sHWv8j/_new 2019-07-08 15:01:41.482595010 +0200 @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.50.1 +Version: 0.51.0 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -89,6 +89,7 @@ BuildRequires: pkgconfig BuildRequires: python2-devel BuildRequires: python3-gobject +BuildRequires: python3-setuptools BuildRequires: zlib-devel-static BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) ++++++ meson-0.50.1.tar.gz -> meson-0.51.0.tar.gz ++++++ ++++ 25363 lines of diff (skipped) ++++++ meson-suse-ify-macros.patch ++++++ --- /var/tmp/diff_new_pack.sHWv8j/_old 2019-07-08 15:01:42.318596274 +0200 +++ /var/tmp/diff_new_pack.sHWv8j/_new 2019-07-08 15:01:42.318596274 +0200 @@ -1,14 +1,19 @@ -Index: meson-0.50.0/data/macros.meson +Index: meson-0.51.0/data/macros.meson =================================================================== ---- meson-0.50.0.orig/data/macros.meson -+++ meson-0.50.0/data/macros.meson -@@ -1,9 +1,15 @@ +--- meson-0.51.0.orig/data/macros.meson ++++ meson-0.51.0/data/macros.meson +@@ -1,6 +1,8 @@ %__meson %{_bindir}/meson %__meson_wrap_mode nodownload %__meson_auto_features enabled +%_vpath_srcdir . +%_vpath_builddir build + %_smp_mesonflags %([ -z "$MESON_BUILD_NCPUS" ] \\\ + && MESON_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ +@@ -9,7 +11,11 @@ + if [ "$MESON_BUILD_NCPUS" -gt 1 ]; then echo "--num-processes $MESON_BUILD_NCPUS"; fi) + %meson \ - %set_build_flags \ + export LANG=C.UTF-8 \ @@ -19,7 +24,7 @@ %{shrink:%{__meson} \ --buildtype=plain \ --prefix=%{_prefix} \ -@@ -25,10 +31,13 @@ +@@ -31,12 +37,15 @@ %{nil}} %meson_build \ @@ -32,4 +37,6 @@ %meson_test \ + export LANG=C.UTF-8 \ - %ninja_test -C %{_vpath_builddir} + %{shrink: %{__meson} test \ + -C %{_vpath_builddir} \ + %{?_smp_mesonflags} \

1 0