October 2024 - openSUSE Commits - openSUSE Mailing Lists

commit qt6-qt5compat for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-qt5compat for openSUSE:Factory checked in at 2024-10-03 18:02:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-qt5compat (Old) and /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-qt5compat" Thu Oct 3 18:02:03 2024 rev:32 rq:1205137 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-qt5compat/qt6-qt5compat.changes 2024-06-24 20:49:59.777071861 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.19354/qt6-qt5compat.changes 2024-10-03 18:02:28.915437629 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:23:03 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qt5compat-everywhere-src-6.7.2.tar.xz New: ---- qt5compat-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-qt5compat.spec ++++++ --- /var/tmp/diff_new_pack.OlEWME/_old 2024-10-03 18:02:29.639467762 +0200 +++ /var/tmp/diff_new_pack.OlEWME/_new 2024-10-03 18:02:29.639467762 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define tar_name qt5compat-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-qt5compat%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Unsupported Qt 5 APIs for Qt 6 License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qt5compat-everywhere-src-6.7.2.tar.xz -> qt5compat-everywhere-src-6.7.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-qt5compat/qt5compat-everywhere-src-6.7.2.tar.xz /work/SRC/openSUSE:Factory/.qt6-qt5compat.new.19354/qt5compat-everywhere-src-6.7.3.tar.xz differ: char 27, line 1

1 0

commit qt6-multimedia for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-multimedia for openSUSE:Factory checked in at 2024-10-03 18:01:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-multimedia (Old) and /work/SRC/openSUSE:Factory/.qt6-multimedia.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-multimedia" Thu Oct 3 18:01:57 2024 rev:25 rq:1205133 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-multimedia/qt6-multimedia.changes 2024-06-24 20:49:51.356763180 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-multimedia.new.19354/qt6-multimedia.changes 2024-10-03 18:02:00.406250738 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:23:01 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtmultimedia-everywhere-src-6.7.2.tar.xz New: ---- qtmultimedia-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-multimedia.spec ++++++ --- /var/tmp/diff_new_pack.TRiUqJ/_old 2024-10-03 18:02:08.798600137 +0200 +++ /var/tmp/diff_new_pack.TRiUqJ/_new 2024-10-03 18:02:08.806600470 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define short_name qtmultimedia %define tar_name qtmultimedia-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-multimedia%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt 6 Multimedia libraries License: GPL-3.0-or-later @@ -239,13 +239,13 @@ # The GstreamerMediaPlugin library has a limited usage outside of Qt development # (needed to create unit tests for the gstreamer plugin) rm %{buildroot}%{_qt6_cmakedir}/Qt6Multimedia/Qt6QGstreamerMediaPluginAdditionalTargetInfo.cmake -rm %{buildroot}%{_qt6_descriptionsdir}/QGstreamerMediaPluginPrivate.json -rm %{buildroot}%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a -rm %{buildroot}%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl -rm %{buildroot}%{_qt6_metatypesdir}/qt6qgstreamermediapluginprivate_*_metatypes.json -rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qgstreamermediaplugin_private.pri -rm -r %{buildroot}%{_qt6_cmakedir}/Qt6QGstreamerMediaPluginPrivate/ -rm -r %{buildroot}%{_qt6_includedir}/QtQGstreamerMediaPlugin/ +rm %{buildroot}%{_qt6_descriptionsdir}/QGstreamerMediaPluginImplPrivate.json +rm %{buildroot}%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.a +rm %{buildroot}%{_qt6_libdir}/libQt6QGstreamerMediaPluginImpl.prl +rm %{buildroot}%{_qt6_metatypesdir}/qt6qgstreamermediapluginimplprivate_*_metatypes.json +rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_qgstreamermediapluginimpl_private.pri +rm -r %{buildroot}%{_qt6_cmakedir}/Qt6QGstreamerMediaPluginImplPrivate/ +rm -r %{buildroot}%{_qt6_includedir}/QtQGstreamerMediaPluginImpl/ %ldconfig_scriptlets -n libQt6Multimedia6 %ldconfig_scriptlets -n libQt6MultimediaQuick6 ++++++ qtmultimedia-everywhere-src-6.7.2.tar.xz -> qtmultimedia-everywhere-src-6.7.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-multimedia/qtmultimedia-everywhere-src-6.7.2.tar.xz /work/SRC/openSUSE:Factory/.qt6-multimedia.new.19354/qtmultimedia-everywhere-src-6.7.3.tar.xz differ: char 25, line 1

1 0

commit qt6-imageformats for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-imageformats for openSUSE:Factory checked in at 2024-10-03 18:01:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-imageformats (Old) and /work/SRC/openSUSE:Factory/.qt6-imageformats.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-imageformats" Thu Oct 3 18:01:55 2024 rev:31 rq:1205127 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-imageformats/qt6-imageformats.changes 2024-06-24 20:49:47.232611992 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-imageformats.new.19354/qt6-imageformats.changes 2024-10-03 18:01:56.342081534 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:22:58 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtimageformats-everywhere-src-6.7.2.tar.xz New: ---- qtimageformats-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-imageformats.spec ++++++ --- /var/tmp/diff_new_pack.p2RX2i/_old 2024-10-03 18:01:57.482128998 +0200 +++ /var/tmp/diff_new_pack.p2RX2i/_new 2024-10-03 18:01:57.486129164 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define short_name qtimageformats %define tar_name qtimageformats-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-imageformats%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt 6 ImageFormat Plugins License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtimageformats-everywhere-src-6.7.2.tar.xz -> qtimageformats-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.7.2/.cmake.conf new/qtimageformats-everywhere-src-6.7.3/.cmake.conf --- old/qtimageformats-everywhere-src-6.7.2/.cmake.conf 2024-06-07 23:03:19.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.7.3/.cmake.conf 2024-09-19 16:50:50.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.7.2/.tag new/qtimageformats-everywhere-src-6.7.3/.tag --- old/qtimageformats-everywhere-src-6.7.2/.tag 2024-06-07 23:03:19.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.7.3/.tag 2024-09-19 16:50:50.000000000 +0200 @@ -1 +1 @@ -31ad4a47027dc0364b84cbfca788a72caf7fa841 +4a5d6a1ca8954148fec262c138e8e038daf569bb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.7.2/dependencies.yaml new/qtimageformats-everywhere-src-6.7.3/dependencies.yaml --- old/qtimageformats-everywhere-src-6.7.2/dependencies.yaml 2024-06-07 23:03:19.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 16:50:50.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.7.2/src/plugins/imageformats/macheif/qmacheifhandler.cpp new/qtimageformats-everywhere-src-6.7.3/src/plugins/imageformats/macheif/qmacheifhandler.cpp --- old/qtimageformats-everywhere-src-6.7.2/src/plugins/imageformats/macheif/qmacheifhandler.cpp 2024-06-07 23:03:19.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.7.3/src/plugins/imageformats/macheif/qmacheifhandler.cpp 2024-09-19 16:50:50.000000000 +0200 @@ -23,6 +23,7 @@ bCanRead = (!qstrncmp(buf + 4, "ftyp", 4) && (!qstrncmp(buf + 8, "heic", 4) || !qstrncmp(buf + 8, "heix", 4) || + !qstrncmp(buf + 8, "msf1", 4) || !qstrncmp(buf + 8, "mif1", 4))); } return bCanRead; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtimageformats-everywhere-src-6.7.2/src/plugins/imageformats/webp/qwebphandler.cpp new/qtimageformats-everywhere-src-6.7.3/src/plugins/imageformats/webp/qwebphandler.cpp --- old/qtimageformats-everywhere-src-6.7.2/src/plugins/imageformats/webp/qwebphandler.cpp 2024-06-07 23:03:19.000000000 +0200 +++ new/qtimageformats-everywhere-src-6.7.3/src/plugins/imageformats/webp/qwebphandler.cpp 2024-09-19 16:50:50.000000000 +0200 @@ -213,11 +213,9 @@ return false; } - QImage srcImage = image; - bool alpha = srcImage.hasAlphaChannel(); + const bool alpha = image.hasAlphaChannel(); QImage::Format newFormat = alpha ? QImage::Format_RGBA8888 : QImage::Format_RGB888; - if (srcImage.format() != newFormat) - srcImage = srcImage.convertToFormat(newFormat); + const QImage srcImage = (image.format() == newFormat) ? image : image.convertedTo(newFormat); WebPPicture picture; WebPConfig config; @@ -232,9 +230,9 @@ picture.use_argb = 1; bool failed = false; if (alpha) - failed = !WebPPictureImportRGBA(&picture, srcImage.bits(), srcImage.bytesPerLine()); + failed = !WebPPictureImportRGBA(&picture, srcImage.constBits(), srcImage.bytesPerLine()); else - failed = !WebPPictureImportRGB(&picture, srcImage.bits(), srcImage.bytesPerLine()); + failed = !WebPPictureImportRGB(&picture, srcImage.constBits(), srcImage.bytesPerLine()); if (failed) { qWarning() << "failed to import image data to webp picture.";

1 0

commit qt6-connectivity for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-connectivity for openSUSE:Factory checked in at 2024-10-03 18:01:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-connectivity (Old) and /work/SRC/openSUSE:Factory/.qt6-connectivity.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-connectivity" Thu Oct 3 18:01:50 2024 rev:25 rq:1205121 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-connectivity/qt6-connectivity.changes 2024-06-24 20:49:40.220354929 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-connectivity.new.19354/qt6-connectivity.changes 2024-10-03 18:01:52.381916660 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:22:56 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtconnectivity-everywhere-src-6.7.2.tar.xz New: ---- qtconnectivity-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-connectivity.spec ++++++ --- /var/tmp/diff_new_pack.yzvYwc/_old 2024-10-03 18:01:53.157948969 +0200 +++ /var/tmp/diff_new_pack.yzvYwc/_new 2024-10-03 18:01:53.161949135 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define tar_name qtconnectivity-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-connectivity%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt 6 connectivity tools and libraries License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qtconnectivity-everywhere-src-6.7.2.tar.xz -> qtconnectivity-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/.cmake.conf new/qtconnectivity-everywhere-src-6.7.3/.cmake.conf --- old/qtconnectivity-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:58:48.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/.tag new/qtconnectivity-everywhere-src-6.7.3/.tag --- old/qtconnectivity-everywhere-src-6.7.2/.tag 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/.tag 2024-09-19 20:58:48.000000000 +0200 @@ -1 +1 @@ -b42c3e57081283d79dc06f5c230abcea9e54b93d +06de765c6d3e649cd1b045e8b00be2d0a3e6ec27 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/dependencies.yaml new/qtconnectivity-everywhere-src-6.7.3/dependencies.yaml --- old/qtconnectivity-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:58:48.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java new/qtconnectivity-everywhere-src-6.7.3/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java --- old/qtconnectivity-everywhere-src-6.7.2/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLE.java 2024-09-19 20:58:48.000000000 +0200 @@ -1530,6 +1530,7 @@ break; case Mtu: skip = executeMtuExchange(); + break; case Rssi: skip = executeRemoteRssiRead(); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/darwin/btrfcommchannel.mm new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/darwin/btrfcommchannel.mm --- old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/darwin/btrfcommchannel.mm 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/darwin/btrfcommchannel.mm 2024-09-19 20:58:48.000000000 +0200 @@ -6,14 +6,23 @@ #include "btdelegates_p.h" #include "btutility_p.h" +#include <QtCore/qtimer.h> + QT_USE_NAMESPACE +namespace { + +static constexpr auto channelOpenTimeoutMs = std::chrono::milliseconds{20000}; + +} // namespace + @implementation DarwinBTRFCOMMChannel { QT_PREPEND_NAMESPACE(DarwinBluetooth)::ChannelDelegate *delegate; IOBluetoothDevice *device; IOBluetoothRFCOMMChannel *channel; bool connected; + std::unique_ptr<QTimer> channelOpenTimer; } - (id)initWithDelegate:(DarwinBluetooth::ChannelDelegate *)aDelegate @@ -89,12 +98,24 @@ const IOReturn status = [device openRFCOMMChannelAsync:&channel withChannelID:channelID delegate:self]; if (status != kIOReturnSuccess) { - qCCritical(QT_BT_DARWIN) << "failed to open L2CAP channel"; + qCCritical(QT_BT_DARWIN) << "failed to open RFCOMM channel"; // device is still autoreleased. device = nil; return status; } + if (!channelOpenTimer) { + channelOpenTimer.reset(new QTimer); + QObject::connect(channelOpenTimer.get(), &QTimer::timeout, + channelOpenTimer.get(), [self]() { + qCDebug(QT_BT_DARWIN) << "Could not open the RFCOMM channel within the specified " + "timeout. Assuming that the remote device is not available."; + [self handleChannelOpenTimeout]; + }); + channelOpenTimer->setSingleShot(true); + } + channelOpenTimer->start(channelOpenTimeoutMs); + [channel retain];// What if we're closed already? [device retain]; @@ -121,10 +142,13 @@ { Q_UNUSED(rfcommChannel); + Q_ASSERT_X(channelOpenTimer.get(), Q_FUNC_INFO, "invalid timer (null)"); Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)"); + channelOpenTimer->stop(); if (error != kIOReturnSuccess) { delegate->setChannelError(error); + delegate->channelClosed(); } else { connected = true; delegate->channelOpenComplete(); @@ -221,5 +245,14 @@ return [channel writeAsync:data length:length refcon:nullptr]; } +- (void)handleChannelOpenTimeout +{ + Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)"); + Q_ASSERT_X(channel, Q_FUNC_INFO, "invalid RFCOMM channel"); + + delegate->setChannelError(kIOReturnNotOpen); + [channel closeChannel]; + delegate->channelClosed(); +} @end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/darwin/btrfcommchannel_p.h new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/darwin/btrfcommchannel_p.h --- old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/darwin/btrfcommchannel_p.h 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/darwin/btrfcommchannel_p.h 2024-09-19 20:58:48.000000000 +0200 @@ -67,6 +67,8 @@ - (IOReturn) writeSync:(void*)data length:(UInt16)length; - (IOReturn) writeAsync:(void*)data length:(UInt16)length; +- (void)handleChannelOpenTimeout; + @end QT_NAMESPACE_ALIAS_OBJC_CLASS(DarwinBTRFCOMMChannel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/qbluetoothlocaldevice.cpp new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/qbluetoothlocaldevice.cpp --- old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/qbluetoothlocaldevice.cpp 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/qbluetoothlocaldevice.cpp 2024-09-19 20:58:48.000000000 +0200 @@ -74,8 +74,8 @@ as service discovery can be skipped on devices not in LimitedInquiry mode. In this mode, the device will be connectable and powered on, if required. This mode is is not supported on Android. - \note On \macos, it is not possible to set the \l hostMode() to - HostConnectable or HostPoweredOff. + \note On \macos, it is not possible to set the \l hostMode(). The + reported host modes are limited to HostPoweredOff and HostConnectable. \note On Windows, it is not possible to set the \l hostMode() to HostDiscoverable or HostDiscoverableLimitedInquiry. Using these modes is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/qbluetoothlocaldevice_macos.mm new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/qbluetoothlocaldevice_macos.mm --- old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/qbluetoothlocaldevice_macos.mm 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/qbluetoothlocaldevice_macos.mm 2024-09-19 20:58:48.000000000 +0200 @@ -18,15 +18,33 @@ #include <Foundation/Foundation.h> #include <IOBluetooth/IOBluetooth.h> +#include <CoreBluetooth/CoreBluetooth.h> #include <algorithm> QT_BEGIN_NAMESPACE +class QBluetoothLocalDevicePrivate; +QT_END_NAMESPACE + +@interface QT_MANGLE_NAMESPACE(QDarwinBluetoothStateMonitor) : NSObject <CBCentralManagerDelegate> + +@property (strong, nonatomic) CBCentralManager *manager; +@property (assign, nonatomic) QT_PREPEND_NAMESPACE(QBluetoothLocalDevicePrivate) *localDevicePrivate; + +- (instancetype)initWith:(QT_PREPEND_NAMESPACE(QBluetoothLocalDevicePrivate) *)localDevicePrivate; +- (CBManagerState)currentState; +- (void)startMonitoring; +- (void)stopMonitoring; + +@end + +QT_BEGIN_NAMESPACE class QBluetoothLocalDevicePrivate : public DarwinBluetooth::PairingDelegate, public DarwinBluetooth::ConnectionMonitor { friend class QBluetoothLocalDevice; + Q_DECLARE_PUBLIC(QBluetoothLocalDevice) public: typedef QBluetoothLocalDevice::Pairing Pairing; @@ -38,6 +56,8 @@ void requestPairing(const QBluetoothAddress &address, Pairing pairing); Pairing pairingStatus(const QBluetoothAddress &address) const; + void bluetoothStateChanged(CBManagerState newState); + private: // PairingDelegate: @@ -59,6 +79,9 @@ void unpair(const QBluetoothAddress &deviceAddress); + DarwinBluetooth::ObjCScopedPointer<QT_MANGLE_NAMESPACE(QDarwinBluetoothStateMonitor)> bluetoothStateMonitor; + QBluetoothLocalDevice::HostMode hostMode = QBluetoothLocalDevice::HostMode::HostPoweredOff; + QBluetoothLocalDevice *q_ptr; using HostController = DarwinBluetooth::ObjCScopedPointer<IOBluetoothHostController>; @@ -113,14 +136,45 @@ // This one is optional, if it fails to initialize, we do not care at all. connectionMonitor.reset([[DarwinBTConnectionMonitor alloc] initWithMonitor:this], DarwinBluetooth::RetainPolicy::noInitialRetain); + // Set the initial host mode + if ([hostController powerState]) + hostMode = QBluetoothLocalDevice::HostConnectable; + else + hostMode = QBluetoothLocalDevice::HostPoweredOff; + + // Start monitoring for bluetooth state changes + bluetoothStateMonitor.reset([[QT_MANGLE_NAMESPACE(QDarwinBluetoothStateMonitor) alloc] initWith:this], + DarwinBluetooth::RetainPolicy::doInitialRetain); + [bluetoothStateMonitor startMonitoring]; } QBluetoothLocalDevicePrivate::~QBluetoothLocalDevicePrivate() { - + [bluetoothStateMonitor stopMonitoring]; [connectionMonitor stopMonitoring]; } +void QBluetoothLocalDevicePrivate::bluetoothStateChanged(CBManagerState state) +{ + Q_Q(QBluetoothLocalDevice); + qCDebug(QT_BT_DARWIN) << "Bluetooth state changed to" << state; + // States other than 'powered ON' and 'powered OFF' are ambiguous to map + // unto Qt HostModes. For example lack of permissions might temporarily + // generate an 'unauthorized' state irrespective of bluetooth power state. + QBluetoothLocalDevice::HostMode mode; + if (state == CBManagerState::CBManagerStatePoweredOff) + mode = QBluetoothLocalDevice::HostPoweredOff; + else if (state == CBManagerState::CBManagerStatePoweredOn) + mode = QBluetoothLocalDevice::HostConnectable; + else + return; + + if (hostMode != mode) { + hostMode = mode; + emit q->hostModeStateChanged(hostMode); + } +} + bool QBluetoothLocalDevicePrivate::isValid() const { return hostController; @@ -375,10 +429,22 @@ QBluetoothLocalDevice::HostMode QBluetoothLocalDevice::hostMode() const { - if (!isValid() || ![d_ptr->hostController powerState]) + Q_D(const QBluetoothLocalDevice); + if (!isValid()) return HostPoweredOff; - return HostConnectable; + auto state = [d->bluetoothStateMonitor currentState]; + // If the monitored state is unknown or ambiguous, use the HCI state directly. + // Otherwise use the monitored state. We can't use HCI state always, because there can + // be a significant delay from "monitored state change" to "HCI state change", causing + // handlers of hostModeStateChanged() signal to perceive conflicting results (signal + // parameter value vs. what this getter returns). + if (state == CBManagerState::CBManagerStatePoweredOff) + return HostPoweredOff; + else if (state == CBManagerState::CBManagerStatePoweredOn) + return HostConnectable; + + return [d->hostController powerState] ? HostConnectable : HostPoweredOff; } QList<QBluetoothAddress> QBluetoothLocalDevice::connectedDevices() const @@ -455,3 +521,45 @@ } QT_END_NAMESPACE + +@implementation QT_MANGLE_NAMESPACE(QDarwinBluetoothStateMonitor) + +- (instancetype)initWith:(QT_PREPEND_NAMESPACE(QBluetoothLocalDevicePrivate) *)localDevicePrivate +{ + if ((self = [super init])) { + self.manager = nil; + self.localDevicePrivate = localDevicePrivate; + } + return self; +} + +- (void)startMonitoring +{ + if (self.manager != nil) + return; + self.manager = [[CBCentralManager alloc] initWithDelegate:self queue:nil]; +} + +- (void)stopMonitoring +{ + if (self.manager == nil) + return; + self.manager.delegate = nil; + self.manager = nil; +} + +- (CBManagerState)currentState +{ + Q_ASSERT(self.manager); + return self.manager.state; +} + +- (void)centralManagerDidUpdateState:(CBCentralManager *)aManager +{ + Q_ASSERT(self.manager); + Q_ASSERT(self.localDevicePrivate); + Q_ASSERT(self.manager == aManager); + self.localDevicePrivate->bluetoothStateChanged(aManager.state); +} + +@end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/qbluetoothsocket_macos.mm new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/qbluetoothsocket_macos.mm --- old/qtconnectivity-everywhere-src-6.7.2/src/bluetooth/qbluetoothsocket_macos.mm 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/bluetooth/qbluetoothsocket_macos.mm 2024-09-19 20:58:48.000000000 +0200 @@ -497,6 +497,8 @@ // (thus close/abort probably will not work). if (!isConnecting) { + if (state == QBluetoothSocket::SocketState::ConnectedState) + q_ptr->setSocketError(QBluetoothSocket::SocketError::RemoteHostClosedError); q_ptr->setOpenMode(QIODevice::NotOpen); q_ptr->setSocketState(QBluetoothSocket::SocketState::UnconnectedState); emit q_ptr->readChannelFinished(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtconnectivity-everywhere-src-6.7.2/src/tools/sdpscanner/main.cpp new/qtconnectivity-everywhere-src-6.7.3/src/tools/sdpscanner/main.cpp --- old/qtconnectivity-everywhere-src-6.7.2/src/tools/sdpscanner/main.cpp 2024-06-08 01:54:23.000000000 +0200 +++ new/qtconnectivity-everywhere-src-6.7.3/src/tools/sdpscanner/main.cpp 2024-09-19 20:58:48.000000000 +0200 @@ -60,7 +60,8 @@ xmlOutput.append(snBuffer); break; case SDP_UINT64: - qsnprintf(snBuffer, BUFFER_SIZE, "<uint64 value=\"0x%016x\"/>\n", data->val.uint64); + qsnprintf(snBuffer, BUFFER_SIZE, "<uint64 value=\"0x%016llx\"/>\n", + qulonglong(data->val.uint64)); xmlOutput.append(snBuffer); break; case SDP_UINT128: @@ -83,7 +84,8 @@ xmlOutput.append(snBuffer); break; case SDP_INT64: - qsnprintf(snBuffer, BUFFER_SIZE, "<int64 value=\"%d\"/>/n", data->val.int64); + qsnprintf(snBuffer, BUFFER_SIZE, "<int64 value=\"%lld\"/>/n", + qlonglong(data->val.int64)); xmlOutput.append(snBuffer); break; case SDP_INT128:

