Hello community, here is the log from the commit of package libarchive for openSUSE:12.2 checked in at 2012-08-12 15:26:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/libarchive (Old) and /work/SRC/openSUSE:12.2/.libarchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libarchive", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.2/libarchive/libarchive.changes 2012-06-25 15:43:27.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.libarchive.new/libarchive.changes 2012-08-12 15:26:18.000000000 +0200 @@ -1,0 +2,34 @@ +Thu Aug 9 09:05:01 UTC 2012 - [email protected] + +- license update: BSD-2-Clause + The COPYING file shows that the package is predominantly BSD-2-Clause + licensed + +------------------------------------------------------------------- +Tue Aug 7 18:47:14 UTC 2012 - [email protected] + +- Update to version 3.0.4: + + libarchive development moved to http://libarchive.github.com/ +- Changes from version 3.0.2: + + Various fixes merged from FreeBSD + + Symlink support in Zip reader and writer + + Robustness fixes to 7Zip reader +- Changes from version 3.0.1b: + + 7Zip reader + + Small fixes to ISO and Zip to improve robustness with corrupted + input + + Improve streaming Zip reader's support for uncompressed entries + + New seeking Zip reader supports SFX Zip archives + + Build fixes on Windows +- For more changes since 2.8.5, please see NEWS file +- Update URL Tag to represent new home of the project. +- Rename libarchive2 to libarchive12, following upstreams soname + bumps. +- Add libarchive-fix-checks.patch: Fix gcc 4.7 side effects. +- Drop libarchive-test-fuzz.patch: fixed upstream. +- Drop libarchive-ignore-sigpipe-in-test-suite.patch: fixed + upstream. +- Drop libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch: upstream + rejected the patch. Seems to be too theoretical problem. + +------------------------------------------------------------------- Old: ---- libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch libarchive-2.8.5.tar.gz libarchive-ignore-sigpipe-in-test-suite.patch libarchive-test-fuzz.patch New: ---- libarchive-3.0.4.tar.gz libarchive-fix-checks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libarchive.spec ++++++ --- /var/tmp/diff_new_pack.6mOKAz/_old 2012-08-12 15:26:18.000000000 +0200 +++ /var/tmp/diff_new_pack.6mOKAz/_new 2012-08-12 15:26:18.000000000 +0200 @@ -17,30 +17,25 @@ Name: libarchive -Version: 2.8.5 +Version: 3.0.4 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 +License: BSD-2-Clause Group: Productivity/Archiving/Compression -# -Url: http://code.google.com/p/libarchive/ +Url: http://libarchive.github.com/ Source0: http://libarchive.googlecode.com/files/libarchive-%{version}.tar.gz Source1: baselibs.conf -Patch1: libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch -Patch2: libarchive-test-fuzz.patch -Patch3: libarchive-ignore-sigpipe-in-test-suite.patch +# PATCH-FIX-UPSTREAM libarchive-fix-checks.patch [email protected] -- Fix GCC 4.7 side effects. Taken from upstream. +Patch0: libarchive-fix-checks.patch %description Libarchive is a programming library that can create and read several @@ -54,20 +49,17 @@ 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 - -# +%package -n libarchive12 Summary: Library to work with several different streaming archive formats Group: Development/Libraries/C and C++ -%description -n libarchive2 +%description -n libarchive12 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 @@ -121,9 +113,8 @@ methods, or new ways of reading/writing archives. %package -n libarchive-devel - Requires: libacl-devel -Requires: libarchive2 = %{version} +Requires: libarchive12 = %{version} Requires: libbz2-devel Requires: zlib-devel Summary: Development files for libarchive @@ -141,13 +132,10 @@ This package contains the development files. %prep -%setup -q -n %{name}-%{version} -%patch1 -%patch2 -p1 -%patch3 -p1 +%setup -q +%patch0 -p1 %build -#autoreconf -fi %global optflags %{optflags} -D_REENTRANT -pipe %configure --disable-static --enable-bsdcpio make %{?_smp_mflags} @@ -157,14 +145,12 @@ %install %makeinstall - -rm -fv minitar/*.o -rm -fv %{buildroot}%{_libdir}/*.la +find %{buildroot} -name '*.la' -type f -delete -print rm "%{buildroot}%{_mandir}/man5/"{tar,cpio,mtree}.5* -%post -n libarchive2 -p /sbin/ldconfig +%post -n libarchive12 -p /sbin/ldconfig -%postun -n libarchive2 -p /sbin/ldconfig +%postun -n libarchive12 -p /sbin/ldconfig %files -n bsdtar %defattr(-,root,root) @@ -173,13 +159,14 @@ %{_mandir}/man1/* %{_mandir}/man5/* -%files -n libarchive2 +%files -n libarchive12 %defattr(-,root,root) +%doc COPYING NEWS README %{_libdir}/libarchive.so.* -%doc COPYING INSTALL NEWS README examples/ %files -n libarchive-devel %defattr(-,root,root) +%doc examples/ %{_mandir}/man3/* %{_libdir}/libarchive.so %{_includedir}/archive* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.6mOKAz/_old 2012-08-12 15:26:18.000000000 +0200 +++ /var/tmp/diff_new_pack.6mOKAz/_new 2012-08-12 15:26:18.000000000 +0200 @@ -1 +1 @@ -libarchive2 +libarchive12 ++++++ libarchive-2.8.5.tar.gz -> libarchive-3.0.4.tar.gz ++++++ ++++ 246163 lines of diff (skipped) ++++++ libarchive-fix-checks.patch ++++++ >From da8ac32da9e5ee4a27674de4442e24c26cb2aa6a Mon Sep 17 00:00:00 2001 From: Dan McGee <[email protected]> Date: Tue, 27 Mar 2012 17:22:40 -0500 Subject: [PATCH] Fixes for GCC 4.7.0 Fixes the following compile error exposed with GCC 4.7.0: libarchive/archive_string.c: In function 'cesu8_to_unicode': libarchive/archive_string.c:2450:11: error: 'wc' may be used uninitialized in this function [-Werror=uninitialized] cc1: all warnings being treated as errors As well as a test failure that depends on signed integer wraparound, which is a very bad thing to do in C [1]. Mark the intermediate result as volatile to prevent the compiler optimizing away the arithmetic and the logical test. [1] http://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Signed-Overflow-Examples.html --- libarchive/archive_string.c | 3 ++- libarchive/test/test_read_format_mtree.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c index 2728a37..2b56a48 100644 --- a/libarchive/archive_string.c +++ b/libarchive/archive_string.c @@ -2447,11 +2447,12 @@ struct archive_string_conv * static int cesu8_to_unicode(uint32_t *pwc, const char *s, size_t n) { - uint32_t wc, wc2; + uint32_t wc = 0; int cnt; cnt = _utf8_to_unicode(&wc, s, n); if (cnt == 3 && IS_HIGH_SURROGATE_LA(wc)) { + uint32_t wc2 = 0; if (n - 3 < 3) { /* Invalid byte sequence. */ goto invalid_sequence; diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c index 0d86bd4..a5d7feb 100644 --- a/libarchive/test/test_read_format_mtree.c +++ b/libarchive/test/test_read_format_mtree.c @@ -37,7 +37,8 @@ * without relying on overflow. This assumes that long long * is at least 64 bits. */ static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62); - time_t min_time, t; + time_t min_time; + volatile time_t t; extract_reference_file(reffile); -- 1.7.10 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
