From ca2cb2b5def59c2740941ab76fb29c87c4d3af1f30b78fae482daf485339e69f Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Mon, 7 Dec 2020 10:52:11 +0000
Subject: [PATCH] - cpio-long-opt.patch: add more long options to cpio for
 IBS/unrpm

OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=80
---
 busybox.changes     |  5 +++++
 busybox.spec        |  2 ++
 cpio-long-opt.patch | 13 +++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 cpio-long-opt.patch

diff --git a/busybox.changes b/busybox.changes
index b0a22ed..84f4009 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  7 10:25:00 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- cpio-long-opt.patch: add more long options to cpio for IBS/unrpm
+
 -------------------------------------------------------------------
 Fri Nov 20 08:59:57 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/busybox.spec b/busybox.spec
index 82c1564..ebce500 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -28,6 +28,7 @@ Source1:        BusyBox.1
 Source2:        busybox.config
 Source3:        busybox-static.config
 Source4:        man.conf
+Patch0:         cpio-long-opt.patch
 # other patches
 Patch100:       busybox.install.patch
 Provides:       useradd_or_adduser_dep
@@ -71,6 +72,7 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest
 
 %prep
 %setup -q
+%patch0 -p1
 %patch100 -p0
 cp -a %{SOURCE1} docs/
 find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \
diff --git a/cpio-long-opt.patch b/cpio-long-opt.patch
new file mode 100644
index 0000000..1cc770b
--- /dev/null
+++ b/cpio-long-opt.patch
@@ -0,0 +1,13 @@
+diff -urN busybox-1.32.0.orig/archival/cpio.c busybox-1.32.0/archival/cpio.c
+--- busybox-1.32.0.orig/archival/cpio.c	2020-06-26 20:47:44.000000000 +0200
++++ busybox-1.32.0/archival/cpio.c	2020-12-07 11:23:44.913676627 +0100
+@@ -367,6 +367,9 @@
+ 	const char *long_opts =
+ 		"extract\0"      No_argument       "i"
+ 		"list\0"         No_argument       "t"
++		"unconditional\0" No_argument      "u"
++		"preserve-modification-time\0" No_argument "m"
++		"make-directories\0" No_argument   "d"
+ #if ENABLE_FEATURE_CPIO_O
+ 		"create\0"       No_argument       "o"
+ 		"format\0"       Required_argument "H"