1 0

commit qt6-charts for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-charts for openSUSE:Factory checked in at 2024-10-03 18:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-charts (Old) and /work/SRC/openSUSE:Factory/.qt6-charts.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-charts" Thu Oct 3 18:01:49 2024 rev:29 rq:1205119 version:6.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-charts/qt6-charts.changes 2024-06-24 20:49:36.448216646 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-charts.new.19354/qt6-charts.changes 2024-10-03 18:01:49.757807411 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:22:55 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +------------------------------------------------------------------- Old: ---- qtcharts-everywhere-src-6.7.2.tar.xz New: ---- qtcharts-everywhere-src-6.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-charts.spec ++++++ --- /var/tmp/diff_new_pack.HDwhWp/_old 2024-10-03 18:01:50.837852376 +0200 +++ /var/tmp/diff_new_pack.HDwhWp/_new 2024-10-03 18:01:50.841852543 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define short_name qtcharts %define tar_name qtcharts-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-charts%{?pkg_suffix} -Version: 6.7.2 +Version: 6.7.3 Release: 0 Summary: Qt 6 Charts library License: GPL-3.0-or-later ++++++ qtcharts-everywhere-src-6.7.2.tar.xz -> qtcharts-everywhere-src-6.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcharts-everywhere-src-6.7.2/.cmake.conf new/qtcharts-everywhere-src-6.7.3/.cmake.conf --- old/qtcharts-everywhere-src-6.7.2/.cmake.conf 2024-06-08 04:17:06.000000000 +0200 +++ new/qtcharts-everywhere-src-6.7.3/.cmake.conf 2024-09-19 23:16:10.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcharts-everywhere-src-6.7.2/.tag new/qtcharts-everywhere-src-6.7.3/.tag --- old/qtcharts-everywhere-src-6.7.2/.tag 2024-06-08 04:17:06.000000000 +0200 +++ new/qtcharts-everywhere-src-6.7.3/.tag 2024-09-19 23:16:10.000000000 +0200 @@ -1 +1 @@ -f7d0fbc2a5cda51ccf6a182a2a1681165d06209b +018428f7b6dab8d87550c12f9812d8bf82eff9b2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcharts-everywhere-src-6.7.2/dependencies.yaml new/qtcharts-everywhere-src-6.7.3/dependencies.yaml --- old/qtcharts-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 04:17:06.000000000 +0200 +++ new/qtcharts-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 23:16:10.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: b5fbe0923cfc566036b83c3d968f225b26117efc + ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: - ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc + ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: false ../qtmultimedia: - ref: a3f871eb133673ea5460425712cc68d7458bf0ef + ref: 18432b64c292b585f1bb1faf4570113d7162efdc required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcharts-everywhere-src-6.7.2/src/charts/axis/horizontalaxis.cpp new/qtcharts-everywhere-src-6.7.3/src/charts/axis/horizontalaxis.cpp --- old/qtcharts-everywhere-src-6.7.2/src/charts/axis/horizontalaxis.cpp 2024-06-08 04:17:06.000000000 +0200 +++ new/qtcharts-everywhere-src-6.7.3/src/charts/axis/horizontalaxis.cpp 2024-09-19 23:16:10.000000000 +0200 @@ -24,6 +24,10 @@ { Q_UNUSED(constraint); QSizeF sh(0,0); + // Size hint from here is used as the base for label size hints; if labels are not + // visible, we need to increase the size or we end up showing "..." when + // the title should be visible + qreal labelPaddingFactor = labelsVisible() ? 1 : 2; if (axis()->titleText().isEmpty() || !titleItem()->isVisible()) return sh; @@ -32,13 +36,16 @@ case Qt::MinimumSize: { QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), QStringLiteral("...")); - sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2.0)); + sh = QSizeF(titleRect.width(), + labelPaddingFactor * (titleRect.height() + (titlePadding() * 2.0))); break; } case Qt::MaximumSize: case Qt::PreferredSize: { - QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText()); - sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2.0)); + QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), + axis()->titleText()); + sh = QSizeF(titleRect.width(), + labelPaddingFactor * (titleRect.height() + (titlePadding() * 2.0))); break; } default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcharts-everywhere-src-6.7.2/src/charts/axis/verticalaxis.cpp new/qtcharts-everywhere-src-6.7.3/src/charts/axis/verticalaxis.cpp --- old/qtcharts-everywhere-src-6.7.2/src/charts/axis/verticalaxis.cpp 2024-06-08 04:17:06.000000000 +0200 +++ new/qtcharts-everywhere-src-6.7.3/src/charts/axis/verticalaxis.cpp 2024-09-19 23:16:10.000000000 +0200 @@ -24,6 +24,10 @@ { Q_UNUSED(constraint); QSizeF sh(0, 0); + // Size hint from here is used as the base for label size hints; if labels are not + // visible, we need to increase the size or we end up showing "..." when + // the title should be visible + qreal labelPaddingFactor = labelsVisible() ? 1 : 2; if (axis()->titleText().isEmpty() || !titleItem()->isVisible()) return sh; @@ -32,13 +36,16 @@ case Qt::MinimumSize: { QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), QStringLiteral("...")); - sh = QSizeF(titleRect.height() + (titlePadding() * 2.0), titleRect.width()); + sh = QSizeF(labelPaddingFactor * (titleRect.height() + (titlePadding() * 2.0)), + titleRect.width()); break; } case Qt::MaximumSize: case Qt::PreferredSize: { - QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText()); - sh = QSizeF(titleRect.height() + (titlePadding() * 2.0), titleRect.width()); + QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), + axis()->titleText()); + sh = QSizeF(labelPaddingFactor * (titleRect.height() + (titlePadding() * 2.0)), + titleRect.width()); break; } default:

1 0

commit python-urllib3 for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-urllib3 for openSUSE:Factory checked in at 2024-10-03 18:00:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-urllib3 (Old) and /work/SRC/openSUSE:Factory/.python-urllib3.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-urllib3" Thu Oct 3 18:00:38 2024 rev:68 rq:1205339 version:2.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-urllib3/python-urllib3.changes 2024-06-18 22:50:49.788502503 +0200 +++ /work/SRC/openSUSE:Factory/.python-urllib3.new.19354/python-urllib3.changes 2024-10-03 18:00:51.163367944 +0200 @@ -1,0 +2,56 @@ +Thu Oct 3 05:10:09 UTC 2024 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Update to 2.2.3: + * Features + + Added support for Python 3.13. + * Bugfixes + + Fixed the default encoding of chunked request bodies to be UTF-8 + instead of ISO-8859-1. All other methods of supplying a request body + already use UTF-8 starting in urllib3 v2.0. + + Fixed ResourceWarning on CONNECT with Python < 3.11.4 by backporting + python/cpython#103472. + + Fixed a crash where certain standard library hash functions were absent + in restricted environments. + + Added the Proxy-Authorization header to the list of headers to strip + from requests when redirecting to a different host. As before, + different headers can be set via Retry.remove_headers_on_redirect. + + Allowed passing negative integers as amt to read methods of + http.client.HTTPResponse as an alternative to None. + + Fixed issue where InsecureRequestWarning was emitted for HTTPS + connections when using Emscripten. + + Fixed HTTPConnectionPool.urlopen to stop automatically casting + non-proxy headers to HTTPHeaderDict. This change was premature as it + did not apply to proxy headers and HTTPHeaderDict does not handle byte + header values correctly yet. + + Changed InvalidChunkLength to ProtocolError when response terminates + before the chunk length is sent. + + Changed ProtocolError to be more verbose on incomplete reads with + excess content. + + Added support for HTTPResponse.read1() method. + + Fixed issue where requests against urls with trailing dots were + failing due to SSL errors when using proxy. + + Fixed HTTPConnection.proxy_is_verified and + HTTPSConnection.proxy_is_verified to be always set to a boolean after + connecting to a proxy. It could be None in some cases previously. + + Fixed an issue where headers passed in a request with json= would be + mutated + + Fixed HTTPSConnection.is_verified to be set to False when connecting + from a HTTPS proxy to an HTTP target. It was set to True previously. + + Fixed handling of new error message from OpenSSL 3.2.0 when configuring + an HTTP proxy as HTTPS + + Fixed TLS 1.3 post-handshake auth when the server certificate + validation is disabled + * HTTP/2 (experimental) + + Excluded Transfer-Encoding: chunked from HTTP/2 request body + + Added a probing mechanism for determining whether a given target + origin supports HTTP/2 via ALPN. + + Add support for sending a request body with HTTP/2 + * Removals + + Drop support for end-of-life PyPy3.8 and PyPy3.9. +- Drop patches, they are now included upstream: + * CVE-2024-37891.patch + * openssl-3.2.patch +- Included patched hypercorn, which is only unpacked and used for the test + suite. + +------------------------------------------------------------------- Old: ---- CVE-2024-37891.patch openssl-3.2.patch urllib3-2.1.0.tar.gz New: ---- hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz urllib3-2.2.3.tar.gz BETA DEBUG BEGIN: Old:- Drop patches, they are now included upstream: * CVE-2024-37891.patch * openssl-3.2.patch Old: * CVE-2024-37891.patch * openssl-3.2.patch - Included patched hypercorn, which is only unpacked and used for the test BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-urllib3.spec ++++++ --- /var/tmp/diff_new_pack.yFxZeI/_old 2024-10-03 18:00:51.667388928 +0200 +++ /var/tmp/diff_new_pack.yFxZeI/_new 2024-10-03 18:00:51.671389095 +0200 @@ -18,6 +18,8 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" +# No Quart for Python 3.10 +%define skip_python310 1 %define psuffix -test %bcond_without test %else @@ -26,42 +28,45 @@ %endif %{?sle15_python_module_pythons} Name: python-urllib3%{psuffix} -Version: 2.1.0 +Version: 2.2.3 Release: 0 Summary: HTTP library with thread-safe connection pooling, file post, and more License: MIT URL: https://urllib3.readthedocs.org/ Source: https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-%{version}… -# PATCH-FIX-OPENSUSE openssl-3.2.patch gh#urllib3/urllib3#3271 -Patch1: openssl-3.2.patch -# PATCH-FIX-UPSTREAM https://github.com/urllib3/urllib3/commit/accff72ecc2f6cf5a76d9570198a93ac7… Strip Proxy-Authorization header on redirects -Patch2: CVE-2024-37891.patch -BuildRequires: %{python_module base >= 3.7} +# https://github.com/urllib3/urllib3/issues/3334 +%define hypercorn_commit d1719f8c1570cbd8e6a3719ffdb14a4d72880abb +Source1: https://github.com/urllib3/hypercorn/archive/%{hypercorn_commit}/hypercorn-… +BuildRequires: %{python_module base >= 3.8} +BuildRequires: %{python_module hatch-vcs} BuildRequires: %{python_module hatchling} BuildRequires: %{python_module pip} BuildRequires: fdupes BuildRequires: python-rpm-macros #!BuildIgnore: python-requests Requires: ca-certificates-mozilla -Requires: python-certifi -Requires: python-cryptography >= 1.9 -Requires: python-idna >= 3.4 -Requires: python-pyOpenSSL >= 23.2.0 Recommends: python-Brotli >= 1.0.9 Recommends: python-PySocks >= 1.7.1 +Recommends: python-h2 >= 4 +Recommends: python-zstandard >= 0.18 BuildArch: noarch %if %{with test} BuildRequires: %{python_module Brotli >= 1.0.9} BuildRequires: %{python_module PySocks >= 1.7.1} -BuildRequires: %{python_module certifi} -BuildRequires: %{python_module cryptography >= 1.9} +BuildRequires: %{python_module Quart >= 0.19} +BuildRequires: %{python_module cryptography >= 43} BuildRequires: %{python_module flaky} -BuildRequires: %{python_module idna >= 3.4} +BuildRequires: %{python_module h2 >= 4.1} +BuildRequires: %{python_module httpx >= 0.25} +BuildRequires: %{python_module idna >= 3.7} BuildRequires: %{python_module psutil} +BuildRequires: %{python_module pyOpenSSL >= 24.2} BuildRequires: %{python_module pytest >= 7.4.0} +BuildRequires: %{python_module pytest-socket >= 0.7} BuildRequires: %{python_module pytest-timeout >= 2.1.0} BuildRequires: %{python_module pytest-xdist} -BuildRequires: %{python_module tornado >= 6.2} +BuildRequires: %{python_module quart-trio >= 0.11} +BuildRequires: %{python_module trio >= 0.26} BuildRequires: %{python_module trustme >= 0.9.0} BuildRequires: %{python_module urllib3 >= %{version}} BuildRequires: timezone @@ -88,6 +93,11 @@ %prep %autosetup -p1 -n urllib3-%{version} +# https://github.com/urllib3/urllib3/issues/3334 +%if %{with test} +mkdir ../patched-hypercorn +tar -C ../patched-hypercorn -zxf %{SOURCE1} +%endif find . -type f -exec chmod a-x '{}' \; find . -name __pycache__ -type d -exec rm -fr {} + @@ -104,6 +114,8 @@ %if %{with test} %check +# https://github.com/urllib3/urllib3/issues/3334 +export PYTHONPATH="$PWD/../patched-hypercorn/hypercorn-%{hypercorn_commit}/src" # gh#urllib3/urllib3#2109 export CI="true" # skip some randomly failing tests (mostly on i586, but sometimes they fail on other architectures) @@ -116,6 +128,8 @@ skiplist+=" or test_requesting_large_resources_via_ssl" # Try to access external evil.com skiplist+=" or test_deprecated_no_scheme" +# weird threading issues on OBS runners +skiplist+=" or test_http2_probe_blocked_per_thread" %pytest %{?jobs:-n %jobs} -k "not (${skiplist})" --ignore test/with_dummyserver/test_socketlevel.py %endif @@ -124,6 +138,6 @@ %license LICENSE.txt %doc CHANGES.rst README.md %{python_sitelib}/urllib3 -%{python_sitelib}/urllib3-%{version}*-info +%{python_sitelib}/urllib3-%{version}.dist-info %endif ++++++ urllib3-2.1.0.tar.gz -> urllib3-2.2.3.tar.gz ++++++ ++++ 10989 lines of diff (skipped)

