From 9de9351b285924558248cdb370c5fda58cfe2dfe77969ca6c949049dd85f4af2 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 16 Oct 2013 18:42:10 +0000 Subject: [PATCH 1/7] Accepting request 203465 from home:mvyskocil - Use gzipped archive to prevent a build cycle on older targets * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html - Add a signature and keyring file for source verification * not enable in spec due bootstrapping issues OBS-URL: https://build.opensuse.org/request/show/203465 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=56 --- xz-5.0.5.tar.gz | 3 +++ xz-5.0.5.tar.gz.sig | Bin 0 -> 543 bytes xz-5.0.5.tar.xz | 3 --- xz.changes | 8 +++++++ xz.keyring | 56 ++++++++++++++++++++++++++++++++++++++++++++ xz.spec | 6 ++++- 6 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 xz-5.0.5.tar.gz create mode 100644 xz-5.0.5.tar.gz.sig delete mode 100644 xz-5.0.5.tar.xz create mode 100644 xz.keyring diff --git a/xz-5.0.5.tar.gz b/xz-5.0.5.tar.gz new file mode 100644 index 0000000..2a7bf41 --- /dev/null +++ b/xz-5.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a +size 1305685 diff --git a/xz-5.0.5.tar.gz.sig b/xz-5.0.5.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..094e7128191f4eaca031de9b98ab3fa65adf6e6ea405e389db94870e962197e2 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-mfU%CJa2@p8$b$w|VMj%1n5C2L}jNw>za_(+$nX-fU zVH)Y%og?3HOL0i6NU-^L`5#Za=u6I?6rLo1F%dSTO~3&K+Mec)Mv0#}pDBG9(_t&Y z^b3DSLE>%*j;s5L+@7x|Z)u#;S`sH}frjkUoZ+-)f#+v)B z1ly$y$rfWGX(L*&hmq$7?gkh0Ro`eoo*nf2J-!es`Y?O&^bKWwYys)>AHsp3-oWu6 zVJLm4OZm#u_W zCWCMH&R8D`YHK#`>ERH$4h*j3{1sCL|I2RrGDoSneuxSv5SyMp&0M2PGQQm$cI4SS}?MAROk^Ea7xw*kCl8ziw_wTdLvPo~NOysTmzZat5)i zdeF6Ze_L@}1_~rjh$BiL`)CClv$yJ_4_xEV>dsGE&o4M*IcSwHjIyKM)1cqRbB+4v h1oUZ1719JN03vR_Fc(ezL-Ln7RXgp=(%wWF*YOXe2?_uJ literal 0 HcmV?d00001 diff --git a/xz-5.0.5.tar.xz b/xz-5.0.5.tar.xz deleted file mode 100644 index 58634d2..0000000 --- a/xz-5.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3515c74d170d0f6ec00820de63106ad16c07bae55a59c174b4741242c76264a4 -size 928700 diff --git a/xz.changes b/xz.changes index 7676a3b..d4e115b 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 16 08:53:16 UTC 2013 - mvyskocil@suse.com + +- Use gzipped archive to prevent a build cycle on older targets + * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html +- Add a signature and keyring file for source verification + * not enable in spec due bootstrapping issues + ------------------------------------------------------------------- Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com diff --git a/xz.keyring b/xz.keyring new file mode 100644 index 0000000..7e82196 --- /dev/null +++ b/xz.keyring @@ -0,0 +1,56 @@ +pub 4096R/69184620 2010-10-24 +uid Lasse Collin +sub 4096R/58ADF744 2010-10-24 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +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 +wOSlnSuT +=u8YC +-----END PGP PUBLIC KEY BLOCK----- diff --git a/xz.spec b/xz.spec index 9f0a347..62e1c7e 100644 --- a/xz.spec +++ b/xz.spec @@ -23,8 +23,10 @@ Group: Productivity/Archiving/Compression Version: 5.0.5 Release: 0 Url: http://tukaani.org/lzma/ -Source: http://tukaani.org/xz/%{name}-%{version}.tar.xz +Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz +Source1: http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig Source2: baselibs.conf +Source3: xz.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig Provides: lzma = %version @@ -117,11 +119,13 @@ make install DESTDIR=$RPM_BUILD_ROOT %if 0%{?lang_package:1} > 0 %files lang -f %{name}.lang +%defattr(-, root, root) %files %else %files -f %{name}.lang +%defattr(-, root, root) %endif %defattr(-, root, root) %_docdir/%name From 9daea59c7a378178240229973a3eaa0e94e44504135fd90a8787b0904e9d8bc1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 25 Nov 2013 12:16:47 +0000 Subject: [PATCH 2/7] merge from Archiving/xz OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=57 --- baselibs.conf | 4 - project.diff | 113 +++++++++++++ xz-5.0.5.tar.bz2 | 3 + xz-5.0.5.tar.bz2.sig | Bin 0 -> 543 bytes xz-5.0.5.tar.gz | 3 - xz-5.0.5.tar.gz.sig | Bin 543 -> 0 bytes xz.changes | 367 ------------------------------------------- xz.keyring | 6 +- xz.spec | 146 ----------------- 9 files changed, 117 insertions(+), 525 deletions(-) delete mode 100644 baselibs.conf create mode 100644 project.diff create mode 100644 xz-5.0.5.tar.bz2 create mode 100644 xz-5.0.5.tar.bz2.sig delete mode 100644 xz-5.0.5.tar.gz delete mode 100644 xz-5.0.5.tar.gz.sig delete mode 100644 xz.changes delete mode 100644 xz.spec diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index d240a68..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,4 +0,0 @@ -liblzma5 -xz-devel - requires -xz- - requires "liblzma5- = " diff --git a/project.diff b/project.diff new file mode 100644 index 0000000..789cecc --- /dev/null +++ b/project.diff @@ -0,0 +1,113 @@ +--- xz.changes.orig ++++ xz.changes +@@ -1,4 +1,11 @@ + ------------------------------------------------------------------- ++Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de ++ ++- verify source signature ++- add optional -static library package, intended to publish pixz for ++ CentOS / RHEL, default off ++ ++------------------------------------------------------------------- + Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com + + - Update to version 5.0.5 +@@ -55,6 +62,11 @@ Fri Jul 6 10:18:06 UTC 2012 - sweet_f_a + - correct license "LGPL-2.1+ and GPL-2.0+" (bnc#770195) + + ------------------------------------------------------------------- ++Mon May 7 08:30:57 UTC 2012 - werner@suse.de ++ ++- Enforce usage of reentrant versions of libc functions ++ ++------------------------------------------------------------------- + Sun Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org + + - Put libraries back in %{_libdir}, /usr merge project. +--- xz.spec.orig ++++ xz.spec +@@ -16,15 +16,25 @@ + # + + ++%if 0%{?centos_version} || 0%{?rhel_version} ++%if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600} ++%bcond_without static_libs ++%endif ++%else ++%bcond_with static_libs ++%endif ++ + Name: xz + Summary: A Program for Compressing Files + License: LGPL-2.1+ and GPL-2.0+ + Group: Productivity/Archiving/Compression + Version: 5.0.5 + Release: 0 +-Url: http://tukaani.org/lzma/ +-Source: http://tukaani.org/xz/%{name}-%{version}.tar.xz ++Url: http://tukaani.org/xz/ ++Source: http://tukaani.org/xz/%{name}-%{version}.tar.bz2 + Source2: baselibs.conf ++Source3: http://tukaani.org/xz/%{name}-%{version}.tar.bz2.sig ++Source4: http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring + BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: pkgconfig + Provides: lzma = %version +@@ -83,22 +93,43 @@ Obsoletes: lzma-alpha-devel < %vers + This package contains the header files and libraries needed for + compiling programs using the LZMA library. + ++%if %{with static_libs} ++%package static ++Summary: Static version of LZMA library ++Group: Development/Libraries/C and C++ ++Requires: lzma-devel = %version ++ ++%description static ++Static library for the LZMA library ++%endif ++ + %prep + %setup -q + + %build ++%global optflags %{optflags} -D_REENTRANT -pipe + %if %{do_profiling} + profiledir=$(mktemp -d) + trap "rm -rf $profiledir" EXIT + export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" + %endif +-%configure --disable-static --with-pic --docdir=%_docdir/%name ++%configure \ ++%if ! %{with static_libs} ++ --disable-static \ ++%endif ++ --with-pic \ ++ --docdir=%_docdir/%name + make %{?_smp_mflags} + %if %{do_profiling} + time make check + make clean + export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" +-%configure --disable-static --with-pic --docdir=%_docdir/%name ++%configure \ ++%if ! %{with static_libs} ++ --disable-static \ ++%endif ++ --with-pic \ ++ --docdir=%_docdir/%name + make %{?_smp_mflags} + %endif + +@@ -139,4 +170,10 @@ make install DESTDIR=$RPM_BUILD_ROOT + %{_libdir}/lib*.so + %{_libdir}/pkgconfig/*.pc + ++%if %{with static_libs} ++%files static ++%defattr(-, root, root) ++%{_libdir}/*.a ++%endif ++ + %changelog diff --git a/xz-5.0.5.tar.bz2 b/xz-5.0.5.tar.bz2 new file mode 100644 index 0000000..16adbf6 --- /dev/null +++ b/xz-5.0.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 +size 1060649 diff --git a/xz-5.0.5.tar.bz2.sig b/xz-5.0.5.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3aba2f092e327ac4c7e75038713cb48232a70cc06e7514a1d9d9e865e97aebce GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-mfU%3DZ2@p8$b$w|VMj-l#5CE!9yx~QFE>3?_#@|_W z+$pOtJSGfWa#==f4b2#GwFo1iYjxvd#8Qhl!k^YSw=ZmPlq8LsD6Eslr@oD3!Y!j& zX1;Aiy5}d&ffdFHyCElY%Qvph2pc*JtZ7;1G_7|p`;QOLfx}iYv9T6U@G@N4-Xp6h zf?Ru}ArW~}mn+%zGOfZDFrL$jFMa&z%I$Jlm59CFsXLwZO3qJf*LcIlWFUlz_&mWM zl1e<+$^HYaHYxdtxqMjdyi!P_Ak(KM3d>sH;=~1zeHHq6Ecz$>5z^MivE^xej8bNmA!jQrj?in=DL4NER zXX=<5#1s>zFt40H$%Z+9D^FM9 zUt*iAav*y}@zcx|eG9*I)RaFC&8C(xFjOnEQ0t_Ll_PpO)Mx)I>Xou$CZ(zDqx4`# znCE0Yu4vpFXCPy8dj^_%-%@bpb~Hf`_FnRORQyBp{GDg0ml_Okvr1;^yZNgYx=nZE ho@6s*%OL-|I1L879y0=4rqv~pN~*c`ucOc*kyUs0`fdOK literal 0 HcmV?d00001 diff --git a/xz-5.0.5.tar.gz b/xz-5.0.5.tar.gz deleted file mode 100644 index 2a7bf41..0000000 --- a/xz-5.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a -size 1305685 diff --git a/xz-5.0.5.tar.gz.sig b/xz-5.0.5.tar.gz.sig deleted file mode 100644 index 094e7128191f4eaca031de9b98ab3fa65adf6e6ea405e389db94870e962197e2..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-mfU%CJa2@p8$b$w|VMj%1n5C2L}jNw>za_(+$nX-fU zVH)Y%og?3HOL0i6NU-^L`5#Za=u6I?6rLo1F%dSTO~3&K+Mec)Mv0#}pDBG9(_t&Y z^b3DSLE>%*j;s5L+@7x|Z)u#;S`sH}frjkUoZ+-)f#+v)B z1ly$y$rfWGX(L*&hmq$7?gkh0Ro`eoo*nf2J-!es`Y?O&^bKWwYys)>AHsp3-oWu6 zVJLm4OZm#u_W zCWCMH&R8D`YHK#`>ERH$4h*j3{1sCL|I2RrGDoSneuxSv5SyMp&0M2PGQQm$cI4SS}?MAROk^Ea7xw*kCl8ziw_wTdLvPo~NOysTmzZat5)i zdeF6Ze_L@}1_~rjh$BiL`)CClv$yJ_4_xEV>dsGE&o4M*IcSwHjIyKM)1cqRbB+4v h1oUZ1719JN03vR_Fc(ezL-Ln7RXgp=(%wWF*YOXe2?_uJ diff --git a/xz.changes b/xz.changes deleted file mode 100644 index d4e115b..0000000 --- a/xz.changes +++ /dev/null @@ -1,367 +0,0 @@ -------------------------------------------------------------------- -Wed Oct 16 08:53:16 UTC 2013 - mvyskocil@suse.com - -- Use gzipped archive to prevent a build cycle on older targets - * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html -- Add a signature and keyring file for source verification - * not enable in spec due bootstrapping issues - -------------------------------------------------------------------- -Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com - -- Update to version 5.0.5 - * lzmadec and liblzma's lzma_alone_decoder(): Support decompressing - .lzma files that have less common settings in the headers - (dictionary size other than 2^n or 2^n + 2^(n-1), or uncompressed - size greater than 256 GiB). - * xz: - - Fixes and improvements to error handling. - - Various fixes to the man page. - * xzless: Fixed to work with "less" versions 448 and later - * xzgrep: Made -h an alias for --no-filename. - -------------------------------------------------------------------- -Tue Jan 29 17:28:51 UTC 2013 - guillaume@opensuse.org - -- Disable profiling for aarch64 arch - -------------------------------------------------------------------- -Tue Nov 27 11:10:13 UTC 2012 - sweet_f_a@gmx.de - -- Update to version 5.0.4 - * liblzma: - - Fix lzma_index_init(). It could crash if memory allocation - failed. - - Fix the possibility of an incorrect LZMA_BUF_ERROR when a BCJ - filter is used and the application only provides exactly as - much output space as is the uncompressed size of the file. - - Fix a bug in doc/examples_old/xz_pipe_decompress.c. It didn't - check if the last call to lzma_code() really returned - LZMA_STREAM_END, which made the program think that truncated - files are valid. - - New example programs in doc/examples (old programs are now in - doc/examples_old). These have more comments and more detailed - error handling. - * Fix "xz -lvv foo.xz". It could crash on some corrupted files. - * Fix output of "xz --robot -lv" and "xz --robot -lvv" which - incorrectly printed the filename also in the "foo (x/x)" format. - * Fix exit status of "xzdiff foo.xz bar.xz". - * Fix exit status of "xzgrep foo binary_file". - * Fix portability to EBCDIC systems. - * Fix a configure issue on AIX with the XL C compiler. See INSTALL - for details. - * Update French, German, Italian, and Polish translations - -------------------------------------------------------------------- -Sun Jul 29 17:52:57 UTC 2012 - jengelh@inai.de - -- Disable profiling on SPARC due to compiler bug [gcc #54121] - -------------------------------------------------------------------- -Fri Jul 6 10:18:06 UTC 2012 - sweet_f_a@gmx.de - -- correct license "LGPL-2.1+ and GPL-2.0+" (bnc#770195) - -------------------------------------------------------------------- -Sun Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org - -- Put libraries back in %{_libdir}, /usr merge project. - -------------------------------------------------------------------- -Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de - -- rewrite last broken arm portability changes - -------------------------------------------------------------------- -Fri Sep 30 20:31:59 UTC 2011 - crrodriguez@opensuse.org - -- Fix build in armv5el doesnt like profiling - -------------------------------------------------------------------- -Tue Sep 27 13:05:34 UTC 2011 - sweet_f_a@gmx.de - -- minor fixes of last portability changes: - * decouple do_profiling and lang_package again - * don't define do_factory, just use lang_package instead - * simplify files section - * do_profiling for some more systems - -------------------------------------------------------------------- -Mon Sep 26 15:59:51 UTC 2011 - coolo@suse.com - -- build on SLE_10 - -------------------------------------------------------------------- -Sat Sep 17 15:19:50 UTC 2011 - coolo@suse.com - -- remove _service, too fragile - -------------------------------------------------------------------- -Fri Sep 16 16:37:32 UTC 2011 - jengelh@medozas.de - -- Add xz-devel to baselibs -- Remove redundant sections - -------------------------------------------------------------------- -Tue Jun 14 18:04:53 CEST 2011 - dmueller@suse.de - -- add recommends xz-lang - -------------------------------------------------------------------- -Wed Jun 8 19:25:51 UTC 2011 - coolo@novell.com - -- Update to version 5.0.3 - * liblzma fixes: - - - A memory leak was fixed. - - - lzma_stream_buffer_encode() no longer creates an empty .xz - Block if encoding an empty buffer. Such an empty Block with - LZMA2 data would trigger a bug in 5.0.1 and older (see the - first bullet point in 5.0.2 notes). When releasing 5.0.2, - I thought that no encoder creates this kind of files but - I was wrong. - - - Validate function arguments better in a few functions. Most - importantly, specifying an unsupported integrity check to - lzma_stream_buffer_encode() no longer creates a corrupt .xz - file. Probably no application tries to do that, so this - shouldn't be a big problem in practice. - - - Document that lzma_block_buffer_encode(), - lzma_easy_buffer_encode(), lzma_stream_encoder(), and - lzma_stream_buffer_encode() may return LZMA_UNSUPPORTED_CHECK. - - - The return values of the _memusage() functions are now - documented better. - - * Fix command name detection in xzgrep. xzegrep and xzfgrep now - correctly use egrep and fgrep instead of grep. - - * French translation was added. - -------------------------------------------------------------------- -Thu Apr 7 20:43:05 UTC 2011 - crrodriguez@opensuse.org - -- Update to version 5.0.2 - * LZMA2 decompressor now correctly accepts LZMA2 streams with no - uncompressed data. Previously it considered them corrupt. The - bug can affect applications that use raw LZMA2 streams. It is - very unlikely to affect .xz files because no compressor creates - .xz files with empty LZMA2 streams. (Empty .xz files are a - different thing than empty LZMA2 streams.) - - * "xz --suffix=.foo filename.foo" now refuses to compress the - file due to it already having the suffix .foo. It was already - documented on the man page, but the code lacked the test. - - * "xzgrep -l foo bar.xz" works now. - - * Polish translation was added. - -------------------------------------------------------------------- -Fri Mar 4 17:54:21 UTC 2011 - crrodriguez@opensuse.org - -- Update to version 5.0.1 -* Fix --force on setuid/setgid/sticky and multi-hardlink files. -* Add alloc_size and malloc attributes to a few functions. -* Fix gzip and bzip2 support in xzdiff - -------------------------------------------------------------------- -Tue Dec 7 18:47:04 UTC 2010 - cristian.rodriguez@opensuse.org - -- Use compiler profile information, makes xz marginally faster - (around 1-2 secs) - -------------------------------------------------------------------- -Sat Oct 30 20:17:49 UTC 2010 - jengelh@medozas.de - -- Use %_smp_mflags - -------------------------------------------------------------------- -Thu Oct 28 09:18:47 UTC 2010 - coolo@novell.com - -- adapt baselibs.conf - -------------------------------------------------------------------- -Wed Oct 27 00:28:26 UTC 2010 - cristian.rodriguez@opensuse.org - -- Update to 5.0.0 final - * The major soname has been bumped to 5.0.0. liblzma API and ABI - are now stable. - * The memory usage limit is now disabled by default - * Added support for XZ_DEFAULTS environment variable - * The compression settings associated with the preset levels - have been changed,they are now less likely to make compression worse. - * Support for "xz --list" was added - -------------------------------------------------------------------- -Sat Apr 24 11:38:25 UTC 2010 - coolo@novell.com - -- buildrequire pkg-config to fix provides - -------------------------------------------------------------------- -Sat Dec 12 18:40:53 CET 2009 - jengelh@medozas.de - -- add baselibs.conf as a source - -------------------------------------------------------------------- -Fri Sep 4 11:53:41 CEST 2009 - coolo@novell.com - -- update to 4.999.9beta - * only some polishment above the git snapshot I took - -------------------------------------------------------------------- -Sun Aug 23 14:50:09 CEST 2009 - coolo@novell.com - -- borrow %check section from fedora spec - -------------------------------------------------------------------- -Thu Aug 20 15:51:47 CEST 2009 - coolo@novell.com - -- update to latest git (5.0 still not released) - * a xz man page (bnc#505969) - * fix data corruption in LZ/LZMA2 encoder. - * major documentation update - * install lzdiff, lzgrep, and lzmore as symlinks - * make the default memory usage limit 40 % of RAM for both - compressing and decompressing. - * fixed a crash in liblzma - See git://ctrl.tukaani.org/xz.git for more - -------------------------------------------------------------------- -Sun Jun 7 19:39:45 CEST 2009 - crrodriguez@suse.de - -- remove static libraries, see bnc#509945 for details - -------------------------------------------------------------------- -Sun Feb 22 18:37:26 CET 2009 - ro@suse.de - -- added baselibs.conf (for rpm-32bit) - -------------------------------------------------------------------- -Mon Feb 16 10:59:51 CET 2009 - coolo@suse.de - -- use bzip payload, so users are able to install new rpm on old systems - -------------------------------------------------------------------- -Wed Feb 11 12:44:41 CET 2009 - coolo@suse.de - -- fix devel symlink - -------------------------------------------------------------------- -Fri Feb 6 13:50:53 CET 2009 - schwab@suse.de - -- Update to xz-4.999.8beta. - See git://ctrl.tukaani.org/lzma-utils.git. - -------------------------------------------------------------------- -Wed Jan 7 10:26:30 CET 2009 - schwab@suse.de - -- Update to xz-4.999.7beta. - See git://ctrl.tukaani.org/lzma-utils.git. -- Rename to xz. - -------------------------------------------------------------------- -Wed Jul 30 13:53:18 CEST 2008 - schwab@suse.de - -- Update to lzma-4.32.7. - * If "lzma -t" is run on a corrupt file or interrupted by a signal, - don't unlink /dev/null. - - * Partial fix to race conditions where a signal could make lzma to - unlink both the source and destination files. Now it cannot lose - data anymore, but with bad luck an incomplete file may be left - on the disk. - -------------------------------------------------------------------- -Wed May 14 22:04:25 CEST 2008 - schwab@suse.de - -- Update to lzma-4.32.6. - * Always use 32-bit integer to hold probability variables. Earlier, - these were 64-bit on 64-bit architectures, which hurt cache - efficiency in the CPU, and thus performance of LZMA. 32-bit - architectures are not affected by this change. - * Fix a theoretical data corruption bug in the LZMA encoder. It is - about overflowing a 32-bit integer, whose typical value stays below - five. I don't know if it is actually possible to construct to a file - that could make it overflow. Even if it were possible, it would "only" - make the output file corrupt so that it is 4 GiB too small; there - are no other security risks. Now the integer is 64-bit to be sure - it won't overflow. - * Add support for copying timestamps on operating systems that support - setting timestamps only by filename, not by file descriptor. - * Several portability fixes were made. - -------------------------------------------------------------------- -Fri May 9 11:51:42 CEST 2008 - schwab@suse.de - -- Revert last changes. - -------------------------------------------------------------------- -Tue May 6 22:36:09 CEST 2008 - bk@suse.de - -- ci removed #neededforbuild while mbuild converts to BuildRequires -- bzip2 source to save space (not lzma, so it can be built in <11.0) - -------------------------------------------------------------------- -Tue May 6 14:24:02 CEST 2008 - bk@suse.de - -- run the package-provided self-test by adding a call to 'make check' -- use %configure instead of equivalent configure call with options -- improved to allow building in SLES and non-SUSE repositories, eg: - - replace obsolete nostatic patch with check for static objects - - use more generic wildcards in the file list for manual pages - -------------------------------------------------------------------- -Mon Feb 4 19:20:31 CET 2008 - schwab@suse.de - -- Fix installation. - -------------------------------------------------------------------- -Mon Feb 4 13:32:06 CET 2008 - schwab@suse.de - -- Update to lzma-4.32.5. - * The percentage shown when --verbose is used, works again. Also some - typos were fixed from the messages printed by --verbose. - * Several small portability fixes were made. - -------------------------------------------------------------------- -Fri Jan 4 07:12:26 CET 2008 - crrodriguez@suse.de - -- Version 4.32.4 - * Ignore command line switch --format=alone. This way current scripts - can be written so that they will produce LZMA_Alone format files - even with the new command line tool once it is finishes along with - liblzma. - * The command line tool now tells if the user tries to decode files - in the new .lzma format. The message recommends upgrading to newer - LZMA Utils. - * Added some internal consistency checks to liblzmadec, so that it - doesn't crash if given lzmadec_stream whose initialization failed. - Some applications using zlib and libbzip2 don't check if - initialization was successful, and expect that error gets caught - safely later. -- disable static libraries -- remove liblzmadec.la that has empty dependency_libs -- do not link utils statically - -------------------------------------------------------------------- -Mon Dec 3 14:12:12 CET 2007 - dmueller@suse.de - -- update to 4.32.3: - * rare file content loss bugs fixed (did not check for error upon close()) - * permissions copying fixed -- testsuited switched partially to GPLv3 -- fix library package name - -------------------------------------------------------------------- -Thu Oct 11 14:52:41 CEST 2007 - schwab@suse.de - -- Fix missing include. - -------------------------------------------------------------------- -Wed Oct 10 14:56:31 CEST 2007 - schwab@suse.de - -- Initial version 4.32.0beta5. - diff --git a/xz.keyring b/xz.keyring index 7e82196..0d6f4c0 100644 --- a/xz.keyring +++ b/xz.keyring @@ -1,9 +1,5 @@ -pub 4096R/69184620 2010-10-24 -uid Lasse Collin -sub 4096R/58ADF744 2010-10-24 - -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI diff --git a/xz.spec b/xz.spec deleted file mode 100644 index 62e1c7e..0000000 --- a/xz.spec +++ /dev/null @@ -1,146 +0,0 @@ -# -# spec file for package xz -# -# Copyright (c) 2013 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: xz -Summary: A Program for Compressing Files -License: LGPL-2.1+ and GPL-2.0+ -Group: Productivity/Archiving/Compression -Version: 5.0.5 -Release: 0 -Url: http://tukaani.org/lzma/ -Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz -Source1: http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig -Source2: baselibs.conf -Source3: xz.keyring -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig -Provides: lzma = %version -Obsoletes: lzma < %version - -%if 0%{?suse_version} < 1130 -%define do_profiling 0 -%endif -%ifarch aarch64 %{arm} %sparc -%define do_profiling 0 -%endif - -%if 0%{?lang_package:1} > 0 -Recommends: %name-lang -%endif -# avoid bootstrapping problem -%define _binary_payload w9.bzdio - -%description -The xz command is a very powerful program for compressing files. - -* Average compression ratio of LZMA is about 30% better than that of - gzip, and 15% better than that of bzip2. - -* Decompression speed is only little slower than that of gzip, being - two to five times faster than bzip2. - -* In fast mode, compresses faster than bzip2 with a comparable - compression ratio. - -* Achieving the best compression ratios takes four to even twelve - times longer than with bzip2. However. this doesn't affect - decompressing speed. - -* Very similar command line interface to what gzip and bzip2 have. - -%{?lang_package} - -%package -n liblzma5 -Summary: LZMA library -Group: System/Libraries - -%description -n liblzma5 -Library for encoding/decoding LZMA files. - -%package devel -Summary: Development package for the LZMA library -Group: Development/Libraries/C and C++ -Requires: liblzma5 = %{version} -Provides: lzma-devel = %version -Obsoletes: lzma-devel < %version -Provides: lzma-alpha-devel = %version -Obsoletes: lzma-alpha-devel < %version - -%description devel -This package contains the header files and libraries needed for -compiling programs using the LZMA library. - -%prep -%setup -q - -%build -%if %{do_profiling} -profiledir=$(mktemp -d) -trap "rm -rf $profiledir" EXIT -export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" -%endif -%configure --disable-static --with-pic --docdir=%_docdir/%name -make %{?_smp_mflags} -%if %{do_profiling} -time make check -make clean -export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" -%configure --disable-static --with-pic --docdir=%_docdir/%name -make %{?_smp_mflags} -%endif - -%check -time make check - -%install -make install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -v %{buildroot}%{_libdir}/liblzma.la -%find_lang %{name} - -%post -n liblzma5 -p /sbin/ldconfig - -%postun -n liblzma5 -p /sbin/ldconfig - -%if 0%{?lang_package:1} > 0 - -%files lang -f %{name}.lang -%defattr(-, root, root) - -%files -%else - -%files -f %{name}.lang -%defattr(-, root, root) -%endif -%defattr(-, root, root) -%_docdir/%name -%{_bindir}/* -%{_mandir}/man?/* - -%files -n liblzma5 -%defattr(-, root, root) -%{_libdir}/lib*.so.5* - -%files devel -%defattr(-, root, root) -%{_includedir}/*.h -%{_includedir}/lzma -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/*.pc - -%changelog From 31c7e1136c0f90e8730cd45af13e16d6ae637dd803f7ed6f3395bbb9ab25be02 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 25 Nov 2013 12:17:20 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=58 --- project.diff | 113 --------------------------------------------------- 1 file changed, 113 deletions(-) delete mode 100644 project.diff diff --git a/project.diff b/project.diff deleted file mode 100644 index 789cecc..0000000 --- a/project.diff +++ /dev/null @@ -1,113 +0,0 @@ ---- xz.changes.orig -+++ xz.changes -@@ -1,4 +1,11 @@ - ------------------------------------------------------------------- -+Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de -+ -+- verify source signature -+- add optional -static library package, intended to publish pixz for -+ CentOS / RHEL, default off -+ -+------------------------------------------------------------------- - Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com - - - Update to version 5.0.5 -@@ -55,6 +62,11 @@ Fri Jul 6 10:18:06 UTC 2012 - sweet_f_a - - correct license "LGPL-2.1+ and GPL-2.0+" (bnc#770195) - - ------------------------------------------------------------------- -+Mon May 7 08:30:57 UTC 2012 - werner@suse.de -+ -+- Enforce usage of reentrant versions of libc functions -+ -+------------------------------------------------------------------- - Sun Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org - - - Put libraries back in %{_libdir}, /usr merge project. ---- xz.spec.orig -+++ xz.spec -@@ -16,15 +16,25 @@ - # - - -+%if 0%{?centos_version} || 0%{?rhel_version} -+%if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600} -+%bcond_without static_libs -+%endif -+%else -+%bcond_with static_libs -+%endif -+ - Name: xz - Summary: A Program for Compressing Files - License: LGPL-2.1+ and GPL-2.0+ - Group: Productivity/Archiving/Compression - Version: 5.0.5 - Release: 0 --Url: http://tukaani.org/lzma/ --Source: http://tukaani.org/xz/%{name}-%{version}.tar.xz -+Url: http://tukaani.org/xz/ -+Source: http://tukaani.org/xz/%{name}-%{version}.tar.bz2 - Source2: baselibs.conf -+Source3: http://tukaani.org/xz/%{name}-%{version}.tar.bz2.sig -+Source4: http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring - BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: pkgconfig - Provides: lzma = %version -@@ -83,22 +93,43 @@ Obsoletes: lzma-alpha-devel < %vers - This package contains the header files and libraries needed for - compiling programs using the LZMA library. - -+%if %{with static_libs} -+%package static -+Summary: Static version of LZMA library -+Group: Development/Libraries/C and C++ -+Requires: lzma-devel = %version -+ -+%description static -+Static library for the LZMA library -+%endif -+ - %prep - %setup -q - - %build -+%global optflags %{optflags} -D_REENTRANT -pipe - %if %{do_profiling} - profiledir=$(mktemp -d) - trap "rm -rf $profiledir" EXIT - export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" - %endif --%configure --disable-static --with-pic --docdir=%_docdir/%name -+%configure \ -+%if ! %{with static_libs} -+ --disable-static \ -+%endif -+ --with-pic \ -+ --docdir=%_docdir/%name - make %{?_smp_mflags} - %if %{do_profiling} - time make check - make clean - export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" --%configure --disable-static --with-pic --docdir=%_docdir/%name -+%configure \ -+%if ! %{with static_libs} -+ --disable-static \ -+%endif -+ --with-pic \ -+ --docdir=%_docdir/%name - make %{?_smp_mflags} - %endif - -@@ -139,4 +170,10 @@ make install DESTDIR=$RPM_BUILD_ROOT - %{_libdir}/lib*.so - %{_libdir}/pkgconfig/*.pc - -+%if %{with static_libs} -+%files static -+%defattr(-, root, root) -+%{_libdir}/*.a -+%endif -+ - %changelog From 82f1443dfb733a139287afb77cfcf6c0bb577d9355c0f07f1fd1bb30fc7bc957 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 25 Nov 2013 12:18:05 +0000 Subject: [PATCH 4/7] - Use gzipped archive to prevent a build cycle on older targets * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html - Add a signature and keyring file for source verification * not enable in spec due bootstrapping issues - Update to version 5.0.5 * lzmadec and liblzma's lzma_alone_decoder(): Support decompressing .lzma files that have less common settings in the headers (dictionary size other than 2^n or 2^n + 2^(n-1), or uncompressed size greater than 256 GiB). * xz: - Fixes and improvements to error handling. - Various fixes to the man page. * xzless: Fixed to work with "less" versions 448 and later * xzgrep: Made -h an alias for --no-filename. - Disable profiling for aarch64 arch - Update to version 5.0.4 * liblzma: - Fix lzma_index_init(). It could crash if memory allocation failed. - Fix the possibility of an incorrect LZMA_BUF_ERROR when a BCJ filter is used and the application only provides exactly as much output space as is the uncompressed size of the file. - Fix a bug in doc/examples_old/xz_pipe_decompress.c. It didn't check if the last call to lzma_code() really returned LZMA_STREAM_END, which made the program think that truncated files are valid. - New example programs in doc/examples (old programs are now in OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=59 --- baselibs.conf | 4 + xz-5.0.5.tar.gz | 3 + xz-5.0.5.tar.gz.sig | Bin 0 -> 543 bytes xz.changes | 367 ++++++++++++++++++++++++++++++++++++++++++++ xz.keyring | 6 +- xz.spec | 146 ++++++++++++++++++ 6 files changed, 525 insertions(+), 1 deletion(-) create mode 100644 baselibs.conf create mode 100644 xz-5.0.5.tar.gz create mode 100644 xz-5.0.5.tar.gz.sig create mode 100644 xz.changes create mode 100644 xz.spec diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..d240a68 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,4 @@ +liblzma5 +xz-devel + requires -xz- + requires "liblzma5- = " diff --git a/xz-5.0.5.tar.gz b/xz-5.0.5.tar.gz new file mode 100644 index 0000000..2a7bf41 --- /dev/null +++ b/xz-5.0.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a +size 1305685 diff --git a/xz-5.0.5.tar.gz.sig b/xz-5.0.5.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..094e7128191f4eaca031de9b98ab3fa65adf6e6ea405e389db94870e962197e2 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-mfU%CJa2@p8$b$w|VMj%1n5C2L}jNw>za_(+$nX-fU zVH)Y%og?3HOL0i6NU-^L`5#Za=u6I?6rLo1F%dSTO~3&K+Mec)Mv0#}pDBG9(_t&Y z^b3DSLE>%*j;s5L+@7x|Z)u#;S`sH}frjkUoZ+-)f#+v)B z1ly$y$rfWGX(L*&hmq$7?gkh0Ro`eoo*nf2J-!es`Y?O&^bKWwYys)>AHsp3-oWu6 zVJLm4OZm#u_W zCWCMH&R8D`YHK#`>ERH$4h*j3{1sCL|I2RrGDoSneuxSv5SyMp&0M2PGQQm$cI4SS}?MAROk^Ea7xw*kCl8ziw_wTdLvPo~NOysTmzZat5)i zdeF6Ze_L@}1_~rjh$BiL`)CClv$yJ_4_xEV>dsGE&o4M*IcSwHjIyKM)1cqRbB+4v h1oUZ1719JN03vR_Fc(ezL-Ln7RXgp=(%wWF*YOXe2?_uJ literal 0 HcmV?d00001 diff --git a/xz.changes b/xz.changes new file mode 100644 index 0000000..d4e115b --- /dev/null +++ b/xz.changes @@ -0,0 +1,367 @@ +------------------------------------------------------------------- +Wed Oct 16 08:53:16 UTC 2013 - mvyskocil@suse.com + +- Use gzipped archive to prevent a build cycle on older targets + * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html +- Add a signature and keyring file for source verification + * not enable in spec due bootstrapping issues + +------------------------------------------------------------------- +Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com + +- Update to version 5.0.5 + * lzmadec and liblzma's lzma_alone_decoder(): Support decompressing + .lzma files that have less common settings in the headers + (dictionary size other than 2^n or 2^n + 2^(n-1), or uncompressed + size greater than 256 GiB). + * xz: + - Fixes and improvements to error handling. + - Various fixes to the man page. + * xzless: Fixed to work with "less" versions 448 and later + * xzgrep: Made -h an alias for --no-filename. + +------------------------------------------------------------------- +Tue Jan 29 17:28:51 UTC 2013 - guillaume@opensuse.org + +- Disable profiling for aarch64 arch + +------------------------------------------------------------------- +Tue Nov 27 11:10:13 UTC 2012 - sweet_f_a@gmx.de + +- Update to version 5.0.4 + * liblzma: + - Fix lzma_index_init(). It could crash if memory allocation + failed. + - Fix the possibility of an incorrect LZMA_BUF_ERROR when a BCJ + filter is used and the application only provides exactly as + much output space as is the uncompressed size of the file. + - Fix a bug in doc/examples_old/xz_pipe_decompress.c. It didn't + check if the last call to lzma_code() really returned + LZMA_STREAM_END, which made the program think that truncated + files are valid. + - New example programs in doc/examples (old programs are now in + doc/examples_old). These have more comments and more detailed + error handling. + * Fix "xz -lvv foo.xz". It could crash on some corrupted files. + * Fix output of "xz --robot -lv" and "xz --robot -lvv" which + incorrectly printed the filename also in the "foo (x/x)" format. + * Fix exit status of "xzdiff foo.xz bar.xz". + * Fix exit status of "xzgrep foo binary_file". + * Fix portability to EBCDIC systems. + * Fix a configure issue on AIX with the XL C compiler. See INSTALL + for details. + * Update French, German, Italian, and Polish translations + +------------------------------------------------------------------- +Sun Jul 29 17:52:57 UTC 2012 - jengelh@inai.de + +- Disable profiling on SPARC due to compiler bug [gcc #54121] + +------------------------------------------------------------------- +Fri Jul 6 10:18:06 UTC 2012 - sweet_f_a@gmx.de + +- correct license "LGPL-2.1+ and GPL-2.0+" (bnc#770195) + +------------------------------------------------------------------- +Sun Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org + +- Put libraries back in %{_libdir}, /usr merge project. + +------------------------------------------------------------------- +Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de + +- rewrite last broken arm portability changes + +------------------------------------------------------------------- +Fri Sep 30 20:31:59 UTC 2011 - crrodriguez@opensuse.org + +- Fix build in armv5el doesnt like profiling + +------------------------------------------------------------------- +Tue Sep 27 13:05:34 UTC 2011 - sweet_f_a@gmx.de + +- minor fixes of last portability changes: + * decouple do_profiling and lang_package again + * don't define do_factory, just use lang_package instead + * simplify files section + * do_profiling for some more systems + +------------------------------------------------------------------- +Mon Sep 26 15:59:51 UTC 2011 - coolo@suse.com + +- build on SLE_10 + +------------------------------------------------------------------- +Sat Sep 17 15:19:50 UTC 2011 - coolo@suse.com + +- remove _service, too fragile + +------------------------------------------------------------------- +Fri Sep 16 16:37:32 UTC 2011 - jengelh@medozas.de + +- Add xz-devel to baselibs +- Remove redundant sections + +------------------------------------------------------------------- +Tue Jun 14 18:04:53 CEST 2011 - dmueller@suse.de + +- add recommends xz-lang + +------------------------------------------------------------------- +Wed Jun 8 19:25:51 UTC 2011 - coolo@novell.com + +- Update to version 5.0.3 + * liblzma fixes: + + - A memory leak was fixed. + + - lzma_stream_buffer_encode() no longer creates an empty .xz + Block if encoding an empty buffer. Such an empty Block with + LZMA2 data would trigger a bug in 5.0.1 and older (see the + first bullet point in 5.0.2 notes). When releasing 5.0.2, + I thought that no encoder creates this kind of files but + I was wrong. + + - Validate function arguments better in a few functions. Most + importantly, specifying an unsupported integrity check to + lzma_stream_buffer_encode() no longer creates a corrupt .xz + file. Probably no application tries to do that, so this + shouldn't be a big problem in practice. + + - Document that lzma_block_buffer_encode(), + lzma_easy_buffer_encode(), lzma_stream_encoder(), and + lzma_stream_buffer_encode() may return LZMA_UNSUPPORTED_CHECK. + + - The return values of the _memusage() functions are now + documented better. + + * Fix command name detection in xzgrep. xzegrep and xzfgrep now + correctly use egrep and fgrep instead of grep. + + * French translation was added. + +------------------------------------------------------------------- +Thu Apr 7 20:43:05 UTC 2011 - crrodriguez@opensuse.org + +- Update to version 5.0.2 + * LZMA2 decompressor now correctly accepts LZMA2 streams with no + uncompressed data. Previously it considered them corrupt. The + bug can affect applications that use raw LZMA2 streams. It is + very unlikely to affect .xz files because no compressor creates + .xz files with empty LZMA2 streams. (Empty .xz files are a + different thing than empty LZMA2 streams.) + + * "xz --suffix=.foo filename.foo" now refuses to compress the + file due to it already having the suffix .foo. It was already + documented on the man page, but the code lacked the test. + + * "xzgrep -l foo bar.xz" works now. + + * Polish translation was added. + +------------------------------------------------------------------- +Fri Mar 4 17:54:21 UTC 2011 - crrodriguez@opensuse.org + +- Update to version 5.0.1 +* Fix --force on setuid/setgid/sticky and multi-hardlink files. +* Add alloc_size and malloc attributes to a few functions. +* Fix gzip and bzip2 support in xzdiff + +------------------------------------------------------------------- +Tue Dec 7 18:47:04 UTC 2010 - cristian.rodriguez@opensuse.org + +- Use compiler profile information, makes xz marginally faster + (around 1-2 secs) + +------------------------------------------------------------------- +Sat Oct 30 20:17:49 UTC 2010 - jengelh@medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- +Thu Oct 28 09:18:47 UTC 2010 - coolo@novell.com + +- adapt baselibs.conf + +------------------------------------------------------------------- +Wed Oct 27 00:28:26 UTC 2010 - cristian.rodriguez@opensuse.org + +- Update to 5.0.0 final + * The major soname has been bumped to 5.0.0. liblzma API and ABI + are now stable. + * The memory usage limit is now disabled by default + * Added support for XZ_DEFAULTS environment variable + * The compression settings associated with the preset levels + have been changed,they are now less likely to make compression worse. + * Support for "xz --list" was added + +------------------------------------------------------------------- +Sat Apr 24 11:38:25 UTC 2010 - coolo@novell.com + +- buildrequire pkg-config to fix provides + +------------------------------------------------------------------- +Sat Dec 12 18:40:53 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Fri Sep 4 11:53:41 CEST 2009 - coolo@novell.com + +- update to 4.999.9beta + * only some polishment above the git snapshot I took + +------------------------------------------------------------------- +Sun Aug 23 14:50:09 CEST 2009 - coolo@novell.com + +- borrow %check section from fedora spec + +------------------------------------------------------------------- +Thu Aug 20 15:51:47 CEST 2009 - coolo@novell.com + +- update to latest git (5.0 still not released) + * a xz man page (bnc#505969) + * fix data corruption in LZ/LZMA2 encoder. + * major documentation update + * install lzdiff, lzgrep, and lzmore as symlinks + * make the default memory usage limit 40 % of RAM for both + compressing and decompressing. + * fixed a crash in liblzma + See git://ctrl.tukaani.org/xz.git for more + +------------------------------------------------------------------- +Sun Jun 7 19:39:45 CEST 2009 - crrodriguez@suse.de + +- remove static libraries, see bnc#509945 for details + +------------------------------------------------------------------- +Sun Feb 22 18:37:26 CET 2009 - ro@suse.de + +- added baselibs.conf (for rpm-32bit) + +------------------------------------------------------------------- +Mon Feb 16 10:59:51 CET 2009 - coolo@suse.de + +- use bzip payload, so users are able to install new rpm on old systems + +------------------------------------------------------------------- +Wed Feb 11 12:44:41 CET 2009 - coolo@suse.de + +- fix devel symlink + +------------------------------------------------------------------- +Fri Feb 6 13:50:53 CET 2009 - schwab@suse.de + +- Update to xz-4.999.8beta. + See git://ctrl.tukaani.org/lzma-utils.git. + +------------------------------------------------------------------- +Wed Jan 7 10:26:30 CET 2009 - schwab@suse.de + +- Update to xz-4.999.7beta. + See git://ctrl.tukaani.org/lzma-utils.git. +- Rename to xz. + +------------------------------------------------------------------- +Wed Jul 30 13:53:18 CEST 2008 - schwab@suse.de + +- Update to lzma-4.32.7. + * If "lzma -t" is run on a corrupt file or interrupted by a signal, + don't unlink /dev/null. + + * Partial fix to race conditions where a signal could make lzma to + unlink both the source and destination files. Now it cannot lose + data anymore, but with bad luck an incomplete file may be left + on the disk. + +------------------------------------------------------------------- +Wed May 14 22:04:25 CEST 2008 - schwab@suse.de + +- Update to lzma-4.32.6. + * Always use 32-bit integer to hold probability variables. Earlier, + these were 64-bit on 64-bit architectures, which hurt cache + efficiency in the CPU, and thus performance of LZMA. 32-bit + architectures are not affected by this change. + * Fix a theoretical data corruption bug in the LZMA encoder. It is + about overflowing a 32-bit integer, whose typical value stays below + five. I don't know if it is actually possible to construct to a file + that could make it overflow. Even if it were possible, it would "only" + make the output file corrupt so that it is 4 GiB too small; there + are no other security risks. Now the integer is 64-bit to be sure + it won't overflow. + * Add support for copying timestamps on operating systems that support + setting timestamps only by filename, not by file descriptor. + * Several portability fixes were made. + +------------------------------------------------------------------- +Fri May 9 11:51:42 CEST 2008 - schwab@suse.de + +- Revert last changes. + +------------------------------------------------------------------- +Tue May 6 22:36:09 CEST 2008 - bk@suse.de + +- ci removed #neededforbuild while mbuild converts to BuildRequires +- bzip2 source to save space (not lzma, so it can be built in <11.0) + +------------------------------------------------------------------- +Tue May 6 14:24:02 CEST 2008 - bk@suse.de + +- run the package-provided self-test by adding a call to 'make check' +- use %configure instead of equivalent configure call with options +- improved to allow building in SLES and non-SUSE repositories, eg: + - replace obsolete nostatic patch with check for static objects + - use more generic wildcards in the file list for manual pages + +------------------------------------------------------------------- +Mon Feb 4 19:20:31 CET 2008 - schwab@suse.de + +- Fix installation. + +------------------------------------------------------------------- +Mon Feb 4 13:32:06 CET 2008 - schwab@suse.de + +- Update to lzma-4.32.5. + * The percentage shown when --verbose is used, works again. Also some + typos were fixed from the messages printed by --verbose. + * Several small portability fixes were made. + +------------------------------------------------------------------- +Fri Jan 4 07:12:26 CET 2008 - crrodriguez@suse.de + +- Version 4.32.4 + * Ignore command line switch --format=alone. This way current scripts + can be written so that they will produce LZMA_Alone format files + even with the new command line tool once it is finishes along with + liblzma. + * The command line tool now tells if the user tries to decode files + in the new .lzma format. The message recommends upgrading to newer + LZMA Utils. + * Added some internal consistency checks to liblzmadec, so that it + doesn't crash if given lzmadec_stream whose initialization failed. + Some applications using zlib and libbzip2 don't check if + initialization was successful, and expect that error gets caught + safely later. +- disable static libraries +- remove liblzmadec.la that has empty dependency_libs +- do not link utils statically + +------------------------------------------------------------------- +Mon Dec 3 14:12:12 CET 2007 - dmueller@suse.de + +- update to 4.32.3: + * rare file content loss bugs fixed (did not check for error upon close()) + * permissions copying fixed +- testsuited switched partially to GPLv3 +- fix library package name + +------------------------------------------------------------------- +Thu Oct 11 14:52:41 CEST 2007 - schwab@suse.de + +- Fix missing include. + +------------------------------------------------------------------- +Wed Oct 10 14:56:31 CEST 2007 - schwab@suse.de + +- Initial version 4.32.0beta5. + diff --git a/xz.keyring b/xz.keyring index 0d6f4c0..7e82196 100644 --- a/xz.keyring +++ b/xz.keyring @@ -1,5 +1,9 @@ +pub 4096R/69184620 2010-10-24 +uid Lasse Collin +sub 4096R/58ADF744 2010-10-24 + -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI diff --git a/xz.spec b/xz.spec new file mode 100644 index 0000000..62e1c7e --- /dev/null +++ b/xz.spec @@ -0,0 +1,146 @@ +# +# spec file for package xz +# +# Copyright (c) 2013 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: xz +Summary: A Program for Compressing Files +License: LGPL-2.1+ and GPL-2.0+ +Group: Productivity/Archiving/Compression +Version: 5.0.5 +Release: 0 +Url: http://tukaani.org/lzma/ +Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz +Source1: http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig +Source2: baselibs.conf +Source3: xz.keyring +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +Provides: lzma = %version +Obsoletes: lzma < %version + +%if 0%{?suse_version} < 1130 +%define do_profiling 0 +%endif +%ifarch aarch64 %{arm} %sparc +%define do_profiling 0 +%endif + +%if 0%{?lang_package:1} > 0 +Recommends: %name-lang +%endif +# avoid bootstrapping problem +%define _binary_payload w9.bzdio + +%description +The xz command is a very powerful program for compressing files. + +* Average compression ratio of LZMA is about 30% better than that of + gzip, and 15% better than that of bzip2. + +* Decompression speed is only little slower than that of gzip, being + two to five times faster than bzip2. + +* In fast mode, compresses faster than bzip2 with a comparable + compression ratio. + +* Achieving the best compression ratios takes four to even twelve + times longer than with bzip2. However. this doesn't affect + decompressing speed. + +* Very similar command line interface to what gzip and bzip2 have. + +%{?lang_package} + +%package -n liblzma5 +Summary: LZMA library +Group: System/Libraries + +%description -n liblzma5 +Library for encoding/decoding LZMA files. + +%package devel +Summary: Development package for the LZMA library +Group: Development/Libraries/C and C++ +Requires: liblzma5 = %{version} +Provides: lzma-devel = %version +Obsoletes: lzma-devel < %version +Provides: lzma-alpha-devel = %version +Obsoletes: lzma-alpha-devel < %version + +%description devel +This package contains the header files and libraries needed for +compiling programs using the LZMA library. + +%prep +%setup -q + +%build +%if %{do_profiling} +profiledir=$(mktemp -d) +trap "rm -rf $profiledir" EXIT +export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" +%endif +%configure --disable-static --with-pic --docdir=%_docdir/%name +make %{?_smp_mflags} +%if %{do_profiling} +time make check +make clean +export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" +%configure --disable-static --with-pic --docdir=%_docdir/%name +make %{?_smp_mflags} +%endif + +%check +time make check + +%install +make install DESTDIR=$RPM_BUILD_ROOT +%{__rm} -v %{buildroot}%{_libdir}/liblzma.la +%find_lang %{name} + +%post -n liblzma5 -p /sbin/ldconfig + +%postun -n liblzma5 -p /sbin/ldconfig + +%if 0%{?lang_package:1} > 0 + +%files lang -f %{name}.lang +%defattr(-, root, root) + +%files +%else + +%files -f %{name}.lang +%defattr(-, root, root) +%endif +%defattr(-, root, root) +%_docdir/%name +%{_bindir}/* +%{_mandir}/man?/* + +%files -n liblzma5 +%defattr(-, root, root) +%{_libdir}/lib*.so.5* + +%files devel +%defattr(-, root, root) +%{_includedir}/*.h +%{_includedir}/lzma +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc + +%changelog From 43d70c1007a866e84470bcd0aa8efb57bba1c304791f5596fe8a96a467686386 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 25 Nov 2013 12:18:31 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=60 --- xz-5.0.5.tar.bz2 | 3 --- xz-5.0.5.tar.bz2.sig | Bin 543 -> 0 bytes 2 files changed, 3 deletions(-) delete mode 100644 xz-5.0.5.tar.bz2 delete mode 100644 xz-5.0.5.tar.bz2.sig diff --git a/xz-5.0.5.tar.bz2 b/xz-5.0.5.tar.bz2 deleted file mode 100644 index 16adbf6..0000000 --- a/xz-5.0.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490 -size 1060649 diff --git a/xz-5.0.5.tar.bz2.sig b/xz-5.0.5.tar.bz2.sig deleted file mode 100644 index 3aba2f092e327ac4c7e75038713cb48232a70cc06e7514a1d9d9e865e97aebce..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-mfU%3DZ2@p8$b$w|VMj-l#5CE!9yx~QFE>3?_#@|_W z+$pOtJSGfWa#==f4b2#GwFo1iYjxvd#8Qhl!k^YSw=ZmPlq8LsD6Eslr@oD3!Y!j& zX1;Aiy5}d&ffdFHyCElY%Qvph2pc*JtZ7;1G_7|p`;QOLfx}iYv9T6U@G@N4-Xp6h zf?Ru}ArW~}mn+%zGOfZDFrL$jFMa&z%I$Jlm59CFsXLwZO3qJf*LcIlWFUlz_&mWM zl1e<+$^HYaHYxdtxqMjdyi!P_Ak(KM3d>sH;=~1zeHHq6Ecz$>5z^MivE^xej8bNmA!jQrj?in=DL4NER zXX=<5#1s>zFt40H$%Z+9D^FM9 zUt*iAav*y}@zcx|eG9*I)RaFC&8C(xFjOnEQ0t_Ll_PpO)Mx)I>Xou$CZ(zDqx4`# znCE0Yu4vpFXCPy8dj^_%-%@bpb~Hf`_FnRORQyBp{GDg0ml_Okvr1;^yZNgYx=nZE ho@6s*%OL-|I1L879y0=4rqv~pN~*c`ucOc*kyUs0`fdOK From 9c36d606102f29dc6dbb8e3e4b55eb7fe93be9e8ec3ee6b1ece9316155642a61 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 25 Nov 2013 12:24:18 +0000 Subject: [PATCH 6/7] - add optional -static library package, intended to publish pixz for CentOS / RHEL, default off OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=61 --- xz.changes | 6 ++++++ xz.spec | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/xz.changes b/xz.changes index d4e115b..e5d8c2c 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de + +- add optional -static library package, intended to publish pixz for + CentOS / RHEL, default off + ------------------------------------------------------------------- Wed Oct 16 08:53:16 UTC 2013 - mvyskocil@suse.com diff --git a/xz.spec b/xz.spec index 62e1c7e..9f5c3fc 100644 --- a/xz.spec +++ b/xz.spec @@ -16,16 +16,25 @@ # +%if 0%{?centos_version} || 0%{?rhel_version} +%if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600} +%bcond_without static_libs +%endif +%else +%bcond_with static_libs +%endif + Name: xz Summary: A Program for Compressing Files License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Archiving/Compression Version: 5.0.5 Release: 0 -Url: http://tukaani.org/lzma/ +Url: http://tukaani.org/xz/ Source0: http://tukaani.org/xz/%{name}-%{version}.tar.gz Source1: http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig Source2: baselibs.conf +# from http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring Source3: xz.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig @@ -85,22 +94,43 @@ Obsoletes: lzma-alpha-devel < %version This package contains the header files and libraries needed for compiling programs using the LZMA library. +%if %{with static_libs} +%package static +Summary: Static version of LZMA library +Group: Development/Libraries/C and C++ +Requires: lzma-devel = %version + +%description static +Static library for the LZMA library +%endif + %prep %setup -q %build +%global optflags %{optflags} -D_REENTRANT -pipe %if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" %endif -%configure --disable-static --with-pic --docdir=%_docdir/%name +%configure \ +%if ! %{with static_libs} + --disable-static \ +%endif + --with-pic \ + --docdir=%_docdir/%name make %{?_smp_mflags} %if %{do_profiling} time make check make clean export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" -%configure --disable-static --with-pic --docdir=%_docdir/%name +%configure \ +%if ! %{with static_libs} + --disable-static \ +%endif + --with-pic \ + --docdir=%_docdir/%name make %{?_smp_mflags} %endif @@ -143,4 +173,10 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc +%if %{with static_libs} +%files static +%defattr(-, root, root) +%{_libdir}/*.a +%endif + %changelog From 28c3a1dafb7fb90a29185f62cdaf96ac10c45f4948e95fc99340d43f4fbe8150 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 10 Dec 2013 17:06:54 +0000 Subject: [PATCH 7/7] - add optional -static-devel library package, intended to publish pixz for OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=62 --- xz.changes | 2 +- xz.spec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xz.changes b/xz.changes index e5d8c2c..1728c06 100644 --- a/xz.changes +++ b/xz.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de -- add optional -static library package, intended to publish pixz for +- add optional -static-devel library package, intended to publish pixz for CentOS / RHEL, default off ------------------------------------------------------------------- diff --git a/xz.spec b/xz.spec index 9f5c3fc..9103b70 100644 --- a/xz.spec +++ b/xz.spec @@ -95,12 +95,12 @@ This package contains the header files and libraries needed for compiling programs using the LZMA library. %if %{with static_libs} -%package static +%package static-devel Summary: Static version of LZMA library Group: Development/Libraries/C and C++ Requires: lzma-devel = %version -%description static +%description static-devel Static library for the LZMA library %endif @@ -126,7 +126,7 @@ time make check make clean export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" %configure \ -%if ! %{with static_libs} +%if %{without static_libs} --disable-static \ %endif --with-pic \ @@ -174,7 +174,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %if %{with static_libs} -%files static +%files static-devel %defattr(-, root, root) %{_libdir}/*.a %endif