From fc99fb3b0ade2ca6af4d7070edde750f7746aaa6 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 21 Feb 2013 12:57:15 +0100 Subject: [PATCH] tar: store the UIDs/GIDs properly in pax format (do not fail) Resolves: #913406 Version: 2:1.26-18 --- tar-1.26-posix-biguid.patch | 15 +++++++++++++++ tar.spec | 11 ++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tar-1.26-posix-biguid.patch diff --git a/tar-1.26-posix-biguid.patch b/tar-1.26-posix-biguid.patch new file mode 100644 index 0000000..1578b7a --- /dev/null +++ b/tar-1.26-posix-biguid.patch @@ -0,0 +1,15 @@ +diff --git a/src/create.c b/src/create.c +index 25387a9..9a7a05a 100644 +--- a/src/create.c ++++ b/src/create.c +@@ -514,8 +514,8 @@ start_private_header (const char *name, size_t size, time_t t) + + TIME_TO_CHARS (t, header->header.mtime); + MODE_TO_CHARS (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, header->header.mode); +- UID_TO_CHARS (getuid (), header->header.uid); +- GID_TO_CHARS (getgid (), header->header.gid); ++ UID_TO_CHARS (0, header->header.uid); ++ GID_TO_CHARS (0, header->header.gid); + MAJOR_TO_CHARS (0, header->header.devmajor); + MINOR_TO_CHARS (0, header->header.devminor); + strncpy (header->header.magic, TMAGIC, TMAGLEN); diff --git a/tar.spec b/tar.spec index 552d4c0..6ed40ef 100644 --- a/tar.spec +++ b/tar.spec @@ -5,7 +5,7 @@ Summary: A GNU file archiving program Name: tar Epoch: 2 Version: 1.26 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv3+ Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ @@ -71,6 +71,11 @@ Patch9: tar-1.26-selinux-gnulib.patch # ~> upstream (b997c90f9, 696338043, d36f5a3cc, 085cace18, up-to ~> 83701a590) Patch10: tar-1.26-xattrs.patch +# Fix problem with bit UIDs/GIDs (> 2^21) and --posix format. +# ~> #913406 +# ~> upstream (it is part of df7b55a8f6354e) +Patch11: tar-1.26-posix-biguid.patch + # run "make check" by default %bcond_without check @@ -112,6 +117,7 @@ the rmt package. %patch8 -p1 -b .skip-old-files %patch9 -p1 -b .selinux-gnulib-prep %patch10 -p1 -b .xattrs-selinux-acls +%patch11 -p1 -b .big_uid_gid autoreconf -v @@ -174,6 +180,9 @@ fi %{_infodir}/tar.info* %changelog +* Wed Feb 20 2013 Pavel Raiskup - 2:1.26-18 +- fix problems with big uids/gids and pax format (> 2^21) (#913406) + * Mon Feb 18 2013 Pavel Raiskup - 2:1.26-17 - add possibility to 'rpmbuild' without %%check phase - make the autoreconf phase verbose