1 0

commit open-iscsi for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2024-10-03 18:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi" Thu Oct 3 18:00:34 2024 rev:133 rq:1205287 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2023-12-26 18:27:12.817279758 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new.19354/open-iscsi.changes 2024-10-03 18:00:47.311207566 +0200 @@ -1,0 +2,24 @@ +Mon Sep 30 19:25:24 UTC 2024 - lduncan(a)suse.com + +- Update to version 2.1.10.suse+51.fea0fde82ed1: + * Incudes upstream version 2.1.10 plus some fixes + * Fix firmware targets startup to always be "onboot" (#482) + (bsc#1228084) + * Change a discovery function to void return type (#481) + * Fix gcc issues (#480) + * Bugfix read specific sysfs value "off" of session attribute (#466) + * Fix bug where abort_tmo read failures were ignored. (#467) + * grammar nitpicks (#464) + * Fix memory leak in iscsi_check_session_use_count (#465) + * improve the comments in idbm_lock() (#458) + * Make it visible when memory allocation failure (#457) + * Better handle multiple iscsiadm commands (#453) + * iscsiadm: allow hostnames in node-mode commands (#451) + * Modify how workqueue priority is set (#445) + * Fix authmethod check by printing a warning message when CHAP used and authmethod=None (#443) + * iscsid: Rescan devices on relogin (#444) + * Adds missing characters in README. (#440) + * Turn off iSCSI NOP-Outs, by default. + * fix: add usr/iscsid_req.h missinig underline (#431) (#436) + +------------------------------------------------------------------- Old: ---- open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz New: ---- open-iscsi-2.1.10.suse+52.9a4cb8fdee02.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.xNkxlV/_old 2024-10-03 18:00:48.907274016 +0200 +++ /var/tmp/diff_new_pack.xNkxlV/_new 2024-10-03 18:00:48.911274182 +0200 @@ -1,7 +1,7 @@ # # spec file for package open-iscsi # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,13 +46,13 @@ %endif %define iscsi_minor_release 1 -%define iscsi_patch_release 9 +%define iscsi_patch_release 10 %define iscsi_patch_release_suse %{iscsi_patch_release}.suse -%define iscsi_service_tag 844.d557967bc9ae +%define iscsi_service_tag 52.9a4cb8fdee02 %define libname libopeniscsiusr0 %define libversion 0.2.0 Name: open-iscsi -Version: 2.1.9 +Version: 2.1.10 Release: 0 Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.xNkxlV/_old 2024-10-03 18:00:49.111282509 +0200 +++ /var/tmp/diff_new_pack.xNkxlV/_new 2024-10-03 18:00:49.143283841 +0200 @@ -3,9 +3,9 @@ <param name="url">https://github.com/openSUSE/open-iscsi.git</param> <param name="scm">git</param> <param name="filename">open-iscsi</param> - <param name="version">d557967bc9ae</param> - <param name="versionformat">2.1.9.suse+@TAG_OFFSET@.%h</param> - <param name="match-tag">2.1.[0-9]</param> + <param name="version">fea0fde82ed1</param> + <param name="versionformat">2.1.10.suse+@TAG_OFFSET@.%h</param> + <param name="match-tag">2.1.[0-9]*</param> <param name="revision">openSUSE-Factory</param> <param name="changesgenerate">enable</param> <param name="exclude">.git</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.xNkxlV/_old 2024-10-03 18:00:49.271289171 +0200 +++ /var/tmp/diff_new_pack.xNkxlV/_new 2024-10-03 18:00:49.299290337 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/open-iscsi.git</param> - <param name="changesrevision">d557967bc9aeaa9aa4f62b443c0aec48a8e8e046</param></service></servicedata> + <param name="changesrevision">fea0fde82ed1f2974839501bf68121d9ad0fc4b5</param></service></servicedata> (No newline at EOF) ++++++ open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz -> open-iscsi-2.1.10.suse+52.9a4cb8fdee02.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Changelog new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Changelog --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Changelog 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Changelog 2024-10-01 21:06:22.000000000 +0200 @@ -1,3 +1,38 @@ +-> open-iscsi-2.1.9 - open-iscsi-2.1.10 + +Chris Leech (1): + remove unicode symbol from iscsid.conf (#423) + +Christian Steinert (1): + Adds missing characters in README. (#440) + +Daniel Moulton (1): + Incorrect documentation for `iscsiadm -m session` print level (#432) + +Fabrice Fontaine (1): + usr/idbm.c: fix musl build (#426) + +Graham Inggs (1): + discoveryd: fix additional format overflow warnings (#425) + +Lee Duncan (9): + iscsiuio build: use correct new version (#422) + Iscsiuio fixes v2 (#427) + iscsiuio: manage threads better at shutdown (#428) + iscsiuio: update version to 0.7.8.8 (#429) + Stop using deprecated inet_aton and inet_ntoa (#435) + Fix authmethod check by printing a warning message when CHAP used and authmethod=None (#443) + Modify how workqueue priority is set (#445) + iscsiadm: allow hostnames in node-mode commands (#451) + Better handle multiple iscsiadm commands (#453) + +cooper.wu (1): + fix: add usr/iscsid_req.h missinig underline (#431) (#436) + +mikechristie (1): + iscsid: Rescan devices on relogin (#444) + + -> open-iscsi-2.1.8 - open-iscsi-2.1.9 Chris Leech (5): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Makefile new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Makefile --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/Makefile 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/Makefile 2024-10-01 21:06:22.000000000 +0200 @@ -7,7 +7,7 @@ DESTDIR ?= # our VERSION String -ISCSI_VERSION_STR ?= 2.1.9 +ISCSI_VERSION_STR ?= 2.1.10 prefix = /usr exec_prefix = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/README new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/README --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/README 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/README 2024-10-01 21:06:22.000000000 +0200 @@ -182,9 +182,9 @@ ==================== The iscsid daemon implements control path of iSCSI protocol, plus some -anagement facilities. For example, the daemon could be configured to -utomatically re-start discovery at startup, based on the contents of -ersistent iSCSI database (see next section). +management facilities. For example, the daemon could be configured to +automatically re-start discovery at startup, based on the contents of +persistent iSCSI database (see next section). For help, run: @@ -1603,12 +1603,14 @@ node.conn[0].timeo.noop_out_interval = X -Where X is in seconds and the default is 10 seconds. To control the -timeout for the NOP-Out the noop_out_timeout value can be used: +Where X is in seconds and the default is 0 seconds, which that NOP-outs +should be disabled. Upstream default is 5 seconds. + +o control the timeout for the NOP-Out the noop_out_timeout value can be used: node.conn[0].timeo.noop_out_timeout = X -Again X is in seconds and the default is 15 seconds. +Again X is in seconds and the default is 5 seconds. Normally for these values you can use: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/doc/iscsiadm.8.template new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/doc/iscsiadm.8.template --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/doc/iscsiadm.8.template 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/doc/iscsiadm.8.template 2024-10-01 21:06:22.000000000 +0200 @@ -186,12 +186,12 @@ .TP .B Home Directory The \fIhome directory\fR for open-iscsi is @HOMEDIR@. This is -where it keeps it's configuration file (\fIiscsid.conf\fR) and it's +where it keeps its configuration file (\fIiscsid.conf\fR) and its initiator name file (\fIinitiatorname.iscsi\fR). .TP .B Database Root Directory The \fIdatabase root directory\fR for open-iscsi is @DBROOT@. This -is where it keeps its flat database files, such as it's list of \fInode\fRs +is where it keeps its flat database files, such as its list of \fInode\fRs (see below). .SH OPTIONS .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/etc/iscsid.conf new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/etc/iscsid.conf --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/etc/iscsid.conf 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/etc/iscsid.conf 2024-10-01 21:06:22.000000000 +0200 @@ -64,6 +64,13 @@ # To enable CHAP authentication set node.session.auth.authmethod # to CHAP. The default is None. +# +# NOTE: currently this attribute is checked for validity but then +# ignored, so even if it is set to None, CHAP will be used if the +# credentials (username/password and possibly username_in/password_in) +# are set. This behavior is deprecated, and in the future CHAP will +# not be used if authmethod is set to None. +# #node.session.auth.authmethod = CHAP # To configure which CHAP algorithms to enable, set @@ -86,6 +93,9 @@ # To enable CHAP authentication for a discovery session to the target, # set discovery.sendtargets.auth.authmethod to CHAP. The default is None. +# +# See NOTE above for node.session.auth.authmethod being mostly ignored. +# #discovery.sendtargets.auth.authmethod = CHAP # To set a discovery session CHAP username and password for the initiator @@ -124,8 +134,9 @@ node.conn[0].timeo.logout_timeout = 15 # Time interval to wait for on connection before sending a ping. -# The value is in seconds and the default is 5 seconds. -node.conn[0].timeo.noop_out_interval = 5 +# The value is in seconds and the default is 0, which means +# do not send any NOOPs. Upstream default is 5 seconds. +node.conn[0].timeo.noop_out_interval = 0 # To specify the time to wait for a Nop-out response before failing # the connection, edit this line. Failing the connection will @@ -214,8 +225,21 @@ # Note: For cxgb3i, you must set all sessions to the same value. # Otherwise the behavior is not defined. # -# The default value is -20. The setting must be between -20 and 20. -node.session.xmit_thread_priority = -20 +# This is done by scanning /proc/PID/stat, and this doesn't work in +# newer kernels (6.* on), as the workqueue transmit thread can be +# passive, and not show in in the process table when not actively +# doing work. If the proper workqueue process is found, and the +# priority value is non-zero, then the priority of that process will +# be modified when a session is created. +# +# Note: as mentioned above, the default value is now zero, which means +# that we don't do anything to the transmit workqueue process priority, +# by default. If you wish to get the previous behavior, set this value +# to -20. In the future, this functionality will be removed, once this +# functionality is no longer needed or works. +# +# The default value is 0. The setting must be between -20 and 20. +# node.session.xmit_thread_priority = 0 #*************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.c 2024-10-01 21:06:22.000000000 +0200 @@ -315,27 +315,41 @@ db = ctx->db; + /* if DB is already being used just increment count and return */ if (db->refs > 0) { db->refs++; return 0; } + /* DB is not being used -- ensure there is a lock dir */ if (access(LOCK_DIR, F_OK) != 0) { - if (mkdir(LOCK_DIR, 0770) != 0) { - _error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno, - _strerror(errno, strerr_buff)); + if ((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) { + _error(ctx, "Could not open %s: %d: %s", LOCK_DIR, + errno, _strerror(errno, strerr_buff)); return LIBISCSI_ERR_IDBM; } } + /* create the lock file, if needed */ fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666); - if (fd >= 0) - close(fd); + if (fd < 0) { + _error(ctx, "Could not open/create lock file: %s", LOCK_FILE); + return LIBISCSI_ERR_IDBM; + } + close(fd); - for (i = 0; i < 3000; i++) { + /* + * try to create a link from the lock file to the + * lock "write" file, retrying everying 10 miliseconds + * for up to 30 seconds! + * + * XXX: very long -- should be configurable? + */ + for (i = 0; i < DB_LOCK_RETRIES; i++) { ret = link(LOCK_FILE, LOCK_WRITE_FILE); if (ret == 0) - break; + break; /* success */ + errno_save = errno; if (errno != EEXIST) { @@ -344,20 +358,27 @@ LOCK_WRITE_FILE, errno_save, _strerror(errno_save, strerr_buff)); return LIBISCSI_ERR_IDBM; - } else if (i == 0) + } + + /* print info the first time through this loop */ + if (i == 0) _debug(ctx, "Waiting for discovery DB lock on %s", LOCK_WRITE_FILE); - usleep(10000); + usleep(DB_LOCK_USECS_WAIT); } if (ret != 0) { - _error(ctx, "Timeout on acquiring lock on DB: %s, errno: %d %s", + _error(ctx, "Timeout on acquiring lock on DB: %s, %d: %s", LOCK_WRITE_FILE, errno_save, _strerror(errno_save, strerr_buff)); return LIBISCSI_ERR_IDBM; } + /* + * if we get here, we were able to "own" the DB by creating + * a link, so we are now the only DB user + */ db->refs = 1; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/idbm.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/idbm.h 2024-10-01 21:06:22.000000000 +0200 @@ -40,6 +40,12 @@ #define BOOT_NAME_MAXLEN 256 #define IDBM_DUMP_SIZE 8192 +/* + * wait up to DB_LOCK_USECS_WAIT * DB_LOCK_RETRIES to a cquire + * the DB lock, before giving up + */ +#define DB_LOCK_USECS_WAIT 10000 /* per-loop waiting for lock */ +#define DB_LOCK_RETRIES 3000 /* number of retries */ struct __DLL_LOCAL idbm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/sysfs.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/sysfs.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/libopeniscsiusr/sysfs.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/libopeniscsiusr/sysfs.c 2024-10-01 21:06:22.000000000 +0200 @@ -285,14 +285,18 @@ } } - errno = 0; - tmp_val = strtoll((const char *) buff, NULL, 10 /* base */); - errno_save = errno; - if ((errno_save != 0) && (! ignore_error)) { - rc = LIBISCSI_ERR_BUG; - _error(ctx, "Sysfs: %s: Error when converting '%s' " - "to number", file_path, (char *) buff, errno_save); - goto out; + if (strncmp((const char *) buff, "off", 3) == 0) { + tmp_val = -1; + } else { + errno = 0; + tmp_val = strtoll((const char *) buff, NULL, 10 /* base */); + errno_save = errno; + if ((errno_save != 0) && (! ignore_error)) { + rc = LIBISCSI_ERR_BUG; + _error(ctx, "Sysfs: %s: Error when converting '%s' " + "to number", file_path, (char *) buff, errno_save); + goto out; + } } *val = tmp_val; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/meson.build new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/meson.build --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/meson.build 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/meson.build 2024-10-01 21:06:22.000000000 +0200 @@ -4,7 +4,7 @@ project('open-iscsi', 'c', meson_version: '>= 0.54.0', - version: '2.1.9', + version: '2.1.10', license: 'LGPL-2.1-or-later', default_options: [ 'c_std=gnu99', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/sysfs-documentation new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/sysfs-documentation --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/sysfs-documentation 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/sysfs-documentation 2024-10-01 21:06:22.000000000 +0200 @@ -139,7 +139,7 @@ --- IPv4 Time to Live (TTL) -This attribute contain TTL value sent in IPv4 TCP packets transmitted on +This attribute contains the TTL value sent in IPv4 TCP packets transmitted on iSCSI connections. Valid range: 8-bit value. [0-255] @@ -301,7 +301,7 @@ --- Ethernet MTU Size. -This field specifies the maximum payload length in byte of an +This field specifies the maximum payload length in bytes of an Ethernet frame supported by iSCSI initiator. Valid values: 576 bytes to 9000 bytes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/discovery.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/discovery.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/discovery.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/discovery.c 2024-10-01 21:06:22.000000000 +0200 @@ -682,7 +682,7 @@ return 1; } -static int +static void process_sendtargets_response(struct str_buffer *sendtargets, int final, discovery_rec_t *drec, struct list_head *rec_list) @@ -696,7 +696,7 @@ if (start == end) { /* no SendTargets data */ - goto done; + return; } /* scan backwards to find the last NUL in the data, to ensure we @@ -711,7 +711,7 @@ /* couldn't find anything we can process now, * it's one big partial string */ - goto done; + return; } /* find the boundaries between target records (TargetName or final PDU) @@ -739,7 +739,7 @@ drec, rec_list)) { log_error("failed to add target record"); str_truncate_buffer(sendtargets, 0); - goto done; + return; } num_targets++; } @@ -769,7 +769,7 @@ } else { log_error("failed to add target record"); str_truncate_buffer(sendtargets, 0); - goto done; + return; } } else { /* remove the parts of the sendtargets buffer we've @@ -785,10 +785,6 @@ record - str_buffer_data(sendtargets)); } } - -done: - - return 1; } static void iscsi_free_session(struct iscsi_session *session) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.c 2024-10-01 21:06:22.000000000 +0200 @@ -898,14 +898,17 @@ return info; } -void idbm_print(int type, void *rec, int show, FILE *f) +int idbm_print(int type, void *rec, int show, FILE *f) { int i; recinfo_t *info; info = idbm_recinfo_alloc(MAX_KEYS); - if (!info) - return; + if (!info) { + log_error("Out of Memory."); + return ISCSI_ERR_NOMEM; + } + switch (type) { case IDBM_PRINT_TYPE_DISCOVERY: @@ -945,6 +948,7 @@ fprintf(f, "%s\n", ISCSI_END_REC); free(info); + return 0; } static void @@ -1341,29 +1345,36 @@ int idbm_print_discovery_info(discovery_rec_t *rec, int show) { - idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, show, stdout); - return 1; + int rc; + + rc = idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, show, stdout); + return !rc; } int idbm_print_node_info(void *data, node_rec_t *rec) { int show = *((int *)data); + int rc; - idbm_print(IDBM_PRINT_TYPE_NODE, rec, show, stdout); - return 0; + rc = idbm_print(IDBM_PRINT_TYPE_NODE, rec, show, stdout); + return rc; } int idbm_print_host_chap_info(struct iscsi_chap_rec *chap) { + int rc; + /* User only calls this to print chap so always print */ - idbm_print(IDBM_PRINT_TYPE_HOST_CHAP, chap, 1, stdout); - return 0; + rc = idbm_print(IDBM_PRINT_TYPE_HOST_CHAP, chap, 1, stdout); + return rc; } int idbm_print_flashnode_info(struct flashnode_rec *fnode) { - idbm_print(IDBM_PRINT_TYPE_FLASHNODE, fnode, 1, stdout); - return 0; + int rc; + + rc = idbm_print(IDBM_PRINT_TYPE_FLASHNODE, fnode, 1, stdout); + return rc; } int idbm_print_node_flat(__attribute__((unused))void *data, node_rec_t *rec) @@ -1435,43 +1446,79 @@ return 0; } +/* + * lock the DB, ensuring we are the only user, + * waiting as needed (for quite a while) + * + * uses global "db" (pointer to the DB instance) + */ int idbm_lock(void) { int fd, i, ret; + int errno_save = 0; + /* if DB is already being used just increment count and return */ if (db->refs > 0) { db->refs++; return 0; } + /* DB is not being used -- ensure there is a lock dir */ if (access(LOCK_DIR, F_OK) != 0) { - if (mkdir(LOCK_DIR, 0770) != 0) { - log_error("Could not open %s: %s", LOCK_DIR, - strerror(errno)); + if ((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) { + log_error("Could not open %s: %d: %s", LOCK_DIR, + errno, strerror(errno)); return ISCSI_ERR_IDBM; } } + /* create the lock file, if needed */ fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666); - if (fd >= 0) - close(fd); + if (fd < 0) { + log_error("Could not open/create lock file: %s", + LOCK_FILE); + return ISCSI_ERR_IDBM; + } + close(fd); - for (i = 0; i < 3000; i++) { + /* + * try to create a link from the lock file to the + * lock "write" file, retrying everying 10 miliseconds + * for up to 30 seconds! + * + * XXX: very long -- should be configurable? + */ + for (i = 0; i < DB_LOCK_RETRIES; i++) { ret = link(LOCK_FILE, LOCK_WRITE_FILE); if (ret == 0) - break; + break; /* success */ + + errno_save = errno; if (errno != EEXIST) { log_error("Maybe you are not root?"); log_error("Could not lock discovery DB: %s: %s", LOCK_WRITE_FILE, strerror(errno)); return ISCSI_ERR_IDBM; - } else if (i == 0) + } + + /* print info the first time through this loop */ + if (i == 0) log_debug(2, "Waiting for discovery DB lock"); - usleep(10000); + usleep(DB_LOCK_USECS_WAIT); /* wait 10 ms */ + } + + if (ret != 0) { + log_error("Timeout on acquiring lock on DB: %s: %d: %s", + LOCK_WRITE_FILE, errno_save, strerror(errno_save)); + return ISCSI_ERR_IDBM; } + /* + * if we get here, we were able to "own" the DB by creating + * a link, so we are now the only DB user + */ db->refs = 1; return 0; } @@ -1491,6 +1538,8 @@ * Backwards Compat: * If the portal is a file then we are doing the old style default * session behavior (svn pre 780). + * + * XXX can't we remove this now? */ static FILE *idbm_open_rec_r(char *portal, char *config) { @@ -2207,7 +2256,7 @@ goto free_portal; } - idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); fclose(f); free_portal: free(portal); @@ -2271,7 +2320,7 @@ rc = ISCSI_ERR_IDBM; goto free_portal; } - idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f); fclose(f); free_portal: free(portal); @@ -2376,7 +2425,7 @@ goto unlock; } - idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_DISCOVERY, rec, 1, f); fclose(f); unlock: idbm_unlock(); @@ -2520,16 +2569,16 @@ if (rc) goto unlock; - if (drec->type == DISCOVERY_TYPE_FW) { - log_debug(8, "setting firmware node 'startup' to 'onboot'"); - newrec->startup = ISCSI_STARTUP_ONBOOT; - newrec->conn[0].startup = ISCSI_STARTUP_ONBOOT; - } log_debug(7, "overwriting existing record"); } else log_debug(7, "adding new DB record"); if (drec) { + if (drec->type == DISCOVERY_TYPE_FW) { + log_debug(8, "setting firmware node 'startup' to 'onboot'"); + newrec->startup = ISCSI_STARTUP_ONBOOT; + newrec->conn[0].startup = ISCSI_STARTUP_ONBOOT; + } newrec->disc_type = drec->type; newrec->disc_port = drec->port; strcpy(newrec->disc_address, drec->address); @@ -3231,7 +3280,7 @@ rec->disc_type = DISCOVERY_TYPE_STATIC; rec->leading_login = 0; rec->session.cmds_max = CMDS_MAX; - rec->session.xmit_thread_priority = XMIT_THREAD_PRIORITY; + rec->session.xmit_thread_priority = DEFAULT_XMIT_THREAD_PRIORITY; rec->session.initial_cmdsn = 0; rec->session.queue_depth = QUEUE_DEPTH; rec->session.nr_sessions = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/idbm.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/idbm.h 2024-10-01 21:06:22.000000000 +0200 @@ -51,6 +51,14 @@ #define NAME_MAXVAL 128 /* the maximum length of key name */ #define VALUE_MAXVAL 256 /* the maximum length of 223 bytes in the RFC. */ #define OPTS_MAXVAL 8 + +/* + * wait up to DB_LOCK_USECS_WAIT * DB_LOCK_RETRIES to a cquire + * the DB lock, before giving up + */ +#define DB_LOCK_USECS_WAIT 10000 /* per-loop waiting for lock */ +#define DB_LOCK_RETRIES 3000 /* number of retries */ + typedef struct recinfo { int type; char name[NAME_MAXVAL]; @@ -167,6 +175,12 @@ int line_number); extern void idbm_recinfo_node(node_rec_t *r, recinfo_t *ri); +/* from libopeniscsiusr/idbm.h */ +enum iscsi_auth_method { + ISCSI_AUTH_METHOD_NONE, + ISCSI_AUTH_METHOD_CHAP, +}; + enum { IDBM_PRINT_TYPE_DISCOVERY, IDBM_PRINT_TYPE_NODE, @@ -175,7 +189,7 @@ IDBM_PRINT_TYPE_FLASHNODE }; -extern void idbm_print(int type, void *rec, int show, FILE *f); +extern int idbm_print(int type, void *rec, int show, FILE *f); struct boot_context; extern struct node_rec *idbm_create_rec(char *targetname, int tpgt, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iface.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iface.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iface.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iface.c 2024-10-01 21:06:22.000000000 +0200 @@ -282,7 +282,7 @@ if (rc) goto close_f; - idbm_print(IDBM_PRINT_TYPE_IFACE, iface, 1, f); + rc = idbm_print(IDBM_PRINT_TYPE_IFACE, iface, 1, f); idbm_unlock(); close_f: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator.c 2024-10-01 21:06:22.000000000 +0200 @@ -395,26 +395,37 @@ session->isid[5] = 0; /* setup authentication variables for the session*/ - iscsi_setup_authentication(session, &rec->session.auth); + if (iscsi_setup_authentication(session, &rec->session.auth)) { + /* + * FIXME: The return value used to be ignored here. It + * would be nice to start paying attention to it, but + * that may break a few corner-case login scenarios, + * and in the case of a root-iSCSI setup, may break it + * badly. So, for now, just print a warning that + * ignoring such errors is being deprecated. + */ + log_warning("Warning: DEPRECATED: Ignoring Authorization setup failure. " + "This will be considered a login authorization error in the future."); + } iscsi_session_init_params(session); - if (t->template->bind_ep_required) { - hostno = iscsi_sysfs_get_host_no_from_hwinfo(&rec->iface, rc); - if (!*rc) { - /* - * if the netdev or mac was set, then we are going to want - * to want to bind the all the conns/eps to a specific host - * if offload is used. - */ - session->conn[0].bind_ep = 1; - session->hostno = hostno; - } else if (*rc == ISCSI_ERR_HOST_NOT_FOUND) { - goto free_session; - } else { - *rc = 0; - } - } + if (t->template->bind_ep_required) { + hostno = iscsi_sysfs_get_host_no_from_hwinfo(&rec->iface, rc); + if (!*rc) { + /* + * if the netdev or mac was set, then we are going to want + * to want to bind the all the conns/eps to a specific host + * if offload is used. + */ + session->conn[0].bind_ep = 1; + session->hostno = hostno; + } else if (*rc == ISCSI_ERR_HOST_NOT_FOUND) { + goto free_session; + } else { + *rc = 0; + } + } /* reset session reopen count */ session->reopen_cnt = 0; @@ -1008,11 +1019,14 @@ } static void session_scan_host(struct iscsi_session *session, int hostno, - queue_task_t *qtask) + queue_task_t *qtask, bool rescan) { pid_t pid; - pid = iscsi_sysfs_scan_host(hostno, 1, idbm_session_autoscan(session)); + if (!rescan && !idbm_session_autoscan(session)) + return; + + pid = iscsi_sysfs_scan_host(hostno, session->id, 1, rescan); if (pid == 0) { mgmt_ipc_write_rsp(qtask, ISCSI_SUCCESS); @@ -1062,7 +1076,8 @@ * don't want to re-scan it on recovery. */ if (conn->id == 0) - session_scan_host(session, session->hostno, c->qtask); + session_scan_host(session, session->hostno, c->qtask, + false); log_warning("Connection%d:%d to [target: %s, portal: %s,%d] " "through [iface: %s] is operational now", @@ -1073,7 +1088,7 @@ } else { session->notify_qtask = NULL; - session_online_devs(session->hostno, session->id); + session_scan_host(session, session->hostno, NULL, true); mgmt_ipc_write_rsp(c->qtask, ISCSI_SUCCESS); log_warning("connection%d:%d is operational after recovery " "(%d attempts)", session->id, conn->id, @@ -1226,7 +1241,7 @@ if (sshdr.asc == 0x3f && sshdr.ascq == 0x0e && idbm_session_autoscan(session)) - session_scan_host(session, session->hostno, NULL); + session_scan_host(session, session->hostno, NULL, true); break; case ISCSI_ASYNC_MSG_REQUEST_LOGOUT: conn_warn(conn, "Target requests logout within %u seconds" , ntohs(async_hdr->param3)); @@ -1399,8 +1414,23 @@ uint32_t host_no; /* drivers like bnx2i and qla4xxx do not have a write wq */ - if (session->t->caps & CAP_DATA_PATH_OFFLOAD) + if (session->t->caps & CAP_DATA_PATH_OFFLOAD) { + log_debug(5, "Skipping setting xmit thread priority: Not needed for offload"); + return; + } + + /* + * optimization: if the priority to be set is zero, just + * return now, saving the trouble of scanning the proc table + * + * TODO: this function should be removed some day "soon", since + * it ony seems to be needed in older (5.4) kernels. But for now + * the optimization should be enough + */ + if (session->nrec.session.xmit_thread_priority == 0) { + log_debug(5, "Skipping setting xmit thread priority to zero: not needed"); return; + } proc_dir = opendir(PROC_DIR); if (!proc_dir) @@ -1457,6 +1487,9 @@ if (!setpriority(PRIO_PROCESS, pid, session->nrec.session.xmit_thread_priority)) { closedir(proc_dir); + log_debug(5, "Set priority for pid=%u to \"%d\"", + pid, + session->nrec.session.xmit_thread_priority); return; } else break; @@ -1465,9 +1498,9 @@ } closedir(proc_dir); fail: - log_error("Could not set session%d priority. " - "READ/WRITE throughout and latency could be " - "affected.", session->id); + log_warning("Could not set session%d priority. " + "READ/WRITE throughout and latency could be affected.", + session->id); } static int session_ipc_create(struct iscsi_session *session) @@ -1700,8 +1733,7 @@ * scan host is one-time deal. We * don't want to re-scan it on recovery. */ - session_scan_host(session, session->hostno, - c->qtask); + session_scan_host(session, session->hostno, c->qtask, false); session->notify_qtask = NULL; log_warning("Connection%d:%d to [target: %s, portal: %s,%d] " @@ -1711,6 +1743,7 @@ session->nrec.conn[conn->id].port, session->nrec.iface.name); } else { + session_scan_host(session, session->hostno, NULL, true); session->notify_qtask = NULL; mgmt_ipc_write_rsp(c->qtask, ISCSI_SUCCESS); } @@ -2209,7 +2242,7 @@ log_debug(3, "session created sid %u host no %d", sid, host_no); session_online_devs(host_no, sid); - session_scan_host(NULL, host_no, NULL); + session_scan_host(NULL, host_no, NULL, false); } static void iscsi_async_session_destruction(uint32_t host_no, uint32_t sid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator_common.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator_common.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/initiator_common.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/initiator_common.c 2024-10-01 21:06:22.000000000 +0200 @@ -38,6 +38,7 @@ #include "sysdeps.h" #include "iscsi_err.h" #include "iscsi_net_util.h" +#include "idbm.h" struct iscsi_session *session_find_by_sid(uint32_t sid) { @@ -61,6 +62,22 @@ int iscsi_setup_authentication(struct iscsi_session *session, struct iscsi_auth_config *auth_cfg) { + /* + * check for authmethod being set correctly, + * and for now just warn user this isn't correct. In the + * future, we should return an error here. + */ + if ((auth_cfg->authmethod == ISCSI_AUTH_METHOD_NONE) && + (auth_cfg->password_length || auth_cfg->password_in_length)) { + /* + * FIXME: if authmethod=None we should really not be using + * CHAP, but fixing this may break some configurations, so + * just warn the user, for now + */ + log_warning("Warning: DEPRECATED: Using CHAP even though 'authmethod' is set to None. " + "In the future 'authmethod=None' will be honored."); + } + /* if we have any incoming credentials, we insist on authenticating * the target or not logging in at all */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_settings.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_settings.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_settings.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_settings.h 2024-10-01 21:06:22.000000000 +0200 @@ -21,8 +21,8 @@ #define CMDS_MAX 128 #define QUEUE_DEPTH 32 -/* system */ -#define XMIT_THREAD_PRIORITY -20 +/* system -- default used for setpriority() of the xmit workqueue process */ +#define DEFAULT_XMIT_THREAD_PRIORITY 0 /* interface */ #define UNKNOWN_VALUE "<empty>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.c 2024-10-01 21:06:22.000000000 +0200 @@ -1342,7 +1342,7 @@ if (ret) (info->tmo).lu_reset_tmo = -1; - sysfs_get_int(session, ISCSI_SESSION_SUBSYS, "abort_tmo", + ret = sysfs_get_int(session, ISCSI_SESSION_SUBSYS, "abort_tmo", &((info->tmo).abort_tmo)); if (ret) (info->tmo).abort_tmo = -1; @@ -1979,7 +1979,7 @@ strlen(write_buf)); } -pid_t iscsi_sysfs_scan_host(int hostno, int async, int autoscan) +pid_t iscsi_sysfs_scan_host(int hostno, int sid, int async, bool rescan) { char id[NAME_SIZE]; char *write_buf = "- - -"; @@ -1988,10 +1988,7 @@ if (async) pid = fork(); - if (pid >= 0 && !autoscan) { - if (pid) - log_debug(4, "host%d in manual scan mode, skipping scan", hostno); - } else if (pid == 0) { + if (pid == 0) { /* child */ log_debug(4, "scanning host%d", hostno); @@ -2001,9 +1998,18 @@ */ set_thread_io_flusher(0); - snprintf(id, sizeof(id), ISCSI_HOST_ID, hostno); - sysfs_set_param(id, SCSI_HOST_SUBSYS, "scan", write_buf, - strlen(write_buf)); + if (rescan) { + iscsi_sysfs_for_each_device(NULL, hostno, sid, + iscsi_sysfs_set_device_online); + + /* rescan each device to pick up size changes */ + iscsi_sysfs_for_each_device(NULL, hostno, sid, + iscsi_sysfs_rescan_device); + } else { + snprintf(id, sizeof(id), ISCSI_HOST_ID, hostno); + sysfs_set_param(id, SCSI_HOST_SUBSYS, "scan", write_buf, + strlen(write_buf)); + } log_debug(4, "scanning host%d completed", hostno); } else if (pid > 0) { log_debug(4, "scanning host%d from pid %d", hostno, pid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_sysfs.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_sysfs.h 2024-10-01 21:06:22.000000000 +0200 @@ -17,6 +17,7 @@ #ifndef ISCSI_SYSFS_H #define ISCSI_SYSFS_H +#include <stdbool.h> #include <sys/types.h> #include "sysfs.h" @@ -89,7 +90,7 @@ struct iscsi_session_operational_config *conf); extern void iscsi_sysfs_get_negotiated_conn_conf(int sid, struct iscsi_conn_operational_config *conf); -extern pid_t iscsi_sysfs_scan_host(int hostno, int async, int autoscan); +extern pid_t iscsi_sysfs_scan_host(int hostno, int sid, int async, bool rescan); extern int iscsi_sysfs_get_session_state(char *state, int sid); extern int iscsi_sysfs_get_host_state(char *state, int host_no); extern int iscsi_sysfs_get_device_state(char *state, int host_no, int target, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.c 2024-10-01 21:06:22.000000000 +0200 @@ -279,7 +279,7 @@ * * If address1 is blank then it matches any string passed in. */ -static int iscsi_addr_match(char *address1, char *address2) +int iscsi_addr_match(const char *address1, const char *address2) { struct addrinfo hints1, hints2, *res1, *res2; int rc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsi_util.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsi_util.h 2024-10-01 21:06:22.000000000 +0200 @@ -30,4 +30,6 @@ struct sockaddr_un; extern int setup_abstract_addr(struct sockaddr_un *addr, char *unix_sock_name); +extern int iscsi_addr_match(const char *address1, const char *address2); + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsiadm.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsiadm.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsiadm.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsiadm.c 2024-10-01 21:06:22.000000000 +0200 @@ -787,41 +787,49 @@ const char *target_name, const char *address, int32_t port, const char *iface_name) { - int rc = 0; + int rc = ISCSI_SUCCESS; struct iscsi_node **nodes = NULL; struct iscsi_node *node = NULL; uint32_t node_count = 0; uint32_t i = 0; - bool match = false; bool has_match = false; rc = iscsi_nodes_get(ctx, &nodes, &node_count); if (rc != LIBISCSI_OK) return rc; + log_debug(7, "%s(target_name=%s, address=%s): found %d node(s) to scan ...", + __FUNCTION__, target_name, address, node_count); + for (i = 0; i < node_count; ++i) { node = nodes[i]; - match = true; + /* + * node matches *unless* one of the following conditions + * is true + */ if ((target_name != NULL) && (strlen(target_name) != 0) && (strcmp(target_name, iscsi_node_target_name_get(node)) != 0)) - match = false; + continue; /* target name mismatch */ + if ((address != NULL) && (strlen(address) != 0) && - (strcmp(address, iscsi_node_conn_address_get(node)) != 0)) - match = false; - if ((port != -1) && (port != (int32_t)iscsi_node_conn_port_get(node))) - match = false; + (iscsi_addr_match(address, + iscsi_node_conn_address_get(node)) != 1)) + continue; /* address/name mismatch */ + + if ((port != -1) && + (port != (int32_t)iscsi_node_conn_port_get(node))) + continue; /* port number mismatch */ + if ((iface_name != NULL) && (strlen(iface_name) != 0) && (strcmp(iface_name, iscsi_node_iface_name_get(node)) != 0)) - match = false; + continue; /* iface mismatch */ - if (match == true) { - iscsi_node_print_config(node, show_secret); - has_match = true; - } + iscsi_node_print_config(node, show_secret); + has_match = true; } iscsi_nodes_free(nodes, node_count); @@ -874,7 +882,7 @@ iscsi_sysfs_for_each_device(NULL, host_no, info->sid, iscsi_sysfs_rescan_device); /* now scan for new devices */ - iscsi_sysfs_scan_host(host_no, 0, 1); + iscsi_sysfs_scan_host(host_no, info->sid, 0, false); return 0; } @@ -2026,6 +2034,7 @@ static int iscsi_check_session_use_count(uint32_t sid) { char *config_file; char *safe_logout; + int rc = 0; config_file = get_config_file(); if (!config_file) { @@ -2034,10 +2043,11 @@ } safe_logout = cfg_get_string_param(config_file, "iscsid.safe_logout"); - if (!safe_logout || strcmp(safe_logout, "Yes")) - return 0; + if (safe_logout && !strcmp(safe_logout, "Yes")) + rc = session_in_use(sid); + free(safe_logout); - return session_in_use(sid); + return rc; } int iscsi_logout_flashnode_sid(struct iscsi_transport *t, uint32_t host_no, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid.c 2024-10-01 21:06:22.000000000 +0200 @@ -221,7 +221,9 @@ iscsi_err_to_str(err)); return 0; } - iscsi_sysfs_scan_host(host_no, 0, idbm_session_autoscan(NULL)); + + if (idbm_session_autoscan(NULL)) + iscsi_sysfs_scan_host(host_no, info->sid, 0, false); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid_req.h new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid_req.h --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/iscsid_req.h 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/iscsid_req.h 2024-10-01 21:06:22.000000000 +0200 @@ -19,7 +19,7 @@ */ #ifndef ISCSID_REQ_H_ -#define ISCSID_REQ_H +#define ISCSID_REQ_H_ #define ISCSID_REQ_TIMEOUT 1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/sysfs.c new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/sysfs.c --- old/open-iscsi-2.1.9.suse+844.d557967bc9ae/usr/sysfs.c 2023-12-20 19:21:30.000000000 +0100 +++ new/open-iscsi-2.1.10.suse+52.9a4cb8fdee02/usr/sysfs.c 2024-10-01 21:06:22.000000000 +0200 @@ -563,7 +563,12 @@ if (!sysfs_value) return EIO; - *value = atoi(sysfs_value); + if (strncmp(sysfs_value, "off", 3) == 0 && + strncmp(subsys, "iscsi_session", 13) == 0) { + *value = -1; + } else { + *value = atoi(sysfs_value); + } free(sysfs_value); return 0; }

