# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1472815948 -7200
# Node ID 4ba626e0a6d2adc17dfd097f2c7b4664841f8431
# Parent  4458f0f34c929059db25019b7432203a647995db
Up brotli (0.5.2)

diff -r 4458f0f34c92 -r 4ba626e0a6d2 brotli/receipt
--- a/brotli/receipt	Thu Sep 01 16:30:12 2016 +0200
+++ b/brotli/receipt	Fri Sep 02 13:32:28 2016 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="brotli"
-VERSION="0.3.0"
+VERSION="0.5.2"
 CATEGORY="base-system"
 SHORT_DESC="A generic-purpose lossless compression algorithm."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,21 +12,18 @@
 TAGS="compression"
 
 DEPENDS="gcc-lib-base"
-BUILD_DEPENDS="python-dev setuptools"
+BUILD_DEPENDS="python-dev setuptools cmake"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
-	sed -i 's/ -std=c++11//' shared.mk
-	cd tools
-	make
+	cmake .
+	make bro
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $src/tools/bro $fs/usr/bin/
+	cp -a $src/bin/bro $fs/usr/bin/
 }
diff -r 4458f0f34c92 -r 4ba626e0a6d2 memtest/stuff/memtest86+-5.01-setup.patch
--- a/memtest/stuff/memtest86+-5.01-setup.patch	Thu Sep 01 16:30:12 2016 +0200
+++ b/memtest/stuff/memtest86+-5.01-setup.patch	Fri Sep 02 13:32:28 2016 +0200
@@ -1,19 +1,20 @@
 --- memtest86+-5.01/setup.S
 +++ memtest86+-5.01/setup.S
-@@ -27,11 +27,10 @@
+@@ -27,11 +27,11 @@
  #ljmp	$INITSEG, $(reload - start + 0x200)
  reload:
  	movw	$INITSEG, %ax
 -	movw	%ax, %ds
  	movw	%ax, %es
  	movw	%ax, %fs
++	movw	%ax, %gs
  	movw	%ax, %ss	# reset the stack to INITSEG:0x4000-12.
 -	movw	%dx, %sp
 +	movw	$0x4000-12, %sp
  	push	%cs
  	pop	%ds
  	lidt	idt_48 - start	# load idt with 0,0
-@@ -50,13 +49,13 @@
+@@ -50,13 +50,13 @@
       	jz	alt_a20_done
       	
       	/* set or clear bit1, the ALT_A20_GATE bit */
@@ -32,13 +33,37 @@
  
  	/* clear the INIT_NOW bit; don't accidently reset the machine */
  alt_a20_cont2:
-@@ -87,8 +86,8 @@
+@@ -87,9 +87,9 @@
  	movw	$KERNEL_DS, %ax
  	movw	%ax, %ds
  	movw	%ax, %es
 -	movw	%ax, %ss
  	movw	%ax, %fs
+ 	movw	%ax, %gs
 +	movw	%ax, %ss
- 	movw	%ax, %gs
  
  data32	ljmp	$KERNEL_CS, $(TSTLOAD <<4)	# jmp offset 2000 of segment 0x10 (cs)
+ 
+@@ -100,18 +100,16 @@
+  * No timeout is used - if this hangs there is something wrong with
+  * the machine, and we probably couldn't proceed anyway.
+  */
++has_output:
++	call	delay
++	inb	$0x60, %al	# read it
+ empty_8042:
+ 	call	delay
+ 	inb	$0x64, %al	# 8042 status port
+ 	cmpb	$0xff, %al	# from grub-a20-patch, skip if not impl
+ 	jz	empty_8042_ret
+ 	testb	$1, %al		# output buffer?
+-	jz	no_output
+-	call	delay
+-	inb	$0x60, %al	# read it
+-	jmp	empty_8042
+-	
+-no_output:
++	jnz	has_output
+ 	testb	$2, %al		# is input buffer full?
+ 	jnz	empty_8042	# yes - loop
+ empty_8042_ret: