diff options
author | christos <christos@pkgsrc.org> | 1999-08-10 05:05:39 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 1999-08-10 05:05:39 +0000 |
commit | 2184e265402ee358acd2523390cc078948ab15a5 (patch) | |
tree | c1500f55b12b1e8fe6f371cbb8aac506a5d9f5e6 /archivers/gtar/patches/patch-ab | |
parent | 60988cc580e2d4fd12a282d5b1fb745d358e4fb3 (diff) | |
download | pkgsrc-2184e265402ee358acd2523390cc078948ab15a5.tar.gz |
make this work under linux.
- don't use gnumalloc
- use lchmod only on NetBSD
Diffstat (limited to 'archivers/gtar/patches/patch-ab')
-rw-r--r-- | archivers/gtar/patches/patch-ab | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/archivers/gtar/patches/patch-ab b/archivers/gtar/patches/patch-ab index f6c44dd5d27..3aacabdcc03 100644 --- a/archivers/gtar/patches/patch-ab +++ b/archivers/gtar/patches/patch-ab @@ -1,17 +1,20 @@ -$NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $ +$NetBSD: patch-ab,v 1.5 1999/08/10 05:05:40 christos Exp $ --- src/extract.c.orig Tue Apr 22 20:05:57 1997 +++ src/extract.c Fri Mar 6 14:33:05 1998 -@@ -103,7 +103,7 @@ +@@ -103,7 +103,11 @@ if (!keep_old_files_option || (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))) -- if (chmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0) ++#ifdef __NetBSD__ + if (lchmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0) ++#else + if (chmod (file_name, ~current_umask & (int) stat_info->st_mode) < 0) ++#endif ERROR ((0, errno, _("%s: Cannot change mode to %0.4o"), file_name, ~current_umask & (int) stat_info->st_mode)); } -@@ -124,8 +124,10 @@ +@@ -124,8 +128,10 @@ { struct utimbuf utimbuf; @@ -22,7 +25,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $ /* We do the utime before the chmod because some versions of utime are broken and trash the modes of the file. */ -@@ -137,6 +139,7 @@ +@@ -137,6 +143,7 @@ /* FIXME: incremental_option should set ctime too, but how? */ @@ -30,7 +33,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $ if (incremental_option) utimbuf.actime = stat_info->st_atime; else -@@ -145,6 +148,19 @@ +@@ -145,6 +152,19 @@ utimbuf.modtime = stat_info->st_mtime; if (utime (file_name, &utimbuf) < 0) @@ -50,7 +53,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:35:49 agc Exp $ ERROR ((0, errno, _("%s: Could not change access and modification times"), file_name)); -@@ -155,7 +171,9 @@ +@@ -155,7 +175,9 @@ have to set permissions prior to possibly giving files away. */ set_mode (file_name, stat_info); |