1 0

commit python-anyio for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-anyio for openSUSE:Factory checked in at 2024-10-03 18:00:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-anyio (Old) and /work/SRC/openSUSE:Factory/.python-anyio.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-anyio" Thu Oct 3 18:00:37 2024 rev:22 rq:1205309 version:4.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-anyio/python-anyio.changes 2024-08-15 09:57:40.625343532 +0200 +++ /work/SRC/openSUSE:Factory/.python-anyio.new.19354/python-anyio.changes 2024-10-03 18:00:50.323332971 +0200 @@ -1,0 +2,60 @@ +Wed Oct 2 18:02:06 UTC 2024 - Antonio Larrosa <alarrosa(a)suse.com> + +- update to 4.6.0: + * Dropped support for Python 3.8 (as #698 cannot be resolved + without cancel message support) + * Fixed 100% CPU use on asyncio while waiting for an exiting task + group to finish while said task group is within a cancelled + cancel scope (#695) + * Fixed cancel scopes on asyncio not propagating CancelledError + on exit when the enclosing cancel scope has been effectively + cancelled (#698) + * Fixed asyncio task groups not yielding control to the event + loop at exit if there were no child tasks to wait on + * Fixed inconsistent task uncancellation with asyncio cancel + scopes belonging to a task group when said task group has child + tasks running +- update to 4.5.0: + * Improved the performance of anyio.Lock and anyio.Semaphore on + asyncio (even up to 50 %) + * Added the fast_acquire parameter to anyio.Lock and + anyio.Semaphore to further boost performance at the expense of + safety (acquire() will not yield control back if there is no + contention) + * Added support for the from_uri(), full_match(), parser + methods/properties in anyio.Path, newly added in Python 3.13 + (#737) + * Added support for more keyword arguments for run_process() and + open_process(): startupinfo, creationflags, pass_fds, user, + group, extra_groups and umask (#742) + * Improved the type annotations and support for PathLike in + run_process() and open_process() to allow for path-like + arguments, just like subprocess.Popen + * Changed the ResourceWarning from an unclosed memory object + stream to include its address for easier identification + * Changed start_blocking_portal() to always use daemonic threads, + to accommodate the "loitering event loop" use case + * Bumped the minimum version of Trio to v0.26.1 + * Fixed __repr__() of MemoryObjectItemReceiver, when item is not + defined (#767; PR by @Danipulok) + * Fixed to_process.run_sync() failing to initialize if + __main__.__file__ pointed to a file in a nonexistent directory + (#696) + * Fixed AssertionError: feed_data after feed_eof on asyncio when + a subprocess is closed early, before its output has been read + (#490) + * Fixed TaskInfo.has_pending_cancellation() on asyncio not + respecting shielded scopes (#771; PR by @gschaffner) + * Fixed SocketStream.receive() returning bytearray instead of + bytes when using asyncio with ProactorEventLoop (Windows) + (#776) + * Fixed quitting the debugger in a pytest test session while in + an active task group failing the test instead of exiting the + test session (because the exit exception arrives in an + exception group) + * Fixed support for Linux abstract namespaces in UNIX sockets + that was broken in v4.2 (#781; PR by @tapetersen) + * Fixed KeyboardInterrupt (ctrl+c) hanging the asyncio pytest + runner + +------------------------------------------------------------------- Old: ---- anyio-4.4.0.tar.gz New: ---- anyio-4.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-anyio.spec ++++++ --- /var/tmp/diff_new_pack.IhNCrT/_old 2024-10-03 18:00:50.827353955 +0200 +++ /var/tmp/diff_new_pack.IhNCrT/_new 2024-10-03 18:00:50.827353955 +0200 @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-anyio -Version: 4.4.0 +Version: 4.6.0 Release: 0 Summary: High level compatibility layer for asynchronous event loop implementations License: MIT @@ -39,7 +39,7 @@ BuildRequires: %{python_module hypothesis >= 4.0} BuildRequires: %{python_module pytest >= 7.0} BuildRequires: %{python_module pytest-mock >= 3.6.1} -BuildRequires: %{python_module trio >= 0.23} +BuildRequires: %{python_module trio >= 0.26.1} BuildRequires: %{python_module trustme} # /SECTION BuildRequires: fdupes @@ -49,7 +49,7 @@ Requires: python-exceptiongroup Requires: python-typing_extensions %endif -Suggests: python-trio >= 0.23 +Suggests: python-trio >= 0.26.1 BuildArch: noarch %python_subpackages ++++++ anyio-4.4.0.tar.gz -> anyio-4.6.0.tar.gz ++++++ ++++ 3980 lines of diff (skipped)

1 0

commit relaxngDatatype for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package relaxngDatatype for openSUSE:Factory checked in at 2024-10-03 18:00:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/relaxngDatatype (Old) and /work/SRC/openSUSE:Factory/.relaxngDatatype.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "relaxngDatatype" Thu Oct 3 18:00:32 2024 rev:22 rq:1205282 version:2011.1 Changes: -------- --- /work/SRC/openSUSE:Factory/relaxngDatatype/relaxngDatatype.changes 2022-03-28 16:59:53.804915216 +0200 +++ /work/SRC/openSUSE:Factory/.relaxngDatatype.new.19354/relaxngDatatype.changes 2024-10-03 18:00:43.895065342 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 16:00:49 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ relaxngDatatype.spec ++++++ --- /var/tmp/diff_new_pack.lQ8GJ3/_old 2024-10-03 18:00:46.271164266 +0200 +++ /var/tmp/diff_new_pack.lQ8GJ3/_new 2024-10-03 18:00:46.287164932 +0200 @@ -1,7 +1,7 @@ # # spec file for package relaxngDatatype # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Source1: copying.txt BuildRequires: ant BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 Obsoletes: %{name}-javadoc BuildArch: noarch @@ -54,7 +54,7 @@ # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar -a relaxngDatatype:relaxngDatatype %files -f .mfiles

1 0

commit regexp for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package regexp for openSUSE:Factory checked in at 2024-10-03 18:00:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/regexp (Old) and /work/SRC/openSUSE:Factory/.regexp.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "regexp" Thu Oct 3 18:00:30 2024 rev:24 rq:1205281 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/regexp/regexp.changes 2022-03-28 16:59:35.304890084 +0200 +++ /work/SRC/openSUSE:Factory/.regexp.new.19354/regexp.changes 2024-10-03 18:00:42.439004722 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 16:00:24 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ regexp.spec ++++++ --- /var/tmp/diff_new_pack.dqJ2vR/_old 2024-10-03 18:00:43.051030202 +0200 +++ /var/tmp/diff_new_pack.dqJ2vR/_new 2024-10-03 18:00:43.055030369 +0200 @@ -1,7 +1,7 @@ # # spec file for package regexp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,6 @@ %define full_name jakarta-%{name} -%define section free Name: regexp Version: 1.5 Release: 0 @@ -28,15 +27,15 @@ URL: http://jakarta.apache.org/%{name}/ Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz Source1: regexp-%{version}.pom -BuildRequires: ant BuildRequires: ant >= 1.6 BuildRequires: java-devel -BuildRequires: javapackages-local -BuildRequires: javapackages-tools +BuildRequires: javapackages-local >= 6 BuildRequires: xml-commons-apis-bootstrap -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver BuildArch: noarch %description @@ -53,26 +52,19 @@ find . -type f -name "*.jar" | xargs -t rm %build -export OPT_JAR_LIST=: -export CLASSPATH= mkdir lib ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar %install # jars -install -d -m 755 %{buildroot}%{_javadir} -install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 build/*.jar %{buildroot}%{_javadir}/%{name}.jar [ -d docs/api ] && rm -rf docs/api # pom mkdir -p %{buildroot}%{_mavenpomdir} -install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a %{full_name}:%{full_name} -%files -%defattr(0644,root,root,0755) -%doc LICENSE -%{_javadir}/*.jar -%{_mavenpomdir}/* -%{_datadir}/maven-metadata/%{name}.xml* +%files -f .mfiles +%license LICENSE

1 0

commit libvirt for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2024-10-03 18:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Thu Oct 3 18:00:28 2024 rev:403 rq:1205278 version:10.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2024-09-05 15:47:08.603961492 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new.19354/libvirt.changes 2024-10-03 18:00:40.178910627 +0200 @@ -1,0 +2,11 @@ +Tue Oct 1 19:57:06 UTC 2024 - James Fehlig <jfehlig(a)suse.com> + +- Update to libvirt 10.8.0 + - libvirt-daemon-driver-storage-core: Change dependency on + nfs-utils from Requires to Recommends + - Switch from YAJL to json-c for JSON parsing and formatting + - jsc#PED-8909 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html#v10-8-0-2024-10-01 + +------------------------------------------------------------------- Old: ---- libvirt-10.7.0.tar.xz New: ---- libvirt-10.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.6rVOG2/_old 2024-10-03 18:00:41.226954260 +0200 +++ /var/tmp/diff_new_pack.6rVOG2/_new 2024-10-03 18:00:41.230954427 +0200 @@ -149,7 +149,7 @@ Name: libvirt URL: https://libvirt.org/ -Version: 10.7.0 +Version: 10.8.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -210,8 +210,8 @@ BuildRequires: readline-devel # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 +BuildRequires: libjson-c-devel BuildRequires: libpciaccess0-devel >= 0.10.9 -BuildRequires: libyajl-devel BuildRequires: pkgconfig(libudev) >= 145 %if %{with_sanlock} BuildRequires: sanlock-devel >= 2.4 @@ -487,7 +487,7 @@ Summary: Storage driver plugin including base backends for the libvirtd daemon Requires: %{name}-daemon-common = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} -Requires: nfs-utils +Recommends: nfs-utils # For mkfs Requires: util-linux %if %{with_qemu} @@ -1070,7 +1070,7 @@ %{?arg_apparmor} \ %{?arg_apparmor_profiles} \ -Dudev=enabled \ - -Dyajl=enabled \ + -Djson_c=enabled \ %{?arg_sanlock} \ -Dlibpcap=enabled \ -Dlibnl=enabled \ ++++++ libvirt-10.7.0.tar.xz -> libvirt-10.8.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-10.7.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.19354/libvirt-10.8.0.tar.xz differ: char 15, line 1

1 0

commit flatpak for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package flatpak for openSUSE:Factory checked in at 2024-10-03 18:00:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flatpak (Old) and /work/SRC/openSUSE:Factory/.flatpak.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flatpak" Thu Oct 3 18:00:26 2024 rev:90 rq:1205277 version:1.15.10 Changes: -------- --- /work/SRC/openSUSE:Factory/flatpak/flatpak.changes 2024-08-27 19:38:13.849675772 +0200 +++ /work/SRC/openSUSE:Factory/.flatpak.new.19354/flatpak.changes 2024-10-03 18:00:36.990777895 +0200 @@ -1,0 +2,6 @@ +Wed Oct 2 15:16:49 UTC 2024 - Robert Frohl <rfrohl(a)suse.com> + +- Explicitly BuildRequire selinux-policy-targeted to allow + selinux_relabel_* in scriptlets to work on other codestreams + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flatpak.spec ++++++ --- /var/tmp/diff_new_pack.7uW2Qi/_old 2024-10-03 18:00:37.722808372 +0200 +++ /var/tmp/diff_new_pack.7uW2Qi/_new 2024-10-03 18:00:37.726808539 +0200 @@ -64,6 +64,7 @@ BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-pyparsing +BuildRequires: selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools

1 0

commit javamail for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javamail for openSUSE:Factory checked in at 2024-10-03 18:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javamail (Old) and /work/SRC/openSUSE:Factory/.javamail.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javamail" Thu Oct 3 18:00:23 2024 rev:10 rq:1205260 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/javamail/javamail.changes 2024-09-09 14:43:18.475879606 +0200 +++ /work/SRC/openSUSE:Factory/.javamail.new.19354/javamail.changes 2024-10-03 18:00:30.462506103 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:48:59 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javamail.spec ++++++ --- /var/tmp/diff_new_pack.YhGH0H/_old 2024-10-03 18:00:31.382544407 +0200 +++ /var/tmp/diff_new_pack.YhGH0H/_new 2024-10-03 18:00:31.382544407 +0200 @@ -78,10 +78,8 @@ rm mail/src/test/java/com/sun/mail/imap/IMAPIdleUntaggedResponseTest.java rm mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java -%pom_remove_parent . - %build -%{ant} -Djavac.source=1.8 -Djavac.target=1.8 \ +ant -Djavac.source=1.8 -Djavac.target=1.8 \ -Dactivation.jar=$(find-jar glassfish-activation-api) \ jar jars docs @@ -108,20 +106,20 @@ # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name pom.xml).pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name pom.xml).pom pompart=%{name}/$(get_name pom.xml).pom %add_maven_depmap ${pompart} for i in mailapijar smtp imap gimap pop3 dsn; do - %mvn_install_pom ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name ${i}/pom.xml).pom + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name ${i}/pom.xml).pom pompart=%{name}/$(get_name ${i}/pom.xml).pom jarpart=%{name}/$(get_name ${i}/pom.xml).jar %add_maven_depmap ${pompart} ${jarpart} done -%mvn_install_pom mail/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mail/pom.xml).pom +%{mvn_install_pom} mail/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mail/pom.xml).pom pompart=%{name}/$(get_name mail/pom.xml).pom jarpart=%{name}/$(get_name mail/pom.xml).jar %add_maven_depmap ${pompart} ${jarpart} -a javax.mail:mail,org.eclipse.jetty.orbit:javax.mail.glassfish,com.sun.mail:jakarta.mail -%mvn_install_pom mailapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mailapi/pom.xml).pom +%{mvn_install_pom} mailapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mailapi/pom.xml).pom pompart=%{name}/$(get_name mailapi/pom.xml).pom jarpart=%{name}/$(get_name mailapi/pom.xml).jar %add_maven_depmap ${pompart} ${jarpart} -a javax.mail:mailapi

