Mailinglist Archive: opensuse-commit (1945 mails)

< Previous Next >
commit bsdtar
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 03 Nov 2008 11:57:48 +0100
  • Message-id: <20081103105748.C8E88678161@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package bsdtar
checked in at Mon Nov 3 11:57:48 CET 2008.


--------
--- bsdtar/bsdtar.changes 2008-09-08 17:57:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsdtar/bsdtar.changes 2008-10-29
17:25:48.918393000 +0100
@@ -1,0 +2,7 @@
+Wed Oct 29 17:24:49 CET 2008 - mrueckert@xxxxxxx
+
+- added libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch:
+ it can happen that your system at build times supports lutimes
+ but later at runtime the needed syscall is missing.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bsdtar.spec ++++++
--- /var/tmp/diff_new_pack.r25555/_old 2008-11-03 11:57:23.000000000 +0100
+++ /var/tmp/diff_new_pack.r25555/_new 2008-11-03 11:57:23.000000000 +0100
@@ -20,7 +20,7 @@

Name: bsdtar
Version: 2.5.5
-Release: 2
+Release: 5
%define pkg_name libarchive
#
License: BSD 3-Clause
@@ -43,6 +43,7 @@
#
http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
Source: libarchive-%{version}.tar.bz2
Patch: libarchive-2.5.5_fix_testsuite.patch
+Patch1: libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch
#
Summary: Bsdtar is a programme that can create and read several
different streaming archive formats

@@ -161,6 +162,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
%patch
+%patch1

%build
#autoreconf -fi
@@ -201,6 +203,10 @@
%{_includedir}/archive*

%changelog
+* Wed Oct 29 2008 mrueckert@xxxxxxx
+- added libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch:
+ it can happen that your system at build times supports lutimes
+ but later at runtime the needed syscall is missing.
* Mon Sep 08 2008 mrueckert@xxxxxxx
- fix rm calls in %%install
* Sat Sep 06 2008 mrueckert@xxxxxxx

++++++ libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch ++++++
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
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_UTIME_H
+#include <sys/utime.h>
+#endif
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -662,7 +671,8 @@ restore_time(struct cpio *cpio, struct a
#endif

#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
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;
#ifdef HAVE_LUTIMES
- lutimes(p->name, times);
+ if ((lutimes(p->name, times) != 0) && (errno==ENOSYS)
&& (!S_ISLNK(p->mode))) {
+ utimes(p->name, times);
+ }
#else
utimes(p->name, times);
#endif
@@ -1638,7 +1640,8 @@ set_time(struct archive_write_disk *a)
#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))
#else
if (!S_ISLNK(a->mode) && utimes(a->name, times) != 0)
#endif

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages