From 15cc4a3ba73e57b5dcff029fb7da27245a92f6066c327f565948939fa318d66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 17 Sep 2024 14:38:07 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main cpio revision
 72d2f2efd3c6f3cb4a5bf6723c59cd5c

---
 cpio.changes    | 11 +++++++++++
 cpio.spec       | 16 ++++------------
 fix-gcc14.patch | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 fix-gcc14.patch

diff --git a/cpio.changes b/cpio.changes
index 8146905..9ea2ed7 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr  5 11:02:45 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Fix build with gcc14, bsc#1221712
+  * fix-gcc14.patch
+
+-------------------------------------------------------------------
+Mon Feb 26 10:56:19 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Use %autopatch instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Mon Feb  5 09:22:10 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/cpio.spec b/cpio.spec
index 5d6636f..0c10f3e 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -41,6 +41,7 @@ Patch20:        cpio-close_files_after_copy.patch
 Patch21:        cpio-pattern-file-sigsegv.patch
 Patch23:        paxutils-rtapelib_mtget.patch
 Patch25:        cpio-fix_truncation_check.patch
+Patch26:        fix-gcc14.patch
 BuildRequires:  autoconf >= 2.71
 BuildRequires:  automake
 #Requires(post): %{xinstall_info_prereq}
@@ -60,7 +61,7 @@ Summary:        Tape drive control utility
 Group:          Productivity/Archiving/Backup
 Requires:       %{name} = %{version}
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Provides:       mt
 
 %description mt
@@ -70,17 +71,8 @@ This package includes the 'mt', a local tape drive control program.
 
 %prep
 %setup -q
-%patch2
-%patch4
-%patch5
-%patch15
-%patch17
-%patch18
-%patch20
-###
-%patch21 -p1
-%patch23 -p1
-%patch25 -p1
+%autopatch -M 20 -p0
+%autopatch -m 21 -p1
 
 %build
 gettextize -f --no-changelog
diff --git a/fix-gcc14.patch b/fix-gcc14.patch
new file mode 100644
index 0000000..3d7b9d5
--- /dev/null
+++ b/fix-gcc14.patch
@@ -0,0 +1,14 @@
+Index: cpio-2.15/src/util.c
+===================================================================
+--- cpio-2.15.orig/src/util.c
++++ cpio-2.15/src/util.c
+@@ -47,6 +47,9 @@
+ extern int errno;
+ #endif
+
++int tape_eof( int tape_des);
++int tape_eod( int tape_des);
++
+ /* Write `output_size' bytes of `output_buffer' to file
+    descriptor OUT_DES and reset `output_size' and `out_buff'.  */
+