# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1459181081 -7200
# Node ID dbf4eeed945fc0783ac9ed1474c49f0f556b1003
# Parent  48c1bca1b6181f196f0043faefe774efad18d790
busybox/fbvnc: wheelmouse support

diff -r 48c1bca1b618 -r dbf4eeed945f busybox/stuff/busybox-1.23-fbvnc.u
--- a/busybox/stuff/busybox-1.23-fbvnc.u	Sat Mar 26 15:57:36 2016 +0200
+++ b/busybox/stuff/busybox-1.23-fbvnc.u	Mon Mar 28 18:04:41 2016 +0200
@@ -2,7 +2,7 @@
    3118       0       0    3118     c2e util-linux/fbvnc.o
 --- /dev/null
 +++ busybox/util-linux/fbvnc.c
-@@ -0,0 +1,551 @@
+@@ -0,0 +1,562 @@
 +/* vi: set sw=4 ts=4: */
 +/*
 + * A small linux framebuffer VNC viewer
@@ -31,6 +31,7 @@
 +//usage:#define fbvnc_full_usage "\n\n"
 +//usage:     "A linux framebuffer VNC viewer."
 +//usage:     "\nTo exit, move mouse to upper left corner and press ESC."
++//usage:     "\nor press any mouse button and press ESC or press ESC ^C."
 +
 +#include "libbb.h"
 +#include "vnc.h"
@@ -400,9 +401,10 @@
 +	return status;
 +}
 +
++static char rat_buttons;
 +static void rat_event(void)
 +{
-+	signed char ie[3];
++	signed char ie[4];
 +	struct vnc_client_ratevent me = {VNC_CLIENT_RATEVENT};
 +	int mask = 0;
 +	int refresh;
@@ -411,12 +413,17 @@
 +	G.mc += ie[1];
 +	G.mr -= ie[2];
 +	refresh = 2 - update_scroll(&G.scroll[0]) - update_scroll(&G.scroll[1]);
++	rat_buttons = ie[0] & 7;
 +	if (ie[0] & 0x01)
 +		mask |= VNC_BUTTON1_MASK;
 +	if (ie[0] & 0x04)
 +		mask |= VNC_BUTTON2_MASK;
 +	if (ie[0] & 0x02)
 +		mask |= VNC_BUTTON3_MASK;
++	if (ie[3] > 0)		/* wheel up */
++		mask |= VNC_BUTTON4_MASK;
++	if (ie[3] < 0)		/* wheel down */
++		mask |= VNC_BUTTON5_MASK;
 +	me.y = htons(G.mr);
 +	me.x = htons(G.mc);
 +	me.mask = mask;
@@ -453,7 +460,7 @@
 +			k = 0xff09;
 +			break;
 +		case 0x1b:
-+			if (G.oc + G.mc + G.or + G.mr == 0)
++			if (G.oc + G.mc + G.or + G.mr == 0 || rat_buttons)
 +				killed(0);
 +			if (i + 2 < nr && key[i + 1] == '[') {
 +				if (key[i + 2] == 'A')
@@ -475,6 +482,8 @@
 +			if (i + 1 < nr) {
 +				mod[nmod++] = 0xffe9;
 +				k = key[++i];
++				if (k == 0x03) /* esc-^C quit */
++					killed(0);
 +			}
 +			break;
 +		case 0x0d:
@@ -527,7 +536,9 @@
 +	port = bb_lookup_port((argc >= 3) ?  argv[2] : "vnc", "tcp", 5900);
 +	G.vnc_fd = create_and_connect_stream_or_die(host, port);
 +	vnc_init();
-+	G.rat_fd = open("/dev/input/mice", O_RDONLY);
++	G.rat_fd = open("/dev/input/mice", O_RDWR);
++	write(rat_fd, "\xf3\xc8\xf3\x64\xf3\x50", 6);	/* for using mouse wheel */
++	read(rat_fd, buf, 1);
 +	term_setup();
 +	atexit(cleanup);
 +	bb_signals(BB_FATAL_SIGS, killed);
@@ -556,7 +567,7 @@
 +}
 --- /dev/null
 +++ busybox/util-linux/vnc.h
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,124 @@
 +#define VNC_CONN_FAILED		0
 +#define VNC_CONN_NOAUTH		1
 +#define VNC_CONN_AUTH		2
@@ -584,9 +595,11 @@
 +#define VNC_ENC_CORRE		4
 +#define VNC_ENC_HEXTILE		5
 +
-+#define VNC_BUTTON1_MASK	0x1
-+#define VNC_BUTTON2_MASK	0x2
-+#define VNC_BUTTON3_MASK	0x4
++#define VNC_BUTTON1_MASK	0x01
++#define VNC_BUTTON2_MASK	0x02
++#define VNC_BUTTON3_MASK	0x04
++#define VNC_BUTTON4_MASK	0x10
++#define VNC_BUTTON5_MASK	0x08
 +
 +typedef unsigned char u8;
 +typedef unsigned short u16;
diff -r 48c1bca1b618 -r dbf4eeed945f djmount/receipt
--- a/djmount/receipt	Sat Mar 26 15:57:36 2016 +0200
+++ b/djmount/receipt	Mon Mar 28 18:04:41 2016 +0200
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://djmount.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+TAGS="upnp"
 
 DEPENDS="fuse readline"
 BUILD_DEPENDS="fuse-dev readline-dev libupnp libupnp-dev"
