Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

main/busybox: fix --file with busybox cpio

Browse source 
Fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/17069
Supersedes https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/82465
This commit is contained in:
Sertonix 2025-04-08 11:40:07 +02:00 • committed by Sören Tempel
parent 9d965a44a7
commit 77bdaceb3d
2 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
main/busybox/0035-cpio-map-F-to-file-long-option.patch Normal file
View file

@ -0,0 +1,28 @@
From ba45c057de6e8da9e3ebd54d416866c04d09496d Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Tue, 8 Apr 2025 11:26:45 +0200
Subject: [PATCH] cpio: map -F to --file long option
function old new delta
.rodata 100437 100444 +7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 7/0) Total: 7 bytes
---
archival/cpio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/archival/cpio.c b/archival/cpio.c
index f0d990048..521001921 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -421,6 +421,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
#endif
#endif
"owner\0" Required_argument "R"
+ "file\0" Required_argument "F"
"verbose\0" No_argument "v"
"null\0" No_argument "0"
"quiet\0" No_argument "\xff"
--
2.49.0

4
main/busybox/APKBUILD
View file

@ -4,7 +4,7 @@
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=busybox
pkgver=1.37.0
pkgrel=18
pkgrel=19
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@ -80,6 +80,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
0032-lineedit-fix-some-tab-completions-written-to-stdout.patch
0033-lineedit-use-stdout-for-shell-history-builtin.patch
0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
0035-cpio-map-F-to-file-long-option.patch
0001-hexdump-fix-regression-with-n4-e-u.patch
0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch
@ -397,6 +398,7 @@ d9625580bdfe7036e0a3e01c33ddffcc8c70737dfa031c9f97a5a45635910dbd5cf3ebb8d28256a1
ac56a170a31f4329d00155a2a7d3950c4fe365e69e2e6b773a28fe3faa214a1330f0dd910bf0712453f033abc9e8465f9cec80f4e3e820a5d6ffafbf36e503e7 0032-lineedit-fix-some-tab-completions-written-to-stdout.patch
82c328921c4034b561f31fe5da77fd1a03033911bb6f50383b59885b184e010bbf66065ce0d90e0bc138a7608a4a5b51cab5d3598f974ee600d06eb161d5b0c3 0033-lineedit-use-stdout-for-shell-history-builtin.patch
04ed80099092bf6cafa293d13039184307197d5b71e2052a7b5650eed4364845cca3910e701e01c67a23dff7c9552506b682d553d6bdd7dfcbc7724e98595c4d 0034-adduser-remove-preconfigured-GECOS-full-name-field.patch
8ea1f59ad19c4dc42d95af3a1e590180483689536dbd6932fd500e1f6bcbc1eb12b50e81b6ea26ea93297ce527d1aa850fbe0b23210a3db79039409392935242 0035-cpio-map-F-to-file-long-option.patch
ac026f8b289d1431c46d51a8c512eb0184aa81de1c41971a87c99bcdc5c63c2d9abed412cad20d3032b480d87a52ee2602411149eb5f271fa9d051165a7b8188 0001-hexdump-fix-regression-with-n4-e-u.patch
7165661f3972f1800faf8d263126e3f238bb26bb7891230dbaad2d085e49e2ababc555294ecefed9d8ff00d93c8c3963e786db796cf3d03d68bf9e0492305d0c 0001-awk-fix-handling-of-literal-backslashes-in-replaceme.patch
9548603cbadf690ab31354642ab3f7bef1b9f696df6b661ea644548fb831b2f78a47a9b09b5489aa43da7061dcc6808864d130d053906f44090983f5cb3dc169 0001-tunctl-fix-segfault-on-ioctl-failure.patch