February 2019 - openSUSE Commits - openSUSE Mailing Lists

commit python-joblib for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package python-joblib for openSUSE:Factory checked in at 2019-02-01 11:45:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-joblib (Old) and /work/SRC/openSUSE:Factory/.python-joblib.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-joblib" Fri Feb 1 11:45:44 2019 rev:6 rq:669904 version:0.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-joblib/python-joblib.changes 2019-01-08 12:31:39.628064190 +0100 +++ /work/SRC/openSUSE:Factory/.python-joblib.new.28833/python-joblib.changes 2019-02-01 11:45:45.192533518 +0100 @@ -1,0 +2,15 @@ +Tue Jan 29 16:41:57 CET 2019 - mcepl(a)suse.com + +- Update to Release 0.13.1: + * Memory now accepts pathlib.Path objects as ``location`` + parameter. Also, a warning is raised if the returned backend + is None while ``location`` is not None. + * Make ``Parallel`` raise an informative ``RuntimeError`` when + the active parallel backend has zero worker. + * Make the ``DaskDistributedBackend`` wait for workers before + trying to schedule work. This is useful in particular when + the workers are provisionned dynamically but provisionning is + not immediate (for instance using Kubernetes, Yarn or an HPC + job queue). + +------------------------------------------------------------------- Old: ---- joblib-0.13.0.tar.gz New: ---- joblib-0.13.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-joblib.spec ++++++ --- /var/tmp/diff_new_pack.8IjYBZ/_old 2019-02-01 11:45:45.996532692 +0100 +++ /var/tmp/diff_new_pack.8IjYBZ/_new 2019-02-01 11:45:45.996532692 +0100 @@ -18,25 +18,24 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-joblib -Version: 0.13.0 +Version: 0.13.1 Release: 0 Summary: Module for using Python functions as pipeline jobs License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/joblib/joblib Source: https://files.pythonhosted.org/packages/source/j/joblib/joblib-%{version}.t… -BuildRequires: %{python_module setuptools} -BuildRequires: fdupes -BuildRequires: python-rpm-macros -Recommends: python-numpy -BuildArch: noarch BuildRequires: %{python_module lz4} BuildRequires: %{python_module numpy} BuildRequires: %{python_module psutil} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes +BuildRequires: python-rpm-macros Requires: python-lz4 Recommends: python-numpy Recommends: python-psutil +BuildArch: noarch %python_subpackages %description ++++++ joblib-0.13.0.tar.gz -> joblib-0.13.1.tar.gz ++++++ ++++ 39785 lines of diff (skipped)

1 0

commit libosmo-dsp for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package libosmo-dsp for openSUSE:Factory checked in at 2019-02-01 11:45:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmo-dsp (Old) and /work/SRC/openSUSE:Factory/.libosmo-dsp.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libosmo-dsp" Fri Feb 1 11:45:36 2019 rev:4 rq:669883 version:0.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libosmo-dsp/libosmo-dsp.changes 2018-03-20 22:01:10.563919229 +0100 +++ /work/SRC/openSUSE:Factory/.libosmo-dsp.new.28833/libosmo-dsp.changes 2019-02-01 11:45:40.860537967 +0100 @@ -1,0 +2,6 @@ +Mon Jan 28 22:01:07 UTC 2019 - mardnh(a)gmx.de + +- Update to new upstream release 0.4.0 + * No functional changes since our last git snapshot (0.3.8) + +------------------------------------------------------------------- Old: ---- libosmo-dsp-0.3.8.tar.xz New: ---- libosmo-dsp-0.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmo-dsp.spec ++++++ --- /var/tmp/diff_new_pack.NDH03G/_old 2019-02-01 11:45:42.696536081 +0100 +++ /var/tmp/diff_new_pack.NDH03G/_new 2019-02-01 11:45:42.740536036 +0100 @@ -7,7 +7,7 @@ %define libname libosmodsp0 Name: libosmo-dsp -Version: 0.3.8 +Version: 0.4.0 Release: 0 Summary: SDR DSP primitives License: GPL-2.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NDH03G/_old 2019-02-01 11:45:43.108535658 +0100 +++ /var/tmp/diff_new_pack.NDH03G/_new 2019-02-01 11:45:43.124535642 +0100 @@ -2,9 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">git://git.osmocom.org/libosmo-dsp</param> - <param name="revision">master</param> - <param name="versionrewrite-pattern">v(.*)</param> - <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> + <param name="revision">0.4.0</param> + <param name="versionformat">0.4.0</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ libosmo-dsp-0.3.8.tar.xz -> libosmo-dsp-0.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/Makefile.am new/libosmo-dsp-0.4.0/Makefile.am --- old/libosmo-dsp-0.3.8/Makefile.am 2017-03-17 21:29:18.000000000 +0100 +++ new/libosmo-dsp-0.4.0/Makefile.am 2019-01-26 17:52:50.000000000 +0100 @@ -37,3 +37,5 @@ endif MOSTLYCLEANFILES = $(DX_CLEAN) + +@RELMAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/configure.ac new/libosmo-dsp-0.4.0/configure.ac --- old/libosmo-dsp-0.3.8/configure.ac 2017-03-17 21:29:18.000000000 +0100 +++ new/libosmo-dsp-0.4.0/configure.ac 2019-01-26 17:52:50.000000000 +0100 @@ -7,6 +7,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/changelog new/libosmo-dsp-0.4.0/debian/changelog --- old/libosmo-dsp-0.3.8/debian/changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/changelog 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1,11 @@ +libosmodsp (0.4.0) unstable; urgency=medium + + * Use release helper from libosmcoore + + -- Harald Welte <laforge(a)gnumonks.org> Sat, 26 Jan 2019 17:52:49 +0100 + +libosmodsp (0.3.0) testing; urgency=low + + * Initial release. + + -- Harald Welte <laforge(a)gnumonks.org> Thu, 17 Jan 2019 17:19:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/compat new/libosmo-dsp-0.4.0/debian/compat --- old/libosmo-dsp-0.3.8/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/compat 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1 @@ +9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/control new/libosmo-dsp-0.4.0/debian/control --- old/libosmo-dsp-0.3.8/debian/control 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/control 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1,69 @@ +Source: libosmodsp +Section: libs +Priority: optional +Maintainer: Harald Welte <laforge(a)gnumonks.org> +Build-Depends: debhelper (>= 9), + autotools-dev, + autoconf, + automake, + libtool, + dh-autoreconf, + libdpkg-perl, + git, + doxygen, + pkg-config, + libfftw3-dev +Standards-Version: 3.9.6 +Vcs-Browser: http://git.osmocom.org/libosmo-dsp/ +Vcs-Git: git://git.osmocom.org/libosmo-dsp.git +Homepage: https://osmocom.org/projects/libosmo-dsp + +Package: libosmodsp0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Description: Osmocom Software Defined Radio Digital Signal Processing Library + C-language library for common DSP (Digital Signal Processing) primitives + for SDR (Software Defined Radio). They are part of the Osmocom (Open + Source Mobile Communications) project. + +Package: libosmodsp-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libosmodsp0 (= ${binary:Version}) +Multi-Arch: same +Description: Development headers for Osmocom DSP Library + C-language library for common DSP (Digital Signal Processing) primitives + for SDR (Software Defined Radio). They are part of the Osmocom (Open + Source Mobile Communications) project. + . + This package contains the development files needed for developing with + the libosmodsp library. + +Package: libosmodsp-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmodsp0, + libjs-jquery +Description: Documentation for the Osmocom DSP Library + C-language library for common DSP (Digital Signal Processing) primitives + for SDR (Software Defined Radio). They are part of the Osmocom (Open + Source Mobile Communications) project. + . + This package contains the documentation for the libosmodsp library. + +Package: libosmodsp-dbg +Section: debug +Architecture: any +Priority: extra +Depends: libosmodsp0 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same +Description: Debug symbols for Osmocom DSP library + C-language library for common DSP (Digital Signal Processing) primitives + for SDR (Software Defined Radio). They are part of the Osmocom (Open + Source Mobile Communications) project. + . + This package contains the debug symbols for the library. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/copyright new/libosmo-dsp-0.4.0/debian/copyright --- old/libosmo-dsp-0.3.8/debian/copyright 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/copyright 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1,28 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libosmodsp +Source: git://git.osmocom.org/libosmo-dsp.git + +Files: * +Copyright: 2011-2013 Sylvain Munaut <tnt(a)246tNt.com> +License: GPL-2+ + +Files: debian/* +Copyright: 2018 Harald Welte <laforge(a)gnumonks.org> +License: GPL-2+ + +License: GPL-2+ + This package is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/libosmodsp-dev.install new/libosmo-dsp-0.4.0/debian/libosmodsp-dev.install --- old/libosmo-dsp-0.3.8/debian/libosmodsp-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/libosmodsp-dev.install 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/lib*.la +usr/lib/*/pkgconfig/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/libosmodsp-doc.doc-base new/libosmo-dsp-0.4.0/debian/libosmodsp-doc.doc-base --- old/libosmo-dsp-0.3.8/debian/libosmodsp-doc.doc-base 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/libosmodsp-doc.doc-base 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1,7 @@ +Document: libosmodsp-doc +Title: Documentation for the libosmods library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmodsp/html/index.html +Files: /usr/share/doc/libosmodsp/html/*.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/libosmodsp-doc.install new/libosmo-dsp-0.4.0/debian/libosmodsp-doc.install --- old/libosmo-dsp-0.3.8/debian/libosmodsp-doc.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/libosmodsp-doc.install 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1 @@ +usr/share/doc/libosmodsp/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/libosmodsp0.install new/libosmo-dsp-0.4.0/debian/libosmodsp0.install --- old/libosmo-dsp-0.3.8/debian/libosmodsp0.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/libosmodsp0.install 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libosmodsp*.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/rules new/libosmo-dsp-0.4.0/debian/rules --- old/libosmo-dsp-0.3.8/debian/rules 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/rules 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +#export DH_VERBOSE=1 + + +%: + dh $@ --with autoreconf --fail-missing + +override_dh_strip: + dh_strip --dbg-package=libosmodsp-dbg + +override_dh_install: + sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` + dh_install + +override_dh_clean: + dh_clean + rm -f .version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/debian/source/format new/libosmo-dsp-0.4.0/debian/source/format --- old/libosmo-dsp-0.3.8/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-dsp-0.4.0/debian/source/format 2019-01-26 17:52:50.000000000 +0100 @@ -0,0 +1 @@ +3.0 (native) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-dsp-0.3.8/src/Makefile.am new/libosmo-dsp-0.4.0/src/Makefile.am --- old/libosmo-dsp-0.3.8/src/Makefile.am 2017-03-17 21:29:18.000000000 +0100 +++ new/libosmo-dsp-0.4.0/src/Makefile.am 2019-01-26 17:52:50.000000000 +0100 @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=0:1:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include AM_CFLAGS = -Wall -ffast-math $(FFTW3F_CFLAGS)

1 0

