Check-in [b6fc849376]
Not logged in

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

Overview

SHA1 Hash:b6fc8493769442eddf5ca115fc8315680b5c46a4
Date: 2012-03-17 19:23:25
User: BarryK
Comment:lots of fixes. especially, xorgwizard correctly sets keyboard layout, model and variant

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/sudoers

@@ -4,11 +4,11 @@
 # Failure to use 'visudo' may result in syntax or file permission errors
 # that prevent sudo from running.
 #
 # See the sudoers man page for the details on how to write a sudoers file.
 #
-#120110 added /usr/sbin/delayedrun to SYSTEM category. also, see sudo line added to script.
+# 120110 added /usr/sbin/delayedrun to SYSTEM category. also, see sudo line added to script.
 
 # Host alias specification
 
 # User alias specification
 

Changes to woof-code/rootfs-skeleton/usr/bin/pman

@@ -1,7 +1,8 @@
 #!/bin/sh
-#Barry Kauler 2006. written for puppyos, www.puppyos.com
+#Barry Kauler 2006. written for puppy, www.puppylinux.com
+#license gpl2 (ref: /usr/share/doc/legal)
 #a script to replace the man command.
 #w464 updated for PKGS_HOMEPAGES homepages db.
 #w482 changed die.net/man/1 url.
 # 24aug09 i18n by Shinobar
 # 27aug09 page1-8 for JM search
@@ -10,10 +11,12 @@
 #  5sep09 read man pages with devx
 # 12sep09 remove extentions such as .txt, .html, excute .sh
 #v431 fix looking up linux.die.net
 # v431JP suppress some locale if no X
 # dev431JPbeta2: man [section] name
+#120317 L18L: enable correct Character Encoding: UTF-8
+
 CREDIT="man for puppy linux - 22 Dec 2009"
 if [ -x /usr/local/bin/man ];then
   CREDIT="$CREDIT
 If you like to use original version of man, try '/usr/local/bin/man'.
 "
@@ -83,10 +86,13 @@
      if echo "$FNDMAN" | grep -q '.gz$' ;then
        zcat "$FNDMAN" | man2html > $TMPFILE
      else
        man2html "$FNDMAN" > $TMPFILE
      fi
+     #120317 L18L: enable correct Character Encoding: UTF-8
+     sed 's/<\/HEAD><BODY>/<meta http-equiv="Content-Type" content="text\/html; charset=UTF-8" \/><\/HEAD><BODY>/' $TMPFILE > ${TMPFILE}1
+     mv -f ${TMPFILE}1 $TMPFILE
      $HTMLVIEWER $TMPFILE
      rm -f $TMPFILE
      exit
     ;;
    esac

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

@@ -29,11 +29,11 @@
 #120307 ROX-Filer now translated via /usr/share/doc/nls/ROX-Filer/ROX-Filer.pot
 #120308 ROX-Filer .mo files are not in standard location. workaround when intltool-update fails.
 #120309 binary executables, option to retain po file for later editing (instead of uncompile mo).
 #120313 langpack pet help msg improved.
 #120313 langpack pet: offer to find more po, mo, pot and t12s translations.
-#120316 scoop up more translations.
+#120316 scoop up more translations. 120317 L18L: add man pages.
 
 #***MOMANAGER IS ENGLISH ONLY (NOT GETTEXT'ED)***
 #it is for use by developers/translators with knowledge of english.
 
 PARAM1=""
