aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2002-06-07 14:08:34 +0800
committersobomax <sobomax@FreeBSD.org>2002-06-07 14:08:34 +0800
commit9db9ea0a546619fa91cc316668fade65a21d4e46 (patch)
tree83778a376d5d8182cce40b3de2a8301ecdf48aac
parent829299101c3e2055c517bbfb00f90284e45d9abc (diff)
downloadfreebsd-ports-gnome-9db9ea0a546619fa91cc316668fade65a21d4e46.tar.gz
freebsd-ports-gnome-9db9ea0a546619fa91cc316668fade65a21d4e46.tar.zst
freebsd-ports-gnome-9db9ea0a546619fa91cc316668fade65a21d4e46.zip
Sync with src/contrib/tar - re-enable --same-owner for uid 0.
-rw-r--r--archivers/gtar/Makefile2
-rw-r--r--archivers/gtar/files/patch-src::extract.c11
2 files changed, 6 insertions, 7 deletions
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 4611d12eee5d..2dcfbe9c19ec 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tar
PORTVERSION= 1.13.25
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= archivers sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/tar/ \
ftp://ftp.sunsite.org.uk/Mirrors/alpha.gnu.org/gnu/tar/ \
diff --git a/archivers/gtar/files/patch-src::extract.c b/archivers/gtar/files/patch-src::extract.c
index ab8e59d9cbf2..7a0a41640fa8 100644
--- a/archivers/gtar/files/patch-src::extract.c
+++ b/archivers/gtar/files/patch-src::extract.c
@@ -2,10 +2,10 @@ Index: src/extract.c
===================================================================
RCS file: /home/ncvs/src/contrib/tar/src/extract.c,v
retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -d -u -r1.1.1.1 -r1.2
+retrieving revision 1.3
+diff -d -u -r1.1.1.1 -r1.3
--- src/extract.c 4 Jun 2002 10:37:44 -0000 1.1.1.1
-+++ src/extract.c 7 Jun 2002 00:03:23 -0000 1.2
++++ src/extract.c 7 Jun 2002 06:02:35 -0000 1.3
@@ -19,6 +19,8 @@
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@@ -15,14 +15,13 @@ diff -d -u -r1.1.1.1 -r1.2
#include "system.h"
#include <quotearg.h>
-@@ -110,8 +112,10 @@
+@@ -110,7 +112,9 @@
extr_init (void)
{
we_are_root = geteuid () == 0;
+#ifndef __FreeBSD__
same_permissions_option += we_are_root;
- same_owner_option += we_are_root;
+#endif
+ same_owner_option += we_are_root;
xalloc_fail_func = extract_finish;
- /* Option -p clears the kernel umask, so it does not affect proper