openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2020
- 1 participants
- 4649 discussions
Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2020-02-29 21:23:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Sat Feb 29 21:23:30 2020 rev:379 rq:779939 version:1.20.7+0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2020-01-23 16:11:01.555639818 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new.26092/xorg-x11-server.changes 2020-02-29 21:23:37.106410103 +0100
@@ -1,0 +2,5 @@
+Thu Feb 27 14:09:12 UTC 2020 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- specfile: reenabled XFree86-VidModeExtension (boo#1164020)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.sGL1hd/_old 2020-02-29 21:23:38.522412906 +0100
+++ /var/tmp/diff_new_pack.sGL1hd/_new 2020-02-29 21:23:38.526412913 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-server
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -121,6 +121,7 @@
BuildRequires: pkgconfig(xextproto) >= 7.1.99
BuildRequires: pkgconfig(xf86dgaproto)
BuildRequires: pkgconfig(xf86driproto)
+BuildRequires: pkgconfig(xf86vidmodeproto)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xfont2)
BuildRequires: pkgconfig(xi) >= 1.2.99.1
@@ -409,6 +410,7 @@
export PCI_TXT_IDS_DIR=%{pci_ids_dir}
%endif
%configure CFLAGS="%{optflags} -fno-strict-aliasing" \
+ --enable-xf86vidmode \
--sysconfdir=/etc \
--enable-xdmcp \
--enable-xdm-auth-1 \
1
0
Hello community,
here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-02-29 21:23:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old)
and /work/SRC/openSUSE:Factory/.postgresql12.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "postgresql12"
Sat Feb 29 21:23:28 2020 rev:4 rq:779839 version:12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-02-19 12:40:20.927602481 +0100
+++ /work/SRC/openSUSE:Factory/.postgresql12.new.26092/postgresql12.changes 2020-02-29 21:23:33.862403684 +0100
@@ -1,0 +2,5 @@
+Thu Feb 27 08:58:37 UTC 2020 - Reinhard Max <max(a)suse.com>
+
+- Fix a few mistakes in the spec file.
+
+-------------------------------------------------------------------
Old:
----
series
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ postgresql12.spec ++++++
--- /var/tmp/diff_new_pack.qBLBNS/_old 2020-02-29 21:23:34.858405654 +0100
+++ /var/tmp/diff_new_pack.qBLBNS/_new 2020-02-29 21:23:34.870405678 +0100
@@ -123,7 +123,6 @@
Source2: baselibs.conf
Source3: postgresql-README.SUSE
Source17: postgresql-rpmlintrc
-Source18: series
Patch1: postgresql-conf.patch
Patch2: postgresql-regress.patch
# PL/Perl needs to be linked with rpath (bsc#578053)
@@ -229,7 +228,9 @@
PreReq: postgresql = %version
Requires: glibc-locale
Requires: timezone
+%if %{with llvm}
Recommends: %{name}-llvmjit
+%endif
Provides: postgresql-server-implementation = %version-%release
Requires: %libpq >= %version
Requires(pre): postgresql-server-noarch >= %pgmajor
@@ -320,6 +321,7 @@
Group: Productivity/Databases/Tools
Provides: postgresql-docs-implementation = %version-%release
Requires: postgresql-docs-noarch >= %pgmajor
+BuildArch: noarch
%description docs
PostgreSQL is an advanced object-relational database management system
1
0
Hello community,
here is the log from the commit of package noto-coloremoji-fonts for openSUSE:Factory checked in at 2020-02-29 21:23:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/noto-coloremoji-fonts (Old)
and /work/SRC/openSUSE:Factory/.noto-coloremoji-fonts.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "noto-coloremoji-fonts"
Sat Feb 29 21:23:25 2020 rev:2 rq:779832 version:20191119
Changes:
--------
--- /work/SRC/openSUSE:Factory/noto-coloremoji-fonts/noto-coloremoji-fonts.changes 2019-06-12 13:14:25.240809035 +0200
+++ /work/SRC/openSUSE:Factory/.noto-coloremoji-fonts.new.26092/noto-coloremoji-fonts.changes 2020-02-29 21:23:30.762397548 +0100
@@ -1,0 +2,18 @@
+Wed Feb 26 17:08:35 UTC 2020 - Antonio Larrosa <alarrosa(a)suse.com>
+
+- Update to Version 20191119 Unicode 12
+ * Updated font file and artwork to Unicode 12
+ * Added flags for:
+ + BL: Saint Barthélemy
+ + BQ: Caribbean Netherlands
+ + MQ: Martinique
+ + RE: Réunion
+ + TF: French Southern Territories
+ * Changed flags for:
+ + XK: Kosovo
+ + FR: France
+ + NL: Netherlands
+ * This release also fixes the people holding hands emoji to work for
+ any combination of skin tone modifiers.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ noto-coloremoji-fonts.spec ++++++
--- /var/tmp/diff_new_pack.9v0Mi4/_old 2020-02-29 21:23:32.370400731 +0100
+++ /var/tmp/diff_new_pack.9v0Mi4/_new 2020-02-29 21:23:32.370400731 +0100
@@ -1,7 +1,7 @@
#
-# spec file for noto-coloremoji-fonts
+# spec file for package noto-coloremoji-fonts
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,14 +17,14 @@
Name: noto-coloremoji-fonts
-Version: 20180810
+Version: 20191119
Release: 0
Summary: Noto Color Emoji font
License: OFL-1.1
Group: System/X11/Fonts
URL: https://github.com/googlefonts/noto-emoji
-Source0: https://github.com/googlefonts/noto-emoji/raw/v2018-08-10-unicode11/fonts/L…
-Source1: https://github.com/googlefonts/noto-emoji/raw/v2018-08-10-unicode11/fonts/N…
+Source0: https://github.com/googlefonts/noto-emoji/raw/v2019-11-19-unicode12/fonts/L…
+Source1: https://github.com/googlefonts/noto-emoji/raw/v2019-11-19-unicode12/fonts/N…
BuildRequires: fontpackages-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
++++++ NotoColorEmoji.ttf ++++++
Binary files /var/tmp/diff_new_pack.9v0Mi4/_old and /var/tmp/diff_new_pack.9v0Mi4/_new differ
1
0
Hello community,
here is the log from the commit of package bcunit for openSUSE:Factory checked in at 2020-02-29 21:23:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bcunit (Old)
and /work/SRC/openSUSE:Factory/.bcunit.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bcunit"
Sat Feb 29 21:23:24 2020 rev:5 rq:779820 version:3.0.2+git.20191119
Changes:
--------
--- /work/SRC/openSUSE:Factory/bcunit/bcunit.changes 2019-11-07 23:13:20.812325816 +0100
+++ /work/SRC/openSUSE:Factory/.bcunit.new.26092/bcunit.changes 2020-02-29 21:23:28.906393875 +0100
@@ -1,0 +2,18 @@
+Thu Feb 27 08:23:15 UTC 2020 - Paolo Stivanin <info(a)paolostivanin.com>
+
+- use correct archive extensione (xz instead of gz)
+
+-------------------------------------------------------------------
+Thu Feb 27 07:55:27 UTC 2020 - Martin Pluskal <mpluskal(a)suse.com>
+
+- Small packaging cleanups
+
+-------------------------------------------------------------------
+Wed Feb 26 14:01:52 UTC 2020 - Paolo Stivanin <info(a)paolostivanin.com>
+
+- Update to latest master. This is needed for us in order to be able to
+ update bctoolbox, ortp and bzrtp to the latest version
+
+- Update bcunit-sover.patch accordingly
+
+-------------------------------------------------------------------
Old:
----
bcunit-3.0.2.tar.gz
New:
----
_service
_servicedata
bcunit-3.0.2+git.20191119.obscpio
bcunit.obsinfo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bcunit.spec ++++++
--- /var/tmp/diff_new_pack.Vywa1S/_old 2020-02-29 21:23:30.130396298 +0100
+++ /var/tmp/diff_new_pack.Vywa1S/_new 2020-02-29 21:23:30.130396298 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bcunit
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,12 @@
%define soname libbcunit
%define sover 1
Name: bcunit
-Version: 3.0.2
+Version: 3.0.2+git.20191119
Release: 0
Summary: Provide C programmers basic testing functionality
License: LGPL-2.0-or-later
-Url: https://linphone.org/
-Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz
+URL: https://linphone.org/
+Source: %{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE bcunit-link-ncurses.patch jengelh(a)medozas.de
Patch0: bcunit-link-ncurses.patch
@@ -33,6 +33,7 @@
# PATCH-FIX-OPENSUSE bcunit-sover.patch sor.alexei(a)meowr.ru -- Correctly set the sover.
Patch2: bcunit-sover.patch
BuildRequires: cmake
+BuildRequires: git-core >= 1.7.10
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
@@ -69,45 +70,35 @@
This package installs the BCUnit shared library.
%prep
-%setup -q -n BCunit-%{version}-Source
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1
%build
%cmake \
-DENABLE_STATIC=OFF \
- -DENABLE_AUTOMATED=ON \
- -DENABLE_BASIC=ON \
- -DENABLE_CONSOLE=ON \
- -DENABLE_CURSES=ON \
- -DENABLE_EXAMPLES=ON
-make %{?_smp_mflags} V=1
+ -DENABLE_DOC=ON
+%cmake_build
%install
%cmake_install
-# Architecture dependent files.
mkdir -p %{buildroot}%{_libdir}/BCUnit/
-mv %{buildroot}%{_datadir}/BCUnit/Examples/ \
- %{buildroot}%{_libdir}/BCUnit/
%post -n %{soname}%{sover} -p /sbin/ldconfig
-
%postun -n %{soname}%{sover} -p /sbin/ldconfig
%files -n %{soname}%{sover}
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README.md TODO
+%license COPYING
%{_libdir}/%{soname}.so.%{sover}*
%files doc
-%defattr(-,root,root)
%dir %{_datadir}/BCUnit/
-%{_datadir}/BCUnit/*
+%dir %{_datadir}/doc/BCUnit/
+%doc %{_datadir}/doc/BCUnit/*
+%doc %{_datadir}/BCUnit/*
+%{_mandir}/man3/BCUnit.3%{?ext_man}
%files devel
-%defattr(-,root,root)
%{_includedir}/BCUnit/
%dir %{_datadir}/BCunit/
%{_libdir}/BCUnit/
++++++ _service ++++++
<services>
<service mode="disabled" name="obs_scm">
<param name="url">git://github.com/BelledonneCommunications/bcunit</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">bcunit</param>
<param name="versionformat">3.0.2+git.%cd</param>
</service>
<service mode="disabled" name="set_version"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/BelledonneCommunications/bcunit</param>
<param name="changesrevision">3c720fbf67dd3c02b0c7011ed4036982b2c93532</param></service></servicedata>
++++++ bcunit-link-ncurses.patch ++++++
--- /var/tmp/diff_new_pack.Vywa1S/_old 2020-02-29 21:23:30.258396551 +0100
+++ /var/tmp/diff_new_pack.Vywa1S/_new 2020-02-29 21:23:30.278396590 +0100
@@ -46,3 +46,4 @@
FRAMEWORK_OBJECT_FILES_SHARED = $(FRAMEWORK_OBJECTS_SHARED)
FRAMEWORK_COMPILE_DIRS = Framework
+
++++++ bcunit-sover.patch ++++++
--- /var/tmp/diff_new_pack.Vywa1S/_old 2020-02-29 21:23:30.410396852 +0100
+++ /var/tmp/diff_new_pack.Vywa1S/_new 2020-02-29 21:23:30.430396891 +0100
@@ -1,10 +1,10 @@
---- a/BCUnit/Sources/CMakeLists.txt
-+++ b/BCUnit/Sources/CMakeLists.txt
-@@ -169,6 +169,7 @@ if(ENABLE_STATIC)
+--- a/BCUnit/Sources/CMakeLists.txt 2020-02-26 14:08:13.803879423 +0100
++++ b/BCUnit/Sources/CMakeLists.txt 2020-02-26 14:08:36.648004434 +0100
+@@ -176,6 +176,7 @@
endif()
if(ENABLE_SHARED)
add_library(bcunit SHARED ${SOURCE_FILES})
-+ set_target_properties(bcunit PROPERTIES SOVERSION 1)
++ set_target_properties(bcunit PROPERTIES SOVERSION 1)
set_target_properties(bcunit PROPERTIES VERSION 1.0.1)
- if(CURSES_LIBRARIES)
- target_link_libraries(bcunit ${CURSES_LIBRARIES})
+ target_include_directories(bcunit PUBLIC
+ $<INSTALL_INTERFACE:include>
++++++ bcunit.obsinfo ++++++
name: bcunit
version: 3.0.2+git.20191119
mtime: 1574161406
commit: 3c720fbf67dd3c02b0c7011ed4036982b2c93532
1
0
Hello community,
here is the log from the commit of package libcaca for openSUSE:Factory checked in at 2020-02-29 21:23:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcaca (Old)
and /work/SRC/openSUSE:Factory/.libcaca.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcaca"
Sat Feb 29 21:23:23 2020 rev:43 rq:779814 version:0.99.beta19.git20171003
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcaca/libcaca.changes 2019-08-07 13:56:34.016856065 +0200
+++ /work/SRC/openSUSE:Factory/.libcaca.new.26092/libcaca.changes 2020-02-29 21:23:27.930391944 +0100
@@ -1,0 +2,6 @@
+Wed Feb 26 16:47:50 UTC 2020 - Илья Индиго <ilya(a)ilya.pp.ua>
+
+- Refresh spec-file via spec-cleaner.
+- Add Requires:toilet for caca-utils, because need for cacaclock.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcaca.spec ++++++
--- /var/tmp/diff_new_pack.PlLlEz/_old 2020-02-29 21:23:28.618393305 +0100
+++ /var/tmp/diff_new_pack.PlLlEz/_new 2020-02-29 21:23:28.622393314 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libcaca
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,13 @@
#
%define _rev da28e9684ef445ac8d42745644336b8a75c01855
-
Name: libcaca
Version: 0.99.beta19.git20171003
Release: 0
Summary: Library for Colour ASCII Art, text mode graphics
License: WTFPL
Group: Development/Languages/C and C++
-Url: http://caca.zoy.org/
+URL: http://caca.zoy.org
Source0: https://github.com/cacalabs/%{name}/archive/%{_rev}.tar.gz#/%{name}-%{versi…
Source1: baselibs.conf
Patch1: libcaca-0.99-texbuild.patch
@@ -114,6 +113,7 @@
Summary: Colour ASCII Art Text mode graphics utilities based on libcaca
Group: Amusements/Toys/Graphics
Requires: imlib2-loaders
+Requires: toilet
%description -n caca-utils
This package contains utilities and demonstration programs for libcaca,
@@ -167,7 +167,7 @@
--enable-plugins \
--enable-java=no \
--enable-python
-make %{?_smp_mflags} V=1
+%make_build
%install
%make_install
@@ -195,7 +195,7 @@
%{_bindir}/caca-config
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
-%{_mandir}/man1/caca-config.1*
+%{_mandir}/man1/caca-config.1%{?ext_man}
%{_mandir}/man3/*
%files ruby
@@ -221,11 +221,11 @@
%{_bindir}/cacaserver
%{_bindir}/img2txt
%{_datadir}/libcaca
-%{_mandir}/man1/cacademo.1*
-%{_mandir}/man1/cacafire.1*
-%{_mandir}/man1/cacaview.1*
-%{_mandir}/man1/cacaplay.1*
-%{_mandir}/man1/cacaserver.1*
-%{_mandir}/man1/img2txt.1*
+%{_mandir}/man1/cacademo.1%{?ext_man}
+%{_mandir}/man1/cacafire.1%{?ext_man}
+%{_mandir}/man1/cacaview.1%{?ext_man}
+%{_mandir}/man1/cacaplay.1%{?ext_man}
+%{_mandir}/man1/cacaserver.1%{?ext_man}
+%{_mandir}/man1/img2txt.1%{?ext_man}
%changelog
1
0
Hello community,
here is the log from the commit of package python-h2 for openSUSE:Factory checked in at 2020-02-29 21:23:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-h2 (Old)
and /work/SRC/openSUSE:Factory/.python-h2.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-h2"
Sat Feb 29 21:23:21 2020 rev:9 rq:779741 version:3.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-h2/python-h2.changes 2019-12-07 15:23:08.967730795 +0100
+++ /work/SRC/openSUSE:Factory/.python-h2.new.26092/python-h2.changes 2020-02-29 21:23:26.910389926 +0100
@@ -1,0 +2,9 @@
+Thu Feb 27 05:43:42 UTC 2020 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Update to 3.2.0:
+ * Receiving DATA frames on closed (or reset) streams now properly emit a
+ WINDOW_UPDATE to keep the connection flow window topped up.
+ * h2.config.logger now uses a trace(...) function, in addition to
+ debug(...).
+
+-------------------------------------------------------------------
Old:
----
h2-3.1.1.tar.gz
New:
----
h2-3.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-h2.spec ++++++
--- /var/tmp/diff_new_pack.pO2q8T/_old 2020-02-29 21:23:27.594391279 +0100
+++ /var/tmp/diff_new_pack.pO2q8T/_new 2020-02-29 21:23:27.598391287 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-h2
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-h2
-Version: 3.1.1
+Version: 3.2.0
Release: 0
Summary: HTTP/2 State-Machine based protocol implementation
License: MIT
++++++ h2-3.1.1.tar.gz -> h2-3.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/HISTORY.rst new/h2-3.2.0/HISTORY.rst
--- old/h2-3.1.1/HISTORY.rst 2019-08-02 15:10:28.000000000 +0200
+++ new/h2-3.2.0/HISTORY.rst 2020-02-08 17:39:21.000000000 +0100
@@ -1,6 +1,23 @@
Release History
===============
+3.2.0 (2020-02-08)
+------------------
+
+Bugfixes
+~~~~~~~~
+
+- Receiving DATA frames on closed (or reset) streams now properly emit a
+ WINDOW_UPDATE to keep the connection flow window topped up.
+
+API Changes (Backward-Incompatible)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``h2.config.logger`` now uses a `trace(...)` function, in addition
+ to `debug(...)`. If you defined a custom logger object, you need to handle
+ these new function calls.
+
+
3.1.1 (2019-08-02)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/PKG-INFO new/h2-3.2.0/PKG-INFO
--- old/h2-3.1.1/PKG-INFO 2019-08-02 15:10:46.000000000 +0200
+++ new/h2-3.2.0/PKG-INFO 2020-02-08 17:43:25.000000000 +0100
@@ -1,11 +1,13 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: h2
-Version: 3.1.1
+Version: 3.2.0
Summary: HTTP/2 State-Machine based protocol implementation
-Home-page: http://hyper.rtfd.org
+Home-page: https://github.com/python-hyper/hyper-h2
Author: Cory Benfield
Author-email: cory(a)lukasa.co.uk
License: MIT License
+Project-URL: Documentation, https://python-hyper.org/projects/h2
+Project-URL: Source, https://github.com/python-hyper/hyper-h2
Description: ===============================
hyper-h2: HTTP/2 Protocol Stack
===============================
@@ -76,6 +78,23 @@
Release History
===============
+ 3.2.0 (2020-02-08)
+ ------------------
+
+ Bugfixes
+ ~~~~~~~~
+
+ - Receiving DATA frames on closed (or reset) streams now properly emit a
+ WINDOW_UPDATE to keep the connection flow window topped up.
+
+ API Changes (Backward-Incompatible)
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - ``h2.config.logger`` now uses a `trace(...)` function, in addition
+ to `debug(...)`. If you defined a custom logger object, you need to handle
+ these new function calls.
+
+
3.1.1 (2019-08-02)
------------------
@@ -825,9 +844,10 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/docs/source/conf.py new/h2-3.2.0/docs/source/conf.py
--- old/h2-3.1.1/docs/source/conf.py 2019-08-02 15:10:28.000000000 +0200
+++ new/h2-3.2.0/docs/source/conf.py 2020-02-08 17:39:21.000000000 +0100
@@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
-version = '3.1.1'
+version = '3.2.0'
# The full version, including alpha/beta/rc tags.
-release = '3.1.1'
+release = '3.2.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/examples/fragments/client_https_setup_fragment.py new/h2-3.2.0/examples/fragments/client_https_setup_fragment.py
--- old/h2-3.1.1/examples/fragments/client_https_setup_fragment.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/examples/fragments/client_https_setup_fragment.py 2020-01-19 12:50:23.000000000 +0100
@@ -48,7 +48,7 @@
# RFC 7540 Section 9.2.2: "deployments of HTTP/2 that use TLS 1.2 MUST
# support TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256". In practice, the
- # blacklist defined in this section allows only the AES GCM and ChaCha20
+ # blocklist defined in this section allows only the AES GCM and ChaCha20
# cipher suites with ephemeral key negotiation.
ctx.set_ciphers("ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/examples/fragments/server_https_setup_fragment.py new/h2-3.2.0/examples/fragments/server_https_setup_fragment.py
--- old/h2-3.1.1/examples/fragments/server_https_setup_fragment.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/examples/fragments/server_https_setup_fragment.py 2020-01-19 12:50:23.000000000 +0100
@@ -51,7 +51,7 @@
# RFC 7540 Section 9.2.2: "deployments of HTTP/2 that use TLS 1.2 MUST
# support TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256". In practice, the
- # blacklist defined in this section allows only the AES GCM and ChaCha20
+ # blocklist defined in this section allows only the AES GCM and ChaCha20
# cipher suites with ephemeral key negotiation.
ctx.set_ciphers("ECDHE+AESGCM:ECDHE+CHACHA20:DHE+AESGCM:DHE+CHACHA20")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/h2/__init__.py new/h2-3.2.0/h2/__init__.py
--- old/h2-3.1.1/h2/__init__.py 2019-08-02 15:10:28.000000000 +0200
+++ new/h2-3.2.0/h2/__init__.py 2020-02-08 17:39:21.000000000 +0100
@@ -5,4 +5,4 @@
A HTTP/2 implementation.
"""
-__version__ = '3.1.1'
+__version__ = '3.2.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/h2/config.py new/h2-3.2.0/h2/config.py
--- old/h2-3.1.1/h2/config.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/h2/config.py 2020-02-08 12:23:54.000000000 +0100
@@ -29,7 +29,7 @@
"""
An Logger object that does not actual logging, hence a DummyLogger.
- For the class the log operation is merely a no-op. The intent is to avoid
+ For the class the log operation is merely a no-op. The intent is to avoid
conditionals being sprinkled throughout the hyper-h2 code for calls to
logging functions when no logger is passed into the corresponding object.
"""
@@ -40,6 +40,12 @@
"""
No-op logging. Only level needed for now.
"""
+ pass
+
+ def trace(self, *vargs, **kwargs):
+ """
+ No-op logging. Only level needed for now.
+ """
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/h2/connection.py new/h2-3.2.0/h2/connection.py
--- old/h2-3.1.1/h2/connection.py 2019-08-02 15:10:17.000000000 +0200
+++ new/h2-3.2.0/h2/connection.py 2020-02-08 12:23:54.000000000 +0100
@@ -1450,7 +1450,7 @@
:returns: A list of events that the remote peer triggered by sending
this data.
"""
- self.config.logger.debug(
+ self.config.logger.trace(
"Process received data on connection. Received data: %r", data
)
@@ -1634,6 +1634,35 @@
return frames, events + stream_events
+ def _handle_data_on_closed_stream(self, events, exc, frame):
+ # This stream is already closed - and yet we received a DATA frame.
+ # The received DATA frame counts towards the connection flow window.
+ # We need to manually to acknowledge the DATA frame to update the flow
+ # window of the connection. Otherwise the whole connection stalls due
+ # the inbound flow window being 0.
+ frames = []
+ conn_manager = self._inbound_flow_control_window_manager
+ conn_increment = conn_manager.process_bytes(
+ frame.flow_controlled_length
+ )
+ if conn_increment:
+ f = WindowUpdateFrame(0)
+ f.window_increment = conn_increment
+ frames.append(f)
+ self.config.logger.debug(
+ "Received DATA frame on closed stream %d - "
+ "auto-emitted a WINDOW_UPDATE by %d",
+ frame.stream_id, conn_increment
+ )
+ f = RstStreamFrame(exc.stream_id)
+ f.error_code = exc.error_code
+ frames.append(f)
+ self.config.logger.debug(
+ "Stream %d already CLOSED or cleaned up - "
+ "auto-emitted a RST_FRAME" % frame.stream_id
+ )
+ return frames, events + exc._events
+
def _receive_data_frame(self, frame):
"""
Receive a data frame on the connection.
@@ -1646,12 +1675,19 @@
self._inbound_flow_control_window_manager.window_consumed(
flow_controlled_length
)
- stream = self._get_stream_by_id(frame.stream_id)
- frames, stream_events = stream.receive_data(
- frame.data,
- 'END_STREAM' in frame.flags,
- flow_controlled_length
- )
+
+ try:
+ stream = self._get_stream_by_id(frame.stream_id)
+ frames, stream_events = stream.receive_data(
+ frame.data,
+ 'END_STREAM' in frame.flags,
+ flow_controlled_length
+ )
+ except StreamClosedError as e:
+ # This stream is either marked as CLOSED or already gone from our
+ # internal state.
+ return self._handle_data_on_closed_stream(events, e, frame)
+
return frames, events + stream_events
def _receive_settings_frame(self, frame):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/h2.egg-info/PKG-INFO new/h2-3.2.0/h2.egg-info/PKG-INFO
--- old/h2-3.1.1/h2.egg-info/PKG-INFO 2019-08-02 15:10:46.000000000 +0200
+++ new/h2-3.2.0/h2.egg-info/PKG-INFO 2020-02-08 17:43:24.000000000 +0100
@@ -1,11 +1,13 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: h2
-Version: 3.1.1
+Version: 3.2.0
Summary: HTTP/2 State-Machine based protocol implementation
-Home-page: http://hyper.rtfd.org
+Home-page: https://github.com/python-hyper/hyper-h2
Author: Cory Benfield
Author-email: cory(a)lukasa.co.uk
License: MIT License
+Project-URL: Documentation, https://python-hyper.org/projects/h2
+Project-URL: Source, https://github.com/python-hyper/hyper-h2
Description: ===============================
hyper-h2: HTTP/2 Protocol Stack
===============================
@@ -76,6 +78,23 @@
Release History
===============
+ 3.2.0 (2020-02-08)
+ ------------------
+
+ Bugfixes
+ ~~~~~~~~
+
+ - Receiving DATA frames on closed (or reset) streams now properly emit a
+ WINDOW_UPDATE to keep the connection flow window topped up.
+
+ API Changes (Backward-Incompatible)
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - ``h2.config.logger`` now uses a `trace(...)` function, in addition
+ to `debug(...)`. If you defined a custom logger object, you need to handle
+ these new function calls.
+
+
3.1.1 (2019-08-02)
------------------
@@ -825,9 +844,10 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/h2.egg-info/requires.txt new/h2-3.2.0/h2.egg-info/requires.txt
--- old/h2-3.1.1/h2.egg-info/requires.txt 2019-08-02 15:10:46.000000000 +0200
+++ new/h2-3.2.0/h2.egg-info/requires.txt 2020-02-08 17:43:24.000000000 +0100
@@ -1,5 +1,5 @@
hyperframe<6,>=5.2.0
-hpack<4,>=2.3
+hpack<4,>=3.0
-[:python_version == "2.7" or python_version == "3.3"]
+[:python_version == "2.7"]
enum34<2,>=1.1.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/setup.cfg new/h2-3.2.0/setup.cfg
--- old/h2-3.1.1/setup.cfg 2019-08-02 15:10:46.000000000 +0200
+++ new/h2-3.2.0/setup.cfg 2020-02-08 17:43:25.000000000 +0100
@@ -1,3 +1,6 @@
+[tool:pytest]
+testpaths = test
+
[wheel]
universal = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/setup.py new/h2-3.2.0/setup.py
--- old/h2-3.1.1/setup.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/setup.py 2020-02-08 17:39:18.000000000 +0100
@@ -40,7 +40,11 @@
long_description=u'\n\n'.join([readme, history]),
author='Cory Benfield',
author_email='cory(a)lukasa.co.uk',
- url='http://hyper.rtfd.org',
+ url='https://github.com/python-hyper/hyper-h2',
+ project_urls={
+ 'Documentation': 'https://python-hyper.org/projects/h2',
+ 'Source': 'https://github.com/python-hyper/hyper-h2',
+ },
packages=packages,
package_data={'': ['LICENSE', 'README.rst', 'CONTRIBUTORS.rst', 'HISTORY.rst', 'NOTICES']},
package_dir={'h2': 'h2'},
@@ -54,18 +58,19 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
],
install_requires=[
'hyperframe>=5.2.0, <6',
- 'hpack>=2.3,<4',
+ 'hpack>=3.0,<4',
],
extras_require={
- ':python_version == "2.7" or python_version == "3.3"': ['enum34>=1.1.6, <2'],
+ ':python_version == "2.7"': ['enum34>=1.1.6, <2'],
}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/test/test_closed_streams.py new/h2-3.2.0/test/test_closed_streams.py
--- old/h2-3.1.1/test/test_closed_streams.py 2019-08-02 15:10:17.000000000 +0200
+++ new/h2-3.2.0/test/test_closed_streams.py 2020-02-08 12:23:54.000000000 +0100
@@ -195,7 +195,6 @@
@pytest.mark.parametrize(
"frame",
[
- lambda self, ff: ff.build_data_frame(b'hello'),
lambda self, ff: ff.build_headers_frame(
self.example_request_headers, flags=['END_STREAM']),
lambda self, ff: ff.build_headers_frame(
@@ -245,7 +244,6 @@
@pytest.mark.parametrize(
"frame",
[
- lambda self, ff: ff.build_data_frame(b'hello'),
lambda self, ff: ff.build_headers_frame(
self.example_response_headers, flags=['END_STREAM']),
lambda self, ff: ff.build_headers_frame(
@@ -344,7 +342,6 @@
self.example_request_headers),
lambda self, ff: ff.build_headers_frame(
self.example_request_headers, flags=['END_STREAM']),
- lambda self, ff: ff.build_data_frame(b'hello'),
]
)
def test_resets_further_frames_after_recv_reset(self,
@@ -352,7 +349,8 @@
frame):
"""
A stream that is closed by receive RST_STREAM can receive further
- frames: it simply sends RST_STREAM for it.
+ frames: it simply sends RST_STREAM for it, and additionally
+ WINDOW_UPDATE for DATA frames.
"""
c = h2.connection.H2Connection(config=self.server_config)
c.receive_data(frame_factory.preamble())
@@ -396,6 +394,59 @@
assert not events
assert c.data_to_send() == rst_frame.serialize() * 3
+ def test_resets_further_data_frames_after_recv_reset(self,
+ frame_factory):
+ """
+ A stream that is closed by receive RST_STREAM can receive further
+ DATA frames: it simply sends WINDOW_UPDATE for the connection flow
+ window, and RST_STREAM for the stream.
+ """
+ c = h2.connection.H2Connection(config=self.server_config)
+ c.receive_data(frame_factory.preamble())
+ c.initiate_connection()
+
+ header_frame = frame_factory.build_headers_frame(
+ self.example_request_headers, flags=['END_STREAM']
+ )
+ c.receive_data(header_frame.serialize())
+
+ c.send_headers(
+ stream_id=1,
+ headers=self.example_response_headers,
+ end_stream=False
+ )
+
+ rst_frame = frame_factory.build_rst_stream_frame(
+ 1, h2.errors.ErrorCodes.STREAM_CLOSED
+ )
+ c.receive_data(rst_frame.serialize())
+ c.clear_outbound_data_buffer()
+
+ f = frame_factory.build_data_frame(
+ data=b'some data'
+ )
+
+ events = c.receive_data(f.serialize())
+ assert not events
+
+ expected = frame_factory.build_rst_stream_frame(
+ stream_id=1,
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
+
+ events = c.receive_data(f.serialize() * 3)
+ assert not events
+ assert c.data_to_send() == expected * 3
+
+ # Iterate over the streams to make sure it's gone, then confirm the
+ # behaviour is unchanged.
+ c.open_outbound_streams
+
+ events = c.receive_data(f.serialize() * 3)
+ assert not events
+ assert c.data_to_send() == expected * 3
+
@pytest.mark.parametrize(
"frame",
[
@@ -403,7 +454,6 @@
self.example_request_headers),
lambda self, ff: ff.build_headers_frame(
self.example_request_headers, flags=['END_STREAM']),
- lambda self, ff: ff.build_data_frame(b'hello'),
]
)
def test_resets_further_frames_after_send_reset(self,
@@ -455,3 +505,51 @@
events = c.receive_data(f.serialize() * 3)
assert not events
assert c.data_to_send() == rst_frame.serialize() * 3
+
+ def test_resets_further_data_frames_after_send_reset(self,
+ frame_factory):
+ """
+ A stream that is closed by sent RST_STREAM can receive further
+ data frames: it simply sends WINDOW_UPDATE and RST_STREAM for it.
+ """
+ c = h2.connection.H2Connection(config=self.server_config)
+ c.receive_data(frame_factory.preamble())
+ c.initiate_connection()
+
+ header_frame = frame_factory.build_headers_frame(
+ self.example_request_headers, flags=['END_STREAM']
+ )
+ c.receive_data(header_frame.serialize())
+
+ c.send_headers(
+ stream_id=1,
+ headers=self.example_response_headers,
+ end_stream=False
+ )
+
+ c.reset_stream(1, h2.errors.ErrorCodes.INTERNAL_ERROR)
+
+ c.clear_outbound_data_buffer()
+
+ f = frame_factory.build_data_frame(
+ data=b'some data'
+ )
+ events = c.receive_data(f.serialize())
+ assert not events
+ expected = frame_factory.build_rst_stream_frame(
+ stream_id=1,
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
+
+ events = c.receive_data(f.serialize() * 3)
+ assert not events
+ assert c.data_to_send() == expected * 3
+
+ # Iterate over the streams to make sure it's gone, then confirm the
+ # behaviour is unchanged.
+ c.open_outbound_streams
+
+ events = c.receive_data(f.serialize() * 3)
+ assert not events
+ assert c.data_to_send() == expected * 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/test/test_flow_control_window.py new/h2-3.2.0/test/test_flow_control_window.py
--- old/h2-3.1.1/test/test_flow_control_window.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/test/test_flow_control_window.py 2020-02-08 12:23:54.000000000 +0100
@@ -638,6 +638,42 @@
with pytest.raises(h2.exceptions.FlowControlError):
c.increment_flow_control_window(increment=increment, stream_id=1)
+ def test_send_update_on_closed_streams(self, frame_factory):
+ c = h2.connection.H2Connection()
+ c.initiate_connection()
+ c.send_headers(1, self.example_request_headers)
+ c.reset_stream(1)
+
+ c.clear_outbound_data_buffer()
+ c.open_outbound_streams
+ c.open_inbound_streams
+
+ f = frame_factory.build_data_frame(b'some data'*1500)
+ events = c.receive_data(f.serialize()*3)
+ assert not events
+
+ expected = frame_factory.build_rst_stream_frame(
+ stream_id=1,
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize() * 2 + frame_factory.build_window_update_frame(
+ stream_id=0,
+ increment=40500,
+ ).serialize() + frame_factory.build_rst_stream_frame(
+ stream_id=1,
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
+
+ f = frame_factory.build_data_frame(b'')
+ events = c.receive_data(f.serialize())
+ assert not events
+
+ expected = frame_factory.build_rst_stream_frame(
+ stream_id=1,
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
+
class TestAutomaticFlowControl(object):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/test/test_h2_upgrade.py new/h2-3.2.0/test/test_h2_upgrade.py
--- old/h2-3.1.1/test/test_h2_upgrade.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/test/test_h2_upgrade.py 2020-02-08 15:57:08.000000000 +0100
@@ -260,11 +260,11 @@
)
c.receive_data(f.serialize())
- expected_frame = frame_factory.build_rst_stream_frame(
+ expected = frame_factory.build_rst_stream_frame(
stream_id=1,
error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
- )
- assert c.data_to_send() == expected_frame.serialize()
+ ).serialize()
+ assert c.data_to_send() == expected
def test_client_settings_are_applied(self, frame_factory):
"""
@@ -278,7 +278,7 @@
# start of the connection, do not agree on their initial settings
# state.
assert (
- client.local_settings._settings != server.remote_settings._settings
+ client.local_settings != server.remote_settings
)
# Get the client header data and pass it to the server.
@@ -297,10 +297,6 @@
)
assert server.data_to_send() == expected_frame.serialize()
- # We violate abstraction layers here, but I don't think defining __eq__
- # for this is worth it. In this case, both the client and server should
- # agree that these settings have been ACK'd, so their underlying
- # dictionaries should be identical.
assert (
- client.local_settings._settings == server.remote_settings._settings
+ client.local_settings == server.remote_settings
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/test/test_invalid_frame_sequences.py new/h2-3.2.0/test/test_invalid_frame_sequences.py
--- old/h2-3.1.1/test/test_invalid_frame_sequences.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/test/test_invalid_frame_sequences.py 2020-02-08 12:23:54.000000000 +0100
@@ -149,14 +149,16 @@
c.receive_data(f.serialize())
c.clear_outbound_data_buffer()
- bad_frame = frame_factory.build_data_frame(data=b'hello')
+ bad_frame = frame_factory.build_data_frame(
+ data=b'some data'
+ )
c.receive_data(bad_frame.serialize())
- expected_frame = frame_factory.build_rst_stream_frame(
+ expected = frame_factory.build_rst_stream_frame(
stream_id=1,
- error_code=0x5,
- )
- assert c.data_to_send() == expected_frame.serialize()
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
def test_unexpected_continuation_on_closed_stream(self, frame_factory):
"""
@@ -293,15 +295,15 @@
c.clear_outbound_data_buffer()
bad_frame = frame_factory.build_data_frame(
- data=b'hello'
+ data=b'some data'
)
events = c.receive_data(bad_frame.serialize())
- expected_frame = frame_factory.build_rst_stream_frame(
+ expected = frame_factory.build_rst_stream_frame(
stream_id=1,
- error_code=0x5,
- )
- assert c.data_to_send() == expected_frame.serialize()
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
assert len(events) == 1
event = events[0]
@@ -327,16 +329,16 @@
c.clear_outbound_data_buffer()
bad_frame = frame_factory.build_data_frame(
- data=b'hello'
+ data=b'some data'
)
# Receive 5 frames.
events = c.receive_data(bad_frame.serialize() * 5)
- expected_frame = frame_factory.build_rst_stream_frame(
+ expected = frame_factory.build_rst_stream_frame(
stream_id=1,
- error_code=0x5,
- )
- assert c.data_to_send() == expected_frame.serialize() * 5
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected * 5
assert len(events) == 1
event = events[0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/test/test_stream_reset.py new/h2-3.2.0/test/test_stream_reset.py
--- old/h2-3.1.1/test/test_stream_reset.py 2019-01-22 18:41:43.000000000 +0100
+++ new/h2-3.2.0/test/test_stream_reset.py 2020-02-08 12:23:54.000000000 +0100
@@ -70,8 +70,8 @@
other_id,
frame_factory):
"""
- A stream that has been reset still affects the connection flow control
- window.
+ A stream that has been reset does not affect the connection flow
+ control window.
"""
c = h2.connection.H2Connection()
c.initiate_connection()
@@ -89,19 +89,19 @@
c.clear_outbound_data_buffer()
f = frame_factory.build_data_frame(
- data=b'some data!',
+ data=b'some data',
stream_id=close_id
)
- events = c.receive_data(f.serialize())
+ c.receive_data(f.serialize())
- rst_frame = frame_factory.build_rst_stream_frame(
- close_id, h2.errors.ErrorCodes.STREAM_CLOSED
- )
- assert not events
- assert c.data_to_send() == rst_frame.serialize()
+ expected = frame_factory.build_rst_stream_frame(
+ stream_id=close_id,
+ error_code=h2.errors.ErrorCodes.STREAM_CLOSED,
+ ).serialize()
+ assert c.data_to_send() == expected
new_window = c.remote_flow_control_window(stream_id=other_id)
- assert initial_window - len(b'some data!') == new_window
+ assert initial_window - len(b'some data') == new_window
@pytest.mark.parametrize('clear_streams', [True, False])
def test_reset_stream_automatically_resets_pushed_streams(self,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/test_requirements.txt new/h2-3.2.0/test_requirements.txt
--- old/h2-3.1.1/test_requirements.txt 2019-08-02 15:10:17.000000000 +0200
+++ new/h2-3.2.0/test_requirements.txt 2020-02-08 17:39:18.000000000 +0100
@@ -1,5 +1,5 @@
-pytest==4.6.2
-pytest-cov==2.7.1
-coverage==4.5.3
-pytest-xdist==1.29.0
+pytest==4.6.5 # rq.filter: < 5
+pytest-cov==2.8.1
+pytest-xdist==1.31.0
+coverage==4.5.4
hypothesis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/h2-3.1.1/tox.ini new/h2-3.2.0/tox.ini
--- old/h2-3.1.1/tox.ini 2019-08-02 15:10:17.000000000 +0200
+++ new/h2-3.2.0/tox.ini 2020-02-08 17:39:18.000000000 +0100
@@ -1,15 +1,15 @@
[tox]
-envlist = py27, py34, py35, py36, py37, pypy, lint, packaging, docs
+envlist = py27, py34, py35, py36, py37, py38, pypy, lint, packaging, docs
[testenv]
deps= -r{toxinidir}/test_requirements.txt
commands=
- coverage run -m py.test {posargs} {toxinidir}/test/
+ coverage run -m py.test {posargs}
coverage report
[testenv:pypy]
# temporarily disable coverage testing on PyPy due to performance problems
-commands= py.test {posargs} {toxinidir}/test/
+commands= py.test {posargs}
[testenv:lint]
basepython=python3.7
@@ -18,7 +18,7 @@
[testenv:docs]
basepython=python3.7
-deps = sphinx==1.4.9
+deps = sphinx==2.2.0
changedir = {toxinidir}/docs
whitelist_externals = rm
commands =
@@ -27,7 +27,7 @@
[testenv:graphs]
basepython=python2.7
-deps = graphviz==0.11.1
+deps = graphviz==0.13
commands =
python visualizer/visualize.py -i docs/source/_static
@@ -42,7 +42,7 @@
[testenv:h2spec]
basepython=python3.6
-deps = twisted[tls]==17.1.0
+deps = twisted[tls]==19.7.0
whitelist_externals = {toxinidir}/test/h2spectest.sh
commands =
{toxinidir}/test/h2spectest.sh
1
0
Hello community,
here is the log from the commit of package libpt2 for openSUSE:Factory checked in at 2020-02-29 21:23:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpt2 (Old)
and /work/SRC/openSUSE:Factory/.libpt2.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpt2"
Sat Feb 29 21:23:19 2020 rev:42 rq:779683 version:2.10.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpt2/libpt2.changes 2018-11-28 11:09:37.323214562 +0100
+++ /work/SRC/openSUSE:Factory/.libpt2.new.26092/libpt2.changes 2020-02-29 21:23:25.670387471 +0100
@@ -1,0 +2,8 @@
+Mon Feb 24 13:19:40 UTC 2020 - Dominique Leuenberger <dimstar(a)opensuse.org>
+
+- Add libpt2-gnu-make-4.3.patch: Fix build with GNU Make 4.3
+ (number signs (#) appearing inside a macro reference or function
+ invocation no longer introduce comments and should not be escaped
+ with backslahes.
+
+-------------------------------------------------------------------
New:
----
libpt2-gnu-make-4.3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpt2.spec ++++++
--- /var/tmp/diff_new_pack.eUDdo9/_old 2020-02-29 21:23:26.494389102 +0100
+++ /var/tmp/diff_new_pack.eUDdo9/_new 2020-02-29 21:23:26.494389102 +0100
@@ -49,6 +49,7 @@
# PATCH-FIX-UPSTREAM libpt2-openssl11.patch boo#1055477 mgorse(a)suse.com -- port to OpenSSL 1.1.
Patch8: libpt2-openssl11.patch
Patch9: reproducible.patch
+Patch10: libpt2-gnu-make-4.3.patch
BuildRequires: SDL-devel
BuildRequires: alsa-devel
BuildRequires: bison
@@ -187,6 +188,9 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%if %{pkg_vcmp make >= 4.3}
+%patch10 -p1
+%endif
%build
export CXXFLAGS="%optflags -fvisibility-inlines-hidden"
++++++ libpt2-gnu-make-4.3.patch ++++++
Index: ptlib-2.10.11/make/common.mak
===================================================================
--- ptlib-2.10.11.orig/make/common.mak
+++ ptlib-2.10.11/make/common.mak
@@ -370,20 +370,20 @@ ifdef VERSION_FILE
# If not specified, find the various version components in the VERSION_FILE
ifndef MAJOR_VERSION
- MAJOR_VERSION:=$(strip $(subst \#define,, $(subst $(MAJOR_VERSION_DEFINE),,\
+ MAJOR_VERSION:=$(strip $(subst #define,, $(subst $(MAJOR_VERSION_DEFINE),,\
$(shell grep "define *$(MAJOR_VERSION_DEFINE) *" $(VERSION_FILE)))))
endif
ifndef MINOR_VERSION
- MINOR_VERSION:=$(strip $(subst \#define,, $(subst $(MINOR_VERSION_DEFINE),,\
+ MINOR_VERSION:=$(strip $(subst #define,, $(subst $(MINOR_VERSION_DEFINE),,\
$(shell grep "define *$(MINOR_VERSION_DEFINE)" $(VERSION_FILE)))))
endif
ifndef BUILD_TYPE
- BUILD_TYPE:=$(strip $(subst \#define,,$(subst BUILD_TYPE,,\
+ BUILD_TYPE:=$(strip $(subst #define,,$(subst BUILD_TYPE,,\
$(subst AlphaCode,alpha,$(subst BetaCode,beta,$(subst ReleaseCode,.,\
$(shell grep "define *BUILD_TYPE" $(VERSION_FILE))))))))
endif
ifndef BUILD_NUMBER
- BUILD_NUMBER:=$(strip $(subst \#define,,$(subst $(BUILD_NUMBER_DEFINE),,\
+ BUILD_NUMBER:=$(strip $(subst #define,,$(subst $(BUILD_NUMBER_DEFINE),,\
$(shell grep "define *$(BUILD_NUMBER_DEFINE)" $(VERSION_FILE)))))
endif
1
0
Hello community,
here is the log from the commit of package wicked for openSUSE:Factory checked in at 2020-02-29 21:23:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wicked (Old)
and /work/SRC/openSUSE:Factory/.wicked.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wicked"
Sat Feb 29 21:23:16 2020 rev:80 rq:779668 version:0.6.62
Changes:
--------
--- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2019-12-17 13:29:37.411420624 +0100
+++ /work/SRC/openSUSE:Factory/.wicked.new.26092/wicked.changes 2020-02-29 21:23:23.818383806 +0100
@@ -1,0 +2,15 @@
+Wed Feb 26 21:00:16 UTC 2020 - rtorreromarijnissen(a)suse.com
+
+- version 0.6.62
+- dhcp4: discard lease on client-id mismatch (CVE-2020-7217,bsc#1160906)
+- dhcp4: free lease on response without message type (CVE-2020-7216,bsc#1160905)
+- dhcp6: don't add free'd IA to ia_pd_list on T1>T2 (CVE-2019-18903,bsc#1160904)
+- dhcp6: fix use-after-free on option parsing failure (CVE-2019-18902,bsc#1160903)
+- utils: don't reject NULL var array names/keys breaking wicked duid dump
+- routes: schema fix to avoid not applying rto_min incl. new time format (bsc#1160939)
+- systemd: order start wicked after network-pre.target and openvswitch.service start
+- packaging: use pkgconfig(libsystemd) instead of systemd-devel
+- misc bug fixes by Malte Kraus including undefined behaviour, memory access alignment
+- corrections, use-after-free, missed initialization and format errors
+
+-------------------------------------------------------------------
Old:
----
wicked-0.6.61.tar.bz2
New:
----
wicked-0.6.62.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wicked.spec ++++++
--- /var/tmp/diff_new_pack.QN09Gz/_old 2020-02-29 21:23:24.598385350 +0100
+++ /var/tmp/diff_new_pack.QN09Gz/_new 2020-02-29 21:23:24.598385350 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wicked
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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
@@ -18,12 +18,12 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.61
+Version: 0.6.62
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
-License: GPL-2.0-only
+License: GPL-2.0-or-later
Group: System/Management
-Url: https://github.com/openSUSE/wicked
+URL: https://github.com/openSUSE/wicked
Source0: %{name}-%{version}.tar.bz2
Source1: wicked-rpmlintrc
#
@@ -39,7 +39,7 @@
BuildRequires: automake
BuildRequires: libtool
BuildRequires: make
-Provides: libwicked-0_6_61 = %{version}
+Provides: libwicked-0_6_62 = %{version}
Obsoletes: libwicked-0-6 <= %{version}
%if 0%{?suse_version} >= 1500
@@ -84,8 +84,8 @@
%endif
%if %{with systemd}
-BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
+BuildRequires: pkgconfig(libsystemd)
%{?systemd_requires}
%if 0%{?suse_version:1}
Requires(pre): %fillup_prereq
@@ -155,7 +155,7 @@
Group: Development/Libraries/C and C++
Requires: dbus-1-devel
Requires: libnl3-devel
-Requires: libwicked-0_6_61 = %{version}
+Requires: libwicked-0_6_62 = %{version}
%description devel
Wicked is a network configuration infrastructure incorporating a number
++++++ wicked-0.6.61.tar.bz2 -> wicked-0.6.62.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/ChangeLog new/wicked-0.6.62/ChangeLog
--- old/wicked-0.6.61/ChangeLog 2019-12-11 12:06:56.000000000 +0100
+++ new/wicked-0.6.62/ChangeLog 2020-02-26 21:49:21.000000000 +0100
@@ -1,3 +1,244 @@
+commit d539bba071c5837bec94a0cdf1c44060ad643e1e
+Author: Marius Tomaschewski <mt(a)suse.de>
+Date: Wed Feb 26 17:16:08 2020 +0100
+
+ version 0.6.62
+
+commit 082b635cd1ae7c893e91d221d24dd36817ab0350
+Author: Marius Tomaschewski <mt(a)suse.de>
+Date: Wed Feb 26 17:11:35 2020 +0100
+
+ spec: adjust rpm spec file licenses and url tags
+
+commit 0699d59048f2e67d6e29f5cd8b017903d061e216
+Merge: f62ab041 e94fb47a
+Author: Marius Tomaschewski <mt(a)suse.com>
+Date: Wed Feb 26 12:18:58 2020 +0100
+
+ Merge pull request #828 from rtorrero/security-1
+
+ security: memory usage errors in DHCPv4 and DHCPv6 handling
+
+commit f62ab04162fd3e30b96fac0c73fde0bcc09c5fc5
+Merge: 4ef7c7b7 c8d3f932
+Author: Marius Tomaschewski <mt(a)suse.com>
+Date: Tue Feb 25 15:04:25 2020 +0100
+
+ Merge pull request #825 from rtorrero/bug-1160939_rto-min-fix
+
+ schema: change rto_min key to avoid not applying it (bsc#1160939)
+
+commit c8d3f932b23a89e50ea69ee9b7584342711639fe
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Mon Feb 24 11:01:29 2020 +0000
+
+ ifcfg: consider new iproute time format for rtt,rttvar,rto_min
+
+commit e94fb47a5e578842bb305a8c232e3df718e8794d
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Fri Jan 31 10:55:24 2020 +0000
+
+ dhcp4: discard lease on client-id mismatch (CVE-2020-7217,bsc#1160906)
+
+commit 127876d452e44045f6470c1e44b1c95b48437f81
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Fri Jan 31 10:40:00 2020 +0000
+
+ dhcp6: don't add free'd IA to ia_pd_list on T1>T2 (CVE-2019-18903,bsc#1160904)
+
+commit b5d618de07819d60ace7b2741f62d83d011be3f8
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Wed Jan 22 12:19:12 2020 +0000
+
+ dhcp4: free lease on response without message type (CVE-2020-7216,bsc#1160905)
+
+commit 9c1a64fdb77772169f7b28550978534c125b7e40
+Author: Marius Tomaschewski <mt(a)suse.de>
+Date: Wed Jan 22 12:42:09 2020 +0100
+
+ dhcp6: fix use-after-free on option parsing failure (CVE-2019-18902,bsc#1160903)
+
+ ni_dhcp6_fsm_parse_client_options() frees msg->lease without clearing
+ it to NULL, leading to UAF.
+
+commit 4ef7c7b75a9e53e66a46e7c6475de3749222d818
+Merge: 1ee4770a e1646682
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Mon Feb 24 11:05:18 2020 +0000
+
+ Merge pull request #826 from mtomaschewski/var-array-name
+
+ utils: don't reject NULL var array names/keys
+
+commit 2b6b9fa4deb3f033e3748477d8004fb360a81dd6
+Author: Clemens Famulla-Conrad <cfamullaconrad(a)suse.de>
+Date: Wed Feb 12 12:59:56 2020 +0100
+
+ Introduce .editorconfig file
+
+ Convenient way to have project based editor config, see http://EditorConfig.org
+
+ I walked through the project and tried to identify the most common used
+ ways for different file types.
+
+ Following four types:
+
+ * xml and .conf files
+ => 2 spaces
+ * manpages
+ => 3 spaces
+ * doc/html
+ => 1 space
+ * all others
+ => tab with 8
+
+commit e164668272ebd5f9bb720c0e84ad6ea5bd94094e
+Author: Marius Tomaschewski <mt(a)suse.de>
+Date: Tue Feb 11 08:32:01 2020 +0100
+
+ utils: don't reject NULL var array names/keys
+
+commit 402fea7de8df803101e4e113d36c22c7b2c20d3d
+Merge: 8240a4a6 d0396a32
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Fri Feb 7 13:32:25 2020 +0000
+
+ Merge pull request #823 from DimStar77/master
+
+ Packaging: BuildRequire pkgconfig(libsystemd) instead of systemd-devel
+
+commit 5b669932606a2bacd46c02b61b88283c8f623422
+Author: Rubén Torrero Marijnissen <rtorreromarijnissen(a)suse.com>
+Date: Wed Feb 5 16:42:45 2020 +0000
+
+ schema: change rto_min key to avoid not applying it (bsc#1160939)
+
+commit 17e60f2cce44b9ad267b3aed3b17b2808b133e23
+Author: Jan Zerebecki <jzerebecki(a)suse.com>
+Date: Fri Jan 31 11:32:38 2020 +0100
+
+ Order After network-pre on startup
+
+ Add network-pre.target where ordering is already After
+ SuSEfirewall2_init.service.
+
+ SuSEfirewall2_init.service is also missing a Before on network-pre.
+ After that is done in SuSEfirewall2 it can be removed here.
+
+ Quote about network-pre from man systemd.special:
+ This passive target unit may be pulled in by services that want to run
+ before any network is set up, for example for the purpose of setting up
+ a firewall. All network management software orders itself after this
+ target, but does not pull it in.
+
+commit 8e7310c6637a403e9ecba64ad4af46f3963db43d
+Author: Jan Zerebecki <jzerebecki(a)suse.com>
+Date: Fri Jan 31 11:18:22 2020 +0100
+
+ Order wickedd After Open vSwitch on startup
+
+ Otherwise these are treading on each other while bringing up interfaces
+ which results in failures. Ordering Open vSwitch Before network.service
+ isn't suficient as wickedd and wickedd-nanny may start before that.
+
+commit d0396a32cd2b75e1444ebe179e2c53219767104a
+Author: Dominique Leuenberger <dimstar(a)opensuse.org>
+Date: Fri Jan 24 15:45:15 2020 +0100
+
+ Packaging: BuildRequire pkgconfig(libsystemd) instead of systemd-devel
+
+ On OBS/openSUSE this has the positive side-effect of using the -mini
+ flavors, meaning we can move up in fhe build queue and not be
+ blocked behind the 'full featured systemd package'. There is no
+ difference for the consumers.
+
+commit 98c0115e5e8b0db84752e5eb81a2b1abbae58618
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Mon Jan 13 14:38:57 2020 +0100
+
+ force aligned struct accesses
+
+commit de2bce5efb6cd5f32a26ce8ef3adc52ebac605f6
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Mon Jan 13 14:00:20 2020 +0100
+
+ ni_iaid_create_hwaddr: deal correctly with unaligned memory
+
+commit ebd4f30689f89ef008675102d9539332b89925de
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 16:37:18 2020 +0100
+
+ turn signed shifts into unsigned shifts: undefined behaviour
+
+commit dc449aacecdd36bc797e5d808bb24b1bf30317b1
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 14:56:00 2020 +0100
+
+ hostname lookup: don't use shellcmd after freeing it
+
+ the process keeps a reference to it, so this was no uaf before. This
+ way it's more robust to changes in ni_process_new at least.
+
+commit 11866ee000cadc1c950ed7883edaf5f56187203e
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 14:54:34 2020 +0100
+
+ fix use-after-free in timer
+
+commit d0aa2afa319ff76b2f866316fafe76630d1723d3
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 14:11:15 2020 +0100
+
+ ni_dhcp4_fsm_arp_validate: handle failure to create ARP handle
+
+commit e9a9520142f0aa37398fbbd4c829b6e825b71f1e
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 14:00:02 2020 +0100
+
+ buffer: remove 0-byte memcpy undefined behaviour
+
+commit 8ac6ffcc70e55b19e2ff6f5e4b748bf6a66734cc
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:50:03 2020 +0100
+
+ ni_rule_print: remove superfluous format argument
+
+commit 9b76473e0504e3ab1e4de4d3292e5cc9acbdd201
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:48:46 2020 +0100
+
+ process_run_info: fix check for signal termination
+
+commit c9ce47dbc8bca88f59d07c3078f9f414df8b97c4
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:47:16 2020 +0100
+
+ ni_ifworker_netif_resolve_cb: initalize cwtype variable
+
+commit 5d3d74458b7e1c4ae9060805994b4c270017f571
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:45:00 2020 +0100
+
+ __ni_objectmodel_route_nexthop_from_dict: do not print uninitalized var
+
+commit fed802e40cf51823890bac1cb7f7d617bd23af18
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:44:00 2020 +0100
+
+ ni_config_parse_addrconf_dhcp6_nodes: fix length parsing
+
+commit b25f199ba117d6b333c808165be979073f03f556
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:42:36 2020 +0100
+
+ ni_auto6_on_nduseropt_events: initialize changed variable
+
+commit 3aef8af62ae556ed6bf702eb085209e6dc80cf06
+Author: Malte Kraus <malte.kraus(a)suse.com>
+Date: Fri Jan 10 13:41:38 2020 +0100
+
+ client: format hostnames correctly
+
commit 50bf6f6197e964203c0b96e7f49b603a2b2bf7eb
Author: Marius Tomaschewski <mt(a)suse.de>
Date: Wed Dec 11 10:51:50 2019 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/VERSION new/wicked-0.6.62/VERSION
--- old/wicked-0.6.61/VERSION 2019-12-11 11:59:56.000000000 +0100
+++ new/wicked-0.6.62/VERSION 2020-02-26 21:44:57.000000000 +0100
@@ -1 +1 @@
-0.6.61
+0.6.62
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/client/compat.c new/wicked-0.6.62/client/compat.c
--- old/wicked-0.6.61/client/compat.c 2019-12-11 11:59:56.000000000 +0100
+++ new/wicked-0.6.62/client/compat.c 2020-02-26 21:44:57.000000000 +0100
@@ -1801,7 +1801,7 @@
xml_node_new_element("features", mnode, ni_sprint_uint(rp->features));
}
if (rp->rto_min > 0) {
- xml_node_new_element("rto-min", mnode, ni_sprint_uint(rp->rto_min));
+ xml_node_new_element("rto_min", mnode, ni_sprint_uint(rp->rto_min));
}
if (rp->initrwnd > 0) {
xml_node_new_element("initrwnd", mnode, ni_sprint_uint(rp->initrwnd));
@@ -3071,4 +3071,3 @@
return count - array->count;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/client/main.c new/wicked-0.6.62/client/main.c
--- old/wicked-0.6.61/client/main.c 2019-12-11 11:59:56.000000000 +0100
+++ new/wicked-0.6.62/client/main.c 2020-02-26 21:42:56.000000000 +0100
@@ -1488,6 +1488,7 @@
if (opt_dbus_error_file) {
write_dbus_error(opt_dbus_error_file,
NI_DBUS_ERROR_UNRESOLVABLE_HOSTNAME,
+ "%s",
hostname);
opt_dbus_error_file = NULL;
}
@@ -1509,6 +1510,7 @@
if (opt_dbus_error_file) {
write_dbus_error(opt_dbus_error_file,
NI_DBUS_ERROR_UNREACHABLE_ADDRESS,
+ "%s",
hostname);
opt_dbus_error_file = NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/client/suse/compat-suse.c new/wicked-0.6.62/client/suse/compat-suse.c
--- old/wicked-0.6.61/client/suse/compat-suse.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/client/suse/compat-suse.c 2020-02-26 21:44:57.000000000 +0100
@@ -602,6 +602,43 @@
}
int
+ni_suse_route_parse_time(const char *input, unsigned int *result)
+{
+ static const ni_intmap_t time_map[] = {
+ { "msecs", 0 },
+ { "msec", 0 },
+ { "ms", 0 },
+ { "secs", 1000 },
+ { "sec", 1000 },
+ { "s", 1000 },
+ { NULL, 0 }
+ };
+ unsigned int factor = 0;
+ unsigned long value;
+ char *end = NULL;
+
+ if (!result || !input || !*input || *input == '-') {
+ errno = EINVAL;
+ return -1;
+ }
+
+ errno = 0;
+ value = strtoul(input, (char **) &end, 10);
+ if (errno)
+ return -1;
+ if (*end && ni_parse_uint_mapped(end, time_map, &factor) < 0) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ if (factor)
+ value *= factor;
+
+ *result = value;
+ return 0;
+}
+
+int
__ni_suse_route_parse_opts(ni_route_t *rp, ni_string_array_t *opts,
unsigned int *pos, const char *ifname,
const char *filename, unsigned int line)
@@ -701,7 +738,7 @@
return -1;
val = ni_string_array_at(opts, (*pos)++);
}
- if (ni_parse_uint(val, &tmp, 10) < 0)
+ if (ni_suse_route_parse_time(val, &tmp) < 0)
return -1;
rp->rtt = tmp;
} else
@@ -712,7 +749,7 @@
return -1;
val = ni_string_array_at(opts, (*pos)++);
}
- if (ni_parse_uint(val, &tmp, 10) < 0)
+ if (ni_suse_route_parse_time(val, &tmp) < 0)
return -1;
rp->rttvar = tmp;
} else
@@ -802,7 +839,7 @@
return -1;
val = ni_string_array_at(opts, (*pos)++);
}
- if (ni_parse_uint(val, &tmp, 10) < 0)
+ if (ni_suse_route_parse_time(val, &tmp) < 0)
return -1;
rp->rto_min = tmp;
} else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/configure new/wicked-0.6.62/configure
--- old/wicked-0.6.61/configure 2019-12-11 12:05:59.000000000 +0100
+++ new/wicked-0.6.62/configure 2020-02-26 21:47:14.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for wicked 0.6.61.
+# Generated by GNU Autoconf 2.69 for wicked 0.6.62.
#
# Report bugs to <http://bugs.opensuse.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='wicked'
PACKAGE_TARNAME='wicked'
-PACKAGE_VERSION='0.6.61'
-PACKAGE_STRING='wicked 0.6.61'
+PACKAGE_VERSION='0.6.62'
+PACKAGE_STRING='wicked 0.6.62'
PACKAGE_BUGREPORT='http://bugs.opensuse.org'
PACKAGE_URL='https://github.com/openSUSE/wicked'
@@ -1396,7 +1396,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 wicked 0.6.61 to adapt to many kinds of systems.
+\`configure' configures wicked 0.6.62 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1466,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wicked 0.6.61:";;
+ short | recursive ) echo "Configuration of wicked 0.6.62:";;
esac
cat <<\_ACEOF
@@ -1637,7 +1637,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wicked configure 0.6.61
+wicked configure 0.6.62
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2236,7 +2236,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wicked $as_me 0.6.61, which was
+It was created by wicked $as_me 0.6.62, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3099,7 +3099,7 @@
# Define the identity of the package.
PACKAGE='wicked'
- VERSION='0.6.61'
+ VERSION='0.6.62'
cat >>confdefs.h <<_ACEOF
@@ -15810,7 +15810,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wicked $as_me 0.6.61, which was
+This file was extended by wicked $as_me 0.6.62, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15877,7 +15877,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wicked config.status 0.6.61
+wicked config.status 0.6.62
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/wicked-0.6.61/etc/systemd/wickedd-auto4.service.in new/wicked-0.6.62/etc/systemd/wickedd-auto4.service.in
--- old/wicked-0.6.61/etc/systemd/wickedd-auto4.service.in 2019-12-11 11:58:07.000000000 +0100
+++ new/wicked-0.6.62/etc/systemd/wickedd-auto4.service.in 2020-02-26 21:44:57.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=wicked AutoIPv4 supplicant service
Requisite=dbus.service
-After=local-fs.target dbus.service SuSEfirewall2_init.service
+After=local-fs.target dbus.service network-pre.target SuSEfirewall2_init.service
Before=wickedd.service wicked.service network.target
PartOf=wickedd.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/etc/systemd/wickedd-dhcp4.service.in new/wicked-0.6.62/etc/systemd/wickedd-dhcp4.service.in
--- old/wicked-0.6.61/etc/systemd/wickedd-dhcp4.service.in 2019-12-11 11:58:07.000000000 +0100
+++ new/wicked-0.6.62/etc/systemd/wickedd-dhcp4.service.in 2020-02-26 21:44:57.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=wicked DHCPv4 supplicant service
Requisite=dbus.service
-After=local-fs.target dbus.service SuSEfirewall2_init.service
+After=local-fs.target dbus.service network-pre.target SuSEfirewall2_init.service
Before=wickedd.service wicked.service network.target
PartOf=wickedd.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/etc/systemd/wickedd-dhcp6.service.in new/wicked-0.6.62/etc/systemd/wickedd-dhcp6.service.in
--- old/wicked-0.6.61/etc/systemd/wickedd-dhcp6.service.in 2019-12-11 11:58:07.000000000 +0100
+++ new/wicked-0.6.62/etc/systemd/wickedd-dhcp6.service.in 2020-02-26 21:44:57.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=wicked DHCPv6 supplicant service
Requisite=dbus.service
-After=local-fs.target dbus.service SuSEfirewall2_init.service
+After=local-fs.target dbus.service network-pre.target SuSEfirewall2_init.service
Before=wickedd.service wicked.service network.target
PartOf=wickedd.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/etc/systemd/wickedd-nanny.service.in new/wicked-0.6.62/etc/systemd/wickedd-nanny.service.in
--- old/wicked-0.6.61/etc/systemd/wickedd-nanny.service.in 2019-12-11 11:58:07.000000000 +0100
+++ new/wicked-0.6.62/etc/systemd/wickedd-nanny.service.in 2020-02-26 21:44:57.000000000 +0100
@@ -1,7 +1,7 @@
[Unit]
Description=wicked network nanny service
Requisite=dbus.service
-After=local-fs.target dbus.service SuSEfirewall2_init.service wickedd.service
+After=local-fs.target dbus.service network-pre.target SuSEfirewall2_init.service wickedd.service
Before=wicked.service network.target
PartOf=wickedd.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/etc/systemd/wickedd.service.in new/wicked-0.6.62/etc/systemd/wickedd.service.in
--- old/wicked-0.6.61/etc/systemd/wickedd.service.in 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/etc/systemd/wickedd.service.in 2020-02-26 21:44:57.000000000 +0100
@@ -2,7 +2,7 @@
Description=wicked network management service daemon
Requisite=dbus.service
Wants=wickedd-nanny.service wickedd-dhcp6.service wickedd-dhcp4.service wickedd-auto4.service systemd-udev-settle.service
-After=local-fs.target dbus.service isdn.service rdma.service SuSEfirewall2_init.service systemd-udev-settle.service
+After=local-fs.target dbus.service isdn.service rdma.service network-pre.target SuSEfirewall2_init.service systemd-udev-settle.service openvswitch.service
Before=wickedd-nanny.service wicked.service network.target
[Service]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/schema/interface.xml new/wicked-0.6.62/schema/interface.xml
--- old/wicked-0.6.61/schema/interface.xml 2019-07-03 09:56:55.000000000 +0200
+++ new/wicked-0.6.62/schema/interface.xml 2020-02-26 21:44:57.000000000 +0100
@@ -65,7 +65,7 @@
<hoplimit type="uint32" />
<initcwnd type="uint32" />
<features type="uint32" />
- <rto-min type="uint32" />
+ <rto_min type="uint32" />
<initrwnd type="uint32" />
</metrics>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/auto6.c new/wicked-0.6.62/src/auto6.c
--- old/wicked-0.6.61/src/auto6.c 2019-07-26 15:27:40.000000000 +0200
+++ new/wicked-0.6.62/src/auto6.c 2020-02-26 21:42:56.000000000 +0100
@@ -717,7 +717,7 @@
ni_addrconf_lease_t *lease;
unsigned int lifetime;
struct timeval now;
- ni_bool_t changed;
+ ni_bool_t changed = FALSE;
if (!dev)
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/buffer.c new/wicked-0.6.62/src/buffer.c
--- old/wicked-0.6.61/src/buffer.c 2016-01-29 16:56:20.000000000 +0100
+++ new/wicked-0.6.62/src/buffer.c 2020-02-26 21:42:56.000000000 +0100
@@ -25,7 +25,8 @@
unsigned char *new_base;
new_base = xmalloc(new_size);
- memcpy(new_base, bp->base, bp->size);
+ if (bp->size)
+ memcpy(new_base, bp->base, bp->size);
bp->base = new_base;
bp->allocated = 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/config.c new/wicked-0.6.62/src/config.c
--- old/wicked-0.6.61/src/config.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/config.c 2020-02-26 21:42:56.000000000 +0100
@@ -1147,7 +1147,7 @@
int len;
/* DUID is "opaque", but has 2 bytes type + up to 128 bytes */
- if ((len = sizeof(pref->serverid.data)) > 130)
+ if ((len = pref->serverid.len) > 130)
len = 130;
/* DUID-LL has 2+2 fixed bytes + variable length hwaddress
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/dbus-objects/misc.c new/wicked-0.6.62/src/dbus-objects/misc.c
--- old/wicked-0.6.61/src/dbus-objects/misc.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/dbus-objects/misc.c 2020-02-26 21:42:56.000000000 +0100
@@ -1058,7 +1058,7 @@
*/
if (ni_dbus_dict_get(nhdict, "gateway")) {
if (!__ni_objectmodel_dict_get_sockaddr(nhdict, "gateway", &nh->gateway)) {
- ni_debug_dbus("%s: invalid route hop gateway %u", __func__, value);
+ ni_debug_dbus("%s: invalid route hop gateway", __func__);
return FALSE;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/dbus-xml.c new/wicked-0.6.62/src/dbus-xml.c
--- old/wicked-0.6.61/src/dbus-xml.c 2019-07-03 09:56:55.000000000 +0200
+++ new/wicked-0.6.62/src/dbus-xml.c 2020-02-26 21:42:56.000000000 +0100
@@ -610,7 +610,7 @@
/* May left shift past width of value if bb >= 32, but as ret
* will be FALSE assignment to result will not happen. */
- value |= 1 << bb;
+ value |= NI_BIT(bb);
}
ni_string_array_destroy(&bit_name_arr);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/dhcp4/fsm.c new/wicked-0.6.62/src/dhcp4/fsm.c
--- old/wicked-0.6.61/src/dhcp4/fsm.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/dhcp4/fsm.c 2020-02-26 21:44:57.000000000 +0100
@@ -153,6 +153,7 @@
*/
ni_debug_dhcp("%s: ignoring packet with not matching client-id%s%s",
dev->ifname, sender ? " sender " : "", sender ? sender : "");
+ ni_addrconf_lease_free(lease);
return -1;
}
@@ -1070,7 +1071,7 @@
if (dev->arp.handle == NULL) {
dev->arp.handle = ni_arp_socket_open(&dev->system,
ni_dhcp4_fsm_process_arp_packet, dev);
- if (!dev->arp.handle->user_data) {
+ if (!dev->arp.handle || !dev->arp.handle->user_data) {
ni_error("%s: unable to create ARP handle", dev->ifname);
return -1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/dhcp4/protocol.c new/wicked-0.6.62/src/dhcp4/protocol.c
--- old/wicked-0.6.61/src/dhcp4/protocol.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/dhcp4/protocol.c 2020-02-26 21:44:57.000000000 +0100
@@ -1909,6 +1909,12 @@
}
}
+ // We should have a msg_type by now
+ if (msg_type < 0) {
+ ni_debug_dhcp("unable to parse DHCP4 response: missing msg type");
+ goto error;
+ }
+
if (options->underflow) {
ni_debug_dhcp("unable to parse DHCP4 response: truncated packet");
goto error;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/dhcp6/fsm.c new/wicked-0.6.62/src/dhcp6/fsm.c
--- old/wicked-0.6.61/src/dhcp6/fsm.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/dhcp6/fsm.c 2020-02-26 21:44:57.000000000 +0100
@@ -1587,6 +1587,7 @@
return 0;
failure:
+ msg->lease = NULL;
ni_addrconf_lease_free(lease);
return -1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/dhcp6/protocol.c new/wicked-0.6.62/src/dhcp6/protocol.c
--- old/wicked-0.6.61/src/dhcp6/protocol.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/dhcp6/protocol.c 2020-02-26 21:44:57.000000000 +0100
@@ -354,7 +354,6 @@
static int
ni_dhcp6_process_packet(ni_dhcp6_device_t *dev, ni_buffer_t *msgbuf, const struct in6_addr *sender)
{
- ni_dhcp6_packet_header_t *header;
ni_dhcp6_message_t msg;
int rv = -1;
@@ -376,8 +375,8 @@
/*
* peek header only
*/
- header = ni_buffer_head(msgbuf);
- switch(header->type) {
+ uint8_t *type = ni_buffer_head(msgbuf);
+ switch(*type) {
/* handle client response msgs */
case NI_DHCP6_ADVERTISE:
case NI_DHCP6_REPLY:
@@ -399,7 +398,7 @@
default:
ni_debug_dhcp("%s: received %s message in state %s from %s: discarding",
dev->ifname,
- ni_dhcp6_message_name(header->type),
+ ni_dhcp6_message_name(*type),
ni_dhcp6_fsm_state_name(dev->fsm.state),
ni_dhcp6_address_print(&msg.sender));
break;
@@ -2573,7 +2572,7 @@
ni_dhcp6_option_name(ia->type),
ia->renewal_time, ia->rebind_time);
/* DISCARD */
- ni_dhcp6_ia_free(ia);
+ goto discard;
}
ni_dhcp6_ia_list_append(ia_pd_list, ia);
@@ -2582,6 +2581,10 @@
failure:
ni_dhcp6_ia_free(ia);
return -1;
+
+discard:
+ ni_dhcp6_ia_free(ia);
+ return 0;
}
static int
@@ -3098,15 +3101,16 @@
int
ni_dhcp6_parse_client_header(ni_dhcp6_message_t *msg, ni_buffer_t *msgbuf)
{
- ni_dhcp6_client_header_t * header;
+ ni_dhcp6_client_header_t header;
if (!msgbuf || !msg)
return -1;
- header = ni_buffer_pull_head(msgbuf, sizeof(*header));
- if (header) {
- msg->type = header->type;
- msg->xid = ni_dhcp6_message_xid(header->xid);
+ const char *header_src = ni_buffer_pull_head(msgbuf, sizeof(header));
+ if (header_src) {
+ memcpy(&header, header_src, sizeof(header));
+ msg->type = header.type;
+ msg->xid = ni_dhcp6_message_xid(header.xid);
return 0;
}
return -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/fsm.c new/wicked-0.6.62/src/fsm.c
--- old/wicked-0.6.61/src/fsm.c 2019-12-11 11:58:07.000000000 +0100
+++ new/wicked-0.6.62/src/fsm.c 2020-02-26 21:42:56.000000000 +0100
@@ -3688,7 +3688,7 @@
ni_ifworker_t *w = closure->worker;
ni_ifworker_t *cw = NULL;
xml_node_t *cwmeta = NULL;
- ni_ifworker_type_t cwtype;
+ ni_ifworker_type_t cwtype = NI_IFWORKER_TYPE_NONE;
unsigned int requires = 0;
xml_node_t *mchild;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/iaid.c new/wicked-0.6.62/src/iaid.c
--- old/wicked-0.6.61/src/iaid.c 2019-07-03 09:56:55.000000000 +0200
+++ new/wicked-0.6.62/src/iaid.c 2020-02-26 21:42:56.000000000 +0100
@@ -445,7 +445,6 @@
ni_bool_t
ni_iaid_create_hwaddr(unsigned int *iaid, const ni_hwaddr_t *hwa)
{
- uint32_t *ptr;
size_t off;
if (!iaid || !hwa)
@@ -458,8 +457,8 @@
return FALSE;
off = hwa->len - sizeof(*iaid);
- ptr = (uint32_t *)(hwa->data + off);
- *iaid = ntohl(*ptr);
+ memcpy(iaid, hwa->data + off, sizeof(uint32_t));
+ *iaid = ntohl(*iaid);
return TRUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/macvlan.c new/wicked-0.6.62/src/macvlan.c
--- old/wicked-0.6.61/src/macvlan.c 2019-07-03 09:56:55.000000000 +0200
+++ new/wicked-0.6.62/src/macvlan.c 2020-02-26 21:42:56.000000000 +0100
@@ -119,7 +119,7 @@
const char *
ni_macvlan_flag_bit_name(unsigned int bit)
{
- return bit < 32 ? ni_macvlan_flag_to_name(1 << bit) : NULL;
+ return bit < 32 ? ni_macvlan_flag_to_name(NI_BIT(bit)) : NULL;
}
ni_bool_t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/names.c new/wicked-0.6.62/src/names.c
--- old/wicked-0.6.61/src/names.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/names.c 2020-02-26 21:42:56.000000000 +0100
@@ -226,16 +226,16 @@
{
if (mask) {
if (enable)
- *mask |= (1U << flag);
+ *mask |= NI_BIT(flag);
else
- *mask &= ~(1U << flag);
+ *mask &= ~NI_BIT(flag);
}
}
ni_bool_t
ni_addrconf_flag_bit_is_set(unsigned int flags, unsigned int flag)
{
- return flags & (1 << flag);
+ return flags & NI_BIT(flag);
}
const char *
@@ -288,9 +288,9 @@
{
if (mask) {
if (enable)
- *mask |= (1 << flag);
+ *mask |= NI_BIT(flag);
else
- *mask &= ~(1 << flag);
+ *mask &= ~NI_BIT(flag);
}
}
@@ -690,7 +690,7 @@
{
if (bit >= 32)
return NULL;
- return ni_format_uint_mapped(1 << bit, __ni_linkifflag_names);
+ return ni_format_uint_mapped(NI_BIT(bit), __ni_linkifflag_names);
}
const char *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/netinfo_priv.h new/wicked-0.6.62/src/netinfo_priv.h
--- old/wicked-0.6.61/src/netinfo_priv.h 2019-07-03 09:56:55.000000000 +0200
+++ new/wicked-0.6.62/src/netinfo_priv.h 2020-02-26 21:42:56.000000000 +0100
@@ -122,7 +122,7 @@
static inline ni_bool_t __ni_addrconf_should_update(unsigned int mask, unsigned int bit)
{
- return !!(mask & (1 << bit));
+ return !!(mask & NI_BIT(bit));
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/process.c new/wicked-0.6.62/src/process.c
--- old/wicked-0.6.61/src/process.c 2019-07-26 15:27:41.000000000 +0200
+++ new/wicked-0.6.62/src/process.c 2020-02-26 21:42:56.000000000 +0100
@@ -402,7 +402,7 @@
pi->pid, pi->process->command, rv, runtime);
return rv;
} else
- if ((rv = ni_process_signaled(pi)) != NI_PROCESS_FAILURE) {
+ if ((rv = ni_process_term_signal(pi)) != NI_PROCESS_FAILURE) {
ni_debug_extension("subprocess %d (%s) died with signal %d%s%s",
pi->pid, pi->process->command, rv,
ni_process_core_dumped(pi) ? " (core dumped)" : "",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/route.c new/wicked-0.6.62/src/route.c
--- old/wicked-0.6.61/src/route.c 2019-07-26 15:27:41.000000000 +0200
+++ new/wicked-0.6.62/src/route.c 2020-02-26 21:42:56.000000000 +0100
@@ -2197,7 +2197,7 @@
ni_stringbuf_printf(out, " pref auto");
if (rule->flags & NI_BIT(NI_RULE_INVERT))
- ni_stringbuf_printf(out, " not", rule->pref);
+ ni_stringbuf_printf(out, " not");
if (rule->src.len)
ni_stringbuf_printf(out, " from %s/%u",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/timer.c new/wicked-0.6.62/src/timer.c
--- old/wicked-0.6.61/src/timer.c 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/src/timer.c 2020-02-26 21:42:56.000000000 +0100
@@ -52,9 +52,9 @@
if ((timer = __ni_timer_disarm(handle)) != NULL) {
user_data = timer->user_data;
- free(timer);
ni_debug_verbose(NI_LOG_DEBUG2, NI_TRACE_TIMER,
"%s: released timer %p", __func__, timer);
+ free(timer);
} else {
ni_debug_verbose(NI_LOG_DEBUG2, NI_TRACE_TIMER,
"%s: timer %p NOT found", __func__, handle);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/update.c new/wicked-0.6.62/src/update.c
--- old/wicked-0.6.61/src/update.c 2019-07-03 09:56:55.000000000 +0200
+++ new/wicked-0.6.62/src/update.c 2020-02-26 21:42:56.000000000 +0100
@@ -1528,7 +1528,7 @@
ni_addrconf_type_to_name(job->lease->type),
ni_addrconf_state_to_name(job->lease->state),
ni_updater_name(job->kind),
- ni_basename(shellcmd->command), pi->pid);
+ ni_basename(pi->process->command), pi->pid);
} else {
ni_process_free(pi);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/src/util.c new/wicked-0.6.62/src/util.c
--- old/wicked-0.6.61/src/util.c 2019-12-11 11:59:56.000000000 +0100
+++ new/wicked-0.6.62/src/util.c 2020-02-26 21:44:57.000000000 +0100
@@ -652,7 +652,7 @@
{
ni_var_t *var, tmp = NI_VAR_INIT;
- if (!nva || !name)
+ if (!nva)
return FALSE;
if (!ni_var_set(&tmp, name, value))
@@ -857,7 +857,7 @@
{
ni_var_t *var;
- if (!nva || !name)
+ if (!nva)
return FALSE;
if ((var = ni_var_array_get(nva, name))) {
@@ -1030,7 +1030,7 @@
{
if (!bf || !ni_bitfield_grow(bf, bit))
return FALSE;
- bf->field[bit / 32] |= (1 << (bit % 32));
+ bf->field[bit / 32] |= NI_BIT(bit % 32u);
return TRUE;
}
@@ -1039,7 +1039,7 @@
{
if (!bf || !ni_bitfield_grow(bf, bit))
return FALSE;
- bf->field[bit / 32] &= ~(1 << (bit % 32));
+ bf->field[bit / 32] &= ~NI_BIT(bit % 32u);
return TRUE;
}
@@ -1057,7 +1057,7 @@
{
if (!bf || bit / 32 >= bf->size)
return FALSE;
- return !!(bf->field[bit / 32] & (1 << (bit % 32)));
+ return !!(bf->field[bit / 32] & NI_BIT(bit % 32u));
}
ni_bool_t
@@ -2032,7 +2032,7 @@
sep = "|";
for (i = 0; map->name; ++map) {
- flag = (1 << map->value);
+ flag = NI_BIT(map->value);
if (flags & flag) {
flags &= ~flag;
if (i++)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/wicked.spec new/wicked-0.6.62/wicked.spec
--- old/wicked-0.6.61/wicked.spec 2019-12-11 12:06:05.000000000 +0100
+++ new/wicked-0.6.62/wicked.spec 2020-02-26 21:47:22.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wicked
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,18 +12,18 @@
# 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/
#
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.61
+Version: 0.6.62
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
-License: GPL-2.0
+License: GPL-2.0-or-later
Group: System/Management
-Url: https://github.com/openSUSE/wicked
+URL: https://github.com/openSUSE/wicked
Source0: %{name}-%{version}.tar.bz2
Source1: wicked-rpmlintrc
#
@@ -39,7 +39,7 @@
BuildRequires: automake
BuildRequires: libtool
BuildRequires: make
-Provides: libwicked-0_6_61 = %{version}
+Provides: libwicked-0_6_62 = %{version}
Obsoletes: libwicked-0-6 <= %{version}
%if 0%{?suse_version} >= 1500
@@ -84,7 +84,7 @@
%endif
%if %{with systemd}
-BuildRequires: systemd-devel
+BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%if 0%{?suse_version:1}
@@ -155,7 +155,7 @@
Group: Development/Libraries/C and C++
Requires: dbus-1-devel
Requires: libnl3-devel
-Requires: libwicked-0_6_61 = %{version}
+Requires: libwicked-0_6_62 = %{version}
%description devel
Wicked is a network configuration infrastructure incorporating a number
@@ -420,5 +420,4 @@
%_mandir/man7/wicked.7*
%endif
-
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked-0.6.61/wicked.spec.in new/wicked-0.6.62/wicked.spec.in
--- old/wicked-0.6.61/wicked.spec.in 2019-12-11 11:59:41.000000000 +0100
+++ new/wicked-0.6.62/wicked.spec.in 2020-02-26 21:44:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wicked
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,9 +21,9 @@
Version: @PACKAGE_VERSION@
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
-License: GPL-2.0
+License: GPL-2.0-or-later
Group: System/Management
-Url: @PACKAGE_URL@
+URL: @PACKAGE_URL@
Source0: %{name}-%{version}.tar.bz2
Source1: wicked-rpmlintrc
#
@@ -84,7 +84,7 @@
%endif
%if %{with systemd}
-BuildRequires: systemd-devel
+BuildRequires: pkgconfig(libsystemd)
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%if 0%{?suse_version:1}
@@ -420,5 +420,4 @@
%_mandir/man7/wicked.7*
%endif
-
%changelog
1
0
Hello community,
here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2020-02-29 21:23:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dolphin (Old)
and /work/SRC/openSUSE:Factory/.dolphin.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin"
Sat Feb 29 21:23:11 2020 rev:64 rq:779653 version:19.12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2020-02-10 21:47:45.618003169 +0100
+++ /work/SRC/openSUSE:Factory/.dolphin.new.26092/dolphin.changes 2020-02-29 21:23:22.722381638 +0100
@@ -1,0 +2,9 @@
+Wed Feb 26 19:08:08 UTC 2020 - Luca Beltrame <lbeltrame(a)kde.org>
+
+- Add upstream patch to move back the "Create New..." menu item
+ in its former position (kde#417640):
+ * 0001-Restore-former-position-of-Create-New-menu-item-in-v.patch
+- Refreshed patches:
+ * dolphin-go_up.diff
+
+-------------------------------------------------------------------
New:
----
0001-Restore-former-position-of-Create-New-menu-item-in-v.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dolphin.spec ++++++
--- /var/tmp/diff_new_pack.yeW6rq/_old 2020-02-29 21:23:23.594383363 +0100
+++ /var/tmp/diff_new_pack.yeW6rq/_new 2020-02-29 21:23:23.598383371 +0100
@@ -36,6 +36,8 @@
Patch0: dolphin-go_up.diff
# PATCH-FIX-OPENSUSE
Patch1: 0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-Restore-former-position-of-Create-New-menu-item-in-v.patch
BuildRequires: extra-cmake-modules >= 1.6.0
BuildRequires: update-desktop-files
BuildRequires: cmake(KF5Activities) >= 5.7.0
++++++ 0001-Restore-former-position-of-Create-New-menu-item-in-v.patch ++++++
>From 4c923a531f77bc4c44b5c8687fe18dd6438eb9c5 Mon Sep 17 00:00:00 2001
From: Nate Graham <nate(a)kde.org>
Date: Sun, 9 Feb 2020 08:58:10 -0700
Subject: [PATCH] Restore former position of "Create New" menu item in viewport
context menu
Summary:
I've seem various complaints from users about the fact that the {nav Create New...} menu
item in the viewport context menu is now below {nav Open With} item. All the other
changes to menus seem to have been well-received but this one has garnered criticism.
Looking through D23757 and D11884, I can't actually see that this was intentional, so
it might even be a bug.
Either way, this patch restores the old position of the {nav Create New} menu items at
the top of the Viewport context menu.
BUG: 417640
FIXED-IN: 20.04.0
Test Plan: {F8093605}
Reviewers: #vdg, #dolphin, elvisangelaccio, ndavis
Reviewed By: #vdg, ndavis
Subscribers: asturmlechner, markuss, kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D27267
---
src/dolphincontextmenu.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: dolphin-19.12.2/src/dolphincontextmenu.cpp
===================================================================
--- dolphin-19.12.2.orig/src/dolphincontextmenu.cpp
+++ dolphin-19.12.2/src/dolphincontextmenu.cpp
@@ -328,12 +328,6 @@ void DolphinContextMenu::openViewportCon
fileItemActions.setParentWidget(m_mainWindow);
fileItemActions.setItemListProperties(baseUrlProperties);
- // Don't show "Open With" menu items if the current dir is empty, because there's
- // generally no app that can do anything interesting with an empty directory
- if (view->itemsCount() != 0) {
- addOpenWithActions(fileItemActions);
- }
-
// Set up and insert 'Create New' menu
KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
@@ -341,6 +335,12 @@ void DolphinContextMenu::openViewportCon
newFileMenu->setPopupFiles(m_baseUrl);
addMenu(newFileMenu->menu());
+ // Don't show "Open With" menu items if the current dir is empty, because there's
+ // generally no app that can do anything interesting with an empty directory
+ if (view->itemsCount() != 0) {
+ addOpenWithActions(fileItemActions);
+ }
+
QAction* pasteAction = createPasteAction();
addAction(pasteAction);
++++++ dolphin-go_up.diff ++++++
--- /var/tmp/diff_new_pack.yeW6rq/_old 2020-02-29 21:23:23.638383450 +0100
+++ /var/tmp/diff_new_pack.yeW6rq/_new 2020-02-29 21:23:23.638383450 +0100
@@ -1,8 +1,8 @@
-Index: dolphin-18.03.90/src/dolphinui.rc
+Index: dolphin-19.12.2/src/dolphinui.rc
===================================================================
---- dolphin-18.03.90.orig/src/dolphinui.rc
-+++ dolphin-18.03.90/src/dolphinui.rc
-@@ -92,6 +92,7 @@
+--- dolphin-19.12.2.orig/src/dolphinui.rc
++++ dolphin-19.12.2/src/dolphinui.rc
+@@ -99,6 +99,7 @@
<text context="@title:menu">Main Toolbar</text>
<Action name="go_back" />
<Action name="go_forward" />
1
0
Hello community,
here is the log from the commit of package xdg-desktop-portal-kde for openSUSE:Factory checked in at 2020-02-29 21:23:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-desktop-portal-kde (Old)
and /work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-desktop-portal-kde"
Sat Feb 29 21:23:10 2020 rev:57 rq:779213 version:5.18.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdg-desktop-portal-kde/xdg-desktop-portal-kde.changes 2020-02-22 19:06:57.794409361 +0100
+++ /work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new.26092/xdg-desktop-portal-kde.changes 2020-02-29 21:23:21.774379761 +0100
@@ -1,0 +2,9 @@
+Tue Feb 25 14:07:20 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.18.2
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.18.2.php
+- No code changes since 5.18.1
+
+-------------------------------------------------------------------
Old:
----
xdg-desktop-portal-kde-5.18.1.tar.xz
xdg-desktop-portal-kde-5.18.1.tar.xz.sig
New:
----
xdg-desktop-portal-kde-5.18.2.tar.xz
xdg-desktop-portal-kde-5.18.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-desktop-portal-kde.spec ++++++
--- /var/tmp/diff_new_pack.CvLvQn/_old 2020-02-29 21:23:22.398380997 +0100
+++ /var/tmp/diff_new_pack.CvLvQn/_new 2020-02-29 21:23:22.402381004 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xdg-desktop-portal-kde
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,12 +25,12 @@
%define kf5_version 5.50.0
Name: xdg-desktop-portal-kde
-Version: 5.18.1
+Version: 5.18.2
Release: 0
Summary: QT/KF5 backend for xdg-desktop-portal
License: LGPL-2.1-or-later
Group: System/Libraries
-Url: http://www.kde.org
+URL: http://www.kde.org
Source: https://download.kde.org/stable/plasma/%{version}/xdg-desktop-portal-kde-%{…
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/xdg-desktop-portal-kde-%{…
++++++ xdg-desktop-portal-kde-5.18.1.tar.xz -> xdg-desktop-portal-kde-5.18.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-desktop-portal-kde-5.18.1/CMakeLists.txt new/xdg-desktop-portal-kde-5.18.2/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.18.1/CMakeLists.txt 2020-02-18 14:29:49.000000000 +0100
+++ new/xdg-desktop-portal-kde-5.18.2/CMakeLists.txt 2020-02-25 14:36:26.000000000 +0100
@@ -2,7 +2,7 @@
project(xdg-desktop-portal-kde)
-set(PROJECT_VERSION "5.18.1")
+set(PROJECT_VERSION "5.18.2")
set(PROJECT_VERSION_MAJOR 5)
set(QT_MIN_VERSION "5.12.0")
1
0