@@ -1461,24 +1461,29 @@
    fi
    if [ -d /usr/share/locales/${ORIGLANG12} ];then
     mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/locales/${ORIGLANG12}
     cp -a -f /usr/share/locales/${ORIGLANG12}/* /root/langpack_${GENLANG}-${ADATE}/usr/share/locales/${ORIGLANG12}/
    fi
-  fi
-  #120316 puppy is usually built with english hunspell dictionary. other languages can be found,
-  #refer: http://bkhome.org/blog/?viewDetailed=02750, refer also pinstall.sh of langpack.
-  for ONEHUN in `find /usr/share/hunspell -mindepth 1 -maxdepth 1 -type f -name "${ORIGLANG1}*.dic" -o -name "${ORIGLANG12}*.aff" | tr '\n' ' '`
-  do
-   HUNBASE="`basename $ONEHUN`"
-   mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/hunspell
-   cp -a -f $ONEHUN /root/langpack_${GENLANG}-${ADATE}/usr/share/hunspell/
-   #maybe need symlinks for apps that use myspell, refer to example hunspell-en-us-2.pet ...
-   mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/enchant/myspell
-   ln -snf ../../hunspell/${HUNBASE} /root/langpack_${GENLANG}-${ADATE}/usr/share/enchant/myspell/${HUNBASE}
-   mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/myspell/dicts
-   ln -snf ../../hunspell/${HUNBASE} /root/langpack_${GENLANG}-${ADATE}/usr/share/myspell/dicts/${HUNBASE}
-  done
+   #120316 puppy is usually built with english hunspell dictionary. other languages can be found,
+   #refer: http://bkhome.org/blog/?viewDetailed=02750, refer also pinstall.sh of langpack.
+   for ONEHUN in `find /usr/share/hunspell -mindepth 1 -maxdepth 1 -type f -name "${ORIGLANG1}*.dic" -o -name "${ORIGLANG12}*.aff" | tr '\n' ' '`
+   do
+    HUNBASE="`basename $ONEHUN`"
+    mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/hunspell
+    cp -a -f $ONEHUN /root/langpack_${GENLANG}-${ADATE}/usr/share/hunspell/
+    #maybe need symlinks for apps that use myspell, refer to example hunspell-en-us-2.pet ...
+    mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/enchant/myspell
+    ln -snf ../../hunspell/${HUNBASE} /root/langpack_${GENLANG}-${ADATE}/usr/share/enchant/myspell/${HUNBASE}
+    mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/myspell/dicts
+    ln -snf ../../hunspell/${HUNBASE} /root/langpack_${GENLANG}-${ADATE}/usr/share/myspell/dicts/${HUNBASE}
+   done
+   #120317 L18L man pages...
+   if [ -d /usr/share/man/${ORIGLANG1} ];then
+    mkdir -p /root/langpack_${GENLANG}-${ADATE}/usr/share/man/${ORIGLANG1}
+    cp -a -f /usr/share/man/${ORIGLANG1}/man* /root/langpack_${GENLANG}-${ADATE}/usr/share/man/${ORIGLANG1}/
+   fi
+  fi
 
   sync
   cd /root
   dir2tgz /root/langpack_${GENLANG}-${ADATE}
   tgz2pet /root/langpack_${GENLANG}-${ADATE}.tar.gz

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

@@ -1,10 +1,11 @@
 #!/bin/sh
 #Barry Kauler, April 2011, GPL3 (/usr/share/doc/legal)
 #intended to be called by rc.shutdown on 1st boot, create a non-root saved session.
 #110918 run with or without X.
 #111003 change from Xdialog to pupdialog.
+#120317 L18L: set group/permissions for /dev/console
 
 . /etc/rc.d/PUPSTATE
 
 #ask for a username? i don't think that is required.
 NEWUSER='fido'
@@ -69,10 +70,14 @@
 busybox chmod 770 /dev/ptmx
 #set the setuid bit...
 busybox chmod u+s `which ddcprobe`
 [ "`which Xvesa`" ] && busybox chmod u+s `which Xvesa`
 [ "`which Xorg`" ] && busybox chmod u+s `which Xorg`
+
+#120317 L18L: ref http://murga-linux.com/puppy/viewtopic.php?t=71358&start=60
+chgrp users /dev/console
+chmod g+w /dev/console
 
 #pizzasgood... have done this in rootfs-skeleton...
 #have the "audio" group own the audio devices
 #chgrp audio ./dev/snd/* ./dev/audio ./dev/admmidi ./dev/adsp ./dev/aloadC0 ./dev/amidi ./dev/amixer ./dev/audio ./dev/audio0 ./dev/dmmidi ./dev/dsp ./dev/midi ./dev/mixer ./dev/music ./dev/sequencer ./dev/sequencer2 ./dev/sndstat ./dev/speaker
 #make sure only authorized users can do audio things

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

@@ -63,10 +63,11 @@
 #120131 rodin.s: added a couple more translations.
 #120213 /var/local/pup_event_icon_change_flag path changed from /tmp (see /sbin/clean_desk_icons)
 #120213 rodin.s: removed LANG=C prefix when run xinitrc_test.
 #120226 01micko: bugfix, call new script 'nouveau_unload'.
 #120301 it seems have to reload console font after exit from X.
+#120318 correctly set keyboard layout, model and variant.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=xorgwizard
 export OUTPUT_CHARSET=UTF-8
@@ -214,33 +215,37 @@
  #fi
 fi
 
 . /etc/rc.d/functions4puppy4 #v411 has choosemousefunc().
 
-#v2.0.0
-#read the console keymap (country layout), apply to xkb...
-CONSKEYMAP="`cat /etc/keymap | cut -c 1-2`"
-[ "$CONSKEYMAP" = "" ] && CONSKEYMAP="us"
-case $CONSKEYMAP in
-  az) XKEYMAP="fr" ;;     #azerty
-  wa) XKEYMAP="fr" ;;     #wangbe
-  dv) XKEYMAP="dvorak" ;; #dvorak
-  cr) XKEYMAP="cz" ;;     #croat
-  sl) XKEYMAP="si" ;;     #slovene v2.12 bugfix, changed from 'sk' to 'si' (sk is slovakia)
-  sv) XKEYMAP="se" ;;     #sweden
-  uk) XKEYMAP="gb" ;;     #united kingdom
-  *)  XKEYMAP="$CONSKEYMAP" ;;
-esac
-if [ -d /etc/X11/xkb/symbols/pc ];then #100127 fallback...
- if [ ! -f /etc/X11/xkb/symbols/pc/${XKEYMAP} ];then
-  if [ ! -f /etc/X11/xkb/symbols/${XKEYMAP} ];then
-   echo "ERROR: Console keyboard `cat /etc/keymap` no matching Xorg layout. PLEASE REPORT TO BK"
-   XKEYMAP='us'
-  fi
- fi
-fi
-
+#120318 broken, use shinobar's keymap-set...
+##v2.0.0 read the console keymap (country layout), apply to xkb...
+#CONSKEYMAP="`cat /etc/keymap | cut -c 1-2`"
+#[ "$CONSKEYMAP" = "" ] && CONSKEYMAP="us"
+#case $CONSKEYMAP in
+#  az) XKEYMAP="fr" ;;     #azerty
+#  wa) XKEYMAP="fr" ;;     #wangbe
+#  dv) XKEYMAP="dvorak" ;; #dvorak
+#  cr) XKEYMAP="cz" ;;     #croat
+#  sl) XKEYMAP="si" ;;     #slovene v2.12 bugfix, changed from 'sk' to 'si' (sk is slovakia)
+#  sv) XKEYMAP="se" ;;     #sweden
+#  uk) XKEYMAP="gb" ;;     #united kingdom
+#  *)  XKEYMAP="$CONSKEYMAP" ;;
+#esac
+#if [ -d /etc/X11/xkb/symbols/pc ];then #100127 fallback...
+# if [ ! -f /etc/X11/xkb/symbols/pc/${XKEYMAP} ];then
+#  if [ ! -f /etc/X11/xkb/symbols/${XKEYMAP} ];then
+#   echo "ERROR: Console keyboard `cat /etc/keymap` no matching Xorg layout. PLEASE REPORT TO BK"
+#   XKEYMAP='us'
+#  fi
+# fi
+#fi
+XKEYMAP='us'
+RETVALS="`keymap-set --xopt`"
+eval "$RETVALS" #ex: XKBMODEL="pc102", XKBLAYOUT="us", XKBVARIANT=""
+[ "$XKBLAYOUT" = "" ] && XKBLAYOUT='us'
+[ "$XKBMODEL" = "" ] && XKBMODEL='pc102'
 
 MAIN1="
 <window title=\"$(gettext 'Xorg Video Wizard')\">
 <hbox>
  <vbox>
@@ -753,16 +758,20 @@
  #+ ("\n"=newline ; "\t"=tab)
  IDENTIFIER="" ; XSECTION="" ; TEMPSECTION=""
  while read ALINE
  do
   case "$ALINE" in
-   EndSection*)
+   EndSection*) #120318 improved...
     if [ "$XSECTION" = "InputDevice" -a "$IDENTIFIER" = "Keyboard0" ] ; then
      TEMPSECTION="$TEMPSECTION
 	Option      \"XkbRules\" \"xorg\"
-	Option      \"XkbModel\" \"pc102\"
-	Option      \"XkbLayout\" \"$XKEYMAP\" #xkeymap0"
+	Option      \"XkbModel\" \"${XKBMODEL}\"
+	Option      \"XkbLayout\" \"${XKBLAYOUT}\" #xkeymap0"
+	if [ "$XKBVARIANT" ];then
+	 TEMPSECTION="$TEMPSECTION
+	Option         \"XkbVariant\" \"$XKBVARIANT\""
+	fi
     elif [ "$XSECTION" = "Monitor" -a "$IDENTIFIER" = "Monitor0" ] ; then
      TEMPSECTION="$TEMPSECTION
 	HorizSync    HORIZSYNC0
 	VertRefresh  VERTREFRESH0
 	#UseModes     \"Modes0\" #monitor0usemodes

Changes to woof-distro/Packages-puppy-noarch-official

@@ -47,11 +47,11 @@
 mscw-1|mscw|1||Setup|36K||mscw-1.pet|+alsa-lib,+gtkdialog3|Multiple Sound Card Wizard||||
 net_setup-20111016|net_setup|20111016||Setup|352K||net_setup-20111016.pet|+gtkdialog3|Network Wizard||||
 partview-2.2-2|partview|2.2-2||Filesystem|40K||partview-2.2-2.pet||Partview free space in drives||||
 pawdioconverter-1.2|pawdioconverter|1.2||Multimedia|208K||pawdioconverter-1.2.pet|+gtkdialog3,+sox|PawdioConverter audio conversion||||
 pbackup-3.1.9|pbackup|3.1.9||Utility|240K||pbackup-3.1.9.pet|+xdialog,+gtkdialog3,+dvd+rwtools,+cdrkit,+curl|Pbackup Backup and Sync||||
-pburn-3.4.3|pburn|3.4.3||Multimedia|336K||pburn-3.4.3.pet|+pfilesearch,+cdrkit,+dvd+rwtools,+gtkdialog4,+normalize,+vcdimager|Pburn CD/DVD/Blu-ray writer||||
+pburn-3.5.1|pburn|3.5.1||Multimedia|360K||pburn-3.5.1.pet|+gtkdialog,+core-utils,+cdrkit,+dvd+rw-tools,+ffmpeg,+pfilesearch,+dvdauthor,+vobcopy,+vamps,+vcdimager,+normalize,|Pburn CD/DVD/Blu-ray writer|||official|
 pcd-1.5|pcd|1.5||Multimedia|72K||pcd-1.5.pet|+gtkdialog3,+cdrkit|pCD CD-audio player||||
 pcdripper-3.9.3|pcdripper|3.9.3||Multimedia|96K||pcdripper-3.9.3.pet|+xdialog,+gtkdialog3,+cdrkit|Audio CD song ripper||||
 pctorrent-1.4|pctorrent|1.4||Internet|64K||pctorrent-1.4.pet|+ctorrent,+gtkdialog3|torrent client gui||||
 pdvdrsab-0.1|pdvdrsab|0.1||Multimedia|52K||pdvdrsab-0.1.pet|+gtkdialog3,+dvdauthor,+vobcopy,+vamps,+ffmpeg|dvd rip,shrink,author,burn||||
 peasypdf-1.4|peasypdf|1.4||Document|52K||peasypdf-1.4.pet||Build multi-page PDF documents||||
@@ -62,11 +62,11 @@
 phash-2|phash|2||Desktop|24K||phash-2.pet|+rox_filer|adds to rox right-click menu, calc md5sum/sha1sum of a file||||
 pmetatagger-2.1|pmetatagger|2.1||Multimedia|80K||pmetatagger-2.1.pet|+gtkdialog3,+id3lib,+vorbis-tools|audio file tag editor||||
 pmirror-0.5|pmirror|0.5||Utility|44K||pmirror-0.5.pet|+gtkdialog3,+mirdir|Pmirror backup a directory||||
 pmirrorget-0.1.1|pmirrorget|0.1.1||Internet|28K||pmirrorget-0.1.1.pet|+gtkdialog3|Website File Grabber||||
 pmusic1-1.8.3-1|pmusic1|1.8.3-1||Multimedia|424K||pmusic1-1.8.3-1.pet|+gtkdialog3,+ffmpeg|Pmusic audio player, old version, works with gtkdialog3 in some less-recent puppies||||
-pmusic-2.4.4|pmusic|2.4.4||Multimedia|660K||pmusic-2.4.4.pet|+gtkdialog4,+ffmpeg,+cdrkit,+libid3tag,+wget,+pschedule,+pburn,+streamripper|player manager grabber|||official|
+pmusic-2.5.0|pmusic|2.5.0||Multimedia|656K||pmusic-2.5.0.pet|+gtkdialog4,+ffmpeg,+cdrkit,+libid3tag,+wget,+pschedule,+pburn,+streamripper|-player -manager -grabber|||official|
 pmusic_index_radio-2011.06.26-1|pmusic_index_radio|2011.06.26-1||Multimedia|544K||pmusic_index_radio-2011.06.26-1.pet|+pmusic|Pmusic radio index||||
 pnethood-0.6.8-2|pnethood|0.6.8-2||Network|100K||pnethood-0.6.8-2.pet|+nbtscan,+mountcifs,+gtkdialog4,+samba_client|connect to samba shares||||
 pplog-1.1.2-2|pplog|1.1.2-2||Personal|188K||pplog-1.1.2-2.pet|+perl_tiny,+hiawatha|PPLOG personal blog||||
 pprocess-2.2.4-1|pprocess|2.2.4-1||System|60K||pprocess-2.2.4-1.pet|+gtkdialog4|Pprocess process manager||||
 precord-7.0.1|precord|7.0.1||Multimedia|88K||precord-7.0.1.pet|+ffmpeg,+gtkdialog3,+vorbis-tools,+lame,+alsa-utils|Precord mp3 recorder/player||||

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

@@ -200,12 +200,12 @@
 faad2-2.7-w5c|faad2|2.7-w5c||BuildingBlock|284K||faad2-2.7-w5c.pet||An MPEG4 AAC decoder|puppy|wary5||
 faad2_DEV-2.7-w5c|faad2_DEV|2.7-w5c||BuildingBlock|356K||faad2_DEV-2.7-w5c.pet|+faad2|An MPEG4 AAC decoder|puppy|wary5||
 faad2_DOC-2.7-w5c|faad2_DOC|2.7-w5c||BuildingBlock|24K||faad2_DOC-2.7-w5c.pet||An MPEG4 AAC decoder|puppy|wary5||
 fbset-2.1-w5c|fbset|2.1-w5c||Utility|40K||fbset-2.1-w5c.pet||A utility to show or change the settings of the frame buffer|puppy|wary5||
 fbset_DOC-2.1-w5c|fbset_DOC|2.1-w5c||Utility|40K||fbset_DOC-2.1-w5c.pet||A utility to show or change the settings of the frame buffer|puppy|wary5||
-ffmpeg-20111002-w5c|ffmpeg|20111002-w5c||BuildingBlock|5464K||ffmpeg-20111002-w5c.pet|+libvpx,+opencore-amr,+freetype,+libogg,+libvorbis,+lame,+faac,+speex,+x264,+libdc1394,+libtheora,+xvidcore,+schroedinger|multimedia player and converter and libraries|puppy|wary5||
-ffmpeg_DEV-20111002-w5c|ffmpeg_DEV|20111002-w5c||BuildingBlock|6800K||ffmpeg_DEV-20111002-w5c.pet|+ffmpeg|multimedia player converter and libraries|puppy|wary5||
+ffmpeg-20111002-1-w5c|ffmpeg|20111002-1-w5c||BuildingBlock|5464K||ffmpeg-20111002-1-w5c.pet|+libcdio,+libvpx,+opencore-amr,+freetype,+libogg,+libvorbis,+lame,+faac,+speex,+x264,+libdc1394,+libtheora,+xvidcore,+schroedinger|multimedia player and converter and libraries|puppy|wary5||
+ffmpeg_DEV-20111002-1-w5c|ffmpeg_DEV|20111002-1-w5c||BuildingBlock|6800K||ffmpeg_DEV-20111002-1-w5c.pet|+ffmpeg|multimedia player converter and libraries|puppy|wary5||
 fget-0.4.1-w5c|fget|0.4.1-w5c||Internet|44K||fget-0.4.1-w5c.pet|+dietlibc|A minimal httpftp download tool for boot disks|puppy|wary5||
 file-5.03-w5c|file|5.03-w5c||BuildingBlock|1896K||file-5.03-w5c.pet||File type identification utility|puppy|wary5||
 file_DOC-5.03-w5c|file_DOC|5.03-w5c||BuildingBlock|72K||file_DOC-5.03-w5c.pet||File type identification utility|puppy|wary5||
 findutils-4.4.2-w5c|findutils|4.4.2-w5c||BuildingBlock|152K||findutils-4.4.2-w5c.pet||GNU find utils|puppy|wary5||
 findutils_DOC-4.4.2-w5c|findutils_DOC|4.4.2-w5c||BuildingBlock|508K||findutils_DOC-4.4.2-w5c.pet||GNU find utils|puppy|wary5||

Changes to woof-distro/x86/wary/testing/DISTRO_SPECS

@@ -1,13 +1,13 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Wary Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.2.2.9
+DISTRO_VERSION=5.2.2.10
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='puppy'
 #Prefix for some filenames: exs: warysave.2fs, wary-5.1.3.4.sfs
 DISTRO_FILE_PREFIX='wary'
 #The version of the distro whose binary packages were used to build this distro:
 DISTRO_COMPAT_VERSION='wary5'
 #the kernel pet package used:
 DISTRO_KERNEL_PET='linux_kernel-2.6.32.55-uni-i486-unionfs-modems-w5.pet'
 DISTRO_TARGETARCH='x86'