commit rdesktop for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package rdesktop for openSUSE:Factory checked in at 2019-02-01 11:45:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdesktop (Old) and /work/SRC/openSUSE:Factory/.rdesktop.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rdesktop" Fri Feb 1 11:45:34 2019 rev:36 rq:669874 version:1.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/rdesktop/rdesktop.changes 2018-02-15 13:26:48.013155966 +0100 +++ /work/SRC/openSUSE:Factory/.rdesktop.new.28833/rdesktop.changes 2019-02-01 11:45:35.644543324 +0100 @@ -1,0 +2,34 @@ +Mon Jan 28 20:29:52 UTC 2019 - Markus Beth <markus.beth(a)web.de> + +- update to 1.8.4 + * Add rdp_protocol_error function that is used in several fixes + * Refactor of process_bitmap_updates + * Fix possible integer overflow in s_check_rem() on 32bit arch + * Fix memory corruption in process_bitmap_data - CVE-2018-8794 + * Fix remote code execution in process_bitmap_data - CVE-2018-8795 + * Fix remote code execution in process_plane - CVE-2018-8797 + * Fix Denial of Service in mcs_recv_connect_response - CVE-2018-20175 + * Fix Denial of Service in mcs_parse_domain_params - CVE-2018-20175 + * Fix Denial of Service in sec_parse_crypt_info - CVE-2018-20176 + * Fix Denial of Service in sec_recv - CVE-2018-20176 + * Fix minor information leak in rdpdr_process - CVE-2018-8791 + * Fix Denial of Service in cssp_read_tsrequest - CVE-2018-8792 + * Fix remote code execution in cssp_read_tsrequest - CVE-2018-8793 + * Fix Denial of Service in process_bitmap_data - CVE-2018-8796 + * Fix minor information leak in rdpsnd_process_ping - CVE-2018-8798 + * Fix Denial of Service in process_secondary_order - CVE-2018-8799 + * Fix remote code execution in in ui_clip_handle_data - CVE-2018-8800 + * Fix major information leak in ui_clip_handle_data - CVE-2018-20174 + * Fix memory corruption in rdp_in_unistr - CVE-2018-20177 + * Fix Denial of Service in process_demand_active - CVE-2018-20178 + * Fix remote code execution in lspci_process - CVE-2018-20179 + * Fix remote code execution in rdpsnddbg_process - CVE-2018-20180 + * Fix remote code execution in seamless_process - CVE-2018-20181 + * Fix remote code execution in seamless_process_line - CVE-2018-20182 + * Fix building against OpenSSL 1.1 + +- remove obsolete patches + * rdesktop-Fix-OpenSSL-1.1-compability-issues.patch + * rdesktop-Fix-crash-in-rdssl_cert_to_rkey.patch + +------------------------------------------------------------------- Old: ---- rdesktop-1.8.3.tar.gz rdesktop-Fix-OpenSSL-1.1-compability-issues.patch rdesktop-Fix-crash-in-rdssl_cert_to_rkey.patch New: ---- rdesktop-1.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdesktop.spec ++++++ --- /var/tmp/diff_new_pack.3jsOpX/_old 2019-02-01 11:45:36.164542790 +0100 +++ /var/tmp/diff_new_pack.3jsOpX/_new 2019-02-01 11:45:36.172542782 +0100 @@ -1,7 +1,7 @@ # # spec file for package rdesktop # -# Copyright (c) 2018 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,24 +12,20 @@ # 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: rdesktop -Version: 1.8.3 +Version: 1.8.4 Release: 0 Summary: A Remote Desktop Protocol client -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/Other Url: http://www.rdesktop.org/ -Source: http://prdownloads.sourceforge.net/rdesktop/%{name}-%{version}.tar.gz +Source: https://github.com/rdesktop/rdesktop/releases/download/v%{version}/%{name}-… ## FIX-openSUSE: remove "Don't depend on pkg-config" Patch0: rdesktop-fix_pkgconfig_check.patch -# PATCH-FIX-UPSTREAM rdesktop-Fix-OpenSSL-1.1-compability-issues.patch -Patch1: rdesktop-Fix-OpenSSL-1.1-compability-issues.patch -# PATCH-FIX-UPSTREAM rdesktop-Fix-crash-in-rdssl_cert_to_rkey.patch -Patch2: rdesktop-Fix-crash-in-rdssl_cert_to_rkey.patch # PATCH-FIX-OPENSUSE rdesktop-Fix-keymap-script.patch Patch3: rdesktop-Fix-keymap-script.patch Patch4: rdesktop-Fix-key-caching.patch @@ -48,17 +44,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -rdesktop is an open source client for Windows NT Terminal Server and -Windows 2000 Terminal Services, capable of natively speaking Remote -Desktop Protocol (RDP) in order to present the user's NT desktop. -Unlike Citrix ICA, no server extensions are required. +rdesktop is an open source UNIX client for connecting to Windows +Remote Desktop Services, capable of natively speaking Remote Desktop +Protocol (RDP) in order to present the user's Windows desktop. +rdesktop is known to work with Windows server versions ranging from +NT 4 terminal server to Windows Server 2012 R2. %prep %setup -q %patch0 %if 0%{?suse_version} > 1110 -%patch1 -p1 -%patch2 -p1 %patch4 -p1 %endif %patch3 -p1 ++++++ rdesktop-1.8.3.tar.gz -> rdesktop-1.8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/asn.c new/rdesktop-1.8.4/asn.c --- old/rdesktop-1.8.3/asn.c 2012-11-16 23:17:36.000000000 +0100 +++ new/rdesktop-1.8.4/asn.c 2019-01-02 15:03:25.000000000 +0100 @@ -22,7 +22,7 @@ /* Parse an ASN.1 BER header */ RD_BOOL -ber_parse_header(STREAM s, int tagval, int *length) +ber_parse_header(STREAM s, int tagval, uint32 *length) { int tag, len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/bitmap.c new/rdesktop-1.8.4/bitmap.c --- old/rdesktop-1.8.3/bitmap.c 2011-04-13 13:13:04.000000000 +0200 +++ new/rdesktop-1.8.4/bitmap.c 2019-01-02 15:03:25.000000000 +0100 @@ -785,7 +785,7 @@ replen = revcode; collen = 0; } - while (collen > 0) + while (indexw < width && collen > 0) { color = CVAL(in); *out = color; @@ -793,7 +793,7 @@ indexw++; collen--; } - while (replen > 0) + while (indexw < width && replen > 0) { *out = color; out += 4; @@ -815,7 +815,7 @@ replen = revcode; collen = 0; } - while (collen > 0) + while (indexw < width && collen > 0) { x = CVAL(in); if (x & 1) @@ -835,7 +835,7 @@ indexw++; collen--; } - while (replen > 0) + while (indexw < width && replen > 0) { x = last_line[indexw * 4] + color; *out = x; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/cliprdr.c new/rdesktop-1.8.4/cliprdr.c --- old/rdesktop-1.8.3/cliprdr.c 2011-09-28 11:36:59.000000000 +0200 +++ new/rdesktop-1.8.4/cliprdr.c 2019-01-02 15:03:25.000000000 +0100 @@ -115,6 +115,7 @@ uint16 type, status; uint32 length, format; uint8 *data; + struct stream packet = *s; in_uint16_le(s, type); in_uint16_le(s, status); @@ -123,6 +124,11 @@ DEBUG_CLIPBOARD(("CLIPRDR recv: type=%d, status=%d, length=%d\n", type, status, length)); + if (!s_check_rem(s, length)) + { + rdp_protocol_error("cliprdr_process(), consume of packet from stream would overrun", &packet); + } + if (status == CLIPRDR_ERROR) { switch (type) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/configure new/rdesktop-1.8.4/configure --- old/rdesktop-1.8.3/configure 2014-10-31 12:40:13.000000000 +0100 +++ new/rdesktop-1.8.4/configure 2019-01-02 15:11:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rdesktop 1.8.3. +# Generated by GNU Autoconf 2.69 for rdesktop 1.8.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='rdesktop' PACKAGE_TARNAME='rdesktop' -PACKAGE_VERSION='1.8.3' -PACKAGE_STRING='rdesktop 1.8.3' +PACKAGE_VERSION='1.8.4' +PACKAGE_STRING='rdesktop 1.8.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1302,7 +1302,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rdesktop 1.8.3 to adapt to many kinds of systems. +\`configure' configures rdesktop 1.8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1371,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rdesktop 1.8.3:";; + short | recursive ) echo "Configuration of rdesktop 1.8.4:";; esac cat <<\_ACEOF @@ -1509,7 +1509,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rdesktop configure 1.8.3 +rdesktop configure 1.8.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2031,7 +2031,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rdesktop $as_me 1.8.3, which was +It was created by rdesktop $as_me 1.8.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8030,7 +8030,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rdesktop $as_me 1.8.3, which was +This file was extended by rdesktop $as_me 1.8.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8083,7 +8083,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rdesktop config.status 1.8.3 +rdesktop config.status 1.8.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/configure.ac new/rdesktop-1.8.4/configure.ac --- old/rdesktop-1.8.3/configure.ac 2014-10-31 12:39:04.000000000 +0100 +++ new/rdesktop-1.8.4/configure.ac 2019-01-02 15:03:38.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(rdesktop, 1.8.3) +AC_INIT(rdesktop, 1.8.4) AC_CONFIG_SRCDIR([rdesktop.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/constants.h new/rdesktop-1.8.4/constants.h --- old/rdesktop-1.8.3/constants.h 2014-09-09 14:34:09.000000000 +0200 +++ new/rdesktop-1.8.4/constants.h 2019-01-02 15:03:25.000000000 +0100 @@ -481,6 +481,10 @@ #define FILE_DELETE_ON_CLOSE 0x00001000 #define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 +/* [MS-RDPBCGR], TS_BITMAP_DATA, flags */ +#define BITMAP_COMPRESSION 0x0001 +#define NO_BITMAP_COMPRESSION_HDR 0x0400 + /* RDP5 disconnect PDU */ #define exDiscReasonNoInfo 0x0000 #define exDiscReasonAPIInitiatedDisconnect 0x0001 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/cssp.c new/rdesktop-1.8.4/cssp.c --- old/rdesktop-1.8.3/cssp.c 2014-08-29 12:57:24.000000000 +0200 +++ new/rdesktop-1.8.4/cssp.c 2019-01-02 15:03:25.000000000 +0100 @@ -648,6 +648,7 @@ STREAM s; int length; int tagval; + struct stream packet; s = tcp_recv(NULL, 4); @@ -673,6 +674,7 @@ // receive the remainings of message s = tcp_recv(s, length); + packet = *s; #if WITH_DEBUG_CREDSSP streamsave(s, "tsrequest_in.raw"); @@ -689,6 +691,12 @@ if (!ber_in_header(s, &tagval, &length) || tagval != (BER_TAG_CTXT_SPECIFIC | BER_TAG_CONSTRUCTED | 0)) return False; + + if (!s_check_rem(s, length)) + { + rdp_protocol_error("cssp_read_tsrequest(), consume of version from stream would overrun", + &packet); + } in_uint8s(s, length); // negoToken [1] @@ -710,7 +718,14 @@ if (!ber_in_header(s, &tagval, &length) || tagval != BER_TAG_OCTET_STRING) return False; - token->end = token->p = token->data; + if (!s_check_rem(s, length)) + { + rdp_protocol_error("cssp_read_tsrequest(), consume of token from stream would overrun", + &packet); + } + + s_realloc(token, length); + s_reset(token); out_uint8p(token, s->p, length); s_mark_end(token); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/doc/ChangeLog new/rdesktop-1.8.4/doc/ChangeLog --- old/rdesktop-1.8.3/doc/ChangeLog 2014-10-31 12:39:04.000000000 +0100 +++ new/rdesktop-1.8.4/doc/ChangeLog 2019-01-02 15:04:25.000000000 +0100 @@ -1,3 +1,32 @@ +rdesktop (1.8.4) + * Add rdp_protocol_error function that is used in several fixes + * Refactor of process_bitmap_updates + * Fix possible integer overflow in s_check_rem() on 32bit arch + * Fix memory corruption in process_bitmap_data - CVE-2018-8794 + * Fix remote code execution in process_bitmap_data - CVE-2018-8795 + * Fix remote code execution in process_plane - CVE-2018-8797 + * Fix Denial of Service in mcs_recv_connect_response - CVE-2018-20175 + * Fix Denial of Service in mcs_parse_domain_params - CVE-2018-20175 + * Fix Denial of Service in sec_parse_crypt_info - CVE-2018-20176 + * Fix Denial of Service in sec_recv - CVE-2018-20176 + * Fix minor information leak in rdpdr_process - CVE-2018-8791 + * Fix Denial of Service in cssp_read_tsrequest - CVE-2018-8792 + * Fix remote code execution in cssp_read_tsrequest - CVE-2018-8793 + * Fix Denial of Service in process_bitmap_data - CVE-2018-8796 + * Fix minor information leak in rdpsnd_process_ping - CVE-2018-8798 + * Fix Denial of Service in process_secondary_order - CVE-2018-8799 + * Fix remote code execution in in ui_clip_handle_data - CVE-2018-8800 + * Fix major information leak in ui_clip_handle_data - CVE-2018-20174 + * Fix memory corruption in rdp_in_unistr - CVE-2018-20177 + * Fix Denial of Service in process_demand_active - CVE-2018-20178 + * Fix remote code execution in lspci_process - CVE-2018-20179 + * Fix remote code execution in rdpsnddbg_process - CVE-2018-20180 + * Fix remote code execution in seamless_process - CVE-2018-20181 + * Fix remote code execution in seamless_process_line - CVE-2018-20182 + * Fix building against OpenSSL 1.1 + + -- Henrik Andersson <hean01(a)users.sourceforge.net> 2019-01-02 + rdesktop (1.8.3) * Added a persistent mode used with SeamlessRDP * Added US international keyboard layout with dead keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/lspci.c new/rdesktop-1.8.4/lspci.c --- old/rdesktop-1.8.3/lspci.c 2010-01-12 09:31:06.000000000 +0100 +++ new/rdesktop-1.8.4/lspci.c 2019-01-02 15:03:25.000000000 +0100 @@ -1,7 +1,8 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Support for the Matrox "lspci" channel - Copyright (C) 2005 Matrox Graphics Inc. + Copyright (C) 2005 Matrox Graphics Inc. + Copyright 2018 Henrik Andersson <hean01(a)cendio.se> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -132,6 +133,12 @@ unsigned int pkglen; static char *rest = NULL; char *buf; + struct stream packet = *s; + + if (!s_check(s)) + { + rdp_protocol_error("lspci_process(), stream is in unstable state", &packet); + } pkglen = s->end - s->p; /* str_handle_lines requires null terminated strings */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/mcs.c new/rdesktop-1.8.4/mcs.c --- old/rdesktop-1.8.3/mcs.c 2012-11-15 12:21:01.000000000 +0100 +++ new/rdesktop-1.8.4/mcs.c 2019-01-02 15:03:25.000000000 +0100 @@ -44,9 +44,16 @@ static RD_BOOL mcs_parse_domain_params(STREAM s) { - int length; + uint32 length; + struct stream packet = *s; ber_parse_header(s, MCS_TAG_DOMAIN_PARAMS, &length); + + if (!s_check_rem(s, length)) + { + rdp_protocol_error("mcs_parse_domain_params(), consume domain params from stream would overrun", &packet); + } + in_uint8s(s, length); return s_check(s); @@ -87,13 +94,15 @@ mcs_recv_connect_response(STREAM mcs_data) { uint8 result; - int length; + uint32 length; STREAM s; - + struct stream packet; s = iso_recv(NULL); if (s == NULL) return False; + packet = *s; + ber_parse_header(s, MCS_CONNECT_RESPONSE, &length); ber_parse_header(s, BER_TAG_RESULT, &length); @@ -106,6 +115,12 @@ ber_parse_header(s, BER_TAG_INTEGER, &length); in_uint8s(s, length); /* connect id */ + + if (!s_check_rem(s, length)) + { + rdp_protocol_error("mcs_recv_connect_response(), consume connect id from stream would overrun", &packet); + } + mcs_parse_domain_params(s); ber_parse_header(s, BER_TAG_OCTET_STRING, &length); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/orders.c new/rdesktop-1.8.4/orders.c --- old/rdesktop-1.8.3/orders.c 2012-06-15 07:16:20.000000000 +0200 +++ new/rdesktop-1.8.4/orders.c 2019-01-02 15:03:25.000000000 +0100 @@ -1260,11 +1260,17 @@ uint16 flags; uint8 type; uint8 *next_order; + struct stream packet = *s; in_uint16_le(s, length); in_uint16_le(s, flags); /* used by bmpcache2 */ in_uint8(s, type); + if (!s_check_rem(s, length + 7)) + { + rdp_protocol_error("process_secondary_order(), next order pointer would overrun stream", &packet); + } + next_order = s->p + (sint16) length + 7; switch (type) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/parse.h new/rdesktop-1.8.4/parse.h --- old/rdesktop-1.8.3/parse.h 2012-11-15 12:20:24.000000000 +0100 +++ new/rdesktop-1.8.4/parse.h 2019-01-02 15:03:25.000000000 +0100 @@ -40,7 +40,7 @@ #define s_pop_layer(s,h) (s)->p = (s)->h; #define s_mark_end(s) (s)->end = (s)->p; #define s_check(s) ((s)->p <= (s)->end) -#define s_check_rem(s,n) ((s)->p + n <= (s)->end) +#define s_check_rem(s,n) (s_check(s) && (n <= (s)->end - (s)->p)) #define s_check_end(s) ((s)->p == (s)->end) #define s_length(s) ((s)->end - (s)->data) #define s_reset(s) ((s)->end = (s)->p = (s)->data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/proto.h new/rdesktop-1.8.4/proto.h --- old/rdesktop-1.8.3/proto.h 2014-09-11 13:54:46.000000000 +0200 +++ new/rdesktop-1.8.4/proto.h 2019-01-02 15:03:25.000000000 +0100 @@ -173,6 +173,7 @@ char *directory, RD_BOOL reconnect); void rdp_reset_state(void); void rdp_disconnect(void); +void rdp_protocol_error(const char *message, STREAM s); /* rdpdr.c */ int get_device_index(RD_NTHANDLE handle); void convert_to_unix_filename(char *filename); @@ -233,7 +234,7 @@ /* asn.c */ RD_BOOL ber_in_header(STREAM s, int *tagval, int *length); void ber_out_header(STREAM s, int tagval, int length); -RD_BOOL ber_parse_header(STREAM s, int tagval, int *length); +RD_BOOL ber_parse_header(STREAM s, int tagval, uint32 *length); void ber_out_integer(STREAM s, int value); /* xclip.c */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/rdesktop.spec new/rdesktop-1.8.4/rdesktop.spec --- old/rdesktop-1.8.3/rdesktop.spec 2014-10-31 12:39:04.000000000 +0100 +++ new/rdesktop-1.8.4/rdesktop.spec 2019-01-02 15:03:38.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Remote Desktop Protocol client Name: rdesktop -Version: 1.8.3 +Version: 1.8.4 Release: 1 License: GPL; see COPYING Group: Applications/Communications diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/rdp.c new/rdesktop-1.8.4/rdp.c --- old/rdesktop-1.8.3/rdp.c 2014-08-27 14:19:59.000000000 +0200 +++ new/rdesktop-1.8.4/rdp.c 2019-01-02 15:03:25.000000000 +0100 @@ -3,7 +3,7 @@ Protocol services - RDP layer Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2003-2011 Peter Astrand <astrand(a)cendio.se> for Cendio AB - Copyright 2011-2014 Henrik Andersson <hean01(a)cendio.se> for Cendio AB + Copyright 2011-2018 Henrik Andersson <hean01(a)cendio.se> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -270,6 +270,20 @@ *string = xmalloc(in_len * 2); *str_size = in_len * 2; + struct stream packet = *s; + + if ((in_len < 0) || ((uint32)in_len >= (RD_UINT32_MAX / 2))) + { + error("rdp_in_unistr(), length of unicode data is out of bounds."); + abort(); + } + + if (!s_check_rem(s, in_len)) + { + rdp_protocol_error("rdp_in_unistr(), consume of unicode data from stream would overrun", &packet); + } + + #ifdef HAVE_ICONV size_t ibl = in_len, obl = *str_size - 1; char *pin = (char *) s->p, *pout = *string; @@ -1084,6 +1098,7 @@ { uint8 type; uint16 len_src_descriptor, len_combined_caps; + struct stream packet = *s; /* at this point we need to ensure that we have ui created */ rd_create_ui(); @@ -1091,6 +1106,11 @@ in_uint32_le(s, g_rdp_shareid); in_uint16_le(s, len_src_descriptor); in_uint16_le(s, len_combined_caps); + + if (!s_check_rem(s, len_src_descriptor)) + { + rdp_protocol_error("rdp_demand_active(), consume of source descriptor from stream would overrun", &packet); + } in_uint8s(s, len_src_descriptor); DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid)); @@ -1238,74 +1258,122 @@ } } -/* Process bitmap updates */ -void -process_bitmap_updates(STREAM s) +/* Process TS_BITMAP_DATA */ +static void +process_bitmap_data(STREAM s) { - uint16 num_updates; uint16 left, top, right, bottom, width, height; - uint16 cx, cy, bpp, Bpp, compress, bufsize, size; + uint16 cx, cy, bpp, Bpp, flags, bufsize, size; uint8 *data, *bmpdata; - int i; - in_uint16_le(s, num_updates); + struct stream packet = *s; - for (i = 0; i < num_updates; i++) - { - in_uint16_le(s, left); - in_uint16_le(s, top); - in_uint16_le(s, right); - in_uint16_le(s, bottom); - in_uint16_le(s, width); - in_uint16_le(s, height); - in_uint16_le(s, bpp); - Bpp = (bpp + 7) / 8; - in_uint16_le(s, compress); - in_uint16_le(s, bufsize); + in_uint16_le(s, left); /* destLeft */ + in_uint16_le(s, top); /* destTop */ + in_uint16_le(s, right); /* destRight */ + in_uint16_le(s, bottom); /* destBottom */ + in_uint16_le(s, width); /* width */ + in_uint16_le(s, height); /* height */ + in_uint16_le(s, bpp); /* bitsPerPixel */ + Bpp = (bpp + 7) / 8; + in_uint16_le(s, flags); /* flags */ + in_uint16_le(s, bufsize); /* bitmapLength */ + + cx = right - left + 1; + cy = bottom - top + 1; + + /* FIXME: There are a assumtion that we do not consider in + this code. The value of bpp is not passed to + ui_paint_bitmap() which relies on g_server_bpp for drawing + the bitmap data. - cx = right - left + 1; - cy = bottom - top + 1; + Does this means that we can sanity check bpp with g_server_bpp ? + */ - DEBUG(("BITMAP_UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,Bpp=%d,cmp=%d)\n", - left, top, right, bottom, width, height, Bpp, compress)); - if (!compress) - { - int y; - bmpdata = (uint8 *) xmalloc(width * height * Bpp); - for (y = 0; y < height; y++) - { - in_uint8a(s, &bmpdata[(height - y - 1) * (width * Bpp)], - width * Bpp); - } - ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); - xfree(bmpdata); - continue; - } + if (Bpp == 0 || width == 0 || height == 0) + { + warning("%s(), [%d,%d,%d,%d], [%d,%d], bpp=%d, flags=%x", __func__, + left, top, right, bottom, width, height, bpp, flags); + rdp_protocol_error + ("TS_BITMAP_DATA, unsafe size of bitmap data received from server", + &packet); + } + if ((RD_UINT32_MAX / Bpp) <= (width * height)) + { + warning("%s(), [%d,%d,%d,%d], [%d,%d], bpp=%d, flags=%x", __func__, + left, top, right, bottom, width, height, bpp, flags); + rdp_protocol_error + ("TS_BITMAP_DATA, unsafe size of bitmap data received from server", + &packet); + } - if (compress & 0x400) - { - size = bufsize; - } - else - { - in_uint8s(s, 2); /* pad */ - in_uint16_le(s, size); - in_uint8s(s, 4); /* line_size, final_size */ - } - in_uint8p(s, data, size); + +#if DEBUG + printf("%s(), [%d,%d,%d,%d], [%d,%d], bpp=%d, flags=%x", __func__, + left, top, right, bottom, width, height, bpp, flags); +#endif + if (flags == 0) + { + /* read uncompresssed bitmap data */ + int y; bmpdata = (uint8 *) xmalloc(width * height * Bpp); - if (bitmap_decompress(bmpdata, width, height, data, size, Bpp)) - { - ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); - } - else + for (y = 0; y < height; y++) { - DEBUG_RDP5(("Failed to decompress data\n")); + in_uint8a(s, &bmpdata[(height - y - 1) * (width * Bpp)], width * Bpp); } - + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); xfree(bmpdata); + return; + } + + if (flags & NO_BITMAP_COMPRESSION_HDR) + { + size = bufsize; + } + else + { + /* Read TS_CD_HEADER */ + in_uint8s(s, 2); /* skip cbCompFirstRowSize (must be 0x0000) */ + in_uint16_le(s, size); /* cbCompMainBodySize */ + in_uint8s(s, 2); /* skip cbScanWidth */ + in_uint8s(s, 2); /* skip cbUncompressedSize */ + } + + /* read compressed bitmap data */ + if (!s_check_rem(s, size)) + { + rdp_protocol_error("process_bitmap_data(), consume of bitmap data from stream would overrun", &packet); + } + in_uint8p(s, data, size); + bmpdata = (uint8 *) xmalloc(width * height * Bpp); + if (bitmap_decompress(bmpdata, width, height, data, size, Bpp)) + { + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); + } + else + { + warning("%s(), failed to decompress bitmap", __func__); + } + + xfree(bmpdata); +} + + + +/* Process TS_UPDATE_BITMAP_DATA */ +void +process_bitmap_updates(STREAM s) +{ + uint16 num_updates; + int i; + + in_uint16_le(s, num_updates); /* rectangles */ + + for (i = 0; i < num_updates; i++) + { + process_bitmap_data(s); } } @@ -1774,3 +1842,21 @@ { sec_disconnect(); } + +/* Abort rdesktop upon protocol error + + A protocol error is defined as: + + - A value is outside specified range for example; + bpp for a bitmap is not allowed to be greater than the + value 32 but is represented by a byte in protocol. + +*/ +void +rdp_protocol_error(const char *message, STREAM s) +{ + error("%s(), %s", __func__, message); + if (s) + hexdump(s->p, s_length(s)); + exit(0); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/rdpdr.c new/rdesktop-1.8.4/rdpdr.c --- old/rdesktop-1.8.3/rdpdr.c 2014-09-11 13:54:46.000000000 +0200 +++ new/rdesktop-1.8.4/rdpdr.c 2019-01-02 15:03:25.000000000 +0100 @@ -797,6 +797,7 @@ uint16 vmin; uint16 component; uint16 pakid; + struct stream packet = *s; #if WITH_DEBUG_RDP5 printf("--- rdpdr_process ---\n"); @@ -818,8 +819,18 @@ /* DR_CORE_SERVER_ANNOUNCE_REQ */ in_uint8s(s, 2); /* skip versionMajor */ in_uint16_le(s, vmin); /* VersionMinor */ + in_uint32_le(s, g_client_id); /* ClientID */ + /* g_client_id is sent back to server, + so lets check that we actually got + valid data from stream to prevent + that we leak back data to server */ + if (!s_check(s)) + { + rdp_protocol_error("rdpdr_process(), consume of g_client_id from stream did overrun", &packet); + } + /* The RDP client is responsibility to provide a random client id if server version is < 12 */ if (vmin < 0x000c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/rdpsnd.c new/rdesktop-1.8.4/rdpsnd.c --- old/rdesktop-1.8.3/rdpsnd.c 2014-05-13 16:34:23.000000000 +0200 +++ new/rdesktop-1.8.4/rdpsnd.c 2019-01-02 15:03:25.000000000 +0100 @@ -355,6 +355,12 @@ { uint16 tick; STREAM out; + struct stream packet = *in; + + if (!s_check_rem(in, 4)) + { + rdp_protocol_error("rdpsnd_process_training(), consume of training data from stream would overrun", &packet); + } in_uint16_le(in, tick); @@ -667,6 +673,11 @@ static char *rest = NULL; char *buf; + if (!s_check(s)) + { + rdp_protocol_error("rdpsnddbg_process(), stream is in unstable state", s); + } + pkglen = s->end - s->p; /* str_handle_lines requires null terminated strings */ buf = (char *) xmalloc(pkglen + 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/seamless.c new/rdesktop-1.8.4/seamless.c --- old/rdesktop-1.8.3/seamless.c 2014-09-11 08:36:25.000000000 +0200 +++ new/rdesktop-1.8.4/seamless.c 2019-01-02 15:03:25.000000000 +0100 @@ -173,6 +173,12 @@ icon_buf[len] = strtol(byte, NULL, 16); len++; + + if ((size_t)len >= sizeof(icon_buf)) + { + warning("seamless_process_line(), icon data would overrun icon_buf"); + break; + } } ui_seamless_seticon(id, tok5, width, height, chunk, icon_buf, len); @@ -375,6 +381,12 @@ { unsigned int pkglen; char *buf; + struct stream packet = *s; + + if (!s_check(s)) + { + rdp_protocol_error("seamless_process(), stream is in unstable state", &packet); + } pkglen = s->end - s->p; /* str_handle_lines requires null terminated strings */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/secure.c new/rdesktop-1.8.4/secure.c --- old/rdesktop-1.8.3/secure.c 2014-02-07 09:44:55.000000000 +0100 +++ new/rdesktop-1.8.4/secure.c 2019-01-02 15:03:25.000000000 +0100 @@ -292,6 +292,9 @@ void sec_decrypt(uint8 * data, int length) { + if (length <= 0) + return; + if (g_sec_decrypt_use_count == 4096) { sec_update(g_sec_decrypt_key, g_sec_decrypt_update_key); @@ -550,6 +553,7 @@ RDSSL_RKEY *server_public_key; uint16 tag, length; uint8 *next_tag, *end; + struct stream packet = *s; in_uint32_le(s, *rc4_key_size); /* 1 = 40-bit, 2 = 128-bit */ in_uint32_le(s, crypt_level); /* 1 = low, 2 = medium, 3 = high */ @@ -628,6 +632,13 @@ DEBUG_RDP5(("Ignored certs left: %d\n", certcount)); in_uint32_le(s, ignorelen); DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen)); + + if (!s_check_rem(s, ignorelen)) + { + rdp_protocol_error("sec_parse_crypt_info(), consume ignored certificate from stream would overrun", + &packet); + } + ignorecert = rdssl_cert_read(s->p, ignorelen); in_uint8s(s, ignorelen); if (ignorecert == NULL) @@ -797,15 +808,21 @@ uint32 sec_flags; uint16 channel; STREAM s; + struct stream packet; while ((s = mcs_recv(&channel, rdpver)) != NULL) { + packet = *s; if (rdpver != NULL) { if (*rdpver != 3) { if (*rdpver & 0x80) { + if (!s_check_rem(s, 8)) { + rdp_protocol_error("sec_recv(), consume fastpath signature from stream would overrun", &packet); + } + in_uint8s(s, 8); /* signature */ sec_decrypt(s->p, s->end - s->p); } @@ -820,6 +837,10 @@ { if (sec_flags & SEC_ENCRYPT) { + if (!s_check_rem(s, 8)) { + rdp_protocol_error("sec_recv(), consume encrypt signature from stream would overrun", &packet); + } + in_uint8s(s, 8); /* signature */ sec_decrypt(s->p, s->end - s->p); } @@ -834,6 +855,10 @@ { uint8 swapbyte; + if (!s_check_rem(s, 8)) { + rdp_protocol_error("sec_recv(), consume redirect signature from stream would overrun", &packet); + } + in_uint8s(s, 8); /* signature */ sec_decrypt(s->p, s->end - s->p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/ssl.c new/rdesktop-1.8.4/ssl.c --- old/rdesktop-1.8.3/ssl.c 2012-10-23 13:38:27.000000000 +0200 +++ new/rdesktop-1.8.4/ssl.c 2019-01-02 14:50:34.000000000 +0100 @@ -3,6 +3,7 @@ Secure sockets abstraction layer Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) Jay Sorg <j(a)american-data.com> 2006-2008 + Copyright (C) Henrik Andersson <hean01(a)cendio.com> 2016 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,7 +89,7 @@ uint8 * exponent) { BN_CTX *ctx; - BIGNUM mod, exp, x, y; + BIGNUM *mod, *exp, *x, *y; uint8 inr[SEC_MAX_MODULUS_SIZE]; int outlen; @@ -98,24 +99,24 @@ reverse(inr, len); ctx = BN_CTX_new(); - BN_init(&mod); - BN_init(&exp); - BN_init(&x); - BN_init(&y); - - BN_bin2bn(modulus, modulus_size, &mod); - BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); - BN_bin2bn(inr, len, &x); - BN_mod_exp(&y, &x, &exp, &mod, ctx); - outlen = BN_bn2bin(&y, out); + mod = BN_new(); + exp = BN_new(); + x = BN_new(); + y = BN_new(); + + BN_bin2bn(modulus, modulus_size, mod); + BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp); + BN_bin2bn(inr, len, x); + BN_mod_exp(y, x, exp, mod, ctx); + outlen = BN_bn2bin(y, out); reverse(out, outlen); if (outlen < (int) modulus_size) memset(out + outlen, 0, modulus_size - outlen); - BN_free(&y); - BN_clear_free(&x); - BN_free(&exp); - BN_free(&mod); + BN_free(y); + BN_clear_free(x); + BN_free(exp); + BN_free(mod); BN_CTX_free(ctx); } @@ -140,18 +141,38 @@ EVP_PKEY *epk = NULL; RDSSL_RKEY *lkey; int nid; + int ret; /* By some reason, Microsoft sets the OID of the Public RSA key to the oid for "MD5 with RSA Encryption" instead of "RSA Encryption" Kudos to Richard Levitte for the following (. intiutive .) lines of code that resets the OID and let's us extract the key. */ - nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); + + X509_PUBKEY *key = NULL; + X509_ALGOR *algor = NULL; + + key = X509_get_X509_PUBKEY(cert); + if (key == NULL) + { + error("Failed to get public key from certificate.\n"); + return NULL; + } + + ret = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key); + if (ret != 1) + { + error("Faild to get algorithm used for public key.\n"); + return NULL; + } + + nid = OBJ_obj2nid(algor->algorithm); + if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption)) { DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n")); - ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm); - cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption); + X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption), + 0, NULL, NULL, 0); } epk = X509_get_pubkey(cert); if (NULL == epk) @@ -201,14 +222,24 @@ { int len; - if ((BN_num_bytes(rkey->e) > (int) max_exp_len) || - (BN_num_bytes(rkey->n) > (int) max_mod_len)) + BIGNUM *e = NULL; + BIGNUM *n = NULL; + +#if OPENSSL_VERSION_NUMBER < 0x10100000L + e = rkey->e; + n = rkey->n; +#else + RSA_get0_key(rkey, &e, &n, NULL); +#endif + + if ((BN_num_bytes(e) > (int) max_exp_len) || + (BN_num_bytes(n) > (int) max_mod_len)) { return 1; } - len = BN_bn2bin(rkey->e, exponent); + len = BN_bn2bin(e, exponent); reverse(exponent, len); - len = BN_bn2bin(rkey->n, modulus); + len = BN_bn2bin(n, modulus); reverse(modulus, len); return 0; } @@ -229,8 +260,5 @@ rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, unsigned char *md) { - HMAC_CTX ctx; - HMAC_CTX_init(&ctx); HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL); - HMAC_CTX_cleanup(&ctx); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rdesktop-1.8.3/types.h new/rdesktop-1.8.4/types.h --- old/rdesktop-1.8.3/types.h 2014-05-20 12:43:03.000000000 +0200 +++ new/rdesktop-1.8.4/types.h 2019-01-02 15:03:25.000000000 +0100 @@ -32,6 +32,8 @@ typedef unsigned int uint32; typedef signed int sint32; +#define RD_UINT32_MAX (uint32)(-1) + typedef void *RD_HBITMAP; typedef void *RD_HGLYPH; typedef void *RD_HCOLOURMAP;

1 0

commit llmnrd for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package llmnrd for openSUSE:Factory checked in at 2019-02-01 11:45:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/llmnrd (Old) and /work/SRC/openSUSE:Factory/.llmnrd.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "llmnrd" Fri Feb 1 11:45:32 2019 rev:5 rq:669863 version:0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/llmnrd/llmnrd.changes 2017-11-24 10:56:21.900133458 +0100 +++ /work/SRC/openSUSE:Factory/.llmnrd.new.28833/llmnrd.changes 2019-02-01 11:45:33.804545214 +0100 @@ -1,0 +2,7 @@ +Tue Jan 29 12:52:45 UTC 2019 - mardnh(a)gmx.de + +- Update to version 0.6 + * Ignore queries with TC bit set in llmnrd + * Add option to set conflict bit in llmnr-query + +------------------------------------------------------------------- Old: ---- llmnrd-0.5.tar.gz New: ---- llmnrd-0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ llmnrd.spec ++++++ --- /var/tmp/diff_new_pack.zXgOBP/_old 2019-02-01 11:45:34.400544602 +0100 +++ /var/tmp/diff_new_pack.zXgOBP/_new 2019-02-01 11:45:34.404544598 +0100 @@ -1,7 +1,7 @@ # # spec file for package llmnrd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -19,16 +19,15 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: llmnrd -Version: 0.5 +Version: 0.6 Release: 0 Summary: Link-Local Multicast Resolution (LLMNR) Daemon -License: GPL-2.0 +License: GPL-2.0-only Group: System/Daemons -Url: https://github.com/tklauser/llmnrd +URL: https://github.com/tklauser/llmnrd Source: https://github.com/tklauser/llmnrd/archive/v%{version}.tar.gz#/%{name}-%{ve… Source1: llmnrd.service Source2: llmnrd.sysconfig @@ -37,7 +36,6 @@ BuildRequires: gcc BuildRequires: git-core BuildRequires: make -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description llmnrd is a daemon implementing the Link-Local Multicast Name Resolution (LLMNR) @@ -79,15 +77,15 @@ %service_del_postun llmnrd.service %files -%defattr(-,root,root) -%doc README.md COPYING +%license COPYING +%doc README.md %{_bindir}/llmnr-query %{_sbindir}/llmnrd %{_sbindir}/rcllmnrd %{_unitdir}/llmnrd.service %{_fillupdir}/sysconfig.llmnrd %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.llmnrd -%{_mandir}/man1/llmnr-query.1%{ext_man} -%{_mandir}/man8/llmnrd.8%{ext_man} +%{_mandir}/man1/llmnr-query.1%{?ext_man} +%{_mandir}/man8/llmnrd.8%{?ext_man} %changelog ++++++ llmnrd-0.5.tar.gz -> llmnrd-0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/llmnrd-0.5/Makefile new/llmnrd-0.6/Makefile --- old/llmnrd-0.5/Makefile 2017-10-18 09:25:44.000000000 +0200 +++ new/llmnrd-0.6/Makefile 2019-01-29 10:04:04.000000000 +0100 @@ -1,8 +1,8 @@ # Makefile for llmnrd # -# Copyright (C) 2014-2017 Tobias Klauser <tklauser(a)distanz.ch> +# Copyright (C) 2014-2019 Tobias Klauser <tklauser(a)distanz.ch> -VERSION = 0.5 +VERSION = 0.6 # llmnrd binary D_P = llmnrd @@ -16,7 +16,7 @@ Q_LIBS = Q_MAN = $(Q_P).1 -CC = $(CROSS_COMPILE)gcc +CC ?= gcc INSTALL = install GZIP = gzip -9 -c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/llmnrd-0.5/README.md new/llmnrd-0.6/README.md --- old/llmnrd-0.5/README.md 2017-10-18 09:25:44.000000000 +0200 +++ new/llmnrd-0.6/README.md 2019-01-29 10:04:04.000000000 +0100 @@ -32,11 +32,12 @@ Cross-Compilation ================= -To cross-compile llmnrd for a different architecture, use the `CROSS_COMPILE` -make variable. To e.g. build it using the arm-linux-gnueabihf toolchain use: +To cross-compile llmnrd for a different architecture, set the `CC` make +variable to the corresponding cross-compiler. To e.g. build it using the +arm-linux-gnueabihf toolchain use: ``` -$ make CROSS_COMPILE=arm-linux-gnueabihf- +$ make CC=arm-linux-gnueabihf-gcc ``` When cross-compiling, you usually don't want to install the generated binary to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/llmnrd-0.5/doc/llmnr-query.1 new/llmnrd-0.6/doc/llmnr-query.1 --- old/llmnrd-0.5/doc/llmnr-query.1 2017-10-18 09:25:44.000000000 +0200 +++ new/llmnrd-0.6/doc/llmnr-query.1 2019-01-29 10:04:04.000000000 +0100 @@ -27,7 +27,7 @@ Set query type. Must be one of A, AAAA, ANY (default: ANY). .TP .B -6, --ipv6 -End queries over IPv6. +Send queries over IPv6. .TP .B -h, --help Show usage information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/llmnrd-0.5/llmnr-query.c new/llmnrd-0.6/llmnr-query.c --- old/llmnrd-0.5/llmnr-query.c 2017-10-18 09:25:44.000000000 +0200 +++ new/llmnrd-0.6/llmnr-query.c 2019-01-29 10:04:04.000000000 +0100 @@ -1,7 +1,7 @@ /* * Simple LLMNR (RFC 4795) query tool. * - * Copyright (C) 2015-2017 Tobias Klauser <tklauser(a)distanz.ch> + * Copyright (C) 2015-2018 Tobias Klauser <tklauser(a)distanz.ch> * * This file is part of llmnrd. * @@ -42,7 +42,7 @@ /* Maximum possible size RFC 4795, section 2.1 */ static const size_t LLMNR_QUERY_PKT_BUF_SIZE = 9194; -static const char *short_ops = "c:d:i:I:t:T:6hV"; +static const char *short_ops = "c:d:i:I:t:T:6ChV"; static const struct option long_opts[] = { { "count", required_argument, NULL, 'c' }, { "id", required_argument, NULL, 'd' }, @@ -50,6 +50,7 @@ { "interface", required_argument, NULL, 'I' }, { "timeout", required_argument, NULL, 't' }, { "type", required_argument, NULL, 'T' }, + { "conflict", no_argument, NULL, 'C' }, { "ipv6", no_argument, NULL, '6' }, { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, @@ -67,6 +68,7 @@ " -t, --timeout NUM time to wait for reply in ms (default: 1000)\n" " -T, --type TYPE set query type; must be one of A, AAAA, ANY (default: ANY)\n" " -6, --ipv6 send queries over IPv6\n" + " -C, --conflict set conflict bit in query\n" " -h, --help show this help and exit\n" " -V, --version show version information and exit\n"); exit(status); @@ -75,7 +77,7 @@ static void __noreturn version_and_exit(void) { fprintf(stdout, "llmnr-query %s %s\n" - "Copyright (C) 2015-2017 Tobias Klauser <tklauser(a)distanz.ch>\n" + "Copyright (C) 2015-2018 Tobias Klauser <tklauser(a)distanz.ch>\n" "Licensed under the GNU General Public License, version 2\n", VERSION_STRING, GIT_VERSION); exit(EXIT_SUCCESS); @@ -101,6 +103,7 @@ const char *query_name, *iface = NULL; size_t query_name_len; unsigned long i, id = 0, count = 1, interval_ms = 500, timeout_ms = 1000; + uint16_t flags = 0; uint16_t qtype = LLMNR_QTYPE_ANY; bool ipv6 = false; struct pkt *p; @@ -112,6 +115,9 @@ case 'c': count = strtoul(optarg, NULL, 0); break; + case 'C': + flags |= LLMNR_F_C; + break; case 'd': id = strtoul(optarg, NULL, 0); break; @@ -141,6 +147,7 @@ break; case 'V': version_and_exit(); + /* fall through */ case 'h': usage_and_exit(EXIT_SUCCESS); default: @@ -235,7 +242,7 @@ hdr = (struct llmnr_hdr *)pkt_put(p, sizeof(*hdr)); hdr->id = htons(id + i % UINT16_MAX); - hdr->flags = 0; + hdr->flags = htons(flags); hdr->qdcount = htons(1); hdr->ancount = 0; hdr->nscount = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/llmnrd-0.5/llmnr.c new/llmnrd-0.6/llmnr.c --- old/llmnrd-0.5/llmnr.c 2017-10-18 09:25:44.000000000 +0200 +++ new/llmnrd-0.6/llmnr.c 2019-01-29 10:04:04.000000000 +0100 @@ -204,8 +204,8 @@ flags = ntohs(hdr->flags); qdcount = ntohs(hdr->qdcount); - /* Query invalid as per RFC 4795, section 2.1.1? */ - if (((flags & (LLMNR_F_QR | LLMNR_F_OPCODE)) != 0) || + /* Query invalid as per RFC 4795, section 2.1.1 */ + if (((flags & (LLMNR_F_QR | LLMNR_F_OPCODE | LLMNR_F_TC)) != 0) || qdcount != 1 || hdr->ancount != 0 || hdr->nscount != 0) return;

1 0

commit epiphany for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package epiphany for openSUSE:Factory checked in at 2019-02-01 11:45:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany (Old) and /work/SRC/openSUSE:Factory/.epiphany.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany" Fri Feb 1 11:45:30 2019 rev:160 rq:669858 version:3.30.2 Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany/epiphany.changes 2018-12-28 12:36:12.479926277 +0100 +++ /work/SRC/openSUSE:Factory/.epiphany.new.28833/epiphany.changes 2019-02-01 11:45:31.592547486 +0100 @@ -1,0 +2,8 @@ +Fri Jan 25 18:59:27 UTC 2019 - bjorn.lie(a)gmail.com + +- Add epiphany-bookmark-ensure-tags-sequence-is-created.patch: + bookmark: ensure tags sequence is always created. Somehow we are + getting EphyBookmarks objects deserialized without initializing + the tags property. + +------------------------------------------------------------------- New: ---- epiphany-bookmark-ensure-tags-sequence-is-created.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany.spec ++++++ --- /var/tmp/diff_new_pack.uYwKY0/_old 2019-02-01 11:45:32.344546713 +0100 +++ /var/tmp/diff_new_pack.uYwKY0/_new 2019-02-01 11:45:32.356546701 +0100 @@ -1,7 +1,7 @@ # # spec file for package epiphany # -# Copyright (c) 2018 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 @@ -25,6 +25,7 @@ URL: https://wiki.gnome.org/Apps/Web Source0: https://download.gnome.org/sources/epiphany/3.30/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc + # PATCH-FIX-UPSTREAM epiphany-window-Set-correct-current-height.patch -- window: set correct current height Patch0: epiphany-window-Set-correct-current-height.patch # PATCH-FIX-UPSTREAM epiphany-encoding-dialog-add-some-column-spacing.patch -- encoding-dialog: add some column spacing to grid @@ -37,6 +38,8 @@ Patch4: epiphany-Fix-saving-web-app-icons.patch # PATCH-FIX-UPSTREAM epiphany-Fix-remote-inspector-support.patch -- Fix remote inspector support Patch5: epiphany-Fix-remote-inspector-support.patch +# PATCH-FIX-UPSTREAM epiphany-bookmark-ensure-tags-sequence-is-created.patch -- Fix bookmark tags creation. +Patch6: epiphany-bookmark-ensure-tags-sequence-is-created.patch BuildRequires: fdupes BuildRequires: meson ++++++ epiphany-bookmark-ensure-tags-sequence-is-created.patch ++++++ >From d571984e24c0a24fd1d09da4341f79eea7286723 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <mcatanzaro(a)igalia.com> Date: Mon, 7 Jan 2019 19:38:22 +0000 Subject: [PATCH] bookmark: ensure tags sequence is always created Somehow we are getting EphyBookmarks objects deserialized without initializing the tags property. I'm not sure how this happens. It even happens for JSON corresponding to bookmarks that definitely have tags set. Anyway, ephy_bookmark_get_tags() is used as if the result is not nullable, so let's guarantee this and return an empty list instead in this case. This is a speculative fix for #612. It should fix the reported crash, but it's possible it will only uncover a subsequent crash. (cherry picked from commit 672cffa5ec652a5d5f7d98d0e0664408d58dcf8c) --- src/bookmarks/ephy-bookmark.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c index 43619a4ef..514a54aec 100644 --- a/src/bookmarks/ephy-bookmark.c +++ b/src/bookmarks/ephy-bookmark.c @@ -99,9 +99,10 @@ ephy_bookmark_set_property (GObject *object, ephy_bookmark_set_url (self, g_value_get_string (value)); break; case PROP_TAGS: - if (self->tags != NULL) - g_sequence_free (self->tags); + g_sequence_free (self->tags); self->tags = g_value_get_pointer (value); + if (!self->tags) + self->tags = g_sequence_new (g_free); break; case PROP_TYPE: g_free (self->type); @@ -176,8 +177,7 @@ ephy_bookmark_finalize (GObject *object) g_free (self->title); g_free (self->id); - if (self->tags) - g_sequence_free (self->tags); + g_sequence_free (self->tags); G_OBJECT_CLASS (ephy_bookmark_parent_class)->finalize (object); } @@ -279,6 +279,7 @@ ephy_bookmark_class_init (EphyBookmarkClass *klass) static void ephy_bookmark_init (EphyBookmark *self) { + self->tags = g_sequence_new (g_free); } EphyBookmark * @@ -456,6 +457,7 @@ GSequence * ephy_bookmark_get_tags (EphyBookmark *self) { g_assert (EPHY_IS_BOOKMARK (self)); + g_assert (self->tags); return self->tags; } -- 2.18.1

1 0

commit python-python-gnupg for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package python-python-gnupg for openSUSE:Factory checked in at 2019-02-01 11:45:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-python-gnupg (Old) and /work/SRC/openSUSE:Factory/.python-python-gnupg.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-python-gnupg" Fri Feb 1 11:45:27 2019 rev:6 rq:669857 version:0.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-python-gnupg/python-python-gnupg.changes 2019-01-25 22:44:12.807165479 +0100 +++ /work/SRC/openSUSE:Factory/.python-python-gnupg.new.28833/python-python-gnupg.changes 2019-02-01 11:45:28.732550423 +0100 @@ -29 +29 @@ - passphrases. + passphrases (CVE-2019-6690 bsc#1123498) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit gthumb for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package gthumb for openSUSE:Factory checked in at 2019-02-01 11:45:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gthumb (Old) and /work/SRC/openSUSE:Factory/.gthumb.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gthumb" Fri Feb 1 11:45:24 2019 rev:92 rq:669856 version:3.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gthumb/gthumb.changes 2019-01-21 10:52:46.763842794 +0100 +++ /work/SRC/openSUSE:Factory/.gthumb.new.28833/gthumb.changes 2019-02-01 11:45:25.384553862 +0100 @@ -1,0 +2,5 @@ +Tue Jan 29 11:46:15 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Add gthumb-exiv-0.27.patch: Fix build against exiv 0.27. + +------------------------------------------------------------------- New: ---- gthumb-exiv-0.27.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gthumb.spec ++++++ --- /var/tmp/diff_new_pack.M6iulc/_old 2019-02-01 11:45:26.936552267 +0100 +++ /var/tmp/diff_new_pack.M6iulc/_new 2019-02-01 11:45:26.940552264 +0100 @@ -28,6 +28,8 @@ # PATCH-FIX-UPSTREAM 0001-contact-sheet-error-if-the-theme-file-could-not-be-l.patch # bsc#1113749 / glgo#GNOME/gthumb#18 Patch0: 0001-contact-sheet-error-if-the-theme-file-could-not-be-l.patch +# PATCH-FIX-UPSTREAM gthumb-exiv-0.27.patch glgo#GNOME/gthumb#30 - Fix build against exiv 0.27 +Patch1: gthumb-exiv-0.27.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex ++++++ gthumb-exiv-0.27.patch ++++++ diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp --- a/extensions/exiv2_tools/exiv2-utils.cpp 2018-06-17 08:24:44.000000000 +0200 +++ b/extensions/exiv2_tools/exiv2-utils.cpp 2018-12-31 15:51:50.912329232 +0100 @@ -32,7 +32,8 @@ #include <sstream> #include <vector> #include <iomanip> -#include <exiv2/xmp.hpp> +#include <exiv2/exiv2.hpp> +#include <exiv2/xmp_exiv2.hpp> #include <gthumb.h> #include "exiv2-utils.h" @@ -1073,7 +1074,11 @@ try { if (exifData.empty()) { +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file"); +#else throw Exiv2::Error(1, " No Exif data found in the file"); +#endif } Exiv2::ExifData::const_iterator end = exifData.end(); for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {

1 0

commit flatpak-builder for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package flatpak-builder for openSUSE:Factory checked in at 2019-02-01 11:45:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak-builder (Old) and /work/SRC/openSUSE:Factory/.flatpak-builder.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flatpak-builder" Fri Feb 1 11:45:19 2019 rev:9 rq:669854 version:1.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak-builder/flatpak-builder.changes 2018-12-24 11:47:02.705152102 +0100 +++ /work/SRC/openSUSE:Factory/.flatpak-builder.new.28833/flatpak-builder.changes 2019-02-01 11:45:23.304555998 +0100 @@ -1,0 +2,19 @@ +Mon Jan 28 21:04:56 UTC 2019 - bjorn.lie(a)gmail.com + +- Update to version 1.0.3: + + Compress changes in cache, fixing the build of large + applications like libreoffice in some cases. + + Add new default-branch manifest option to allow overridable + branch name. +- Changes from version 1.0.2: + + Print a warning when a YAML document has a float-like string + value. + + Handle .txz archive suffixes. + + Set SOURCE_DATE_EPOCH to the mtime of the manifest in the + build. + + Update python post-processor to handle python 3.7 pyc files. + + Allow unsetting env vars in the build options by setting them + to null. + + Documentation improvements. + +------------------------------------------------------------------- Old: ---- flatpak-builder-1.0.1.tar.xz New: ---- flatpak-builder-1.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak-builder.spec ++++++ --- /var/tmp/diff_new_pack.8UVecC/_old 2019-02-01 11:45:23.804555484 +0100 +++ /var/tmp/diff_new_pack.8UVecC/_new 2019-02-01 11:45:23.804555484 +0100 @@ -1,7 +1,7 @@ # # spec file for package flatpak-builder # -# Copyright (c) 2018 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 @@ -17,7 +17,7 @@ Name: flatpak-builder -Version: 1.0.1 +Version: 1.0.3 Release: 0 Summary: Tool to build flatpaks from source License: LGPL-2.1-or-later ++++++ flatpak-builder-1.0.1.tar.xz -> flatpak-builder-1.0.3.tar.xz ++++++ ++++ 5009 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/NEWS new/flatpak-builder-1.0.3/NEWS --- old/flatpak-builder-1.0.1/NEWS 2018-10-04 14:59:28.000000000 +0200 +++ new/flatpak-builder-1.0.3/NEWS 2019-01-28 12:52:14.000000000 +0100 @@ -1,3 +1,20 @@ +Changes in 1.0.3 +================ + + * Compress changes in cache, fixing the build of large applications like libreoffice in + some cases. + * Add new default-branch manifest option to allow overridable branch name. + +Changes in 1.0.2 +================ + + * Print a warning when a YAML document has a float-like string value. + * Handle .txz archive suffixes. + * Set SOURCE_DATE_EPOCH to the mtime of the manifest in the build. + * Update python post-processor to handle python 3.7 pyc files. + * Allow unsetting env vars in the build options by setting them to null. + * Documentation improvements + Changes in 1.0.1 ================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/compile new/flatpak-builder-1.0.3/compile --- old/flatpak-builder-1.0.1/compile 2018-09-25 14:29:35.000000000 +0200 +++ new/flatpak-builder-1.0.3/compile 2019-01-11 16:32:13.000000000 +0100 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/configure.ac new/flatpak-builder-1.0.3/configure.ac --- old/flatpak-builder-1.0.1/configure.ac 2018-10-04 14:59:59.000000000 +0200 +++ new/flatpak-builder-1.0.3/configure.ac 2019-01-28 12:51:04.000000000 +0100 @@ -15,7 +15,7 @@ m4_define([flatpak_builder_major_version], [1]) m4_define([flatpak_builder_minor_version], [0]) -m4_define([flatpak_builder_micro_version], [1]) +m4_define([flatpak_builder_micro_version], [3]) m4_define([flatpak_builder_version], [flatpak_builder_major_version.flatpak_builder_minor_version.flatpak_builder_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/doc/flatpak-builder.xml new/flatpak-builder-1.0.3/doc/flatpak-builder.xml --- old/flatpak-builder-1.0.1/doc/flatpak-builder.xml 2018-08-08 14:12:15.000000000 +0200 +++ new/flatpak-builder-1.0.3/doc/flatpak-builder.xml 2019-01-11 16:15:29.000000000 +0100 @@ -112,7 +112,7 @@ <refsect1> <title>Manifest</title> - <para>The manifest file is a json file whose format is described in detail in its own manual page.</para> + <para>The manifest file is a json or yaml file whose format is described in detail in its own manual page.</para> </refsect1> <refsect1> @@ -623,7 +623,7 @@ "runtime-version": "1.2", "sdk": "org.freedesktop.Sdk", "command": "test", - "clean": [ "/include", "*.la" ], + "cleanup": [ "/include", "*.la" ], "build-options" : { "cflags": "-O2 -g", "cxxflags": "-O2 -g", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/doc/flatpak-manifest.xml new/flatpak-builder-1.0.3/doc/flatpak-manifest.xml --- old/flatpak-builder-1.0.1/doc/flatpak-manifest.xml 2018-08-20 10:57:46.000000000 +0200 +++ new/flatpak-builder-1.0.3/doc/flatpak-manifest.xml 2019-01-25 16:50:51.000000000 +0100 @@ -58,7 +58,24 @@ </varlistentry> <varlistentry> <term><option>branch</option> (string)</term> - <listitem><para>The branch of the application, defaults to master.</para></listitem> + <listitem><para>The branch to use when exporting + the application. If this is unset the defaults + come from the default-branch option.</para> + <para>This key overrides both the default-branch + key, and the --default-branch commandline + option. Unless you need a very specific branchname + (like for a runtime or an extension) it is + recommended to use the default-branch key instead, because + you can then override the default using --default-branch when + building for instance a test build.</para></listitem> + </varlistentry> + <varlistentry> + <term><option>default-branch</option> (string)</term> + <listitem><para>The default branch to use when + exporting the application. Defaults to master. </para> + <para>This key can be overriden by the + --default-branch commandline + option.</para></listitem> </varlistentry> <varlistentry> <term><option>collection-id</option> (string)</term> @@ -106,7 +123,16 @@ </varlistentry> <varlistentry> <term><option>command</option> (string)</term> - <listitem><para>The filename or path to the main binary of the application. Note that this is really just a single file, not a commandline. If you want to pass arguments, install a shell script wrapper and use that as the command.</para></listitem> + <listitem><para> + The filename or path to the main binary of the application. Note that this + is really just a single file, not a commandline. If you want to pass arguments, + install a shell script wrapper and use that as the command. + </para><para> + Also note that the command is used when the application is run via + <command>flatpak run</command>, and does not affect what gets executed when + the application is run in other ways, e.g. via the desktop file or D-Bus + activation. + </para></listitem> </varlistentry> <varlistentry> <term><option>build-runtime</option> (boolean)</term> @@ -340,7 +366,7 @@ </varlistentry> <varlistentry> <term><option>env</option> (object)</term> - <listitem><para>This is a dictionary defining environment variables to be set during the build. Elements in this override the properties that set the environment, like cflags and ldflags.</para></listitem> + <listitem><para>This is a dictionary defining environment variables to be set during the build. Elements in this override the properties that set the environment, like cflags and ldflags. Keys with a null value unset the corresponding variable. </para></listitem> </varlistentry> <varlistentry> <term><option>build-args</option> (array of strings)</term> @@ -661,7 +687,7 @@ </varlistentry> <varlistentry> <term><option>url</option> (string)</term> - <listitem><para>URL of the git repository. This overrides path if both are specified.</para></listitem> + <listitem><para>URL of the git repository. This overrides path if both are specified. When using git via SSH, the correct syntax is ssh://user@domain/path/to/repo.git.</para></listitem> </varlistentry> <varlistentry> <term><option>branch</option> (string)</term> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/missing new/flatpak-builder-1.0.3/missing --- old/flatpak-builder-1.0.1/missing 2018-09-25 14:29:35.000000000 +0200 +++ new/flatpak-builder-1.0.3/missing 2019-01-11 16:32:13.000000000 +0100 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-cache.c new/flatpak-builder-1.0.3/src/builder-cache.c --- old/flatpak-builder-1.0.1/src/builder-cache.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-cache.c 2019-01-25 15:13:40.000000000 +0100 @@ -588,6 +588,10 @@ g_autoptr(GPtrArray) removals = NULL; g_autoptr(GVariantDict) metadata_dict = NULL; g_autoptr(GVariant) metadata = NULL; + g_autoptr(GVariant) changesv = NULL; + g_autoptr(GVariant) removalsv = NULL; + g_autoptr(GVariant) changesvz = NULL; + g_autoptr(GVariant) removalsvz = NULL; g_print ("Committing stage %s to cache\n", self->stage); @@ -615,11 +619,17 @@ goto out; changes = builder_cache_get_changes_to (self, root, &removals, NULL); + metadata_dict = g_variant_dict_new (NULL); - g_variant_dict_insert_value (metadata_dict, "changes", - g_variant_new_strv ((const gchar * const *) changes->pdata, changes->len)); - g_variant_dict_insert_value (metadata_dict, "removals", - g_variant_new_strv ((const gchar * const *) removals->pdata, removals->len)); + + changesv = g_variant_ref_sink (g_variant_new_strv ((const gchar * const *) changes->pdata, changes->len)); + changesvz = flatpak_variant_compress (changesv); + g_variant_dict_insert_value (metadata_dict, "changesz", changesvz); + + removalsv = g_variant_ref_sink (g_variant_new_strv ((const gchar * const *) removals->pdata, removals->len)); + removalsvz = flatpak_variant_compress (removalsv); + g_variant_dict_insert_value (metadata_dict, "removalsz", removalsvz); + metadata = g_variant_ref_sink (g_variant_dict_end (metadata_dict)); current = self->current_checksum; @@ -1162,6 +1172,7 @@ g_autoptr(GVariant) variant = NULL; g_autoptr(GVariant) commit_metadata = NULL; g_autofree char *parent_commit = NULL; + g_autoptr(GVariant) changesz_v = NULL; g_autoptr(GVariant) changes_v = NULL; if (!ostree_repo_read_commit (self->repo, self->last_parent, &current_root, NULL, NULL, error)) @@ -1172,7 +1183,12 @@ return NULL; commit_metadata = g_variant_get_child_value (variant, 0); - changes_v = g_variant_lookup_value (commit_metadata, "changes", G_VARIANT_TYPE ("as")); + changesz_v = g_variant_lookup_value (commit_metadata, "changesz", G_VARIANT_TYPE_BYTESTRING); + + if (changesz_v) + changes_v = flatpak_variant_uncompress (changesz_v, G_VARIANT_TYPE ("as")); + else + changes_v = g_variant_lookup_value (commit_metadata, "changes", G_VARIANT_TYPE ("as")); if (changes_v) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-context.c new/flatpak-builder-1.0.3/src/builder-context.c --- old/flatpak-builder-1.0.1/src/builder-context.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-context.c 2019-01-25 17:18:28.000000000 +0100 @@ -48,7 +48,9 @@ SoupSession *soup_session; CURL *curl_session; char *arch; + char *default_branch; char *stop_at; + gint64 source_date_epoch; GFile *download_dir; GPtrArray *sources_dirs; @@ -118,6 +120,7 @@ g_clear_object (&self->options); g_clear_object (&self->sdk_config); g_free (self->arch); + g_free (self->default_branch); g_free (self->state_subdir); g_free (self->stop_at); g_strfreev (self->cleanup); @@ -566,6 +569,27 @@ } const char * +builder_context_get_default_branch (BuilderContext *self) +{ + return (const char *) self->default_branch; +} + +void +builder_context_set_default_branch (BuilderContext *self, + const char *default_branch) +{ + g_free (self->default_branch); + self->default_branch = g_strdup (default_branch); +} + +void +builder_context_set_source_date_epoch (BuilderContext *self, + gint64 source_date_epoch) +{ + self->source_date_epoch = source_date_epoch; +} + +const char * builder_context_get_stop_at (BuilderContext *self) { return self->stop_at; @@ -1005,8 +1029,21 @@ } char ** -builder_context_extend_env (BuilderContext *self, - char **envp) +builder_context_extend_env_pre (BuilderContext *self, + char **envp) +{ + if (self->source_date_epoch != 0) + { + g_autofree char *s_d_e = g_strdup_printf ("%" G_GUINT64_FORMAT, self->source_date_epoch); + envp = g_environ_setenv (envp, "SOURCE_DATE_EPOCH", s_d_e, FALSE); + } + + return envp; +} + +char ** +builder_context_extend_env_post (BuilderContext *self, + char **envp) { g_autofree char *path = NULL; const char *ccache_dir = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-context.h new/flatpak-builder-1.0.3/src/builder-context.h --- old/flatpak-builder-1.0.1/src/builder-context.h 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-context.h 2019-01-25 17:09:48.000000000 +0100 @@ -74,6 +74,11 @@ const char * builder_context_get_arch (BuilderContext *self); void builder_context_set_arch (BuilderContext *self, const char *arch); +const char * builder_context_get_default_branch (BuilderContext *self); +void builder_context_set_default_branch (BuilderContext *self, + const char *default_branch); +void builder_context_set_source_date_epoch (BuilderContext *self, + gint64 source_date_epoch); const char * builder_context_get_stop_at (BuilderContext *self); void builder_context_set_stop_at (BuilderContext *self, const char *module); @@ -140,8 +145,10 @@ void builder_context_set_no_shallow_clone (BuilderContext *self, gboolean no_shallow_clone); gboolean builder_context_get_no_shallow_clone (BuilderContext *self); -char ** builder_context_extend_env (BuilderContext *self, - char **envp); +char ** builder_context_extend_env_pre (BuilderContext *self, + char **envp); +char ** builder_context_extend_env_post (BuilderContext *self, + char **envp); gboolean builder_context_load_sdk_config (BuilderContext *self, const char *sdk_path, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-main.c new/flatpak-builder-1.0.3/src/builder-main.c --- old/flatpak-builder-1.0.1/src/builder-main.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-main.c 2019-01-25 17:13:41.000000000 +0100 @@ -253,6 +253,46 @@ } static gboolean +flatpak_version_check (int major, + int minor, + int micro) +{ + static int flatpak_major = 0; + static int flatpak_minor = 0; + static int flatpak_micro = 0; + + if (flatpak_major == 0 && + flatpak_minor == 0 && + flatpak_micro == 0) + { + const char * argv[] = { "flatpak", "--version", NULL }; + g_autoptr(GSubprocess) subp = NULL; + g_autofree char *out = NULL; + + subp = g_subprocess_newv (argv, G_SUBPROCESS_FLAGS_STDOUT_PIPE, NULL); + g_subprocess_communicate_utf8 (subp, NULL, NULL, &out, NULL, NULL); + + if (sscanf (out, "Flatpak %d.%d.%d", &flatpak_major, &flatpak_minor, &flatpak_micro) != 3) + g_warning ("Failed to get flatpak version"); + + g_debug ("Using Flatpak version %d.%d.%d", flatpak_major, flatpak_minor, flatpak_micro); + } + + if (flatpak_major > major) + return TRUE; + if (flatpak_major < major) + return FALSE; + if (flatpak_minor > minor) + return TRUE; + if (flatpak_minor < minor) + return FALSE; + if (flatpak_micro >= micro) + return TRUE; + + return FALSE; +} + +static gboolean do_install (BuilderContext *build_context, const gchar *repodir, const gchar *id, @@ -276,7 +316,8 @@ g_ptr_array_add (args, g_strdup ("--system")); g_ptr_array_add (args, g_strdup ("-y")); - + if (flatpak_version_check (1, 2, 0)) + g_ptr_array_add (args, g_strdup ("--noninteractive")); g_ptr_array_add (args, g_strdup ("--reinstall")); ref = flatpak_build_untyped_ref (id, branch, @@ -401,6 +442,7 @@ int i, first_non_arg, orig_argc; int argnr; char *p; + struct stat statbuf; setlocale (LC_ALL, ""); @@ -417,7 +459,6 @@ else g_unsetenv ("GIO_USE_VFS"); - /* Work around libsoup/glib race condition, as per: https://bugzilla.gnome.org/show_bug.cgi?id=796031 and https://bugzilla.gnome.org/show_bug.cgi?id=674885#c87 */ @@ -619,6 +660,9 @@ return 1; } + if (stat (flatpak_file_get_path_cached (manifest_file), &statbuf) == 0) + builder_context_set_source_date_epoch (build_context, (gint64)statbuf.st_mtime); + manifest_sha256 = g_compute_checksum_for_string (G_CHECKSUM_SHA256, manifest_contents, -1); if (opt_skip_if_unchanged) @@ -646,7 +690,7 @@ } if (opt_default_branch) - builder_manifest_set_default_branch (manifest, opt_default_branch); + builder_context_set_default_branch (build_context, opt_default_branch); if (opt_collection_id) builder_manifest_set_default_collection_id (manifest, opt_collection_id); @@ -884,7 +928,7 @@ if (opt_mirror_screenshots_url && !opt_export_only) { g_autofree char *screenshot_subdir = g_strdup_printf ("%s-%s", builder_manifest_get_id (manifest), - builder_manifest_get_branch (manifest)); + builder_manifest_get_branch (manifest, build_context)); g_autofree char *url = g_build_filename (opt_mirror_screenshots_url, screenshot_subdir, NULL); g_autofree char *xml_relpath = g_strdup_printf ("files/share/app-info/xmls/%s.xml.gz", builder_manifest_get_id (manifest)); g_autoptr(GFile) xml = g_file_resolve_relative_path (app_dir, xml_relpath); @@ -966,7 +1010,7 @@ if (!do_export (build_context, &error, FALSE, flatpak_file_get_path_cached (export_repo), - app_dir_path, exclude_dirs, builder_manifest_get_branch (manifest), + app_dir_path, exclude_dirs, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), "--exclude=/lib/debug/*", "--include=/lib/debug/app", @@ -1000,7 +1044,7 @@ "/share/runtime/locale/", NULL); if (!do_export (build_context, &error, TRUE, flatpak_file_get_path_cached (export_repo), - app_dir_path, NULL, builder_manifest_get_branch (manifest), + app_dir_path, NULL, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), metadata_arg, files_arg, @@ -1020,7 +1064,7 @@ if (!do_export (build_context, &error, TRUE, flatpak_file_get_path_cached (export_repo), - app_dir_path, NULL, builder_manifest_get_branch (manifest), + app_dir_path, NULL, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), "--metadata=metadata.debuginfo", builder_context_get_build_runtime (build_context) ? "--files=usr/lib/debug" : "--files=files/lib/debug", @@ -1051,7 +1095,7 @@ if (!do_export (build_context, &error, TRUE, flatpak_file_get_path_cached (export_repo), - app_dir_path, NULL, builder_manifest_get_branch (manifest), + app_dir_path, NULL, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), metadata_arg, files_arg, NULL)) @@ -1070,7 +1114,7 @@ if (!do_export (build_context, &error, TRUE, flatpak_file_get_path_cached (export_repo), - app_dir_path, NULL, builder_manifest_get_branch (manifest), + app_dir_path, NULL, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), "--metadata=metadata.sources", "--files=sources", @@ -1090,7 +1134,7 @@ if (!do_export (build_context, &error, TRUE, flatpak_file_get_path_cached (export_repo), - app_dir_path, NULL, builder_manifest_get_branch (manifest), + app_dir_path, NULL, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), "--metadata=metadata.platform", "--files=platform", @@ -1124,7 +1168,7 @@ files_arg = g_strconcat ("--files=platform/share/runtime/locale/", NULL); if (!do_export (build_context, &error, TRUE, flatpak_file_get_path_cached (export_repo), - app_dir_path, NULL, builder_manifest_get_branch (manifest), + app_dir_path, NULL, builder_manifest_get_branch (manifest, build_context), builder_manifest_get_collection_id (manifest), metadata_arg, files_arg, @@ -1144,7 +1188,7 @@ g_printerr ("NOTE: No export due to --require-changes, ignoring --install\n"); else if (!do_install (build_context, flatpak_file_get_path_cached (export_repo), builder_manifest_get_id (manifest), - builder_manifest_get_branch (manifest), + builder_manifest_get_branch (manifest, build_context), &error)) { g_printerr ("Install failed: %s\n", error->message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-manifest.c new/flatpak-builder-1.0.3/src/builder-manifest.c --- old/flatpak-builder-1.0.1/src/builder-manifest.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-manifest.c 2019-01-25 17:15:59.000000000 +0100 @@ -61,6 +61,7 @@ char *id; char *id_platform; char *branch; + char *default_branch; char *collection_id; char *extension_tag; char *type; @@ -123,6 +124,7 @@ PROP_ID, PROP_ID_PLATFORM, PROP_BRANCH, + PROP_DEFAULT_BRANCH, PROP_RUNTIME, PROP_RUNTIME_VERSION, PROP_RUNTIME_COMMIT, @@ -175,6 +177,7 @@ g_free (self->id); g_free (self->branch); + g_free (self->default_branch); g_free (self->collection_id); g_free (self->extension_tag); g_free (self->runtime); @@ -284,6 +287,10 @@ g_value_set_string (value, self->branch); break; + case PROP_DEFAULT_BRANCH: + g_value_set_string (value, self->default_branch); + break; + case PROP_RUNTIME: g_value_set_string (value, self->runtime); break; @@ -488,6 +495,11 @@ self->branch = g_value_dup_string (value); break; + case PROP_DEFAULT_BRANCH: + g_free (self->default_branch); + self->default_branch = g_value_dup_string (value); + break; + case PROP_RUNTIME: g_free (self->runtime); self->runtime = g_value_dup_string (value); @@ -749,6 +761,13 @@ NULL, G_PARAM_READWRITE)); g_object_class_install_property (object_class, + PROP_DEFAULT_BRANCH, + g_param_spec_string ("default-branch", + "", + "", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_RUNTIME, g_param_spec_string ("runtime", "", @@ -1366,20 +1385,20 @@ } const char * -builder_manifest_get_branch (BuilderManifest *self) +builder_manifest_get_branch (BuilderManifest *self, + BuilderContext *context) { if (self->branch) return self->branch; - return "master"; -} + if (context && + builder_context_get_default_branch (context)) + return builder_context_get_default_branch (context); -void -builder_manifest_set_default_branch (BuilderManifest *self, - const char *default_branch) -{ - if (self->branch == NULL) - self->branch = g_strdup (default_branch); + if (self->default_branch) + return self->default_branch; + + return "master"; } const char * @@ -1405,7 +1424,7 @@ static const char * builder_manifest_get_base_version (BuilderManifest *self) { - return self->base_version ? self->base_version : builder_manifest_get_branch (self); + return self->base_version ? self->base_version : builder_manifest_get_branch (self, NULL); } G_GNUC_NULL_TERMINATED @@ -2713,7 +2732,7 @@ ref = flatpak_compose_ref (!self->build_runtime && !self->build_extension, builder_manifest_get_id (self), - builder_manifest_get_branch (self), + builder_manifest_get_branch (self, context), builder_context_get_arch (context)); if (self->metadata) @@ -3132,7 +3151,7 @@ ref = flatpak_compose_ref (!self->build_runtime && !self->build_extension, builder_manifest_get_id_platform (self), - builder_manifest_get_branch (self), + builder_manifest_get_branch (self, context), builder_context_get_arch (context)); platform_dir = g_file_get_child (app_dir, "platform"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-manifest.h new/flatpak-builder-1.0.3/src/builder-manifest.h --- old/flatpak-builder-1.0.1/src/builder-manifest.h 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-manifest.h 2019-01-25 17:11:56.000000000 +0100 @@ -59,9 +59,8 @@ GList * builder_manifest_get_modules (BuilderManifest *self); GList * builder_manifest_get_add_extensions (BuilderManifest *self); GList * builder_manifest_get_add_build_extensions (BuilderManifest *self); -const char * builder_manifest_get_branch (BuilderManifest *self); -void builder_manifest_set_default_branch (BuilderManifest *self, - const char *default_branch); +const char * builder_manifest_get_branch (BuilderManifest *self, + BuilderContext *context); const char * builder_manifest_get_collection_id (BuilderManifest *self); const char * builder_manifest_get_extension_tag (BuilderManifest *self); void builder_manifest_set_default_collection_id (BuilderManifest *self, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-options.c new/flatpak-builder-1.0.3/src/builder-options.c --- old/flatpak-builder-1.0.1/src/builder-options.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-options.c 2019-01-15 16:14:23.000000000 +0100 @@ -645,23 +645,24 @@ for (i = 0; self->env[i] != NULL; i++) { - JsonNode *str = json_node_new (JSON_NODE_VALUE); + JsonNode *val = NULL; const char *equal; g_autofree char *member = NULL; equal = strchr (self->env[i], '='); if (equal) { - json_node_set_string (str, equal + 1); + val = json_node_new (JSON_NODE_VALUE); + json_node_set_string (val, equal + 1); member = g_strndup (self->env[i], equal - self->env[i]); } else { - json_node_set_string (str, ""); + val = json_node_new (JSON_NODE_NULL); member = g_strdup (self->env[i]); } - json_object_set_member (object, member, str); + json_object_set_member (object, member, val); } retval = json_node_init_object (json_node_alloc (), object); @@ -743,11 +744,19 @@ const char *val_str; val = json_object_get_member (object, member_name); - val_str = json_node_get_string (val); - if (val_str == NULL) - return FALSE; - g_ptr_array_add (env, g_strdup_printf ("%s=%s", member_name, val_str)); + if (JSON_NODE_TYPE (val) == JSON_NODE_NULL) + { + g_ptr_array_add (env, g_strdup_printf ("%s", member_name)); + } + else + { + val_str = json_node_get_string (val); + if (val_str == NULL) + return FALSE; + + g_ptr_array_add (env, g_strdup_printf ("%s=%s", member_name, val_str)); + } } g_ptr_array_add (env, NULL); @@ -1084,51 +1093,53 @@ char **envp = NULL; const char *cflags, *cppflags, *cxxflags, *ldflags; - for (l = options; l != NULL; l = l->next) + envp = builder_context_extend_env_pre (context, envp); + + cflags = builder_options_get_cflags (self, context); + if (cflags) + envp = g_environ_setenv (envp, "CFLAGS", cflags, FALSE); + + cppflags = builder_options_get_cppflags (self, context); + if (cppflags) + envp = g_environ_setenv (envp, "CPPFLAGS", cppflags, FALSE); + + cxxflags = builder_options_get_cxxflags (self, context); + if (cxxflags) + envp = g_environ_setenv (envp, "CXXFLAGS", cxxflags, FALSE); + + ldflags = builder_options_get_ldflags (self, context); + if (ldflags) + envp = g_environ_setenv (envp, "LDFLAGS", ldflags, FALSE); + + /* We traverse in reverse order because the list is "last first" */ + for (l = g_list_last (options); l != NULL; l = l->prev) { BuilderOptions *o = l->data; if (o->env) { - for (i = 0; o->env[i] != NULL; i++) + for (i = g_strv_length (o->env) - 1; i >= 0; i--) { const char *line = o->env[i]; const char *eq = strchr (line, '='); - const char *value = ""; - g_autofree char *key = NULL; if (eq) { - key = g_strndup (line, eq - line); - value = eq + 1; + g_autofree char *key = g_strndup (line, eq - line); + const char *value = eq + 1; + + envp = g_environ_setenv (envp, key, value, TRUE); } else { - key = g_strdup (key); + envp = g_environ_unsetenv (envp, line); } - envp = g_environ_setenv (envp, key, value, FALSE); } } } - envp = builder_context_extend_env (context, envp); - - cflags = builder_options_get_cflags (self, context); - if (cflags) - envp = g_environ_setenv (envp, "CFLAGS", cflags, FALSE); - - cppflags = builder_options_get_cppflags (self, context); - if (cppflags) - envp = g_environ_setenv (envp, "CPPFLAGS", cppflags, FALSE); - - cxxflags = builder_options_get_cxxflags (self, context); - if (cxxflags) - envp = g_environ_setenv (envp, "CXXFLAGS", cxxflags, FALSE); - - ldflags = builder_options_get_ldflags (self, context); - if (ldflags) - envp = g_environ_setenv (envp, "LDFLAGS", ldflags, FALSE); + envp = builder_context_extend_env_post (context, envp); envp = builder_options_update_path (self, context, envp); envp = builder_options_update_ld_path (self, context, envp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-post-process.c new/flatpak-builder-1.0.3/src/builder-post-process.c --- old/flatpak-builder-1.0.1/src/builder-post-process.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-post-process.c 2019-01-14 11:18:13.000000000 +0100 @@ -112,6 +112,9 @@ return TRUE; } +/* We need to read at least 12 bytes to get both magic + optional flags + mtime */ +#define PYTHON_HEADER_SIZE 12 + static gboolean fixup_python_time_stamp (const char *path, const char *rel_path, @@ -119,9 +122,11 @@ { glnx_fd_close int fd = -1; g_auto(GLnxTmpfile) tmpf = { 0 }; - guint8 buffer[8]; + guint8 buffer[PYTHON_HEADER_SIZE]; ssize_t res; guint32 pyc_mtime; + guint32 magic, header_flag; + gsize mtime_offset; g_autofree char *py_path = NULL; struct stat stbuf; gboolean remove_pyc = FALSE; @@ -136,8 +141,8 @@ return TRUE; } - res = pread (fd, buffer, 8, 0); - if (res != 8) + res = pread (fd, buffer, PYTHON_HEADER_SIZE, 0); + if (res != PYTHON_HEADER_SIZE) { g_warning ("Short read for %s", rel_path); return TRUE; @@ -149,11 +154,48 @@ return TRUE; } + magic = buffer[0] + (buffer[1] << 8); + + /* All magic listed here: https://github.com/python/cpython/blob/HEAD/Lib/importlib/_bootstrap_extern… + * 3392 is the first (3.7) which added an extra flags field in the header. + * 20121 is the first higher major listed (1.5), and all other non-py3 ones are higher. + */ + if (magic >= 3392 && magic < 20121) + { + /* From the spec: + * The pyc header currently consists of 3 32-bit words. We will expand it to 4. + * The first word will continue to be the magic number, versioning the bytecode and pyc format. + * The second word, conceptually the new word, will be a bit field. + * The interpretation of the rest of the header and invalidation behavior of the pyc depends on the contents of the bit field. + */ + header_flag = + (buffer[4] << 8*0) | + (buffer[5] << 8*1) | + (buffer[6] << 8*2) | + (buffer[7] << 8*3); + + /* If the bit field is 0, the pyc is a traditional timestamp-based pyc. I.e., the third + and forth words will be the timestamp and file size respectively, and invalidation + will be done by comparing the metadata of the source file with that in the header. */ + if (header_flag != 0) + { + /* Non-mtime based verification, like hash if low bit is 1, + * or other future added methods. No need to do anything*/ + return TRUE; + } + + mtime_offset = 8; + } + else + { + mtime_offset = 4; + } + pyc_mtime = - (buffer[4] << 8*0) | - (buffer[5] << 8*1) | - (buffer[6] << 8*2) | - (buffer[7] << 8*3); + (buffer[mtime_offset+0] << 8*0) | + (buffer[mtime_offset+1] << 8*1) | + (buffer[mtime_offset+2] << 8*2) | + (buffer[mtime_offset+3] << 8*3); if (strcmp (dir_basename, "__pycache__") == 0) { @@ -233,11 +275,11 @@ return glnx_throw_errno_prefix (error, "copyfile"); /* Change to mtime 0 which is what ostree uses for checkouts */ - buffer[4] = OSTREE_TIMESTAMP; - buffer[5] = buffer[6] = buffer[7] = 0; + buffer[mtime_offset+0] = OSTREE_TIMESTAMP; + buffer[mtime_offset+1] = buffer[mtime_offset+2] = buffer[mtime_offset+3] = 0; - res = pwrite (tmpf.fd, buffer, 8, 0); - if (res != 8) + res = pwrite (tmpf.fd, buffer, PYTHON_HEADER_SIZE, 0); + if (res != PYTHON_HEADER_SIZE) { glnx_set_error_from_errno (error); return FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-source-archive.c new/flatpak-builder-1.0.3/src/builder-source-archive.c --- old/flatpak-builder-1.0.1/src/builder-source-archive.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-source-archive.c 2019-01-11 16:15:29.000000000 +0100 @@ -504,7 +504,8 @@ if (g_str_has_suffix (lower, ".tar.lzo")) return TAR_LZOP; - if (g_str_has_suffix (lower, ".tar.xz")) + if (g_str_has_suffix (lower, ".tar.xz") || + g_str_has_suffix (lower, ".txz")) return TAR_XZ; if (g_str_has_suffix (lower, ".zip")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-utils.c new/flatpak-builder-1.0.3/src/builder-utils.c --- old/flatpak-builder-1.0.1/src/builder-utils.c 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-utils.c 2019-01-25 14:55:29.000000000 +0100 @@ -408,14 +408,29 @@ json_node_init_boolean (json, FALSE); break; } - - gchar *endptr; - gint64 num = g_ascii_strtoll (scalar, &endptr, 10); - if (*scalar != '\0' && *endptr == '\0') + else if (strcmp (scalar, "null") == 0) { - json_node_init_int (json, num); + json_node_init_null (json); break; } + + if (*scalar != '\0') + { + gchar *endptr; + gint64 num = g_ascii_strtoll (scalar, &endptr, 10); + if (*endptr == '\0') + { + json_node_init_int (json, num); + break; + } + else if (*endptr == '.') + { + g_ascii_strtoll (endptr + 1, &endptr, 10); + if (*endptr == '\0') + g_warning ("%zu:%zu: '%s' will be parsed as a number by many YAML parsers", + node->start_mark.line + 1, node->start_mark.column + 1, scalar); + } + } } json_node_init_string (json, scalar); @@ -2524,3 +2539,71 @@ return g_steal_pointer (&xml_root); } + +GBytes * +flatpak_read_stream (GInputStream *in, + gboolean null_terminate, + GError **error) +{ + g_autoptr(GOutputStream) mem_stream = NULL; + + mem_stream = g_memory_output_stream_new_resizable (); + if (g_output_stream_splice (mem_stream, in, + 0, NULL, error) < 0) + return NULL; + + if (null_terminate) + { + if (!g_output_stream_write (G_OUTPUT_STREAM (mem_stream), "\0", 1, NULL, error)) + return NULL; + } + + if (!g_output_stream_close (G_OUTPUT_STREAM (mem_stream), NULL, error)) + return NULL; + + return g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (mem_stream)); +} + +GVariant * +flatpak_variant_uncompress (GVariant *variant, + const GVariantType *type) +{ + g_autoptr(GInputStream) input_stream = NULL; + g_autoptr(GZlibDecompressor) decompressor = NULL; + g_autoptr(GInputStream) converter = NULL; + g_autoptr(GBytes) decompressed_bytes = NULL; + const guint8 *compressed; + gsize compressed_size; + + g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_BYTESTRING)); + + compressed = g_variant_get_data (variant); + compressed_size = g_variant_get_size (variant); + + input_stream = g_memory_input_stream_new_from_data (compressed, compressed_size, NULL); + decompressor = g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP); + converter = g_converter_input_stream_new (G_INPUT_STREAM (input_stream), G_CONVERTER (decompressor)); + decompressed_bytes = flatpak_read_stream (converter, FALSE, NULL); + return g_variant_ref_sink (g_variant_new_from_bytes (type, decompressed_bytes, TRUE)); +} + +GVariant * +flatpak_variant_compress (GVariant *variant) +{ + g_autoptr(GInputStream) input_stream = NULL; + g_autoptr(GZlibCompressor) compressor = NULL; + g_autoptr(GInputStream) converter = NULL; + g_autoptr(GBytes) compressed_bytes = NULL; + const guint8 *decompressed; + gsize decompressed_size; + + decompressed = g_variant_get_data (variant); + decompressed_size = g_variant_get_size (variant); + + input_stream = g_memory_input_stream_new_from_data (decompressed, decompressed_size, NULL); + compressor = g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP, -1); + converter = g_converter_input_stream_new (G_INPUT_STREAM (input_stream), G_CONVERTER (compressor)); + compressed_bytes = flatpak_read_stream (converter, FALSE, NULL); + + return g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE_BYTESTRING, compressed_bytes, TRUE)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/src/builder-utils.h new/flatpak-builder-1.0.3/src/builder-utils.h --- old/flatpak-builder-1.0.1/src/builder-utils.h 2018-10-04 14:48:07.000000000 +0200 +++ new/flatpak-builder-1.0.3/src/builder-utils.h 2019-01-25 14:54:53.000000000 +0100 @@ -170,6 +170,13 @@ const char *type, FlatpakXml **prev_child_out); +GBytes * flatpak_read_stream (GInputStream *in, + gboolean null_terminate, + GError **error); +GVariant * flatpak_variant_compress (GVariant *variant); +GVariant * flatpak_variant_uncompress (GVariant *variant, const GVariantType *type); + + G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakXml, flatpak_xml_free); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/flatpak-builder-1.0.1/test-driver new/flatpak-builder-1.0.3/test-driver --- old/flatpak-builder-1.0.1/test-driver 2018-09-25 14:29:35.000000000 +0200 +++ new/flatpak-builder-1.0.3/test-driver 2019-01-11 16:32:13.000000000 +0100 @@ -1,9 +1,9 @@ -#!/bin/sh +#! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,7 +140,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0"

1 0

commit skelcd-fallbackrepo for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package skelcd-fallbackrepo for openSUSE:Factory checked in at 2019-02-01 11:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-fallbackrepo (Old) and /work/SRC/openSUSE:Factory/.skelcd-fallbackrepo.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-fallbackrepo" Fri Feb 1 11:45:17 2019 rev:3 rq:669805 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-fallbackrepo/skelcd-fallbackrepo.changes 2019-01-28 20:50:45.137759176 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-fallbackrepo.new.28833/skelcd-fallbackrepo.changes 2019-02-01 11:45:18.152561290 +0100 @@ -1,0 +2,5 @@ +Tue Jan 29 10:58:16 UTC 2019 - snwint(a)suse.com + +- ignore setting of %is_susesap and rework build conditions + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-fallbackrepo.spec ++++++ --- /var/tmp/diff_new_pack.LrVzh2/_old 2019-02-01 11:45:18.856560566 +0100 +++ /var/tmp/diff_new_pack.LrVzh2/_new 2019-02-01 11:45:18.856560566 +0100 @@ -23,6 +23,13 @@ %global flavor @BUILD_FLAVOR@%nil +# SLE but not Leap +%if 0%{?sle_version} && !0%{?is_opensuse} +%define sle_only 1 +%else +%define sle_only 0 +%endif + # === sort out which flavor to build === %if "%flavor" == "openSUSE" @@ -42,13 +49,13 @@ %if "%flavor" == "SLED" # build SLED only on x86_64 -%if "%{_target_cpu}" == "x86_64" && 0%{?sle_version} && !0%{?is_opensuse} +%if %sle_only && "%{_target_cpu}" == "x86_64" %define theme SLED %endif %endif %if "%flavor" == "SLES" -%if 0%{?sle_version} && !0%{?is_opensuse} +%if %sle_only %ifnarch %ix86 %define theme SLES %endif @@ -56,19 +63,19 @@ %endif %if "%flavor" == "SLES_SAP" -%if 0%{?sle_version} && 0%{?is_susesap} && ( "%{_target_cpu}" == "x86_64" || "%{_target_cpu}" == "ppc64le" ) +%if %sle_only && ( "%{_target_cpu}" == "x86_64" || "%{_target_cpu}" == "ppc64le" ) %define theme SLES_SAP %endif %endif %if "%flavor" == "SLE_HPC" -%if 0%{?sle_version} && ( "%{_target_cpu}" == "x86_64" || "%{_target_cpu}" == "aarch64" ) +%if %sle_only && ( "%{_target_cpu}" == "x86_64" || "%{_target_cpu}" == "aarch64" ) %define theme SLE_HPC %endif %endif %if "%flavor" == "SLE_RT" -%if 0%{?sle_version} && ( "%{_target_cpu}" == "x86_64" ) +%if %sle_only && ( "%{_target_cpu}" == "x86_64" ) %define theme SLE_RT %endif %endif

1 0

commit python-boto3 for openSUSE:Factory
by root 01 Feb '19

01 Feb '19

Hello community, here is the log from the commit of package python-boto3 for openSUSE:Factory checked in at 2019-02-01 11:45:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-boto3 (Old) and /work/SRC/openSUSE:Factory/.python-boto3.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-boto3" Fri Feb 1 11:45:15 2019 rev:21 rq:669801 version:1.9.84 Changes: -------- --- /work/SRC/openSUSE:Factory/python-boto3/python-boto3.changes 2019-01-08 12:31:30.372074249 +0100 +++ /work/SRC/openSUSE:Factory/.python-boto3.new.28833/python-boto3.changes 2019-02-01 11:45:17.136562333 +0100 @@ -1,0 +2,44 @@ +Thu Jan 24 10:28:23 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com> + +- Version update to 1.9.84 + * api-change:``worklink``: [``botocore``] Update worklink client to latest version + * api-change:``apigatewaymanagementapi``: [``botocore``] + Update apigatewaymanagementapi client to latest version + * api-change:``acm-pca``: [``botocore``] Update acm-pca client to latest version +- from version 1.9.83 + * api-change:``appstream``: [``botocore``] Update appstream client to latest version + * api-change:``discovery``: [``botocore``] Update discovery client to latest version + * api-change:``dms``: [``botocore``] Update dms client to latest version + * api-change:``fms``: [``botocore``] Update fms client to latest version + * api-change:``ssm``: [``botocore``] Update ssm client to latest version +- from version 1.9.82 + * api-change:``glue``: [``botocore``] Update glue client to latest version + * api-change:``ec2``: [``botocore``] Update ec2 client to latest version +- from version 1.9.81 + * api-change:``lightsail``: [``botocore``] Update lightsail client to latest version + * api-change:``lambda``: [``botocore``] Update lambda client to latest version + * api-change:``pinpoint``: [``botocore``] Update pinpoint client to latest version + * api-change:``rekognition``: [``botocore``] Update rekognition client to latest version +- from version 1.9.80 + * api-change:``dynamodb``: [``botocore``] Update dynamodb client to latest version + * api-change:``ce``: [``botocore``] Update ce client to latest version + * api-change:``backup``: [``botocore``] Update backup client to latest version +- from version 1.9.79 + * api-change:``storagegateway``: [``botocore``] Update storagegateway client to latest version + * api-change:``mediaconvert``: [``botocore``] Update mediaconvert client to latest version +- from version 1.9.78 + * api-change:``rds-data``: [``botocore``] Update rds-data client to latest version + * api-change:``emr``: [``botocore``] Update emr client to latest version +- from version 1.9.77 + * api-change:``iot``: [``botocore``] Update iot client to latest version + * api-change:``ec2``: [``botocore``] Update ec2 client to latest version + * api-change:``codedeploy``: [``botocore``] Update codedeploy client to latest version + * api-change:``sagemaker``: [``botocore``] Update sagemaker client to latest version +- from version 1.9.76 + * api-change:``docdb``: [``botocore``] Update docdb client to latest version + * api-change:``redshift``: [``botocore``] Update redshift client to latest version +- from version 1.9.75 + * api-change:``appmesh``: [``botocore``] Update appmesh client to latest version +- Update Requires in spec file from setup.py + +------------------------------------------------------------------- Old: ---- 1.9.74.tar.gz New: ---- 1.9.84.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-boto3.spec ++++++ --- /var/tmp/diff_new_pack.pPx9YQ/_old 2019-02-01 11:45:17.688561766 +0100 +++ /var/tmp/diff_new_pack.pPx9YQ/_new 2019-02-01 11:45:17.696561758 +0100 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-boto3 -Version: 1.9.74 +Version: 1.9.84 Release: 0 Summary: Amazon Web Services Library License: Apache-2.0 @@ -26,7 +26,7 @@ URL: https://github.com/boto/boto3 Source: https://github.com/boto/boto3/archive/%{version}.tar.gz BuildRequires: %{python_module botocore < 1.13.0} -BuildRequires: %{python_module botocore >= 1.12.74} +BuildRequires: %{python_module botocore >= 1.12.84} BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} BuildRequires: %{python_module s3transfer} @@ -38,7 +38,7 @@ BuildRequires: python %endif Requires: python-botocore < 1.13.0 -Requires: python-botocore >= 1.12.74 +Requires: python-botocore >= 1.12.84 Requires: python-jmespath < 1.0.0 Requires: python-jmespath >= 0.7.1 Requires: python-s3transfer < 0.2.0 ++++++ 1.9.74.tar.gz -> 1.9.84.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.75.json new/boto3-1.9.84/.changes/1.9.75.json --- old/boto3-1.9.74/.changes/1.9.75.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.75.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,7 @@ +[ + { + "category": "``appmesh``", + "description": "[``botocore``] Update appmesh client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.76.json new/boto3-1.9.84/.changes/1.9.76.json --- old/boto3-1.9.74/.changes/1.9.76.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.76.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,12 @@ +[ + { + "category": "``docdb``", + "description": "[``botocore``] Update docdb client to latest version", + "type": "api-change" + }, + { + "category": "``redshift``", + "description": "[``botocore``] Update redshift client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.77.json new/boto3-1.9.84/.changes/1.9.77.json --- old/boto3-1.9.74/.changes/1.9.77.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.77.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,22 @@ +[ + { + "category": "``iot``", + "description": "[``botocore``] Update iot client to latest version", + "type": "api-change" + }, + { + "category": "``ec2``", + "description": "[``botocore``] Update ec2 client to latest version", + "type": "api-change" + }, + { + "category": "``codedeploy``", + "description": "[``botocore``] Update codedeploy client to latest version", + "type": "api-change" + }, + { + "category": "``sagemaker``", + "description": "[``botocore``] Update sagemaker client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.78.json new/boto3-1.9.84/.changes/1.9.78.json --- old/boto3-1.9.74/.changes/1.9.78.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.78.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,12 @@ +[ + { + "category": "``rds-data``", + "description": "[``botocore``] Update rds-data client to latest version", + "type": "api-change" + }, + { + "category": "``emr``", + "description": "[``botocore``] Update emr client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.79.json new/boto3-1.9.84/.changes/1.9.79.json --- old/boto3-1.9.74/.changes/1.9.79.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.79.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,12 @@ +[ + { + "category": "``storagegateway``", + "description": "[``botocore``] Update storagegateway client to latest version", + "type": "api-change" + }, + { + "category": "``mediaconvert``", + "description": "[``botocore``] Update mediaconvert client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.80.json new/boto3-1.9.84/.changes/1.9.80.json --- old/boto3-1.9.74/.changes/1.9.80.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.80.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,17 @@ +[ + { + "category": "``dynamodb``", + "description": "[``botocore``] Update dynamodb client to latest version", + "type": "api-change" + }, + { + "category": "``ce``", + "description": "[``botocore``] Update ce client to latest version", + "type": "api-change" + }, + { + "category": "``backup``", + "description": "[``botocore``] Update backup client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.81.json new/boto3-1.9.84/.changes/1.9.81.json --- old/boto3-1.9.74/.changes/1.9.81.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.81.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,22 @@ +[ + { + "category": "``lightsail``", + "description": "[``botocore``] Update lightsail client to latest version", + "type": "api-change" + }, + { + "category": "``lambda``", + "description": "[``botocore``] Update lambda client to latest version", + "type": "api-change" + }, + { + "category": "``pinpoint``", + "description": "[``botocore``] Update pinpoint client to latest version", + "type": "api-change" + }, + { + "category": "``rekognition``", + "description": "[``botocore``] Update rekognition client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.82.json new/boto3-1.9.84/.changes/1.9.82.json --- old/boto3-1.9.74/.changes/1.9.82.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.82.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,12 @@ +[ + { + "category": "``glue``", + "description": "[``botocore``] Update glue client to latest version", + "type": "api-change" + }, + { + "category": "``ec2``", + "description": "[``botocore``] Update ec2 client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.83.json new/boto3-1.9.84/.changes/1.9.83.json --- old/boto3-1.9.74/.changes/1.9.83.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.83.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,27 @@ +[ + { + "category": "``appstream``", + "description": "[``botocore``] Update appstream client to latest version", + "type": "api-change" + }, + { + "category": "``discovery``", + "description": "[``botocore``] Update discovery client to latest version", + "type": "api-change" + }, + { + "category": "``dms``", + "description": "[``botocore``] Update dms client to latest version", + "type": "api-change" + }, + { + "category": "``fms``", + "description": "[``botocore``] Update fms client to latest version", + "type": "api-change" + }, + { + "category": "``ssm``", + "description": "[``botocore``] Update ssm client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/.changes/1.9.84.json new/boto3-1.9.84/.changes/1.9.84.json --- old/boto3-1.9.74/.changes/1.9.84.json 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/.changes/1.9.84.json 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,17 @@ +[ + { + "category": "``worklink``", + "description": "[``botocore``] Update worklink client to latest version", + "type": "api-change" + }, + { + "category": "``apigatewaymanagementapi``", + "description": "[``botocore``] Update apigatewaymanagementapi client to latest version", + "type": "api-change" + }, + { + "category": "``acm-pca``", + "description": "[``botocore``] Update acm-pca client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/CHANGELOG.rst new/boto3-1.9.84/CHANGELOG.rst --- old/boto3-1.9.74/CHANGELOG.rst 2019-01-04 23:57:55.000000000 +0100 +++ new/boto3-1.9.84/CHANGELOG.rst 2019-01-24 00:03:25.000000000 +0100 @@ -2,6 +2,84 @@ CHANGELOG ========= +1.9.84 +====== + +* api-change:``worklink``: [``botocore``] Update worklink client to latest version +* api-change:``apigatewaymanagementapi``: [``botocore``] Update apigatewaymanagementapi client to latest version +* api-change:``acm-pca``: [``botocore``] Update acm-pca client to latest version + + +1.9.83 +====== + +* api-change:``appstream``: [``botocore``] Update appstream client to latest version +* api-change:``discovery``: [``botocore``] Update discovery client to latest version +* api-change:``dms``: [``botocore``] Update dms client to latest version +* api-change:``fms``: [``botocore``] Update fms client to latest version +* api-change:``ssm``: [``botocore``] Update ssm client to latest version + + +1.9.82 +====== + +* api-change:``glue``: [``botocore``] Update glue client to latest version +* api-change:``ec2``: [``botocore``] Update ec2 client to latest version + + +1.9.81 +====== + +* api-change:``lightsail``: [``botocore``] Update lightsail client to latest version +* api-change:``lambda``: [``botocore``] Update lambda client to latest version +* api-change:``pinpoint``: [``botocore``] Update pinpoint client to latest version +* api-change:``rekognition``: [``botocore``] Update rekognition client to latest version + + +1.9.80 +====== + +* api-change:``dynamodb``: [``botocore``] Update dynamodb client to latest version +* api-change:``ce``: [``botocore``] Update ce client to latest version +* api-change:``backup``: [``botocore``] Update backup client to latest version + + +1.9.79 +====== + +* api-change:``storagegateway``: [``botocore``] Update storagegateway client to latest version +* api-change:``mediaconvert``: [``botocore``] Update mediaconvert client to latest version + + +1.9.78 +====== + +* api-change:``rds-data``: [``botocore``] Update rds-data client to latest version +* api-change:``emr``: [``botocore``] Update emr client to latest version + + +1.9.77 +====== + +* api-change:``iot``: [``botocore``] Update iot client to latest version +* api-change:``ec2``: [``botocore``] Update ec2 client to latest version +* api-change:``codedeploy``: [``botocore``] Update codedeploy client to latest version +* api-change:``sagemaker``: [``botocore``] Update sagemaker client to latest version + + +1.9.76 +====== + +* api-change:``docdb``: [``botocore``] Update docdb client to latest version +* api-change:``redshift``: [``botocore``] Update redshift client to latest version + + +1.9.75 +====== + +* api-change:``appmesh``: [``botocore``] Update appmesh client to latest version + + 1.9.74 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/boto3/__init__.py new/boto3-1.9.84/boto3/__init__.py --- old/boto3-1.9.74/boto3/__init__.py 2019-01-04 23:57:55.000000000 +0100 +++ new/boto3-1.9.84/boto3/__init__.py 2019-01-24 00:03:25.000000000 +0100 @@ -17,7 +17,7 @@ __author__ = 'Amazon Web Services' -__version__ = '1.9.74' +__version__ = '1.9.84' # The default Boto3 session; autoloaded when needed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/docs/source/guide/index.rst new/boto3-1.9.84/docs/source/guide/index.rst --- old/boto3-1.9.74/docs/source/guide/index.rst 2019-01-04 23:57:55.000000000 +0100 +++ new/boto3-1.9.84/docs/source/guide/index.rst 2019-01-24 00:03:25.000000000 +0100 @@ -36,3 +36,4 @@ dynamodb s3 secrets-manager + sdk-metrics diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/docs/source/guide/sdk-metrics.rst new/boto3-1.9.84/docs/source/guide/sdk-metrics.rst --- old/boto3-1.9.74/docs/source/guide/sdk-metrics.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/boto3-1.9.84/docs/source/guide/sdk-metrics.rst 2019-01-24 00:03:25.000000000 +0100 @@ -0,0 +1,271 @@ +.. _guide_sdk-metrics: + +SDK Metrics +=========== + +AWS SDK Metrics for Enterprise Support (SDK Metrics) enables Enterprise customers to collect metrics from AWS SDKs on their hosts and clients shared with +AWS Enterprise Support. SDK Metrics provides information that helps speed up detection and diagnosis of issues occurring in connections +to AWS services for AWS Enterprise Support customers. + +As telemetry is collected on each host, it is relayed via UDP to 127.0.0.1 (aka localhost), where the CloudWatch agent aggregates the data and sends it +to the SDK Metrics service. Therefore, to receive metrics, you must add the CloudWatch agent to your instance. + +The following steps to set up SDK Metrics pertain to an Amazon EC2 instance running Amazon Linux for a client application that is using the AWS SDK for Python. +SDK Metrics is also available for your production environments if you enable it while configuring the AWS SDK for Python. + +To utilize SDK Metrics, run the latest version of the CloudWatch agent. Learn how to +`Configure the CloudWatch Agent for SDK Metrics <https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-A…>`__ in the Amazon CloudWatch User Guide. + +To set up SDK Metrics with the AWS SDK for Python, follow these instructions: + +#. Create an application with an AWS SDK for Python client to use an AWS service. +#. Host your project on an Amazon EC2 instance or in your local environment. +#. Install and use the latest version of Boto3 (AWS SDK for Python). +#. Install and configure a CloudWatch agent on an EC2 instance or in your local environment as described in the `Amazon CloudWatch User Guide <https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-A…>`__ . +#. Authorize SDK Metrics to collect and send metrics as described in the `Amazon CloudWatch User Guide <https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-A…>`__ .. +#. :ref:`csm-enable-agent`. + + +For more information, see the following: + +* :ref:`csm-update-agent` +* :ref:`csm-disable-agent` + + +.. _csm-enable-agent: + +Enable SDK Metrics +------------------ + +By default, SDK Metrics is turned off, and the port is set to 31000. The following are the default parameters. + +Enabling SDK Metrics is independent of configuring your credentials to use an AWS service. + +You can enable SDK Metrics by setting environment variables or by using the AWS Shared config file. + +Option 1: Set Environment Variables +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If :code:`AWS_CSM_ENABLED` is not set, the SDK checks the :code:`AWS_DEFAULT_PROFILE` profile to determine if SDK Metrics is enabled. By default this is set to ``false``. + +To turn on SDK Metrics, add the following to your environmental variables. + +.. code-block:: shell + + export AWS_CSM_ENABLED=true + +:ref:`Other configuration settings<csm-update-agent>` are available. + +Note: Enabling SDK Metrics does not configure your credentials to use an AWS service. + + +Option 2: AWS Shared Config File +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If no CSM configuration is found in the environment variables, the SDK looks for your default AWS profile field. If :code:`AWS_DEFAULT_PROFILE` is set to something other than default, update that profile. To enable SDK Metrics, add :code:`csm_enabled` to the shared config file located at :file:`~/.aws/config`. + +.. code-block:: ini + + [default] + csm_enabled = true + + [profile aws_csm] + csm_enabled = true + +:ref:`Other configuration settings<csm-update-agent>` are available. + +Note: Enabling SDK Metrics is independent from configuring your credentials to use an AWS service. You can use a different profile to authenticate. + +.. _csm-update-agent: + +Update a CloudWatch Agent +------------------------- + +To make changes to the port, you need to set the values and then restart any AWS jobs that are currently active. + +Option 1: Set Environment Variables +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Most services use the default port. But if your service requires a unique port ID, add ``AWS_CSM_PORT=[port_number]``, to the host's environment variables. + +.. code-block:: shell + + export AWS_CSM_ENABLED=true + export AWS_CSM_PORT=1234 + + +Option 2: AWS Shared Config File +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Most services use the default port. But if your service requires a +unique port ID, add ``csm_port = [port_number]`` to ``~/.aws/config``. + +.. code-block:: ini + + [default] + csm_enabled = false + csm_port = 1234 + + [profile aws_csm] + csm_enabled = false + csm_port = 1234 + +Restart SDK Metrics +~~~~~~~~~~~~~~~~~~~ + +To restart a job, run the following commands. + +.. code-block:: shell + + amazon-cloudwatch-agent-ctl –a stop; + amazon-cloudwatch-agent-ctl –a start; + + +.. _csm-disable-agent: + +Disable SDK Metrics +-------------------- + +To turn off SDK Metrics, remove ``csm_enabled`` from your environment variables, or in your AWS Shared config file located at :file:`~/.aws/config`. +Then restart your CloudWatch agent so that the changes can take effect. + +**Environment Variables** + +Remove ``AWS_CSM_ENABLED`` from your environment variables or set it to false. + +.. code-block:: shell + + unset AWS_CSM_ENABLED + + +**AWS Shared Config File** + +Remove ``csm_enabled`` from the profiles in your AWS Shared config file located at :file:`~/.aws/config`. + +.. note:: Environment variables override the AWS Shared config file. If SDK Metrics is enabled in the environment variables, the SDK Metrics remain enabled. + +To explicitly opt-out of SDK Metrics set ``csm_enabled`` to false. + +.. code-block:: ini + + [default] + csm_enabled = false + + [profile aws_csm] + csm_enabled = false + +To disable SDK Metrics, use the following command to stop CloudWatch agent. + +.. code-block:: shell + + sudo amazon-cloudwatch-agent-ctl -a stop && + echo "Done" + +If you are using other CloudWatch features, restart CloudWatch Agent with the following command. + +.. code-block:: shell + + amazon-cloudwatch-agent-ctl –a start; + + +Restart SDK Metrics +~~~~~~~~~~~~~~~~~~~ + +To restart a SDK Metrics job, run the following commands. + +.. code-block:: shell + + amazon-cloudwatch-agent-ctl –a stop; + amazon-cloudwatch-agent-ctl –a start; + +Definitions for SDK Metrics +--------------------------- + +You can use the following descriptions of SDK Metrics to interpret your results. In general, these metrics are available for review +with your Technical Account Manager during regular business reviews. AWS Support resources and your Technical Account Manager +should have access to SDK Metrics data to help you resolve cases, but if you discover data that is confusing or unexpected, but +doesn’t seem to be negatively impacting your applications’ performance, it is best to review that data during scheduled +business reviews. + +.. list-table:: + :widths: 1 2 + :header-rows: 1 + + * - Metric: + - CallCount + + * - Definition + - Total number of successful or failed API calls from your code to AWS services + + * - How to use it + - Use it as a baseline to correlate with other metrics like errors or throttling. + + +.. list-table:: + :widths: 1 2 + :header-rows: 1 + + * - Metric: + - ClientErrorCount + + * - Definition + - Number of API calls that fail with client errors (4xx HTTP response codes). *Examples: Throttling, Access denied, S3 bucket does not exist, and Invalid parameter value.* + + * - How to use it + - Except in certain cases related to throttling (ex. when throttling occurs due to a limit that needs to be increased) this metric can indicate something in your application that needs to be fixed. + + +.. list-table:: + :widths: 1 2 + :header-rows: 1 + + * - Metric: + - ConnectionErrorCount + + * - Definition + - Number of API calls that fail because of errors connecting to the service. These can be caused by network issues between the customer application and AWS services including load balancers, DNS failures, transit providers. In some cases, AWS issues may result in this error. + + * - How to use it + - Use this metric to determine whether issues are specific to your application or are caused by your infrastructure and/or network. High ConnectionErrorCount could also indicate short timeout values for API calls. + + +.. list-table:: + :widths: 1 2 + :header-rows: 1 + + * - Metric: + - ThrottleCount + + * - Definition + - Number of API calls that fail due to throttling by AWS services. + + * - How to use it + - Use this metric to assess if your application has reached throttle limits, as well as to determine the cause of retries and application latency. Consider distributing calls over a window instead of batching your calls. + + +.. list-table:: + :widths: 1 2 + :header-rows: 1 + + * - Metric: + - ServerErrorCount + + * - Definition + - Number of API calls that fail due to server errors (5xx HTTP response codes) from AWS Services. These are typically caused by AWS services. + + * - How to use it + - Determine cause of SDK retries or latency. This metric will not always indicate that AWS services are at fault, as some AWS teams classify latency as an HTTP 503 response. + +.. list-table:: + :widths: 1 2 + :header-rows: 1 + + * - Metric: + - EndToEndLatency + + * - Definition + - Total time for your application to make a call using the AWS SDK, inclusive of retries. In other words, regardless of whether it is successful after several attempts, or as soon as a call fails due to an unretriable error. + + * - How to use it + - Determine how AWS API calls contribute to your application’s overall latency. Higher than expected latency may be caused by issues with network, firewall, or other configuration settings, or by latency that occurs as a result of SDK retries. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/setup.cfg new/boto3-1.9.84/setup.cfg --- old/boto3-1.9.74/setup.cfg 2019-01-04 23:57:55.000000000 +0100 +++ new/boto3-1.9.84/setup.cfg 2019-01-24 00:03:25.000000000 +0100 @@ -3,6 +3,6 @@ [metadata] requires-dist = - botocore>=1.12.74,<1.13.0 + botocore>=1.12.84,<1.13.0 jmespath>=0.7.1,<1.0.0 s3transfer>=0.1.10,<0.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/boto3-1.9.74/setup.py new/boto3-1.9.84/setup.py --- old/boto3-1.9.74/setup.py 2019-01-04 23:57:55.000000000 +0100 +++ new/boto3-1.9.84/setup.py 2019-01-24 00:03:25.000000000 +0100 @@ -14,7 +14,7 @@ requires = [ - 'botocore>=1.12.74,<1.13.0', + 'botocore>=1.12.84,<1.13.0', 'jmespath>=0.7.1,<1.0.0', 's3transfer>=0.1.10,<0.2.0' ]

1 0