[rpms/libx86emu] epel10.2: Update to 3.7

[Lubomir Rintel <lkundrak@v3.sk>]

A new commit has been pushed.

Repo   : rpms/libx86emu
Branch : epel10.2
Commit : 5e330997c2846f2208f74bcb404a4e497a8fbbd6
Author : Lubomir Rintel <lkundrak@v3.sk>
Date   : 2025-03-04T22:50:30+01:00
Stats  : +7/-82 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/libx86emu/c/5e330997c2846f2208f74bcb404a4e497a8fbbd6?branch=epel10.2

Log:
Update to 3.7

---
diff --git a/.gitignore b/.gitignore
index 558ecab..49f2144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /libx86emu-1.11.tar.gz
 /libx86emu-3.1.tar.gz
 /libx86emu-3.5.tar.gz
+/libx86emu-3.7.tar.gz

diff --git a/libx86emu-3.5-x86-io.patch b/libx86emu-3.5-x86-io.patch
deleted file mode 100644
index 7e9dab1..0000000
--- a/libx86emu-3.5-x86-io.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urp libx86emu-3.5/mem.c libx86emu-3.5.fixed/mem.c
---- libx86emu-3.5/mem.c	2021-11-18 18:14:15.000000000 +0100
-+++ libx86emu-3.5.fixed/mem.c	2024-12-31 20:40:27.692860597 +0100
-@@ -35,6 +35,14 @@
- #include "include/x86emu_int.h"
- #if defined(__i386__) || defined (__x86_64__)
- #include <sys/io.h>
-+#else
-+/* These are hopefully never reached, since iopl_ok is not going to be true. */
-+static inline unsigned inb(unsigned addr) { abort(); return -1; }
-+static inline unsigned inw(unsigned addr) { abort(); return -1; }
-+static inline unsigned inl(unsigned addr) { abort(); return -1; }
-+static inline void outb(unsigned val, unsigned addr) { abort(); }
-+static inline void outw(unsigned val, unsigned addr) { abort(); }
-+static inline void outl(unsigned val, unsigned addr) { abort(); }
- #endif
- 
- #define PERM16(a)	((a) + ((a) << 8))

diff --git a/libx86emu-log-overflow.patch b/libx86emu-log-overflow.patch
deleted file mode 100644
index 8cb4569..0000000
--- a/libx86emu-log-overflow.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From cfbbe1fcecfbff0b4b51e6060b793252ad942db1 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 1 Nov 2024 14:03:38 +0100
-Subject: [PATCH] api: fix a buffer overflow in x86emu_log()
-
-There seems to be an assumption that vsnprintf() returns a number of
-characters that were written. That is actually not the case -- it
-returns number of characters that *would* have been written regardless
-of truncation to specified size.
-
-Therefore, on x86emu_log() that would cross the buffer end will move
-.log.ptr beyond the end of the buffer, and the subsequent .flush()
-will be called back with a size argument larger than the buffer.
-
-Moreover, given the .flush() is essentially only invoked upon
-x86emu_clear_log(), this is almost bound to happen for instances that
-run for a long time.
-
-Let's solve the buffer fillup differently: 1.) flush the buffer when it
-fills up (we'd be crossing the buffer boundary) and 2.) make sure
-.log.ptr is allways clipped to point inside the allocated buffer.
----
- api.c | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/api.c b/api.c
-index 71a46ae..f76e64a 100644
---- a/api.c
-+++ b/api.c
-@@ -337,18 +337,16 @@ API_SYM void x86emu_log(x86emu_t *emu, const char *format, ...)
- 
-   if(!emu || !emu->log.ptr) return;
- 
--  size = emu->log.size - (emu->log.ptr - emu->log.buf);
--
-   va_start(args, format);
--  if(size > 0) {
--    size = vsnprintf(emu->log.ptr, size, format, args);
--    if(size > 0) {
--      emu->log.ptr += size;
--    }
--    else {
--      *emu->log.ptr = 0;
--    }
-+  size = vsnprintf(emu->log.ptr, LOG_FREE(emu), format, args);
-+  if (emu->log.ptr + size > emu->log.buf + emu->log.size) {
-+    x86emu_clear_log(emu, 1);
-+    size = vsnprintf(emu->log.ptr, emu->log.size, format, args);
-   }
-+  if (size > 0)
-+    emu->log.ptr += size;
-+  if (emu->log.ptr > emu->log.buf + emu->log.size)
-+    emu->log.ptr = emu->log.buf + emu->log.size;
-   va_end(args);  
- }
- 

diff --git a/libx86emu.spec b/libx86emu.spec
index 5b51081..09a55a9 100644
--- a/libx86emu.spec
+++ b/libx86emu.spec
@@ -10,19 +10,14 @@
         LDFLAGS="-fPIC %{__global_ldflags}"
 
 Name:           libx86emu
-Version:        3.5
-Release:        10%{?dist}
+Version:        3.7
+Release:        1%{?dist}
 Summary:        x86 emulation library
 
 License:        HPND-sell-variant
 URL:            https://github.com/wfeldt/libx86emu
 Source0:        https://github.com/wfeldt/libx86emu/archive/%{version}/%{name}-%{version}.tar.gz
 
-# Make it build outside x86. Not submitted upstream because I don't know what is going on.
-Patch0:         libx86emu-3.5-x86-io.patch
-# Submitted upstream: https://github.com/wfeldt/libx86emu/pull/45
-Patch1:         https://github.com/wfeldt/libx86emu/commit/cfbbe1fcecfbff0b4b51e6060b793252ad942db1.patch#/libx86emu-log-overflow.patch
-
 BuildRequires:  gcc
 BuildRequires:  make
 
@@ -69,6 +64,9 @@ library.
 
 
 %changelog
+* Tue Mar 04 2025 Lubomir Rintel <lkundrak@v3.sk> - 3.7-1
+- Update to 3.7
+
 * Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

diff --git a/sources b/sources
index 0ab1cc4..db20eca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libx86emu-3.5.tar.gz) = 079a8b5a7166802cd9bf781436dccc36a064c7e05c199bb41cc4d225e43afad4cc99654b3cb58389f7f806ffa625b5d793468064fdd9fa758ae0415496b18a9e
+SHA512 (libx86emu-3.7.tar.gz) = e93db0f32d9e83f7f5f87753f1afb70add90bc033bc71e92fbe551608153a8ae7f1fe5c2900523445cb473ea7c1e26a8296f11a8cf248a816f3c5bf450a7b99c