From 33240da3c04c28074e332036c924def16da9598bc01fa02b7d03012296cc21b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Sep 2024 16:04:33 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libslirp revision 5af77538ed902ec79bb2725073184c82 --- _service | 4 +-- _servicedata | 2 +- libslirp-4.7.0+44.obscpio | 3 -- libslirp-4.8.0+2.obscpio | 3 ++ libslirp-4.8.0+2.tar.xz | 3 ++ libslirp-semicolon.patch | 11 ------- libslirp.changes | 60 +++++++++++++++++++++++++++++++++++++++ libslirp.obsinfo | 6 ++-- libslirp.spec | 6 ++-- 9 files changed, 74 insertions(+), 24 deletions(-) delete mode 100644 libslirp-4.7.0+44.obscpio create mode 100644 libslirp-4.8.0+2.obscpio create mode 100644 libslirp-4.8.0+2.tar.xz delete mode 100644 libslirp-semicolon.patch diff --git a/_service b/_service index 9298178..fa9fc52 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + https://gitlab.freedesktop.org/slirp/libslirp.git git libslirp @@ -8,7 +8,7 @@ master enable - + *.tar diff --git a/_servicedata b/_servicedata index e70ab43..ba4f79f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.freedesktop.org/slirp/libslirp.git - 60967ef1ac6254e710cc913fb8430c86a696dd02 \ No newline at end of file + 6ea2c4f95922a64d21190d9ad163e3bbde37a836 \ No newline at end of file diff --git a/libslirp-4.7.0+44.obscpio b/libslirp-4.7.0+44.obscpio deleted file mode 100644 index bf76012..0000000 --- a/libslirp-4.7.0+44.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7549bab106a3fe147f8a1521076bac8c6602bd6a736e36d297350c2c69c16e39 -size 604172 diff --git a/libslirp-4.8.0+2.obscpio b/libslirp-4.8.0+2.obscpio new file mode 100644 index 0000000..ff0c20f --- /dev/null +++ b/libslirp-4.8.0+2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b64cf7c6042b5a1430dd56db98f2054b1be3c4f35c0ce5ff4ea8063221f2c09 +size 768524 diff --git a/libslirp-4.8.0+2.tar.xz b/libslirp-4.8.0+2.tar.xz new file mode 100644 index 0000000..0df43cd --- /dev/null +++ b/libslirp-4.8.0+2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6566011eeb1123bc0d12ec0ef79d5ac4195abd1142369ac9eb1ce8d4e5cf7334 +size 126864 diff --git a/libslirp-semicolon.patch b/libslirp-semicolon.patch deleted file mode 100644 index 5920135..0000000 --- a/libslirp-semicolon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libslirp-4.7.0+44/src/ip6_icmp.h.orig 2022-11-11 09:18:31.486198471 +0000 -+++ libslirp-4.7.0+44/src/ip6_icmp.h 2022-11-11 09:18:44.050294018 +0000 -@@ -59,7 +59,7 @@ struct ndp_na { /* Neighbor Advertisemen - uint8_t R : 1, /* Router Flag */ - S : 1, /* Solicited Flag */ - O : 1, /* Override Flag */ -- reserved_1 : 5 -+ reserved_1 : 5; - #else - uint8_t reserved_1 : 5, O : 1, S : 1, R : 1; - #endif diff --git a/libslirp.changes b/libslirp.changes index 04937ac..5810f7a 100644 --- a/libslirp.changes +++ b/libslirp.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Tue May 21 13:49:27 UTC 2024 - pgajdos@suse.com + +- Update to version 4.8.0+2: + * Fix actually linking the library + * Use simpler test linker script for detectiong --version-script option + * Release v4.8.0 + * Explicit that -Dstatic=True is not meant for distributing a static library + * icmp6: Add echo request forwarding support + * fuzz: Fix icmp6 matching and checksum computation + * fuzz: Drop debugging + * fuzz: Drop debugging + * fuzz: Add ARP and NDP cases + * fuzz: Add IPv6 cases + * mbuf: Do not reallocate when the requested size already fits exactly + * mbuf: Fix copying headers + * oss-fuzz: Fix udp-h and tcp-h corpuses + * fuzz: comment coherency + * fuzz: Simplify TCP checksum code + * Note changes that can probably be security issues + * Add changelog for next release + * eth: pad ethernet frames to 60 bytes + * udp: Make cleanup loop clearer + * fuzz: Fix tftp fuzz actually receiving a file + * tftp: cleanup sessions remaining at slirp shutdown + * tftp: Fix use-after-free + * Add fuzzing CI + * fuzz: Add ip filtering + * tcp: hack syn/ack + * fuzzing: Increase coverage + * First attempt at fuzzing with libFuzzer based on @elmarco work + * Start some fuzzing test + * tcp: Fix testing for last fragment + * icmp: Fix msg duplication for debugging + * tcp: Fix allocating room + * mbuf: Be extra careful with freed pointer + * mbuf: remove '#define if*' member accessors + * m_cleanup_list: Fix missing cleanup packets from the same session + * tcp-input: inline TCP_REASS + * ip: remove second argument from ip_stripoptions() + * Document endianness of slirp_add_hostfwd parameters + +------------------------------------------------------------------- +Wed Dec 13 09:44:43 UTC 2023 - lnussel@suse.com + +- Update to version 4.7.0+60: + * Avoid including on windows + * Document functions + * icmp: Handle ICMP packets as IPPROTO_IP on BSD + * ip: Enforce strict aliasing + * Fix including BaseTsd.h on mingw + * Use SSIZE_T from BaseTsd.h on windows + * Detach UDP socket if errno is ENOTCONN (Socket is not connected) + * slirp: use localhost as dns when /etc/resolv.conf empty + * missing semicolon + * Drop unused UDP_UDPDATALEN macro + * Reject domain-search when any entry ends with ".." + * Use target address from Neighbor Advertisement +- removed libslirp-semicolon.patch, now included + ------------------------------------------------------------------- Fri Nov 11 09:30:22 UTC 2022 - pgajdos@suse.com diff --git a/libslirp.obsinfo b/libslirp.obsinfo index 3d027ae..81515ed 100644 --- a/libslirp.obsinfo +++ b/libslirp.obsinfo @@ -1,4 +1,4 @@ name: libslirp -version: 4.7.0+44 -mtime: 1655913759 -commit: 7132fef2a6b08d270b412d37a4c38b34728993ea +version: 4.8.0+2 +mtime: 1715522738 +commit: 6ea2c4f95922a64d21190d9ad163e3bbde37a836 diff --git a/libslirp.spec b/libslirp.spec index 98c1394..de157ee 100644 --- a/libslirp.spec +++ b/libslirp.spec @@ -1,7 +1,7 @@ # # spec file for package libslirp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,13 @@ %define libname libslirp0 Name: libslirp -Version: 4.7.0+44 +Version: 4.8.0+2 Release: 0 Summary: A general purpose TCP-IP emulator License: MIT Group: System/Libraries URL: https://gitlab.freedesktop.org/slirp/%{name} Source0: %{name}-%{version}.tar.xz -# https://gitlab.freedesktop.org/slirp/libslirp/-/issues/64 -Patch0: libslirp-semicolon.patch BuildRequires: gcc BuildRequires: git-core BuildRequires: glib2-devel