From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 9 Sep 2015 13:32:11 +0000 (+0300)
Subject: add tar.xz support for template build
X-Git-Tag: auto/th/util-vserver-0.30.216-1.pre3117.2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-vserver.git;a=commitdiff_plain;h=2803ac6

add tar.xz support for template build

https://github.com/linux-vserver/util-vserver/pull/24
---

diff --git a/h2ext-xz.patch b/h2ext-xz.patch
new file mode 100644
index 0000000..2791203
--- /dev/null
+++ b/h2ext-xz.patch
@@ -0,0 +1,33 @@
+From 2d66dba387f1240ad489b41d9b7504ab2a56dbf9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
+Date: Wed, 9 Sep 2015 16:22:56 +0300
+Subject: [PATCH] add .xz support for h2ext to be able to build from tar.xz
+ templates
+
+magic taken from
+https://github.com/file/file/blob/FILE5_24/magic/Magdir/compress#L202-L205
+
+however due limited support of magic format in util-vserver had to hack
+some things:
+
+- does not support 'ustring', used 'string'
+- does not support \xXX hex escape, used octal
+- unable parse octal properly \375 + 7 would be parsed as \3757, so encoded '7' as \67
+
+$ head -c6 < pld32.tar.xz|od -cx
+0000000 375   7   z   X   Z  \0
+           37fd    587a    005a
+---
+ distrib/misc/h2ext.desc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/distrib/misc/h2ext.desc b/distrib/misc/h2ext.desc
+index a234339..9441bd2 100644
+--- a/distrib/misc/h2ext.desc
++++ b/distrib/misc/h2ext.desc
+@@ -17,3 +17,5 @@
+ # dump/restore old-fs big and little endian
+ 24	belong		60011			restore -rf -			0
+ 24	lelong		60011			restore -rf -			0
++# xz
++0	string		\375\67zXZ\0		xz -d -c			1
diff --git a/util-vserver.spec b/util-vserver.spec
index 3144996..951a8f3 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -20,7 +20,7 @@
 %define		reqdb_ver	5.2
 %define		reqdb_pkg	db%{reqdb_ver}
 %define		snap	pre3117
-%define		rel	1
+%define		rel	2
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
@@ -66,7 +66,7 @@ Patch13:	%{name}-tmpdir.patch
 Patch14:	%{name}-rpmpath.patch
 Patch15:	%{name}-interfaces-ignore-cvs-dir.patch
 Patch16:	%{name}-personalitymachine.patch
-
+Patch17:	h2ext-xz.patch
 Patch18:	%{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
 Patch19:	%{name}-dbrebuild-internalize4.patch
@@ -442,7 +442,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-
+%patch17 -p1
 %patch18 -p1
 %patch19 -p1
 %patch21 -p1