Check-in [03856c3ba7]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:03856c3ba7759d9c99058e86a091e446d49bd8c9
Date: 2012-02-23 22:57:34
User: BarryK
Comment:fix longstanding bug /usr/sbin/sfsget for racy

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/init.d/10alsa

@@ -6,11 +6,11 @@
 #110111 shinobar: for reliable sound detection on HP Compac nc4010.
 #110113 tweak delay. 110216 tweak delay.
 #110506 /usr/sbin/alsaconf has 'restart' option, might need to reprobe modules. for now, just 'start|restart'.
 #111229 add test file /etc/asound.state exists.
 #120103 karl godt: fix unloading modules. refer: http://www.murga-linux.com/puppy/viewtopic.php?t=71767&start=390
-#120222 revert 111229.
+#120222 revert 111229. 120223 shinobar: better fix.
 
 case "$1" in
  start|restart)
   #110217 remove this test, seems to be a problem some people report file not created but snd ok...
   #if [ -f /tmp/rc_d_rc_services_alsa_ok ];then #101121 see rc.services.
@@ -58,20 +58,20 @@
 set Headphone 75% unmute
 set Headphone -12dB
 set Playback 100% unmute
 set "SB Live Analog/Digital Output Jack" off
 set "Audigy Analog/Digital Output Jack" off
-set Speaker 75 % unmute
+set Speaker 75% unmute
 EOF
-
+	[ $? -eq 0 ] && alsactl -f /etc/asound.state store #120223 shinobar
    else
     alsactl -f /etc/asound.state restore #from /etc/asound.state.
    fi
   #fi
  ;;
  stop)
