April 2023 - openSUSE Commits - openSUSE Mailing Lists

commit qt6-base for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-base for openSUSE:Factory checked in at 2023-04-29 17:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-base (Old) and /work/SRC/openSUSE:Factory/.qt6-base.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-base" Sat Apr 29 17:28:09 2023 rev:31 rq:1083537 version:6.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-base/qt6-base.changes 2023-04-08 17:39:42.814269757 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-base.new.1533/qt6-base.changes 2023-04-29 17:28:21.430596583 +0200 @@ -1,0 +2,6 @@ +Fri Apr 28 13:56:55 UTC 2023 - Christophe Marin <christophe(a)krop.fr> + +- Add upstream change to fix boo#1210849: + * 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch + +------------------------------------------------------------------- New: ---- 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-base.spec ++++++ --- /var/tmp/diff_new_pack.smPynO/_old 2023-04-29 17:28:23.510605292 +0200 +++ /var/tmp/diff_new_pack.smPynO/_new 2023-04-29 17:28:23.514605309 +0200 @@ -40,6 +40,7 @@ Source99: qt6-base-rpmlintrc # Patches 0-100 are upstream patches # Patch0: 0001-QApplication-Fix-DEPRECATED_VERSION-for-setActiveWin.patch +Patch1: 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch # Patches 100-200 are openSUSE and/or non-upstream(able) patches # Patch100: 0001-Tell-the-truth-about-private-API.patch %if 0%{?suse_version} == 1500 ++++++ 0001-QVariant-Fix-support-for-metatypes-created-by-Qt-6.5.patch ++++++ From 42c87e932c308c6269c4195091adae24bce90af1 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale <fabian.kosmale(a)qt.io> Date: Thu, 27 Apr 2023 09:40:17 +0200 Subject: [PATCH] QVariant: Fix support for metatypes created by Qt < 6.5 In Qt >= 6.1, < 6.5, a trivially constructible type would have the NeedsDestruction flag set, but it's dtor pointer would have been null. In Qt 6.5, the meaning of the NeedsDestruction flag was changed to be more aligned with what the name suggests, and thus would only be set for non-trivially destructible types. For QMetaType this was fine, but QVariant has a check for acceptable metatypes which attempts to verify whether a QMetaType is usable for QVariant. The check assumes the semantics of Qt 6.5, and thus fails for metatypes created by older Qt versions. To fix this issue, we increment the QMetaType revision field, and only check the metatype's destruction support if the revision is high enough. In theory, that allows passing unsuitable metatypes from older Qt versions to QVariant; however, such code would have been broken in prior Qt releases already (which didn't attempt the check), and no code that used to work in any released Qt version will break (as we simply skip a check that was passing before). Fixes: QTBUG-113227 Pick-to: 6.5 Change-Id: I12e02bd97d2c410ea1a36efb0ce2389f21d50a30 Reviewed-by: Ulf Hermann <ulf.hermann(a)qt.io> --- src/corelib/kernel/qmetatype.h | 11 ++++++-- src/corelib/kernel/qmetatype_p.h | 7 ++++- .../corelib/kernel/qvariant/tst_qvariant.cpp | 28 +++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e70f901..a641313 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -246,7 +246,14 @@ using NonConstMetaTypeInterface = const QMetaTypeInterface; class QMetaTypeInterface { public: - ushort revision; // 0 in Qt 6.0. Can increase if new field are added + + /* Revision: Can increase if new field are added, or if semantics changes + 0: Initial Revision + 1: the meaning of the NeedsDestruction flag changed + */ + static inline constexpr ushort CurrentRevision = 1; + + ushort revision; ushort alignment; uint size; uint flags; @@ -2461,7 +2468,7 @@ struct QMetaTypeInterfaceWrapper using InterfaceType = std::conditional_t<IsConstMetaTypeInterface, const QMetaTypeInterface, NonConstMetaTypeInterface>; static inline InterfaceType metaType = { - /*.revision=*/ 0, + /*.revision=*/ QMetaTypeInterface::CurrentRevision, /*.alignment=*/ alignof(T), /*.size=*/ sizeof(T), /*.flags=*/ QMetaTypeForType<T>::Flags, diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 3defbc7..e649394 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -152,7 +152,12 @@ inline bool isMoveConstructible(const QtPrivate::QMetaTypeInterface *iface) noex inline bool isDestructible(const QtPrivate::QMetaTypeInterface *iface) noexcept { - return checkMetaTypeFlagOrPointer(iface, iface->dtor, QMetaType::NeedsDestruction); + /* For metatypes of revision 1, the NeedsDestruction was set even for trivially + destructible types, but their dtor pointer would be null. + For that reason, we need the additional check here. + */ + return iface->revision < 1 || + checkMetaTypeFlagOrPointer(iface, iface->dtor, QMetaType::NeedsDestruction); } inline void defaultConstruct(const QtPrivate::QMetaTypeInterface *iface, void *where) diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 61a8e76..9dfc143 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -331,6 +331,7 @@ private slots: void constructFromIncompatibleMetaType_data(); void constructFromIncompatibleMetaType(); + void constructFromQtLT65MetaType(); void copyNonDefaultConstructible(); private: @@ -5636,6 +5637,33 @@ void tst_QVariant::constructFromIncompatibleMetaType() QVERIFY(!QVariant(regular).convert(type)); } +void tst_QVariant::constructFromQtLT65MetaType() +{ + auto qsizeIface = QtPrivate::qMetaTypeInterfaceForType<QSize>(); + + QtPrivate::QMetaTypeInterface qsize64Iface = { + /*revision*/0, + 8, + 8, + QMetaType::NeedsConstruction | QMetaType::NeedsDestruction, + 0, + qsizeIface->metaObjectFn, + "FakeQSize", + qsizeIface->defaultCtr, + qsizeIface->copyCtr, + qsizeIface->moveCtr, + /*dtor =*/ nullptr, + qsizeIface->equals, + qsizeIface->lessThan, + qsizeIface->debugStream, + qsizeIface->dataStreamOut, + qsizeIface->dataStreamIn, + /*legacyregop =*/ nullptr + }; + QVariant var{ QMetaType(&qsize64Iface) }; + QVERIFY(var.isValid()); +} + void tst_QVariant::copyNonDefaultConstructible() { NonDefaultConstructible ndc(42); -- 2.40.0

1 0

