# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1363678794 -3600
# Node ID 016b98861bed701f3d00b640cb21200477ebbd05
# Parent  6d11967fcb51f9b0f5f691e113974a8b0300a681
busybox: unxz patch

diff -r 6d11967fcb51 -r 016b98861bed busybox/receipt
--- a/busybox/receipt	Mon Mar 18 20:48:03 2013 +0100
+++ b/busybox/receipt	Tue Mar 19 08:39:54 2013 +0100
@@ -40,6 +40,7 @@
 cmdline.u
 diff.u
 nfs-segfault.u
+xz.u
 EOT
     cp $stuff/$PACKAGE-${VERSION%.*}.config .config
 }
diff -r 6d11967fcb51 -r 016b98861bed busybox/stuff/busybox-1.21-xz.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox/stuff/busybox-1.21-xz.u	Tue Mar 19 08:39:54 2013 +0100
@@ -0,0 +1,84 @@
+--- busybox-1.21.0/archival/libarchive/decompress_unxz.c
++++ busybox-1.21.0/archival/libarchive/decompress_unxz.c
+@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *
+ IF_DESKTOP(long long) int FAST_FUNC
+ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+ {
++	enum xz_ret xz_result;
+ 	struct xz_buf iobuf;
+ 	struct xz_dec *state;
+ 	unsigned char *membuf;
+@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t
+ 	/* Limit memory usage to about 64 MiB. */
+ 	state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
+ 
++	xz_result = X_OK;
+ 	while (1) {
+-		enum xz_ret r;
+-
+ 		if (iobuf.in_pos == iobuf.in_size) {
+ 			int rd = safe_read(src_fd, membuf, BUFSIZ);
+ 			if (rd < 0) {
+@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t
+ 				total = -1;
+ 				break;
+ 			}
++			if (rd == 0 && xz_result == XZ_STREAM_END)
++				break;
+ 			iobuf.in_size = rd;
+ 			iobuf.in_pos = 0;
+ 		}
++		if (xz_result == XZ_STREAM_END) {
++			/*
++			 * Try to start decoding next concatenated stream.
++			 * Stream padding must always be a multiple of four
++			 * bytes to preserve four-byte alignment. To keep the
++			 * code slightly smaller, we aren't as strict here as
++			 * the .xz spec requires. We just skip all zero-bytes
++			 * without checking the alignment and thus can accept
++			 * files that aren't valid, e.g. the XZ utils test
++			 * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
++			 */
++			do {
++				if (membuf[iobuf.in_pos] != 0) {
++					xz_dec_reset(state);
++					goto do_run;
++				}
++				iobuf.in_pos++;
++			} while (iobuf.in_pos < iobuf.in_size);
++		}
++ do_run:
+ //		bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
+ //				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
+-		r = xz_dec_run(state, &iobuf);
++		xz_result = xz_dec_run(state, &iobuf);
+ //		bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
+-//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
++//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
+ 		if (iobuf.out_pos) {
+ 			xwrite(dst_fd, iobuf.out, iobuf.out_pos);
+ 			IF_DESKTOP(total += iobuf.out_pos;)
+ 			iobuf.out_pos = 0;
+ 		}
+-		if (r == XZ_STREAM_END) {
+-			break;
++		if (xz_result == XZ_STREAM_END) {
++			/*
++			 * Can just "break;" here, if not for concatenated
++			 * .xz streams.
++			 * Checking for padding may require buffer
++			 * replenishment. Can't do it here.
++			 */
++			continue;
+ 		}
+-		if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
++		if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
+ 			bb_error_msg("corrupted data");
+ 			total = -1;
+ 			break;
+ 		}
+ 	}
++
+ 	xz_dec_end(state);
+ 	free(membuf);
+ 
diff -r 6d11967fcb51 -r 016b98861bed get-LibreOffice/stuff/get-LibreOffice
--- a/get-LibreOffice/stuff/get-LibreOffice	Mon Mar 18 20:48:03 2013 +0100
+++ b/get-LibreOffice/stuff/get-LibreOffice	Tue Mar 19 08:39:54 2013 +0100
@@ -26,7 +26,6 @@
 VER="${VERSION/\-/}" # without hyphens
 
 
-#http://download.documentfoundation.org/libreoffice/stable/4.0.1/rpm/x86/LibreOffice_4.0.1_Linux_x86_rpm.tar.gz
 TARBALL="${PREFIX}_${VER}_${SUFFIX}"
 
 for LOC in ${LANG/_/-} ${LANG%_*}; do
@@ -191,24 +190,23 @@
 
 post_install()
 {
-	cd /usr/share/applications
-	ln -s /usr/lib/libreoffice?*/share/xdg/base.desktop          libreoffice-base.desktop
-	ln -s /usr/lib/libreoffice?*/share/xdg/impress.desktop       libreoffice-impress.desktop
-	ln -s /usr/lib/libreoffice?*/share/xdg/writer.desktop        libreoffice-writer.desktop
-	ln -s /usr/lib/libreoffice?*/share/xdg/calc.desktop          libreoffice-calc.desktop
-	ln -s /usr/lib/libreoffice?*/share/xdg/math.desktop          libreoffice-math.desktop
-	ln -s /usr/lib/libreoffice?*/share/xdg/draw.desktop          libreoffice-draw.desktop
-	ln -s /usr/lib/libreoffice?*/share/xdg/printeradmin.desktop libreoffice-printeradmin.desktop
-	chmod +x /usr/lib/libreoffice?*/share/xdg/*.desktop
+	cd \$1/usr/share/applications
+	ln -s /usr/lib/libreoffice*/share/xdg/base.desktop          libreoffice-base.desktop
+	ln -s /usr/lib/libreoffice*/share/xdg/impress.desktop       libreoffice-impress.desktop
+	ln -s /usr/lib/libreoffice*/share/xdg/writer.desktop        libreoffice-writer.desktop
+	ln -s /usr/lib/libreoffice*/share/xdg/calc.desktop          libreoffice-calc.desktop
+	ln -s /usr/lib/libreoffice*/share/xdg/math.desktop          libreoffice-math.desktop
+	ln -s /usr/lib/libreoffice*/share/xdg/draw.desktop          libreoffice-draw.desktop
+	ln -s /usr/lib/libreoffice*/share/xdg/printeradmin.desktop libreoffice-printeradmin.desktop
+	chmod +x /usr/lib/libreoffice*/share/xdg/*.desktop
 
-	cd /usr/bin
-	ln -s /usr/lib/libreoffice?* /usr/lib/libreoffice
+	cd \$1/usr/bin
 	ln -sf /usr/lib/libreoffice/program/soffice
 }
 
 post_remove()
 {
-	rm -f /usr/share/applications/libreoffice-*
+	rm -f \$1/usr/share/applications/libreoffice-*
 }
 
 EOT
diff -r 6d11967fcb51 -r 016b98861bed gv/receipt
--- a/gv/receipt	Mon Mar 18 20:48:03 2013 +0100
+++ b/gv/receipt	Tue Mar 19 08:39:54 2013 +0100
@@ -7,7 +7,6 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/gv/"
-
 WGET_URL="http://ftp.gnu.org/gnu/gv/$TARBALL"
 
 DEPENDS="ghostscript xorg-libXaw3d xorg-libXinerama"
@@ -21,7 +20,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install soinstall
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.