-  alsactl -f /etc/asound.state store #saves to /etc/asound.state. 111229 add test file exists. 120222 revert.
+  [ -f /etc/asound.state ] && alsactl -f /etc/asound.state store #saves to /etc/asound.state. 111229 add test file exists. 120222 revert. 120223 restore.
   # Kill processes holding open sound devices...
   fuser -k /dev/admmidi? /dev/adsp? /dev/amidi? /dev/audio* /dev/dmfm* /dev/dmmidi? /dev/dsp* /dev/dspW* /dev/midi0? /dev/mixer? /dev/music /dev/patmgr? /dev/sequencer* /dev/sndstat >/dev/null 2>&1
   [ -d /proc/asound/dev ] && fuser -k /proc/asound/dev/* >/dev/null 2>&1
   [ -d /dev/snd ] && fuser -k /dev/snd/* >/dev/null 2>&1
   # remove all sequencer connections if any

Changes to woof-code/rootfs-skeleton/usr/sbin/download_file

@@ -9,10 +9,11 @@
 #101126 not sure, it seems that wget now defaults to ipv6, fails for some users, use '-4' to force ipv4.
 #101206 fix find filesize ftp://ftp.lug.udel.edu/pub/puppylinux ...
 #120201 rodin.s: internationalized. Add LANG=C to 1-st wget for proper work
 #120218 removed a LANG=C line (line 43).
 #120220 jemimah: Technosaurus' wget progressbar function to the download_file utility. It also replaces an rxvt window with an Xdialog tailbox. refer: http://murga-linux.com/puppy/viewtopic.php?t=71767&start=420
+#120224 small tweak.
 
 # adding gettext
 export TEXTDOMAINDIR=/usr/share/locale
 export TEXTDOMAIN=download_file
 eval_gettext () {
@@ -186,11 +187,11 @@
  #120220 jemimah...
  tail -f /tmp/download_file_spider.log2 | while read LINE; do
       case $LINE in
          *%*)LINE=${LINE##*..};echo ${LINE%%%*};;
       esac
- done |Xdialog --gauge "$(gettext 'Downloading file:') ${URLSPEC}" 0 0&
+ done |Xdialog --wmclass "gtkdialog2" --title "$(gettext 'Puppy File Downloader')" --screen-center --gauge "$(gettext 'Downloading file:') ${URLSPEC}" 0 0&
  PID1=$!
  #-t 5 means retry 5 times, -w 5 means wait 5 seconds between retries...
  wget -4 ${CONTPARAM} -t 5 -w 5 "${URLSPEC}" > /tmp/download_file_spider.log2 2>&1
  if [ $? -ne 0 ];then
   Xdialog --wmclass "gtkdialog2" --title "$(gettext 'Puppy File Downloader')" --screen-center --cr-wrap --ok-label "$(gettext 'TRY AGAIN')" --cancel-label "$(gettext 'GIVE UP')" --icon "/usr/local/lib/X11/pixmaps/error.xpm" --yesno "$(gettext 'Download failed, see log top-left of screen.

Changes to woof-code/rootfs-skeleton/usr/sbin/sfsget

@@ -6,10 +6,11 @@
 #110402 first version.
 #110422 DISTRO_VERSION variable now has dotted format. note, also now using full dotted version# in puppy filenames.
 #110813 bug fix, sfs file has '_' in name.
 #120202 BK: internationalized.
 #120204 more gettext.
+#120224 bugfix for racy.
 
 export TEXTDOMAIN=sfsget
 export OUTPUT_CHARSET=UTF-8
 
 SFS_FILE=''; SFS_DIR=''
@@ -43,10 +44,15 @@
 MAJNUM="`echo -n "$DOTVER" | cut -f 1 -d '.'`" #110422
 case $DISTRO_FILE_PREFIX in
  qrky)
   x_REPOS="`echo -n "$PET_REPOS" | tr ' ' '\n' | grep '/quirky'`"
   SFS_DIR0="quirky-${DOTVER}"
+  SFS_DIR1='sfs'
+ ;;
+ racy) #120224
+  x_REPOS="`echo -n "$PET_REPOS" | tr ' ' '\n' | grep '/quirky'`"
+  SFS_DIR0="racy-${DOTVER}"
   SFS_DIR1='sfs'
  ;;
  wary)
   x_REPOS="`echo -n "$PET_REPOS" | tr ' ' '\n' | grep '/quirky'`"
   SFS_DIR0="wary-${DOTVER}"

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -285,11 +285,11 @@
 pwallpaper-1.1.2-1|pwallpaper|1.1.2-1||Desktop|72K||pwallpaper-1.1.2-1.pet|+gtk+|Set backdrop image||||
 pwget-0.2|pwget|0.2||Internet|56K||pwget-0.2.pet|+wget,+gtkdialog3|file downloader frontend for wget||||
 pwsget-0.1|pwsget|0.1||Internet|40K||pwsget-0.1.pet|+gtkdialog3|Pwsget secure file downloader||||
 pzchmview-1.0d-1|pzchmview|1.0d-1||Document|28K||pzchmview-1.0d-1.pet|+chmlib|PZCHMView CHM Viewer||||
 replaceit-1.0.0|replaceit|1.0.0||BuildingBlock|32K||replaceit-1.0.0.pet||text replacement in a file|puppy|4||
-retrovol-0.10-w5|retrovol|0.10-w5||Multimedia|128K||retrovol-0.10-w5.pet|+gtk+,+alsa-lib|Retrovol sound mixer and tray applet|puppy|wary5||
+retrovol-0.12|retrovol|0.12||Multimedia|128K||retrovol-0.12.pet|+gtk+,+alsa-lib|Retrovol sound mixer and tray applet|puppy|||
 rox_filer-20111022-patched-w5c|rox_filer|20111022-patched-w5c||Filesystem|1464K||rox_filer-20111022-patched-w5c.pet|+gtk+|ROX-Filer file manager, note compiled in Wary 5.2.2.2 but should work all puppies|puppy|wary5||
 rpl-1.4.1|rpl|1.4.1||BuildingBlock|48K||rpl-1.4.1.pet||cli utility, text replacement in a file|puppy|4||
 rp_pppoe_cli-3.8-patched2-2-p4|rp_pppoe_cli|3.8-patched2-2-p4||Network|448K||rp_pppoe_cli-3.8-patched2-2-p4.pet||roaring penguin pppoe internet connection|puppy|4||
 rxvt-unicode-9.05-1|rxvt-unicode|9.05-1||Utility|||rxvt-unicode-9.05-1.pet||terminal emulator, compatible with rxvt, supports unicode|puppy|4||
 samba_client-3.0.37|samba_client|3.0.37||BuildingBlock|1008K||samba_client-3.0.37.pet||samba client utilities, note, compiled in slackware 13.1 but should work in all puppies||||

Changes to woof-distro/x86/Packages-puppy-wary5-official

@@ -1059,11 +1059,10 @@
 reiserfsprogs_DOC-3.6.21-w5c|reiserfsprogs_DOC|3.6.21-w5c||BuildingBlock|60K||reiserfsprogs_DOC-3.6.21-w5c.pet||Filesystem utilities for ReiserFS|puppy|wary5||
 renderproto-0.9.2-w5c|renderproto|0.9.2-w5c||BuildingBlock|8K||renderproto-0.9.2-w5c.pet||Render extension headers|puppy|wary5||
 renderproto_DEV-0.9.2-w5c|renderproto_DEV|0.9.2-w5c||BuildingBlock|60K||renderproto_DEV-0.9.2-w5c.pet|+renderproto|Render extension headers|puppy|wary5||
 resourceproto-1.0.2-w5c|resourceproto|1.0.2-w5c||BuildingBlock|8K||resourceproto-1.0.2-w5c.pet||Resource extension headers|puppy|wary5||
 resourceproto_DEV-1.0.2-w5c|resourceproto_DEV|1.0.2-w5c||BuildingBlock|40K||resourceproto_DEV-1.0.2-w5c.pet|+resourceproto|Resource extension headers|puppy|wary5||
-retrovol-0.10-w5|retrovol|0.10-w5||Multimedia|128K||retrovol-0.10-w5.pet|+gtk+,+alsa-lib|Retrovol sound mixer and tray applet|puppy|wary5||
 rgb-1.0.1-w5c|rgb|1.0.1-w5c||Personal|52K||rgb-1.0.1-w5c.pet||X.org RGB database and applications|puppy|wary5||
 rgb_DOC-1.0.1-w5c|rgb_DOC|1.0.1-w5c||Personal|24K||rgb_DOC-1.0.1-w5c.pet||X.org RGB database and applications|puppy|wary5||
 rman_DEV-3.2-w5c|rman_DEV|3.2-w5c||BuildingBlock|96K||rman_DEV-3.2-w5c.pet|+rman|A manual page translator to HTML ASCII TkMan DocBook ...|puppy|wary5||
 rman_DOC-3.2-w5c|rman_DOC|3.2-w5c||BuildingBlock|32K||rman_DOC-3.2-w5c.pet||A manual page translator to HTML ASCII TkMan DocBook ...|puppy|wary5||
 rocknet-2005-06-24-w5c|rocknet|2005-06-24-w5c||Network|60K||rocknet-2005-06-24-w5c.pet||Network configuration|puppy|wary5||

Changes to woof-distro/x86/racy/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -561,11 +561,11 @@
 yes|pzchmview||exe
 no|qt4|qt4|exe,dev,doc,nls
 no|quisp||exe,dev,doc>dev,nls
 yes|readline|readline|exe,dev,doc,nls
 yes|replaceit||exe
-yes|retrovol|retrovol|exe
+yes|retrovol||exe
 no|ripoff||exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls
 no|rox-clib||exe,dev,doc,nls
 yes|rox_filer||exe
 no|rox-menu||exe

Changes to woof-distro/x86/wary/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -561,11 +561,11 @@
 yes|pzchmview||exe
 no|qt4|qt4|exe,dev,doc,nls
 no|quisp||exe,dev,doc>dev,nls
 yes|readline|readline|exe,dev,doc,nls
 yes|replaceit||exe
-yes|retrovol|retrovol|exe
+yes|retrovol||exe
 no|ripoff||exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls
 no|rox-clib||exe,dev,doc,nls
 yes|rox_filer||exe
 no|rox-menu||exe