commit qwt6 for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qwt6 for openSUSE:Factory checked in at 2023-04-29 17:28:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt6 (Old) and /work/SRC/openSUSE:Factory/.qwt6.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qwt6" Sat Apr 29 17:28:08 2023 rev:17 rq:1083627 version:6.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qwt6/qwt6.changes 2021-07-28 19:20:20.691611522 +0200 +++ /work/SRC/openSUSE:Factory/.qwt6.new.1533/qwt6.changes 2023-04-29 17:28:20.566592965 +0200 @@ -1,0 +2,11 @@ +Fri Apr 28 11:07:33 UTC 2023 - Luigi Baldoni <aloisio(a)gmx.com> + +- Fixes boo#1210931 +- Add _multibuild to support Qt6 +- Add qwt-6.2.0-qt6-pkgconfig.patch and + qwt-6.2.0-qt6-libsuffix.patch (courtesy of Fedora) + and qwt6-rpmlintrc +- Man pages are now installed in the flavored doc dir as per + upstream default + +------------------------------------------------------------------- New: ---- _multibuild qwt-6.2.0-qt6-libsuffix.patch qwt-6.2.0-qt6-pkgconfig.patch qwt6-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt6.spec ++++++ --- /var/tmp/diff_new_pack.bmDFIF/_old 2023-04-29 17:28:21.062595042 +0200 +++ /var/tmp/diff_new_pack.bmDFIF/_new 2023-04-29 17:28:21.070595075 +0200 @@ -1,7 +1,7 @@ # # spec file for package qwt6 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,106 +16,141 @@ # +%global qwt6_flavor @BUILD_FLAVOR@%{nil} +%if "%{qwt6_flavor}" == "" +ExclusiveArch: do_not_build +%endif +%if "%{qwt6_flavor}" == "qt6" +%define qt6 1 +%define pkg_suffix -qt6 +%define qt_descr Qt6 +%endif +%if "%{qwt6_flavor}" == "qt5" +%define qt5 1 +%define pkg_suffix -qt5 +%define qt_descr Qt5 +%endif + %define sover 6_2 -Name: qwt6 +%define mver 6 +Name: qwt6%{?pkg_suffix} Version: 6.2.0 Release: 0 -Summary: Qt5 Widgets for Technical Applications +Summary: %{qt_descr} Widgets for Technical Applications License: SUSE-QWT-1.0 Group: Development/Libraries/C and C++ URL: https://qwt.sourceforge.io Source: https://sourceforge.net/projects/qwt/files/qwt/%{version}/qwt-%{version}.ta… +Source99: qwt6-rpmlintrc # PATCH-FIX-OPENSUSE to prevent 'ERROR: RPATH "/usr/local/qwt-6.1.0/lib" on # /usr/lib(64)/qt(4,5)/plugins/designer/libqwt_designer_plugin.so is not allowed'. Patch0: qwt-6.1.3-rpath.patch # PATCH-FIX-OPENSUSE mkspecs.patch -- Use established settings for the .pc files Patch2: qwt-6.1.4-mkspecs.patch +# PATCH-FIX-OPENSUSE qwt-6.2.0-qt6-pkgconfig.patch -- require correct libraries in Qt6 pkgconfig +Patch3: qwt-6.2.0-qt6-pkgconfig.patch +# +# PATCH-FIX-OPENSUSE qwt-6.2.0-qt6-libsuffix.patch -- change SONAMEs to avoid conflicts +Patch4: qwt-6.2.0-qt6-libsuffix.patch BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig +%if 0%{?qt5} BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Designer) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5Svg) +%endif +%if 0%{?qt6} +BuildRequires: pkgconfig(Qt6Concurrent) +BuildRequires: pkgconfig(Qt6Designer) +BuildRequires: pkgconfig(Qt6OpenGL) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6Svg) +%endif BuildRequires: pkgconfig(libpng) %description -The Qwt(Qt5) library contains GUI Components and utility classes which are +The Qwt(%{qt_descr}) library contains GUI Components and utility classes which are primarily useful for programs with a technical background. Beside a 2D plot widget it provides scales, sliders, dials, compasses, thermometers, wheels and knobs to control or display values, arrays, or ranges of type double. -%package -n libqwt%{sover} -Summary: Shared library for Qt5 Widgets for Technical Applications +%package -n libqwt%{mver}-%{qwt6_flavor}-%{sover} +Summary: Shared library for %{qt_descr} Widgets for Technical Applications Group: System/Libraries -Provides: lib%{name}-qt5-%{sover} = %{version} -Obsoletes: lib%{name}-qt5-%{sover} < %{version} -%description -n libqwt%{sover} +%description -n libqwt%{mver}-%{qwt6_flavor}-%{sover} This package contains the shared library to run Technical Applications developed with/for Qwt(Qt5). %package devel Summary: Include headers and Qt Designer plugin for Qwt(Qt5) Group: Development/Libraries/C and C++ -Requires: libqwt%{sover} = %{version} +Requires: libqwt%{mver}-%{qwt6_flavor}-%{sover} = %{version} Requires: freetype2-devel Requires: gcc-c++ +%if 0%{?qt5} Requires: pkgconfig(Qt5Concurrent) Requires: pkgconfig(Qt5OpenGL) Requires: pkgconfig(Qt5PrintSupport) Requires: pkgconfig(Qt5Svg) Requires: pkgconfig(Qt5Widgets) +%endif +%if 0%{?qt6} +Requires: pkgconfig(Qt6Concurrent) +Requires: pkgconfig(Qt6OpenGL) +Requires: pkgconfig(Qt6PrintSupport) +Requires: pkgconfig(Qt6Svg) +Requires: pkgconfig(Qt6Widgets) +%endif Requires: pkgconfig(libpng) Recommends: %{name}-designer Recommends: %{name}-devel-doc Recommends: %{name}-examples +%if 0%{?qt5} Conflicts: otherproviders(qwt-qt5-devel) Conflicts: qwt-devel Provides: qwt-qt5-devel = %{version} -Obsoletes: qwt6-qt5-devel < %{version} -Provides: qwt6-qt5-devel = %{version} +%endif %description devel This package contains the header files of Qwt and its Qt designer plugin -in order to create Qt applications using the Qwt(Qt5) widgets. +in order to create Qt applications using the Qwt(%{qt_descr}) widgets. %package examples -Summary: Example programs using Qwt(Qt5) +Summary: Example programs using Qwt(%{qt_descr}) License: SUSE-QWT-1.0 or BSD-3-Clause Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Provides: %{name}-qt5-examples = %{version} -Obsoletes: %{name}-qt5-examples < %{version} %description examples -This package contains example programs demonstrating the Qwt(Qt5) widgets. +This package contains example programs demonstrating the Qwt(%{qt_descr}) widgets. %package designer -Summary: Plugin for the Qt5 Interface designer +Summary: Plugin for the %{qt_descr} Interface designer Group: Development/Tools/GUI Builders Requires: %{name}-devel = %{version} +%if 0%{?qt5} Conflicts: otherproviders(qwt-qt5-designer) Provides: qwt-qt5-designer = %{version} -Provides: %{name}-qt5-designer = %{version} -Obsoletes: %{name}-qt5-designer < %{version} +%endif %description designer The %{name}-designer package contains the plugin for the Qt5 User Interface designer tool. %package devel-doc -Summary: Development documentation for Qwt(Qt5) +Summary: Development documentation for Qwt(%{qt_descr}) Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Provides: %{name}-qt5-devel-doc = %{version} -Obsoletes: %{name}-qt5-devel-doc < %{version} +BuildArch: noarch %description devel-doc -This package contains the development documentation of the Qwt(Qt5) widgets +This package contains the development documentation of the Qwt(%{qt_descr}) widgets as is it created by doxygen. %prep @@ -124,57 +159,101 @@ %build mkdir build pushd build +%if 0%{?qt5} %qmake5 .. +%endif +%if 0%{?qt6} +%qmake6 .. +%endif %make_jobs popd %install pushd build +%if 0%{?qt5} %qmake5_install +%endif +%if 0%{?qt6} +%qmake6_install +%endif popd # nothing references this -rm -f "%{buildroot}/%{_libqt5_libdir}/libqwt.so.6" +%if 0%{?qt5} +rm -f "%{buildroot}/%{_libqt5_libdir}/libqwt-%{qwt6_flavor}.so.6" +%endif +%if 0%{?qt6} +rm -f "%{buildroot}/%{_qt6_libdir}/libqwt-%{qwt6_flavor}.so.6" +%endif # Qwt base examples +%if 0%{?qt5} mkdir -p %{buildroot}%{%_libqt5_docdir}/qwt6 mkdir -p %{buildroot}%{_libqt5_examplesdir}/qwt6 cp -r examples %{buildroot}%{_libqt5_docdir}/qwt6/examples cp -r build/examples/bin %{buildroot}%{_libqt5_examplesdir}/qwt6 - -mkdir -p %{buildroot}%{_mandir} -mv %{buildroot}%{_libqt5_docdir}/qwt6/man/man3 \ - %{buildroot}%{_mandir}/ +%endif +%if 0%{?qt6} +mkdir -p %{buildroot}%{%_qt6_docdir}/qwt6 +mkdir -p %{buildroot}%{_qt6_examplesdir}/qwt6 +cp -r examples %{buildroot}%{_qt6_docdir}/qwt6/examples +cp -r build/examples/bin %{buildroot}%{_qt6_examplesdir}/qwt6 +%endif %fdupes %{buildroot}%{_prefix} -%post -n libqwt%{sover} -p /sbin/ldconfig -%postun -n libqwt%{sover} -p /sbin/ldconfig +%post -n libqwt%{mver}-%{qwt6_flavor}-%{sover} -p /sbin/ldconfig +%postun -n libqwt%{mver}-%{qwt6_flavor}-%{sover} -p /sbin/ldconfig -%files -n libqwt%{sover} -%if 0%{?sle_version} != 120200 +%files -n libqwt%{mver}-%{qwt6_flavor}-%{sover} %license COPYING -%else -%doc COPYING +%if 0%{?qt5} +%{_libqt5_libdir}/libqwt-%{qwt6_flavor}.so.6.2* +%endif +%if 0%{?qt6} +%{_qt6_libdir}/libqwt-%{qwt6_flavor}.so.6.2* %endif -%{_libqt5_libdir}/libqwt.so.6.2* %files designer +%if 0%{?qt5} %dir %{_libqt5_plugindir}/designer/ %{_libqt5_plugindir}/designer/*.so +%endif +%if 0%{?qt6} +%dir %{_qt6_pluginsdir}/designer/ +%{_qt6_pluginsdir}/designer/*.so +%endif %files devel %doc README -%{_libqt5_libdir}/libqwt.so +%if 0%{?qt5} +%{_libqt5_libdir}/libqwt-%{qwt6_flavor}.so %{_libqt5_libdir}/pkgconfig/Qt5Qwt6.pc %{_libqt5_archdatadir}/mkspecs/features/ %dir %{_libqt5_includedir}/qwt6 %{_libqt5_includedir}/qwt6/* -%{_mandir}/man?/*.3%{ext_info} +%endif +%if 0%{?qt6} +%{_qt6_libdir}/libqwt-%{qwt6_flavor}.so +%{_qt6_libdir}/pkgconfig/%{qt_descr}Qwt6.pc +%{_qt6_archdatadir}/mkspecs/features/ +%dir %{_qt6_includedir}/qwt6 +%{_qt6_includedir}/qwt6/* +%endif %files examples +%if 0%{?qt5} %{_libqt5_examplesdir}/ +%endif +%if 0%{?qt6} +%{_qt6_examplesdir}/ +%endif %files devel-doc +%if 0%{?qt5} %doc %{_libqt5_docdir}/ +%endif +%if 0%{?qt6} +%doc %{_qt6_docdir}/ +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <flavor>qt5</flavor> <flavor>qt6</flavor> </multibuild> ++++++ qwt-6.2.0-qt6-libsuffix.patch ++++++ diff -rupN --no-dereference qwt-6.2.0/qwtfunctions.pri qwt-6.2.0-new/qwtfunctions.pri --- qwt-6.2.0/qwtfunctions.pri 2021-07-18 13:19:33.644367625 +0200 +++ qwt-6.2.0-new/qwtfunctions.pri 2022-11-29 15:38:14.943070118 +0100 @@ -12,7 +12,12 @@ defineReplace(qwtLibraryTarget) { unset(LIBRARY_NAME) + + greaterThan(QT_MAJOR_VERSION, 4) { + LIBRARY_NAME = $${1}-qt$${QT_MAJOR_VERSION} + } else { LIBRARY_NAME = $$1 + } mac:contains(QWT_CONFIG, QwtFramework) { @@ -36,7 +41,11 @@ defineReplace(qwtLibraryTarget) { defineTest(qwtAddLibrary) { LIB_PATH = $$1 + greaterThan(QT_MAJOR_VERSION, 4) { + LIB_NAME = $${2}-qt$${QT_MAJOR_VERSION} + } else { LIB_NAME = $$2 + } mac:contains(QWT_CONFIG, QwtFramework) { diff -rupN qwt-6.2.0/src/src.pro qwt-6.2.0-new/src/src.pro --- qwt-6.2.0/src/src.pro 2022-11-29 15:38:15.365070601 +0100 +++ qwt-6.2.0-new/src/src.pro 2022-11-29 15:45:42.295600411 +0100 @@ -31,7 +31,11 @@ contains(QWT_CONFIG, QwtDll) { # we increase the SONAME for every minor number - QWT_SONAME=libqwt.so.$${VER_MAJ}.$${VER_MIN} + greaterThan(QT_MAJOR_VERSION, 4) { + QWT_SONAME=libqwt-qt$${QT_MAJOR_VERSION}.so.$${VER_MAJ}.$${VER_MIN} + } else { + QWT_SONAME=libqwt.so.$${VER_MAJ}.$${VER_MIN} + } QMAKE_LFLAGS *= $${QMAKE_LFLAGS_SONAME}$${QWT_SONAME} QMAKE_LFLAGS_SONAME= } ++++++ qwt-6.2.0-qt6-pkgconfig.patch ++++++ Index: qwt-6.2.0/src/src.pro =================================================================== --- qwt-6.2.0.orig/src/src.pro +++ qwt-6.2.0/src/src.pro @@ -82,14 +82,14 @@ contains(QWT_CONFIG, QwtPkgConfig) { greaterThan(QT_MAJOR_VERSION, 4) { QMAKE_PKGCONFIG_FILE = Qt$${QT_MAJOR_VERSION}$${QMAKE_PKGCONFIG_NAME} - QMAKE_PKGCONFIG_REQUIRES = Qt5Widgets Qt5Concurrent Qt5PrintSupport + QMAKE_PKGCONFIG_REQUIRES = Qt$${QT_MAJOR_VERSION}Widgets Qt$${QT_MAJOR_VERSION}Concurrent Qt$${QT_MAJOR_VERSION}PrintSupport contains(QWT_CONFIG, QwtSvg) { - QMAKE_PKGCONFIG_REQUIRES += Qt5Svg + QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}Svg } contains(QWT_CONFIG, QwtOpenGL) { - QMAKE_PKGCONFIG_REQUIRES += Qt5OpenGL + QMAKE_PKGCONFIG_REQUIRES += Qt$${QT_MAJOR_VERSION}OpenGL } QMAKE_DISTCLEAN += $${DESTDIR}/$${QMAKE_PKGCONFIG_DESTDIR}/$${QMAKE_PKGCONFIG_FILE}.pc Index: qwt-6.2.0/qwt.prf =================================================================== --- qwt-6.2.0.orig/qwt.prf +++ qwt-6.2.0/qwt.prf @@ -44,4 +44,9 @@ else { } # QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS} -qwtAddLibrary($${QWT_INSTALL_LIBS}, qwt) +greaterThan(QT_MAJOR_VERSION,5) { + qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt6) +} +else { + qwtAddLibrary($${QWT_OUT_ROOT}/lib,qwt-qt5) +} ++++++ qwt6-rpmlintrc ++++++ # Silence complaint on Leap addFilter("shlib-policy-name-error")

1 0

commit python-scikit-build for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-scikit-build for openSUSE:Factory checked in at 2023-04-29 17:28:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-scikit-build (Old) and /work/SRC/openSUSE:Factory/.python-scikit-build.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-scikit-build" Sat Apr 29 17:28:05 2023 rev:16 rq:1083333 version:0.17.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-scikit-build/python-scikit-build.changes 2023-04-03 21:49:23.680871364 +0200 +++ /work/SRC/openSUSE:Factory/.python-scikit-build.new.1533/python-scikit-build.changes 2023-04-29 17:28:17.758581208 +0200 @@ -1,0 +2,58 @@ +Tue Apr 25 17:07:11 UTC 2023 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.17.2 + ## Bug fixes + * Validate value before returning library path by @dlech in #942. + * Only add Python_LIBRARY on Windows MSVC in #943 and #944. + * Slightly nicer traceback for failed compiler in 947. + ## Testing + * Hide a few warnings that are expected in #494. +- Release 0.17.1 + * This is a small release fixing a few bugs; the primary one + being a change that was triggering a bug in older FindPython. + The unused variable messages have been deactivated to simplify + output, as well. + * Older (<3.24) CMake breaks when lib specified in #932 + * An error output was missing formatting in #931 + * Make empty CMAKE_OSX_DEPLOYMENT_TARGET a warning (bug in + conda-forge's clang activation fixed upstream) in #934 + * Remove unused variable warnings by in #930 +- Release 0.17.0 + * A lot of bug fixes are present in this release, focusing on + Windows, PyPy, and cross compiling. We've also improved the + compatibility with default setuptools behaviors a little, and + enabled some things that were previously unavailable, like + overriding the build type via the cmake argument environment + variables. We've expanded our CI matrix to include Windows and + macOS PyPy and some Fortran tests on Linux. This release + requires Python 3.7+. + ## Bug fixes + * Match setuptools behavior for include_package_data default by + @vyasr in #873. + * Misc. fixes for F2PY and PythonExtensions modules by @benbovy + in #495. + * Provide more useful error if user provides CMAKE_INSTALL_PREFIX + by @vyasr in #872. + * Stop assuming that .pyx files are in the same directory as + CMakeLists.txt by @vyasr in #871. + * Allow build type overriding in #902. + * Include library for FindPython for better Windows + cross-compiles in #913. Thanks to @maxbachmann for testing. + * Fix logic for default generator when cross-compiling for ARM on + Windows by @dlech in #917. + * Use f2py's get_include if present in #877. + * Fix support for cross-compilation exception using + targetLinkLibrariesWithDynamicLookup by @erykoff in #901. + * Treat empty MACOSX_DEPLOYMENT_TARGET as if it was unset in + #918. + ## Testing + * Add hello fortran sample package + tests by @benbovy in #493. + * Add sdist check & fix in #906. + * Fix some setuptools types in #888. + ## Miscellaneous + * Drop Python 3.6 in #862. + * Move building backend to hatchling in #870. + * Avoid mutating function input parameters in #899. + * Use _compat/typing name in #869. + +------------------------------------------------------------------- Old: ---- scikit-build-0.16.7.tar.gz New: ---- scikit_build-0.17.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-scikit-build.spec ++++++ --- /var/tmp/diff_new_pack.f23Yv2/_old 2023-04-29 17:28:18.366583754 +0200 +++ /var/tmp/diff_new_pack.f23Yv2/_new 2023-04-29 17:28:18.370583771 +0200 @@ -26,24 +26,19 @@ %endif Name: python-scikit-build%{psuffix} -Version: 0.16.7 +Version: 0.17.2 Release: 0 Summary: Improved build system generator for Python C/C++/Fortran/Cython extensions License: MIT URL: https://github.com/scikit-build/scikit-build -Source: https://files.pythonhosted.org/packages/source/s/scikit-build/scikit-build-… +Source: https://files.pythonhosted.org/packages/source/s/scikit-build/scikit_build-… Source99: sample-setup.cfg -BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module devel >= 3.7} +BuildRequires: %{python_module hatch-fancy-pypi-readme} +BuildRequires: %{python_module hatch-vcs} +BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 42.0.0} -BuildRequires: %{python_module wheel} -%if !%{with test} -# https://github.com/scikit-build/scikit-build/issues/689 -BuildRequires: %{python_module setuptools_scm} -%if 0%{?suse_version} < 1550 -BuildRequires: %{python_module toml} -%endif -%endif BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: cmake @@ -51,13 +46,17 @@ Requires: python-packaging Requires: python-setuptools >= 42.0.0 Requires: python-wheel >= 0.32.0 -%if %python_version_nodots < 38 +%if %{python_version_nodots} < 38 Requires: python-typing-extensions >= 3.7 %endif +%if %{python_version_nodots} < 311 +Requires: python-tomli +%endif %if %{with test} # Note: When tests fail try `osc build ---clean` in order to get rid of remnant numpy typing stubs in $HOME BuildRequires: %{python_module Cython >= 0.25.1} BuildRequires: %{python_module build >= 0.7} +BuildRequires: %{python_module importlib-metadata if %python-base < 3.8} BuildRequires: %{python_module pytest >= 6.0.0} BuildRequires: %{python_module pytest-mock >= 1.10.4} BuildRequires: %{python_module pytest-virtualenv >= 1.2.5} @@ -76,7 +75,7 @@ Improved build system generator for Python C/C++/Fortran/Cython extensions %prep -%autosetup -p1 -n scikit-build-%{version} +%autosetup -p1 -n scikit_build-%{version} %if %{with test} # some tests call setup.py develop|install|test, which by default write to /usr # This is not allowed in OBS @@ -88,9 +87,6 @@ cp %{S:99} tests/samples/issue-274-support-one-package-without-package-dir/setup.cfg cp %{S:99} tests/samples/issue-334-configure-cmakelist-non-cp1252-encoding/setup.cfg %endif -# remove toml entries not relevant for us and failing old py3.6 pip in 15.X -sed -i '/tool.pylint/,/^$/ d' pyproject.toml -sed -i '/tool.ruff/,/^$/ d' pyproject.toml %if !%{with test} %build @@ -105,12 +101,14 @@ %check # these tests need a wheelhouse with downloaded wheels including platform dependent cmake donttestmarker="isolated" +# setuptools_scm is a dependency of hatch_vcs +donttestmarker+=" or nosetuptoolsscm" %pytest -m "not ($donttestmarker)" %endif %if !%{with test} %files %{python_files} -%doc AUTHORS.rst README.rst CONTRIBUTING.rst HISTORY.rst docs/ +%doc AUTHORS.rst README.rst CONTRIBUTING.rst docs/ %license LICENSE %{python_sitelib}/skbuild %{python_sitelib}/scikit_build-%{version}.dist-info

