Check-in [59d09dfc1a]
Not logged in

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

Overview

SHA1 Hash:59d09dfc1a9e0c2a8775842e993fc2e8d46314e2
Date: 2012-05-14 01:32:43
User: BarryK
Comment:Karl Godt: shutdownconfig: save-file must be big enough to hold all files of session

Tags And Properties
Changes

Changes to woof-code/packages-templates/pciutils/usr/lib/PLUSEXTRADIRS


Changes to woof-code/packages-templates/xorg_base/FIXUPHACK

@@ -22,12 +22,12 @@
  ln -s mesa/libGL.so.1 usr/lib/libGL.so.1
  ln -s mesa/libGL.so usr/lib/libGL.so
  ln -s mesa/libGL.so.1.2 usr/lib/libGL.so.1.2
 fi
 
-#120406 gxmessage pkg creates xmessage symlink to it. get real xmessage out of the way...
+#120406 gxmessage pkg creates xmessage symlink to it (in pinstall.sh). get real xmessage out of the way...
 if [ -f usr/bin/xmessage ];then
  if [ ! -h usr/bin/xmessage  ];then
   mkdir -p usr/X11R7/bin
   mv -f usr/bin/xmessage usr/X11R7/bin/
  fi
 fi

Deleted woof-code/packages-templates/xorg_base/usr/bin/gxmessage

Changes to woof-code/rootfs-skeleton/sbin/pup_event_frontend_d

@@ -33,11 +33,11 @@
 #120129 karl godt: fix ZOMBIES, see http://murga-linux.com/puppy/viewtopic.php?t=71767&start=420. see also rc.shutdown, pmount, drive_all.
 #120131 rodin.s: internationalized. BK: note, rodin.s's script different from that in Woof, applied changes line-by-line.
 #120201 more gettext added.
 #120215 rodin.s: gettext fixes on a couple of lines.
 #120503 the label "mmcblk0p1" (SD memory cards via mmc interface) is too long, reduce to "mm0p1".
-#120512 Karl Godt: do not save when compiling, add: make, cc, new2dir.
+#120512 Karl Godt: do not save when compiling, add: make, cc, new2dir. 120513 add -w option.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110513
 
 export TEXTDOMAIN=pup_event_frontend_d
 export OUTPUT_CHARSET=UTF-8
@@ -778,12 +778,12 @@
   fi
  fi
  #some apps should not be disturbed by this background stuff...
  RUNPS="`ps`"
  #w482 add xorriso... 111228 added removepreview.sh (in /usr/local/petget) but probably test for "petget" is already enough...
- #120512 Karl Godt: do not save when compiling, add: make, cc, new2dir
- [ "`echo "$RUNPS" | grep -E 'make|cc|new2dir|xorriso|xorrecord|xine|petget|wget|axel|dotpup|mplayer|gcurl|gimv|burniso2cd|growisofs|cdrecord|pcdripper|xfmedia|xmms|ripoff|pdvdrsab|pburn|mhwaveedit|installpkg\.sh|downloadpkgs\.sh|removepreview\.sh'`" != "" ] && continue
+ #120512 Karl Godt: do not save when compiling, add: make, cc, new2dir. 120513 add -w option, and gcc, imake, cmake, gxine, gmplayer...
+ [ "`echo "$RUNPS" | grep -w -E 'make|cc|gcc|imake|cmake|new2dir|xorriso|xorrecord|xine|gxine|petget|wget|axel|dotpup|mplayer|gmplayer|gcurl|gimv|burniso2cd|growisofs|cdrecord|pcdripper|xfmedia|xmms|ripoff|pdvdrsab|pburn|mhwaveedit|installpkg\.sh|downloadpkgs\.sh|removepreview\.sh'`" != "" ] && continue
 
  [ "$AUTOUNMOUNT" = "true" ] && auto_unmount_func #v424 automatially unmount a partition if no longer being used (AUTOUNMOUNT set in eventmanager).
 
  #monitor free memory, periodic save of tmpfs top layer...
  case $PUPMODE in

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

@@ -20,10 +20,11 @@
 #120323 replace 'xmessage' with 'pupmessage'.
 #120327 only show "*RECOMMENDED*" partition for savefile if >256MB free.
 #120327 expBOOTDRV needs to be exported to rc.shutdown.
 #120427 01micko: support ext4 in save-file. 120428
 #120512 Karl Godt: some parameters missing from lines 626, 630, 642.
+#120514 Karl Godt: precaution, save-file must be bigger than size used in ram.
 
 if [ ! $DISPLAY ];then
  export LANG=C #110928 console shutdown using 'dialog', disable i18n.
 else
  export OUTPUT_CHARSET=UTF-8
@@ -65,10 +66,14 @@
  TITLEPARAM='--title'
  BACKGROUNDYELLOW=''
  BACKGROUNDPINK=''
  BACKGROUNDORANGE=''
 fi
+
+#120514 Karl Godt: precaution, save-file must be at least this big...
+DU_INITRD_PUP_RW=0
+[ "`mount | grep ' /initrd/pup_rw '`" != "" ] && DU_INITRD_PUP_RW=`du -B 1M -c /initrd/pup_rw |tail -n1 |awk '{print $1}'` #M=1024,MB=1000
 
 choosepartfunc() {
  #dialog to choose what partition to create ${DISTRO_FILE_PREFIX}save.2fs on...
  T_admin="$(gettext 'administrator')"
  T_fidomsg="`eval_gettext \"fido CURRENTLY EXPERIMENTAL STATUS, PLEASE CHOOSE \\\${T_admin}\"`"
@@ -277,15 +282,19 @@
  echo "$PUPSAVE" #TEST
  return 0
 } #end choosepartfunc
 
 choosesizefunc(){
- local KFREE SIZELIST NUM CHOICES FLABEL SLABEL ACHOICE KSIZE
+ local KFREE SIZELIST NUM CHOICES FLABEL SLABEL ACHOICE KSIZE VALUES VALIDS val
  KFREE=$1 ; SIZELIST="" ; NUM=1 ; CHOICES=""
  FLABEL="`expr $KFREE \/ 1024`MB"
  [ $KFREE -ge 1048576 ] && FLABEL="`dc $KFREE 1048576 \/ p`GB"
- for ACHOICE in 32 64 128 256 512 768 1024 1280 2048 4096
+ VALUES='32 64 128 256 512 768 1024 1280 2048 4096'
+ for val in $VALUES;do
+ [ "$val" -gt "$DU_INITRD_PUP_RW" ] && VALIDS="$VALIDS $val"
+ done
+ for ACHOICE in $VALIDS
  do
   KSIZE=`expr $ACHOICE \* 1024`
   SLABEL="${ACHOICE}MB"
   [ $ACHOICE -ge 1024 ] && SLABEL="`dc $ACHOICE 1024 \/ p`GB"
   if [ $KSIZE -lt $KFREE ];then

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

@@ -67,11 +67,11 @@
 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.5.3|pmusic|2.5.3||Multimedia|668K||pmusic-2.5.3.pet|+gtkdialog4,+ffmpeg,+cdrkit,+wget,+pschedule,+pburn,+streamripper,+pfilesearch|-Player -Manaager -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||||
+pplog-1.1.3|pplog|1.1.3||Personal|188K||pplog-1.1.3.pet|+perl_tiny,+httpd|PPLOG personal blog, forked from the official 1.1.2 pplog project||||
 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||||
 prename-0.7|prename|0.7||Filesystem|48K||prename-0.7.pet|+gtkdialog3|batch file renamer||||
 programchooser-0.3|programchooser|0.3||BuildingBlock|76K||programchooser-0.3.pet|+gtkdialog3|used by wallpaper-setter||||
 pschedule-1.0.2|pschedule|1.0.2||System|84K||pschedule-1.0.2.pet|+gtkdialog3|Pschedule task on time||||

Changes to woof-distro/arm/Packages-puppy-armv7-official

@@ -13,10 +13,11 @@
 dhcpcd-5.2.12-armv7|dhcpcd|5.2.12-armv7||BuildingBlock|176K||dhcpcd-5.2.12-armv7.pet|+linux_kernel&ge2.6.32|network connection client daemon, requires kernel 2.6.32 or greater||||
 dialog-1.1-20111020-widechar-armv7|dialog|1.1-20111020-widechar-armv7||BuildingBlock|164K||dialog-1.1-20111020-widechar-armv7.pet|+ncurses|create text-mode dialog boxes from scripts, compiled against libncursesw for wide-char unicode support||||
 didiwiki-0.8-armv7|didiwiki|0.8-armv7||Personal|92K||didiwiki-0.8-armv7.pet||DidiWiki personal wiki||||
 embutils-0.19-static-armv7|embutils|0.19-static-armv7||BuildingBlock|556K||embutils-0.19-static-armv7.pet||Stripped down utilities for embedded use, compiled statically with uclibc||||
 foomatic-filters-4.0.7-armv7|foomatic-filters|4.0.7-armv7||BuildingBlock|156K||foomatic-filters-4.0.7-armv7.pet||Foomatic filter convert PostScript data into printers native format||||
+fossil-1.20-armv7|fossil|1.20-armv7||BuildingBlock|952K||fossil-1.20-armv7.pet||Fossil Content Management System, runs in any armv7 linux||||
 fpm2-0.75-armv7|fpm2|0.75-armv7||Personal|208K||fpm2-0.75-armv7.pet|+gtk+|Figaro password manager||||
 freememapplet_tray-2.3.1-armv7|freememapplet_tray|2.3.1-armv7||Desktop|8K||freememapplet_tray-2.3.1-armv7.pet|+gtk+|display personal-storage free memory in tray||||
 gcolorsel-1.0.0-armv7|gcolorsel|1.0.0-armv7||Graphic|44K||gcolorsel-1.0.0-armv7.pet|+gtk+|Color chooser and picker||||
 gcolorsel_DOC-1.0.0-armv7|gcolorsel_DOC|1.0.0-armv7||Graphic|20K||gcolorsel_DOC-1.0.0-armv7.pet||Color picker window||||
 getcurpos-2007-armv7|getcurpos|2007-armv7||BuildingBlock|3K||getcurpos-2007-armv7.pet||reads mouse pointer coords||||

Changes to woof-distro/arm/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze

@@ -142,10 +142,11 @@
 no|flac|flac,libflac8,libflac-dev|exe,dev,doc,nls
 yes|flashplayer||exe
 yes|flex|flex|exe>dev,dev,doc,nls
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
 yes|foomatic-filters|foomatic-filters|exe,dev,doc,nls
+yes|fossil||exe>dev,dev,doc>dev,nls
 yes|fotoxx||exe,dev>null,doc,nls
 yes|fpm2|fpm2|exe
 yes|freememapplet_tray||exe
 yes|freetype|libfreetype6,libfreetype6-dev|exe,dev,doc,nls
 yes|fribidi|libfribidi0,libfribidi-dev|exe,dev,doc,nls

Changes to woof-distro/arm/ubuntu/lucid/DISTRO_PKGS_SPECS-ubuntu-lucid

@@ -153,11 +153,11 @@
 no|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
 no|foomatic-db|foomatic-db|exe,dev,doc,nls
 no|foomatic-filters|foomatic-filters|exe,dev,doc,nls
 yes|foomatic-filters||exe
-no|fossil||exe>dev,dev,doc>dev,nls
+yes|fossil||exe>dev,dev,doc>dev,nls
 no|fotoxx||exe,dev>null,doc,nls
 yes|fpm2|fpm2|exe
 yes|freememapplet_tray||exe
 yes|freetype|libfreetype6,libfreetype6-dev|exe,dev,doc,nls
 yes|fribidi|libfribidi0,libfribidi-dev|exe,dev,doc,nls

Changes to woof-distro/arm/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -152,11 +152,11 @@
 no|flsynclient||exe
 yes|foomatic-db-engine|foomatic-db-engine|exe,dev,doc,nls
 no|foomatic-db|foomatic-db|exe,dev,doc,nls
 no|foomatic-filters|foomatic-filters|exe,dev,doc,nls
 yes|foomatic-filters||exe
-no|fossil||exe>dev,dev,doc>dev,nls
+yes|fossil||exe>dev,dev,doc>dev,nls
 no|fotoxx||exe,dev>null,doc,nls
 yes|fpm2|fpm2|exe
 yes|freememapplet_tray||exe
 yes|freetype|libfreetype6,libfreetype6-dev|exe,dev,doc,nls
 yes|fribidi|libfribidi0,libfribidi-dev|exe,dev,doc,nls
@@ -354,11 +354,11 @@
 yes|libmng|libmng1,libmng-dev|exe,dev,doc,nls
 no|libmozjs0d||exe| #just provides symlinks into seamonkey.
 yes|libnl|libnl1,libnl-dev,libnl-doc|exe,dev,doc,nls
 yes|libnl3|libnl-3-200,libnl-3-dev,libnl-cli-3-200,libnl-cli-3-dev,libnl-genl-3-200,libnl-genl-3-dev,libnl-nf-3-200,libnl-nf-3-dev,libnl-route-3-200,libnl-route-3-dev|exe,dev,doc,nls
 yes|libnotify|libnotify4,libnotify-dev|exe,dev,doc,nls
-no|libofx|libofx4,libofx-dev|exe,dev,doc,nls|+opensp
+yes|libofx|libofx4,libofx-dev|exe,dev,doc,nls| #needed by homebank.
 yes|libopencore|libopencore-amrnb0,libopencore-amrnb-dev,libopencore-amrwb0,libopencore-amrwb-dev|exe,dev,doc,nls
 yes|libogg|libogg0,libogg-dev|exe,dev,doc,nls
 yes|liboil|liboil0.3,liboil0.3-dev|exe,dev,doc,nls
 yes|libpaper|libpaper1,libpaper-dev,libpaper-utils|exe,dev,doc,nls
 yes|libpcap|libpcap0.8,libpcap0.8-dev|exe,dev,doc,nls
@@ -400,10 +400,11 @@
 no|libxfce4util|libxfce4util4,libxfce4util-dev|exe,dev,doc,nls
 no|libxfcegui4|libxfcegui4-4,libxfcegui4-dev|exe,dev,doc,nls
 yes|libxml2|libxml2,libxml2-dev|exe,dev,doc,nls
 yes|libxml2-utils|libxml2-utils|exe>dev,dev,doc,nls
 yes|libxslt|libxslt1.1,libxslt1-dev,xsltproc|exe,dev,doc,nls
+no|libyahoo2||exe,dev,doc,nls| #needed by ayttm.
 yes|linux_firewall||exe
 no|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls
 yes|lsb-base|lsb-base|exe,dev,doc,nls
@@ -465,12 +466,12 @@
 yes|numlockx||exe,dev,doc,nls|
 no|obconf||exe,dev>null,doc,nls|+openbox
 no|openbox||exe,dev>null,doc,nls
 yes|openldap|libldap-2.4-2,libldap2-dev|exe,dev,doc,nls
 yes|openslp|libslp1,libslp-dev|exe,dev,doc,nls
-no|opensp|libosp5|exe,dev,doc,nls
-no|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|+sgml-base,+sgml-data,+xml-core
+yes|opensp-runtime|libosp5|exe,dev,doc,nls| #needed by libofx and homebank.
+yes|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|+sgml-base,+sgml-data,+xml-core
 yes|openssh_client|openssh-client|exe,dev,doc,nls
 yes|openssl0|libssl0.9.8|exe,dev>null,doc,nls| #old version.
 yes|openssl|openssl,libssl1.0.0,libssl-dev|exe,dev,doc,nls
 yes|orbit2|liborbit2,liborbit2-dev|exe,dev,doc,nls
 yes|orc|liborc-0.4-0,liborc-0.4-dev|exe,dev,doc,nls| #needed by mplayer.
@@ -566,10 +567,11 @@
 yes|rox_filer||exe
 no|rp_pppoe_cli||exe
 no|rpl||exe
 yes|rsync|rsync|exe>dev,dev,doc,nls
 yes|rsync|rsync|exe,dev>null,doc>null,nls>null
+yes|rtmpdump|librtmp0,librtmp-dev|exe,dev,doc,nls
 yes|rubix||exe
 no|rxvt|rxvt|exe,dev>null,doc,nls
 no|rxvt||exe,dev>null,doc,nls
 yes|rxvt-unicode||exe,dev>null,doc,nls
 no|rxvt-unicode|rxvt-unicode-lite|exe,dev,doc,nls| #note, need to fix this, would not start, reported missing font -- /root/.Xdefaults specifies xft font.

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -358,11 +358,11 @@
 yes|libmng|libmng1,libmng-dev|exe,dev,doc,nls
 no|libmozjs0d||exe| #just provides symlinks into seamonkey.
 yes|libnl|libnl1,libnl-dev,libnl-doc|exe,dev,doc,nls| #this was used in lucid, perhaps not needed now.
 yes|libnl3|libnl-3-200,libnl-3-dev,libnl-cli-3-200,libnl-cli-3-dev,libnl-genl-3-200,libnl-genl-3-dev,libnl-nf-3-200,libnl-nf-3-dev,libnl-route-3-200,libnl-route-3-dev|exe,dev,doc,nls
 yes|libnotify|libnotify4,libnotify-dev|exe,dev,doc,nls
-no|libofx|libofx4,libofx-dev|exe,dev,doc,nls|+opensp
+yes|libofx|libofx4,libofx-dev|exe,dev,doc,nls| #needed by homebank.
 yes|libopencore|libopencore-amrnb0,libopencore-amrnb-dev,libopencore-amrwb0,libopencore-amrwb-dev|exe,dev,doc,nls| #was libopencore dep for ffmpeg3 or mplayer2--can delete if mplayer2
 yes|libogg|libogg0,libogg-dev|exe,dev,doc,nls
 yes|liboil|liboil0.3,liboil0.3-dev|exe,dev,doc,nls
 yes|libpaper|libpaper1,libpaper-dev,libpaper-utils|exe,dev,doc,nls
 yes|libpcap|libpcap0.8,libpcap0.8-dev|exe,dev,doc,nls
@@ -404,10 +404,11 @@
 no|libxfce4util|libxfce4util4,libxfce4util-dev|exe,dev,doc,nls
 no|libxfcegui4|libxfcegui4-4,libxfcegui4-dev|exe,dev,doc,nls
 yes|libxml2|libxml2,libxml2-dev|exe,dev,doc,nls
 yes|libxml2-utils|libxml2-utils|exe>dev,dev,doc,nls
 yes|libxslt|libxslt1.1,libxslt1-dev,xsltproc|exe,dev,doc,nls
+yes|libyahoo2||exe,dev,doc,nls| #needed by ayttm.
 yes|linux_firewall||exe
 yes|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
 yes|linux_headers||exe>dev,dev,doc,nls
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls
@@ -471,12 +472,12 @@
 yes|numlockx||exe| #needed by shinobars firstrun.
 no|obconf||exe,dev>null,doc,nls|+openbox
 no|openbox||exe,dev>null,doc,nls
 yes|openldap|libldap-2.4-2,libldap2-dev|exe,dev,doc,nls
 yes|openslp|libslp1,libslp-dev|exe,dev,doc,nls
-no|opensp|libosp5|exe,dev,doc,nls
-no|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|+sgml-base,+sgml-data,+xml-core
+yes|opensp-runtime|libosp5|exe,dev,doc,nls| #needed by libofx and homebank.
+yes|opensp|opensp,libosp-dev|exe>dev,dev,doc,nls|+sgml-base,+sgml-data,+xml-core
 yes|openssh_client|openssh-client|exe,dev,doc,nls
 yes|openssl0|libssl0.9.8|exe,dev>null,doc,nls| #old version.
 yes|openssl|openssl,libssl1.0.0,libssl-dev|exe,dev,doc,nls
 yes|orbit2|liborbit2,liborbit2-dev|exe,dev,doc,nls
 yes|orc|liborc-0.4-0,liborc-0.4-dev|exe,dev,doc,nls| #needed by mplayer.
@@ -566,10 +567,11 @@
 yes|rox_filer||exe
 yes|rp_pppoe_cli||exe
 yes|rpl||exe
 yes|rsync|rsync|exe>dev,dev,doc,nls
 yes|rsync|rsync|exe,dev>null,doc>null,nls>null
+yes|rtmpdump|librtmp0,librtmp-dev|exe,dev,doc,nls
 yes|rubix||exe
 no|rxvt|rxvt|exe,dev>null,doc,nls
 no|rxvt||exe,dev>null,doc,nls
 yes|rxvt-unicode||exe,dev>null,doc,nls
 no|samba_client|samba,samba-common,smbfs,smbclient|exe,dev>null,doc,nls

Changes to woof-distro/x86/ubuntu/precise/DISTRO_SPECS

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Precise Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.2.52
+DISTRO_VERSION=5.2.54
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='ubuntu'
 #Prefix for some filenames: exs: precisesave.2fs, precise-4.99.0.sfs
 DISTRO_FILE_PREFIX='precise'
 #The version of the distro whose binary packages were used to build this distro: