[PATCH] xz: update to 5.2.2

[PATCH] xz: update to 5.2.2

[Marcel Lorenz]

[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]

Update xz to last version from Linux from Scratch.

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>

---
 config/rootfiles/common/xz | 2 +-
 lfs/xz                     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz
index b4053d9..8b71758 100644
--- a/config/rootfiles/common/xz
+++ b/config/rootfiles/common/xz
@@ -41,7 +41,7 @@ usr/bin/xzmore
 #usr/lib/liblzma.la
 usr/lib/liblzma.so
 usr/lib/liblzma.so.5
-usr/lib/liblzma.so.5.2.1
+usr/lib/liblzma.so.5.2.2
 #usr/lib/pkgconfig/liblzma.pc
 #usr/share/doc/xz
 #usr/share/doc/xz/AUTHORS
diff --git a/lfs/xz b/lfs/xz
index c1d3ef7..c09cb34 100644
--- a/lfs/xz
+++ b/lfs/xz
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2.1
+VER        = 5.2.2
 
 THISAPP    = xz-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b5e2dd95dc8498cea5354377ed89aa65
+$(DL_FILE)_MD5 = e26772b69940085c0632589ab1d52e64
 
 install : $(TARGET)
 
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && sed -e '/mf\.buffer = NULL/a next->coder->mf.size = 0;' -i src/liblzma/lz/lz_encoder.c
 	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-- 
1.9.1

Re: [PATCH] xz: update to 5.2.2

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1919 bytes --]

Hi,

On Tue, 2016-02-23 at 09:37 +0100, Marcel Lorenz wrote:
> Update xz to last version from Linux from Scratch.
> 
> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
> 
> ---
>  config/rootfiles/common/xz | 2 +-
>  lfs/xz                     | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz
> index b4053d9..8b71758 100644
> --- a/config/rootfiles/common/xz
> +++ b/config/rootfiles/common/xz
> @@ -41,7 +41,7 @@ usr/bin/xzmore
>  #usr/lib/liblzma.la
>  usr/lib/liblzma.so
>  usr/lib/liblzma.so.5
> -usr/lib/liblzma.so.5.2.1
> +usr/lib/liblzma.so.5.2.2
>  #usr/lib/pkgconfig/liblzma.pc
>  #usr/share/doc/xz
>  #usr/share/doc/xz/AUTHORS
> diff --git a/lfs/xz b/lfs/xz
> index c1d3ef7..c09cb34 100644
> --- a/lfs/xz
> +++ b/lfs/xz
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 5.2.1
> +VER        = 5.2.2
>  
>  THISAPP    = xz-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -47,7 +47,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = b5e2dd95dc8498cea5354377ed89aa65
> +$(DL_FILE)_MD5 = e26772b69940085c0632589ab1d52e64
>  
>  install : $(TARGET)
>  
> @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
> $(DIR_DL)/$(DL_FILE)
> +	cd $(DIR_APP) && sed -e '/mf\.buffer = NULL/a next->coder-
> >mf.size = 0;' -i src/liblzma/lz/lz_encoder.c

I am not too happy about these one-line seds. I know that LFS is using
them a lot, but sometimes they do more damage than they help. Patches
would be preferred.

However I won't bitch about this one.

>  	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make install

-Michael

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]