diff -r 48c1bca1b618 -r dbf4eeed945f miniupnpc/receipt
--- a/miniupnpc/receipt	Sat Mar 26 15:57:36 2016 +0200
+++ b/miniupnpc/receipt	Mon Mar 28 18:04:41 2016 +0200
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://miniupnp.tuxfamily.org/"
 WGET_URL="$WEB_SITE/files/$TARBALL"
+TAGS="upnp"
 
 DEPENDS=""
 BUILD_DEPENDS=""
diff -r 48c1bca1b618 -r dbf4eeed945f miniupnpd/receipt
--- a/miniupnpd/receipt	Sat Mar 26 15:57:36 2016 +0200
+++ b/miniupnpd/receipt	Mon Mar 28 18:04:41 2016 +0200
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://miniupnp.tuxfamily.org/"
 WGET_URL="$WEB_SITE/files/$TARBALL"
+TAGS="upnp"
 
 DEPENDS="iptables"
 BUILD_DEPENDS="iptables-dev libnfnetlink-dev"
diff -r 48c1bca1b618 -r dbf4eeed945f mysql/stuff/reset-password.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mysql/stuff/reset-password.sh	Mon Mar 28 18:04:41 2016 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -z "$1" ] && echo "Usage: $0 <newpassword>" && exit 1
+
+/etc/init.d/mysql stop
+/usr/bin/mysqld_safe --skip-grant-tables &
+mysql <<EOT
+UPDATE `mysql`.`user` SET `Password` = password('$1') WHERE `User` = "root" AND Host = "localhost";
+quit
+EOT
+mysqladmin shutdown
+/etc/init.d/mysql start
diff -r 48c1bca1b618 -r dbf4eeed945f syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Sat Mar 26 15:57:36 2016 +0200
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Mon Mar 28 18:04:41 2016 +0200
@@ -21,6 +21,8 @@
 compress()
 {
 	if [ "$1" ]; then
+		[ "$(which zopfli 2> /dev/null)" ] &&
+		zopfli --i100 -c /dev/stdin > $1 ||
 		gzip -9 > $1
 		[ "$(which advdef 2> /dev/null)" ] &&
 		advdef -z4 $1 > /dev/null
@@ -79,9 +81,7 @@
 {
 	HOLE=$OFS
 	[ $(get 0 $2) -eq 35615 ] || return
-	zcat $2 | gzip -9 > /tmp/rezipped$$.gz
-	[ "$(which advdef 2> /dev/null)" ] &&
-	advdef -z4 /tmp/rezipped$$.gz > /dev/null
+	zcat $2 | compress /tmp/rezipped$$.gz
 	n=$(stat -c %s /tmp/rezipped$$.gz)
 	printf "Moving tazlito data record at %04X ($n bytes) ...\n" $OFS
 	ddq if=/tmp/rezipped$$.gz bs=1 of=$1 seek=$OFS conv=notrunc
diff -r 48c1bca1b618 -r dbf4eeed945f syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sat Mar 26 15:57:36 2016 +0200
+++ b/syslinux/stuff/iso2exe/taziso	Mon Mar 28 18:04:41 2016 +0200
@@ -1284,6 +1284,23 @@
 	${1:-exit}
 }
 
+infoiso()
+{
+	isoinfo -d -i "$ISO" > /tmp/isoinfo$$
+	if [ -x "$(which iso2exe)" ]; then
+		echo "----"
+		iso2exe -l "$ISO"
+	fi >> /tmp/isoinfo$$
+	if [ "$1" ]; then
+		cat /tmp/isoinfo$$
+	else
+		$DIALOG --clear \
+			--title " Info ISO " \
+			--textbox /tmp/isoinfo$$ 0 0
+	fi
+	rm -f /tmp/isoinfo$$
+}
+
 isotitle()
 {
 	echo "$(blkid "$ISO" | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
@@ -1326,6 +1343,7 @@
 $(gotisomd5		"isomd5"	"Check the ISO image") \
 $(cdfile 'md5sum*'	"md5"		"Check the ISO files") \
 $(cdfile 'sha*sum*'	"sha"		"Check the ISO files") \
+$(xfile isoinfo		"infoiso"	"ISO image info") \
 $(cdfilex boot/bzImage	"bootiso"	"Boot the ISO image") \
 $(burnable		"burniso"	"Burn the ISO image") \
 $(blankable		"blankcd"	"Blank the CD/DVD") \
diff -r 48c1bca1b618 -r dbf4eeed945f unbound/receipt
--- a/unbound/receipt	Sat Mar 26 15:57:36 2016 +0200
+++ b/unbound/receipt	Mon Mar 28 18:04:41 2016 +0200
@@ -28,8 +28,16 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
+	mkdir -p $fs/usr/lib $fs/var/lib/unbound
 	cp -a $install/etc $fs
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/sbin $fs/usr
 }
+
+# Post message when installing.
+post_install()
+{
+	chroot "$1/" adduser -S -H -h /var/lib/unbound -D unbound
+	chroot "$1/" chown unbound /var/lib/unbound
+	chroot "$1/" unbound-anchor -a /var/lib/unbound/root.key
+}