1 0

commit python-slycot for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-slycot for openSUSE:Factory checked in at 2023-04-29 17:28:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-slycot (Old) and /work/SRC/openSUSE:Factory/.python-slycot.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-slycot" Sat Apr 29 17:28:04 2023 rev:18 rq:1083332 version:0.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-slycot/python-slycot.changes 2022-12-21 16:07:18.918772821 +0100 +++ /work/SRC/openSUSE:Factory/.python-slycot.new.1533/python-slycot.changes 2023-04-29 17:28:16.494575916 +0200 @@ -1,0 +2,7 @@ +Thu Apr 27 19:50:47 UTC 2023 - Ben Greiner <code(a)bnavigator.de> + +- Update to 0.5.4 + * Don't include package data by @bnavigator in #194 + * Update SLICOT to 5.8 Update 1 by @bnavigator in #195 + +------------------------------------------------------------------- Old: ---- slycot-0.5.3.tar.gz New: ---- slycot-0.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-slycot.spec ++++++ --- /var/tmp/diff_new_pack.gNDggX/_old 2023-04-29 17:28:17.038578194 +0200 +++ /var/tmp/diff_new_pack.gNDggX/_new 2023-04-29 17:28:17.042578211 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-slycot # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-slycot -Version: 0.5.3 +Version: 0.5.4 Release: 0 Summary: A wrapper for the SLICOT control and systems library License: BSD-3-Clause AND GPL-2.0-only ++++++ slycot-0.5.3.tar.gz -> slycot-0.5.4.tar.gz ++++++ ++++ 3376 lines of diff (skipped)

1 0

commit spyder for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spyder for openSUSE:Factory checked in at 2023-04-29 17:28:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spyder (Old) and /work/SRC/openSUSE:Factory/.spyder.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spyder" Sat Apr 29 17:28:02 2023 rev:46 rq:1083328 version:5.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/spyder/spyder.changes 2023-01-20 17:38:52.256584525 +0100 +++ /work/SRC/openSUSE:Factory/.spyder.new.1533/spyder.changes 2023-04-29 17:28:15.494571729 +0200 @@ -1,0 +2,29 @@ +Thu Apr 27 15:32:42 UTC 2023 - Ben Greiner <code(a)bnavigator.de> + +- Update to 5.4.3 + ## New features + * Add support for QDarkstyle 3.1 + * Add support for Jupyter-client 8 + * Add mambaforge and miniforge when searching for conda + environments + ## Important fixes + * Fix IPython Console completions, traceback handling and other + issues to better support IPython 8.x + * Fix compatibility issues with PyZMQ 25.x + * Add warning message before loading spydata files + * Fix web based widgets display by adding the --no-sandbox + argument for QtApplication + * Fix copy and paste shortcuts for the Files and Projects + explorer panes + * Fix Editor issues related with handling LSP server failed + starts + * Fix Editor issues related with restoring previous session and + file changes outside Spyder + * Fix PYTHONPATH manager showing extra paths and other related + errors + * Fix update available notification with pip based installations + * Fix some UX/UI issues for the find replace widget when the + Editor has a small width + * Removal of Python 2 related code + +------------------------------------------------------------------- Old: ---- spyder-5.4.2.tar.gz New: ---- spyder-5.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spyder.spec ++++++ --- /var/tmp/diff_new_pack.9LN0wd/_old 2023-04-29 17:28:16.290575062 +0200 +++ /var/tmp/diff_new_pack.9LN0wd/_new 2023-04-29 17:28:16.294575079 +0200 @@ -21,7 +21,7 @@ # your live system before submitting an update. %bcond_with test Name: spyder -Version: 5.4.2 +Version: 5.4.3 Release: 0 Summary: The Scientific Python Development Environment License: MIT @@ -31,6 +31,7 @@ Source1: spyder-rpmlintrc BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python3-base >= 3.7 BuildRequires: python3-pip BuildRequires: python3-setuptools >= 49.6.0 BuildRequires: python3-wheel @@ -49,7 +50,8 @@ Requires: python3-diff-match-patch >= 20181111 Requires: python3-flake8 >= 3.8.0 Requires: python3-intervaltree -Requires: python3-ipython >= 7.31.1 +Requires: (python3-ipython >= 7.31.1 with python3-ipython < 9) +Conflicts: (python3-ipython >= 8.8 with python3-ipython < 8.10.1) Requires: python3-jedi >= 0.17.2 Requires: python3-jellyfish >= 0.7 Requires: python3-jsonschema >= 3.2.0 @@ -79,11 +81,11 @@ Requires: python3-watchdog Requires: python3-whatthepatch Requires: python3-yapf -Requires: (python3-QDarkStyle >= 3.0.2 with python3-QDarkStyle < 3.1.0) +Requires: (python3-QDarkStyle >= 3.0.2 with python3-QDarkStyle < 3.2.0) Requires: (python3-pylint >= 2.5.0 with python3-pylint < 3) -Requires: (python3-python-lsp-server >= 1.7.1 with python3-python-lsp-server < 1.8) -Requires: (python3-qtconsole >= 5.4.0 with python3-qtconsole < 5.5.0) -Requires: (python3-spyder-kernels >= 2.4.2 with python3-spyder-kernels < 2.5) +Requires: (python3-python-lsp-server >= 1.7.2 with python3-python-lsp-server < 1.8) +Requires: (python3-qtconsole >= 5.4.2 with python3-qtconsole < 5.5.0) +Requires: (python3-spyder-kernels >= 2.4.3 with python3-spyder-kernels < 2.5) Recommends: %{name}-dicom Recommends: %{name}-hdf5 Recommends: python3-Cython >= 0.21 @@ -129,7 +131,6 @@ BuildRequires: python3-flake8 >= 3.8.0 BuildRequires: python3-flaky BuildRequires: python3-intervaltree -BuildRequires: python3-ipython >= 7.31.1 BuildRequires: python3-jedi >= 0.17.2 BuildRequires: python3-jellyfish >= 0.7 BuildRequires: python3-jsonschema >= 3.2.0 @@ -174,11 +175,13 @@ BuildRequires: python3-yapf BuildRequires: xdpyinfo BuildRequires: xvfb-run -BuildRequires: (python3-QDarkStyle >= 3.0.2 with python3-QDarkStyle < 3.1.0) +BuildRequires: (python3-QDarkStyle >= 3.0.2 with python3-QDarkStyle < 3.2.0) +BuildRequires: (python3-ipython >= 7.31.1 with python3-ipython < 9) +BuildConflicts: (python3-ipython >= 8.8 with python3-ipython < 8.10.1) BuildRequires: (python3-pylint >= 2.5.0 with python3-pylint < 3) -BuildRequires: (python3-python-lsp-server >= 1.7.1 with python3-python-lsp-server < 1.8) -BuildRequires: (python3-qtconsole >= 5.4 with python3-qtconsole < 5.5) -BuildRequires: (python3-spyder-kernels >= 2.4.2 with python3-spyder-kernels < 2.5) +BuildRequires: (python3-python-lsp-server >= 1.7.2 with python3-python-lsp-server < 1.8) +BuildRequires: (python3-qtconsole >= 5.4.2 with python3-qtconsole < 5.5) +BuildRequires: (python3-spyder-kernels >= 2.4.3 with python3-spyder-kernels < 2.5) # /SECTION %description @@ -223,19 +226,6 @@ This package contains the plugin that allows Spyder to read and write HDF5 files. -%package doc -Summary: Documentation for the Spyder IDE -Group: Development/Languages/Python -Recommends: %{name} = %{version} -Provides: spyder3-doc = %{version} -Obsoletes: spyder3-doc < %{version} - -%description doc -Spyder, the Scientific Python Development Environment, is an -IDE for researchers, engineers and data analysts. - -Documentation and help files for Spyder and its plugins. - %package lang # expansion of lang_package because the macro does not handle the rename Summary: Translations for package %{name} @@ -324,10 +314,6 @@ # requires internet connection donttest+=" or test_github_backend" -%if 0%{?suse_version} == 1500 -# fails on Leap -donttest+=" or (test_objectexplorer_collection_types and params0)" -%endif # different PyQT version? donttest+=" or (test_objectexplorer_collection_types and params5)" # qtbot timeouts or too slow in OBS ++++++ spyder-5.4.2.tar.gz -> spyder-5.4.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/spyder/spyder-5.4.2.tar.gz /work/SRC/openSUSE:Factory/.spyder.new.1533/spyder-5.4.3.tar.gz differ: char 22, line 1

1 0

commit python-spyder-kernels for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-spyder-kernels for openSUSE:Factory checked in at 2023-04-29 17:28:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-spyder-kernels (Old) and /work/SRC/openSUSE:Factory/.python-spyder-kernels.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-spyder-kernels" Sat Apr 29 17:28:01 2023 rev:41 rq:1083327 version:2.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-spyder-kernels/python-spyder-kernels.changes 2023-03-21 17:40:16.517470758 +0100 +++ /work/SRC/openSUSE:Factory/.python-spyder-kernels.new.1533/python-spyder-kernels.changes 2023-04-29 17:28:11.246553943 +0200 @@ -1,0 +2,16 @@ +Thu Apr 27 15:25:00 UTC 2023 - Ben Greiner <code(a)bnavigator.de> + +- Update to 2.4.3 + * PR 452 - PR: Fix error when executing empty Python script, by + @rear1019 + * PR 450 - PR: Remove usage of distutils.LooseVersion, by + @ccordoba12 (440) + * PR 449 - PR: Add support for Jupyter-client 8, by @ccordoba12 + * PR 448 - PR: Skip IPython versions that give buggy code + completions, by @ccordoba12 + * PR 434 - PR: Use allow_pickle=True when loading Numpy arrays, + by @nkleinbaer + * PR 430 - PR: Inform GUI about position of exception in post + mortem debugging, by @rear1019 + +------------------------------------------------------------------- Old: ---- spyder-kernels-2.4.2-gh.tar.gz New: ---- spyder-kernels-2.4.3-gh.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-spyder-kernels.spec ++++++ --- /var/tmp/diff_new_pack.J28TKf/_old 2023-04-29 17:28:14.762568664 +0200 +++ /var/tmp/diff_new_pack.J28TKf/_new 2023-04-29 17:28:14.814568882 +0200 @@ -19,7 +19,7 @@ # flaky for obs, only test locally %bcond_with dasktest Name: python-spyder-kernels -Version: 2.4.2 +Version: 2.4.3 Release: 0 Summary: Jupyter kernels for Spyder's console License: MIT @@ -38,8 +38,9 @@ BuildRequires: %{python_module cloudpickle} BuildRequires: %{python_module flaky} BuildRequires: %{python_module ipykernel >= 6.16.1 with %python-ipykernel < 7} +BuildRequires: %{python_module jupyter_client >= 7.4.9 with %python-jupyter_client < 9} +BuildConflicts: %{python_module jupyter_client >= 8.8 with %python-jupyter_client < 8.10.1} BuildRequires: %{python_module ipython >= 7.31.1 with %python-ipython < 9} -BuildRequires: %{python_module jupyter_client >= 7.4.9 with %python-jupyter_client < 8} BuildRequires: %{python_module matplotlib} BuildRequires: %{python_module numpy} BuildRequires: %{python_module pandas} @@ -57,7 +58,8 @@ Requires: python-wurlitzer >= 1.0.3 Requires: (python-ipykernel >= 6.16.1 with python-ipykernel < 7) Requires: (python-ipython >= 7.31.1 with python-ipython < 9) -Requires: (python-jupyter_client >= 7.4.9 with python-jupyter_client < 8) +Conflicts: (python-ipython >= 8.8.0 with python-ipython < 8.10.1) +Requires: (python-jupyter_client >= 7.4.9 with python-jupyter_client < 9) BuildArch: noarch %python_subpackages @@ -86,9 +88,7 @@ %if ! %{with dasktest} donttest=("-k" "not test_dask_multiprocessing") %endif -# no xarray for python38 -python38_ignore="--ignore spyder_kernels/utils/tests/test_nsview.py" -%pytest "${donttest[@]}" ${$python_ignore} +%pytest "${donttest[@]}" %files %{python_files} %doc CHANGELOG.md README.md ++++++ spyder-kernels-2.4.2-gh.tar.gz -> spyder-kernels-2.4.3-gh.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/CHANGELOG.md new/spyder-kernels-2.4.3/CHANGELOG.md --- old/spyder-kernels-2.4.2/CHANGELOG.md 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/CHANGELOG.md 2023-04-02 20:29:23.000000000 +0200 @@ -1,5 +1,29 @@ # History of changes +## Version 2.4.3 (2023-04-02) + +### Issues Closed + +* [Issue 440](https://github.com/spyder-ide/spyder-kernels/issues/440) - distutils and LooseVersion deprecation ([PR 450](https://github.com/spyder-ide/spyder-kernels/pull/450) by [@ccordoba12](https://github.com/ccordoba12)) + +In this release 1 issue was closed. + +### Pull Requests Merged + +* [PR 452](https://github.com/spyder-ide/spyder-kernels/pull/452) - PR: Fix error when executing empty Python script, by [@rear1019](https://github.com/rear1019) +* [PR 450](https://github.com/spyder-ide/spyder-kernels/pull/450) - PR: Remove usage of `distutils.LooseVersion`, by [@ccordoba12](https://github.com/ccordoba12) ([440](https://github.com/spyder-ide/spyder-kernels/issues/440)) +* [PR 449](https://github.com/spyder-ide/spyder-kernels/pull/449) - PR: Add support for Jupyter-client 8, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 448](https://github.com/spyder-ide/spyder-kernels/pull/448) - PR: Skip IPython versions that give buggy code completions, by [@ccordoba12](https://github.com/ccordoba12) +* [PR 442](https://github.com/spyder-ide/spyder-kernels/pull/442) - PR: Add FreeBSD to `test_user_sitepackages_in_pathlist`, by [@rhurlin](https://github.com/rhurlin) +* [PR 434](https://github.com/spyder-ide/spyder-kernels/pull/434) - PR: Use `allow_pickle=True` when loading Numpy arrays, by [@nkleinbaer](https://github.com/nkleinbaer) +* [PR 430](https://github.com/spyder-ide/spyder-kernels/pull/430) - PR: Inform GUI about position of exception in post mortem debugging, by [@rear1019](https://github.com/rear1019) + +In this release 7 pull requests were closed. + + +---- + + ## Version 2.4.2 (2023-01-17) ### Issues Closed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/requirements/posix.txt new/spyder-kernels-2.4.3/requirements/posix.txt --- old/spyder-kernels-2.4.2/requirements/posix.txt 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/requirements/posix.txt 2023-04-02 20:29:23.000000000 +0200 @@ -1,6 +1,6 @@ cloudpickle ipykernel>=6.16.1,<7 ipython>=7.31.1,<9 -jupyter_client>=7.4.9,<8 +jupyter_client>=7.4.9,<9 pyzmq>=22.1.0 wurlitzer>=1.0.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/requirements/python-27.txt new/spyder-kernels-2.4.3/requirements/python-27.txt --- old/spyder-kernels-2.4.2/requirements/python-27.txt 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/requirements/python-27.txt 2023-04-02 20:29:23.000000000 +0200 @@ -1,7 +1,7 @@ decorator<5 backports.functools_lru_cache cloudpickle -ipykernel<5 +ipykernel>=4.5,<5 jupyter_client>=5.3.4,<6 pyzmq>=17,<20 wurlitzer>=1.0.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/requirements/windows.txt new/spyder-kernels-2.4.3/requirements/windows.txt --- old/spyder-kernels-2.4.2/requirements/windows.txt 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/requirements/windows.txt 2023-04-02 20:29:23.000000000 +0200 @@ -1,5 +1,5 @@ cloudpickle ipykernel>=6.16.1,<7 ipython>=7.31.1,<9 -jupyter_client>=7.4.9,<8 +jupyter_client>=7.4.9,<9 pyzmq>=22.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/setup.py new/spyder-kernels-2.4.3/setup.py --- old/spyder-kernels-2.4.2/setup.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/setup.py 2023-04-02 20:29:23.000000000 +0200 @@ -39,12 +39,12 @@ 'decorator<5; python_version<"3"', 'backports.functools-lru-cache; python_version<"3"', 'cloudpickle', - 'ipykernel<5; python_version<"3"', + 'ipykernel>=4.5,<5; python_version<"3"', 'ipykernel>=6.16.1,<7; python_version>="3"', 'ipython<6; python_version<"3"', - 'ipython>=7.31.1,<9; python_version>="3"', + 'ipython>=7.31.1,<9,!=8.8.0,!=8.9.0,!=8.10.0; python_version>="3"', 'jupyter-client>=5.3.4,<6; python_version<"3"', - 'jupyter-client>=7.4.9,<8; python_version>="3"', + 'jupyter-client>=7.4.9,<9; python_version>="3"', 'pyzmq>=17,<20; python_version<"3"', 'pyzmq>=22.1.0; python_version>="3"', 'wurlitzer>=1.0.3;platform_system!="Windows"', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/_version.py new/spyder-kernels-2.4.3/spyder_kernels/_version.py --- old/spyder-kernels-2.4.2/spyder_kernels/_version.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/_version.py 2023-04-02 20:29:23.000000000 +0200 @@ -8,5 +8,5 @@ """Version File.""" -VERSION_INFO = (2, 4, 2) +VERSION_INFO = (2, 4, 3) __version__ = '.'.join(map(str, VERSION_INFO)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/console/kernel.py new/spyder-kernels-2.4.3/spyder_kernels/console/kernel.py --- old/spyder-kernels-2.4.2/spyder_kernels/console/kernel.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/console/kernel.py 2023-04-02 20:29:23.000000000 +0200 @@ -11,14 +11,12 @@ """ # Standard library imports -from distutils.version import LooseVersion import logging import os import sys import threading # Third-party imports -import ipykernel from ipykernel.ipkernel import IPythonKernel from ipykernel import eventloops from traitlets.config.loader import LazyConfigValue @@ -450,11 +448,7 @@ def set_mpl_inline_resolution(self, resolution): """Set inline figure resolution.""" - if LooseVersion(ipykernel.__version__) < LooseVersion('4.5'): - option = 'savefig.dpi' - else: - option = 'figure.dpi' - self._set_mpl_inline_rc_config(option, resolution) + self._set_mpl_inline_rc_config('figure.dpi', resolution) def set_mpl_inline_figure_size(self, width, height): """Set inline figure size.""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/console/start.py new/spyder-kernels-2.4.3/spyder_kernels/console/start.py --- old/spyder-kernels-2.4.2/spyder_kernels/console/start.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/console/start.py 2023-04-02 20:29:23.000000000 +0200 @@ -11,7 +11,6 @@ """ # Standard library imports -from distutils.version import LooseVersion import os import os.path as osp import sys @@ -73,7 +72,6 @@ def kernel_config(): """Create a config object with IPython kernel options.""" - import ipykernel from IPython.core.application import get_ipython_dir from traitlets.config.loader import Config, load_pyconfig_files @@ -149,19 +147,11 @@ # use our config system to configure the # inline backend but want to use # '%matplotlib inline' at runtime - if LooseVersion(ipykernel.__version__) < LooseVersion('4.5'): - dpi_option = 'savefig.dpi' - else: - dpi_option = 'figure.dpi' - - # The typical default figure size is too large for inline use, - # so we shrink the figure size to 6x4, and tweak fonts to - # make that fit. spy_cfg.InlineBackend.rc = { 'figure.figsize': (6.0, 4.0), # 72 dpi matches SVG/qtconsole. # This only affects PNG export, as SVG has no dpi setting. - dpi_option: 72, + 'figure.dpi': 72, # 12pt labels get cutoff on 6x4 logplots, so use 10pt. 'font.size': 10, # 10pt still needs a little more room on the xlabel @@ -190,7 +180,8 @@ # Resolution resolution_o = os.environ.get('SPY_RESOLUTION_O') if resolution_o is not None: - spy_cfg.InlineBackend.rc[dpi_option] = float(resolution_o) + spy_cfg.InlineBackend.rc['figure.dpi'] = float( + resolution_o) # Figure size width_o = float(os.environ.get('SPY_WIDTH_O')) @@ -248,8 +239,7 @@ # Disable the new mechanism to capture and forward low-level output # in IPykernel 6. For that we have Wurlitzer. - if LooseVersion(ipykernel.__version__) >= LooseVersion('6.3.0'): - spy_cfg.IPKernelApp.capture_fd_output = False + spy_cfg.IPKernelApp.capture_fd_output = False # Merge IPython and Spyder configs. Spyder prefs will have prevalence # over IPython ones diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/customize/spydercustomize.py new/spyder-kernels-2.4.3/spyder_kernels/customize/spydercustomize.py --- old/spyder-kernels-2.4.2/spyder_kernels/customize/spydercustomize.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/customize/spydercustomize.py 2023-04-02 20:29:23.000000000 +0200 @@ -353,8 +353,12 @@ _print('*' * 40) _print('Entering post mortem debugging...') _print('*' * 40) - # add ability to move between frames - p.send_initial_notification = False + + # Inform Spyder about position of exception: pdb.Pdb.interaction() calls + # cmd.Cmd.cmdloop(), which calls SpyderPdb.preloop() where + # send_initial_notification is handled. + p.send_initial_notification = True + p.reset() frame = tb.tb_next.tb_frame # wait for stdout to print @@ -458,7 +462,7 @@ else: ast_code = ast.parse(transform_cell(code)) - if code.rstrip()[-1] == ";": + if code.rstrip()[-1:] == ";": # Supress output with ; capture_last_expression = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/customize/spyderpdb.py new/spyder-kernels-2.4.3/spyder_kernels/customize/spyderpdb.py --- old/spyder-kernels-2.4.2/spyder_kernels/customize/spyderpdb.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/customize/spyderpdb.py 2023-04-02 20:29:23.000000000 +0200 @@ -186,7 +186,7 @@ code_ast = ast.parse(line) - if line.rstrip()[-1] == ";": + if line.rstrip()[-1:] == ";": # Supress output with ; capture_last_expression = False else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/customize/tests/test_utils.py new/spyder-kernels-2.4.3/spyder_kernels/customize/tests/test_utils.py --- old/spyder-kernels-2.4.2/spyder_kernels/customize/tests/test_utils.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/customize/tests/test_utils.py 2023-04-02 20:29:23.000000000 +0200 @@ -16,7 +16,7 @@ """Test that we include user site-packages in pathlist.""" if sys.platform.startswith('linux'): user_path = 'local' - elif sys.platform == 'darwin': + elif (sys.platform == 'darwin' or sys.platform.startswith('freebsd')): user_path = os.path.expanduser('~/.local') else: user_path = 'Roaming' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/utils/iofuncs.py new/spyder-kernels-2.4.3/spyder_kernels/utils/iofuncs.py --- old/spyder-kernels-2.4.2/spyder_kernels/utils/iofuncs.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/utils/iofuncs.py 2023-04-02 20:29:23.000000000 +0200 @@ -415,7 +415,7 @@ try: saved_arrays = data.pop('__saved_arrays__') for (name, index), fname in list(saved_arrays.items()): - arr = np.load(osp.join(tmp_folder, fname)) + arr = np.load(osp.join(tmp_folder, fname), allow_pickle=True) if index is None: data[name] = arr elif isinstance(data[name], dict): Binary files old/spyder-kernels-2.4.2/spyder_kernels/utils/tests/export_data.spydata and new/spyder-kernels-2.4.3/spyder_kernels/utils/tests/export_data.spydata differ Binary files old/spyder-kernels-2.4.2/spyder_kernels/utils/tests/export_data_renamed.spydata and new/spyder-kernels-2.4.3/spyder_kernels/utils/tests/export_data_renamed.spydata differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spyder-kernels-2.4.2/spyder_kernels/utils/tests/test_iofuncs.py new/spyder-kernels-2.4.3/spyder_kernels/utils/tests/test_iofuncs.py --- old/spyder-kernels-2.4.2/spyder_kernels/utils/tests/test_iofuncs.py 2023-01-18 00:14:46.000000000 +0100 +++ new/spyder-kernels-2.4.3/spyder_kernels/utils/tests/test_iofuncs.py 2023-04-02 20:29:23.000000000 +0200 @@ -21,7 +21,7 @@ # Local imports import spyder_kernels.utils.iofuncs as iofuncs -from spyder_kernels.py3compat import is_text_string +from spyder_kernels.py3compat import is_text_string, PY2 # Full path to this file's parent directory for loading data @@ -88,7 +88,7 @@ B = 'ham' C = np.eye(3) D = {'a': True, 'b': np.eye(4, dtype=np.complex128)} - E = [np.eye(2, dtype=np.int64), 42.0, np.eye(3, dtype=np.bool_)] + E = [np.eye(2, dtype=np.int64), 42.0, np.eye(3, dtype=np.bool_), np.eye(4, dtype=object)] return {'A': A, 'B': B, 'C': C, 'D': D, 'E': E} @@ -227,6 +227,7 @@ assert valid +(a)pytest.mark.skipif(PY2, reason="Fails on Python 2") @pytest.mark.parametrize('spydata_file_name', ['export_data.spydata', 'export_data_renamed.spydata']) def test_spydata_import(spydata_file_name, spydata_values):

1 0

commit installation-images for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2023-04-29 17:28:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Sat Apr 29 17:28:00 2023 rev:183 rq:1083563 version:17.86 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2023-03-29 23:27:03.175414875 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new.1533/installation-images.changes 2023-04-29 17:28:10.206549589 +0200 @@ -1,0 +2,37 @@ +Fri Apr 28 17:07:56 UTC 2023 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#644 +- fix minor usrmerge issue +- 17.86 + +-------------------------------------------------------------------- +Fri Apr 28 16:29:33 UTC 2023 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#643 +- usrmerge fixes in module config creation +- allow firmware file names with spaces +- add qrtr* kernel modules (bsc#1209965) +- 17.85 + +-------------------------------------------------------------------- +Fri Apr 28 13:48:27 UTC 2023 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#642 +- adjust module config for kernel 6.3 +- 17.84 + +-------------------------------------------------------------------- +Fri Apr 28 09:14:16 UTC 2023 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#641 +- add cpio-mt to spec file +- 17.83 + +-------------------------------------------------------------------- +Wed Apr 26 16:48:15 UTC 2023 - wfeldt(a)opensuse.org + +- merge gh#openSUSE/installation-images#640 +- add mt to rescue system (bsc#1188998) +- 17.82 + +-------------------------------------------------------------------- Old: ---- installation-images-17.81.tar.xz New: ---- installation-images-17.86.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.EIGIPB/_old 2023-04-29 17:28:10.810552118 +0200 +++ /var/tmp/diff_new_pack.EIGIPB/_new 2023-04-29 17:28:10.810552118 +0200 @@ -315,6 +315,7 @@ BuildRequires: cairo BuildRequires: checkmedia BuildRequires: cifs-utils +BuildRequires: cpio-mt BuildRequires: cracklib BuildRequires: cracklib-dict-full BuildRequires: cron @@ -667,7 +668,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 17.81 +Version: 17.86 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) ++++++ installation-images-17.81.tar.xz -> installation-images-17.86.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/VERSION new/installation-images-17.86/VERSION --- old/installation-images-17.81/VERSION 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/VERSION 2023-04-28 19:07:56.000000000 +0200 @@ -1 +1 @@ -17.81 +17.86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/changelog new/installation-images-17.86/changelog --- old/installation-images-17.81/changelog 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/changelog 2023-04-28 19:07:56.000000000 +0200 @@ -1,3 +1,25 @@ +2023-04-28: 17.86 + - merge gh#openSUSE/installation-images#644 + - fix minor usrmerge issue + +2023-04-28: 17.85 + - merge gh#openSUSE/installation-images#643 + - usrmerge fixes in module config creation + - allow firmware file names with spaces + - add qrtr* kernel modules (bsc#1209965) + +2023-04-28: 17.84 + - merge gh#openSUSE/installation-images#642 + - adjust module config for kernel 6.3 + +2023-04-28: 17.83 + - merge gh#openSUSE/installation-images#641 + - add cpio-mt to spec file + +2023-04-26: 17.82 + - merge gh#openSUSE/installation-images#640 + - add mt to rescue system (bsc#1188998) + 2023-03-27: 17.81 - merge gh#openSUSE/installation-images#639 - modernized mount-rootfs-and-do-chroot script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/data/base/mlist3 new/installation-images-17.86/data/base/mlist3 --- old/installation-images-17.81/data/base/mlist3 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/data/base/mlist3 2023-04-28 19:07:56.000000000 +0200 @@ -29,7 +29,7 @@ for my $f (<$fw_dir/$fw $fw_dir/$kv/$fw>) { if(-r $f) { $f =~ s#^$fw_dir/##; - system "install -m 644 -D $fw_dir/$f lib/firmware/$f\n"; + system "install -m 644 -D '$fw_dir/$f' 'lib/firmware/$f'\n"; $ok = 1; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/data/initrd/modules.file_list new/installation-images-17.86/data/initrd/modules.file_list --- old/installation-images-17.81/data/initrd/modules.file_list 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/data/initrd/modules.file_list 2023-04-28 19:07:56.000000000 +0200 @@ -1,20 +1,20 @@ -d lib/modules/<kernel_ver> -d lib/modules/<kernel_ver>/initrd -s lib/modules/<kernel_ver>/initrd modules +# for depmod; also to indicate usrmerge in "gefrickel" script +# don't use 's usr/lib lib' as link might already exist +e ln -snf usr/lib lib + +d usr/lib/modules/<kernel_ver> +d usr/lib/modules/<kernel_ver>/initrd +s usr/lib/modules/<kernel_ver>/initrd modules <kernel_rpm>: - # temporary: usrmerge - if exists(filesystem, /lib, l) - L usr/lib/firmware fw - else - L lib/firmware fw - endif + L usr/lib/firmware fw <kernel_module_dir>/<kernel_ver>/modules.order e perl -pi -e "s#.*/#initrd/#" ./<kernel_module_dir>/<kernel_ver>/modules.order <kernel_module_dir>/<kernel_ver>/modules.builtin e perl -pi -e "s#.*/#initrd/#" ./<kernel_module_dir>/<kernel_ver>/modules.builtin + <kernel_module_dir>/<kernel_ver>/modules.builtin.modinfo x module.help modules/module.config @@ -53,26 +53,17 @@ if 0 # add alsa modules - lib/modules/<kernel_ver>/kernel/sound + usr/lib/modules/<kernel_ver>/kernel/sound endif # add modules.alias, modules.dep -if exists(<kernel_rpm>, usr/lib/modules/<kernel_ver>/System.map) - L usr/lib/modules/<kernel_ver>/System.map System.map -else - L boot/System.map* System.map -endif +L usr/lib/modules/<kernel_ver>/System.map System.map e /sbin/depmod -a -b . -F System.map <kernel_ver> r System.map -# usrmerge: copy needed firmware files -if exists(filesystem, /lib, l) - d usr/lib/firmware -else - d lib/firmware -endif +# copy needed firmware files +d usr/lib/firmware e mlist3 <kernel_ver> fw || true # remove temp firmware dir r fw - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/data/rescue/rescue.file_list new/installation-images-17.86/data/rescue/rescue.file_list --- old/installation-images-17.81/data/rescue/rescue.file_list 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/data/rescue/rescue.file_list 2023-04-28 19:07:56.000000000 +0200 @@ -121,6 +121,7 @@ checkmedia: cifs-utils: cpio: +cpio-mt: cracklib-dict-full: cracklib: cryptsetup: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/etc/module.config new/installation-images-17.86/etc/module.config --- old/installation-images-17.81/etc/module.config 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/etc/module.config 2023-04-28 19:07:56.000000000 +0200 @@ -349,6 +349,7 @@ kernel/net/ieee802154/.* kernel/net/ipv4/.* kernel/net/mac802154/.* +kernel/net/qrtr/.* [WLAN] @@ -641,7 +642,6 @@ ; modules we do _not_ need [notuseful] bareudp -bpck6 bsd_comp caif_serial cfspi_slave diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/etc/module.list new/installation-images-17.86/etc/module.list --- old/installation-images-17.81/etc/module.list 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/etc/module.list 2023-04-28 19:07:56.000000000 +0200 @@ -127,6 +127,7 @@ kernel/net/802/stp.ko kernel/net/802/mrp.ko kernel/net/llc/ +kernel/net/qrtr kernel/drivers/power/power_supply.ko kernel/drivers/firmware/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-17.81/obs/installation-images.spec new/installation-images-17.86/obs/installation-images.spec --- old/installation-images-17.81/obs/installation-images.spec 2023-03-27 18:37:07.000000000 +0200 +++ new/installation-images-17.86/obs/installation-images.spec 2023-04-28 19:07:56.000000000 +0200 @@ -315,6 +315,7 @@ BuildRequires: cairo BuildRequires: checkmedia BuildRequires: cifs-utils +BuildRequires: cpio-mt BuildRequires: cracklib BuildRequires: cracklib-dict-full BuildRequires: cron

1 0

