# HG changeset patch # User Aleksej Bobylev # Date 1373273127 -10800 # Node ID a7b54d88ae54390aa8432eae7fd1de7172f2b8f4 # Parent 2cb5636c1d2de514dea10791229415058860c5f0 Fix ownership and permissions for some files in some packages: adeskbar, ajaxterm, amsn, anacron, arora, asciiquarium, assaultcube-data, asterisk-sound-fr, asterisk-sound, attr-dev, attr, audacious, avidemux, awstats, bind-dev, binutils, blogotext, bootchart, btanks, bzip2-dev, c-client, cairo-dock. diff -r 2cb5636c1d2d -r a7b54d88ae54 adeskbar/receipt --- a/adeskbar/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/adeskbar/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -3,22 +3,28 @@ PACKAGE="adeskbar" VERSION="0.4.2" CATEGORY="system-tools" -SHORT_DESC="Quick launch bar." +SHORT_DESC="ADesk Bar - application launcher for Openbox" MAINTAINER="gokhlayeh@slitaz.org" +LICENSE="GPL3" +WEB_SITE="https://launchpad.net/adeskbar" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="http://download.tuxfamily.org/$PACKAGE/sources/$TARBALL" + DEPENDS="python pygtk pycairo gnome-menus python-xdg" -SUGGESTED="dbus-python python-pyalsaaudio" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="https://launchpad.net/adeskbar" -WGET_URL="http://www.ad-comp.be/public/projets/ADeskBar/$TARBALL" +SUGGESTED="python-xlib dbus-python python-pyalsaaudio" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/adeskbar $fs/usr/bin \ - $fs/usr/share/pixmaps $fs/usr/share/applications + mkdir -p \ + $fs/usr/share/adeskbar \ + $fs/usr/bin \ + $fs/usr/share/pixmaps \ + $fs/usr/share/applications cp -a $src/src/* $fs/usr/share/adeskbar cp $src/src/images/adeskbar.png $fs/usr/share/pixmaps cp $src/adeskbar.desktop $fs/usr/share/applications cp $src/adeskbar.sh $fs/usr/bin/adeskbar + chown -R root:root $fs } diff -r 2cb5636c1d2d -r a7b54d88ae54 ajaxterm/receipt --- a/ajaxterm/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/ajaxterm/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,13 +5,14 @@ CATEGORY="network" SHORT_DESC="Login terminal for the web." MAINTAINER="pascal.bellard@slitaz.org" +WEB_SITE="http://antony.lesuisse.org/software/ajaxterm/" SOURCE="Ajaxterm" TARBALL="$SOURCE-$VERSION.tar.gz" -WEB_SITE="http://antony.lesuisse.org/software/ajaxterm/" WGET_URL="${WEB_SITE}files/$TARBALL" +TAGS="web application" + DEPENDS="python" SUGGESTED="apache lighttpd-ssl lighttpd-modules" -TAGS="web application" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() @@ -19,6 +20,8 @@ mkdir -p $fs/usr/share/ajaxterm cp -a $src/*.py $src/*.js $src/*.css $src/*.html $fs/usr/share/ajaxterm cp -a $stuff/* $fs/ + chown -R root:root $fs + find $fs -type f -name '*.py' -exec chmod a+x \{\} \; } post_install() diff -r 2cb5636c1d2d -r a7b54d88ae54 amsn/receipt --- a/amsn/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/amsn/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,8 +5,8 @@ CATEGORY="network" SHORT_DESC="Alvaro's Messenger" MAINTAINER="erjo@slitaz.org" +WEB_SITE="http://amsn-project.net/" TARBALL="$PACKAGE-$VERSION-src.tar.gz" -WEB_SITE="http://amsn-project.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" TAGS="chat messenger im" @@ -34,5 +34,8 @@ mkdir -p $fs/usr cp -a $install/usr/bin $fs/usr cp -a $install/usr/share $fs/usr + for ext in png xml css; do + find $fs -type f -name '*.'$ext -exec chmod a-x \{\} \; + done } diff -r 2cb5636c1d2d -r a7b54d88ae54 anacron/receipt --- a/anacron/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/anacron/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,8 +5,8 @@ CATEGORY="utilities" SHORT_DESC="Periodic command scheduler." MAINTAINER="pascal.bellard@slitaz.org" +WEB_SITE="http://anacron.sourceforge.net/" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://anacron.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" DEPENDS="" @@ -25,4 +25,5 @@ genpkg_rules() { cp -a $install/* $fs + find $fs/usr/man -type f -exec chmod a-x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 arora/receipt --- a/arora/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/arora/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,8 +5,8 @@ CATEGORY="network" SHORT_DESC="A cross-platform Qt4 WebKit browser" MAINTAINER="devl547@gmail.com" +WEB_SITE="http://arora.googlecode.com/" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://arora.googlecode.com/" WGET_URL="$WEB_SITE/files/$TARBALL" BUILD_DEPENDS="Qt4-dev qmake libsqlite" @@ -26,4 +26,5 @@ { mkdir -p $fs/usr/bin cp $src/arora $fs/usr/bin + find $fs -type f -name '*.desktop' -exec chmod a-x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 asciiquarium/receipt --- a/asciiquarium/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/asciiquarium/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,11 +5,12 @@ CATEGORY="system-tools" SHORT_DESC="Text console screensaver." MAINTAINER="pascal.bellard@slitaz.org" +WEB_SITE="http://www.robobunny.com/projects/$PACKAGE/html/" TARBALL="${PACKAGE}_${VERSION}.tar.gz" -WEB_SITE="http://www.robobunny.com/projects/$PACKAGE/html/" WGET_URL="http://www.robobunny.com/projects/$PACKAGE/$TARBALL" +TAGS="screensaver" + DEPENDS="perl-animation perl-curses" -TAGS="screensaver" # Rules to configure and make the package. compile_rules() @@ -24,5 +25,6 @@ mkdir -p $fs/usr/bin cp -a $src/asciiquarium $fs/usr/bin chmod a+x $fs/usr/bin/asciiquarium + chown -R root:root $fs } diff -r 2cb5636c1d2d -r a7b54d88ae54 assaultcube-data/receipt --- a/assaultcube-data/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/assaultcube-data/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,10 +5,10 @@ CATEGORY="games" SHORT_DESC="data files for assaultcube" MAINTAINER="slaxemulator@gmail.com" +WEB_SITE="http://assault.cubers.net/" SOURCE="AssaultCube" TARBALL="${SOURCE}_v${VERSION}.tar.bz2" SOURCE="AssaultCube-Data" -WEB_SITE="http://assault.cubers.net/" WGET_URL="$SF_MIRROR/actiongame/$TARBALL" # Rules to gen a SliTaz package suitable for Tazpkg. @@ -19,5 +19,7 @@ cp -a $src/packages $fs/usr/share/assaultcube cp -a $src/docs $fs/usr/share/assaultcube cp -a $src/mods $fs/usr/share/assaultcube + chown -R root:root $fs + find $fs -type f -exec chmod a-x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 asterisk-sound-fr/receipt --- a/asterisk-sound-fr/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/asterisk-sound-fr/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -29,5 +29,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cp -a $_pkg/* $fs + cp -a $install/* $fs + chown -R root:root $fs } diff -r 2cb5636c1d2d -r a7b54d88ae54 asterisk-sound/receipt --- a/asterisk-sound/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/asterisk-sound/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -22,5 +22,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cp -a $_pkg/* $fs + cp -a $install/* $fs + chown -R root:root $fs } diff -r 2cb5636c1d2d -r a7b54d88ae54 attr-dev/receipt --- a/attr-dev/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/attr-dev/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -17,4 +17,5 @@ cp -a $install/usr/lib/*.*a $fs/usr/lib cp -a $install/lib/*.*a $fs/lib cp -a $install/usr/include $fs/usr + find $fs -type f -name '*.la' -exec chmod a+x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 attr/receipt --- a/attr/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/attr/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,8 +5,8 @@ CATEGORY="system-tools" SHORT_DESC="Commands for Manipulating Filesystem Extended Attributes." MAINTAINER="rcx@zoominternet.net" +WEB_SITE="http://savannah.nongnu.org/projects/attr/" TARBALL="${PACKAGE}-${VERSION}.src.tar.gz" -WEB_SITE="http://savannah.nongnu.org/projects/attr/" WGET_URL="http://download.savannah.gnu.org/releases-noredirect/$PACKAGE/$TARBALL" HOST_ARCH="i486 arm" @@ -39,7 +39,8 @@ genpkg_rules() { mkdir -p $fs/lib $fs/usr/lib - cp -a $_pkg/lib/*.so* $fs/lib - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib - cp -a $_pkg/usr/bin $fs/usr + cp -a $install/lib/*.so* $fs/lib + cp -a $install/usr/lib/*.so* $fs/usr/lib + cp -a $install/usr/bin $fs/usr + find $fs -type f -name '*.so' -exec chmod a+x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 audacious/receipt --- a/audacious/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/audacious/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -36,5 +36,6 @@ cp -a $install/usr/share/$PACKAGE $fs/usr/share cp -a $install/usr/share/pixmaps $fs/usr/share tar -xzf $stuff/Skins.tar.gz -C $fs/usr/share/$PACKAGE + find $fs/usr/share/audacious/Skins/Default -type f -exec chmod a-x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 avidemux/receipt --- a/avidemux/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/avidemux/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,8 +5,8 @@ CATEGORY="multimedia" SHORT_DESC="free video editor" MAINTAINER="allan316@gmail.com" +WEB_SITE="http://fixounet.free.fr/$PACKAGE" TARBALL="${PACKAGE}_${VERSION}.tar.gz" -WEB_SITE="http://fixounet.free.fr/$PACKAGE" WGET_URL="http://download.berlios.de/$PACKAGE/$TARBALL" TAGS="video movie editor avi mpeg mp4" @@ -29,16 +29,16 @@ make -j 1 && make -j1 DESTDIR=$DESTDIR install mkdir -p $DESTDIR/usr/share/pixmaps $DESTDIR/usr/share/applications - cp -a $src/avidemux_icon.png $DESTDIR/usr/share/pixmaps/avidemux.png - cp -a $src/avidemux2.desktop $DESTDIR/usr/share/applications/avidemux2.desktop + cp $src/avidemux_icon.png $DESTDIR/usr/share/pixmaps/avidemux.png + cp $src/avidemux2.desktop $DESTDIR/usr/share/applications } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/share/pixmaps $fs/usr/share/applications - cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib - cp -a $_pkg/usr/share/ADM_scripts $fs/usr/share + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib/*.so* $fs/usr/lib + cp -a $install/usr/share/ADM_scripts $fs/usr/share } diff -r 2cb5636c1d2d -r a7b54d88ae54 awstats/receipt --- a/awstats/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/awstats/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,12 +5,13 @@ CATEGORY="network" SHORT_DESC="Log file analyzer" MAINTAINER="erjo@slitaz.org" +WEB_SITE="http://awstats.sourceforge.net/" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="http://prdownloads.sourceforge.net/awstats/$TARBALL" +TAGS="log analyze web mail ftp" + DEPENDS="perl" SUGGESTED="perl-net-xwhois" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://awstats.sourceforge.net/" -WGET_URL="http://prdownloads.sourceforge.net/awstats/$TARBALL" -TAGS="log analyze web mail ftp" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() @@ -19,7 +20,7 @@ $fs/var/www/cgi-bin \ $fs/var/lib/awstats \ $fs/etc/awstats \ - + cp -a $src/wwwroot/classes $fs/usr/share/awstats cp -a $src/wwwroot/css $fs/usr/share/awstats cp -a $src/wwwroot/icon $fs/usr/share/awstats @@ -27,17 +28,17 @@ cp -a $src/wwwroot/cgi-bin/lang $fs/usr/share/awstats cp -a $src/wwwroot/cgi-bin/lib $fs/usr/share/awstats cp -a $src/wwwroot/cgi-bin/plugins $fs/usr/share/awstats - + cp -a $src/wwwroot/cgi-bin/awstats.pl $fs/var/www/cgi-bin cp -a $src/wwwroot/cgi-bin/awstats.model.conf $fs/etc/awstats - + cp $stuff/* $fs/usr/share/awstats/extras # Add a link using google map sed -i 's|Full Whois Field"|Full Whois Field ?"|' \ $fs/usr/share/awstats/plugins/hostinfo.pm - # Avoid alias conflits + # Avoid alias conflicts for i in classes css icon ; do sed -i "s| /$i| /awstats$i|" \ $fs/usr/share/awstats/extras/awstats-apache.conf @@ -48,11 +49,18 @@ $fs/etc/awstats/awstats.model.conf sed -i 's/classes/awstatsclasses/' \ $fs/usr/share/awstats/plugins/graphapplet.pm + + chown -R root:root $fs + find $fs -type f -exec chmod a-x \{\} \; + chmod a+x \ + $fs/usr/share/awstats/extras/update \ + $fs/var/www/cgi-bin/awstats.pl \ + $fs/usr/share/awstats/classes/src/Makefile.pl } post_install() { - echo "Processing post-install commands..." + echo "Processing post-install commands..." # Set lighttpd or apache config if [ -f $1/etc/apache/httpd.conf ]; then if [ ! -f $1/etc/apache/conf.d/awstats.conf ]; then @@ -71,7 +79,7 @@ if [ -f $1/etc/lighttpd/lighttpd.conf ]; then if [ ! -f $1/etc/lighttpd/awstats.conf ]; then cp $1/usr/share/awstats/extras/awstats-lighttpd.conf \ - $1/etc/lighttpd/awstats.conf + $1/etc/lighttpd/awstats.conf fi # Start Web server if necessary. if [ -f /var/run/lighttpd.pid ]; then @@ -89,18 +97,17 @@ { echo "Remove orphan dirctories." [ -d /usr/share/awstats ] && rm -rf /usr/share/awstats - + # echo "All database and configuratoin files will be removed" echo -n "Please confirm removing (y/N) : "; read answer - + case $answer in - y|Y) - rm -rf /var/lib/awstats - rm -rf /etc/awstats - ;; - *) - ;; + y|Y) + rm -rf /var/lib/awstats + rm -rf /etc/awstats + ;; + *) + ;; esac - } diff -r 2cb5636c1d2d -r a7b54d88ae54 bind-dev/receipt --- a/bind-dev/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/bind-dev/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -14,5 +14,6 @@ mkdir -p $fs/usr/lib cp -a $install/usr/lib/*a $fs/usr/lib cp -a $install/usr/include $fs/usr + find $fs -type f -name '*.la' -exec chmod a+x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 binutils/receipt --- a/binutils/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/binutils/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -96,4 +96,7 @@ # Remove build directory (cookutils and tazwok path). rm -rf $WOK/$PACKAGE/source/$PACKAGE-build rm -rf $WOK/$PACKAGE/$PACKAGE-build + + chown -R root:root $fs/usr/include/libiberty.h + chmod g-x,o-x $fs/usr/include/libiberty.h } diff -r 2cb5636c1d2d -r a7b54d88ae54 blogotext/receipt --- a/blogotext/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/blogotext/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,8 +5,8 @@ CATEGORY="network" SHORT_DESC="Simple blog engine." MAINTAINER="pascal.bellard@slitaz.org" +WEB_SITE="http://lehollandaisvolant.net/blogotext" TARBALL="$PACKAGE-$VERSION.zip" -WEB_SITE="http://lehollandaisvolant.net/blogotext" URL="$WEB_SITE/archives/$TARBALL" DEPENDS="php-gd" @@ -23,8 +23,9 @@ chown -R 80.80 $DESTDIR/var/www/blogotext } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() { cp -a $install/* $fs + find $fs -type f -exec chmod a-x \{\} \; } diff -r 2cb5636c1d2d -r a7b54d88ae54 bootchart/receipt --- a/bootchart/receipt Mon Jul 08 02:17:10 2013 +0000 +++ b/bootchart/receipt Mon Jul 08 11:45:27 2013 +0300 @@ -5,51 +5,45 @@ CATEGORY="misc" SHORT_DESC="boot process performance analyzer (add init=/sbin/bootchartd to boot options)" MAINTAINER="jozee@slitaz.org" -SUGGESTED="pybootchartgui" +WEB_SITE="http://www.bootchart.org/" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.bootchart.org/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" TAGS="boot performance profile analyze" - +SUGGESTED="pybootchartgui" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/sbin $fs/etc + mkdir -p $fs/sbin $fs/etc cp -a $src/script/bootchartd $fs/sbin/bootchartd - cp -a $src/script/bootchartd.conf $fs/etc + cp -a $src/script/bootchartd.conf $fs/etc sed -i "s/SAMPLE_PERIOD=0.2/SAMPLE_PERIOD=1/" $fs/etc/bootchartd.conf sed -i "s/kdm_greet/kdm_greet slim /" $fs/sbin/bootchartd - sed -i "s|\/usr\/bin\/bootchart|\/usr\/bin\/pybootchartgui|g" $fs/sbin/bootchartd - + sed -i 's|/usr/bin/bootchart|/usr/bin/pybootchartgui|g' $fs/sbin/bootchartd } post_install() { - KERNEL_VERSION=`uname -a | cut -d ' ' -f3 | cut -d '-' -f1` - if [ -f "$1/boot/grub/menu.lst" ]; then - # add an entry only if slitaz is installed and bootchart is not configured - if ! grep -q "vmlinuz-$KERNEL_VERSION-slitaz.*sbin/bootchartd.*" $1/boot/grub/menu.lst; then - root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1` - grub_dev=`cat $1/boot/grub/menu.lst | grep "root.* (" | head -n 1` - # Add new kernel entry for bootchart - cat >> $1/boot/grub/menu.lst << EOT + KERNEL_VERSION=$(uname -r | cut -d- -f1) + MENU="$1/boot/grub/menu.lst" + if [ -f "$MENU" ]; then + # add an entry only if slitaz is installed and bootchart is not configured + if ! grep -q "vmlinuz-$KERNEL_VERSION-slitaz.*sbin/bootchartd.*" "$MENU"; then + # FIXME: really use the first comer value? + # (our lines will be LAST) + root_dev=`sed -n 's/.*root=\([^ ]*\).*/\1/p' "$MENU" | head -n1` + grub_dev=`sed -n '/^[^#]*root.* (/p' "$MENU" | head -n1` + # Add new kernel entry for bootchart and display information message + echo "----" + echo "GRUB is installed, these tree lines has been added to the menu.lst:" + tee -a "$MENU" << EOT title SliTaz GNU/Linux (Kernel $KERNEL_VERSION-slitaz) with bootchart $grub_dev kernel /boot/vmlinuz-$KERNEL_VERSION-slitaz root=$root_dev init=/sbin/bootchartd EOT - # Display information message. - cat <