Sync from SUSE:SLFO:Main libslirp revision 5af77538ed902ec79bb2725073184c82

_service

@@ -1,5 +1,5 @@
 <services>
-  <service name="obs_scm" mode="disabled">
+  <service name="obs_scm" mode="manual">
     <param name="url">https://gitlab.freedesktop.org/slirp/libslirp.git</param>
     <param name="scm">git</param>
     <param name="filename">libslirp</param>
@@ -8,7 +8,7 @@
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
   <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://gitlab.freedesktop.org/slirp/libslirp.git</param>
-              <param name="changesrevision">60967ef1ac6254e710cc913fb8430c86a696dd02</param></service></servicedata>
+              <param name="changesrevision">6ea2c4f95922a64d21190d9ad163e3bbde37a836</param></service></servicedata>

libslirp-semicolon.patch

@@ -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

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 <sys/param.h> 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
 

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

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