commit makedumpfile for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package makedumpfile for openSUSE:Factory checked in at 2023-04-29 17:27:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old) and /work/SRC/openSUSE:Factory/.makedumpfile.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "makedumpfile" Sat Apr 29 17:27:58 2023 rev:89 rq:1083540 version:1.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes 2023-01-08 21:25:17.247157258 +0100 +++ /work/SRC/openSUSE:Factory/.makedumpfile.new.1533/makedumpfile.changes 2023-04-29 17:28:08.902544129 +0200 @@ -1,0 +2,8 @@ +Tue Apr 25 10:42:06 UTC 2023 - Petr Tesa��k <petr(a)tesarici.cz> + +- update to 1.7.3: + * Support kernels up to v6.3 (x86_64) + * Support sadump with 5-level paging +- temporarily disable eppic until v5.0 branch can be supported + +------------------------------------------------------------------- Old: ---- makedumpfile-1.7.2.tar.gz New: ---- makedumpfile-1.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedumpfile.spec ++++++ --- /var/tmp/diff_new_pack.gnoren/_old 2023-04-29 17:28:09.678547378 +0200 +++ /var/tmp/diff_new_pack.gnoren/_new 2023-04-29 17:28:09.682547395 +0200 @@ -1,7 +1,7 @@ # # spec file for package makedumpfile # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +%define build_eppic 0 + %if 0%{!?have_snappy:1} %if 0%{?suse_version} >= 1310 %define have_snappy 1 @@ -40,7 +42,7 @@ # End of compatibility cruft Name: makedumpfile -Version: 1.7.2 +Version: 1.7.3 Release: 0 Summary: Partial kernel dump License: GPL-2.0-only @@ -54,7 +56,9 @@ BuildRequires: libbz2-devel BuildRequires: libdw-devel BuildRequires: libelf-devel +%if %{build_eppic} BuildRequires: libeppic-devel +%endif BuildRequires: lzo-devel BuildRequires: ncurses-devel BuildRequires: xz-devel @@ -88,16 +92,20 @@ export USELZO=on export LINKTYPE=dynamic make %{?_smp_mflags} LDFLAGS="-Wl,-rpath,%{_libdir}/%{name}-%{version}" +%if %{build_eppic} make %{?_smp_mflags} eppic_makedumpfile.so %{?ncurses_make_opts} +%endif %install install -D -m 0755 makedumpfile %{buildroot}%{_bindir}/makedumpfile install -D -m 0755 makedumpfile-R.pl %{buildroot}%{_bindir}/makedumpfile-R.pl install -D -m 0644 makedumpfile.8 %{buildroot}%{_mandir}/man8/makedumpfile.8 install -D -m 0644 makedumpfile.conf.5 %{buildroot}%{_mandir}/man5/makedumpfile.conf.5 +%if %{build_eppic} install -D -m 0755 eppic_makedumpfile.so %{buildroot}%{_libdir}/%{name}-%{version}/eppic_makedumpfile.so install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts install -m 0644 -t %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts/ eppic_scripts/* +%endif # Compatibility cruft # there is no %%license prior to SLE12 @@ -117,9 +125,11 @@ %doc README IMPLEMENTATION %{_mandir}/man?/* %{_bindir}/* +%if %{build_eppic} %dir %{_libdir}/%{name}-%{version} %{_libdir}/%{name}-%{version}/eppic_makedumpfile.so %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/eppic_scripts/ +%endif %changelog ++++++ makedumpfile-1.7.2.tar.gz -> makedumpfile-1.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/IMPLEMENTATION new/makedumpfile-1.7.3/IMPLEMENTATION --- old/makedumpfile-1.7.2/IMPLEMENTATION 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/IMPLEMENTATION 2023-04-25 08:42:54.000000000 +0200 @@ -280,3 +280,48 @@ If there is no segment dumped into the DUMPFILE, the DUMPFILE can't be analysed by crash. + + +* The flattened format + + This format is mostly used to send dump data to a remote host via SSH. + The kdump-compressed format and ELF format require random access to create + a DUMPFILE, so it cannot be written directly to standard output. + The flattened format adds the original offset and size of each data block, + and it can be rearranged to the original format on the remote host. + + - File structure + + This is the case of the kdump-compressed format. + File offset + +------------------------------------------+ 0x0 + | flat header (struct makedumpfile_header) | + | | + |------------------------------------------| 0x1000 (4096) + | flat data header | + | (struct makedumpfile_data_header) | + | main header (struct disk_dump_header) | + |------------------------------------------| (not aligned) + | flat data header | + | : | + + Note: For the ELF format, ELF header is not always the first data. + + - flat header + + struct makedumpfile_header { + char signature[SIG_LEN_MDF]; /* = "makedumpfile\0\0\0\0" */ + int64_t type; /* = TYPE_FLAT_HEADER (1) */ + int64_t version; /* = VERSION_FLAT_HEADER (1) */ + }; + + Note: the type and version are big endian. + + - flat data header + + struct makedumpfile_data_header { + int64_t offset; + int64_t buf_size; + }; + + Note: the offset and buf_size are big endian. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/Makefile new/makedumpfile-1.7.3/Makefile --- old/makedumpfile-1.7.2/Makefile 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/Makefile 2023-04-25 08:42:54.000000000 +0200 @@ -1,7 +1,7 @@ # makedumpfile -VERSION=1.7.2 -DATE=20 Oct 2022 +VERSION=1.7.3 +DATE=25 Apr 2023 # Honour the environment variable CC ifeq ($(strip $CC),) @@ -130,6 +130,6 @@ install -m 755 -t ${DESTDIR}/usr/sbin makedumpfile $(VPATH)makedumpfile-R.pl install -m 644 -t ${DESTDIR}/usr/share/man/man8 makedumpfile.8 install -m 644 -t ${DESTDIR}/usr/share/man/man5 makedumpfile.conf.5 - mkdir -p ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts - install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/usr/share/makedumpfile-${VERSION}/makedumpfile.conf.sample - install -m 644 -t ${DESTDIR}/usr/share/makedumpfile-${VERSION}/eppic_scripts/ $(VPATH)eppic_scripts/* + mkdir -p ${DESTDIR}/usr/share/makedumpfile/eppic_scripts + install -m 644 -D $(VPATH)makedumpfile.conf ${DESTDIR}/usr/share/makedumpfile/makedumpfile.conf.sample + install -m 644 -t ${DESTDIR}/usr/share/makedumpfile/eppic_scripts/ $(VPATH)eppic_scripts/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/README new/makedumpfile-1.7.3/README --- old/makedumpfile-1.7.2/README 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/README 2023-04-25 08:42:54.000000000 +0200 @@ -166,6 +166,9 @@ 5.18 | | ** | | | | ** | | -- | | OK | | | 5.19 | | ** | | | | ** | | -- | | OK | | | 6.0 | | ** | | | | ** | | -- | | OK | | | + 6.1 | | ** | | | | ** | | -- | | OK | | | + 6.2 | | ** | | | | ** | | -- | | OK | | | + 6.3 | | ** | | | | ** | | -- | | OK | | | OK : Support. -- : Not support. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/extension_eppic.c new/makedumpfile-1.7.3/extension_eppic.c --- old/makedumpfile-1.7.2/extension_eppic.c 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/extension_eppic.c 2023-04-25 08:42:54.000000000 +0200 @@ -122,7 +122,7 @@ { int type_flag, len = 0, t_len = 0, nidx = 0; int fctflg = 0, ref = 0, *idxlst = 0; - ull die_off = offset, t_die_off; + unsigned long long die_off = offset, t_die_off; char *tstr = NULL, *tstr_dup = NULL; while (GET_DIE_ATTR_TYPE(die_off, &type_flag, &t_die_off)) { @@ -221,7 +221,7 @@ int index, nfields = -1, size; int nbits = 0, fbits = 0; long offset; - ull m_die, die_off = idx; + unsigned long long m_die, die_off = idx; char *name = NULL; nfields = GET_DIE_NFIELDS_ALL(die_off); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/extension_eppic.h new/makedumpfile-1.7.3/extension_eppic.h --- old/makedumpfile-1.7.2/extension_eppic.h 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/extension_eppic.h 2023-04-25 08:42:54.000000000 +0200 @@ -71,6 +71,7 @@ ull rtype; /* type_t a reference refers too */ } type_t; +#undef ERRMSG #define ERRMSG(x...) \ do { \ fprintf(stderr, __FUNCTION__); \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/makedumpfile.c new/makedumpfile-1.7.3/makedumpfile.c --- old/makedumpfile-1.7.2/makedumpfile.c 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/makedumpfile.c 2023-04-25 08:42:54.000000000 +0200 @@ -1732,6 +1732,9 @@ OFFSET_INIT(page.compound_dtor, "page", "compound_dtor"); OFFSET_INIT(page.compound_order, "page", "compound_order"); OFFSET_INIT(page.compound_head, "page", "compound_head"); + /* Linux 6.3 and later */ + OFFSET_INIT(folio._folio_dtor, "folio", "_folio_dtor"); + OFFSET_INIT(folio._folio_order, "folio", "_folio_order"); /* * Some vmlinux(s) don't have debugging information about @@ -2381,6 +2384,10 @@ WRITE_MEMBER_OFFSET("page.compound_dtor", page.compound_dtor); WRITE_MEMBER_OFFSET("page.compound_order", page.compound_order); WRITE_MEMBER_OFFSET("page.compound_head", page.compound_head); + /* Linux 6.3 and later */ + WRITE_MEMBER_OFFSET("folio._folio_dtor", folio._folio_dtor); + WRITE_MEMBER_OFFSET("folio._folio_order", folio._folio_order); + WRITE_MEMBER_OFFSET("mem_section.section_mem_map", mem_section.section_mem_map); WRITE_MEMBER_OFFSET("pglist_data.node_zones", pglist_data.node_zones); @@ -2821,6 +2828,10 @@ READ_MEMBER_OFFSET("page.compound_dtor", page.compound_dtor); READ_MEMBER_OFFSET("page.compound_order", page.compound_order); READ_MEMBER_OFFSET("page.compound_head", page.compound_head); + /* Linux 6.3 and later */ + READ_MEMBER_OFFSET("folio._folio_dtor", folio._folio_dtor); + READ_MEMBER_OFFSET("folio._folio_order", folio._folio_order); + READ_MEMBER_OFFSET("mem_section.section_mem_map", mem_section.section_mem_map); READ_MEMBER_OFFSET("pglist_data.node_zones", pglist_data.node_zones); @@ -4297,6 +4308,32 @@ return ret; } +void +init_compound_offset(void) { + + /* Linux 6.3 and later */ + if (OFFSET(folio._folio_order) != NOT_FOUND_STRUCTURE) + info->compound_order_offset = OFFSET(folio._folio_order) - SIZE(page); + else if (OFFSET(page.compound_order) != NOT_FOUND_STRUCTURE) + info->compound_order_offset = OFFSET(page.compound_order); + else if (info->kernel_version < KERNEL_VERSION(4, 4, 0)) + info->compound_order_offset = OFFSET(page.lru) + OFFSET(list_head.prev); + else + info->compound_order_offset = 0; + + if (OFFSET(folio._folio_dtor) != NOT_FOUND_STRUCTURE) + info->compound_dtor_offset = OFFSET(folio._folio_dtor) - SIZE(page); + else if (OFFSET(page.compound_dtor) != NOT_FOUND_STRUCTURE) + info->compound_dtor_offset = OFFSET(page.compound_dtor); + else if (info->kernel_version < KERNEL_VERSION(4, 4, 0)) + info->compound_dtor_offset = OFFSET(page.lru) + OFFSET(list_head.next); + else + info->compound_dtor_offset = 0; + + DEBUG_MSG("compound_order_offset : %u\n", info->compound_order_offset); + DEBUG_MSG("compound_dtor_offset : %u\n", info->compound_dtor_offset); +} + int initial(void) { @@ -4606,6 +4643,8 @@ if (info->dump_level & DL_EXCLUDE_FREE) setup_page_is_buddy(); + init_compound_offset(); + if (info->flag_usemmap == MMAP_TRY ) { if (initialize_mmap()) { DEBUG_MSG("mmap() is available on the kernel.\n"); @@ -6351,6 +6390,9 @@ return FALSE; } + order_offset = info->compound_order_offset; + dtor_offset = info->compound_dtor_offset; + for (pfn = pfn_start; pfn < pfn_end; pfn++, mem_map += SIZE(page)) { /* @@ -6399,24 +6441,6 @@ _count = UINT(pcache + OFFSET(page._refcount)); mapping = ULONG(pcache + OFFSET(page.mapping)); - if (OFFSET(page.compound_order) != NOT_FOUND_STRUCTURE) { - order_offset = OFFSET(page.compound_order); - } else { - if (info->kernel_version < KERNEL_VERSION(4, 4, 0)) - order_offset = OFFSET(page.lru) + OFFSET(list_head.prev); - else - order_offset = 0; - } - - if (OFFSET(page.compound_dtor) != NOT_FOUND_STRUCTURE) { - dtor_offset = OFFSET(page.compound_dtor); - } else { - if (info->kernel_version < KERNEL_VERSION(4, 4, 0)) - dtor_offset = OFFSET(page.lru) + OFFSET(list_head.next); - else - dtor_offset = 0; - } - compound_order = 0; compound_dtor = 0; /* @@ -6428,14 +6452,10 @@ unsigned char *addr = pcache + SIZE(page); if (order_offset) { - if (info->kernel_version >= - KERNEL_VERSION(4, 16, 0)) { - compound_order = - UCHAR(addr + order_offset); - } else { - compound_order = - USHORT(addr + order_offset); - } + if (info->kernel_version >= KERNEL_VERSION(4, 16, 0)) + compound_order = UCHAR(addr + order_offset); + else + compound_order = USHORT(addr + order_offset); } if (dtor_offset) { @@ -6443,18 +6463,12 @@ * compound_dtor has been changed from the address of descriptor * to the ID of it since linux-4.4. */ - if (info->kernel_version >= - KERNEL_VERSION(4, 16, 0)) { - compound_dtor = - UCHAR(addr + dtor_offset); - } else if (info->kernel_version >= - KERNEL_VERSION(4, 4, 0)) { - compound_dtor = - USHORT(addr + dtor_offset); - } else { - compound_dtor = - ULONG(addr + dtor_offset); - } + if (info->kernel_version >= KERNEL_VERSION(4, 16, 0)) + compound_dtor = UCHAR(addr + dtor_offset); + else if (info->kernel_version >= KERNEL_VERSION(4, 4, 0)) + compound_dtor = USHORT(addr + dtor_offset); + else + compound_dtor = ULONG(addr + dtor_offset); } if ((compound_order >= sizeof(unsigned long) * 8) @@ -6502,7 +6516,7 @@ */ else if ((info->dump_level & DL_EXCLUDE_CACHE) && is_cache_page(flags) - && !isPrivate(flags) && !isAnon(mapping)) { + && !isPrivate(flags) && !isAnon(mapping, flags)) { pfn_counter = &pfn_cache; } /* @@ -6510,7 +6524,7 @@ */ else if ((info->dump_level & DL_EXCLUDE_CACHE_PRI) && is_cache_page(flags) - && !isAnon(mapping)) { + && !isAnon(mapping, flags)) { if (isPrivate(flags)) pfn_counter = &pfn_cache_private; else @@ -6522,7 +6536,7 @@ * - hugetlbfs pages */ else if ((info->dump_level & DL_EXCLUDE_USER_DATA) - && (isAnon(mapping) || isHugetlb(compound_dtor))) { + && (isAnon(mapping, flags) || isHugetlb(compound_dtor))) { pfn_counter = &pfn_user; } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/makedumpfile.h new/makedumpfile-1.7.3/makedumpfile.h --- old/makedumpfile-1.7.2/makedumpfile.h 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/makedumpfile.h 2023-04-25 08:42:54.000000000 +0200 @@ -161,12 +161,9 @@ #define isSwapBacked(flags) test_bit(NUMBER(PG_swapbacked), flags) #define isHWPOISON(flags) (test_bit(NUMBER(PG_hwpoison), flags) \ && (NUMBER(PG_hwpoison) != NOT_FOUND_NUMBER)) - -static inline int -isAnon(unsigned long mapping) -{ - return ((unsigned long)mapping & PAGE_MAPPING_ANON) != 0; -} +#define isSlab(flags) test_bit(NUMBER(PG_slab), flags) +#define isAnon(mapping, flags) (((unsigned long)mapping & PAGE_MAPPING_ANON) != 0 \ + && !isSlab(flags)) #define PTOB(X) (((unsigned long long)(X)) << PAGESHIFT()) #define BTOP(X) (((unsigned long long)(X)) >> PAGESHIFT()) @@ -501,7 +498,7 @@ #define KVER_MIN_SHIFT 16 #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z)) #define OLDEST_VERSION KERNEL_VERSION(2, 6, 15) /* linux-2.6.15 */ -#define LATEST_VERSION KERNEL_VERSION(6, 0, 1) /* linux-6.0.1 */ +#define LATEST_VERSION KERNEL_VERSION(6, 3, 0) /* linux-6.3.0 */ /* * vmcoreinfo in /proc/vmcore @@ -1471,6 +1468,12 @@ unsigned long kaslr_offset; /* + * for compound page + */ + unsigned int compound_order_offset; + unsigned int compound_dtor_offset; + + /* * page table info for ppc64 */ int cur_mmu_type; @@ -1875,6 +1878,10 @@ long compound_order; long compound_head; } page; + struct folio { + long _folio_dtor; + long _folio_order; + } folio; struct mem_section { long section_mem_map; } mem_section; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/makedumpfile.spec new/makedumpfile-1.7.3/makedumpfile.spec --- old/makedumpfile-1.7.2/makedumpfile.spec 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/makedumpfile.spec 2023-04-25 08:42:54.000000000 +0200 @@ -1,6 +1,6 @@ Name: makedumpfile Summary: makedumpfile package -Version: 1.7.2 +Version: 1.7.3 Release: 1 Group: Applications/Text License: GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makedumpfile-1.7.2/sadump_info.c new/makedumpfile-1.7.3/sadump_info.c --- old/makedumpfile-1.7.2/sadump_info.c 2022-10-20 02:39:03.000000000 +0200 +++ new/makedumpfile-1.7.3/sadump_info.c 2023-04-25 08:42:54.000000000 +0200 @@ -1362,6 +1362,7 @@ #define PTI_USER_PGTABLE_BIT (info->page_shift) #define PTI_USER_PGTABLE_MASK (1 << PTI_USER_PGTABLE_BIT) #define CR3_PCID_MASK 0xFFFull +#define CR4_LA57 (1 << 12) int calc_kaslr_offset(void) { @@ -1397,6 +1398,8 @@ else cr3 = smram.Cr3 & ~CR3_PCID_MASK; + NUMBER(pgtable_l5_enabled) = !!(smram.Cr4 & CR4_LA57); + /* Convert virtual address of IDT table to physical address */ idtr_paddr = vtop4_x86_64_pagetable(idtr, cr3); if (idtr_paddr == NOT_PADDR) { @@ -1417,6 +1420,7 @@ DEBUG_MSG("sadump: idtr=%" PRIx64 "\n", idtr); DEBUG_MSG("sadump: cr3=%" PRIx64 "\n", cr3); + DEBUG_MSG("sadump: cr4=%" PRIx32 "\n", smram.Cr4); DEBUG_MSG("sadump: idtr(phys)=%" PRIx64 "\n", idtr_paddr); DEBUG_MSG("sadump: devide_error(vmlinux)=%lx\n", divide_error_vmlinux);

1 0

