From f8d376af3c1ef58790380ec008e8c432de961404 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 17 Mar 2013 17:17:34 +0100 Subject: [PATCH] xbps: merge patch from git master to use lchown(2) while unpacking. --- ...n-2-to-set-proper-uid-gid-to-symlink.patch | 25 +++++++++++++++++++ srcpkgs/xbps/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbps/patches/0006-unpack-use-lchown-2-to-set-proper-uid-gid-to-symlink.patch diff --git a/srcpkgs/xbps/patches/0006-unpack-use-lchown-2-to-set-proper-uid-gid-to-symlink.patch b/srcpkgs/xbps/patches/0006-unpack-use-lchown-2-to-set-proper-uid-gid-to-symlink.patch new file mode 100644 index 0000000000..b884f261fc --- /dev/null +++ b/srcpkgs/xbps/patches/0006-unpack-use-lchown-2-to-set-proper-uid-gid-to-symlink.patch @@ -0,0 +1,25 @@ +From 8d6f3b5029b889e2865fc8ace4a2eacb56e5962a Mon Sep 17 00:00:00 2001 +From: Juan RP +Date: Sun, 17 Mar 2013 17:13:07 +0100 +Subject: [PATCH] unpack: use lchown(2) to set proper uid/gid to symlinks. + +--- + lib/package_unpack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/package_unpack.c b/lib/package_unpack.c +index fd19250..bf37690 100644 +--- lib/package_unpack.c ++++ lib/package_unpack.c +@@ -408,7 +408,7 @@ unpack_archive(struct xbps_handle *xhp, + if ((!force && file_exists && skip_extract && (euid == 0)) && + (((archive_entry_uid(entry) != st.st_uid)) || + ((archive_entry_gid(entry) != st.st_gid)))) { +- if (chown(entry_pname, ++ if (lchown(entry_pname, + archive_entry_uid(entry), + archive_entry_gid(entry)) != 0) { + xbps_dbg_printf(xhp, +-- +1.8.1.3 + diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 86d4261641..e0141eac73 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.21 -revision=5 +revision=6 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --enable-static --enable-debug --enable-tests"