March 2023 - openSUSE Commits - openSUSE Mailing Lists

commit libstorage-ng for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2023-03-31 21:15:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old) and /work/SRC/openSUSE:Factory/.libstorage-ng.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage-ng" Fri Mar 31 21:15:14 2023 rev:211 rq:1075587 version:4.5.91 Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2023-03-29 23:26:25.175236342 +0200 +++ /work/SRC/openSUSE:Factory/.libstorage-ng.new.31432/libstorage-ng.changes 2023-03-31 21:15:16.958320417 +0200 @@ -1,0 +2,20 @@ +Thu Mar 30 15:53:17 UTC 2023 - aschnell(a)suse.com + +- merge gh#openSUSE/libstorage-ng#922 +- add PCIe as disk transport +- 4.5.91 + +-------------------------------------------------------------------- +Thu Mar 30 09:49:34 UTC 2023 - aschnell(a)suse.com + +- merge gh#openSUSE/libstorage-ng#921 +- fixed setting sysfs-name for partitions on nvme disks +- 4.5.90 + +-------------------------------------------------------------------- +Thu Mar 30 04:56:07 UTC 2023 - aschnell(a)suse.com + +- Translated using Weblate (Georgian) (bsc#1149754) +- 4.5.89 + +-------------------------------------------------------------------- Old: ---- libstorage-ng-4.5.88.tar.xz New: ---- libstorage-ng-4.5.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage-ng.spec ++++++ --- /var/tmp/diff_new_pack.0h2Ukz/_old 2023-03-31 21:15:17.574322614 +0200 +++ /var/tmp/diff_new_pack.0h2Ukz/_new 2023-03-31 21:15:17.578322628 +0200 @@ -18,7 +18,7 @@ %define libname %{name}1 Name: libstorage-ng -Version: 4.5.88 +Version: 4.5.91 Release: 0 Summary: Library for storage management License: GPL-2.0-only ++++++ libstorage-ng-4.5.88.tar.xz -> libstorage-ng-4.5.91.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/LIBVERSION new/libstorage-ng-4.5.91/LIBVERSION --- old/libstorage-ng-4.5.88/LIBVERSION 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/LIBVERSION 2023-03-30 17:53:17.000000000 +0200 @@ -1 +1 @@ -1.84.2 +1.85.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/VERSION new/libstorage-ng-4.5.91/VERSION --- old/libstorage-ng-4.5.88/VERSION 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/VERSION 2023-03-30 17:53:17.000000000 +0200 @@ -1 +1 @@ -4.5.88 +4.5.91 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/po/ka.po new/libstorage-ng-4.5.91/po/ka.po --- old/libstorage-ng-4.5.88/po/ka.po 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/po/ka.po 2023-03-30 17:53:17.000000000 +0200 @@ -8,10 +8,10 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-03-09 09:55+0100\n" -"PO-Revision-Date: 2023-02-04 20:14+0000\n" +"PO-Revision-Date: 2023-03-30 07:14+0000\n" "Last-Translator: Temuri Doghonadze <temuri.doghonadze(a)gmail.com>\n" -"Language-Team: Georgian <https://l10n.opensuse.org/projects/libstorage/ng-" -"master/ka/>\n" +"Language-Team: Georgian <https://l10n.opensuse.org/projects/libstorage/" +"ng-master/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,17 +79,17 @@ #. TRANSLATORS: displayed before action, #. %1$s is replaced by the device name (e.g. /dev/loop0), #. %2$s is replaced by the size (e.g. 20.00 GiB) -#, fuzzy, c-format +#, c-format msgid "Activate hard disk %1$s (%2$s)" -msgstr "%1 �� " +msgstr "%1$s (%2$s) �� " #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), #. %2$s is replaced by size (e.g. 2.00 GiB), #. %3$s is replaced by volume group name (e.g. system) -#, fuzzy, c-format +#, c-format msgid "Activate logical volume %1$s (%2$s) on volume group %3$s" -msgstr "%1 �� " +msgstr "�� %1$s (%2$s) �� %3$s" #. TRANSLATORS: displayed before action, #. %1$s is replaced by logical volume name (e.g. root), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/Disk.h new/libstorage-ng-4.5.91/storage/Devices/Disk.h --- old/libstorage-ng-4.5.88/storage/Devices/Disk.h 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/Disk.h 2023-03-30 17:53:17.000000000 +0200 @@ -35,7 +35,7 @@ * Data Transport Layer */ enum class Transport { - UNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB, FCOE + UNKNOWN, SBP, ATA, FC, ISCSI, SAS, SATA, SPI, USB, FCOE, PCIE }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/DiskImpl.cc new/libstorage-ng-4.5.91/storage/Devices/DiskImpl.cc --- old/libstorage-ng-4.5.88/storage/Devices/DiskImpl.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/DiskImpl.cc 2023-03-30 17:53:17.000000000 +0200 @@ -21,7 +21,7 @@ */ -#include <ctype.h> +#include <cctype> #include <boost/algorithm/string.hpp> #include "storage/Devices/DiskImpl.h" @@ -54,7 +54,7 @@ const vector<string> EnumTraits<Transport>::names({ - "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB", "FCoE" + "UNKNOWN", "SBP", "ATA", "FC", "iSCSI", "SAS", "SATA", "SPI", "USB", "FCoE", "PCIe" }); @@ -211,7 +211,7 @@ dax = dax_file.get<bool>(); Lsscsi::Entry entry; - if (system_info.getLsscsi().getEntry(get_name(), entry)) + if (system_info.getLsscsi().get_entry(get_name(), entry)) transport = entry.transport; const File& zoned_file = get_sysfs_file(system_info, "queue/zoned"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/PartitionImpl.cc new/libstorage-ng-4.5.91/storage/Devices/PartitionImpl.cc --- old/libstorage-ng-4.5.88/storage/Devices/PartitionImpl.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/PartitionImpl.cc 2023-03-30 17:53:17.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) [2016-2022] SUSE LLC + * Copyright (c) [2016-2023] SUSE LLC * * All Rights Reserved. * @@ -21,6 +21,7 @@ */ +#include <cctype> #include <boost/algorithm/string.hpp> #include "storage/Utils/AppUtil.h" @@ -630,11 +631,17 @@ { const Partitionable* partitionable = get_partitionable(); - if ((!partitionable->get_sysfs_name().empty() && !partitionable->get_sysfs_path().empty()) && - partitionable->get_dm_table_name().empty()) + const string& sysfs_name = partitionable->get_sysfs_name(); + const string& sysfs_path = partitionable->get_sysfs_path(); + + if ((!sysfs_name.empty() && !sysfs_path.empty()) && partitionable->get_dm_table_name().empty()) { - set_sysfs_name(partitionable->get_sysfs_name() + to_string(get_number())); - set_sysfs_path(partitionable->get_sysfs_path() + "/" + get_sysfs_name()); + if (isdigit(sysfs_name.back())) + set_sysfs_name(sysfs_name + "p" + to_string(get_number())); + else + set_sysfs_name(sysfs_name + to_string(get_number())); + + set_sysfs_path(sysfs_path + "/" + get_sysfs_name()); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/Devices/PartitionableImpl.cc new/libstorage-ng-4.5.91/storage/Devices/PartitionableImpl.cc --- old/libstorage-ng-4.5.88/storage/Devices/PartitionableImpl.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/Devices/PartitionableImpl.cc 2023-03-30 17:53:17.000000000 +0200 @@ -21,6 +21,7 @@ */ +#include <cctype> #include <boost/algorithm/string.hpp> #include "storage/Devices/PartitionableImpl.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.cc new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.cc --- old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.cc 2023-03-30 17:53:17.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) [2010-2020] Novell, Inc. + * Copyright (c) 2023 SUSE LLC * * All Rights Reserved. * @@ -48,16 +49,19 @@ { data.clear(); - for (vector<string>::const_iterator it = lines.begin(); it != lines.end(); ++it) + for (const string& line : lines) { - string line = boost::replace_all_copy(*it, " usb: ", " usb:"); - string type = extractNthWord(1, line); if (type != "disk") continue; - string transport = extractNthWord(2, line); - string device = extractNthWord(3, line); + string tmp = line; + + boost::replace_all(tmp, " usb: ", " usb:"); + boost::replace_all(tmp, " pcie 0x", " pcie:0x"); + + string transport = extractNthWord(2, tmp); + string device = extractNthWord(3, tmp); if (boost::starts_with(transport, "/dev/")) { device = transport; @@ -87,6 +91,8 @@ entry.transport = Transport::SPI; else if (boost::starts_with(transport, "usb:")) entry.transport = Transport::USB; + else if (boost::starts_with(transport, "pcie:")) + entry.transport = Transport::PCIE; data[device] = entry; } @@ -96,13 +102,13 @@ bool - Lsscsi::getEntry(const string& device, Entry& entry) const + Lsscsi::get_entry(const string& device, Entry& entry) const { - const_iterator i = data.find(device); - if (i == data.end()) + const_iterator it = data.find(device); + if (it == data.end()) return false; - entry = i->second; + entry = it->second; return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.h new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.h --- old/libstorage-ng-4.5.88/storage/SystemInfo/CmdLsscsi.h 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/storage/SystemInfo/CmdLsscsi.h 2023-03-30 17:53:17.000000000 +0200 @@ -52,7 +52,7 @@ friend std::ostream& operator<<(std::ostream& s, const Lsscsi& lsscsi); friend std::ostream& operator<<(std::ostream& s, const Entry& entry); - bool getEntry(const string& device, Entry& entry) const; + bool get_entry(const string& device, Entry& entry) const; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/testsuite/SystemInfo/lsscsi.cc new/libstorage-ng-4.5.91/testsuite/SystemInfo/lsscsi.cc --- old/libstorage-ng-4.5.88/testsuite/SystemInfo/lsscsi.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/testsuite/SystemInfo/lsscsi.cc 2023-03-30 17:53:17.000000000 +0200 @@ -110,3 +110,17 @@ check(input, output); } + + +BOOST_AUTO_TEST_CASE(parse6) +{ + vector<string> input = { + "[N:0:0:1] disk pcie 0x1d4c:0x03e2 /dev/nvme0n1" + }; + + vector<string> output = { + "data[/dev/nvme0n1] -> transport:PCIe" + }; + + check(input, output); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-ng-4.5.88/testsuite/partitions/set-number.cc new/libstorage-ng-4.5.91/testsuite/partitions/set-number.cc --- old/libstorage-ng-4.5.88/testsuite/partitions/set-number.cc 2023-03-27 00:14:42.000000000 +0200 +++ new/libstorage-ng-4.5.91/testsuite/partitions/set-number.cc 2023-03-30 17:53:17.000000000 +0200 @@ -7,11 +7,13 @@ #include "storage/Devices/DiskImpl.h" #include "storage/Devices/Msdos.h" +#include "storage/Devices/Gpt.h" #include "storage/Devices/PartitionImpl.h" #include "storage/Devicegraph.h" #include "storage/Storage.h" #include "storage/Environment.h" #include "storage/Utils/Region.h" +#include "storage/Utils/HumanString.h" using namespace std; @@ -47,9 +49,9 @@ BOOST_REQUIRE_EQUAL(partitions.size(), 2); BOOST_CHECK_EQUAL(partitions[1]->get_name(), "/dev/sda6"); + BOOST_CHECK_EQUAL(partitions[1]->get_number(), 6); BOOST_CHECK_EQUAL(partitions[1]->get_sysfs_name(), "sda6"); - BOOST_CHECK_EQUAL(partitions[1]->get_sysfs_path(), "/devices/pci0000:00/0000:00:1f.2/ata1/host0/target0:0:0/0:0:0:0/block/sda/sda6"); BOOST_REQUIRE_EQUAL(partitions[1]->get_udev_paths().size(), 1); @@ -59,3 +61,49 @@ BOOST_CHECK_EQUAL(partitions[1]->get_udev_ids()[0], "ata-WDC_WD10EADS-00M2B0_WD-WCAV52321683-part6"); BOOST_CHECK_EQUAL(partitions[1]->get_udev_ids()[1], "scsi-350014ee203733bb5-part6"); } + + +BOOST_AUTO_TEST_CASE(test2) +{ + Environment environment(true, ProbeMode::NONE, TargetMode::DIRECT); + + Storage storage(environment); + + Devicegraph* staging = storage.get_staging(); + + Disk* nvme0n1 = Disk::create(staging, "/dev/nvme0n1"); + nvme0n1->set_size(16 * GiB); + nvme0n1->get_impl().set_sysfs_name("nvme0n1"); + nvme0n1->get_impl().set_sysfs_path("/devices/pci0000:00/0000:00:1d.0/0000:3c:00.0/nvme/nvme0/nvme0n1"); + nvme0n1->get_impl().set_udev_paths({ "pci-0000:3c:00.0-nvme-1" }); + nvme0n1->get_impl().set_udev_ids({ "nvme-eui.008738c571d83492" }); + + Gpt* gpt = to_gpt(nvme0n1->create_partition_table(PtType::GPT)); + Partition* partition = gpt->create_partition("/dev/nvme0n1p1", Region(2048, 1048576, 512), PartitionType::PRIMARY); + + BOOST_CHECK_EQUAL(partition->get_name(), "/dev/nvme0n1p1"); + BOOST_CHECK_EQUAL(partition->get_number(), 1); + + BOOST_CHECK_EQUAL(partition->get_sysfs_name(), "nvme0n1p1"); + BOOST_CHECK_EQUAL(partition->get_sysfs_path(), "/devices/pci0000:00/0000:00:1d.0/0000:3c:00.0/nvme/nvme0/nvme0n1/nvme0n1p1"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_paths().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_paths()[0], "pci-0000:3c:00.0-nvme-1-part1"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_ids().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_ids()[0], "nvme-eui.008738c571d83492-part1"); + + partition->get_impl().set_number(2); + + BOOST_CHECK_EQUAL(partition->get_name(), "/dev/nvme0n1p2"); + BOOST_CHECK_EQUAL(partition->get_number(), 2); + + BOOST_CHECK_EQUAL(partition->get_sysfs_name(), "nvme0n1p2"); + BOOST_CHECK_EQUAL(partition->get_sysfs_path(), "/devices/pci0000:00/0000:00:1d.0/0000:3c:00.0/nvme/nvme0/nvme0n1/nvme0n1p2"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_paths().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_paths()[0], "pci-0000:3c:00.0-nvme-1-part2"); + + BOOST_REQUIRE_EQUAL(partition->get_udev_ids().size(), 1); + BOOST_CHECK_EQUAL(partition->get_udev_ids()[0], "nvme-eui.008738c571d83492-part2"); +}

1 0

commit ruby3.2 for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ruby3.2 for openSUSE:Factory checked in at 2023-03-31 21:15:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby3.2 (Old) and /work/SRC/openSUSE:Factory/.ruby3.2.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby3.2" Fri Mar 31 21:15:13 2023 rev:2 rq:1075579 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby3.2/ruby3.2.changes 2023-02-18 17:10:15.134685419 +0100 +++ /work/SRC/openSUSE:Factory/.ruby3.2.new.31432/ruby3.2.changes 2023-03-31 21:15:15.862316509 +0200 @@ -1,0 +2,10 @@ +Thu Mar 30 14:23:04 UTC 2023 - Marcus Rueckert <mrueckert(a)suse.de> + +- update to 3.2.2 (boo#1209891 CVE-2023-28755 boo#1209967 CVE-2023-28756) + https://www.ruby-lang.org/en/news/2023/03/30/redos-in-time-cve-2023-28756/ + https://www.ruby-lang.org/en/news/2023/03/28/redos-in-uri-cve-2023-28755/ + https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-2-2-released/ +- drop ruby-3.1.3-remove-timezone-test.patch + solved differently upstream + +------------------------------------------------------------------- Old: ---- ruby-3.2.1.tar.xz New: ---- ruby-3.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby3.2.spec ++++++ --- /var/tmp/diff_new_pack.ApT7p5/_old 2023-03-31 21:15:16.510318820 +0200 +++ /var/tmp/diff_new_pack.ApT7p5/_new 2023-03-31 21:15:16.518318848 +0200 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %ifarch x86_64 aarch64 %bcond_with yjit %else @@ -35,7 +36,7 @@ %global patch_level p0 Name: ruby3.2%{psuffix} -Version: 3.2.1 +Version: 3.2.2 Release: 0 %global pkg_version %{version} # make the exported API version explicit @@ -62,7 +63,6 @@ %global rb_extarchdocdir %{_libdir}/ruby/gems/%{rb_ver}/doc/extensions/%{rb_arch_short} %global rb_include_dir %{_includedir}/ruby-%{api_version} - %if "%{rb_default_ruby_suffix}" == "%{rb_soname}" %global is_default_ruby 1 %global rb_ua_weight 1%{_rb_ua_weight} ++++++ ruby-3.2.1.tar.xz -> ruby-3.2.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/ruby3.2/ruby-3.2.1.tar.xz /work/SRC/openSUSE:Factory/.ruby3.2.new.31432/ruby-3.2.2.tar.xz differ: char 27, line 1

1 0

commit gegl for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gegl for openSUSE:Factory checked in at 2023-03-31 21:15:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gegl (Old) and /work/SRC/openSUSE:Factory/.gegl.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gegl" Fri Mar 31 21:15:12 2023 rev:71 rq:1075578 version:0.4.44 Changes: -------- --- /work/SRC/openSUSE:Factory/gegl/gegl.changes 2023-03-05 20:08:00.632707954 +0100 +++ /work/SRC/openSUSE:Factory/.gegl.new.31432/gegl.changes 2023-03-31 21:15:13.302307380 +0200 @@ -1,0 +2,9 @@ +Thu Mar 30 14:09:16 UTC 2023 - Paolo Stivanin <info(a)paolostivanin.com> + +- Update to version 0.4.44: + + This release fixes a crashing bug what is umasked by GLib + 2.75.3 and newer. Never-allocated data were being passed to + g_slice_free, in GeglBuffer��s handling of copy-on-write tiles. + + ctx: Updated vendored library from upstream. + +------------------------------------------------------------------- Old: ---- gegl-0.4.42.tar.xz New: ---- gegl-0.4.44.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gegl.spec ++++++ --- /var/tmp/diff_new_pack.CQwqlj/_old 2023-03-31 21:15:13.958309719 +0200 +++ /var/tmp/diff_new_pack.CQwqlj/_new 2023-03-31 21:15:13.966309748 +0200 @@ -26,7 +26,7 @@ %bcond_with gegl_docs Name: gegl -Version: 0.4.42 +Version: 0.4.44 Release: 0 Summary: Generic Graphics Library License: GPL-3.0-or-later AND LGPL-3.0-or-later @@ -48,8 +48,8 @@ BuildRequires: pkgconfig BuildRequires: ruby BuildRequires: suitesparse-devel -BuildRequires: pkgconfig(OpenEXR) >= 1.6.1 BuildRequires: (pkgconfig(babl) or pkgconfig(babl-0.1)) +BuildRequires: pkgconfig(OpenEXR) >= 1.6.1 BuildRequires: pkgconfig(cairo) >= 1.12.2 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.32.0 BuildRequires: pkgconfig(gexiv2) ++++++ gegl-0.4.42.tar.xz -> gegl-0.4.44.tar.xz ++++++ ++++ 3139 lines of diff (skipped)

1 0

commit libupnp for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libupnp for openSUSE:Factory checked in at 2023-03-31 21:15:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libupnp (Old) and /work/SRC/openSUSE:Factory/.libupnp.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libupnp" Fri Mar 31 21:15:10 2023 rev:33 rq:1075563 version:1.14.16 Changes: -------- --- /work/SRC/openSUSE:Factory/libupnp/libupnp.changes 2022-11-20 19:46:55.433206569 +0100 +++ /work/SRC/openSUSE:Factory/.libupnp.new.31432/libupnp.changes 2023-03-31 21:15:11.702301675 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 13:29:07 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.14.16 + * Fix memory leak and ActionExAsync + +------------------------------------------------------------------- Old: ---- libupnp-1.14.15.tar.bz2 New: ---- libupnp-1.14.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libupnp.spec ++++++ --- /var/tmp/diff_new_pack.wztr8U/_old 2023-03-31 21:15:12.210303486 +0200 +++ /var/tmp/diff_new_pack.wztr8U/_new 2023-03-31 21:15:12.218303515 +0200 @@ -1,7 +1,7 @@ # # spec file for package libupnp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2011, Sascha Peilicke <saschpe(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %define pnpver 17 %define ixmlver 11 Name: libupnp -Version: 1.14.15 +Version: 1.14.16 Release: 0 Summary: An implementation of Universal Plug and Play (UPnP) License: BSD-3-Clause ++++++ libupnp-1.14.15.tar.bz2 -> libupnp-1.14.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/ChangeLog new/libupnp-1.14.16/ChangeLog --- old/libupnp-1.14.15/ChangeLog 2022-11-19 03:18:45.000000000 +0100 +++ new/libupnp-1.14.16/ChangeLog 2023-03-30 14:55:23.000000000 +0200 @@ -9,6 +9,63 @@ Aborted. ******************************************************************************* +Version 1.14.16 +******************************************************************************* + +2023-03-19 philippe44 <philippe44(a)users.noreply.github.com> + + Fix memory leak and ActionExAsync (#426) + + This intends to fix #424. I've found at least 2 memory leaks + + 1- When sending Action(Ex)Async + The ActionRequest document was not released nor was the ActionResult. + I initially tought that this should be done in + UpnpActionComplete::UpnpActionComplete_delete() but I was wrong because + ActionRequest and ActionResult do not "belong" to the Evt object. + The sets methods only set a pointer and modifying generator.c is not the + right solution. The reason is that ActionRequest "belongs" to the ACTION + job and should be handled as such if we want as well that, when the job + is cancelled, the memory is released as well. So I've change the + free_func for ACTION to reflect that. + + 2- When using event subscription + The Event was not released upon Timer termination. So I've done as + above, created a special free_func that handles that properly. + + In general, when something prevents the execution/submission of a job, + I've also used the actual free function instead of duplicating the + individual free(). Note that when terminating a timer, I'm using the + job's internal structure free_func() as it was already used to access + arg. One can argue that it should be an opaque structure and get/set or + the option to call the free function could be use instead. + + Also, I realized that ActionExAsync has never been working properly + because when the job is executed, only an Action is made, never an + ActionEx although the Header document is in the job's argument. I've + fixed that as well and stopped there to not go too deep in that rabbit + hole. + + I've also removed the upnp_timeout.c/h files as they were not used + anymore (and had a strange names anyway) + +2023-01-04 Thoren Paulson <thoren.paulson(a)gmail.com> + + Handle redundant initialization + +2022-12-22 Thoren Paulson <thoren.paulson(a)gmail.com> + + Clean up after failed initialization. + + Some initialization failures (such as failure in UpnpGetIfInfo) would + leave resources like thread pools initialized. This change ensures if + UpnpInit2 fails, we call UpnpFinish before returning to clean up those + resources. + + To ensure UpnpFinish is effective in this way, we set UpnpSdkInit to 1 + earlier in UpnpInit2. + +******************************************************************************* Version 1.14.15 ******************************************************************************* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/Makefile.in new/libupnp-1.14.16/Makefile.in --- old/libupnp-1.14.15/Makefile.in 2022-11-19 03:24:18.000000000 +0100 +++ new/libupnp-1.14.16/Makefile.in 2023-03-30 14:57:59.000000000 +0200 @@ -210,7 +210,7 @@ $(top_srcdir)/upnp/inc/upnpconfig.h.in \ $(top_srcdir)/upnp/sample/common/config_sample.h.in COPYING \ ChangeLog README.md THANKS build-aux/ar-lib build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/config.guess build-aux/config.sub \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/README.md new/libupnp-1.14.16/README.md --- old/libupnp-1.14.15/README.md 2022-11-19 03:21:29.000000000 +0100 +++ new/libupnp-1.14.16/README.md 2023-03-30 14:55:23.000000000 +0200 @@ -102,7 +102,8 @@ | -------------- | ---------- | ---------------------------------------- | | 1.18.0 | TBA ? | [Portable UPnP SDK][Portable UPnP SDK] | | 1.16.0 | aborted | [Portable UPnP SDK][Portable UPnP SDK] | -| 1.14.16 | TBA | [Portable UPnP SDK][Portable UPnP SDK] | +| 1.14.17 | TBA | [Portable UPnP SDK][Portable UPnP SDK] | +| 1.14.16 | 2023-03-30 | [Portable UPnP SDK][Portable UPnP SDK] | | 1.14.15 | 2022-11-18 | [Portable UPnP SDK][Portable UPnP SDK] | | 1.14.14 | 2022-10-05 | [Portable UPnP SDK][Portable UPnP SDK] | | 1.14.13 | 2022-08-03 | [Portable UPnP SDK][Portable UPnP SDK] | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/THANKS new/libupnp-1.14.16/THANKS --- old/libupnp-1.14.15/THANKS 2022-10-05 19:49:53.000000000 +0200 +++ new/libupnp-1.14.16/THANKS 2023-03-30 14:55:23.000000000 +0200 @@ -57,7 +57,7 @@ - Leuk_He - Loigu - Luke Kim (nereusuj) -- Marcelo Roberto Jimenez (mroberto) +- Marcelo Roberto Jimenez (mroberto, mrjimenez at github) - Markus Strobl - Marvin Scholz (ePirat at Github) - Matthew Garrett (mjg59) @@ -72,7 +72,7 @@ - Peng - Peter Hartley - Peter Pramberger (peterpramb) -- Philippe (philippe44ca) +- Philippe (philippe44 at github) - Philipp Matthias Hahn - Pino Toscano (pinotree) - Rene Hexel @@ -89,11 +89,12 @@ - Siva Chandran - Stefan Sommerfeld (zerocom) - St��phane Corth��sy -- Stephen Anthony Jones (frobones at gmail.com) +- Stephen Anthony Jones (frobones at gmail dot com) - Stephen Bash (scbash at Github) - Steve Bresson - Thijs Schreijer - Thomas Mitterfellner (lineinthesand at Github) +- Thoren Paulson (Thoren dot Paulson at gmail dot com, thoren-d at github) - Timothy Redaelli - Titus Winters - Tom (tomdev2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/configure new/libupnp-1.14.16/configure --- old/libupnp-1.14.15/configure 2022-11-19 03:24:19.000000000 +0100 +++ new/libupnp-1.14.16/configure 2023-03-30 14:57:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for libupnp 1.14.15. +# Generated by GNU Autoconf 2.71 for libupnp 1.14.16. # # Report bugs to <mroberto(a)users.sourceforge.net>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='libupnp' PACKAGE_TARNAME='libupnp' -PACKAGE_VERSION='1.14.15' -PACKAGE_STRING='libupnp 1.14.15' +PACKAGE_VERSION='1.14.16' +PACKAGE_STRING='libupnp 1.14.16' PACKAGE_BUGREPORT='mroberto(a)users.sourceforge.net' PACKAGE_URL='' @@ -1434,7 +1434,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libupnp 1.14.15 to adapt to many kinds of systems. +\`configure' configures libupnp 1.14.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libupnp 1.14.15:";; + short | recursive ) echo "Configuration of libupnp 1.14.16:";; esac cat <<\_ACEOF @@ -1652,7 +1652,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libupnp configure 1.14.15 +libupnp configure 1.14.16 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2008,7 +2008,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libupnp $as_me 1.14.15, which was +It was created by libupnp $as_me 1.14.16, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2766,7 +2766,7 @@ LT_VERSION_IXML=12:2:1 -LT_VERSION_UPNP=18:6:1 +LT_VERSION_UPNP=18:7:1 @@ -3288,7 +3288,7 @@ # Define the identity of the package. PACKAGE='libupnp' - VERSION='1.14.15' + VERSION='1.14.16' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -17722,7 +17722,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libupnp $as_me 1.14.15, which was +This file was extended by libupnp $as_me 1.14.16, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17790,7 +17790,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libupnp config.status 1.14.15 +libupnp config.status 1.14.16 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/configure.ac new/libupnp-1.14.16/configure.ac --- old/libupnp-1.14.15/configure.ac 2022-11-19 03:24:08.000000000 +0100 +++ new/libupnp-1.14.16/configure.ac 2022-11-19 03:28:44.000000000 +0100 @@ -9,7 +9,7 @@ AC_PREREQ(2.60) -AC_INIT([libupnp], [1.14.15], [mroberto(a)users.sourceforge.net] +AC_INIT([libupnp], [1.14.16], [mroberto(a)users.sourceforge.net] dnl ############################################################################ dnl # *Independently* of the above libupnp package version, the libtool version dnl # of the 3 libraries need to be updated whenever there is a change released: @@ -209,8 +209,18 @@ dnl #AC_SUBST([LT_VERSION_UPNP], [18:6:1]) dnl # dnl ############################################################################ +dnl # Release 1.14.16 +dnl # "current:revision:age" +dnl # +dnl # - Code has changed in upnp +dnl # revision: 6 -> 7 +dnl # +dnl #AC_SUBST([LT_VERSION_IXML], [12:2:1]) +dnl #AC_SUBST([LT_VERSION_UPNP], [18:7:1]) +dnl # +dnl ############################################################################ AC_SUBST([LT_VERSION_IXML], [12:2:1]) -AC_SUBST([LT_VERSION_UPNP], [18:6:1]) +AC_SUBST([LT_VERSION_UPNP], [18:7:1]) dnl ############################################################################ dnl # Repeating the algorithm to place it closer to the modificatin place: dnl # - library code modified: revision++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/docs/Doxyfile new/libupnp-1.14.16/docs/Doxyfile --- old/libupnp-1.14.15/docs/Doxyfile 2022-10-05 19:49:53.000000000 +0200 +++ new/libupnp-1.14.16/docs/Doxyfile 2022-11-19 03:29:29.000000000 +0100 @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.14.15 +PROJECT_NUMBER = 1.14.16 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/libupnp.spec new/libupnp-1.14.16/libupnp.spec --- old/libupnp-1.14.15/libupnp.spec 2022-10-05 19:49:53.000000000 +0200 +++ new/libupnp-1.14.16/libupnp.spec 2022-11-19 03:29:49.000000000 +0100 @@ -1,4 +1,4 @@ -Version: 1.14.15 +Version: 1.14.16 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp-1.14 Release: 1%{?dist} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/CMakeLists.txt new/libupnp-1.14.16/upnp/CMakeLists.txt --- old/libupnp-1.14.15/upnp/CMakeLists.txt 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/CMakeLists.txt 2023-03-20 02:24:51.000000000 +0100 @@ -35,7 +35,6 @@ src/genlib/util/list.c src/genlib/util/membuffer.c src/genlib/util/strintmap.c - src/genlib/util/upnp_timeout.c src/genlib/util/util.c src/threadutil/FreeList.c src/threadutil/LinkedList.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/Makefile.am new/libupnp-1.14.16/upnp/Makefile.am --- old/libupnp-1.14.15/upnp/Makefile.am 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/Makefile.am 2023-03-20 02:24:51.000000000 +0100 @@ -83,7 +83,6 @@ src/inc/sysdep.h \ src/inc/unixutil.h \ src/inc/upnpapi.h \ - src/inc/upnp_timeout.h \ src/inc/uri.h \ src/inc/urlconfig.h \ src/inc/upnputil.h \ @@ -134,7 +133,6 @@ src/genlib/service_table/service_table.c \ src/genlib/util/membuffer.c \ src/genlib/util/strintmap.c \ - src/genlib/util/upnp_timeout.c \ src/genlib/util/util.c \ src/genlib/util/list.c \ src/genlib/net/sock.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/Makefile.in new/libupnp-1.14.16/upnp/Makefile.in --- old/libupnp-1.14.15/upnp/Makefile.in 2022-11-19 03:24:19.000000000 +0100 +++ new/libupnp-1.14.16/upnp/Makefile.in 2023-03-30 14:57:59.000000000 +0200 @@ -206,14 +206,14 @@ src/inc/service_table.h src/inc/soaplib.h src/inc/sock.h \ src/inc/statcodes.h src/inc/strintmap.h src/inc/ssdplib.h \ src/inc/sysdep.h src/inc/unixutil.h src/inc/upnpapi.h \ - src/inc/upnp_timeout.h src/inc/uri.h src/inc/urlconfig.h \ - src/inc/upnputil.h src/inc/uuid.h src/inc/VirtualDir.h \ - src/inc/webserver.h src/threadutil/FreeList.h \ - src/threadutil/FreeList.c src/threadutil/LinkedList.h \ - src/threadutil/LinkedList.c src/threadutil/ThreadPool.h \ - src/threadutil/ThreadPool.c src/threadutil/TimerThread.h \ - src/threadutil/TimerThread.c src/ssdp/SSDPResultData.c \ - src/ssdp/SSDPResultData.h src/ssdp/SSDPResultDataCallback.c \ + src/inc/uri.h src/inc/urlconfig.h src/inc/upnputil.h \ + src/inc/uuid.h src/inc/VirtualDir.h src/inc/webserver.h \ + src/threadutil/FreeList.h src/threadutil/FreeList.c \ + src/threadutil/LinkedList.h src/threadutil/LinkedList.c \ + src/threadutil/ThreadPool.h src/threadutil/ThreadPool.c \ + src/threadutil/TimerThread.h src/threadutil/TimerThread.c \ + src/ssdp/SSDPResultData.c src/ssdp/SSDPResultData.h \ + src/ssdp/SSDPResultDataCallback.c \ src/ssdp/SSDPResultDataCallback.h src/ssdp/ssdp_device.c \ src/ssdp/ssdp_ctrlpt.c src/ssdp/ssdp_server.c \ src/soap/soap_device.c src/soap/soap_ctrlpt.c \ @@ -222,9 +222,8 @@ src/genlib/client_table/GenlibClientSubscription.c \ src/genlib/service_table/service_table.c \ src/genlib/util/membuffer.c src/genlib/util/strintmap.c \ - src/genlib/util/upnp_timeout.c src/genlib/util/util.c \ - src/genlib/util/list.c src/genlib/net/sock.c \ - src/genlib/net/http/httpparser.c \ + src/genlib/util/util.c src/genlib/util/list.c \ + src/genlib/net/sock.c src/genlib/net/http/httpparser.c \ src/genlib/net/http/httpreadwrite.c \ src/genlib/net/http/statcodes.c \ src/genlib/net/http/webserver.c \ @@ -268,7 +267,6 @@ src/genlib/service_table/libupnp_la-service_table.lo \ src/genlib/util/libupnp_la-membuffer.lo \ src/genlib/util/libupnp_la-strintmap.lo \ - src/genlib/util/libupnp_la-upnp_timeout.lo \ src/genlib/util/libupnp_la-util.lo \ src/genlib/util/libupnp_la-list.lo \ src/genlib/net/libupnp_la-sock.lo \ @@ -363,7 +361,6 @@ src/genlib/util/$(DEPDIR)/libupnp_la-list.Plo \ src/genlib/util/$(DEPDIR)/libupnp_la-membuffer.Plo \ src/genlib/util/$(DEPDIR)/libupnp_la-strintmap.Plo \ - src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Plo \ src/genlib/util/$(DEPDIR)/libupnp_la-util.Plo \ src/soap/$(DEPDIR)/libupnp_la-soap_common.Plo \ src/soap/$(DEPDIR)/libupnp_la-soap_ctrlpt.Plo \ @@ -831,21 +828,20 @@ src/inc/service_table.h src/inc/soaplib.h src/inc/sock.h \ src/inc/statcodes.h src/inc/strintmap.h src/inc/ssdplib.h \ src/inc/sysdep.h src/inc/unixutil.h src/inc/upnpapi.h \ - src/inc/upnp_timeout.h src/inc/uri.h src/inc/urlconfig.h \ - src/inc/upnputil.h src/inc/uuid.h src/inc/VirtualDir.h \ - src/inc/webserver.h src/threadutil/FreeList.h \ - src/threadutil/FreeList.c src/threadutil/LinkedList.h \ - src/threadutil/LinkedList.c src/threadutil/ThreadPool.h \ - src/threadutil/ThreadPool.c src/threadutil/TimerThread.h \ - src/threadutil/TimerThread.c $(am__append_3) $(am__append_4) \ + src/inc/uri.h src/inc/urlconfig.h src/inc/upnputil.h \ + src/inc/uuid.h src/inc/VirtualDir.h src/inc/webserver.h \ + src/threadutil/FreeList.h src/threadutil/FreeList.c \ + src/threadutil/LinkedList.h src/threadutil/LinkedList.c \ + src/threadutil/ThreadPool.h src/threadutil/ThreadPool.c \ + src/threadutil/TimerThread.h src/threadutil/TimerThread.c \ + $(am__append_3) $(am__append_4) \ src/genlib/miniserver/miniserver.c \ src/genlib/client_table/client_table.c \ src/genlib/client_table/GenlibClientSubscription.c \ src/genlib/service_table/service_table.c \ src/genlib/util/membuffer.c src/genlib/util/strintmap.c \ - src/genlib/util/upnp_timeout.c src/genlib/util/util.c \ - src/genlib/util/list.c src/genlib/net/sock.c \ - src/genlib/net/http/httpparser.c \ + src/genlib/util/util.c src/genlib/util/list.c \ + src/genlib/net/sock.c src/genlib/net/http/httpparser.c \ src/genlib/net/http/httpreadwrite.c \ src/genlib/net/http/statcodes.c \ src/genlib/net/http/webserver.c \ @@ -1031,9 +1027,6 @@ src/genlib/util/libupnp_la-strintmap.lo: \ src/genlib/util/$(am__dirstamp) \ src/genlib/util/$(DEPDIR)/$(am__dirstamp) -src/genlib/util/libupnp_la-upnp_timeout.lo: \ - src/genlib/util/$(am__dirstamp) \ - src/genlib/util/$(DEPDIR)/$(am__dirstamp) src/genlib/util/libupnp_la-util.lo: src/genlib/util/$(am__dirstamp) \ src/genlib/util/$(DEPDIR)/$(am__dirstamp) src/genlib/util/libupnp_la-list.lo: src/genlib/util/$(am__dirstamp) \ @@ -1253,7 +1246,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/genlib/util/$(DEPDIR)/libupnp_la-list.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/genlib/util/$(DEPDIR)/libupnp_la-membuffer.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/genlib/util/$(DEPDIR)/libupnp_la-strintmap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/genlib/util/$(DEPDIR)/libupnp_la-util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/soap/$(DEPDIR)/libupnp_la-soap_common.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/soap/$(DEPDIR)/libupnp_la-soap_ctrlpt.Plo@am__quote@ # am--include-marker @@ -1432,13 +1424,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libupnp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/genlib/util/libupnp_la-strintmap.lo `test -f 'src/genlib/util/strintmap.c' || echo '$(srcdir)/'`src/genlib/util/strintmap.c -src/genlib/util/libupnp_la-upnp_timeout.lo: src/genlib/util/upnp_timeout.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libupnp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/genlib/util/libupnp_la-upnp_timeout.lo -MD -MP -MF src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Tpo -c -o src/genlib/util/libupnp_la-upnp_timeout.lo `test -f 'src/genlib/util/upnp_timeout.c' || echo '$(srcdir)/'`src/genlib/util/upnp_timeout.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Tpo src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/genlib/util/upnp_timeout.c' object='src/genlib/util/libupnp_la-upnp_timeout.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libupnp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/genlib/util/libupnp_la-upnp_timeout.lo `test -f 'src/genlib/util/upnp_timeout.c' || echo '$(srcdir)/'`src/genlib/util/upnp_timeout.c - src/genlib/util/libupnp_la-util.lo: src/genlib/util/util.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libupnp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/genlib/util/libupnp_la-util.lo -MD -MP -MF src/genlib/util/$(DEPDIR)/libupnp_la-util.Tpo -c -o src/genlib/util/libupnp_la-util.lo `test -f 'src/genlib/util/util.c' || echo '$(srcdir)/'`src/genlib/util/util.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/genlib/util/$(DEPDIR)/libupnp_la-util.Tpo src/genlib/util/$(DEPDIR)/libupnp_la-util.Plo @@ -2175,7 +2160,6 @@ -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-list.Plo -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-membuffer.Plo -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-strintmap.Plo - -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Plo -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-util.Plo -rm -f src/soap/$(DEPDIR)/libupnp_la-soap_common.Plo -rm -f src/soap/$(DEPDIR)/libupnp_la-soap_ctrlpt.Plo @@ -2275,7 +2259,6 @@ -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-list.Plo -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-membuffer.Plo -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-strintmap.Plo - -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-upnp_timeout.Plo -rm -f src/genlib/util/$(DEPDIR)/libupnp_la-util.Plo -rm -f src/soap/$(DEPDIR)/libupnp_la-soap_common.Plo -rm -f src/soap/$(DEPDIR)/libupnp_la-soap_ctrlpt.Plo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/src/api/upnpapi.c new/libupnp-1.14.16/upnp/src/api/upnpapi.c --- old/libupnp-1.14.15/upnp/src/api/upnpapi.c 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/src/api/upnpapi.c 2023-03-20 02:25:07.000000000 +0100 @@ -239,6 +239,42 @@ SSL_CTX *gSslCtx = NULL; #endif +typedef union +{ + struct + { + int handle; + int eventId; + void *Event; + } advertise; + struct UpnpNonblockParam action; +} job_arg; + +/*! + * \brief Free memory associated with advertise job's argument + */ +static void free_advertise_arg(job_arg *arg) +{ + if (arg->advertise.Event) { + free(arg->advertise.Event); + } + free(arg); +} + +/*! + * \brief Free memory associated with an action job's argument + */ +static void free_action_arg(job_arg *arg) +{ + if (arg->action.Header) { + ixmlDocument_free(arg->action.Header); + } + if (arg->action.Act) { + ixmlDocument_free(arg->action.Act); + } + free(arg); +} + /*! * \brief (Windows Only) Initializes the Windows Winsock library. * @@ -511,6 +547,10 @@ goto exit_function; } + /* Set the UpnpSdkInit flag to 1 to indicate we're successfully + * initialized. */ + UpnpSdkInit = 1; + /* Perform initialization preamble. */ retVal = UpnpInitPreamble(); if (retVal != UPNP_E_SUCCESS) { @@ -531,18 +571,16 @@ goto exit_function; } - /* Set the UpnpSdkInit flag to 1 to indicate we're successfully - * initialized. */ - UpnpSdkInit = 1; - /* Finish initializing the SDK. */ retVal = UpnpInitStartServers(DestPort); if (retVal != UPNP_E_SUCCESS) { - UpnpSdkInit = 0; goto exit_function; } exit_function: + if (retVal != UPNP_E_SUCCESS && retVal != UPNP_E_INIT) { + UpnpFinish(); + } ithread_mutex_unlock(&gSDKInitMutex); return retVal; @@ -1892,7 +1930,7 @@ { struct Handle_Info *SInfo = NULL; int retVal = 0, *ptrMx; - upnp_timeout *adEvent; + job_arg *adEvent; ThreadPoolJob job; memset(&job, 0, sizeof(job)); @@ -1940,15 +1978,15 @@ ptrMx = (int *)malloc(sizeof(int)); if (ptrMx == NULL) return UPNP_E_OUTOF_MEMORY; - adEvent = (upnp_timeout *)malloc(sizeof(upnp_timeout)); + adEvent = (job_arg *)malloc(sizeof(job_arg)); if (adEvent == NULL) { free(ptrMx); return UPNP_E_OUTOF_MEMORY; } *ptrMx = Exp; - adEvent->handle = Hnd; - adEvent->Event = ptrMx; + adEvent->advertise.handle = Hnd; + adEvent->advertise.Event = ptrMx; HandleLock(); switch (GetHandleInfo(Hnd, &SInfo)) { @@ -1962,32 +2000,30 @@ } #ifdef SSDP_PACKET_DISTRIBUTE TPJobInit(&job, (start_routine)AutoAdvertise, adEvent); - TPJobSetFreeFunction(&job, (free_routine)free_upnp_timeout); + TPJobSetFreeFunction(&job, (free_routine)free_advertise_arg); TPJobSetPriority(&job, MED_PRIORITY); if ((retVal = TimerThreadSchedule(&gTimerThread, ((Exp / 2) - (AUTO_ADVERTISEMENT_TIME)), REL_SEC, &job, SHORT_TERM, - &(adEvent->eventId))) != UPNP_E_SUCCESS) { + &(adEvent->advertise.eventId))) != UPNP_E_SUCCESS) { HandleUnlock(); - free(adEvent); - free(ptrMx); + free_advertise_arg(adEvent); return retVal; } #else TPJobInit(&job, (start_routine)AutoAdvertise, adEvent); - TPJobSetFreeFunction(&job, (free_routine)free_upnp_timeout); + TPJobSetFreeFunction(&job, (free_routine)free_advertise_arg); TPJobSetPriority(&job, MED_PRIORITY); if ((retVal = TimerThreadSchedule(&gTimerThread, Exp - AUTO_ADVERTISEMENT_TIME, REL_SEC, &job, SHORT_TERM, - &(adEvent->eventId))) != UPNP_E_SUCCESS) { + &(adEvent->advertise.eventId))) != UPNP_E_SUCCESS) { HandleUnlock(); - free(adEvent); - free(ptrMx); + free_advertise_arg(adEvent); return retVal; } #endif @@ -3026,11 +3062,11 @@ Param->Fun = Fun; TPJobInit(&job, (start_routine)UpnpThreadDistribution, Param); - TPJobSetFreeFunction(&job, (free_routine)free); + TPJobSetFreeFunction(&job, (free_routine)free_action_arg); TPJobSetPriority(&job, MED_PRIORITY); if (ThreadPoolAdd(&gSendThreadPool, &job, NULL) != 0) { - free(Param); + free_action_arg((job_arg *)Param); } UpnpPrintf(UPNP_ALL, @@ -3155,11 +3191,11 @@ Param->Fun = Fun; TPJobInit(&job, (start_routine)UpnpThreadDistribution, Param); - TPJobSetFreeFunction(&job, (free_routine)free); + TPJobSetFreeFunction(&job, (free_routine)free_action_arg); TPJobSetPriority(&job, MED_PRIORITY); if (ThreadPoolAdd(&gSendThreadPool, &job, NULL) != 0) { - free(Param); + free_action_arg((job_arg *)Param); } UpnpPrintf(UPNP_ALL, @@ -4026,17 +4062,27 @@ case ACTION: { UpnpActionComplete *Evt = UpnpActionComplete_new(); IXML_Document *actionResult = NULL; - int errCode = SoapSendAction(Param->Url, - Param->ServiceType, - Param->Act, - &actionResult); + int errCode; + if (Param->Header) { + errCode = SoapSendActionEx(Param->Url, + Param->ServiceType, + Param->Header, + Param->Act, + &actionResult); + } else { + errCode = SoapSendAction(Param->Url, + Param->ServiceType, + Param->Act, + &actionResult); + } UpnpActionComplete_set_ErrCode(Evt, errCode); UpnpActionComplete_set_ActionRequest(Evt, Param->Act); UpnpActionComplete_set_ActionResult(Evt, actionResult); UpnpActionComplete_strcpy_CtrlUrl(Evt, Param->Url); Param->Fun(UPNP_CONTROL_ACTION_COMPLETE, Evt, Param->Cookie); - free(Param); UpnpActionComplete_delete(Evt); + ixmlDocument_free(actionResult); + free_action_arg((job_arg *)Param); break; } case STATUS: { @@ -4251,10 +4297,11 @@ #if EXCLUDE_SSDP == 0 void AutoAdvertise(void *input) { - upnp_timeout *event = (upnp_timeout *)input; + job_arg *arg = (job_arg *)input; - UpnpSendAdvertisement(event->handle, *((int *)event->Event)); - free_upnp_timeout(event); + UpnpSendAdvertisement( + arg->advertise.handle, *((int *)arg->advertise.Event)); + free_advertise_arg(arg); } #endif /* EXCLUDE_SSDP == 0 */ #endif /* INCLUDE_DEVICE_APIS */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/src/gena/gena_ctrlpt.c new/libupnp-1.14.16/upnp/src/gena/gena_ctrlpt.c --- old/libupnp-1.14.15/upnp/src/gena/gena_ctrlpt.c 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/src/gena/gena_ctrlpt.c 2023-03-20 02:24:51.000000000 +0100 @@ -53,16 +53,36 @@ extern ithread_mutex_t GlobalClientSubscribeMutex; +typedef struct +{ + int handle; + int eventId; + void *Event; +} job_arg; + +/*! + * \brief Free memory associated with job's argument + */ +static void free_subscribe_arg(job_arg *arg) +{ + if (arg) { + if (arg->Event) { + UpnpEventSubscribe_delete(arg->Event); + } + free(arg); + } +} + /*! * \brief This is a thread function to send the renewal just before the * subscription times out. */ static void GenaAutoRenewSubscription( - /*! [in] Thread data(upnp_timeout *) needed to send the renewal. */ + /*! [in] Thread data(job_arg *) needed to send the renewal. */ void *input) { - upnp_timeout *event = (upnp_timeout *)input; - UpnpEventSubscribe *sub_struct = (UpnpEventSubscribe *)event->Event; + job_arg *arg = (job_arg *)input; + UpnpEventSubscribe *sub_struct = (UpnpEventSubscribe *)arg->Event; void *cookie; Upnp_FunPtr callback_fun; struct Handle_Info *handle_info; @@ -84,7 +104,7 @@ UpnpPrintf( UPNP_INFO, GENA, __FILE__, __LINE__, "GENA AUTO RENEW"); timeout = UpnpEventSubscribe_get_TimeOut(sub_struct); - errCode = genaRenewSubscription(event->handle, + errCode = genaRenewSubscription(arg->handle, UpnpEventSubscribe_get_SID(sub_struct), &timeout); UpnpEventSubscribe_set_ErrCode(sub_struct, errCode); @@ -98,9 +118,9 @@ if (send_callback) { HandleReadLock(); - if (GetHandleInfo(event->handle, &handle_info) != HND_CLIENT) { + if (GetHandleInfo(arg->handle, &handle_info) != HND_CLIENT) { HandleUnlock(); - free_upnp_timeout(event); + free_subscribe_arg(arg); goto end_function; } UpnpPrintf( @@ -110,10 +130,10 @@ callback_fun = handle_info->Callback; cookie = handle_info->Cookie; HandleUnlock(); - callback_fun(eventType, event->Event, cookie); + callback_fun(eventType, arg->Event, cookie); } - free_upnp_timeout(event); + free_subscribe_arg(arg); end_function: return; @@ -133,8 +153,8 @@ /*! [in] Subscription being renewed. */ GenlibClientSubscription *sub) { - UpnpEventSubscribe *RenewEventStruct = NULL; - upnp_timeout *RenewEvent = NULL; + UpnpEventSubscribe *RenewEvent = NULL; + job_arg *arg = NULL; int return_code = GENA_SUCCESS; ThreadPoolJob job; @@ -145,34 +165,33 @@ goto end_function; } - RenewEventStruct = UpnpEventSubscribe_new(); - if (RenewEventStruct == NULL) { + RenewEvent = UpnpEventSubscribe_new(); + if (RenewEvent == NULL) { return_code = UPNP_E_OUTOF_MEMORY; goto end_function; } - RenewEvent = (upnp_timeout *)malloc(sizeof(upnp_timeout)); - if (RenewEvent == NULL) { - free(RenewEventStruct); + arg = (job_arg *)malloc(sizeof(job_arg)); + if (arg == NULL) { + free(RenewEvent); return_code = UPNP_E_OUTOF_MEMORY; goto end_function; } - memset(RenewEvent, 0, sizeof(upnp_timeout)); + memset(arg, 0, sizeof(job_arg)); /* schedule expire event */ - UpnpEventSubscribe_set_ErrCode(RenewEventStruct, UPNP_E_SUCCESS); - UpnpEventSubscribe_set_TimeOut(RenewEventStruct, TimeOut); + UpnpEventSubscribe_set_ErrCode(RenewEvent, UPNP_E_SUCCESS); + UpnpEventSubscribe_set_TimeOut(RenewEvent, TimeOut); UpnpEventSubscribe_set_SID( - RenewEventStruct, GenlibClientSubscription_get_SID(sub)); + RenewEvent, GenlibClientSubscription_get_SID(sub)); UpnpEventSubscribe_set_PublisherUrl( - RenewEventStruct, GenlibClientSubscription_get_EventURL(sub)); + RenewEvent, GenlibClientSubscription_get_EventURL(sub)); - /* RenewEvent->EventType=UPNP_EVENT_SUBSCRIPTION_EXPIRE; */ - RenewEvent->handle = client_handle; - RenewEvent->Event = RenewEventStruct; + arg->handle = client_handle; + arg->Event = RenewEvent; - TPJobInit(&job, (start_routine)GenaAutoRenewSubscription, RenewEvent); - TPJobSetFreeFunction(&job, (free_routine)free_upnp_timeout); + TPJobInit(&job, (start_routine)GenaAutoRenewSubscription, arg); + TPJobSetFreeFunction(&job, (free_routine)free_subscribe_arg); TPJobSetPriority(&job, MED_PRIORITY); /* Schedule the job */ @@ -181,14 +200,13 @@ REL_SEC, &job, SHORT_TERM, - &(RenewEvent->eventId)); + &(arg->eventId)); if (return_code != UPNP_E_SUCCESS) { - free(RenewEvent); - free(RenewEventStruct); + free_subscribe_arg(arg); goto end_function; } - GenlibClientSubscription_set_RenewEventId(sub, RenewEvent->eventId); + GenlibClientSubscription_set_RenewEventId(sub, arg->eventId); return_code = GENA_SUCCESS; @@ -665,7 +683,7 @@ if (TimerThreadRemove(&gTimerThread, GenlibClientSubscription_get_RenewEventId(sub), &tempJob) == 0) { - free_upnp_timeout((upnp_timeout *)tempJob.arg); + tempJob.free_func(tempJob.arg); } UpnpPrintf(UPNP_INFO, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/src/genlib/client_table/client_table.c new/libupnp-1.14.16/upnp/src/genlib/client_table/client_table.c --- old/libupnp-1.14.15/upnp/src/genlib/client_table/client_table.c 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/src/genlib/client_table/client_table.c 2023-03-20 02:24:51.000000000 +0100 @@ -16,7 +16,6 @@ void free_client_subscription(GenlibClientSubscription *sub) { - upnp_timeout *event; ThreadPoolJob tempJob; if (sub) { int renewEventId = @@ -29,8 +28,7 @@ if (TimerThreadRemove(&gTimerThread, renewEventId, &tempJob) == 0) { - event = (upnp_timeout *)tempJob.arg; - free_upnp_timeout(event); + tempJob.free_func(tempJob.arg); } } GenlibClientSubscription_set_RenewEventId(sub, -1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/src/genlib/util/upnp_timeout.c new/libupnp-1.14.16/upnp/src/genlib/util/upnp_timeout.c --- old/libupnp-1.14.15/upnp/src/genlib/util/upnp_timeout.c 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/src/genlib/util/upnp_timeout.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -/******************************************************************************* - * - * Copyright (c) 2000-2003 Intel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ******************************************************************************/ - -/*! - * \file - * - * \brief Contains a function for freeing the memory associated with a upnp - * time out event. - */ - -#include "config.h" - -#include "upnp_timeout.h" - -#include <stdlib.h> /* for free() */ - -void free_upnp_timeout(upnp_timeout *event) -{ - if (event) { - if (event->Event) { - free(event->Event); - } - free(event); - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/src/inc/client_table.h new/libupnp-1.14.16/upnp/src/inc/client_table.h --- old/libupnp-1.14.15/upnp/src/inc/client_table.h 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/src/inc/client_table.h 2023-03-20 02:24:51.000000000 +0100 @@ -15,7 +15,6 @@ #include "UpnpString.h" #include "service_table.h" #include "upnp.h" -#include "upnp_timeout.h" #include "uri.h" #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libupnp-1.14.15/upnp/src/inc/upnp_timeout.h new/libupnp-1.14.16/upnp/src/inc/upnp_timeout.h --- old/libupnp-1.14.15/upnp/src/inc/upnp_timeout.h 2022-08-03 16:14:24.000000000 +0200 +++ new/libupnp-1.14.16/upnp/src/inc/upnp_timeout.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -/******************************************************************************* - * - * Copyright (c) 2000-2003 Intel Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - Neither name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - ******************************************************************************/ - -#ifndef UPNPTIMEOUT_H -#define UPNPTIMEOUT_H - -/*! - * \file - */ - -/*! - * The upnp_timeout structure definition. - */ -typedef struct UPNP_TIMEOUT -{ - int EventType; - int handle; - int eventId; - void *Event; -} upnp_timeout; - -/*! - * \brief Free memory associated with event and memory for any sub-elements. - */ -void free_upnp_timeout( - /*! [in] Event which needs to be freed. */ - upnp_timeout *event); - -#endif /* UPNPTIMEOUT_H */

1 0

commit polkit for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package polkit for openSUSE:Factory checked in at 2023-03-31 21:15:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/polkit (Old) and /work/SRC/openSUSE:Factory/.polkit.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "polkit" Fri Mar 31 21:15:09 2023 rev:88 rq:1075521 version:121 Changes: -------- --- /work/SRC/openSUSE:Factory/polkit/polkit.changes 2022-11-10 14:19:38.537456739 +0100 +++ /work/SRC/openSUSE:Factory/.polkit.new.31432/polkit.changes 2023-03-31 21:15:10.514297438 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 13:37:25 UTC 2023 - Johannes Segitz <jsegitz(a)suse.com> + +- Change permissions for rules folders (bsc#1209282) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ polkit.spec ++++++ --- /var/tmp/diff_new_pack.tbJaUP/_old 2023-03-31 21:15:11.174299792 +0200 +++ /var/tmp/diff_new_pack.tbJaUP/_new 2023-03-31 21:15:11.182299821 +0200 @@ -1,7 +1,7 @@ # # spec file for package polkit # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -264,11 +264,11 @@ %{_datadir}/polkit-1/policyconfig-1.dtd %dir %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/org.freedesktop.policykit.policy -%attr(0700,polkitd,root) %dir %{_polkit_rulesdir} -%attr(0600,polkitd,root) %{_polkit_rulesdir}/50-default.rules +%attr(0750,root,polkitd) %dir %{_polkit_rulesdir} +%attr(0640,root,polkitd) %{_polkit_rulesdir}/50-default.rules %{_pam_vendordir}/polkit-1 %dir %{_sysconfdir}/polkit-1 -%attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d +%attr(0750,root,polkitd) %dir %{_sysconfdir}/polkit-1/rules.d %dir %{_sysconfdir}/polkit-1/actions %{_bindir}/pkaction %{_bindir}/pkcheck

1 0

commit SVT-AV1 for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package SVT-AV1 for openSUSE:Factory checked in at 2023-03-31 21:15:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SVT-AV1 (Old) and /work/SRC/openSUSE:Factory/.SVT-AV1.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SVT-AV1" Fri Mar 31 21:15:08 2023 rev:9 rq:1075515 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/SVT-AV1/SVT-AV1.changes 2023-01-04 17:51:19.805731553 +0100 +++ /work/SRC/openSUSE:Factory/.SVT-AV1.new.31432/SVT-AV1.changes 2023-03-31 21:15:08.778291248 +0200 @@ -1,0 +2,5 @@ +Thu Mar 30 09:10:48 UTC 2023 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Enable build on aarch64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SVT-AV1.spec ++++++ --- /var/tmp/diff_new_pack.JbkqDF/_old 2023-03-31 21:15:09.386293416 +0200 +++ /var/tmp/diff_new_pack.JbkqDF/_new 2023-03-31 21:15:09.390293431 +0200 @@ -30,7 +30,7 @@ BuildRequires: help2man BuildRequires: pkgconfig BuildRequires: yasm >= 1.2.0 -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 aarch64 %description The Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) is an

1 0

commit ImageMagick for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2023-03-31 21:15:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ImageMagick" Fri Mar 31 21:15:07 2023 rev:270 rq:1075483 version:7.1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2023-03-24 15:16:02.349503353 +0100 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new.31432/ImageMagick.changes 2023-03-31 21:15:07.754287596 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 07:46:56 UTC 2023 - Dirk M��ller <dmueller(a)suse.com> + +- update to 7.1.1.5: + https://github.com/ImageMagick/Website/blob/main/ChangeLog.md#711-5---2023-… + +------------------------------------------------------------------- Old: ---- ImageMagick-7.1.1-3.tar.xz ImageMagick-7.1.1-3.tar.xz.asc New: ---- ImageMagick-7.1.1-5.tar.xz ImageMagick-7.1.1-5.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.scmJGM/_old 2023-03-31 21:15:08.546290421 +0200 +++ /var/tmp/diff_new_pack.scmJGM/_new 2023-03-31 21:15:08.550290435 +0200 @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 3 +%define mfr_revision 5 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 ++++++ ImageMagick-7.1.1-3.tar.xz -> ImageMagick-7.1.1-5.tar.xz ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-7.1.1-3.tar.xz /work/SRC/openSUSE:Factory/.ImageMagick.new.31432/ImageMagick-7.1.1-5.tar.xz differ: char 26, line 1

1 0

commit container-selinux for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package container-selinux for openSUSE:Factory checked in at 2023-03-31 21:15:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/container-selinux (Old) and /work/SRC/openSUSE:Factory/.container-selinux.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "container-selinux" Fri Mar 31 21:15:06 2023 rev:16 rq:1075436 version:2.206.0 Changes: -------- --- /work/SRC/openSUSE:Factory/container-selinux/container-selinux.changes 2023-01-20 17:38:22.400419389 +0100 +++ /work/SRC/openSUSE:Factory/.container-selinux.new.31432/container-selinux.changes 2023-03-31 21:15:06.610283517 +0200 @@ -1,0 +2,13 @@ +Wed Mar 29 13:04:36 UTC 2023 - Johannes Segitz <jsegitz(a)suse.com> + +- Update to version 2.206.0: + * Allow unconfined domains to transition to container_runtime_t + * Allow container domains to transition to install_t + * Allow avirt_sandbox_domain to manage container_file_t types + * Allow containers to watch sysfs_t directories + * Allow spc_t to transption to rpm_script_t + * Add support to new user_namespace access check + * Smaller permission changes for container_init_t +- Drop spc.patch, is now included + +------------------------------------------------------------------- Old: ---- spc.patch v2.198.0.tar.gz New: ---- v2.206.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ container-selinux.spec ++++++ --- /var/tmp/diff_new_pack.B2l6Nx/_old 2023-03-31 21:15:07.210285657 +0200 +++ /var/tmp/diff_new_pack.B2l6Nx/_new 2023-03-31 21:15:07.218285685 +0200 @@ -26,14 +26,12 @@ # Version of SELinux we were using %define selinux_policyver %(rpm -q selinux-policy --qf '%%{version}') Name: container-selinux -Version: 2.198.0 +Version: 2.206.0 Release: 0 Summary: SELinux policies for container runtimes License: GPL-2.0-only URL: https://github.com/containers/container-selinux Source0: https://github.com/containers/container-selinux/archive/refs/tags/v%{versio… -# https://github.com/containers/container-selinux/pull/199, can be dropped after this is included -Patch0: spc.patch BuildRequires: selinux-policy BuildRequires: selinux-policy-devel Requires: selinux-policy >= %(rpm -q selinux-policy --qf '%%{version}-%%{release}') @@ -49,7 +47,6 @@ %prep %setup -q -%patch0 -p1 %build %make_build ++++++ v2.198.0.tar.gz -> v2.206.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/.packit.sh new/container-selinux-2.206.0/.packit.sh --- old/container-selinux-2.198.0/.packit.sh 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/.packit.sh 2023-03-21 21:03:07.000000000 +0100 @@ -14,14 +14,14 @@ # RPM Spec modifications -# Fix Version +# Update Version in spec with Version from container.te sed -i "s/^Version:.*/Version: $HEAD_VERSION/" container-selinux.spec -# Fix Release -sed -i "s/^Release: %autorelease/Release: $PACKIT_RPMSPEC_RELEASE%{?dist}/" container-selinux.spec +# Update Release in spec with Packit's release envvar +sed -i "s/^Release:.*/Release: $PACKIT_RPMSPEC_RELEASE%{?dist}/" container-selinux.spec -# Fix Source0 -sed -i "s/^Source0:.*.tar.gz/Source0: %{name}-$HEAD_VERSION.tar.gz/" container-selinux.spec +# Update Source tarball name in spec +sed -i "s/^Source:.*.tar.gz/Source: %{name}-$HEAD_VERSION.tar.gz/" container-selinux.spec -# Fix autosetup -sed -i "s/^%autosetup.*/%autosetup -Sgit -n %{name}-$HEAD_VERSION/" container-selinux.spec +# Update setup macro to use the correct build dir +sed -i "s/^%setup.*/%autosetup -Sgit -n %{name}-$HEAD_VERSION/" container-selinux.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/.packit.yaml new/container-selinux-2.206.0/.packit.yaml --- old/container-selinux-2.198.0/.packit.yaml 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/.packit.yaml 2023-03-21 21:03:07.000000000 +0100 @@ -1,38 +1,30 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -upstream_package_name: container-selinux -downstream_package_name: container-selinux +# Build targets can be found at: +# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/ + +specfile_path: container-selinux.spec jobs: - - job: copr_build + - &copr + job: copr_build # Run on every PR trigger: pull_request - # Defaults to x86_64 unless architecture is explicitly specified - targets: - - fedora-rawhide - actions: - post-upstream-clone: - - "curl -O https://src.fedoraproject.org/rpms/container-selinux/raw/rawhide/f/containe…" - fix-spec-file: - - bash .packit.sh - - - job: copr_build - trigger: pull_request - targets: - - fedora-37 + owner: rhcontainerbot + project: packit-builds + enable_net: true + srpm_build_deps: + - make + - rpkg actions: post-upstream-clone: - - "curl -O https://src.fedoraproject.org/rpms/container-selinux/raw/f37/f/container-se…" + - rpkg spec --outdir ./ fix-spec-file: - bash .packit.sh - - job: copr_build - trigger: pull_request - targets: - - fedora-36 - actions: - post-upstream-clone: - - "curl -O https://src.fedoraproject.org/rpms/container-selinux/raw/f36/f/container-se…" - fix-spec-file: - - bash .packit.sh + - <<: *copr + # Run on commit to main branch + trigger: commit + branch: main + project: podman-next diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/Makefile new/container-selinux-2.206.0/Makefile --- old/container-selinux-2.198.0/Makefile 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/Makefile 2023-03-21 21:03:07.000000000 +0100 @@ -1,12 +1,15 @@ -TARGETS?=container -MODULES?=${TARGETS:=.pp.bz2} -SHAREDIR?=/usr/share +TARGETS ?= container +MODULES ?= ${TARGETS:=.pp.bz2} +# DATADIR seems to be the more commonly used variable +# Point SHAREDIR to DATADIR by default to not break existing users +DATADIR ?= /usr/share +SHAREDIR ?= ${DATADIR} all: ${TARGETS:=.pp.bz2} %.pp.bz2: %.pp @echo Compressing $^ -\> $@ - bzip2 -9 $^ + bzip2 -f -9 $^ %.pp: %.te make -f ${SHAREDIR}/selinux/devel/Makefile $@ @@ -22,7 +25,11 @@ semodule -i ${TARGETS}.pp.bz2 install: man - install -D -m 644 ${TARGETS}.pp.bz2 ${DESTDIR}${SHAREDIR}/selinux/packages/container.pp.bz2 - install -D -m 644 container.if ${DESTDIR}${SHAREDIR}/selinux/devel/include/services/container.if - install -D -m 644 container_selinux.8 ${DESTDIR}${SHAREDIR}/man/man8/container_selinux.8 - install -D -m 644 container_contexts ${DESTDIR}${SHAREDIR}/containers/continer_contexts + install -D -pm 644 ${TARGETS}.pp.bz2 ${DESTDIR}${SHAREDIR}/selinux/packages/container.pp.bz2 + install -D -pm 644 container.if ${DESTDIR}${SHAREDIR}/selinux/devel/include/services/container.if + install -D -pm 644 container_selinux.8 ${DESTDIR}${SHAREDIR}/man/man8/container_selinux.8 + install -D -pm 644 container_contexts ${DESTDIR}${SHAREDIR}/containers/selinux/contexts + +install.udica-templates: + install -dp $(DESTDIR)$(SHAREDIR)/udica/templates + install -pm 644 udica-templates/*.cil $(DESTDIR)$(SHAREDIR)/udica/templates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/container-selinux.spec.rpkg new/container-selinux-2.206.0/container-selinux.spec.rpkg --- old/container-selinux-2.198.0/container-selinux.spec.rpkg 1970-01-01 01:00:00.000000000 +0100 +++ new/container-selinux-2.206.0/container-selinux.spec.rpkg 2023-03-21 21:03:07.000000000 +0100 @@ -0,0 +1,122 @@ +# For automatic rebuilds in COPR + +# The following tag is to get correct syntax highlighting for this file in vim text editor +# vim: syntax=spec + +%global debug_package %{nil} + +# container-selinux stuff (prefix with ds_ for version/release etc.) +# Some bits borrowed from the openstack-selinux package +%global selinuxtype targeted +%global moduletype services +%global modulenames container + +# Usage: _format var format +# Expand 'modulenames' into various formats as needed +# Format must contain '$x' somewhere to do anything useful +%global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; + +Name: {{{ git_dir_name }}} +Epoch: 101 +Version: {{{ git_dir_version }}} +Release: 1%{?dist} +License: GPLv2 +URL: https://github.com/containers/container-selinux +Summary: SELinux policies for container runtimes +VCS: {{{ git_dir_vcs }}} +Source: {{{ git_dir_pack }}} +BuildArch: noarch +BuildRequires: make +BuildRequires: git-core +BuildRequires: pkgconfig(systemd) +BuildRequires: selinux-policy >= %_selinux_policy_version +BuildRequires: selinux-policy-devel >= %_selinux_policy_version +# RE: rhbz#1195804 - ensure min NVR for selinux-policy +Requires: selinux-policy >= %_selinux_policy_version +Requires(post): selinux-policy-base >= %_selinux_policy_version +Requires(post): selinux-policy-targeted >= %_selinux_policy_version +Requires(post): policycoreutils +Requires(post): libselinux-utils +Requires(post): sed +Obsoletes: %{name} <= 2:1.12.5-13 +Obsoletes: docker-selinux <= 2:1.12.4-28 +Provides: docker-selinux = %{?epoch:%{epoch}:}%{version}-%{release} +Conflicts: udica < 0.2.6-1 +Conflicts: k3s-selinux <= 0.4-1 + +%description +SELinux policy modules for use with container runtimes. + +%prep +{{{ git_dir_setup_macro }}} + +# Remove some lines for RHEL 8 build +%if ! 0%{?fedora} && 0%{?rhel} <= 8 +sed -i 's/watch watch_reads//' container.if +sed -i '/sysfs_t:dir watch/d' container.te +sed -i '/systemd_chat_resolved/d' container.te +%endif + +sed -i 's/man: install-policy/man:/' Makefile +sed -i 's/install: man/install:/' Makefile + +# https://github.com/containers/container-selinux/issues/203 +%if 0%{?fedora} <= 37 || 0%{?rhel} <= 9 +sed -i '/user_namespace/d' container.te +%endif + +%build +make + +%install +# install policy modules +%_format MODULES $x.pp.bz2 +%{__make} DATADIR=%{buildroot}%{_datadir} install install.udica-templates + +%check + +%pre +%selinux_relabel_pre -s %{selinuxtype} + +%post +# Install all modules in a single transaction +if [ $1 -eq 1 ]; then + %{_sbindir}/setsebool -P -N virt_use_nfs=1 virt_sandbox_use_all_caps=1 +fi +%_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2 +%{_sbindir}/semodule -n -s %{selinuxtype} -r container 2> /dev/null +%{_sbindir}/semodule -n -s %{selinuxtype} -d docker 2> /dev/null +%{_sbindir}/semodule -n -s %{selinuxtype} -d gear 2> /dev/null +%selinux_modules_install -s %{selinuxtype} $MODULES +. %{_sysconfdir}/selinux/config +sed -e "\|container_file_t|h; \${x;s|container_file_t||;{g;t};a\\" -e "container_file_t" -e "}" -i /etc/selinux/${SELINUXTYPE}/contexts/customizable_types +matchpathcon -qV %{_sharedstatedir}/containers || restorecon -R %{_sharedstatedir}/containers &> /dev/null || : + +%postun +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{modulenames} docker +fi + +%posttrans +%selinux_relabel_post -s %{selinuxtype} + +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + +%files +%doc README.md +%{_datadir}/selinux/* +%{_mandir}/man8/* +%dir %{_datadir}/containers/selinux +%{_datadir}/containers/selinux/contexts +%dir %{_datadir}/udica/templates/ +%{_datadir}/udica/templates/* + +%triggerpostun -- container-selinux < 2:2.162.1-3 +if %{_sbindir}/selinuxenabled ; then + echo "Fixing Rootless SELinux labels in homedir" + %{_sbindir}/restorecon -R /home/*/.local/share/containers/storage/overlay* 2> /dev/null +fi + +%changelog +{{{ git_dir_changelog }}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/container.if new/container-selinux-2.206.0/container.if --- old/container-selinux-2.198.0/container.if 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/container.if 2023-03-21 21:03:07.000000000 +0100 @@ -887,6 +887,7 @@ type $1_t, container_domain; domain_type($1_t) domain_user_exemption_target($1_t) + allow $1_t $2_file_t:file entrypoint; container_manage_files_template($1, $2) ') @@ -929,7 +930,7 @@ manage_lnk_files_pattern($1_t, $2_file_t, $2_file_t) manage_dirs_pattern($1_t, $2_file_t, $2_file_t) manage_chr_files_pattern($1_t, $2_file_t, $2_file_t) - allow $1_t $2_file_t:chr_file mmap_file_perms; + allow $1_t $2_file_t:chr_file { mmap_file_perms watch watch_reads }; manage_blk_files_pattern($1_t, $2_file_t, $2_file_t) manage_fifo_files_pattern($1_t, $2_file_t, $2_file_t) manage_sock_files_pattern($1_t, $2_file_t, $2_file_t) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/container.te new/container-selinux-2.206.0/container.te --- old/container-selinux-2.198.0/container.te 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/container.te 2023-03-21 21:03:07.000000000 +0100 @@ -1,4 +1,4 @@ -policy_module(container, 2.198.0) +policy_module(container, 2.206.0) gen_require(` class passwd rootok; @@ -287,6 +287,8 @@ userdom_map_tmp_files(container_runtime_domain) +anaconda_domtrans_install(container_runtime_domain) + optional_policy(` gnome_map_generic_data_home_files(container_runtime_domain) allow container_runtime_domain data_home_t:dir { relabelfrom relabelto }; @@ -627,6 +629,8 @@ ') domtrans_pattern(systemd_logind_t, container_runtime_exec_t , container_runtime_t) + container_manage_dirs(systemd_logind_t) + container_manage_files(systemd_logind_t) ') optional_policy(` @@ -648,6 +652,8 @@ allow container_runtime_t unconfined_t:process transition; allow unconfined_domain_type { container_var_lib_t container_ro_file_t }:file entrypoint; fs_fusefs_entrypoint(unconfined_domain_type) + + domtrans_pattern(unconfined_domain_type, container_runtime_exec_t , container_runtime_t) ') optional_policy(` @@ -815,6 +821,7 @@ allow container_runtime_domain container_domain:fd use; allow container_domain self:socket_class_set { create_socket_perms map accept }; allow container_domain self:lnk_file setattr; +allow container_domain self:user_namespace create; dontaudit container_domain self:capability fsetid; allow container_domain self:association sendto; @@ -860,6 +867,8 @@ dev_getattr_mtrr_dev(container_domain) dev_list_sysfs(container_domain) +allow container_domain sysfs_t:dir watch; + dev_rw_kvm(container_domain) dev_rwx_zero(container_domain) @@ -1008,6 +1017,7 @@ optional_policy(` rpm_read_cache(container_domain) rpm_read_db(container_domain) + rpm_transition_script(spc_t, system_r) ') optional_policy(` @@ -1210,6 +1220,7 @@ gen_require(` attribute device_node; + type device_t; attribute sysctl_type; ') dontaudit container_domain device_node:chr_file setattr; @@ -1277,12 +1288,18 @@ corenet_unconfined(container_init_t) +allow container_init_t device_t:filesystem { remount unmount }; + dev_mounton_sysfs(container_init_domain) -fs_mounton_cgroup(container_init_domain) -fs_unmount_cgroup(container_init_domain) fs_manage_cgroup_dirs(container_init_domain) fs_manage_cgroup_files(container_init_domain) +fs_mounton_cgroup(container_init_domain) +fs_unmount_cgroup(container_init_domain) +fs_unmount_tmpfs(container_init_domain) + +kernel_mounton_proc(container_init_t) +kernel_unmount_proc(container_init_t) logging_send_syslog_msg(container_init_t) @@ -1313,17 +1330,18 @@ fs_unmount_cgroup(container_engine_t) fs_manage_cgroup_dirs(container_engine_t) fs_manage_cgroup_files(container_engine_t) +fs_mount_tmpfs(container_engine_t) +fs_write_cgroup_files(container_engine_t) allow container_engine_t proc_t:file mounton; allow container_engine_t sysctl_t:file mounton; allow container_engine_t sysfs_t:filesystem remount; -fs_mount_tmpfs(container_engine_t) -fs_write_cgroup_files(container_engine_t) kernel_mount_proc(container_engine_t) kernel_mounton_core_if(container_engine_t) kernel_mounton_proc(container_engine_t) kernel_mounton_systemd_ProtectKernelTunables(container_engine_t) + term_mount_pty_fs(container_engine_t) type kubelet_t, container_runtime_domain; @@ -1398,3 +1416,11 @@ allow syslogd_t container_runtime_tmpfs_t:file { read write }; logging_send_syslog_msg(container_runtime_t) ') + + +manage_dirs_pattern(svirt_sandbox_domain, container_file_t, container_file_t) +manage_files_pattern(svirt_sandbox_domain, container_file_t, container_file_t) +manage_lnk_files_pattern(svirt_sandbox_domain, container_file_t, container_file_t) +manage_chr_files_pattern(svirt_sandbox_domain, container_file_t, container_file_t) +manage_blk_files_pattern(svirt_sandbox_domain, container_file_t, container_file_t) +manage_sock_files_pattern(svirt_sandbox_domain, container_file_t, container_file_t) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/contrib/container-selinux.spec new/container-selinux-2.206.0/contrib/container-selinux.spec --- old/container-selinux-2.198.0/contrib/container-selinux.spec 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/contrib/container-selinux.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,129 +0,0 @@ -# This is an example of a spec file that can be used to install -# container-selinux policy. The official spec file is included in the -# dist-git for each OS distribution - -%global debug_package %{nil} - -# container-selinux -%global git0 https://github.com/projectatomic/container-selinux -%if 0%{?fedora} -%global commit0 e06212c96d71174bf4085f8e3704b4805c668625 -%else -%global commit0 e06212c96d71174bf4085f8e3704b4805c668625 -%endif -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - -# container-selinux stuff (prefix with ds_ for version/release etc.) -# Some bits borrowed from the openstack-selinux package -%global selinuxtype targeted -%global moduletype services -%global modulenames container - -# Usage: _format var format -# Expand 'modulenames' into various formats as needed -# Format must contain '$x' somewhere to do anything useful -%global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done; - -# Version of SELinux we were using -%if 0%{?fedora} >= 22 -%global selinux_policyver 3.13.1-220 -%else -%global selinux_policyver 3.13.1-39 -%endif - -Name: container-selinux -%if 0%{?fedora} || 0%{?centos} -Epoch: 2 -%endif -Version: 2.1 -Release: 1%{?dist} -License: GPLv2 -URL: %{git0} -Summary: SELinux policies for container runtimes -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -BuildArch: noarch -BuildRequires: git -BuildRequires: pkgconfig(systemd) - -# RE: rhbz#1195804 - ensure min NVR for selinux-policy -Requires: selinux-policy >= %{selinux_policyver} - -BuildRequires: selinux-policy -BuildRequires: selinux-policy-devel -Requires(post): selinux-policy-base >= %{selinux_policyver} -Requires(post): policycoreutils -%if 0%{?fedora} -Requires(post): policycoreutils-python-utils -%else -Requires(post): policycoreutils-python -%endif -Requires(post): libselinux-utils -Obsoletes: %{name} <= 2:1.12.5-13 -Obsoletes: docker-selinux <= 2:1.12.4-28 -Provides: docker-selinux = %{epoch}:%{version}-%{release} - -%description -SELinux policy modules for use with container runtimes. - -%prep -%autosetup -Sgit -n %{name}-%{commit0} - -%build -make - -%install -# install policy modules -%_format MODULES $x.pp.bz2 -install -d %{buildroot}%{_datadir}/selinux/packages -install -d -p %{buildroot}%{_datadir}/selinux/devel/include/services -install -p -m 644 container.if %{buildroot}%{_datadir}/selinux/devel/include/services -install -m 0644 $MODULES %{buildroot}%{_datadir}/selinux/packages -install -d %{buildroot}%{_datadir}/udica/templates -install -m 0644 udica-templates/*.cil %{buildroot}%{_datadir}/udica/templates - -# remove spec file -rm -rf container-selinux.spec - -%check - -%pre -%selinux_relabel_pre -s %{selinuxtype} - -%post -# Install all modules in a single transaction -if [ $1 -eq 1 ]; then - %{_sbindir}/setsebool -P -N virt_use_nfs=1 virt_sandbox_use_all_caps=1 -fi -%_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2 -%{_sbindir}/semodule -n -s %{selinuxtype} -r container 2> /dev/null -%{_sbindir}/semodule -n -s %{selinuxtype} -d docker 2> /dev/null -%{_sbindir}/semodule -n -s %{selinuxtype} -d gear 2> /dev/null -%selinux_modules_install -s %{selinuxtype} $MODULES - -%postun -if [ $1 -eq 0 ]; then - %selinux_modules_uninstall -s %{selinuxtype} %{modulenames} docker -fi - -%posttrans -%selinux_relabel_post -s %{selinuxtype} - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%doc README.md -%{_datadir}/selinux/* -%{_datadir}/udica/templates/* - -%changelog -* Fri Jan 06 2017 Dan Walsh <dwalsh(a)redhat.com> - 2:2.1-1 -- Additional labeling for ocid - -* Fri Jan 06 2017 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 2:2.0-1 -- Resolves: #1406517 - bump to v2.0 (first upload to Fedora as a -standalone package) -- include projectatomic/RHEL-1.12 branch commit for building on centos/rhel - -* Mon Dec 19 2016 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 2:1.12.4-29 -- new package (separated from docker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-selinux-2.198.0/sources new/container-selinux-2.206.0/sources --- old/container-selinux-2.198.0/sources 2023-01-05 20:57:53.000000000 +0100 +++ new/container-selinux-2.206.0/sources 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -SHA512 (container-selinux-e06212c.tar.gz) = a859346b306b9a11057cd192f74f497bea32a48cb2f1ddf3dd840117379a945a9c32db4c1213482a3f769bc237a838a07516821f0ed665a595e2f3f1f995990e

1 0

commit rust1.68 for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rust1.68 for openSUSE:Factory checked in at 2023-03-31 21:14:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust1.68 (Old) and /work/SRC/openSUSE:Factory/.rust1.68.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rust1.68" Fri Mar 31 21:14:10 2023 rev:3 rq:1075360 version:1.68.2 Changes: -------- --- /work/SRC/openSUSE:Factory/rust1.68/rust1.68.changes 2023-03-15 18:54:55.600517118 +0100 +++ /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust1.68.changes 2023-03-31 21:14:41.454193813 +0200 @@ -1,0 +2,24 @@ +Tue Mar 28 02:30:57 UTC 2023 - William Brown <william.brown(a)suse.com> + +- bsc#1209839 - replace leaked github keys in rust/cargo + +Version 1.68.2 (2023-03-28) +=========================== + +- [Update the GitHub RSA host key bundled within Cargo](https://github.com/rust-lang/cargo/pull/11883). + The key was [rotated by GitHub](https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/) + on 2023-03-24 after the old one leaked. +- [Mark the old GitHub RSA host key as revoked](https://github.com/rust-lang/cargo/pull/11889). + This will prevent Cargo from accepting the leaked key even when trusted by + the system. +- [Add support for `@revoked` and a better error message for `@cert-authority` in Cargo's SSH host key verification](https://github.com/rust-lang/cargo/pull/11635) +- [Fix miscompilation in produced Windows MSVC artifacts](https://github.com/rust-lang/rust/pull/109094) + This was introduced by enabling ThinLTO for the distributed rustc which led + to miscompilations in the resulting binary. Currently this is believed to be + limited to the -Zdylib-lto flag used for rustc compilation, rather than a + general bug in ThinLTO, so only rustc artifacts should be affected. +- [Fix --enable-local-rust builds](https://github.com/rust-lang/rust/pull/109111/) +- [Treat `$prefix-clang` as `clang` in linker detection code](https://github.com/rust-lang/rust/pull/109156) +- [Fix panic in compiler code](https://github.com/rust-lang/rust/pull/108162) + +------------------------------------------------------------------- Old: ---- rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz.asc rust-1.68.0-arm-unknown-linux-gnueabihf.tar.xz rust-1.68.0-arm-unknown-linux-gnueabihf.tar.xz.asc rust-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz rust-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz.asc rust-1.68.0-i686-unknown-linux-gnu.tar.xz rust-1.68.0-i686-unknown-linux-gnu.tar.xz.asc rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz.asc rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz rust-1.68.0-powerpc64-unknown-linux-gnu.tar.xz.asc rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz.asc rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz.asc rust-1.68.0-s390x-unknown-linux-gnu.tar.xz rust-1.68.0-s390x-unknown-linux-gnu.tar.xz.asc rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz.asc rustc-1.68.0-src.tar.xz New: ---- rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz.asc rust-1.68.2-arm-unknown-linux-gnueabihf.tar.xz rust-1.68.2-arm-unknown-linux-gnueabihf.tar.xz.asc rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz.asc rust-1.68.2-i686-unknown-linux-gnu.tar.xz rust-1.68.2-i686-unknown-linux-gnu.tar.xz.asc rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz.asc rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz.asc rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz.asc rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz.asc rust-1.68.2-s390x-unknown-linux-gnu.tar.xz rust-1.68.2-s390x-unknown-linux-gnu.tar.xz.asc rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz.asc rustc-1.68.2-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rust1.68.spec ++++++ --- /var/tmp/diff_new_pack.nd8MU7/_old 2023-03-31 21:14:58.774255574 +0200 +++ /var/tmp/diff_new_pack.nd8MU7/_new 2023-03-31 21:14:58.778255589 +0200 @@ -18,7 +18,7 @@ %global version_suffix 1.68 -%global version_current 1.68.0 +%global version_current 1.68.2 %global version_previous 1.67.1 # This has to be kept lock step to the rust version. %global llvm_version 15 ++++++ rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz -> rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-aarch64-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-aarch64-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-arm-unknown-linux-gnueabihf.tar.xz -> rust-1.68.2-arm-unknown-linux-gnueabihf.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-arm-unknown-linux-gnueabihf.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-arm-unknown-linux-gnueabihf.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz -> rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-armv7-unknown-linux-gnueabihf.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-armv7-unknown-linux-gnueabihf.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-i686-unknown-linux-gnu.tar.xz -> rust-1.68.2-i686-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-i686-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-i686-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz -> rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-powerpc-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz -> rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-powerpc-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-powerpc64-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz -> rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-powerpc64le-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-powerpc64le-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz -> rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-riscv64gc-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-riscv64gc-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-s390x-unknown-linux-gnu.tar.xz -> rust-1.68.2-s390x-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-s390x-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-s390x-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz -> rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rust-1.68.0-x86_64-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rust-1.68.2-x86_64-unknown-linux-gnu.tar.xz differ: char 15, line 1 ++++++ rustc-1.68.0-src.tar.xz -> rustc-1.68.2-src.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust1.68/rustc-1.68.0-src.tar.xz /work/SRC/openSUSE:Factory/.rust1.68.new.31432/rustc-1.68.2-src.tar.xz differ: char 15, line 1

1 0

commit python-httpretty for openSUSE:Factory
by Source-Sync 31 Mar '23

31 Mar '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-httpretty for openSUSE:Factory checked in at 2023-03-31 21:14:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-httpretty (Old) and /work/SRC/openSUSE:Factory/.python-httpretty.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-httpretty" Fri Mar 31 21:14:09 2023 rev:23 rq:1075359 version:1.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-httpretty/python-httpretty.changes 2022-10-28 19:29:55.126748209 +0200 +++ /work/SRC/openSUSE:Factory/.python-httpretty.new.31432/python-httpretty.changes 2023-03-31 21:14:13.126092796 +0200 @@ -1,0 +2,6 @@ +Thu Mar 30 04:21:14 UTC 2023 - Steve Kowalik <steven.kowalik(a)suse.com> + +- Add patch relax-test-callback-response.patch: + * Relax timeout for test_callback_response (bsc#1209571) + +------------------------------------------------------------------- New: ---- relax-test-callback-response.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-httpretty.spec ++++++ --- /var/tmp/diff_new_pack.PiCHl1/_old 2023-03-31 21:14:13.758095050 +0200 +++ /var/tmp/diff_new_pack.PiCHl1/_new 2023-03-31 21:14:13.766095079 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-httpretty # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-httpretty Version: 1.1.4 Release: 0 @@ -34,6 +32,8 @@ Patch2: double-slash-paths.patch #PATCH-FIX-UPSTREAM 460-fix-tests-two-miliseconds Patch3: 460-miliseconds_tests.patch +# PATCH-FIX-OPENSUSE Relax the time for one test case from 2ms to 3ms. +Patch4: relax-test-callback-response.patch BuildRequires: %{python_module boto3} BuildRequires: %{python_module eventlet} BuildRequires: %{python_module fakeredis} ++++++ relax-test-callback-response.patch ++++++ Index: httpretty-1.1.4/tests/functional/test_requests.py =================================================================== --- httpretty-1.1.4.orig/tests/functional/test_requests.py +++ httpretty-1.1.4/tests/functional/test_requests.py @@ -456,7 +456,7 @@ def test_multipart(): @httprettified -@within(two=miliseconds) +@within(three=miliseconds) def test_callback_response(now): ("HTTPretty should call a callback function and set its return value as the body of the response" " requests")

1 0