Git log: commit 0147c4c37e9684acdeea8aec9ac08ffdfb790041
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Sep 10 14:36:35 2012 -0700
debian: prepare for upload
commit 6915c4e015d22fdc7dcf13699631b92e2a74feb5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Aug 18 02:54:54 2012 -0700
xz-utils/README.Debian: flesh out "differences from upstream"
In addition to updating the list of patches applied, also list patches
not applied to make the relationship to the upstream release
5.1.2alpha crystal clear.
commit bbb482e3f7511694719099a4656df7e7b3c5e97e
Merge: 42c2509 9d32a03
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Sep 10 14:22:33 2012 -0700
Merge branch 'jn/5.1.1alpha+20120614'
Recent changes from upstream, including a documentation update and
small correctness fix for the "minimal version to decode" field.
Thanks to Lasse Collin for advice about which patches to apply.
After these changes, the xz and liblzma API and ABI match 5.1.2alpha,
except that no features that were not already present in Debian sid
have been added.
commit 42c25096d90922c1d5f789fc778a15a99146b2a1
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jul 4 16:18:05 2012 -0500
xz-utils/README.Debian: Document patches
End-users and distributors might wonder how a stable release is made
out of an alpha release and how the packaged code differs from the
original code.
Briefly describe each patch in README.Debian to help such people,
imitating the gcc packaging. This information does not belong in the
package description because it is more relevant when using the package
than when deciding whether to install it. The package description
already mentions that threads are not supported.
Thanks to Andrew Pollock, Thorsten Glaser, and Lasse Collin for
advice.
commit 9d32a034611c8bcf126970a97b939ae349870065
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Jun 28 10:47:49 2012 +0300
liblzma: Check that the first byte of range encoded data is 0x00.
It is just to be more pedantic and thus perhaps catch broken
files slightly earlier.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 2f7b46d2c3dd4d89dcb922601ef4b1a85f89eb2e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Wed Jul 4 19:58:23 2012 +0300
xz: Fix the version number printed by xz -lvv.
The decoder bug was fixed in 5.0.2 instead of 5.0.3.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 68f4b3955403bb3bf67f9dcaceb1a31fe8f32005
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun Jul 1 18:44:33 2012 +0300
xz: Update the man page about the new field in --robot -lvv.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 5dd73e3cb7d9bc1be6af93f3d56073856d1c61ab
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Fri Jun 22 14:34:03 2012 +0300
xz: Update man page date to match the latest update.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 7bf0bc745a3f59cb82c5a2ba55fcaef86a2ab79c
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 15:05:59 2012 -0500
debian/symbols: bump to match new snapshot version
The snapshot from 20120528 was never uploaded to the archive. Use a
version listed in debian/changelog instead to make it easier for
packagers to understand what happened to warrant the symbols bump.
commit a35e01f5ccbbad21af8e82394c25ad1f8a309f9d
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 06:19:09 2012 -0500
debian: prepare for upload
commit fae574863bf0adebc76388663e66223d80bdac6a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 06:07:40 2012 -0500
debian/liblzma-dev: avoid linking static lib to libdl
To avoid breaking existing static libs built against liblzma2, let's
just unconditionally skip checking reserved fields past the
traditional end of the lzma_stream structure. Hopefully most
developers on Debian will test using the shared library by default.
We could have made this change by keying the behavior on __PIC__, but
that seems a little too tricky and inflexible (maybe some platform
uses PIC for ordinary static libraries) so instead we build the static
and shared libraries in separate configure runs.
One subtlety: because the Libs.private setting in the pkgconfig
metadata file is only valid in the static build, the static lib is
installed after the shared library.
commit e6bb16b7fb87a0953eb18bb11e92206172e725f7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 05:59:49 2012 -0500
debian/xzdec: configure --disable-liblzma2-compat
This just simplifies and shrinks xzdec and lzmadec a little.
commit 531fceb2f990896f2d43b174f218c31f92f3c47d
Merge: d468549 18a69a2
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 05:58:50 2012 -0500
Merge branch 'jn/abi'
Make the liblzma2-compat trickery more configurable, so we have the
option of turning it off for xzdec and the static lib if appropriate
to avoid a dependency on libdl.
* jn/abi:
liblzma: make dlopen()-based liblzma2 compatibility optional
commit 18a69a29003d00e171f98ee69170a47f41d4fb80
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 05:57:42 2012 -0500
liblzma: make dlopen()-based liblzma2 compatibility optional
Suppose I want to build a statically linked program:
gcc -static -o app app.c -lrpm -llzma
Suppose further that librpm.a was built against a pre-5.0 version of
liblzma so it does not allocate as much space for reserved fields at
the end of lzma_stream as the current API requires.
(This is a hypothetical scenario --- Debian librpm does not provide a
static library.)
If liblzma uses unpatched lzma_code() from XZ Utils >= 5.0, then
during calls to librpm that try to compress or decompress an
xz-compressed RPM, lzma_code’s reserved field checks will overflow the
buffer and segfault.
If liblzma uses the modified version of lzma_code() which asks libdl
if liblzma.so.2 is resident and refrains from checking reserved fields
past the end of the old lzma_stream struct when the answer is "yes",
the behavior is no better. The dynamic library liblzma.so.2 is _not_
resident, so lzma_code() dutifully reads reserved fields past the end
of the buffer --- segfault.
So the only safe behavior in the static library is to unconditionally
disable checks that might break for callers we want to continue to
support.
The new "./configure --enable-liblzma2-compat" option implements all
three sets of semantics:
- "./configure --disable-liblzma2-compat" means to check the full set
of reserved fields unconditionally. You can use this to check how
your application would behave with the unpatched library.
- "./configure --enable-liblzma2-compat=auto" means to skip checks of
reserved fields past the old end of struct lzma_stream when
liblzma.so.2 is resident. If a DSO built against liblzma2 shares
the process image, the ABI-incompatible checks are skipped for
safety, whereas in the usual case when no such DSO is resident, the
full set of checks is run to help application developers remember
to zero all reserved fields.
- "./configure --enable-liblzma2-compat" makes liblzma skip the
ABI-incompatible checks unconditionallty. You can use this if you
want your copy of liblzma to be usable by static libraries that
were built against the old library.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit d468549175654c31e8f3f846fe560e1e2add9acf
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 05:16:18 2012 -0500
debian/copyright: remove unwanted periods in formatted form
In Debian's machine-readable copyright format, the space between
paragraphs is indicated using a dot (.) preceded by a single space.
Some instances of this were changed to a dot preceded by two spaces
(which signifies a literal '.') by mistake when marking the paragraphs
around them as literal to avoid automatically rewrapping.
commit 5415947c77f63eba804b02df562819dac229b545
Merge: 9736036 f1675f7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 05:16:11 2012 -0500
Merge branch 'master' of http://git.tukaani.org/xz
Sync with upstream.
* 'master' of http://git.tukaani.org/xz:
Fix the top-level Makefile.am for the new example programs.
Docs: Add new example programs.
Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old.
Docs: Fix a bug in xz_pipe_decomp.c example program.
Translations: Update the French translation.
Translations: Update the German translation.
Translations: Update the German translation.
Translations: Update Polish translation.
commit 9736036fa25a992929f9e11f9f47be2cbab0ae7e
Merge: 0e4f720 c98ccde
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 04:46:39 2012 -0500
Merge branch 'jn/abi' (early part)
Bugfix for abi-liblzma2-compat.
* jn/abi (early part):
liblzma: add -ldl to Libs.private to support static linking again
commit c98ccdef182e9b970e3f8945154d39ae576a2272
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 16 02:44:02 2012 -0500
liblzma: add -ldl to Libs.private to support static linking again
Static linking using the flags suggested by pkg-config fails:
$ gcc -static -o xz_pipe_comp xz_pipe_comp.c \
$(pkg-config --static --cflags --libs liblzma)
/usr/lib/i386-linux-gnu/liblzma.a(liblzma_la-common.o): In function `lzma_strm_init':
(.text+0x32a): undefined reference to `dlopen'
Add -ldl to get that working again.
After this patch, gcc still warns:
Using 'dlopen' in statically linked applications requires at
runtime the shared libraries from the glibc version used for
linking
This particular use of 'dlopen' is not harmful because it is only
meant to check if liblzma.so.2 is already (dynamically) loaded. It is
also not useful in statically linked applications, but fixing that can
wait for another patch.
Reported-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit f1675f765fe228cb5a5f904f853445a03e33cfe9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Jun 14 20:15:30 2012 +0300
Fix the top-level Makefile.am for the new example programs.
commit 3a0c5378abefaf86aa39a62a7c9682bdb21568a1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Jun 14 10:52:33 2012 +0300
Docs: Add new example programs.
These have more comments than the old examples and
human-readable error messages. More tutorial-like examples
are needed but these are a start.
commit 1bd2c2c553e30c4a73cfb82abc6908efd6be6b8d
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Jun 14 10:33:27 2012 +0300
Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old.
It is good to keep these around to so that if someone has
copied the decompressor bug from xz_pipe_decomp.c he has
an example how to easily fix it.
commit 905f0ab5b5ce544d4b68a2ed6077df0f3d021292
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Jun 14 10:33:01 2012 +0300
Docs: Fix a bug in xz_pipe_decomp.c example program.
commit 4bd1a3bd5fdf4870b2f96dd0b8a21657c8a58ad8
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Wed May 30 23:14:33 2012 +0300
Translations: Update the French translation.
Thanks to Adrien Nader.
commit d2e836f2f3a87df6fe6bb0589b037db51205d910
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue May 29 23:42:37 2012 +0300
Translations: Update the German translation.
The previous only included the new strings in v5.0.
commit c9a16151577ba459afd6e3528df23bc0ddb95171
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue May 29 22:26:27 2012 +0300
Translations: Update the German translation.
commit 1530a74fd48f8493372edad137a24541efe24713
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue May 29 22:14:21 2012 +0300
Translations: Update Polish translation.
commit 0e4f720c6a99a073d0143c8eda52d6686f713e23
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 28 19:11:13 2012 -0500
Prepare for upload
commit 4c15e41a9c9b7b0feddd9afc86249f7d50a84b34
Merge: d76bab2 d8db706
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 28 19:10:53 2012 -0500
Merge branch 'master' of http://git.tukaani.org/xz
Sync with upstream. Addresses an important bug in liblzma that can
cause compression or decompression to error out without good reason.
* 'master' of http://git.tukaani.org/xz:
liblzma: Fix possibility of incorrect LZMA_BUF_ERROR.
Update THANKS.
xz: Don't show a huge number in -vv when memory limit is disabled.
xz: Document the "summary" lines of --robot -lvv.
xz: Fix output of verbose --robot --list modes.
Build: Upgrade m4/acx_pthread.m4 to the latest version.
commit d8db706acb8316f9861abd432cfbe001dd6d0c5c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon May 28 20:42:11 2012 +0300
liblzma: Fix possibility of incorrect LZMA_BUF_ERROR.
lzma_code() could incorrectly return LZMA_BUF_ERROR if
all of the following was true:
- The caller knows how many bytes of output to expect
and only provides that much output space.
- When the last output bytes are decoded, the
caller-provided input buffer ends right before
the LZMA2 end of payload marker. So LZMA2 won't
provide more output anymore, but it won't know it
yet and thus won't return LZMA_STREAM_END yet.
- A BCJ filter is in use and it hasn't left any
unfiltered bytes in the temp buffer. This can happen
with any BCJ filter, but in practice it's more likely
with filters other than the x86 BCJ.
Another situation where the bug can be triggered happens
if the uncompressed size is zero bytes and no output space
is provided. In this case the decompression can fail even
if the whole input file is given to lzma_code().
A similar bug was fixed in XZ Embedded on 2011-09-19.
commit 3f94b6d87f1b8f1c421ba548f8ebb83dca9c8cda
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon May 28 15:38:32 2012 +0300
Update THANKS.
commit 7769ea051d739a38a1640fd448cf5eb83cb119c6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon May 28 15:37:43 2012 +0300
xz: Don't show a huge number in -vv when memory limit is disabled.
commit ec921105725e4d3ef0a683dd83eee6f24ab60ccd
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun May 27 22:30:17 2012 +0300
xz: Document the "summary" lines of --robot -lvv.
This documents only the columns that are in v5.0.
The new columns added in the master branch aren't
necessarily stable yet.
commit 27d24eb0a9f6eed96d6a4594c2b0bf7a91d29f9a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun May 27 21:53:20 2012 +0300
xz: Fix output of verbose --robot --list modes.
It printed the filename in "filename (x/y)" format
which it obviously shouldn't do in robot mode.
commit ab25b82a91754d9388c89abddf806424671d9431
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu May 24 18:33:54 2012 +0300
Build: Upgrade m4/acx_pthread.m4 to the latest version.
commit d76bab287cb450d121b11278cc01feb2f7249256
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 17:19:59 2012 -0500
Prepare for upload
While at it, fix the format of the Date: line in
patches/abi-liblzma2-compat.
commit 50eba4d1fec143e87f9134b0ec08314bc49d79c4
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 05:01:36 2012 -0500
Clarify changelog
commit 3d0b97a60c445b824702c4acd954574c41d919f5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 02:03:35 2012 -0500
debian/rules build-indep: assume Build-Depends-Indep are present
Now that dpkg-buildpackage uses the build-arch target when present
instead of build, there is no more need to guard against a build
environment that tries to invoke build-indep without ensuring its
dependencies are available.
commit 2f51e0c41aa1272dffba505f51c032f32c38e61e
Merge: a7c448c 5b8c38d
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 01:52:48 2012 -0500
Merge branch 'jn/slibdir'
* jn/slibdir:
debian/liblzma: Move run-time library to /lib
Conflicts:
debian/changelog
debian/liblzma2.install
debian/rules
commit a7c448cc153a2e7aa72f3a3cc48a8444b8812246
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 01:37:50 2012 -0500
debian/rules: avoid unnecessary linkage against -lpthread and -lrt
Until the ABI stabilizes and it is time to re-enable threaded
encoding, linking against the system pthread and realtime libraries
just makes for needless complication and extra time spent loading the
library.
commit 52d48477f8596f70f159e2436be5b63d41f9e69b
Merge: 7ab2e6a d648e7e
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 01:15:43 2012 -0500
Merge branch 'jn/alternatives'
* jn/alternatives:
Provide LZMA Utils compatibility commands through the alternatives system
Conflicts:
debian/changelog
debian/xz-utils.README.Debian
commit 7ab2e6a4cafbe40ad944c6c803fd197afb6d9731
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Aug 28 17:37:00 2011 -0500
debian/rules: reorder rules for clarity
Move variable definitions used in dependencies to before the
override_dh_* rules. debian/rules has the following layout now:
Standard targets (build, install, etc)
Lists of files for use in dependencies
Targets used by standard targets (override_dh_*, etc)
Compilation flags and other variables
The get-orig-source target
In particular, this makes the third section (detailed rules to
configure, build, and install xz) easier to read straight through.
commit 323bb36f7c3af1f56f219b6eb67c183e4a2aa957
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Aug 17 09:09:51 2011 -0500
changelog.upstream.sh: use rev-list | diff-tree instead of git log
The developer’s Git installation might be set up to use --decorate by
default or to automatically abbreviate commit names. Use plumbing
commands whose output does not depend on configuration to avoid
gratuitous differences between the changelogs produced on different
machines.
Reported-by: Thorsten Glaser <tg@mirbsd.de>
commit e6769dbb06da8965a9a8d1c295aa8734221ad629
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Aug 16 19:45:23 2011 -0500
debian/rules: simplify DEB_BUILD_OPTIONS=nocheck handling
Use a double-colon rule again to decide whether to run tests. This
lets us get rid of the noop target from 0d22d82 (2011-08-16) and
should make the makefile a little easier to read.
commit eb19065145886adbd8c35d21be2b9dbfff951e64
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Aug 16 01:57:34 2011 -0500
debian/rules: use dpkg-buildflags to retrieve compilation flags
The intent is for this to be the standard interface for passing
hardening flags to the toolchain when building packages in
wheezy.
Fixes: http://bugs.debian.org/653739
commit bcc80d59d00b2e49cb5a153ff93d1bf415821835
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Aug 16 00:49:24 2011 -0500
Allow liblzma-dev to be installed for multiple architectures at once
This isn't part of the official plan for the early stages of multiarch
in Debian, but it already seems to work well.
Requested-by: Riku Voipio <riku.voipio@linaro.org>
commit 53a8fe26b8197efba55c382a386330f1fb3ad4c9
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 23:38:44 2012 -0500
debian/control: new Debian policy version
commit 9af4e21558a13a114dbac424a972beb64dfa60aa
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 23:36:12 2012 -0500
debian/copyright: follow machine-readable format more closely
Most notably:
Now that there is a stable URL for the copyright-format spec,
point to it.
Simplify the description of the dos/config.h license by removing
some extraneous details about the license of the Autoconf source
files it is derived from. (Since dos/config.h doesn't contain a
license notice, this brings us closer to verbatim.)
As Jakub Wilk pointed out on debian-devel
(<20120507122448.GA6510@jwilk.net>), viewers are expected to reflow
the License and Comments fields. Indent text that needs to be left
alone by one extra space.
Checked using “cme check dpkg-copyright”.
commit 1f6691e44ad05bf788ca5df52323d7b994f16189
Merge: b9cfc07 d05d6d6
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri May 18 01:13:07 2012 -0500
Merge branch 'master' of http://git.tukaani.org/xz
Sync with upstream.
* 'master' of http://git.tukaani.org/xz: (22 commits)
Update THANKS.
Docs: Cleanup line wrapping a bit.
Fix a few typos and add some missing articles in some documents.
Windows: Update notes about static linking with MSVC.
liblzma: Remove outdated comments.
DOS: Link against DJGPP's libemu to support FPU emulation.
liblzma: Fix Libs.private in liblzma.pc to include -lrt when needed.
Docs: Update MINIX 3 information in INSTALL.
Update THANKS.
Fix exit status of xzgrep when grepping binary files.
Update THANKS.
Fix compiling with IBM XL C on AIX.
Tests: Fix a compiler warning with _FORTIFY_SOURCE.
Docs: Explain the stable releases better in README.
xz: Show minimum required XZ Utils version in xz -lvv.
xz: Fix a typo in a comment.
Update THANKS.
xz: Fix xz on EBCDIC systems.
Update THANKS.
liblzma: Fix invalid free() in the threaded encoder.
...
Conflicts:
src/liblzma/common/outqueue.c
src/liblzma/common/stream_encoder_mt.c
commit b9cfc074ab5e4c56c1e90f6cd47329c9b785141c
Merge: 7c82c9a 8f925fe
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 20:25:48 2012 -0500
Merge branch 'jn/static'
* jn/static:
Do not let liblzma.a from xzdec-build clobber the real thing
commit 8f925feed7b437dada60ed4c8d72957d38f27fea
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 20:25:10 2012 -0500
Do not let liblzma.a from xzdec-build clobber the real thing
After commit 18be97e6 (Optimize xzdec, lzmadec for size, 2009-06-24),
the install target in debian/rules takes place in two stages: first
install tools from the normal build, then from the xzdec build. In
particular, after installing a perfectly good liblzma.a, we overwrite
it with the copy from the xzdec build with all encoders disabled ---
oops.
The fix is simple: let the install rule for xzdec run _before_ the
normal build.
Probably this wasn't noticed before because static linking on Debian
is not popular. The xz and lzmainfo commands, shared library, and
scripts are all disabled when building xzdec, so this problem only
affects the static library.
Reported-by: Anton Tolchanov <anton.tolchanov@gmail.com>
Fixes: http://bugs.debian.org/673001
commit 7c82c9ac43f1c7223e7b72190f3749911ba13a68
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 19:21:13 2012 -0500
Revert "debian/symbols: forbid use of unversioned lzma_code symbol"
This reverts commit a875d2722290adfd2943ab827f61b4f638e9e311.
No need to forbid use of the unversioned compatibility symbol, since
it has been removed (phew). As a side benefit, this means we don't
have to rely any more on the undocumented semantics of invalid package
names in symbols files.
Suggested-by: Jakub Wilk <jwilk@debian.org>
commit 0261638d8e939b147d6d564614cac2d602f34d5a
Merge: 85af804 d1695d7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 19:16:28 2012 -0500
Merge branch 'jn/abi'
* jn/abi:
liblzma: remove unversioned lzma_code@Base compatibility symbol
commit d1695d77580c92c8ee003e4721c3c8c98d709812
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 17 18:49:00 2012 -0500
liblzma: remove unversioned lzma_code@Base compatibility symbol
When liblzma started using ELF symbol versioning at the same time
as a soname bump (2 → 5) and a small increase in the reserved space at
the end of the lzma_stream structure checked by lzma_code, introducing
an unversioned compatibility symbol to ease the transition seemed like
a great idea. After all:
- most applications only use one version of the library (liblzma.so.2
or liblzma.so.5) and would obviously work fine
- applications linking to the new version of the library
(liblzma.so.5) should use the default, versioned lzma_code symbol so
errors initializing the reserved space can be noticed
- symbol versioning should ensure application/library mixtures
independently making use of both versions of the library also
work. Calls using the unversioned symbol names would be resolved
using the old symbol from liblzma.so.2 or the compatibility symbol
from liblzma.so.5, avoiding segfaults and spurious
LZMA_OPTIONS_ERROR errors.
- application/library mixtures using both versions of the library and
passing lzma_stream objects between the two would break, but that
was never supposed to be supported, anyway.
Three toolchain bugs dash that plan.
Current (2.22) versions of the gold linker cannot be used to build
libraries providing versioned and unversioned symbols with the same
name. On the other hand, BFD ld doesn't mind. So GNU gold refuses to
link versions of liblzma including the compatibility symbol (PR12261):
/usr/bin/ld: error: symbol lzma_code has undefined version
Annoying, but livable. liblzma with the compatibility symbol just
has to be built with BFD ld.
More importantly, gold does not support linking to libraries providing
versioned and unversioned symbols with the same name. If I link some
code to a version of liblzma with the compatibility symbol:
ld -o demo demo.o -llzma
then the documented behavior, implemented by BFD ld, is to interpret
calls to lzma_code as referring to the default version
(lzma_code@XZ_5.0). Current versions of GNU gold treat such calls as
referring to whichever symbol comes first in liblzma.so.5's symbol
table. If the unversioned symbol comes first (and in Debian liblzma5
5.1.1alpha+20110809-3 it does), GNU gold will mislink new applications
to use the unversioned compatibility symbol (PR13521):
$ ld.gold -o test.gold test.o -llzma
$ eu-readelf -s test.gold | grep lzma_code
1: 0000000000000000 0 FUNC GLOBAL DEFAULT UNDEF lzma_code
5: 0000000000000000 0 FUNC GLOBAL DEFAULT UNDEF lzma_code
There is no warning.
Worse, ld.so from glibc unpredictably will sometimes use the versioned
symbol to resolve references to the unversioned base version when both
are present (PR12977).
Clearly no one has been testing mixtures of versioned and
unversioned symbols at all, and we cannot trust the symbol resolution
process to do anything in particular for them.
This patch implements an alternative method to implement the same
compatibility goals described above.
- No more compatibility symbol. liblzma.so.5 will define lzma_code
only once, with version XZ_5.0.
- When initializing an lzma_stream object, use dlopen("liblzma.so.2",
RTLD_NOLOAD) to detect whether the caller might have been expecting
the old ABI, and store that information in the private
stream->internal->liblzma2_compat field.
- In lzma_code, when checking reserved fields, skip fields past the
old end of the lzma_stream structure ifying reserved fields if and
only if this->internal->liblzma2_compat is false.
That's it. Hopefully this time it will work reliably.
Thanks to Eduard Bloch for noticing PR13521 and to Ian Lance Taylor
for PR12977.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 5b8c38d291aca6eb5b458933197bc619f7c4760e
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun May 13 18:35:27 2012 -0500
debian/liblzma: Move run-time library to /lib
liblzma is used by systemd which runs before /usr is mounted.
For now, let's make this change in the Debian packaging instead of the
upstream rules to avoid having to worry about details like what
happens to the .la file.
Requested-by: Tollef Fog Heen <tfheen@debian.org>
commit d05d6d65c41a4bc83f162fa3d67c5d84e8751634
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu May 10 21:15:17 2012 +0300
Update THANKS.
commit e077391982f9f28dbfe542bba8800e7c5b916666
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu May 10 21:14:16 2012 +0300
Docs: Cleanup line wrapping a bit.
commit fc39849c350225c6a1cd7f6e6adff1020521eabc
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Tue Mar 13 22:04:04 2012 +0100
Fix a few typos and add some missing articles in some documents.
Also hyphenate several compound adjectives.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
commit 29fa0566d5df199cb9acb2d17bf7eea61acc7fa1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun Apr 29 11:51:25 2012 +0300
Windows: Update notes about static linking with MSVC.
commit aac1b31ea4e66cf5a7a8c116bdaa15aa45e6c56e
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Apr 19 15:25:26 2012 +0300
liblzma: Remove outdated comments.
commit df14a46013bea70c0bd35be7821b0b9108f97de7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Apr 19 14:17:52 2012 +0300
DOS: Link against DJGPP's libemu to support FPU emulation.
This way xz should work on 386SX and 486SX. Floating point
only is needed for verbose output in xz.
commit 03ed742a3a4931bb5c821357832083b26f577b13
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Apr 19 14:02:25 2012 +0300
liblzma: Fix Libs.private in liblzma.pc to include -lrt when needed.
commit 8c5b13ad59df70f49429bfdfd6ac120b8f892fda
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Apr 19 13:58:55 2012 +0300
Docs: Update MINIX 3 information in INSTALL.
commit c7376fc415a1566f38b2de4b516a17013d516a8b
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Wed Feb 22 14:23:13 2012 +0200
Update THANKS.
commit cff070aba6281ba743d29a62b8c0c66e5da4b2a6
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Wed Feb 22 14:02:34 2012 +0200
Fix exit status of xzgrep when grepping binary files.
When grepping binary files, grep may exit before it has
read all the input. In this case, gzip -q returns 2 (eating
SIGPIPE), but xz and bzip2 show SIGPIPE as the exit status
(e.g. 141). This causes wrong exit status when grepping
xz- or bzip2-compressed binary files.
The fix checks for the special exit status that indicates SIGPIPE.
It uses kill -l which should be supported everywhere since it
is in both SUSv2 (1997) and POSIX.1-2008.
Thanks to James Buren for the bug report.
commit 41cafb2bf9beea915710ee68f05fe929cd17759c
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Wed Feb 22 12:08:43 2012 +0200
Update THANKS.
commit 2dcea03712fa881930d69ec9eff70855c3d126d9
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Wed Feb 22 12:00:16 2012 +0200
Fix compiling with IBM XL C on AIX.
commit 7db6bdf4abcf524115be2cf5659ed540cef074c5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue Jan 10 17:13:03 2012 +0200
Tests: Fix a compiler warning with _FORTIFY_SOURCE.
Reported here:
http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385
commit 694952d545b6cf056547893ced69486eff9ece55
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon Dec 19 21:21:29 2011 +0200
Docs: Explain the stable releases better in README.
commit 418fe668b3c53a9a20020b6cc652aaf25c734b29
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon Nov 7 13:07:52 2011 +0200
xz: Show minimum required XZ Utils version in xz -lvv.
Man page wasn't updated yet.
commit 7081d82c37326bac97184e338345fa1c327e3580
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Fri Nov 4 17:57:16 2011 +0200
xz: Fix a typo in a comment.
Thanks to Bela Lubkin.
commit 232fe7cd70ad258d6a37f17e860e0f1b1891eeb5
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Nov 3 17:08:02 2011 +0200
Update THANKS.
commit 74d2bae4d3449c68453b0473dd3430ce91fd90c1
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Thu Nov 3 17:07:22 2011 +0200
xz: Fix xz on EBCDIC systems.
Thanks to Chris Donawa.
commit 4ac4923f47cc0ef97dd9ca5cfcc44fc53eeab34a
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun Oct 23 17:09:10 2011 +0300
Update THANKS.
commit ab50ae3ef40c81e5bf613905ca3fd636548b75e7
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun Oct 23 17:08:14 2011 +0300
liblzma: Fix invalid free() in the threaded encoder.
It was triggered if initialization failed e.g. due to
running out of memory.
Thanks to Arkadiusz Miskiewicz.
commit 6b620a0f0813d28c3c544b4ff8cb595b38a6e908
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Sun Oct 23 17:05:55 2011 +0300
liblzma: Fix a deadlock in the threaded encoder.
It was triggered when reinitializing the encoder,
e.g. when encoding two files.
commit 85af804469427b644a4a0806806396763b4328a8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu Oct 20 21:31:36 2011 -0500
debian/control: declare a build-time dependency on recent dpkg-gensymbols
The (symver) tag was introduced in dpkg 1.15.6
Suggested-by: Jakub Wilk <jwilk@debian.org>
commit 61556b0e0c25d37369f4131005d67a66a9361971
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu Oct 20 21:19:51 2011 -0500
debian/patches: squash abi-version-script-fixup into abi-version-script
A single patch per logical change is easier to review.
Requested-by: Jakub Wilk <jwilk@debian.org>
commit 000c7895c66a6ed4e0a6c9427deaf3cf97cb15da
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu Oct 20 21:17:22 2011 -0500
debian: correct lzma_code@Base rationale
debian/patches/abi-liblzma2-compat says:
| Applications linked directly to liblzma2 and indirectly to liblzma5 use
| the implementation from liblzma5
As Jakub Wilk explained, that doesn't seem to be the case. If a
program is linked to two versions of a library, one of which doesn't
use versioned symbols, then the symbols from the directly-linked one
shadow the indirectly-linked one.
Annoyingly, I noticed the same thing last year and then promptly
forgot about it. Luckily in cases where liblzma2 wins the right to
provide lzma_code(), that just means the lib checks a few fewer
reserved fields and the patch is not needed, and in cases where
liblzma5 wins, the patch works.
Reported-by: Jakub Wilk <jwilk@debian.org>
commit b0119dee5cec8a5dfdc9b9f216eb8c38c7473eab
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Oct 17 21:17:21 2011 -0500
Clarify changelog
Be less cryptic about the latest changes.
commit a875d2722290adfd2943ab827f61b4f638e9e311
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Oct 16 20:01:37 2011 -0500
debian/symbols: forbid use of unversioned lzma_code symbol
New apps built against liblzma-dev would be using lzma_code@XZ_5.1,
so any use of lzma_code@Base is a bug.
Use an invalid dependency for this, based on an idea by Modestas
Vainius from <http://bugs.debian.org/630344>. This way, attempts
to build a Debian package linking to the compatibility symbol
will be caught early.
dpkg-shlibdeps: warning: can't parse dependency liblzma_private_symbols
dpkg-shlibdeps: error: invalid dependency got generated: liblzma_private_symbols, libc6 (>= 2.4)
dh_shlibdeps: dpkg-shlibdeps -Tdebian/test-prog.substvars debian/test-prog/usr/bin/testme returned exit code 2
commit fa566a8e8256ec20c17e9f333bb0b3248b163fd0
Merge: 3e157d0 6e73e8b
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Oct 16 19:20:04 2011 -0500
Merge branch 'jn/abi'
* jn/abi:
liblzma: unlisted symbols are local
commit 6e73e8b7c83142e0c2502206df91576fac2369d3
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Oct 14 23:57:08 2011 -0500
liblzma: unlisted symbols are local
When commit 6c800e9 (liblzma: Remove XZ_5.1.1alpha version symbol,
2011-06-11) removed the XZ_5.1.1alpha node, the author forgot to
move its "local: *;" declaration to the XZ_5.0 node.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 3e157d02b72a92b755235dbe91bd2d69e5c5e3d9
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Oct 14 23:10:06 2011 -0500
Prepare for upload
commit 80b4914bb2d9f21e60c1d4e2e584eb7c1930da91
Merge: ff9265c e38a7e3
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Oct 14 23:08:27 2011 -0500
Merge branch 'jn/abi'
* jn/abi:
liblzma: define a base version of lzma_code for ABI-compatibility
commit e38a7e3039f3efab71663cfe97136e8bbc5f8ebf
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Oct 14 23:05:35 2011 -0500
liblzma: define a base version of lzma_code for ABI-compatibility
Generally speaking, it should be safe to have a process image
including both the pre-5.0 and v5.0 implementations of liblzma
(liblzma2 and liblzma5 in Debian), since the only changes in ABI were
to remove a function and to rearrange reserved fields which are not
used by most functions.
There is one function that does differ between the two ABIs, though:
lzma_code() checks that the reserved fields at the end of an
lzma_stream are all 0 before proceeding. Applications linked directly
to liblzma2 and indirectly to liblzma5 use the implementation from
liblzma5, which looks at more reserved fields than the application
knows to fill, resulting in segfaults or errors:
$ LD_PRELOAD=/usr/lib/x86_64-linux-gnu/liblzma.so.5 xz README
xz: README: Unsupported options
Unfortunately one cannot even get lucky and find the symbol from
liblzma2 used from time to time: versioned symbols take precedence
over unversioned ones when resolving unversioned references.
Fortunately the fix is clear: if we additionally bind a compatibility
version of lzma_code() to the unspecified base version of lzma_code,
_it_ will be used to resolve references from code linked to liblzma2
when liblzma2 and liblzma5 share a process image. Do so.
Caveat: libbfd-based binutils handles this well (and it is documented
to work), but GNU gold 2.21.90.20111004 errors out with
/usr/bin/ld: error: symbol lzma_code has undefined version
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit ff9265c9c4d2c27218f258a9ec2fd9d837370684
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Oct 14 21:15:31 2011 -0500
Match upstream ABI at last
It turns out that due to upstream's careful planning it is pretty safe
to have a process image containing both liblzma2 and liblzma5, since
the changes in struct layout are only in trailing fields that no
exported functions need to touch (and no one seems to rely on the size
of these structs). So let's match upstream and avoid some trouble.
This simplifies a number of pieces and allows us to get rid of the
documentation in liblzma’s and xz-utils’s READMEs.Debian on
binary-incompatibility with upstream.
commit af1178ee566bdfc3c3a13ec69136583138b3a9b8
Merge: 0d22d82 6c800e9
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Oct 14 20:55:16 2011 -0500
Merge branch 'jn/abi'
Stop advertising the new multithreaded compression feature in
liblzma.map. The relevant functions have never been part of liblzma
in Debian (they were patched out in 775f947, "Merge jn/abi2",
2011-08-15) but so far the out-of-sync version script has not been a
problem because debian/rules passes --disable-symbol-versions to
configure.
In other words, this is just a prerequisite to getting
--enable-symbol-versions to work. No immediate functional change
intended.
* jn/abi:
liblzma: Remove XZ_5.1.1alpha version symbol
commit bd52cf150ecd51e3ab63a9cc1a3cff6a77500178
Author: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue Sep 6 12:03:41 2011 +0300
Build: Fix "make check" on Windows.
commit d648e7efc033b0380ad622fa2b2e14d79d43fbf3
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Aug 29 18:31:06 2011 -0500
Provide LZMA Utils compatibility commands through the alternatives system
This way, there is no need for the tiny xz-lzma package whose
installation or non-installation reflects whether the sysadmin wanted
XZ Utils to provide commands such as lzma and unlzma.
Something like this seemed like a good idea and was then backed out as
long ago as cf1aca1 (Drop xz-lzma again, 2009-09-30). Back then, lzma
was pseudo-essential due to dpkg's dependency on it, making the
temporary removal of /usr/bin/lzma during an upgrade of the "lzma"
package in preparation for providing it through the alternatives
system awkward.
That is not a problem any more:
- squeeze dpkg already does not use the "lzma" command. No problem
in upgrades from squeeze.
- etch-m68k dpkg suggests lzma as an experimental feature and no
Debian package uses LZMA compression for its files yet. No danger
there, either.
- people trying to upgrade using lenny dpkg are doing something
unsupported and are on their own. Luckily, it shouldn't be a
problem for them, either --- once the new "lzma" is extracted,
configuring it is sufficient to make the lzma command available
again.
After this change, you can allow xz to implement the "lzma" command
with a simple "update-alternatives --config lzma". No more need to
fish for a Debian installation CD or network cable.
The update-alternatives priority is 20 (less than the a neutral 30)
so the lzma package gets to provide those commands by default when
installed.
commit 0d22d821682ba99a938d8b36c77e04a5f2166c21
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Aug 16 18:11:53 2011 -0500
debian/rules: avoid infinite makefile loop with DEB_BUILD_OPTIONS=nocheck
When the list of test_targets is empty, the rules for build-arch
simply run
make -f debian/rules
which invokes the default target, which depends on build-arch.
Oops.
Fixes: http://bugs.debian.org/638071
Reported-by: Thorsten Glaser <tg@mirbsd.de>
commit 09fe07e751a79eceb29edb2f76052c00dfaabdd8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Aug 16 00:40:42 2011 -0500
Prepare for upload to unstable
commit f0301d5a020cc421e2aa30dfa71cfbd0c5443b54
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Aug 15 23:54:03 2011 -0500
debian/rules build: describe dependencies between targets in more detail
Tell debian/rules which files should trigger an autoreconf or
./configure run when modified. This way, familiar processes like
build / modify / build and bisecting to find the source of a
regression will work without requiring a "debian/rules clean" so
often.
The build goes through the following stages (as implied by
dependencies).
1. autotools input (e.g., configure.ac) is transformed by autoreconf
to
2. autoreconf output (e.g., configure, Makefile.in) which is
transformed by configure with the help of templates like
Doxyfile.in to
3. basic build files (as represented by $(builddir)/Makefile) that
are used to build
4. xz, xzdec, wrapper scripts, and API documentation that are needed
to produce
5. successful test results (as represented by the stamp files
debian/test-*-stamp)
Details:
- at step (1), the system autotools files are very relevant and not
reflected in dependencies. Use "touch configure.ac" if you want to
force a rebuild of the configure script.
- during step (2), make only pays attention to the timestamp of the
resulting toplevel Makefile, even though that is certainly not the
only file being written. If the configure script is interrupted
writing the Makefile and before writing other files, the result
might be confusing.
- there is no timestamp associated to the result of step (3), so
"make -C $(builddir)" is always run to check if any files need to
be rebuilt (which is exactly what one would want to happen ---
good!).
- as a consequence, "make" does not know whether results from (4)
(the test suite) are stale. So we declare that if the test suite
has ever run all the way through then that’s good enough, using
make’s order-only prerequisite (“|”) feature.
After this patch, as a nice side effect, debian/rules knows enough to
build xzdec and standard xz in parallel.
commit fb550faa7dbde08e012cb606d471909c82e35691
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed May 18 19:10:03 2011 -0500
debian/control: new Debian policy version
commit 08b02ce73627f768fd1443a647a821eb0fe7de34
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Aug 15 23:04:19 2011 -0500
debian/rules: split build-arch, build-indep targets
In the not-so-distant future, Debian's autobuilders will start using
the build-arch and build-indep targets instead of unconditionally
invoking “debian/rules build”. That will be nice --- in particular,
it would allow the hack introduced in commit 8f68eeb (Do not
needlessly install and run doxygen on buildds, 2010-02-23) to be
removed. At the moment, we can prepare by making sure those targets
are provided and do just the right thing.
Until recently, that was not easy --- the simplest way involved doing
something like the following:
override_dh_auto_build:
set -e; \
if \
dh_listpackages | \
grep liblzma-doc >/dev/null; \
then \
doxygen Doxyfile; \
fi
dh_auto_build
That is because debhelper’s sequences do not include separate items
for building the architecture-dependent and architecture-independent
part of a package --- internally, dh wants to treat “dh build-arch”
somewhat like “dh build -a”.
Luckily debhelper 8.9.0 gives a way out: we can define build-arch,
build-indep, and the targets they depend on as ordinary makefile
targets in debian/rules and dh will invoke them at the appropriate
moment in sequences like “dh build” and “dh binary-arch”. Use it.
To avoid running “configure” twice, use the makefile output by
configure as a stamp file. To avoid running the test suite twice, put
a stamp file at debian/test-stamp. The former could be improved by
listing the appropriate dependencies (to allow bisecting and other
workflows that involving tweaking makefiles and incrementally
rebuilding), while the latter is unavoidable. Both were previously
taken care of by *.debhelper.log.
commit f32e73fa90d064c37f7eb75b2b9334b338ca37e1
Author: Riku Voipio <riku.voipio@linaro.org>
Date: Mon Aug 15 17:10:07 2011 +0300
debian/control: add multiarch fields
Multiarch transition in experimental is half-done. While the paths
have been changed, Multi-Arch: fields from debian/control are missing.
Multi-Arch: same for packages that install to multiarch directories,
and Multi-Arch: foreign for packages where foreign architecture version
is ok.
[jn: leaving out the liblzma-dev change for now]
Fixes: http://bugs.debian.org/637883
commit 58fab59bfb429a989c5047f049ca50b9e4b126a6
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Jun 11 04:30:02 2011 -0500
Install liblzma2 under /usr/lib/<triplet>/ instead of /usr/lib/
This change has been cooking in experimental since June without
problems. Time to add it to sid and get some bug reports.
This patch doesn’t add the Multi-Arch fields to debian/control yet
because they are not documented in policy and require dpkg support
(added in version 1.15.4). But since that version is already in
stable, the Multi-Arch fields will probably follow soon.
commit 79a57f7ab67b12cf8dbc323179accfb07be820aa
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Aug 15 19:17:48 2011 -0500
debian/copyright: sync with experimental
Changes from experimental:
- update the development repository address;
- follow the proposed machine-readable copyright file format
more closely;
- list the authors of the new translations;
- update dates.
commit f56bd8a2b74b46bba6de80e445cdb624816af9ed
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed May 18 16:48:06 2011 -0500
debian/symbols: bumps for new safety features
v5.1.1alpha~14 (liblzma: Don't create an empty Block in
lzma_stream_buffer_encode(), 2011-04-11) taught lsbe() and its caller
lzma_easy_buffer_encode() to leave out LZMA2 streams that correspond
to an empty decompressed version.
In v5.1.1alpha~16 (liblzma: Validate encoder arguments better,
2011-04-11), functions like lzma_stream_buffer_encode() learned to
reject unsupported check IDs instead of writing a corrupt stream.
Packages only tested against the new version of these functions will
need to depend on a version of liblzma2 with the fixes.
Do not bump symbols for v5.1.1alpha~40 (liblzma: Fix decoding of LZMA2
streams having no uncompressed data, 2011-03-31) or v5.1.1alpha~36
(liblzma: Fix a memory leak in stream_encoder.c, 2011-04-02), though,
since those are plain bugfixes that applications are not likely to be
relying on.
commit 775f9478eede93ef0d76348f6ec1a2cf27bc0cc9
Merge: c65bc07 77e2e99
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Aug 15 19:02:02 2011 -0500
Merge branch 'jn/abi2'
Sync with upstream, taking care not to break ABI. Descriptions of
upstream fixes taken from the changelog in experimental.
* jn/abi2: (81 commits)
Set liblzma version-info to 2:0:0
Revive "lzma_chunk_size()" stub
Revert "liblzma: A few ABI tweaks to reserve space in structures."
Update THANKS.
Workaround unusual SIZE_MAX on SCO OpenServer.
Run the scripts with the correct shell in test_scripts.sh.
Fix exit status of "xzdiff foo.xz bar.xz".
liblzma: Remove unneeded semicolon.
Remove threading functionality for now
Build: Make configure print if symbol versioning is enabled or not.
Don't call close(-1) in tuklib_open_stdxxx() on error.
liblzma: Use symbol versioning.
Translations: Update the Italian translation.
Tests: Add a test file for the bug in the previous commit.
xz: Fix error handling in xz -lvv.
liblzma: Handle allocation failures correctly in lzma_index_init().
Build: Fix checking for system-provided SHA-256.
Build: Set GZIP_ENV=-9n in top-level Makefile.am.
Update NEWS for 5.0.3.
Add French translation.
...
Conflicts:
src/liblzma/Makefile.am
src/liblzma/common/filter_encoder.c
commit 77e2e993114d0e9cc32bff37ad3683dfb35a000f
Merge: c3d857d 5c5b225
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Aug 15 18:39:08 2011 -0500
Merge branch 'master' of http://git.tukaani.org/xz into jn/abi2
* 'master' of http://git.tukaani.org/xz:
Update THANKS.
Workaround unusual SIZE_MAX on SCO OpenServer.
Run the scripts with the correct shell in test_scripts.sh.
Fix exit status of "xzdiff foo.xz bar.xz".
liblzma: Remove unneeded semicolon.
