# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1581873939 -3600
# Node ID c34ef09acb7c3d3da21a10c8e7fa09a67f0fb126
# Parent  ffed896b80ca9298af3b0280f5aeb0ba9d59e657
bluez: add v4 deprecated tools

diff -r ffed896b80ca -r c34ef09acb7c bluez/receipt
--- a/bluez/receipt	Sat Feb 15 16:12:12 2020 +0100
+++ b/bluez/receipt	Sun Feb 16 18:25:39 2020 +0100
@@ -48,6 +48,7 @@
 		--enable-library	\
 		--enable-sap		\
 		--enable-tools		\
+		--enable-deprecated	\
 		--disable-systemd	\
 		--disable-test		\
 		$CONFIGURE_ARGS &&
diff -r ffed896b80ca -r c34ef09acb7c ppp/receipt
--- a/ppp/receipt	Sat Feb 15 16:12:12 2020 +0100
+++ b/ppp/receipt	Sun Feb 16 18:25:39 2020 +0100
@@ -31,10 +31,12 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN
+	mkdir -p $fs/usr/share/applications \
+		 $fs/var/www/tazpanel/menu.d/network/VPN
 	cp -a $install/usr/sbin $fs/usr
 	[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
 	cp -a $stuff/ppp.cgi $fs/var/www/tazpanel
+	cp $stuff/*.desktop $fs/usr/share/applications
 	ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp
 	ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp
 	
@@ -53,36 +55,22 @@
 	cp -a $src/scripts/callback $fs/etc/ppp/scripts
 	cp -a $src/scripts/redialer $fs/etc/ppp/scripts
 	cat >> $fs/etc/ppp/ip-up <<EOT
-#!/bin/sh
-
 if [ -x /etc/ppp/ip-up.d/\$6 ]; then
 	. /etc/ppp/ip-up.d/\$6 "\$@"
-elif [ -n "\$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+elif [ -n "\$DNS1\$DNS2" ]; then
 	rm -f /etc/ppp/resolv.prev
-	if [ -f /etc/resolv.conf ]; then
-		cp /etc/resolv.conf /etc/ppp/resolv.prev
-		grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
-		grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
-		cat /etc/ppp/resolv.conf >> /etc/resolv.conf
-		chmod 644 /etc/resolv.conf
-	else
-		cp /etc/ppp/resolv.conf /etc
-		chmod 644 /etc/resolv.conf
-	fi
+	[ -s /etc/resolv.conf ] && mv -f /etc/resolv.conf /etc/ppp/resolv.prev
+	[ -n "\$DNS1" ] && echo "nameserver \$DNS1" >> /etc/resolv.conf
+	[ -n "\$DNS2" ] && echo "nameserver \$DNS2" >> /etc/resolv.conf
+	chmod 644 /etc/resolv.conf
 fi
 EOT
 	cat >> $fs/etc/ppp/ip-down <<EOT
-#!/bin/sh
-
 if [ -x /etc/ppp/ip-down.d/\$6 ]; then
 	. /etc/ppp/ip-down.d/\$6 "\$@"
-elif [ -n "\$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
-	if [ -f /etc/ppp/resolv.prev ]; then
-		cp -f /etc/ppp/resolv.prev /etc/resolv.conf
-		chmod 644 /etc/resolv.conf
-	else
-		rm -f /etc/resolv.conf
-	fi
+elif [ -n "\$DNS1\$DNS2" ]; then
+	rm -f /etc/resolv.conf
+	mv -f /etc/ppp/resolv.prev /etc/resolv.conf
 fi
 EOT
 	# cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up
@@ -90,7 +78,6 @@
 	chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down
 
 	# insert #!/bin/sh  on top line in ip* scripts
-	sed -i '/#!\/bin\/sh/d' $fs/etc/ppp/ip* 2>/dev/null	
 	sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null	
 	# add empty peers dir
 	mkdir -p $fs/etc/ppp/peers
diff -r ffed896b80ca -r c34ef09acb7c ppp/stuff/ppp.cgi
--- a/ppp/stuff/ppp.cgi	Sat Feb 15 16:12:12 2020 +0100
+++ b/ppp/stuff/ppp.cgi	Sun Feb 16 18:25:39 2020 +0100
@@ -204,10 +204,11 @@
 		kill $(busybox ps x | grep "$ppp" | awk '/pty/{next}/dbclient/{print $1}')
 		;;
 	*\ start_pppssh\ *)
-EOT
 		pppssh	"$(GET ssharg) $(GET peer)" \
 			"$(GET localip):$(GET remoteip) $(GET localpppopt)" \
-			"$(GET remotepppopt)" "$(GET routes)" "$(GET udp)" &
+			"$(GET remotepppopt)" "$(GET routes)" \
+			"$(GET udp)" > /dev/null &
+		sleep 1
 		;;
 	esac
 	;;
@@ -438,7 +439,7 @@
 	</tr>
 	<tr>
 		<td>$(_ 'Local PPP options')</td>
-		<td><input type="text" name="localpppopt" size="50" value="$LOCALPPP" /></td>
+		<td><input type="text" name="localpppopt" size="50" value="${LOCALPPP:-usepeerdns}" /></td>
 	</tr>
 	<tr>
 		<td>$(_ 'Remote PPP options')</td>
@@ -450,7 +451,7 @@
 	</tr>
 	<tr>
 		<td>$(_ 'UDP port')</td>
-		<td><input type="text" name="udp" size="50" value="$UDP" title="$(_ "Optional UDP port for a real-time but unencrypted link")"/></td>
+		<td><input type="text" name="udp" size="50" value="$UDP" title="$(_ "Optional UDP port for real-time (with a very reliable link only)")"/></td>
 	</tr>
 	</table>
 	<footer><!--
diff -r ffed896b80ca -r c34ef09acb7c ppp/stuff/vpnssh.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ppp/stuff/vpnssh.desktop	Sun Feb 16 18:25:39 2020 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=VPN/SSH
+Comment=Virtual Private Network based on PPP and SSH
+Comment[fr]=Réseau privé virtuel basé sur PPP et SSH
+Exec=tazweb --notoolbar http://127.0.0.1:82/user/ppp.cgi#pppssh
+Icon=network-wired
+Categories=Network;
diff -r ffed896b80ca -r c34ef09acb7c tazpanel-extra/receipt
--- a/tazpanel-extra/receipt	Sat Feb 15 16:12:12 2020 +0100
+++ b/tazpanel-extra/receipt	Sun Feb 16 18:25:39 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazpanel-extra"
-VERSION="632"
+VERSION="633"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz administration and configuration panel extra modules."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r ffed896b80ca -r c34ef09acb7c tazpanel/receipt
--- a/tazpanel/receipt	Sat Feb 15 16:12:12 2020 +0100
+++ b/tazpanel/receipt	Sun Feb 16 18:25:39 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazpanel"
-VERSION="632"
+VERSION="633"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz administration and configuration panel."
 MAINTAINER="pankso@slitaz.org"
diff -r ffed896b80ca -r c34ef09acb7c webgames/receipt
--- a/webgames/receipt	Sat Feb 15 16:12:12 2020 +0100
+++ b/webgames/receipt	Sun Feb 16 18:25:39 2020 +0100
@@ -12,9 +12,9 @@
 {
 	type=$1
 	IFS='|'; set -- $2
-	echo "$type=$1"; shift
-	while [ "$1" ]; do
-		echo "$type${1%]*}]=${1#*]}"
+	echo "$type=$1"
+	while [ "$2" ]; do
+		echo "$type${2%]*}]=${2#*]}"
 		shift
 	done
 }