wok-current rev 22849
bluez: add v4 deprecated tools
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Feb 16 18:25:39 2020 +0100 (2020-02-16) |
| parents | ffed896b80ca |
| children | fa8eccc0015a |
| files | bluez/receipt ppp/receipt ppp/stuff/ppp.cgi ppp/stuff/vpnssh.desktop tazpanel-extra/receipt tazpanel/receipt webgames/receipt |
line diff
1.1 --- a/bluez/receipt Sat Feb 15 16:12:12 2020 +0100 1.2 +++ b/bluez/receipt Sun Feb 16 18:25:39 2020 +0100 1.3 @@ -48,6 +48,7 @@ 1.4 --enable-library \ 1.5 --enable-sap \ 1.6 --enable-tools \ 1.7 + --enable-deprecated \ 1.8 --disable-systemd \ 1.9 --disable-test \ 1.10 $CONFIGURE_ARGS &&
2.1 --- a/ppp/receipt Sat Feb 15 16:12:12 2020 +0100 2.2 +++ b/ppp/receipt Sun Feb 16 18:25:39 2020 +0100 2.3 @@ -31,10 +31,12 @@ 2.4 # Rules to gen a SliTaz package suitable for Tazpkg. 2.5 genpkg_rules() 2.6 { 2.7 - mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN 2.8 + mkdir -p $fs/usr/share/applications \ 2.9 + $fs/var/www/tazpanel/menu.d/network/VPN 2.10 cp -a $install/usr/sbin $fs/usr 2.11 [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 2.12 cp -a $stuff/ppp.cgi $fs/var/www/tazpanel 2.13 + cp $stuff/*.desktop $fs/usr/share/applications 2.14 ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp 2.15 ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp 2.16 2.17 @@ -53,36 +55,22 @@ 2.18 cp -a $src/scripts/callback $fs/etc/ppp/scripts 2.19 cp -a $src/scripts/redialer $fs/etc/ppp/scripts 2.20 cat >> $fs/etc/ppp/ip-up <<EOT 2.21 -#!/bin/sh 2.22 - 2.23 if [ -x /etc/ppp/ip-up.d/\$6 ]; then 2.24 . /etc/ppp/ip-up.d/\$6 "\$@" 2.25 -elif [ -n "\$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then 2.26 +elif [ -n "\$DNS1\$DNS2" ]; then 2.27 rm -f /etc/ppp/resolv.prev 2.28 - if [ -f /etc/resolv.conf ]; then 2.29 - cp /etc/resolv.conf /etc/ppp/resolv.prev 2.30 - grep domain /etc/ppp/resolv.prev > /etc/resolv.conf 2.31 - grep search /etc/ppp/resolv.prev >> /etc/resolv.conf 2.32 - cat /etc/ppp/resolv.conf >> /etc/resolv.conf 2.33 - chmod 644 /etc/resolv.conf 2.34 - else 2.35 - cp /etc/ppp/resolv.conf /etc 2.36 - chmod 644 /etc/resolv.conf 2.37 - fi 2.38 + [ -s /etc/resolv.conf ] && mv -f /etc/resolv.conf /etc/ppp/resolv.prev 2.39 + [ -n "\$DNS1" ] && echo "nameserver \$DNS1" >> /etc/resolv.conf 2.40 + [ -n "\$DNS2" ] && echo "nameserver \$DNS2" >> /etc/resolv.conf 2.41 + chmod 644 /etc/resolv.conf 2.42 fi 2.43 EOT 2.44 cat >> $fs/etc/ppp/ip-down <<EOT 2.45 -#!/bin/sh 2.46 - 2.47 if [ -x /etc/ppp/ip-down.d/\$6 ]; then 2.48 . /etc/ppp/ip-down.d/\$6 "\$@" 2.49 -elif [ -n "\$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then 2.50 - if [ -f /etc/ppp/resolv.prev ]; then 2.51 - cp -f /etc/ppp/resolv.prev /etc/resolv.conf 2.52 - chmod 644 /etc/resolv.conf 2.53 - else 2.54 - rm -f /etc/resolv.conf 2.55 - fi 2.56 +elif [ -n "\$DNS1\$DNS2" ]; then 2.57 + rm -f /etc/resolv.conf 2.58 + mv -f /etc/ppp/resolv.prev /etc/resolv.conf 2.59 fi 2.60 EOT 2.61 # cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up 2.62 @@ -90,7 +78,6 @@ 2.63 chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down 2.64 2.65 # insert #!/bin/sh on top line in ip* scripts 2.66 - sed -i '/#!\/bin\/sh/d' $fs/etc/ppp/ip* 2>/dev/null 2.67 sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null 2.68 # add empty peers dir 2.69 mkdir -p $fs/etc/ppp/peers
3.1 --- a/ppp/stuff/ppp.cgi Sat Feb 15 16:12:12 2020 +0100 3.2 +++ b/ppp/stuff/ppp.cgi Sun Feb 16 18:25:39 2020 +0100 3.3 @@ -204,10 +204,11 @@ 3.4 kill $(busybox ps x | grep "$ppp" | awk '/pty/{next}/dbclient/{print $1}') 3.5 ;; 3.6 *\ start_pppssh\ *) 3.7 -EOT 3.8 pppssh "$(GET ssharg) $(GET peer)" \ 3.9 "$(GET localip):$(GET remoteip) $(GET localpppopt)" \ 3.10 - "$(GET remotepppopt)" "$(GET routes)" "$(GET udp)" & 3.11 + "$(GET remotepppopt)" "$(GET routes)" \ 3.12 + "$(GET udp)" > /dev/null & 3.13 + sleep 1 3.14 ;; 3.15 esac 3.16 ;; 3.17 @@ -438,7 +439,7 @@ 3.18 </tr> 3.19 <tr> 3.20 <td>$(_ 'Local PPP options')</td> 3.21 - <td><input type="text" name="localpppopt" size="50" value="$LOCALPPP" /></td> 3.22 + <td><input type="text" name="localpppopt" size="50" value="${LOCALPPP:-usepeerdns}" /></td> 3.23 </tr> 3.24 <tr> 3.25 <td>$(_ 'Remote PPP options')</td> 3.26 @@ -450,7 +451,7 @@ 3.27 </tr> 3.28 <tr> 3.29 <td>$(_ 'UDP port')</td> 3.30 - <td><input type="text" name="udp" size="50" value="$UDP" title="$(_ "Optional UDP port for a real-time but unencrypted link")"/></td> 3.31 + <td><input type="text" name="udp" size="50" value="$UDP" title="$(_ "Optional UDP port for real-time (with a very reliable link only)")"/></td> 3.32 </tr> 3.33 </table> 3.34 <footer><!--
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/ppp/stuff/vpnssh.desktop Sun Feb 16 18:25:39 2020 +0100 4.3 @@ -0,0 +1,8 @@ 4.4 +[Desktop Entry] 4.5 +Type=Application 4.6 +Name=VPN/SSH 4.7 +Comment=Virtual Private Network based on PPP and SSH 4.8 +Comment[fr]=Réseau privé virtuel basé sur PPP et SSH 4.9 +Exec=tazweb --notoolbar http://127.0.0.1:82/user/ppp.cgi#pppssh 4.10 +Icon=network-wired 4.11 +Categories=Network;
5.1 --- a/tazpanel-extra/receipt Sat Feb 15 16:12:12 2020 +0100 5.2 +++ b/tazpanel-extra/receipt Sun Feb 16 18:25:39 2020 +0100 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="tazpanel-extra" 5.7 -VERSION="632" 5.8 +VERSION="633" 5.9 CATEGORY="system-tools" 5.10 SHORT_DESC="SliTaz administration and configuration panel extra modules." 5.11 MAINTAINER="pascal.bellard@slitaz.org"
6.1 --- a/tazpanel/receipt Sat Feb 15 16:12:12 2020 +0100 6.2 +++ b/tazpanel/receipt Sun Feb 16 18:25:39 2020 +0100 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="tazpanel" 6.7 -VERSION="632" 6.8 +VERSION="633" 6.9 CATEGORY="system-tools" 6.10 SHORT_DESC="SliTaz administration and configuration panel." 6.11 MAINTAINER="pankso@slitaz.org"
7.1 --- a/webgames/receipt Sat Feb 15 16:12:12 2020 +0100 7.2 +++ b/webgames/receipt Sun Feb 16 18:25:39 2020 +0100 7.3 @@ -12,9 +12,9 @@ 7.4 { 7.5 type=$1 7.6 IFS='|'; set -- $2 7.7 - echo "$type=$1"; shift 7.8 - while [ "$1" ]; do 7.9 - echo "$type${1%]*}]=${1#*]}" 7.10 + echo "$type=$1" 7.11 + while [ "$2" ]; do 7.12 + echo "$type${2%]*}]=${2#*]}" 7.13 shift 7.14 done 7.15 }