Stephan Kulow 2011-12-06 16:03:17 +00:00 committed by Git OBS Bridge
commit 550145edbf
7 changed files with 423 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libarchive2

View File

@ -0,0 +1,59 @@
---
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
+++ 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>
+#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>
@@ -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 ((AE_IFLNK != archive_entry_filetype(entry))
&& utimes(name, times) != 0)
Index: libarchive/archive_write_disk.c
===================================================================
--- 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))) {
+ utimes(p->name, times);
+ }
#else
utimes(p->name, times);
#endif
@@ -1886,8 +1888,8 @@ set_time(int fd, int mode, const char *n
(void)fd; /* UNUSED */
#endif
#ifdef HAVE_LUTIMES
- (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(mode))
return (0);

3
libarchive-2.8.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d
size 1410485

154
libarchive.changes Normal file
View File

@ -0,0 +1,154 @@
-------------------------------------------------------------------
Tue Dec 6 16:00:48 UTC 2011 - coolo@suse.com
- rename main package to libarchive
-------------------------------------------------------------------
Tue Dec 6 16:00:32 UTC 2011 - coolo@suse.com
- Update to libarchive 2.8.5 (from werner)
* Fix issue 134: Improve handling of open failures
* Fix issue 119: Relax ISO verification
* Fix issue 121: mtree parsing
* Fix extraction of GNU tar 'D' directory entries
* Be less demanding in LZMA/XZ compression tests
-------------------------------------------------------------------
Fri Sep 30 08:15:50 UTC 2011 - coolo@suse.com
- add baselibs.conf for PackageKit to use
-------------------------------------------------------------------
Tue Apr 19 13:23:09 UTC 2011 - idoenmez@novell.com
- Add suport for xz and xar archives
- Add libarchive-2.8.4-iso9660-data-types.patch:
fix ISO9660 reader data type mismatches
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Jan 6 04:36:37 UTC 2010 - jengelh@medozas.de
- enable parallel building
-------------------------------------------------------------------
Wed Oct 29 17:24:49 CET 2008 - mrueckert@suse.de
- 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 8 17:57:29 CEST 2008 - mrueckert@suse.de
- fix rm calls in %install
-------------------------------------------------------------------
Sat Sep 6 17:54:11 CEST 2008 - mrueckert@suse.de
- update to 2.5.5
This is a major version bump again: it incorporates
lots of bugfixes and improvements.
For all the details please see
/usr/share/doc/packages/libarchive2/NEWS
- drop the .la file
- dropped patch libarchive-2.2.5_rpath.patch:
no longer needed
- added libarchive-2.5.5_fix_testsuite.patch:
added missing mode to open() with O_CREAT
-------------------------------------------------------------------
Wed Aug 15 12:58:06 CEST 2007 - ro@suse.de
- fix dependency of devel package
-------------------------------------------------------------------
Tue Aug 7 16:47:22 CEST 2007 - mrueckert@suse.de
- restructured package:
bsdtar is now the main package and libarchive2 and libarchive-devel
the subpackages. This saves us a rename on soversion bumps.
-------------------------------------------------------------------
Mon Jul 30 14:31:32 CEST 2007 - mrueckert@suse.de
- update to 2.2.5 (#291358)
This is a major version bump. For a full list of all changes see
/usr/share/doc/packages/libarchive/NEWS. Mostly notable this up-
date includes the fixes for the following security bugs:
Errors handling corrupt tar files in libarchive
(CVE-2007-3641, CVE-2007-3644, CVE-2007-3645)
- added libarchive-2.2.5_rpath.patch:
dont set a rpath on the builddir.
- no longer building the static lib
-------------------------------------------------------------------
Fri Jun 8 01:35:37 CEST 2007 - ro@suse.de
- added ldconfig to post scripts
- remove minitar objects (leave binary there for now)
-------------------------------------------------------------------
Sun Apr 8 20:53:59 CEST 2007 - mrueckert@suse.de
- updated to 2.0.28
- removed all patches:
included upstream
-------------------------------------------------------------------
Sat Mar 24 20:07:04 CET 2007 - mrueckert@suse.de
- require libbz2-devel on >= 10.3
-------------------------------------------------------------------
Sat Mar 24 16:30:08 CET 2007 - aj@suse.de
- Change requires for libbz2 split.
-------------------------------------------------------------------
Tue Mar 6 16:49:29 CET 2007 - mrueckert@suse.de
- updated bsdtar-1.2.53_ext2_include.patch:
the old fix was not complete and on newer glibc/kernel-headers it
seems you need to include linux/fs.h explicitly
new name: bsdtar-1.3.1_linux_fs_includes.patch
- build with -fno-strict-aliasing
-------------------------------------------------------------------
Fri Nov 10 13:01:38 CET 2006 - mrueckert@suse.de
- added SA-06-24_libarchive.patch:
fix DOS in libarchive (CVE-2006-5680)
http://security.freebsd.org/advisories/FreeBSD-SA-06:24.libarchive.asc
-------------------------------------------------------------------
Fri Sep 22 13:03:42 CET 2006 - mrueckert@suse.de
- update to version 1.3.1
-------------------------------------------------------------------
Thu Apr 27 02:32:57 CEST 2006 - mrueckert@suse.de
- updated to 1.2.53:
Upstream merged the source tarball.
Splitted of a bsdtar package
-------------------------------------------------------------------
Mon Feb 27 19:24:00 CET 2006 - mrueckert@suse.de
- fixed building of debuginfo package
-------------------------------------------------------------------
Mon Feb 27 18:32:04 CET 2006 - mrueckert@suse.de
- libarchive 1.2.38

182
libarchive.spec Normal file
View File

@ -0,0 +1,182 @@
#
# spec file for package libarchive
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: libarchive
Version: 2.8.5
Release: 0
#
BuildRequires: libacl-devel
BuildRequires: pkg-config
BuildRequires: zlib-devel
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libbz2-devel
BuildRequires: libext2fs-devel
BuildRequires: libopenssl-devel
BuildRequires: libxml2-devel
BuildRequires: xz-devel
#
Summary: Creates and reads several different streaming archive formats
License: BSD-3-Clause
Group: Productivity/Archiving/Compression
#
Url: http://code.google.com/p/libarchive/
Source0: http://libarchive.googlecode.com/files/libarchive-%{version}.tar.gz
Source1: baselibs.conf
Patch1: libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch
%description
Libarchive is a programming library that can create and read several
different streaming archive formats, including most popular tar
variants and several cpio formats. It can also write shar archives and
read ISO9660 CDROM images. The bsdtar program is an implementation of
tar(1) that is built on top of libarchive. It started as a test
harness, but has grown and is now the standard system tar for FreeBSD 5
and 6.
This package contains the bsdtar cmdline utility.
%package -n bsdtar
Summary: Creates and reads several different streaming archive formats
Group: Productivity/Archiving/Compression
%description -n bsdtar
This package contains the bsdtar cmdline utility.
%package -n libarchive2
#
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
different streaming archive formats, including most popular tar
variants and several cpio formats. It can also write shar archives and
read ISO9660 CDROM images. The bsdtar program is an implementation of
tar(1) that is built on top of libarchive. It started as a test
harness, but has grown and is now the standard system tar for FreeBSD 5
and 6.
The libarchive library offers a number of features that make it both
very flexible and very powerful.
- Automatic format detection: libarchive can automatically determine
both the compression and the archive format, regardless of the
data source. Most tar implementations do not automatically detect
the compression format, few implementation that can correctly do
this when reading from stdin or a socket. (The tar program
included with Gunnar Ritter's heirloom collection also does full
automatic format detection.)
- Writes POSIX formats: libarchive writes POSIX-standard formats,
including "ustar," "pax interchange format," and the POSIX "cpio"
format.
- Supports pax interchange format: Pax interchange format (which,
despite the name, is really an extended tar format) eliminates
almost all limitations of historic tar formats and provides a
standard method for incorporating vendor-specific extensions.
libarchive exploits this extension mechanism to support ACLs and
file flags, for example. (Joerg Schilling's star archiver is
another open-source tar program that supports pax interchange
format.)
- Reads popular formats: libarchive can read GNU tar, ustar, pax
interchange format, cpio, and older tar variants. The internal
architecture is easily extensible. The only requirement for
support is that it be possible to read the format without seeking
in the file. (For example, a format that includes a compressed
size field before the data cannot be correctly written without
seeking.)
- High-Level API: the libarchive API makes it fairly simple to build
an archive from a list of filenames or to extract the entries
from an archive. However, the API also provides extreme
flexibility with regards to data sources. For example, there are
generic hooks that allow you to write an archive to a socket or
read data from an archive entry into a memory buffer.
- Extensible. The internal design uses generic interfaces for
compression, archive format detection and decoding, and archive data
I/O. It should be very easy to add new formats, new compression
methods, or new ways of reading/writing archives.
%package -n libarchive-devel
Requires: libacl-devel
Requires: libarchive2 = %{version}
Requires: zlib-devel
Requires: libbz2-devel
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
different streaming archive formats, including most popular tar
variants and several cpio formats. It can also write shar archives and
read ISO9660 CDROM images. The bsdtar program is an implementation of
tar(1) that is built on top of libarchive. It started as a test
harness, but has grown and is now the standard system tar for FreeBSD 5
and 6.
This package contains the development files.
%prep
%setup -q -n %{name}-%{version}
%patch1
%build
#autoreconf -fi
%configure --disable-static --enable-bsdcpio
make %{?_smp_mflags}
%check
make check
%install
%make_install
rm -fv minitar/*.o
rm -fv %{buildroot}%{_libdir}/*.la
rm "%{buildroot}%{_mandir}/man5/"{tar,cpio,mtree}.5*
%clean
rm -rf %{buildroot}
%post -n libarchive2 -p /sbin/ldconfig
%postun -n libarchive2 -p /sbin/ldconfig
%files -n bsdtar
%defattr(-,root,root)
%{_bindir}/bsdtar
%{_bindir}/bsdcpio
%{_mandir}/man1/*
%{_mandir}/man5/*
%files -n libarchive2
%defattr(-,root,root)
%{_libdir}/libarchive.so.*
%doc COPYING INSTALL NEWS README examples/
%files -n libarchive-devel
%defattr(-,root,root)
%{_mandir}/man3/*
%{_libdir}/libarchive.so
%{_includedir}/archive*
%{_libdir}/pkgconfig/libarchive.pc
%changelog