1 0

commit javacc for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package javacc for openSUSE:Factory checked in at 2024-10-03 18:00:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc (Old) and /work/SRC/openSUSE:Factory/.javacc.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javacc" Thu Oct 3 18:00:20 2024 rev:25 rq:1205259 version:7.0.13 Changes: -------- --- /work/SRC/openSUSE:Factory/javacc/javacc.changes 2023-11-23 21:38:54.943662634 +0100 +++ /work/SRC/openSUSE:Factory/.javacc.new.19354/javacc.changes 2024-10-03 18:00:28.878440154 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:48:03 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc.spec ++++++ --- /var/tmp/diff_new_pack.4YBxvO/_old 2024-10-03 18:00:29.706474627 +0200 +++ /var/tmp/diff_new_pack.4YBxvO/_new 2024-10-03 18:00:29.710474794 +0200 @@ -1,7 +1,7 @@ # -# spec file +# spec file for package javacc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2005, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -42,7 +42,7 @@ Name: %{base_name} BuildRequires: %{base_name} BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -82,7 +82,7 @@ This package contains the API documentation for %{name}. %prep -%setup -n %{base_name}-%{base_name}-%{version} +%setup -q -n %{base_name}-%{base_name}-%{version} rm -f lib/*.jar %if %{without bootstrap} rm -f bootstrap/javacc.jar @@ -96,7 +96,7 @@ %endif %build -%{ant} -Dant.build.javac.{source,target}=8 \ +ant -Dant.build.javac.{source,target}=8 \ %if %{with bootstrap} jar %else @@ -112,7 +112,7 @@ # pom install -dm0755 %{buildroot}%{_mavenpomdir} -install -pm0644 pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}.pom %add_maven_depmap %{base_name}.pom %{base_name}.jar # javadoc install -dm0755 %{buildroot}%{_javadocdir}/%{name}

1 0

commit glassfish-annotation-api for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glassfish-annotation-api for openSUSE:Factory checked in at 2024-10-03 18:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glassfish-annotation-api (Old) and /work/SRC/openSUSE:Factory/.glassfish-annotation-api.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glassfish-annotation-api" Thu Oct 3 18:00:17 2024 rev:4 rq:1205251 version:1.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/glassfish-annotation-api/glassfish-annotation-api.changes 2022-03-19 22:22:52.704948517 +0100 +++ /work/SRC/openSUSE:Factory/.glassfish-annotation-api.new.19354/glassfish-annotation-api.changes 2024-10-03 18:00:25.370294099 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:40:10 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glassfish-annotation-api.spec ++++++ --- /var/tmp/diff_new_pack.O0Pr6x/_old 2024-10-03 18:00:26.098324409 +0200 +++ /var/tmp/diff_new_pack.O0Pr6x/_new 2024-10-03 18:00:26.102324576 +0200 @@ -1,7 +1,7 @@ # # spec file for package glassfish-annotation-api # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -49,10 +49,8 @@ cp %{SOURCE1} build.xml cp %{SOURCE2} . -%pom_remove_parent . - %build -%{ant} +ant %install # jar @@ -60,7 +58,7 @@ install -pm 0644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}

1 0

commit glassfish-activation for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glassfish-activation for openSUSE:Factory checked in at 2024-10-03 18:00:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glassfish-activation (Old) and /work/SRC/openSUSE:Factory/.glassfish-activation.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glassfish-activation" Thu Oct 3 18:00:17 2024 rev:5 rq:1205250 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/glassfish-activation/glassfish-activation.changes 2022-07-18 18:33:02.821681502 +0200 +++ /work/SRC/openSUSE:Factory/.glassfish-activation.new.19354/glassfish-activation.changes 2024-10-03 18:00:24.078240307 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 15:39:44 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Spec file cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glassfish-activation.spec ++++++ --- /var/tmp/diff_new_pack.t0tw53/_old 2024-10-03 18:00:24.862272949 +0200 +++ /var/tmp/diff_new_pack.t0tw53/_new 2024-10-03 18:00:24.866273115 +0200 @@ -1,7 +1,7 @@ # # spec file for package glassfish-activation # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Source1: activation-build.xml BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 Obsoletes: gnu-jaf < %{version} Obsoletes: jaf BuildArch: noarch @@ -70,9 +70,6 @@ # maven-dependency-plugin doesn't work correctly without access to remote repos %pom_remove_plugin :maven-dependency-plugin activationapi -%pom_remove_parent activation activationapi -%pom_xpath_inject pom:project "<version>%{version}</version>" activation activationapi - %pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin %pom_remove_plugin -r :maven-javadoc-plugin %pom_remove_plugin -r :maven-source-plugin @@ -88,21 +85,21 @@ %install # jar -install -d -m 755 %{buildroot}%{_javadir}/ -install -m 644 activation/target/javax.activation-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -install -m 644 activation/target/javax.activation-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar +install -d -m 0755 %{buildroot}%{_javadir}/ +install -m 0644 activation/target/javax.activation-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 0644 activation/target/javax.activation-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar ln -sf %{name}-api.jar %{buildroot}%{_javadir}/activation.jar ln -sf %{name}-api.jar %{buildroot}%{_javadir}/jaf.jar # pom -install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 644 activation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -install -pm 644 activationapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom +install -d -m 0755 %{buildroot}%{_mavenpomdir}/%{name} +%{mvn_install_pom} activation/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} activationapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-api.pom %add_maven_depmap %{name}.pom %{name}.jar %add_maven_depmap %{name}-api.pom %{name}-api.jar -a javax.activation:activation -f api # javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -r activation/target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}

1 0

commit libgsf for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libgsf for openSUSE:Factory checked in at 2024-10-03 18:00:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgsf (Old) and /work/SRC/openSUSE:Factory/.libgsf.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgsf" Thu Oct 3 18:00:06 2024 rev:76 rq:1205221 version:1.14.53 Changes: -------- --- /work/SRC/openSUSE:Factory/libgsf/libgsf.changes 2024-02-06 16:33:00.695701974 +0100 +++ /work/SRC/openSUSE:Factory/.libgsf.new.19354/libgsf.changes 2024-10-03 18:00:09.381628442 +0200 @@ -1,0 +2,11 @@ +Tue Oct 1 13:54:13 UTC 2024 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.14.53: + + Compilation fixes for libxml 2.13 + + Fix ABR in gsf-vba-dump. + + Teach gsf (the tool) to handle odf properties. + + Fix integer overflows affecting memory allocation. + + Add missing "DocumentStatus" ole2 property. + + Avoid some undefined C behaviour in overflow checks. + +------------------------------------------------------------------- Old: ---- libgsf-1.14.52.tar.xz New: ---- libgsf-1.14.53.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsf.spec ++++++ --- /var/tmp/diff_new_pack.2ZJKsO/_old 2024-10-03 18:00:11.133701386 +0200 +++ /var/tmp/diff_new_pack.2ZJKsO/_new 2024-10-03 18:00:11.137701552 +0200 @@ -17,7 +17,7 @@ Name: libgsf -Version: 1.14.52 +Version: 1.14.53 Release: 0 Summary: I/O library for dealing with structured file formats License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ libgsf-1.14.52.tar.xz -> libgsf-1.14.53.tar.xz ++++++ ++++ 6543 lines of diff (skipped)

1 0

commit liboqs for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package liboqs for openSUSE:Factory checked in at 2024-10-03 18:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liboqs (Old) and /work/SRC/openSUSE:Factory/.liboqs.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liboqs" Thu Oct 3 18:00:05 2024 rev:14 rq:1205214 version:0.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/liboqs/liboqs.changes 2024-06-11 18:32:52.080708767 +0200 +++ /work/SRC/openSUSE:Factory/.liboqs.new.19354/liboqs.changes 2024-10-03 18:00:07.833563991 +0200 @@ -1,0 +2,47 @@ +Sun Sep 29 09:48:19 UTC 2024 - Marcus Meissner <meissner(a)suse.com> + +- Updated to 0.11.0: + * This release updates ML-KEM implementations to their final FIPS 203 + https://csrc.nist.gov/pubs/fips/203/final versions . + * This release still includes the NIST Round 3 version of Kyber for + interoperability purposes, but we plan to remove Kyber Round 3 in a + future release. + * Additionally, this release adds support for MAYO and CROSS + digital signature schemes from [NIST Additional Signatures Round 1 + https://csrc.nist.gov/Projects/pqc-dig-sig/round-1-additional-signatures + along with stateful hash-based signature schemes XMSS + https://datatracker.ietf.org/doc/html/rfc8391 and LMS + https://datatracker.ietf.org/doc/html/rfc8554. + * Finally, this release provides formally verified + implementations of Kyber-512 and Kyber-768 from libjade + https://github.com/formosa-crypto/libjade/releases/tag/release%2F2023.05-2 + + * LMS and XMSS are disabled by default due to the security risks associated with their use in software. + See the note on stateful hash-based signatures in CONFIGURE.md + + * Key encapsulation mechanisms: + + - Kyber: Added formally-verified portable C and AVX2 implementations + of Kyber-512 and Kyber-768 from libjade. + - ML-KEM: Updated portable C and AVX2 implementations of ML-KEM-512, + ML-KEM-768, and ML-KEM-1024 to FIP 203 version. + - Kyber: Patched ARM64 implementations of Kyber-512, Kyber-768, and + Kyber-1024 to work with AddressSanitizer. + + * Digital signature schemes: + + - LMS/XMSS: Added implementations of stateful hash-based signature + schemes: XMSS and LMS + - MAYO: Added portable C and AVX2 implementations of MAYO signature + scheme from NIST Additional Signatures Round 1. + - CROSS: Added portable C and AVX2 implementations of CROSS signature + scheme from NIST Additional Signatures Round 1. + + * Other changes: + + - Added callback API to use custom implementations of AES, SHA2, and SHA3. + - Refactor SHA3 implementation to use OpenSSL's EVP_DigestSqueeze() API. + +- new library major version 6 + +------------------------------------------------------------------- Old: ---- 0.10.1.tar.gz New: ---- 0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liboqs.spec ++++++ --- /var/tmp/diff_new_pack.NDXDvv/_old 2024-10-03 18:00:08.881607624 +0200 +++ /var/tmp/diff_new_pack.NDXDvv/_new 2024-10-03 18:00:08.881607624 +0200 @@ -17,7 +17,7 @@ Name: liboqs -Version: 0.10.1 +Version: 0.11.0 Release: 0 Summary: C library for quantum-resistant cryptographic algorithms License: MIT @@ -35,18 +35,18 @@ liboqs is a C library for quantum-resistant cryptographic algorithms. See the bundled README.md for particular limitations on intended use. -%package -n liboqs5 +%package -n liboqs6 Summary: C library for quantum-resistant cryptographic algorithms Group: System/Libraries -%description -n liboqs5 +%description -n liboqs6 liboqs is a C library for quantum-resistant cryptographic algorithms. See the bundled README.md for particular limitations on intended use. %package devel Summary: Headers for liboqs, a library for quantum-resistant cryptography Group: Development/Languages/C and C++ -Requires: liboqs5 = %{version} +Requires: liboqs6 = %{version} %description devel liboqs is a C library for quantum-resistant cryptographic algorithms. @@ -78,13 +78,13 @@ rmdir %{buildroot}%{_prefix}/local/ -%post -n liboqs5 -p /sbin/ldconfig -%postun -n liboqs5 -p /sbin/ldconfig +%post -n liboqs6 -p /sbin/ldconfig +%postun -n liboqs6 -p /sbin/ldconfig -%files -n liboqs5 +%files -n liboqs6 %license LICENSE.txt %{_libdir}/liboqs.so.%version -%{_libdir}/liboqs.so.5 +%{_libdir}/liboqs.so.6 %doc README.md %files devel ++++++ 0.10.1.tar.gz -> 0.11.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/liboqs/0.10.1.tar.gz /work/SRC/openSUSE:Factory/.liboqs.new.19354/0.11.0.tar.gz differ: char 13, line 1 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.NDXDvv/_old 2024-10-03 18:00:08.933609789 +0200 +++ /var/tmp/diff_new_pack.NDXDvv/_new 2024-10-03 18:00:08.937609956 +0200 @@ -1,3 +1,3 @@ -liboqs5 +liboqs6 liboqs-devel

1 0

commit audit for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package audit for openSUSE:Factory checked in at 2024-10-03 17:59:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audit (Old) and /work/SRC/openSUSE:Factory/.audit.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audit" Thu Oct 3 17:59:59 2024 rev:107 rq:1205295 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/audit/audit-secondary.changes 2024-09-30 15:35:06.179791045 +0200 +++ /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes 2024-10-03 18:00:00.849273424 +0200 @@ -1,0 +2,11 @@ +Wed Oct 2 11:15:07 UTC 2024 - Enzo Matsumiya <ematsumiya(a)suse.com> + +- Readd audit-allow-manual-stop.patch (removed by mistake) + +------------------------------------------------------------------- +Tue Oct 1 14:43:13 UTC 2024 - Enzo Matsumiya <ematsumiya(a)suse.com> + +- Fix plugin termination when using systemd service units (bsc#1215377) + * add auditd.service-fix-plugin-termination.patch + +------------------------------------------------------------------- New: ---- audit-allow-manual-stop.patch auditd.service-fix-plugin-termination.patch BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes- /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes:- Readd audit-allow-manual-stop.patch (removed by mistake) /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes- -- /work/SRC/openSUSE:Factory/.audit.new.19354/audit.changes-- Refresh patches (context adjusment): /work/SRC/openSUSE:Factory/.audit.new.19354/audit.changes: * audit-allow-manual-stop.patch /work/SRC/openSUSE:Factory/.audit.new.19354/audit.changes- * audit-ausearch-do-not-require-tclass.patch New:/work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes-- Fix plugin termination when using systemd service units (bsc#1215377) /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes: * add auditd.service-fix-plugin-termination.patch /work/SRC/openSUSE:Factory/.audit.new.19354/audit-secondary.changes- BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-secondary.spec ++++++ --- /var/tmp/diff_new_pack.yMbfRG/_old 2024-10-03 18:00:01.889316513 +0200 +++ /var/tmp/diff_new_pack.yMbfRG/_new 2024-10-03 18:00:01.893316680 +0200 @@ -39,6 +39,8 @@ Patch7: fix-hardened-service.patch Patch8: enable-stop-rules.patch Patch9: fix-auparse-test.patch +Patch10: auditd.service-fix-plugin-termination.patch +Patch11: audit-allow-manual-stop.patch BuildRequires: audit-devel = %{version} BuildRequires: autoconf >= 2.12 BuildRequires: kernel-headers >= 2.6.30 ++++++ audit-allow-manual-stop.patch ++++++ From: Tony Jones <tonyj(a)suse.de> Subject: allow service stop References: https://lists.fedoraproject.org/pipermail/devel/2012-June/169411.html References: https://www.redhat.com/archives/linux-audit/2013-July/msg00048.html --- legacy-actions is Fedora specific, so blocking manual stop won't work for SUSE since we lack the ability to use a custom stop/restart init.d/auditd.service | 1 - 1 file changed, 1 deletion(-) --- a/init.d/auditd.service +++ b/init.d/auditd.service @@ -14,7 +14,6 @@ After=local-fs.target systemd-tmpfiles-s Before=sysinit.target shutdown.target ##Before=shutdown.target Conflicts=shutdown.target -RefuseManualStop=yes Documentation=man:auditd(8) https://github.com/linux-audit/audit-documentation ++++++ auditd.service-fix-plugin-termination.patch ++++++ --- init.d/auditd.service | 1 + 1 file changed, 1 insertion(+) --- a/init.d/auditd.service +++ b/init.d/auditd.service @@ -29,6 +29,7 @@ ExecStopPost=/sbin/auditctl -R /etc/audi Restart=on-failure # Do not restart for intentional exits. See EXIT CODES section in auditd(8). RestartPreventExitStatus=2 4 6 +KillMode=mixed ### Security Settings ### MemoryDenyWriteExecute=true

1 0

commit libeconf for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libeconf for openSUSE:Factory checked in at 2024-10-03 17:59:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libeconf (Old) and /work/SRC/openSUSE:Factory/.libeconf.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libeconf" Thu Oct 3 17:59:23 2024 rev:30 rq:1205077 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libeconf/libeconf.changes 2024-09-27 17:10:39.748578177 +0200 +++ /work/SRC/openSUSE:Factory/.libeconf.new.19354/libeconf.changes 2024-10-03 17:59:25.623815454 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 07:08:25 UTC 2024 - Stefan Schubert <schubi(a)suse.com> + +- Updated license in the spec file to MIT. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libeconf/python-libeconf.changes 2024-09-27 17:10:39.768579010 +0200 +++ /work/SRC/openSUSE:Factory/.libeconf.new.19354/python-libeconf.changes 2024-10-03 17:59:25.683817937 +0200 @@ -1,0 +2,5 @@ +Wed Oct 2 07:09:19 UTC 2024 - Stefan Schubert <schubi(a)suse.com> + +- Updated license in the spec file to MIT. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libeconf.spec ++++++ --- /var/tmp/diff_new_pack.il0UYL/_old 2024-10-03 17:59:26.239840951 +0200 +++ /var/tmp/diff_new_pack.il0UYL/_new 2024-10-03 17:59:26.239840951 +0200 @@ -21,7 +21,7 @@ Version: 0.7.4 Release: 0 Summary: Enhanced config file parser ala systemd -License: LGPL-2.1-or-later +License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/openSUSE/libeconf Source: libeconf-%{version}.tar.xz ++++++ python-libeconf.spec ++++++ --- /var/tmp/diff_new_pack.il0UYL/_old 2024-10-03 17:59:26.271842276 +0200 +++ /var/tmp/diff_new_pack.il0UYL/_new 2024-10-03 17:59:26.275842441 +0200 @@ -22,7 +22,7 @@ Version: 0.7.4 Release: 0 Summary: Python bindings for libeconf -License: LGPL-2.1-or-later +License: MIT Group: Development/Languages/Python URL: https://github.com/openSUSE/libeconf Source: libeconf-%{version}.tar.xz

1 0

commit filesystem for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package filesystem for openSUSE:Factory checked in at 2024-10-03 17:59:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filesystem (Old) and /work/SRC/openSUSE:Factory/.filesystem.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "filesystem" Thu Oct 3 17:59:18 2024 rev:173 rq:1204628 version:84.87 Changes: -------- --- /work/SRC/openSUSE:Factory/filesystem/filesystem.changes 2023-12-10 19:39:29.954631657 +0100 +++ /work/SRC/openSUSE:Factory/.filesystem.new.19354/filesystem.changes 2024-10-03 17:59:19.599566113 +0200 @@ -1,0 +2,6 @@ +Wed Sep 25 19:10:06 UTC 2024 - Thorsten Kukuk <kukuk(a)suse.com> + +- Move /srv/www hierachy to the packages which use them + [bsc#1231027] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filesystem.spec ++++++ --- /var/tmp/diff_new_pack.u0mpBg/_old 2024-10-03 17:59:20.591607173 +0200 +++ /var/tmp/diff_new_pack.u0mpBg/_new 2024-10-03 17:59:20.599607505 +0200 @@ -1,7 +1,7 @@ # # spec file for package filesystem # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ ghost.list ++++++ --- /var/tmp/diff_new_pack.u0mpBg/_old 2024-10-03 17:59:20.707611974 +0200 +++ /var/tmp/diff_new_pack.u0mpBg/_new 2024-10-03 17:59:20.711612140 +0200 @@ -4,9 +4,6 @@ 0555 root root /opt 0555 root root /proc 0555 root root /srv -0755 root root /srv/www -0755 root root /srv/www/cgi-bin -0755 root root /srv/www/htdocs 0755 root root /run/lock 0555 root root /sys 0755 root root /usr/local

1 0

commit tomcat for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2024-10-03 17:40:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tomcat" Thu Oct 3 17:40:54 2024 rev:110 rq:1205527 version:9.0.91 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2024-09-30 15:40:15.908681891 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new.19354/tomcat.changes 2024-10-03 17:41:54.600060032 +0200 @@ -1,0 +2,5 @@ +Thu Oct 3 13:17:03 UTC 2024 - Fridrich Strba <fstrba(a)suse.com> + +- Adapt the scripts to run also with javapackages-tools >= 6.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat-9.0-digest.script ++++++ --- /var/tmp/diff_new_pack.Ji12xw/_old 2024-10-03 17:41:55.564100210 +0200 +++ /var/tmp/diff_new_pack.Ji12xw/_new 2024-10-03 17:41:55.568100377 +0200 @@ -3,6 +3,9 @@ # tomcat-digest script # JPackage Project <http://www.jpackage.org/> +# Set default JAVA_HOME +export JAVA_HOME="${JAVA_HOME:-%{?java_home}}" + # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions ++++++ tomcat-9.0-tool-wrapper.script ++++++ --- /var/tmp/diff_new_pack.Ji12xw/_old 2024-10-03 17:41:55.624102710 +0200 +++ /var/tmp/diff_new_pack.Ji12xw/_new 2024-10-03 17:41:55.628102877 +0200 @@ -3,6 +3,9 @@ # tomcat-digest script # JPackage Project <http://www.jpackage.org/> +# Set default JAVA_HOME +export JAVA_HOME="${JAVA_HOME:-%{?java_home}}" + # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions

1 0

commit mosquitto for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mosquitto for openSUSE:Factory checked in at 2024-10-03 17:40:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mosquitto (Old) and /work/SRC/openSUSE:Factory/.mosquitto.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mosquitto" Thu Oct 3 17:40:44 2024 rev:31 rq:1205507 version:2.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/mosquitto/mosquitto.changes 2024-03-25 21:17:59.146982330 +0100 +++ /work/SRC/openSUSE:Factory/.mosquitto.new.19354/mosquitto.changes 2024-10-03 17:41:51.783942668 +0200 @@ -1,0 +2,24 @@ +Thu Oct 3 12:22:10 UTC 2024 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 2.0.19 + Security: + * Fix mismatched subscribe/unsubscribe with normal/shared topics. + * Fix crash on bridge using remapped topic being sent a crafted + packet. + Broker: + * Fix assert failure when loading a persistence file that + contains subscriptions with no client id. + * Fix local bridges being incorrectly expired when + persistent_client_expiration is in use. + * Fix use of CLOCK_BOOTTIME for getting time. + * Fix mismatched subscribe/unsubscribe with normal/shared topics. + * Fix crash on bridge using remapped topic being sent a crafted + packet. + Client library: + * Fix some error codes being converted to string as "unknown". + * Clear SSL error state to avoid spurious error reporting. + * Fix "payload format invalid" not being allowed as a PUBREC + reason code. + * Don't allow SUBACK with missing reason codes. + +------------------------------------------------------------------- Old: ---- mosquitto-2.0.18.tar.gz mosquitto-2.0.18.tar.gz.sig New: ---- mosquitto-2.0.19.tar.gz mosquitto-2.0.19.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mosquitto.spec ++++++ --- /var/tmp/diff_new_pack.LoqW9k/_old 2024-10-03 17:41:52.303964341 +0200 +++ /var/tmp/diff_new_pack.LoqW9k/_new 2024-10-03 17:41:52.303964341 +0200 @@ -20,7 +20,7 @@ %define c_lib libmosquitto1 %define cpp_lib libmosquittopp1 Name: mosquitto -Version: 2.0.18 +Version: 2.0.19 Release: 0 Summary: A MQTT v3.1/v3.1.1 Broker License: EPL-1.0 ++++++ mosquitto-2.0.18.tar.gz -> mosquitto-2.0.19.tar.gz ++++++ ++++ 1611 lines of diff (skipped)

1 0

commit accerciser for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package accerciser for openSUSE:Factory checked in at 2024-10-03 17:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/accerciser (Old) and /work/SRC/openSUSE:Factory/.accerciser.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "accerciser" Thu Oct 3 17:40:38 2024 rev:76 rq:1205409 version:3.44.1 Changes: -------- --- /work/SRC/openSUSE:Factory/accerciser/accerciser.changes 2023-10-12 11:36:17.728406630 +0200 +++ /work/SRC/openSUSE:Factory/.accerciser.new.19354/accerciser.changes 2024-10-03 17:41:49.383842642 +0200 @@ -1,0 +2,56 @@ +Mon Sep 30 05:18:26 UTC 2024 - jun wang <jgwang(a)suse.com> + +- Update to version 3.44.1 + * Replace intltool dep with gettext + * Add meson build support + * Drop autotools build + * Add CI + * plugins: Port from imp to importlib + * Drop last occurrence of importing imp + * Drop using deprecated gtk features + * Don't add when cancelling "New Bookmark" dialog + * event_monitor: Port "Clear Selection" button from "stock" + * event_monitor: Fix saving to file + * event_monitor: Fix jumping to object on click + * node: Calculate screen coords for gtk4 apps + * node: More reliably detect the right gtk4 window + * Move retrieval of window stacking order to WindowManager + * Only consider windows in current workspace for "Inspect under + mouse" + * WindowInfo: Add stacking order + * WindowInfo: Add info whether on current workspace + * Unify WindowManager implementations further, consider size + * win manager: Add more infos to WindowInfo + * window_manager: Extract helper method to get toolkit name and + version + * window_manager: Escape special chars in window title regex + * Wnck: Use frame geometry when client geometry includes CSD + * Support "Inspect under mouse" for Gtk 4 apps + * GNOME: Use gtk and sandboxed app ID to retrieve app icon + * GnomeShellWindowManager: Retrieve mouse pos from Mutter + * GNOME Shell: Add extension and win manager using Mutter win pos + * GNOME Shell: Add info whether on current workspace + * GNOME Shell/Mutter: Use client/frame geometry except for GTK 3 + * GNOME Shell/Mutter: Support GNOME 47 + * GNOME Shell: Install the GNOME Shell extension + * Add a window manager that retrieves screen coords from KWin + * KWinWindowManager: Support KWin 6 as well + * KWinWindowManager: Don't fail on win title containing quotes + * KWinWindowManager: Get mouse position via KWin API + * KWinWindowManager: Get window stacking order from KWin + * KWin: Use 'console.info' instead of 'print' in KWin script + * KWin 6: Use client/frame geometry instead of buffer geometry + except for GTK 3 + * Kwin: Drop extra KWin 5 win title suffix right away + * KWin: Retrieve app/window icon via desktop entry + * interface_view: Add help text + * interface_view: Update acc description when it changes + * interface_view: Update help text when it changes + * interface_view: Show infos for Hyperlink iface + * ipython_view: Handle more color-related ANSI escape codes + * ipython_view: Use raw string for regex + * Add project_license tag to AppStream metadata file + * Updated translations. +- Add meson BuildRequires and macros following upstreams port to it + +------------------------------------------------------------------- Old: ---- accerciser-3.42.0.tar.xz New: ---- accerciser-3.44.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ accerciser.spec ++++++ --- /var/tmp/diff_new_pack.09ln1n/_old 2024-10-03 17:41:50.059870816 +0200 +++ /var/tmp/diff_new_pack.09ln1n/_new 2024-10-03 17:41:50.063870983 +0200 @@ -1,7 +1,7 @@ # # spec file for package accerciser # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,17 @@ Name: accerciser -Version: 3.42.0 +Version: 3.44.1 Release: 0 Summary: Accessibility debugging tool License: BSD-3-Clause Group: Development/Tools/Other URL: https://wiki.gnome.org/Apps/Accerciser -Source0: https://download.gnome.org/sources/accerciser/3.42/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/accerciser/3.44/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gobject-introspection +BuildRequires: meson BuildRequires: pkgconfig # py3atspi is a virtual name that is provided by the default at-spi stack BuildRequires: py3atspi @@ -72,12 +73,11 @@ %autosetup -p1 %build -%configure \ - %{nil} -%make_build +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file -r -N "Accerciser" -G "Accesibility Debugger" accerciser Utility GNOME Accessibility %find_lang %{name} %{?no_lang_C} %python3_fix_shebang @@ -87,10 +87,15 @@ %license COPYING %doc AUTHORS NEWS README.md %doc %{_datadir}/help/C/%{name}/ +%dir %{_datadir}/gnome-shell/ +%dir %{_datadir}/gnome-shell/extensions/ +%dir %{_datadir}/gnome-shell/extensions/accerciser(a)accerciser.gnome.org/ +%{_datadir}/gnome-shell/extensions/accerciser(a)accerciser.gnome.org/extension.js +%{_datadir}/gnome-shell/extensions/accerciser(a)accerciser.gnome.org/metadata.json %{_bindir}/%{name} %{_datadir}/%{name}/ %exclude %{_datadir}/%{name}/plugins/ipython_view.py -%{_datadir}/metainfo/accerciser.appdata.xml +%{_datadir}/metainfo/org.gtk.accerciser.metainfo.xml %{_datadir}/glib-2.0/schemas/org.a11y.Accerciser.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{name}* %{_datadir}/applications/%{name}.desktop ++++++ accerciser-3.42.0.tar.xz -> accerciser-3.44.1.tar.xz ++++++ ++++ 88758 lines of diff (skipped)

1 0

commit wxsvg for openSUSE:Factory
by Source-Sync 03 Oct '24

03 Oct '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wxsvg for openSUSE:Factory checked in at 2024-10-03 17:40:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxsvg (Old) and /work/SRC/openSUSE:Factory/.wxsvg.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wxsvg" Thu Oct 3 17:40:36 2024 rev:14 rq:1205390 version:1.5.25 Changes: -------- --- /work/SRC/openSUSE:Factory/wxsvg/wxsvg.changes 2024-08-22 18:11:12.272504684 +0200 +++ /work/SRC/openSUSE:Factory/.wxsvg.new.19354/wxsvg.changes 2024-10-03 17:41:48.239794964 +0200 @@ -1,0 +2,16 @@ +Mon Sep 16 05:53:10 UTC 2024 - ecsos <ecsos(a)opensuse.org> + +- Update to 1.5.25 + * applied ffmpeg7 patch +- Changes from 1.5.24 + * applied ffmpeg5 patch +- Drop ffmpeg5.patch from suse, because now in upstream. +- Drop wxsvg-fix-missing-include.patch, because now in upstream. +- Add wxsvg-fix-version.patch because in configure files are 1.5.24. + +------------------------------------------------------------------- +Mon Sep 16 05:51:10 UTC 2024 - ecsos <ecsos(a)opensuse.org> + +- Upstream does not need ffmpeg-6 to build. Remove it again. + +------------------------------------------------------------------- Old: ---- ffmpeg5.patch wxsvg-1.5.23.tar.bz2 wxsvg-fix-missing-include.patch New: ---- wxsvg-1.5.25.tar.bz2 wxsvg-fix-version.patch BETA DEBUG BEGIN: Old:- Changes from 1.5.24 * applied ffmpeg5 patch - Drop ffmpeg5.patch from suse, because now in upstream. Old:- Drop ffmpeg5.patch from suse, because now in upstream. - Drop wxsvg-fix-missing-include.patch, because now in upstream. - Add wxsvg-fix-version.patch because in configure files are 1.5.24. BETA DEBUG END: BETA DEBUG BEGIN: New:- Drop wxsvg-fix-missing-include.patch, because now in upstream. - Add wxsvg-fix-version.patch because in configure files are 1.5.24. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxsvg.spec ++++++ --- /var/tmp/diff_new_pack.l9q2GS/_old 2024-10-03 17:41:48.923823471 +0200 +++ /var/tmp/diff_new_pack.l9q2GS/_new 2024-10-03 17:41:48.927823637 +0200 @@ -20,14 +20,13 @@ %define sover 3 Name: wxsvg -Version: 1.5.23 +Version: 1.5.25 Release: 0 Summary: Library to create, manipulate and render SVG files License: LGPL-2.1-or-later WITH WxWindows-exception-3.1 URL: http://wxsvg.sourceforge.net/ Source: https://prdownloads.sourceforge.net/wxsvg/%{name}-%{version}.tar.bz2 -Patch0: ffmpeg5.patch -Patch1: wxsvg-fix-missing-include.patch +Patch1: %{name}-fix-version.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: wxGTK3-3_2-devel @@ -35,7 +34,7 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(pangocairo) # WARNING: needs to build with the same ffmpeg libraries as DVDStyler. -BuildRequires: ffmpeg-6-libavcodec-devel +BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libexif) ++++++ wxsvg-1.5.23.tar.bz2 -> wxsvg-1.5.25.tar.bz2 ++++++ ++++ 20614 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/.cproject new/wxsvg-1.5.25/.cproject --- old/wxsvg-1.5.23/.cproject 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/.cproject 2024-05-18 14:04:49.000000000 +0200 @@ -1,115 +1,305 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?fileVersion 4.0.0?> - -<cproject> -<storageModule moduleId="org.eclipse.cdt.core.settings"> -<cconfiguration id="org.eclipse.cdt.core.default.config.248320115"> -<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.248320115" moduleId="org.eclipse.cdt.core.settings" name="Configuration"> -<externalSettings/> -<extensions> -<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> -</extensions> -</storageModule> -<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> - - -<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> - - - - -<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/> -<storageModule moduleId="org.eclipse.cdt.core.pathentry"> -<pathentry excluding="src/|include/" kind="src" path=""/> -<pathentry kind="src" path="include"/> -<pathentry kind="src" path="src"/> -<pathentry kind="out" path=""/> -<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> -<pathentry base-path="wxsvg" include="" kind="inc" path="" system="true"/> -</storageModule> -<storageModule moduleId="scannerConfiguration"> -<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> -<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="true" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="true"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="specsFile"> -<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> -<buildOutputProvider> -<openAction enabled="false" filePath=""/> -<parser enabled="true"/> -</buildOutputProvider> -<scannerInfoProvider id="makefileGenerator"> -<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> -<parser enabled="false"/> -</scannerInfoProvider> -</profile> -</storageModule> -</cconfiguration> -</storageModule> -</cproject> +<?fileVersion 5.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage2"> + <storageModule moduleId="org.eclipse.cdt.core.settings"> + <cconfiguration id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489"> + <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489" moduleId="org.eclipse.cdt.core.settings" name="Build (GNU)"> + <externalSettings/> + <extensions> + <extension id="org.eclipse.cdt.core.MachO64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.Cygwin_PE64" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> + <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> + </extensions> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <configuration buildProperties="" description="" id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489" name="Build (GNU)" parent="org.eclipse.cdt.build.core.emptycfg"> + <folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489.1186571592" name="/" resourcePath=""> + <toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.519033105" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain"> + <targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.832556175" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/> + <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.505612967" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Autotools Makefile Generator" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.834671888" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"> + <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.69488679" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489" valueType="string"/> + </tool> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.1065302222" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1376719613" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc"> + <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1990736214" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> + </tool> + <tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.849364588" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp"> + <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1845599972" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> + <listOptionValue builtIn="false" value="/usr/include/wx-3.0"/> + <listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.0"/> + </option> + <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.915365229" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> + </tool> + </toolChain> + </folderInfo> + </configuration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> + </cconfiguration> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.pathentry"> + <pathentry excluding="src/|include/" kind="src" path=""/> + <pathentry kind="src" path="include"/> + <pathentry kind="src" path="src"/> + <pathentry kind="out" path=""/> + <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> + <pathentry base-path="wxsvg" include="" kind="inc" path="" system="true"/> + </storageModule> + <storageModule moduleId="cdtBuildSystem" version="4.0.0"> + <project id="wxsvg.null.953235811" name="wxsvg"/> + </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> + <storageModule moduleId="refreshScope"/> + <storageModule moduleId="scannerConfiguration"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489;org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489.1186571592;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1376719613;cdt.managedbuild.tool.gnu.c.compiler.input.1990736214"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + </scannerConfigBuildInfo> + <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489;org.eclipse.linuxtools.cdt.autotools.core.toolChain.956433489.1186571592;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.849364588;cdt.managedbuild.tool.gnu.cpp.compiler.input.915365229"> + <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="true" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="true"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="makefileGenerator"> + <runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC"> + <buildOutputProvider> + <openAction enabled="false" filePath=""/> + <parser enabled="true"/> + </buildOutputProvider> + <scannerInfoProvider id="specsFile"> + <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/> + <parser enabled="false"/> + </scannerInfoProvider> + </profile> + </scannerConfigBuildInfo> + </storageModule> +</cproject> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/ChangeLog new/wxsvg-1.5.25/ChangeLog --- old/wxsvg-1.5.23/ChangeLog 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/ChangeLog 2024-05-18 14:04:49.000000000 +0200 @@ -1,3 +1,13 @@ +Version 1.5.25 <2024-05-18> +--------------------------- + + * applied ffmpeg7 patch (thanks to Robert-André Mauchin) + +Version 1.5.24 <2022-08-31> +--------------------------- + + * applied ffmpeg5 patch + Version 1.5.23 <2021-11-02> --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/autogen.sh new/wxsvg-1.5.25/autogen.sh --- old/wxsvg-1.5.23/autogen.sh 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/autogen.sh 2024-05-18 14:04:49.000000000 +0200 @@ -1,5 +1,8 @@ #!/bin/sh -libtoolize --copy --force || exit 1 +case `uname` in + Darwin*) glibtoolize --copy || exit 1 ;; + *) libtoolize --copy || exit 1 ;; +esac aclocal -I m4 automake --foreign -a -c autoconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/compile new/wxsvg-1.5.25/compile --- old/wxsvg-1.5.23/compile 2021-11-02 17:31:42.000000000 +0100 +++ new/wxsvg-1.5.25/compile 2024-05-18 14:04:50.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/configure.ac new/wxsvg-1.5.25/configure.ac --- old/wxsvg-1.5.23/configure.ac 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/configure.ac 2024-05-18 14:04:49.000000000 +0200 @@ -1,8 +1,8 @@ # Process this file with autoconf to produce a configure script. # initialization -AC_PREREQ(2.59) -AC_INIT([wxsvg], [1.5.23], [http://wxsvg.sourceforge.net/] +AC_PREREQ([2.71]) +AC_INIT([wxsvg],[1.5.24],[http://wxsvg.sourceforge.net/]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(foreign) AM_MAINTAINER_MODE @@ -15,7 +15,7 @@ # 4. If any interfaces have been added since the last public release, then increment age. # 5. If any interfaces have been removed since the last public release then set age to 0. -LIBRARY_VERSION=15:7:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) +LIBRARY_VERSION=15:8:12 # current:revision:age -> libwxsvg.so.(C-A).(A).(R) AC_SUBST(LIBRARY_VERSION) # options @@ -48,7 +48,7 @@ # Checks for programs. -AC_LANG_CPLUSPLUS +AC_LANG([C++]) AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_CC @@ -57,8 +57,8 @@ PKG_PROG_PKG_CONFIG() # Check for libtool -m4_pattern_allow([AC_PROG_LIBTOOL]) -AC_PROG_LIBTOOL +m4_pattern_allow([LT_INIT]) +LT_INIT # debug flags case "$USE_DEBUG" in @@ -137,6 +137,10 @@ # check libexif PKG_CHECK_MODULES(LIBEXIF, libexif, [LIBS="$LIBS $LIBEXIF_LIBS"], [AC_MSG_ERROR([*** missing libexif ***])]) +# check for separate -latomic +AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) +AC_SEARCH_LIBS([__atomic_load_8], [atomic]) + # check ffmpeg AM_CONDITIONAL(USE_LIBAV, [test x$enable_libav = xyes]) if test x$enable_libav = xyes; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h new/wxsvg-1.5.25/include/wxSVG/mediadec_ffmpeg.h --- old/wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/include/wxSVG/mediadec_ffmpeg.h 2024-05-18 14:04:49.000000000 +0200 @@ -81,6 +81,7 @@ bool OpenVideoDecoder(); void CloseVideoDecoder(); AVStream* GetVideoStream(); + int64_t m_cur_dts; }; #endif //FFMPEG_MEDIA_DECODER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/m4/libtool.m4 new/wxsvg-1.5.25/m4/libtool.m4 --- old/wxsvg-1.5.23/m4/libtool.m4 2021-11-02 17:31:40.000000000 +0100 +++ new/wxsvg-1.5.25/m4/libtool.m4 2024-05-18 14:04:49.000000000 +0200 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -777,7 +779,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1041,8 +1043,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1066,17 +1068,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1125,12 +1122,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1244,7 +1241,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1261,7 +1259,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1291,7 +1289,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1308,7 +1306,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1320,7 +1318,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1342,7 +1340,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1350,7 +1348,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1358,7 +1356,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1378,14 +1376,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1453,7 +1451,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1492,9 +1490,22 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1713,7 +1724,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1756,7 +1767,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2206,26 +2217,35 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2548,7 +2568,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2558,14 +2578,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2584,7 +2604,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2621,7 +2641,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2654,7 +2674,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3465,7 +3485,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3499,14 +3519,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3520,7 +3540,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3567,7 +3587,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3694,13 +3714,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3726,7 +3746,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3966,7 +3986,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'" @@ -3984,20 +4004,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* $.*$$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4021,7 +4041,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4039,9 +4059,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4329,7 +4349,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4412,7 +4432,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4754,7 +4774,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4937,7 +4957,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4945,7 +4965,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5005,15 +5025,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5068,7 +5088,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5180,6 +5200,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5194,7 +5215,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5237,7 +5258,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5249,13 +5270,14 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5265,7 +5287,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5397,7 +5419,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5580,12 +5602,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5626,7 +5648,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5674,7 +5696,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5815,6 +5837,7 @@ # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; @@ -5886,6 +5909,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6656,8 +6680,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6755,6 +6779,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6785,7 +6810,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6922,7 +6947,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7062,13 +7087,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8214,6 +8239,14 @@ AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/m4/ltversion.m4 new/wxsvg-1.5.25/m4/ltversion.m4 --- old/wxsvg-1.5.23/m4/ltversion.m4 2021-11-02 17:31:40.000000000 +0100 +++ new/wxsvg-1.5.25/m4/ltversion.m4 2024-05-18 14:04:49.000000000 +0200 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/missing new/wxsvg-1.5.25/missing --- old/wxsvg-1.5.23/missing 2021-11-02 17:31:42.000000000 +0100 +++ new/wxsvg-1.5.25/missing 2024-05-18 14:04:49.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/src/cairo/SVGCanvasCairo.cpp new/wxsvg-1.5.25/src/cairo/SVGCanvasCairo.cpp --- old/wxsvg-1.5.23/src/cairo/SVGCanvasCairo.cpp 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/src/cairo/SVGCanvasCairo.cpp 2024-05-18 14:04:49.000000000 +0200 @@ -14,6 +14,7 @@ #include "SVGCanvasImageCairo.h" #include <wx/log.h> #include <wx/file.h> +#include <cstdint> wxSVGCanvasCairo::~wxSVGCanvasCairo() { Destroy(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/src/cairo/SVGCanvasPathCairo.cpp new/wxsvg-1.5.25/src/cairo/SVGCanvasPathCairo.cpp --- old/wxsvg-1.5.23/src/cairo/SVGCanvasPathCairo.cpp 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/src/cairo/SVGCanvasPathCairo.cpp 2024-05-18 14:04:49.000000000 +0200 @@ -125,7 +125,7 @@ dashed[i] = style.GetStrokeDasharray().Item(i).GetFloatValue(); } cairo_set_dash(cr, dashed, style.GetStrokeDasharray().GetLength(), style.GetStrokeDashoffset()); - delete dashed; + delete[] dashed; } else cairo_set_dash(cr, NULL, 0, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/wxsvg-1.5.23/src/mediadec_ffmpeg.cpp new/wxsvg-1.5.25/src/mediadec_ffmpeg.cpp --- old/wxsvg-1.5.23/src/mediadec_ffmpeg.cpp 2021-11-02 17:31:39.000000000 +0100 +++ new/wxsvg-1.5.25/src/mediadec_ffmpeg.cpp 2024-05-18 14:04:49.000000000 +0200 @@ -20,6 +20,7 @@ #define UINT64_C(val) val##ULL #endif extern "C" { +#include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libswscale/swscale.h> #include <libavutil/avutil.h> @@ -36,17 +37,20 @@ #define av_packet_unref av_free_packet #endif +#define HAVE_AVCODEC_FREE_CONTEXT (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 69, 100)) +#define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + wxFfmpegMediaDecoder::wxFfmpegMediaDecoder(): m_formatCtx(NULL), m_videoStream(-1), m_codecCtx(NULL), m_frame(NULL), m_width(0), m_height(0) { // nothing to do } wxFfmpegMediaDecoder::~wxFfmpegMediaDecoder() { - Close(); + Close(); } void wxFfmpegMediaDecoder::Init() { - // nothing to do + // nothing to do #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 0, 0) av_register_all(); #endif @@ -98,8 +102,8 @@ } wxSize wxFfmpegMediaDecoder::GetVideoSize() { - OpenVideoDecoder(); - return m_codecCtx ? wxSize(m_codecCtx->width, m_codecCtx->height) : wxSize(); + OpenVideoDecoder(); + return m_codecCtx ? wxSize(m_codecCtx->width, m_codecCtx->height) : wxSize(); } AVStream* wxFfmpegMediaDecoder::GetVideoStream() { @@ -153,6 +157,9 @@ } wxString wxFfmpegMediaDecoder::GetCodecName(unsigned int streamIndex) { +#if LIBAVCODEC_VERSION_MAJOR >= 59 + const +#endif AVCodec *codec = avcodec_find_decoder(m_formatCtx->streams[streamIndex]->codecpar->codec_id); if (codec) { return wxString(codec->name, wxConvLocal); @@ -161,7 +168,11 @@ } int wxFfmpegMediaDecoder::GetChannelNumber(unsigned int streamIndex) { +#if HAVE_CH_LAYOUT + return m_formatCtx ? m_formatCtx->streams[streamIndex]->codecpar->ch_layout.nb_channels : -1; +#else return m_formatCtx ? m_formatCtx->streams[streamIndex]->codecpar->channels : -1; +#endif } int wxFfmpegMediaDecoder::GetSampleRate(unsigned int streamIndex) { @@ -193,6 +204,9 @@ // find and open the decoder for the video stream AVStream* stream = m_formatCtx->streams[m_videoStream]; +#if LIBAVCODEC_VERSION_MAJOR >= 59 + const +#endif AVCodec* codec = avcodec_find_decoder(stream->codecpar->codec_id); if (!codec) return false; @@ -206,15 +220,19 @@ } void wxFfmpegMediaDecoder::CloseVideoDecoder() { - if (m_codecCtx) - avcodec_close(m_codecCtx); // close the codec - m_codecCtx = NULL; + if (m_codecCtx) +#if HAVE_AVCODEC_FREE_CONTEXT + avcodec_free_context(&m_codecCtx); +#else + avcodec_close(m_codecCtx); // close the codec +#endif + m_codecCtx = NULL; } bool wxFfmpegMediaDecoder::BeginDecode(int width, int height) { - if (!m_formatCtx || !OpenVideoDecoder()) - return false; - // video size + if (!m_formatCtx || !OpenVideoDecoder()) + return false; + // video size if (width == -1 || height == -1) { m_width = m_codecCtx->width; m_height = m_codecCtx->height; @@ -224,38 +242,46 @@ m_width = w < width ? w : width; m_height = w < width ? height : h; } - // allocate video frame - m_frame = av_frame_alloc(); - if (!m_frame) { - avcodec_close(m_codecCtx); - m_codecCtx = NULL; - return false; - } - return true; + // allocate video frame + m_frame = av_frame_alloc(); + if (!m_frame) { +#if HAVE_AVCODEC_FREE_CONTEXT + avcodec_free_context(&m_codecCtx); +#else + avcodec_close(m_codecCtx); +#endif + m_codecCtx = NULL; + return false; + } + return true; } bool wxFfmpegMediaDecoder::SetPosition(double pos, bool keyFrame, bool seekBackward) { - if (m_formatCtx == NULL) - return false; + if (m_formatCtx == NULL) + return false; if (!m_frame && !BeginDecode()) return false; - int64_t timestamp = (int64_t) (pos * AV_TIME_BASE); - if (m_formatCtx->start_time != (int64_t)AV_NOPTS_VALUE) - timestamp += m_formatCtx->start_time; - avcodec_flush_buffers(m_codecCtx); - int flags = seekBackward ? AVSEEK_FLAG_BACKWARD : 0; - if (!keyFrame) - flags = flags|AVSEEK_FLAG_ANY; - bool res = av_seek_frame(m_formatCtx, -1, timestamp, flags) >= 0; - avcodec_flush_buffers(m_codecCtx); - return res; + int64_t timestamp = (int64_t) (pos * AV_TIME_BASE); + if (m_formatCtx->start_time != (int64_t)AV_NOPTS_VALUE) + timestamp += m_formatCtx->start_time; + avcodec_flush_buffers(m_codecCtx); + int flags = seekBackward ? AVSEEK_FLAG_BACKWARD : 0; + if (!keyFrame) + flags = flags|AVSEEK_FLAG_ANY; + bool res = av_seek_frame(m_formatCtx, -1, timestamp, flags) >= 0; + avcodec_flush_buffers(m_codecCtx); + return res; } double wxFfmpegMediaDecoder::GetPosition() { AVStream *st = GetVideoStream(); if (st == NULL) return -1; +#if LIBAVCODEC_VERSION_MAJOR >= 59 + int64_t timestamp = m_cur_dts; +#else int64_t timestamp = st->cur_dts; +#endif if (timestamp == (int64_t)AV_NOPTS_VALUE) return -1; timestamp = av_rescale(timestamp, AV_TIME_BASE * (int64_t)st->time_base.num, st->time_base.den); @@ -308,6 +334,7 @@ uint8_t *rgbSrc[3] = { img.GetData(), NULL, NULL }; int rgbStride[3] = { 3 * m_width, 0, 0 }; sws_scale(imgConvertCtx, m_frame->data, m_frame->linesize, 0, m_codecCtx->height, rgbSrc, rgbStride); + m_cur_dts = packet.dts; av_packet_unref(&packet); sws_freeContext(imgConvertCtx); return img; @@ -321,7 +348,7 @@ void wxFfmpegMediaDecoder::EndDecode() { av_frame_free(&m_frame); - CloseVideoDecoder(); + CloseVideoDecoder(); } /** Returns a comma separated list of short names for the format. */ ++++++ wxsvg-fix-version.patch ++++++ diff -Pdpru wxsvg-1.5.25.orig/configure wxsvg-1.5.25/configure --- wxsvg-1.5.25.orig/configure 2024-05-18 14:04:51.000000000 +0200 +++ wxsvg-1.5.25/configure 2024-09-16 09:04:44.992447704 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for wxsvg 1.5.24. +# Generated by GNU Autoconf 2.71 for wxsvg 1.5.25. # # Report bugs to <http://wxsvg.sourceforge.net/>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxsvg' PACKAGE_TARNAME='wxsvg' -PACKAGE_VERSION='1.5.24' -PACKAGE_STRING='wxsvg 1.5.24' +PACKAGE_VERSION='1.5.25' +PACKAGE_STRING='wxsvg 1.5.25' PACKAGE_BUGREPORT='http://wxsvg.sourceforge.net/' PACKAGE_URL='' @@ -1421,7 +1421,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxsvg 1.5.24 to adapt to many kinds of systems. +\`configure' configures wxsvg 1.5.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxsvg 1.5.24:";; + short | recursive ) echo "Configuration of wxsvg 1.5.25:";; esac cat <<\_ACEOF @@ -1639,7 +1639,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxsvg configure 1.5.24 +wxsvg configure 1.5.25 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2014,7 +2014,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxsvg $as_me 1.5.24, which was +It was created by wxsvg $as_me 1.5.25, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3500,7 +3500,7 @@ fi # Define the identity of the package. PACKAGE='wxsvg' - VERSION='1.5.24' + VERSION='1.5.25' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -18864,7 +18864,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxsvg $as_me 1.5.24, which was +This file was extended by wxsvg $as_me 1.5.25, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18923,7 +18923,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -wxsvg config.status 1.5.24 +wxsvg config.status 1.5.25 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Pdpru wxsvg-1.5.25.orig/configure.ac wxsvg-1.5.25/configure.ac --- wxsvg-1.5.25.orig/configure.ac 2024-05-18 14:04:49.000000000 +0200 +++ wxsvg-1.5.25/configure.ac 2024-09-16 09:05:02.988893909 +0200 @@ -2,7 +2,7 @@ # initialization AC_PREREQ([2.71]) -AC_INIT([wxsvg],[1.5.24],[http://wxsvg.sourceforge.net/]) +AC_INIT([wxsvg],[1.5.25],[http://wxsvg.sourceforge.net/]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE(foreign) AM_MAINTAINER_MODE

1 0