Check-in [617697370d]
Not logged in

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

Overview

SHA1 Hash:617697370dc698c328abb9cbe0077a0d369aca61
Date: 2012-09-07 09:16:10
User: BarryK
Comment:hack for vlc (media player) to run as root, both when built-in and deb installed later

Tags And Properties
Changes

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

@@ -1,14 +1,24 @@
 
-#hack for slackware 13.1: i compiled mplayer against a later libcdio...
-[ -e usr/lib/libcdio.so.7 ] && ln -s libcdio.so.7 usr/lib/libcdio.so.12
-[ -e usr/lib/libiso9660.so.5 ] && ln -s libiso9660.so.5 usr/lib/libiso9660.so.7
+##hack for slackware 13.1: i compiled mplayer against a later libcdio...
+#[ -e usr/lib/libcdio.so.7 ] && ln -s libcdio.so.7 usr/lib/libcdio.so.12
+#[ -e usr/lib/libiso9660.so.5 ] && ln -s libiso9660.so.5 usr/lib/libiso9660.so.7
 
 #hack for debian squeezy...
 LIBCDIOEXIST="`find usr/lib -maxdepth 1 -name 'libcdio.so.*' | head -n 1`"
 BASEEXIST="`basename $LIBCDIOEXIST`"
 if [ ! -e usr/lib/libcdio.so.7 ];then
  ln -s $BASEEXIST usr/lib/libcdio.so.7
 fi
 if [ ! -e usr/lib/libcdio.so.12 ];then
  ln -s $BASEEXIST usr/lib/libcdio.so.12
+fi
+
+#120907
+LIB9660EXIST="`find usr/lib -maxdepth 1 -name 'libiso9660.so.*' | head -n 1`"
+BASEEXIST="`basename $LIB9660EXIST`"
+if [ ! -e usr/lib/libiso9660.so.7 ];then
+ ln -s $BASEEXIST usr/lib/libiso9660.so.7
+fi
+if [ ! -e usr/lib/libiso9660.so.5 ];then
+ ln -s $BASEEXIST usr/lib/libiso9660.so.5
 fi

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

@@ -1,1 +1,11 @@
 
+#120907 vlc in debian/ubuntu configured to not run as root (it is a pre-compile configure option to enable running as root).
+#this hack will fix it...
+#note, this code is also in /usr/local/petget/hacks-postinstall.sh.
+if [ -f /usr/bin/bbe ];then #bbe is a sed-like utility for binary files.
+ if [ -f usr/bin/vlc  ];then
+  bbe -e 's/geteuid/getppid/' usr/bin/vlc > /tmp/vlc-temp1
+  mv -f /tmp/vlc-temp1 usr/bin/vlc
+  chmod 755 usr/bin/vlc
+ fi
+fi

Changes to woof-code/packages-templates/vlc/PLUSEXTRADIRS


Changes to woof-code/rootfs-skeleton/usr/local/petget/downloadpkgs.sh

@@ -16,11 +16,11 @@
 #101118 improve test fail and exit number.
 #110812 hack for pets that are in quirky site at ibiblio.
 #120203 BK: internationalized.
 #120313 'noarch' repo is on quirky ibiblio site.
 #120515 support download from arm gentoo compat-distro binary pkgs on ibiblio quirky site.
-#120904 vertical scrollbar for successful-install window.
+#120904 vertical scrollbar for successful-install window. 120907 another.
 
 export TEXTDOMAIN=petget___downloadpkgs.sh
 export OUTPUT_CHARSET=UTF-8
 
 #export LANG=C
@@ -108,14 +108,17 @@
 
  PKGNAMES="`cat $ONELIST | cut -f 1 -d '|' | tr '\n' ' '`"
 
  [ "$PKGNAMES" = "" -o "$PKGNAMES" = " " ] && continue #100921
 
+ #120907 scrollbar...
  export DEPS_DIALOG="<window title=\"$(gettext 'Puppy Package Manager: download')\" icon-name=\"gtk-about\">
 <vbox>
  <text><label>$(gettext 'You have chosen to download these packages:')</label></text>
- <text use-markup=\"true\"><label>\"<b>${PKGNAMES}</b>\"</label></text>
+ <vbox scrollable=\"true\" height=\"100\">
+  <text use-markup=\"true\"><label>\"<b>${PKGNAMES}</b>\"</label></text>
+ </vbox>
  <text><label>$(gettext "Please choose which URL you would like to download them from. Choose 'LOCAL FOLDER' if you have already have them on this computer (on hard drive, USB drive or CD):")</label></text>
 
  <frame ${LISTNAMECUT}>
   ${REPOBUTTONS}
   <radiobutton><label>$(gettext 'LOCAL FOLDER')</label><variable>RADIO_URL_LOCAL</variable></radiobutton>
@@ -134,11 +137,11 @@
  </hbox>
 </vbox>
 </window>
 "
 
- RETPARAMS="`gtkdialog3 --program=DEPS_DIALOG`"
+ RETPARAMS="`gtkdialog4 --program=DEPS_DIALOG`"
  #RETPARAMS ex:
  #RADIO_URL_LOCAL="false"
  #RADIO_URL_repository.slacky.eu="true"
  #EXIT="BUTTON_PKGS_DOWNLOAD"
 

Changes to woof-code/rootfs-skeleton/usr/local/petget/hacks-postinstall.sh

@@ -1,1 +1,21 @@
+#!/bin/sh
+#this is for hacks needed to fix a package, that might not have been done elsewhere.
+#package that has just been installed is passed in on commandline.
+
+INSTALLEDPKG="$1" #ex: vlc_2.0.3-0ubuntu0.12.04.1_i386, without .deb
+
+case $INSTALLEDPKG in
+ vlc_*)
+  #120907 vlc in debian/ubuntu configured to not run as root (it is a pre-compile configure option to enable running as root).
+  #this hack will fix it...
+  #note, this code is also in FIXUPHACK in 'vlc' template.
+  if [ -f /usr/bin/bbe ];then #bbe is a sed-like utility for binary files.
+   if [ -f /usr/bin/vlc  ];then
+    bbe -e 's/geteuid/getppid/' /usr/bin/vlc > /tmp/vlc-temp1
+    mv -f /tmp/vlc-temp1 /usr/bin/vlc
+    chmod 755 /usr/bin/vlc
+   fi
+  fi
+ ;;
+esac
 

Changes to woof-code/rootfs-skeleton/usr/local/petget/installpkg.sh

@@ -29,10 +29,11 @@
 #120219 was not properly internationalized (there was no TEXTDOMAIN).
 #120523 may need to run gio-query-modules and/or glib-compile-schemas. (refer also rc.update and 3builddistro)
 #120628 fix Categories= assignment in .desktop files. see also 2createpackages in woof.
 #120818 Categories management improved. pkg db now has category[;subcategory] (see 0setup), xdg enhanced (see /etc/xdg and /usr/share/desktop-directories), and generic icons for all subcategories (see /usr/local/lib/X11/mini-icons).
 #120901 .desktop files, get rid of param on end of Exec, ex: Exec=gimp-2.8 %U
+#120907 post-install hacks.
 
 #information from 'labrador', to expand a .pet directly to '/':
 #NAME="a52dec-0.7.4"
 #pet2tgz "${NAME}.pet"
 #tar -C / --transform 's/^\(\.\/\)\?'"$NAME"'//g' -zxf "${NAME}.tar.gz"
@@ -472,10 +473,13 @@
 DESKTOPFILES="`grep '\.desktop$' /root/.packages/${DLPKG_NAME}.files | tr '\n' ' '`"
 for ONEDESKTOP in $DESKTOPFILES
 do
  sed -i -e 's/ %u$//' $ONEDESKTOP
 done
+
+#120907 post-install hacks...
+/usr/local/petget/hacks-postinstall.sh $DLPKG_MAIN
 
 #announcement of successful install...
 #announcement is done after all downloads, in downloadpkgs.sh...
 CATEGORY="`echo -n "$CATEGORY" | cut -f 1 -d ';'`"
 [ "$CATEGORY" = "" ] && CATEGORY="none"

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

