diff options
author | rillig <rillig> | 2006-10-01 21:00:20 +0000 |
---|---|---|
committer | rillig <rillig> | 2006-10-01 21:00:20 +0000 |
commit | 8f266b56589906da0c011704765240140634149d (patch) | |
tree | 98eb2dfa8cef90903506d1a37160313e54649658 /archivers | |
parent | 402c19ef6eb3a21b2c298407e2a6ccfbac1fa967 (diff) | |
download | pkgsrc-8f266b56589906da0c011704765240140634149d.tar.gz |
Added a patch for Solaris 10, which does neither have futimes() nor
struct stat.st_flags.
Diffstat (limited to 'archivers')
-rw-r--r-- | archivers/archangel/distinfo | 4 | ||||
-rw-r--r-- | archivers/archangel/patches/patch-ad | 32 |
2 files changed, 30 insertions, 6 deletions
diff --git a/archivers/archangel/distinfo b/archivers/archangel/distinfo index c1818e5999b..1e09344a279 100644 --- a/archivers/archangel/distinfo +++ b/archivers/archangel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2005/10/31 14:31:47 tv Exp $ +$NetBSD: distinfo,v 1.8 2006/10/01 21:00:20 rillig Exp $ SHA1 (archangel-20050730.tar.gz) = 966948ebac01a71732e93afd72fe5c4a21ba1ed8 RMD160 (archangel-20050730.tar.gz) = 16b5f1d7dae8d45b22d0e371a90e0673c5e58caa @@ -6,5 +6,5 @@ Size (archangel-20050730.tar.gz) = 673307 bytes SHA1 (patch-aa) = cc5369ee02b35a0f4c21bed18802a3919f89bc63 SHA1 (patch-ab) = 580fac24f5c2ee698ea58dce3b75bc4301db75bf SHA1 (patch-ac) = f7cd2a68ae6349e9ce2570ee269c70d7dd565c8f -SHA1 (patch-ad) = 8cfb116a12ec927f00d2059d5e9b59e1e2d564c3 +SHA1 (patch-ad) = 576ba595b35fba2a0eb2ef840cf544b3d2a88856 SHA1 (patch-ae) = 21e2e651af0d828813b26cd036b7583a5dd3eebe diff --git a/archivers/archangel/patches/patch-ad b/archivers/archangel/patches/patch-ad index 4717080f85b..b13709feec2 100644 --- a/archivers/archangel/patches/patch-ad +++ b/archivers/archangel/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 2005/10/31 05:11:41 minskim Exp $ +$NetBSD: patch-ad,v 1.2 2006/10/01 21:00:20 rillig Exp $ ---- aa.c.orig 2005-07-31 15:20:23.000000000 -0700 -+++ aa.c +--- aa.c.orig 2005-08-01 00:20:23.000000000 +0200 ++++ aa.c 2006-08-30 17:56:16.285256480 +0200 @@ -48,6 +48,9 @@ #include <sys/endian.h> #endif @@ -33,7 +33,19 @@ $NetBSD: patch-ad,v 1.1 2005/10/31 05:11:41 minskim Exp $ warn("WARNING: can't setxattr (%s) for \"%s\"", ap, name); } *eq = '='; -@@ -927,9 +934,17 @@ ext_attr_get(aa_t *aa, aaent_t *aep, cha +@@ -605,7 +612,11 @@ extractfile(aa_t *aa, aaent_t *aep, char + warn("extractfile: can't open \"%s\" mode %x", name, mode); + return 0; + } ++#if defined(__sun) ++ if (utimes(name, tv) < 0) { ++#else + if (futimes(fd, tv) < 0) { ++#endif + warn("extractfile: can't set access/modification time for \"%s\"", name); + } + if (aep->sub.xattrlen > 0) { +@@ -927,9 +938,17 @@ ext_attr_get(aa_t *aa, aaent_t *aep, cha int cc; int vc; @@ -51,3 +63,15 @@ $NetBSD: patch-ad,v 1.1 2005/10/31 05:11:41 minskim Exp $ warnx("file \"%s\" attribute \"%s\" is too long, skipping...", path, key); } else { ac += snprintf(&attrs[ac], sizeof(attrs) - ac, "%s=%s\n", key, val); +@@ -982,7 +1001,11 @@ addent(aa_t *aa, char *name, int namelen + #endif + a.sub.size = sp->st_size; + a.sub.blocks = sp->st_blocks; ++#if defined(__sun) ++ a.sub.flags = 0; ++#else + a.sub.flags = sp->st_flags; ++#endif + a.sub.offset = from; + a.sub.part = from / aa->maxfsize; + a.sub.lastpart = (sp->st_size - from) < aa->maxfsize; |