commit libzypp for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2023-04-29 17:27:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Sat Apr 29 17:27:57 2023 rev:471 rq:1083529 version:17.31.11 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2023-04-14 13:12:20.467310970 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new.1533/libzypp.changes 2023-04-29 17:28:05.698530714 +0200 @@ -1,0 +2,22 @@ +Fri Apr 28 13:40:07 CEST 2023 - ma(a)suse.de + +- MediaCurl: Fix endless loop if wrong credentials are stored in + credentials.cat (bsc#1210870) + Since libzypp-17.31.7 wrong credentials stored in credentials.cat + may lead to an endless loop. Rather than asking for the right + credentials, the stored ones are used again and again. +- zypp.conf: Introduce 'download.connect_timeout' [60 sec.] + (bsc#1208329) + Maximum time in seconds that you allow the connection phase to + the server to take. This only limits the connection phase, it has + no impact once it has connected. (see also CURLOPT_CONNECTTIMEOUT) +- commit: Try to provide /dev fs if not present (fixes #444) +- fix build with boost 1.82. +- version 17.31.11 (22) + +------------------------------------------------------------------- +Mon Apr 24 08:30:44 CEST 2023 - aschnell(a)suse.com + +- fix build with boost 1.82 + +------------------------------------------------------------------- Old: ---- libzypp-17.31.10.tar.bz2 New: ---- libzypp-17.31.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.ZyPK3u/_old 2023-04-29 17:28:06.286533176 +0200 +++ /var/tmp/diff_new_pack.ZyPK3u/_new 2023-04-29 17:28:06.294533210 +0200 @@ -42,7 +42,7 @@ %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper Name: libzypp -Version: 17.31.10 +Version: 17.31.11 Release: 0 License: GPL-2.0+ Url: https://github.com/openSUSE/libzypp ++++++ libzypp-17.31.10.tar.bz2 -> libzypp-17.31.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/VERSION.cmake new/libzypp-17.31.11/VERSION.cmake --- old/libzypp-17.31.10/VERSION.cmake 2023-04-13 16:51:38.000000000 +0200 +++ new/libzypp-17.31.11/VERSION.cmake 2023-04-28 13:42:03.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "22") SET(LIBZYPP_MINOR "31") -SET(LIBZYPP_PATCH "10") +SET(LIBZYPP_PATCH "11") # -# LAST RELEASED: 17.31.10 (22) +# LAST RELEASED: 17.31.11 (22) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/package/libzypp.changes new/libzypp-17.31.11/package/libzypp.changes --- old/libzypp-17.31.10/package/libzypp.changes 2023-04-13 16:51:38.000000000 +0200 +++ new/libzypp-17.31.11/package/libzypp.changes 2023-04-28 13:42:03.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Fri Apr 28 13:40:07 CEST 2023 - ma(a)suse.de + +- MediaCurl: Fix endless loop if wrong credentials are stored in + credentials.cat (bsc#1210870) + Since libzypp-17.31.7 wrong credentials stored in credentials.cat + may lead to an endless loop. Rather than asking for the right + credentials, the stored ones are used again and again. +- zypp.conf: Introduce 'download.connect_timeout' [60 sec.] + (bsc#1208329) + Maximum time in seconds that you allow the connection phase to + the server to take. This only limits the connection phase, it has + no impact once it has connected. (see also CURLOPT_CONNECTTIMEOUT) +- commit: Try to provide /dev fs if not present (fixes #444) +- fix build with boost 1.82. +- version 17.31.11 (22) + +------------------------------------------------------------------- +Mon Apr 24 08:30:44 CEST 2023 - aschnell(a)suse.com + +- fix build with boost 1.82 + +------------------------------------------------------------------- Thu Apr 13 16:48:40 CEST 2023 - ma(a)suse.de - BuildRequires: libsolv-devel >= 0.7.24 for x86_64_v[234] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/po/nl.po new/libzypp-17.31.11/po/nl.po --- old/libzypp-17.31.10/po/nl.po 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/po/nl.po 2023-04-15 23:42:04.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: zypp.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-12-22 14:35+0100\n" -"PO-Revision-Date: 2023-03-10 19:14+0000\n" +"PO-Revision-Date: 2023-04-15 21:14+0000\n" "Last-Translator: Heimen Stoffels <vistausss(a)fastmail.com>\n" "Language-Team: Dutch <https://l10n.opensuse.org/projects/libzypp/master/nl/>" "\n" @@ -3855,7 +3855,7 @@ #: zypp/RepoManager.cc:1837 zypp/RepoManager.cc:2039 #, c-format, boost-format msgid "Can't delete '%s'" -msgstr "Kan '%s' niet verwijderen" +msgstr "��%s�� kan niet worden verwijderd" #: zypp/RepoManager.cc:2027 zypp/RepoManager.cc:2477 msgid "Can't figure out where the service is stored." @@ -4225,7 +4225,7 @@ #: zypp/solver/detail/ProblemSolutionIgnore.cc:42 #, c-format, boost-format msgid "break %s by ignoring some of its dependencies" -msgstr "%s afbreken door enige van zijn afhankelijkheden te negeren" +msgstr "doorbreek ��%s�� door enkele afhankelijkheden te negeren" #: zypp/solver/detail/ProblemSolutionIgnore.cc:48 msgid "generally ignore of some dependencies" @@ -4261,7 +4261,7 @@ #: zypp/solver/detail/SATResolver.cc:1154 #, boost-format msgid "problem with the installed %1%" -msgstr "probleem met de ge��nstalleerde %1%" +msgstr "er is een probleem met het ge��nstalleerde pakket ��%1%��" #: zypp/solver/detail/SATResolver.cc:1157 msgid "conflicting requests" @@ -4529,7 +4529,7 @@ #: zypp/solver/detail/SATResolver.cc:1538 #, boost-format msgid "keep obsolete %1%" -msgstr "verouderde %1% behouden" +msgstr "behoud het verouderde pakket ��%1%��" #: zypp/solver/detail/SATResolver.cc:1543 #, boost-format @@ -4591,7 +4591,7 @@ #: zypp/solver/detail/SATResolver.cc:1626 #, boost-format msgid "deinstallation of %1%" -msgstr "%1% verwijderen" +msgstr "verwijder ��%1%��" #: zypp/target/RpmPostTransCollector.cc:98 #, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp/PurgeKernels.cc new/libzypp-17.31.11/zypp/PurgeKernels.cc --- old/libzypp-17.31.10/zypp/PurgeKernels.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp/PurgeKernels.cc 2023-04-24 11:42:04.000000000 +0200 @@ -28,6 +28,7 @@ #include <sys/utsname.h> #include <functional> #include <array> +#include <climits> #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "PurgeKernels" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp/RepoInfo.cc new/libzypp-17.31.11/zypp/RepoInfo.cc --- old/libzypp-17.31.10/zypp/RepoInfo.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp/RepoInfo.cc 2023-04-28 11:42:04.000000000 +0200 @@ -1050,20 +1050,24 @@ bool RepoInfo::requireStatusWithMediaFile () const { + // We skip the check for downloading media unless a local copy of the + // media file exists and states that there is more than one medium. bool canSkipMediaCheck = std::all_of( baseUrlsBegin(), baseUrlsEnd(), []( const zypp::Url &url ) { return url.schemeIsDownloading(); }); - - const auto &mDataPath = metadataPath(); - if ( canSkipMediaCheck && !mDataPath.empty() ) { - zypp::Pathname mediafile = mDataPath/"media.1/media"; - - zypp::repo::SUSEMediaVerifier lverifier { mediafile }; - if ( lverifier ) { - canSkipMediaCheck = lverifier.totalMedia() == 1; + if ( canSkipMediaCheck ) { + const auto &mDataPath = metadataPath(); + if ( not mDataPath.empty() ) { + PathInfo mediafile { mDataPath/"media.1/media" }; + if ( mediafile.isExist() ) { + repo::SUSEMediaVerifier lverifier { mediafile.path() }; + if ( lverifier && lverifier.totalMedia() > 1 ) { + canSkipMediaCheck = false; + } + } } } - - DBG << "Can SKIP media.1/media check for status calc: " << canSkipMediaCheck << " for repo " << alias() << std::endl; - return !canSkipMediaCheck; + if ( canSkipMediaCheck ) + DBG << "Can SKIP media.1/media check for status calc of repo " << alias() << endl; + return not canSkipMediaCheck; } ///////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp/media/MediaCurl.cc new/libzypp-17.31.11/zypp/media/MediaCurl.cc --- old/libzypp-17.31.10/zypp/media/MediaCurl.cc 2023-03-31 18:42:04.000000000 +0200 +++ new/libzypp-17.31.11/zypp/media/MediaCurl.cc 2023-04-28 11:42:04.000000000 +0200 @@ -429,9 +429,6 @@ } vol_settings.addHeader("Pragma:"); - _settings.setTimeout(ZConfig::instance().download_transfer_timeout()); - _settings.setConnectTimeout(CONNECT_TIMEOUT); - _settings.setUserAgentString(agentString()); // fill some settings from url query parameters @@ -744,27 +741,27 @@ Url fileurl(getFileUrl(filename)); - bool retry = false; + bool firstAuth = true; // bsc#1210870: authenticate must not return stored credentials more than once. unsigned internalTry = 0; static constexpr unsigned maxInternalTry = 3; do { - retry = false; try { doGetFileCopy( srcFile, target, report ); + break; // success! } // retry with proper authentication data catch (MediaUnauthorizedException & ex_r) { - if(authenticate(ex_r.hint(), !retry)) - retry = true; - else - { - report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory()); - ZYPP_RETHROW(ex_r); + if ( authenticate(ex_r.hint(), firstAuth) ) { + firstAuth = false; // must not return stored credentials again + continue; // retry } + + report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory()); + ZYPP_RETHROW(ex_r); } // unexpected exception catch (MediaException & excpt_r) @@ -774,8 +771,7 @@ if ( internalTry < maxInternalTry ) { // just report (NO_ERROR); no interactive request to the user report->problem(fileurl, media::DownloadProgressReport::NO_ERROR, excpt_r.asUserHistory()+_("Will try again...")); - retry = true; - continue; + continue; // retry } excpt_r.addHistory( str::Format(_("Giving up after %1% attempts.")) % maxInternalTry ); } @@ -790,8 +786,7 @@ ZYPP_RETHROW(excpt_r); } } - while (retry); - + while ( true ); report->finish(fileurl, zypp::media::DownloadProgressReport::NO_ERROR, ""); } @@ -1083,49 +1078,6 @@ /////////////////////////////////////////////////////////////////// - -#if DETECT_DIR_INDEX -bool MediaCurl::detectDirIndex() const -{ - if(_url.getScheme() != "http" && _url.getScheme() != "https") - return false; - // - // try to check the effective url and set the not_a_file flag - // if the url path ends with a "/", what usually means, that - // we've received a directory index (index.html content). - // - // Note: This may be dangerous and break file retrieving in - // case of some server redirections ... ? - // - bool not_a_file = false; - char *ptr = NULL; - CURLcode ret = curl_easy_getinfo( _curl, - CURLINFO_EFFECTIVE_URL, - &ptr); - if ( ret == CURLE_OK && ptr != NULL) - { - try - { - Url eurl( ptr); - std::string path( eurl.getPathName()); - if( !path.empty() && path != "/" && *path.rbegin() == '/') - { - DBG << "Effective url (" - << eurl - << ") seems to provide the index of a directory" - << endl; - not_a_file = true; - } - } - catch( ... ) - {} - } - return not_a_file; -} -#endif - -/////////////////////////////////////////////////////////////////// - void MediaCurl::doGetFileCopy( const OnMediaLocation &srcFile , const Pathname & target, callback::SendReport<DownloadProgressReport> & report, RequestOptions options ) const { Pathname dest = target.absolutename(); @@ -1332,13 +1284,6 @@ ZYPP_RETHROW(e); } } - -#if DETECT_DIR_INDEX - if (!ret && detectDirIndex()) - { - ZYPP_THROW(MediaNotAFileException(_url, filename)); - } -#endif // DETECT_DIR_INDEX } /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp/target/TargetImpl.cc new/libzypp-17.31.11/zypp/target/TargetImpl.cc --- old/libzypp-17.31.10/zypp/target/TargetImpl.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp/target/TargetImpl.cc 2023-04-26 18:42:04.000000000 +0200 @@ -232,21 +232,49 @@ /////////////////////////////////////////////////////////////////// namespace { + class AssertMountedBase + { + NON_COPYABLE(AssertMountedBase); + NON_MOVABLE(AssertMountedBase); + protected: + AssertMountedBase() + {} + + ~AssertMountedBase() + { + if ( ! _mountpoint.empty() ) { + // we mounted it so we unmount... + MIL << "We mounted " << _mountpoint << " so we unmount it" << endl; + execute({ "umount", "-R", "-l", _mountpoint.asString() }); + } + } + + protected: + int execute( ExternalProgram::Arguments && cmd_r ) const + { + ExternalProgram prog( cmd_r, ExternalProgram::Stderr_To_Stdout ); + for( std::string line = prog.receiveLine(); ! line.empty(); line = prog.receiveLine() ) + { DBG << line; } + return prog.close(); + } + + protected: + Pathname _mountpoint; + + }; + /// \brief Try to provide /proc fs if not present. /// bsc#1181328: Some systemd tools require /proc to be mounted - class AssertProcMounted + class AssertProcMounted : private AssertMountedBase { - NON_COPYABLE(AssertProcMounted); - NON_MOVABLE(AssertProcMounted); public: - AssertProcMounted( Pathname root_r ) { root_r /= "/proc"; if ( ! PathInfo(root_r/"self").isDir() ) { MIL << "Try to make sure proc is mounted at" << root_r << endl; if ( filesystem::assert_dir(root_r) == 0 - && execute({ "mount", "-t", "proc", "proc", root_r.asString() }) == 0 ) { + && execute({ "mount", "-t", "proc", "/proc", root_r.asString() }) == 0 ) { _mountpoint = std::move(root_r); // so we'll later unmount it } else { @@ -254,28 +282,32 @@ } } } + }; - ~AssertProcMounted( ) + /// \brief Try to provide /dev fs if not present. + /// #444: Some packages expect /dev to be mounted + class AssertDevMounted : private AssertMountedBase + { + public: + AssertDevMounted( Pathname root_r ) { - if ( ! _mountpoint.empty() ) { - // we mounted it so we unmount... - MIL << "We mounted " << _mountpoint << " so we unmount it" << endl; - execute({ "umount", "-l", _mountpoint.asString() }); + root_r /= "/dev"; + if ( ! PathInfo(root_r/"null").isChr() ) { + MIL << "Try to make sure dev is mounted at" << root_r << endl; + // https://unix.stackexchange.com/questions/263972/unmount-a-rbind-mount-witho… + // Without --make-rslave unmounting <sandbox-root>/dev/pts + // may unmount /dev/pts and you're out of ptys. + if ( filesystem::assert_dir(root_r) == 0 + && execute({ "mount", "--rbind", "--make-rslave", "/dev", root_r.asString() }) == 0 ) { + _mountpoint = std::move(root_r); // so we'll later unmount it + } + else { + WAR << "Mounting dev at " << root_r << " failed" << endl; + } } } - - private: - int execute( ExternalProgram::Arguments && cmd_r ) const - { - ExternalProgram prog( cmd_r, ExternalProgram::Stderr_To_Stdout ); - for( std::string line = prog.receiveLine(); ! line.empty(); line = prog.receiveLine() ) - { DBG << line; } - return prog.close(); - } - - private: - Pathname _mountpoint; }; + } // namespace /////////////////////////////////////////////////////////////////// @@ -1582,6 +1614,7 @@ // bsc#1181328: Some systemd tools require /proc to be mounted AssertProcMounted assertProcMounted( _root ); + AssertDevMounted assertDevMounted( _root ); // also /dev RpmPostTransCollector postTransCollector( _root ); std::vector<sat::Solvable> successfullyInstalledPackages; @@ -1929,6 +1962,7 @@ // bsc#1181328: Some systemd tools require /proc to be mounted AssertProcMounted assertProcMounted( _root ); + AssertDevMounted assertDevMounted( _root ); // also /dev // Why nodeps? // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-core/Pathname.cc new/libzypp-17.31.11/zypp-core/Pathname.cc --- old/libzypp-17.31.10/zypp-core/Pathname.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp-core/Pathname.cc 2023-04-24 11:42:04.000000000 +0200 @@ -10,6 +10,7 @@ * */ #include <iostream> +#include <climits> #include <zypp-core/base/String.h> #include <zypp-core/Pathname.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-curl/curlhelper.cc new/libzypp-17.31.11/zypp-curl/curlhelper.cc --- old/libzypp-17.31.10/zypp-curl/curlhelper.cc 2023-03-31 18:42:04.000000000 +0200 +++ new/libzypp-17.31.11/zypp-curl/curlhelper.cc 2023-04-14 16:42:04.000000000 +0200 @@ -24,6 +24,8 @@ #include <list> #include <string> +#define TRANSFER_TIMEOUT_MAX 60 * 60 + using std::endl; using namespace zypp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-curl/ng/network/request.cc new/libzypp-17.31.11/zypp-curl/ng/network/request.cc --- old/libzypp-17.31.10/zypp-curl/ng/network/request.cc 2023-03-31 18:42:04.000000000 +0200 +++ new/libzypp-17.31.11/zypp-curl/ng/network/request.cc 2023-04-14 16:42:04.000000000 +0200 @@ -210,9 +210,6 @@ locSet.addHeader("Pragma:"); - locSet.setTimeout( zypp::MediaConfig::instance().download_transfer_timeout() ); - locSet.setConnectTimeout( CONNECT_TIMEOUT ); - /** Force IPv4/v6 */ switch ( zypp::env::ZYPP_MEDIA_CURL_IPRESOLVE() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-curl/private/curlhelper_p.h new/libzypp-17.31.11/zypp-curl/private/curlhelper_p.h --- old/libzypp-17.31.10/zypp-curl/private/curlhelper_p.h 2023-03-31 18:42:04.000000000 +0200 +++ new/libzypp-17.31.11/zypp-curl/private/curlhelper_p.h 2023-04-14 16:42:04.000000000 +0200 @@ -18,10 +18,6 @@ #include <zypp-core/Url.h> #include <zypp-curl/TransferSettings> -#define CONNECT_TIMEOUT 60 -#define TRANSFER_TIMEOUT_MAX 60 * 60 -#define DETECT_DIR_INDEX 0 - #define EXPLICITLY_NO_PROXY "_none_" #undef CURLVERSION_AT_LEAST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-curl/transfersettings.cc new/libzypp-17.31.11/zypp-curl/transfersettings.cc --- old/libzypp-17.31.10/zypp-curl/transfersettings.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp-curl/transfersettings.cc 2023-04-14 16:42:04.000000000 +0200 @@ -37,7 +37,7 @@ public: Impl() : _useproxy( false ), _timeout( MediaConfig::instance().download_transfer_timeout() ), - _connect_timeout( 60 ), + _connect_timeout( MediaConfig::instance().download_connect_timeout() ), _maxConcurrentConnections( MediaConfig::instance().download_max_concurrent_connections() ), _minDownloadSpeed(MediaConfig::instance().download_min_download_speed()), _maxDownloadSpeed(MediaConfig::instance().download_max_download_speed()), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-media/mediaconfig.cc new/libzypp-17.31.11/zypp-media/mediaconfig.cc --- old/libzypp-17.31.10/zypp-media/mediaconfig.cc 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp-media/mediaconfig.cc 2023-04-28 11:42:04.000000000 +0200 @@ -25,6 +25,7 @@ , download_max_download_speed ( 0 ) , download_max_silent_tries ( 5 ) , download_transfer_timeout ( 180 ) + , download_connect_timeout ( 60 ) { } Pathname credentials_global_dir_path; @@ -35,6 +36,8 @@ int download_max_download_speed; int download_max_silent_tries; int download_transfer_timeout; + int download_connect_timeout; + }; MediaConfig::MediaConfig() : d_ptr( new MediaConfigPrivate() ) @@ -73,6 +76,12 @@ str::strtonum(value, d->download_max_silent_tries); return true; + } else if ( entry == "download.connect_timeout" ) { + str::strtonum(value, d->download_connect_timeout); + if ( d->download_connect_timeout < 0 ) + d->download_connect_timeout = 0; + return true; + } else if ( entry == "download.transfer_timeout" ) { str::strtonum(value, d->download_transfer_timeout); if ( d->download_transfer_timeout < 0 ) d->download_transfer_timeout = 0; @@ -112,6 +121,9 @@ long MediaConfig::download_transfer_timeout() const { return d_func()->download_transfer_timeout; } + long MediaConfig::download_connect_timeout() const + { return d_func()->download_connect_timeout; } + ZYPP_IMPL_PRIVATE(MediaConfig) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp-media/mediaconfig.h new/libzypp-17.31.11/zypp-media/mediaconfig.h --- old/libzypp-17.31.10/zypp-media/mediaconfig.h 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp-media/mediaconfig.h 2023-04-14 16:42:04.000000000 +0200 @@ -85,6 +85,11 @@ */ long download_transfer_timeout() const; + /*! + * Maximum time in seconds that you allow the connection phase to the server to take. + */ + long download_connect_timeout() const; + private: MediaConfig(); std::unique_ptr<MediaConfigPrivate> d_ptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.31.10/zypp.conf new/libzypp-17.31.11/zypp.conf --- old/libzypp-17.31.10/zypp.conf 2023-03-13 16:50:22.000000000 +0100 +++ new/libzypp-17.31.11/zypp.conf 2023-04-28 11:42:04.000000000 +0200 @@ -182,6 +182,17 @@ # download.max_silent_tries = 5 ## +## Maximum time in seconds that you allow the connection phase to the server to take. +## +## This only limits the connection phase, it has no impact once it has connected. +## (see also CURLOPT_CONNECTTIMEOUT) +## +## Valid values: Integer +## Default value: 60 +## +# download.connect_timeout = 60 + +## ## Maximum time in seconds that you allow a transfer operation to take. ## ## This is useful for preventing your batch jobs from hanging for hours due

1 0

commit bsh2 for openSUSE:Factory
by Source-Sync 29 Apr '23

29 Apr '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2023-04-29 17:27:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bsh2" Sat Apr 29 17:27:56 2023 rev:36 rq:1083524 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2019-04-17 11:22:05.946330196 +0200 +++ /work/SRC/openSUSE:Factory/.bsh2.new.1533/bsh2.changes 2023-04-29 17:28:03.686522290 +0200 @@ -1,0 +2,24 @@ +Fri Apr 28 12:05:16 UTC 2023 - Fridrich Strba <fstrba(a)suse.com> + +- Update to version 2.1.1 + * Changes of 2.1.1 + + Fix src/bsh/util/AWTConsole.java breakage with newer Java + versions + * Changes of 2.1.0 + + This release formalizes the merge of 2.0b6 with suitable + backports from the development version of BeanShell. Also + included are are some ALv2 contributions to the BeanShell2 + fork that had not been folded into BeanShell but are still + applicable to this version. For backwards compatibility + purposes, the 2.x branch of BeanShell still supports a minimum + Java version of 1.6. +- Modified patch: + * beanshell-2.0b6-target.patch -> 0000-source-target-1.8.patch + + rediff to changed context and clean up +- Added patches: + * beanshell-2.0b6-getpeer.patch + + fixed in 2.1.1 + * bsh2-fix-tests.patch + + not needed any more + +------------------------------------------------------------------- Old: ---- 2.0b6.tar.gz beanshell-2.0b6-getpeer.patch beanshell-2.0b6-target.patch bsh2-fix-tests.patch New: ---- 0000-source-target-1.8.patch _service beanshell-2.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.wZdBsH/_old 2023-04-29 17:28:04.234524585 +0200 +++ /var/tmp/diff_new_pack.wZdBsH/_new 2023-04-29 17:28:04.242524618 +0200 @@ -1,7 +1,7 @@ # # spec file for package bsh2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,22 +18,18 @@ %define orig_name bsh -%define fversion 2.0b6 Name: bsh2 -Version: 2.0.0.b6 +Version: 2.1.1 Release: 0 Summary: Scripting for Java (BeanShell Version 2.x) -License: SPL-1.0 OR LGPL-2.0-or-later +License: LGPL-2.0-or-later OR SPL-1.0 Group: Development/Libraries/Java URL: http://www.beanshell.org/ -Source0: https://github.com/beanshell/beanshell/archive/%{fversion}.tar.gz +Source0: beanshell-%{version}.tar.xz #PATCH-FIX-OPENSUSE: use html output and JVM's built-in xmlns:redirect Patch3: bsh-2.0b5-docs.patch -#PATCH-FIX-OPENSUSE: those two patches fixes a compatibility with a standard javax.script API -Patch1000: bsh2-fix-tests.patch Patch1001: reproducible.patch -Patch1002: beanshell-2.0b6-target.patch -Patch1003: beanshell-2.0b6-getpeer.patch +Patch1002: 0000-source-target-1.8.patch BuildRequires: ant BuildRequires: bsf BuildRequires: bsf-javadoc @@ -93,45 +89,25 @@ Scripting for Java (BeanShell Version 2.x) (demo and samples). %prep -%setup -q -n beanshell-%{fversion} +%setup -q -n beanshell-%{version} %patch3 -p1 -%patch1000 -p1 %patch1001 -p1 %patch1002 -p1 -%patch1003 -p1 -for j in $(find . -name "*.jar"); do - mv $j $j.no -done -# Remove bundled javax.script files under Sun's proprietary license -find engine/javax-src/javax/script/ -maxdepth 1 -type 'f' | xargs rm -mv tests/test-scripts/Data/addedCommand.jar.no tests/test-scripts/Data/addedCommand.jar -mv tests/test-scripts/Data/addclass.jar.no tests/test-scripts/Data/addclass.jar + +sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/red…,' docs/manual/xsl/*.xsl %build build-jar-repository -s -p lib bsf javacc glassfish-servlet-api -pushd engine/javax-src/ -javac -cp $(build-classpath glassfish-servlet-api) -source 8 -target 8 $(find . -name "*.java") -jar cf ../../lib/javaxscript.jar $(find . -name "*.class" -o -name "*.html") -popd -# set VERSION -perl -p -i -e 's|VERSION =.*;|VERSION = "%{version}";|' src/bsh/Interpreter.java -ant \ - -Dbsf.javadoc=%{_javadocdir}/bsf \ - -Djava.javadoc=%{_javadocdir}/java \ - dist -(cd docs/faq && ant) -(cd docs/manual && ant) -%fdupes -s docs/ +ant dist %install # jars mkdir -p %{buildroot}%{_javadir}/%{name} -rm -f dist/%{orig_name}-%{fversion}-src.jar -rm -f dist/%{orig_name}-%{fversion}-sources.jar +rm -f dist/%{orig_name}-%{version}-src.jar +rm -f dist/%{orig_name}-%{version}-sources.jar for jar in dist/*.jar; do - install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{fversion}.jar`-%{version}.jar + install -m 644 ${jar} %{buildroot}%{_javadir}/%{name}/`basename ${jar} -%{version}.jar`.jar done -(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done) # poms install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -163,7 +139,7 @@ # bshservlet mkdir -p %{buildroot}%{_datadir}/%{name}/bshservlet (cd %{buildroot}%{_datadir}/%{name}/bshservlet -jar xf $RPM_BUILD_DIR/beanshell-%{fversion}/dist/bshservlet.war +jar xf $RPM_BUILD_DIR/beanshell-%{version}/dist/bshservlet.war ) # scripts mkdir -p %{buildroot}%{_bindir} @@ -203,12 +179,7 @@ %fdupes -s %{buildroot} %fdupes docs/ -%files -%attr(0755,root,root) %{_bindir}/%{name} -%attr(0755,root,root) %{_bindir}/%{name}doc -%license LICENSE -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{orig_name}-%{version}.jar +%files -f .mfiles %{_javadir}/%{name}/%{orig_name}.jar %{_javadir}/%{name}/%{orig_name}-classpath*.jar %{_javadir}/%{name}/%{orig_name}-commands*.jar @@ -216,14 +187,11 @@ %{_javadir}/%{name}/%{orig_name}-engine*.jar %{_javadir}/%{name}/%{orig_name}-reflect*.jar %{_javadir}/%{name}/%{orig_name}-util*.jar +%attr(0755,root,root) %{_bindir}/%{name} +%attr(0755,root,root) %{_bindir}/%{name}doc +%license LICENSE %dir %{_datadir}/%{name} %{_datadir}/%{name}/bshservlet -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %files bsf %{_javadir}/%{name}/%{orig_name}-bsf*.jar ++++++ 0000-source-target-1.8.patch ++++++ diff --git a/build.xml b/build.xml index 8542245..6179cfa 100644 --- a/build.xml +++ b/build.xml @@ -16,8 +16,8 @@ <property name="file" value=""/> - <property name="ant.build.javac.target" value="1.6" /> - <property name="ant.build.javac.source" value="1.6" /> + <property name="ant.build.javac.target" value="1.8" /> + <property name="ant.build.javac.source" value="1.8" /> <property name="version" value="2.1.1"/> <property name="deprecation" value="on"/> <property name="Specification-Title" value="BeanShell" /> @@ -178,8 +178,8 @@ debug="on" includes="**/*.java" excludes="${excludes},**/bak/**" - source="1.6" - target="1.6" + source="1.8" + target="1.8" > <classpath> <fileset refid="lib-fileset"/> @@ -213,8 +213,8 @@ debug="on" includes="**/*.java" excludes="${excludes},**/bak/**" - source="1.6" - target="1.6" + source="1.8" + target="1.8" > <classpath> <fileset refid="lib-fileset"/> @@ -255,7 +255,7 @@ destdir="${javadoc-dir}" author="true" version="true" - source="1.6" + source="1.8" use="true" windowtitle="BeanShell ${version}" doctitle="<h1>BeanShell ${version}<h1>" @@ -680,8 +680,8 @@ destdir="${build-dir}" debug="on" debuglevel="lines,vars,source" - source="1.6" - target="1.6" + source="1.8" + target="1.8" > <classpath> <path refid="test-classpath"/> ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/beanshell/beanshell.git</param> <param name="revision">2.1.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="exclude">**.jar</param> <param name="exclude">engine/javax-src/javax/script/*.java</param> <param name="exclude">engine/javax-src/javax/script/*.html</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>

1 0