@@ -55,10 +55,11 @@
 no|axel||exe,dev>null,doc,nls
 yes|ayttm||exe,dev>null,doc,nls
 yes|bacon||exe,dev,doc>dev,nls
 yes|bash|bash|exe,dev>null,doc,nls
 yes|bbc_provided||exe,dev,doc,nls
+yes|bbe|bbe|exe,dev,doc,nls| #sed-like editor for binary files.
 yes|bc|bc|exe,dev>null,doc,nls
 yes|bcrypt||exe,dev,doc,nls
 yes|bdb|libdb4.8,libdb4.8-dev|exe,dev,doc,nls
 yes|bin86|bin86|exe>dev,dev,doc,nls
 yes|binutils|binutils,binutils-dev|exe>dev,dev,doc,nls

Changes to woof-distro/arm/raspbian/wheezy/DISTRO_PKGS_SPECS-raspbian-wheezy

@@ -60,10 +60,11 @@
 no|ayttm|ayttm,libaspell15,libaspell-dev,libgpgme11|exe,dev,doc,nls
 no|Ayttm||exe,dev>null,doc,nls
 yes|bacon||exe,dev,doc>dev,nls
 yes|bash|bash|exe,dev>null,doc,nls
 yes|bbc_provided||exe
+yes|bbe|bbe|exe,dev,doc,nls| #sed-like editor for binary files.
 yes|bc||exe,dev>null,doc,nls
 yes|bcrypt||exe
 yes|bdb|libdb5.1,libdb-dev|exe,dev,doc,nls
 yes|binutils|binutils,binutils-dev|exe>dev,dev,doc,nls
 yes|bison|bison|exe>dev,dev,doc,nls

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

@@ -59,10 +59,11 @@
 no|ayttm|ayttm,libaspell15,libaspell-dev,libgpgme11|exe,dev,doc,nls
 no|Ayttm||exe,dev>null,doc,nls
 yes|bacon||exe,dev,doc>dev,nls
 yes|bash|bash|exe,dev>null,doc,nls
 yes|bbc_provided||exe
+yes|bbe|bbe|exe,dev,doc,nls| #sed-like editor for binary files.
 yes|bc||exe,dev>null,doc,nls
 yes|bcrypt||exe
 yes|bdb|libdb5.1,libdb-dev|exe,dev,doc,nls
 yes|binutils|binutils,binutils-dev|exe>dev,dev,doc,nls
 yes|bison|bison|exe>dev,dev,doc,nls
@@ -318,11 +319,11 @@
 yes|libbluray|libbluray1,libbluray-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libbonobo|libbonobo2-0,libbonobo2-dev,libbonoboui2-0,libbonoboui2-dev|exe,dev,doc,nls
 yes|libcap|libcap2,libcap-dev|exe,dev,doc,nls
 no|libcddb|libcddb2,libcddb2-dev|exe,dev,doc,nls| #debian/ubuntu pkg missing cddb_query, also very old version. (warning: .deb cddb package has nothing to do with libcddb pkg)
 yes|libcddb||exe,dev,doc,nls
-yes|libcdio|libcdio13,libcdio-dev,libcdio-cdda1,libcdio-cdda-dev,libcdio-paranoia1,libcdio-paranoia-dev,libcdio-utils,libiso9660-8|exe,dev,doc,nls
+yes|libcdio|libcdio13,libcdio-dev,libcdio-cdda1,libcdio-cdda-dev,libcdio-paranoia1,libcdio-paranoia-dev,libcdio-utils,libiso9660-8,libiso9660-dev,libudf0,libudf-dev|exe,dev,doc,nls
 yes|libcroco|libcroco3,libcroco3-dev|exe,dev,doc,nls
 yes|libcurl3-gnutls|libcurl3-gnutls|exe>dev,dev,doc>null,nls>null| #this is needed by git in the devx sfs file.
 yes|libdaemon|libdaemon0,libdaemon-dev|exe,dev,doc,nls
 yes|libdatrie|libdatrie1,libdatrie-dev|exe,dev,doc,nls
 yes|libdb|libdb4.8,libdb4.8-dev|exe>dev,dev,doc,nls

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

