Hello community, here is the log from the commit of package bsdtar for openSUSE:Factory checked in at Mon Nov 15 17:24:52 CET 2010. -------- --- bsdtar/bsdtar.changes 2010-01-06 04:37:18.000000000 +0100 +++ bsdtar/bsdtar.changes 2010-11-11 14:42:22.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 11 13:36:59 UTC 2010 - puzel@novell.com + +- udpate to libarchive-2.8.4 + - see /usr/share/doc/packages/libarchive2/NEWS for changes +- drop libarchive-2.5.5_fix_testsuite.patch (upstream) +- update libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch +- clean up specfile +- disable make check for now + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libarchive-2.5.5.tar.bz2 libarchive-2.5.5_fix_testsuite.patch New: ---- libarchive-2.8.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsdtar.spec ++++++ --- /var/tmp/diff_new_pack.vZfVql/_old 2010-11-15 17:24:24.000000000 +0100 +++ /var/tmp/diff_new_pack.vZfVql/_new 2010-11-15 17:24:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bsdtar (Version 2.5.5) +# spec file for package bsdtar (Version 2.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,19 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: bsdtar -Version: 2.5.5 -Release: 6 +Version: 2.8.4 +Release: 1 %define pkg_name libarchive # -License: BSD 3-clause (or similar) -Group: Development/Libraries/C and C++ +License: BSD3c(or similar) +Group: Productivity/Archiving/Compression +BuildRequires: libacl-devel +BuildRequires: pkg-config +BuildRequires: zlib-devel # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libacl-devel zlib-devel %if 0%{?suse_version} > 1020 BuildRequires: libbz2-devel %else @@ -39,13 +40,11 @@ BuildRequires: e2fsprogs-devel %endif # -Url: http://people.freebsd.org/~kientzle/libarchive/ -# http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz +Summary: Creates and reads several different streaming archive formats +# +Url: http://code.google.com/p/libarchive/ 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 %description Libarchive is a programming library that can create and read several @@ -58,17 +57,11 @@ This package contains the bsdtar cmdline utility. - - -Authors: --------- - Tim Kientzle <kientzle@freebsd.org> - %package -n libarchive2 -License: BSD 3-clause (or similar) -Group: Development/Libraries/C and C++ +License: BSD3c(or similar) # -Summary: Programming Library To Create And Read Several Different Streaming Archive Formats +Summary: Library to work with several different streaming archive formats +Group: Development/Libraries/C and C++ %description -n libarchive2 Libarchive is a programming library that can create and read several @@ -123,24 +116,19 @@ I/O. It should be very easy to add new formats, new compression methods, or new ways of reading/writing archives. - - -Authors: --------- - Tim Kientzle <kientzle@freebsd.org> - %package -n libarchive-devel -License: BSD 3-clause (or similar) +License: BSD3c(or similar) +Requires: libacl-devel Requires: libarchive2 = %{version} -Requires: zlib-devel libacl-devel +Requires: zlib-devel %if 0%{?suse_version} > 1020 Requires: libbz2-devel %else Requires: bzip2 %endif -Group: Development/Libraries/C and C++ # Summary: Development files for libarchive +Group: Development/Libraries/C and C++ %description -n libarchive-devel Libarchive is a programming library that can create and read several @@ -153,32 +141,27 @@ This package contains the development files. - - -Authors: --------- - Tim Kientzle <kientzle@freebsd.org> - %prep %setup -q -n %{pkg_name}-%{version} -%patch %patch1 %build #autoreconf -fi %configure --disable-static --enable-bsdcpio -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %check -%{__make} check +# Disabled until http://code.google.com/p/libarchive/issues/detail?id=115 +# is resolved. +#%%make check %install -%makeinstall +%make_install rm -fv minitar/*.o rm -fv %{buildroot}%{_libdir}/*.la %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %post -n libarchive2 -p /sbin/ldconfig @@ -201,5 +184,6 @@ %{_mandir}/man3/* %{_libdir}/libarchive.so %{_includedir}/archive* +%{_libdir}/pkgconfig/libarchive.pc %changelog ++++++ libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch ++++++ --- /var/tmp/diff_new_pack.vZfVql/_old 2010-11-15 17:24:24.000000000 +0100 +++ /var/tmp/diff_new_pack.vZfVql/_new 2010-11-15 17:24:24.000000000 +0100 @@ -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); ++++++ libarchive-2.5.5.tar.bz2 -> libarchive-2.8.4.tar.bz2 ++++++ ++++ 214767 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org