|
[-]
[+]
|
Added |
bsdtar.changes
|
|
|
|
[-]
[+]
|
Changed |
bsdtar.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
libarchive-2.5.5_fix_testsuite.patch
^
|
| @@ -1,13 +0,0 @@
-Index: tar/test/test_option_T.c
-===================================================================
---- tar/test/test_option_T.c.orig 2008-05-29 07:27:46.000000000 +0200
-+++ tar/test/test_option_T.c 2008-09-06 17:45:07.496292842 +0200
-@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/test
- static int
- touch(const char *fn)
- {
-- int fd = open(fn, O_RDWR | O_CREAT);
-+ int fd = open(fn, O_RDWR | O_CREAT, 0644);
- failure("Couldn't create file '%s', fd=%d, errno=%d (%s)\n",
- fn, fd, errno, strerror(errno));
- if (!assert(fd > 0))
|
|
[-]
[+]
|
Changed |
libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch
^
|
| @@ -1,40 +1,43 @@
+---
+ cpio/cpio.c | 10 +++++++---
+ libarchive/archive_write_disk.c | 8 +++++---
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
Index: cpio/cpio.c
===================================================================
---- cpio/cpio.c.orig 2008-07-03 07:28:35.000000000 +0200
-+++ cpio/cpio.c 2008-10-27 17:31:56.806826303 +0100
-@@ -35,6 +35,15 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cpi
+--- cpio/cpio.c.orig
++++ cpio/cpio.c
+@@ -38,8 +38,11 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cpi
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
+-#ifdef HAVE_SYS_TIME_H
+-#include <sys/time.h>
+#ifdef HAVE_SYS_UTIME_H
+#include <sys/utime.h>
+#endif
+#ifdef HAVE_UTIME_H
+#include <utime.h>
-+#endif
+ #endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
- #endif
-@@ -662,7 +671,8 @@ restore_time(struct cpio *cpio, struct a
- #endif
+@@ -786,7 +789,8 @@ restore_time(struct cpio *cpio, struct a
+ }
#ifdef HAVE_LUTIMES
- if (lutimes(name, times) != 0)
+ if ((lutimes(name, times) != 0) && (errno==ENOSYS) &&
+ (!S_ISLNK(archive_entry_mode(entry)) && utimes(name, times) != 0))
#else
- if (!S_ISLNK(archive_entry_mode(entry)) && utimes(name, times) != 0)
- #endif
+ if ((AE_IFLNK != archive_entry_filetype(entry))
+ && utimes(name, times) != 0)
Index: libarchive/archive_write_disk.c
===================================================================
---- libarchive/archive_write_disk.c.orig 2008-06-27 09:08:58.000000000 +0200
-+++ libarchive/archive_write_disk.c 2008-10-27 17:42:24.514385393 +0100
-@@ -1097,7 +1097,9 @@ _archive_write_close(struct archive *_a)
- times[0].tv_sec = p->atime;
- times[0].tv_usec = p->atime_nanos / 1000;
+--- libarchive/archive_write_disk.c.orig
++++ libarchive/archive_write_disk.c
+@@ -1265,7 +1265,9 @@ _archive_write_close(struct archive *_a)
+ times[1].tv_sec = p->mtime;
+ times[1].tv_usec = p->mtime_nanos / 1000;
#ifdef HAVE_LUTIMES
- lutimes(p->name, times);
+ if ((lutimes(p->name, times) != 0) && (errno==ENOSYS) && (!S_ISLNK(p->mode))) {
@@ -43,13 +46,14 @@
#else
utimes(p->name, times);
#endif
-@@ -1638,7 +1640,8 @@ set_time(struct archive_write_disk *a)
+@@ -1886,8 +1888,8 @@ set_time(int fd, int mode, const char *n
+ (void)fd; /* UNUSED */
#endif
-
#ifdef HAVE_LUTIMES
-- if (lutimes(a->name, times) != 0)
-+ if ((lutimes(a->name, times) != 0) && (errno==ENOSYS) &&
-+ (!S_ISLNK(a->mode) && utimes(a->name, times) != 0))
+- (void)mode; /* UNUSED */
+- return (lutimes(name, times));
++ return ((lutimes(name, times) != 0) && (errno==ENOSYS) &&
++ (!S_ISLNK(mode)) && (utimes(name,mode) != 0));
#else
- if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0)
- #endif
+ if (S_ISLNK(mode))
+ return (0);
|
|
[-]
[+]
|
Added |
libarchive-2.8.4-iso9660-data-types.patch
^
|
| @@ -0,0 +1,33 @@
+Index: libarchive/archive_read_support_format_iso9660.c
+===================================================================
+--- libarchive/archive_read_support_format_iso9660.c (revision 1983)
++++ libarchive/archive_read_support_format_iso9660.c (revision 1984)
+@@ -924,7 +924,7 @@
+ if (parent->offset + parent->size > iso9660->volume_size) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Directory is beyond end-of-media: %s",
+- parent->name);
++ parent->name.s);
+ return (ARCHIVE_WARN);
+ }
+ if (iso9660->current_position < parent->offset) {
+@@ -1220,7 +1220,7 @@
+
+ if (file->offset + file->size > iso9660->volume_size) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "File is beyond end-of-media: %s", file->name);
++ "File is beyond end-of-media: %s", file->name.s);
+ iso9660->entry_bytes_remaining = 0;
+ iso9660->entry_sparse_offset = 0;
+ return (ARCHIVE_WARN);
+@@ -1279,8 +1279,8 @@
+ if ((file->mode & AE_IFMT) != AE_IFDIR &&
+ file->offset < iso9660->current_position) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+- "Ignoring out-of-order file @%x (%s) %jd < %jd",
+- file,
++ "Ignoring out-of-order file @%jx (%s) %jd < %jd",
++ (intmax_t)file->number,
+ iso9660->pathname.s,
+ file->offset, iso9660->current_position);
+ iso9660->entry_bytes_remaining = 0;
|
|
[-]
[+]
|
Added |
baselibs.conf
^
|
| @@ -0,0 +1 @@
+libarchive2
|
|
|
Changed |
libarchive-2.8.4.tar.bz2
^
|