@@ -56,10 +56,11 @@
 yes|axel||exe,dev>null,doc,nls
 yes|ayttm||exe,dev>null,doc,nls
 yes|bacon||exe,dev,doc>dev,nls
 yes|bash||exe,dev>null,doc,nls
 yes|bbc_provided||exe
+yes|bbe|bbe|exe,dev,doc,nls| #sed-like editor for binary files.
 yes|bc|bc|exe,dev>null,doc,nls
 yes|bcrypt||exe
 yes|bdb|libdb4.8,libdb4.8-dev|exe,dev,doc,nls
 yes|bin86|bin86|exe>dev,dev,doc,nls
 yes|binutils|binutils,binutils-dev|exe>dev,dev,doc,nls

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

@@ -64,10 +64,11 @@
 no|ayttm|ayttm,libaspell15,libaspell-dev,libgpgme11|exe,dev,doc,nls
 yes|ayttm||exe,dev>null,doc,nls
 yes|bacon||exe,dev,doc>dev,nls
 yes|bash||exe,dev>null,doc,nls
 yes|bbc_provided||exe
+yes|bbe|bbe|exe,dev,doc,nls| #sed-like editor for binary files.
 yes|bc|bc|exe,dev>null,doc,nls
 yes|bcrypt||exe
 yes|bdb|libdb5.1,libdb-dev|exe,dev,doc,nls
 yes|bin86|bin86|exe>dev,dev,doc,nls
 yes|binutils|binutils,binutils-dev|exe>dev,dev,doc,nls
@@ -328,14 +329,14 @@
 yes|libbluray|libbluray1,libbluray-dev|exe,dev,doc,nls| #needed by mplayer.
 yes|libbonobo|libbonobo2-0,libbonobo2-dev,libbonoboui2-0,libbonoboui2-dev|exe,dev,doc,nls
 yes|libbsd|libbsd0,libbsd-dev|exe,dev,doc,nls| #needed by libedit.
 yes|libcanberra|libcanberra0,libcanberra-dev|exe,dev,doc,nls| #libbonobui needs this.
 yes|libcap|libcap2,libcap-dev|exe,dev,doc,nls
-no|libcddb|libcddb2,libcddb2-dev|exe,dev,doc,nls| #debian/ubuntu pkg missing 'cddb_query', also very old version (warning: .deb 'cddb' package has nothing to do with libcddb pkg)
-yes|libcddb||exe,dev,doc,nls|pet:wary5
-no|libcdio|libcdio13,libcdio-dev,libcdio-cdda1,libcdio-cdda-dev,libcdio-paranoia1,libcdio-paranoia-dev,libcdio-utils,libiso9660-8|exe,dev,doc,nls| #not compatible with my libcddb pet, use my pet...
-yes|libcdio||exe,dev,doc,nls|pet:wary5
+yes|libcddb|libcddb2,libcddb2-dev|exe,dev,doc,nls| #debian/ubuntu pkg missing 'cddb_query', also very old version (warning: .deb cddb package has nothing to do with libcddb pkg). 120907 yes.
+no|libcddb||exe,dev,doc,nls|pet:wary5| #120907 gone back to deb.
+yes|libcdio|libcdio13,libcdio-dev,libcdio-cdda1,libcdio-cdda-dev,libcdio-paranoia1,libcdio-paranoia-dev,libcdio-utils,libiso9660-8,libiso9660-dev,libudf0,libudf-dev|exe,dev,doc,nls| #not compatible with my libcddb pet, use my pet. 120907 yes.
+no|libcdio||exe,dev,doc,nls|pet:wary5| #120907 precise needs a later version, use deb.
 yes|libcdk5|libcdk5,libcdk5-dev|exe,dev,doc,nls
 yes|libcroco|libcroco3,libcroco3-dev|exe,dev,doc,nls
 yes|libcurl3-gnutls|libcurl3-gnutls|exe>dev,dev,doc>null,nls>null| #this is needed by git in the devx sfs file.
 yes|libdaemon|libdaemon0,libdaemon-dev|exe,dev,doc,nls
 yes|libdatrie|libdatrie1,libdatrie-dev|exe,dev,doc,nls