diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-06-07 06:08:34 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-06-07 06:08:34 +0000 |
| commit | 808f5a34a853b5f29e3e9d196072f00ba227e790 (patch) | |
| tree | f0d0c165b02196ecf3120785af4ed4202ef99c2a /archivers/gtar | |
| parent | Allow this port to build in -current (i.e. with gcc 3.1) (diff) | |
Sync with src/contrib/tar - re-enable --same-owner for uid 0.
Notes
Notes:
svn path=/head/; revision=60747
Diffstat (limited to 'archivers/gtar')
| -rw-r--r-- | archivers/gtar/Makefile | 2 | ||||
| -rw-r--r-- | archivers/gtar/files/patch-src::extract.c | 11 |
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 |