Commit 913d0715 authored by Natanael Copa's avatar Natanael Copa

main/busybox: fix cpio symlinks

ref #8751
parent fa94a829
......@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.28.2
pkgrel=0
pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
arch="all"
......@@ -36,6 +36,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
0015-ash-introduce-a-config-option-to-search-current-dire.patch
0016-top-handle-much-larger-VSZ-values.patch
0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
fix-cpio-symlinks.patch
acpid.logrotate
busyboxconfig
......@@ -197,6 +198,7 @@ a96aa81d2f0104b5c28f02e80b3f77dbce77af93c174c09015a34850474d69e42c160fc8061c62f0
832eb44c52d2caad4bf6ea79fb17f10c116de3e90ed79038dabe3736d8e74507d1e0cb6f4f7689b4dd506b92437d8df7862038fc0213ecda259e40baf9d9b3de 0015-ash-introduce-a-config-option-to-search-current-dire.patch
185f11578dc3c3637f1acd1285c71b9e31f4244c57cd85b0848912c085a7a8c833d4c935ab1cadcb9852cf3185c7ffb08db8ea728fb19ab6e6fa90d89f13c75b 0016-top-handle-much-larger-VSZ-values.patch
d90d6b3406760fe3df6dbed46a0f4d1c02a69d5184ebc86d8c1692bc4576532127283ba3ff9a81e64f3660c279b8ee324dac7a426350873c45957067648651c6 0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
65c11538056b6bd782b6195252a2a49f3b374e285a04f3296f708bb7da02b87435c34d43eaf80f1961167f55106fc2e4d5843d0c27cf06e6156ff8fabe642ac8 fix-cpio-symlinks.patch
a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate
035f2a28719971d9ff805d208d70bc1144fd3701235dc46ef581a559e696ef92265f28f7debf0248a2cee004a773dcd07828bcc088716f5aff944ccdce15d30f busyboxconfig
0efbe22e2fd56993d92b6542d4ccffb2b42d50495be085c98f417a71f503b4071e2f092afcec77f78064d33ffb0922c28daa3cb9958e6d7fb26d5a660abd90f4 busyboxconfig-extras
......
From 2bc68477023015b2ab3973057e90d36fa6f93923 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 30 Mar 2018 14:01:01 +0200
Subject: [PATCH] cpio: fix regression with symlinks
Fix to make cpio create symlinks.
This fixes a regression in cpio introduced with
a84db18fc71d09e801df0ebca048d82e90b32c6a (tar,unzip: postpone creation
of symlinks with "suspicious" targets).
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
archival/cpio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/archival/cpio.c b/archival/cpio.c
index 1d6cbd1e2..3eb37c603 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -507,6 +507,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
archive_handle->cpio__blocks = (off_t)-1;
while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
continue;
+ create_symlinks_from_list(archive_handle->symlink_placeholders);
if (archive_handle->cpio__blocks != (off_t)-1
&& !(opt & OPT_QUIET)
--
2.16.3
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment