wok-4.x rev 12413

Fix issue with busybox rm (--preserve-root option doesn't implemented)
author Stanislas Leduc <shann@slitaz.org>
date Fri Dec 20 17:54:40 2013 +0100 (2013-12-20)
parents 647d73170189 fd0d0addaaf9
children 172020a42b4e
files lxc/receipt manaplus/receipt
line diff
     1.1 --- a/apache-dev/receipt	Fri Dec 20 17:53:18 2013 +0100
     1.2 +++ b/apache-dev/receipt	Fri Dec 20 17:54:40 2013 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apache-dev"
     1.7 -VERSION="2.2.22"
     1.8 +VERSION="2.2.25"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="HTTP server development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/apache-doc/receipt	Fri Dec 20 17:53:18 2013 +0100
     2.2 +++ b/apache-doc/receipt	Fri Dec 20 17:54:40 2013 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="apache-doc"
     2.7 -VERSION="2.2.22"
     2.8 +VERSION="2.2.25"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="HTTP server documentation files."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
     3.1 --- a/apache/receipt	Fri Dec 20 17:53:18 2013 +0100
     3.2 +++ b/apache/receipt	Fri Dec 20 17:54:40 2013 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="apache"
     3.7 -VERSION="2.2.22"
     3.8 +VERSION="2.2.25"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Secure, efficient and extensible HTTP server."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
     4.1 --- a/aria2/receipt	Fri Dec 20 17:53:18 2013 +0100
     4.2 +++ b/aria2/receipt	Fri Dec 20 17:54:40 2013 +0100
     4.3 @@ -9,7 +9,7 @@
     4.4  WEB_SITE="http://aria2.sourceforge.net/"
     4.5  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     4.6  
     4.7 -DEPENDS="zlib libxml2 gnutls"
     4.8 +DEPENDS="zlib libxml2 gnutls libgcrypt"
     4.9  BUILD_DEPENDS="zlib-dev gettext libxml2-dev gnutls-dev pkg-config gmp-dev \
    4.10  nettle-dev"
    4.11  
     5.1 --- a/bozohttpd/receipt	Fri Dec 20 17:53:18 2013 +0100
     5.2 +++ b/bozohttpd/receipt	Fri Dec 20 17:54:40 2013 +0100
     5.3 @@ -12,6 +12,7 @@
     5.4  WEB_SITE="http://www.eterna.com.au/$PACKAGE/"
     5.5  WGET_URL="http://www.eterna.com.au/$PACKAGE/$TARBALL"
     5.6  TAGS="http server lightweight cgi ipv6 ssl"
     5.7 +PROVIDE="lighttpd"
     5.8  
     5.9  # Rules to configure and make the package.
    5.10  compile_rules()
     6.1 --- a/cherokee/receipt	Fri Dec 20 17:53:18 2013 +0100
     6.2 +++ b/cherokee/receipt	Fri Dec 20 17:54:40 2013 +0100
     6.3 @@ -8,6 +8,7 @@
     6.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     6.5  WEB_SITE="http://www.cherokee-project.com/"
     6.6  WGET_URL="http://www.cherokee-project.com/download/1.2/$VERSION/$TARBALL"
     6.7 +PROVIDE="lighttpd"
     6.8  
     6.9  DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg"
    6.10  BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
     7.1 --- a/cherokee/stuff/cherokee	Fri Dec 20 17:53:18 2013 +0100
     7.2 +++ b/cherokee/stuff/cherokee	Fri Dec 20 17:54:40 2013 +0100
     7.3 @@ -19,7 +19,7 @@
     7.4        exit 1
     7.5      fi
     7.6      echo -n "Starting $DESC: $NAME... "
     7.7 -    $DAEMON $OPTIONS -k start 
     7.8 +    $DAEMON $OPTIONS -d &>/dev/null  
     7.9      status
    7.10      ;;
    7.11    stop)
    7.12 @@ -28,17 +28,7 @@
    7.13        exit 1
    7.14      fi
    7.15      echo -n "Stopping $DESC: $NAME... "
    7.16 -    $DAEMON $OPTION -k stop
    7.17 -    rm $PIDFILE
    7.18 -    status
    7.19 -    ;;
    7.20 -  reload)
    7.21 -    if ! active_pidfile $PIDFILE cherokee ; then
    7.22 -      echo "$NAME is not running."
    7.23 -      exit 1
    7.24 -    fi
    7.25 -    echo -n "Stopping $DESC: $NAME... "
    7.26 -    $DAEMON $OPTION -k graceful
    7.27 +    kill $(cat $PIDFILE)
    7.28      status
    7.29      ;;
    7.30    restart)
    7.31 @@ -47,15 +37,19 @@
    7.32        exit 1
    7.33      fi
    7.34      echo -n "Restarting $DESC: $NAME... "
    7.35 -    $DAEMON $OPTIONS -k restart
    7.36 +    kill $(cat $PIDFILE)
    7.37 +    rm $PIDFILE
    7.38 +    sleep 2
    7.39 +    $DAEMON $OPTIONS -d &>/dev/null
    7.40      status
    7.41      ;;
    7.42    *)
    7.43      echo ""
    7.44 -    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
    7.45 +    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    7.46      echo ""
    7.47      exit 1
    7.48      ;;
    7.49  esac
    7.50  
    7.51  exit 0
    7.52 +
     8.1 --- a/cyrus-imapd/receipt	Fri Dec 20 17:53:18 2013 +0100
     8.2 +++ b/cyrus-imapd/receipt	Fri Dec 20 17:54:40 2013 +0100
     8.3 @@ -109,6 +109,11 @@
     8.4  Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
     8.5  ----
     8.6  EOF
     8.7 +
     8.8 +	# A security hole with ssh...
     8.9 +	[ -f $1/etc/ssh/sshd_config ] &&
    8.10 +	! grep -q cyrus $1/etc/ssh/sshd_config &&
    8.11 +	echo "DenyUsers cyrus" >> $1/etc/ssh/sshd_config
    8.12  }
    8.13  
    8.14  post_remove()
     9.1 --- a/haproxy/receipt	Fri Dec 20 17:53:18 2013 +0100
     9.2 +++ b/haproxy/receipt	Fri Dec 20 17:54:40 2013 +0100
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="haproxy"
     9.7 -VERSION="1.4.18"
     9.8 +VERSION="1.4.24"
     9.9  CATEGORY="network"
    9.10  SHORT_DESC="Reliable, High Performance TCP/HTTP Load Balancer."
    9.11  MAINTAINER="pascal.bellard@slitaz.org"
    10.1 --- a/lighttpd/receipt	Fri Dec 20 17:53:18 2013 +0100
    10.2 +++ b/lighttpd/receipt	Fri Dec 20 17:54:40 2013 +0100
    10.3 @@ -77,17 +77,17 @@
    10.4  	echo "Processing pre-install commands..."
    10.5  	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
    10.6  	# Backup config file.
    10.7 -	if [ -d $1/$CONFIG_FILES ]; then
    10.8 -		cp -a $1/$CONFIG_FILES $1/$CONFIG_FILES.bak
    10.9 +	if [ -d $1/etc/lighttpd ]; then
   10.10 +		cp -a $1/etc/lighttpd $1/etc/lighttpd.bak
   10.11  	fi
   10.12  }
   10.13  post_install()
   10.14  {
   10.15  	echo "Processing post-install commands..."
   10.16  	# Restore original config.
   10.17 -	if [ -d $1/$CONFIG_FILES.bak ]; then
   10.18 -		rm -rf $1/$CONFIG_FILES
   10.19 -		mv $1/$CONFIG_FILES.bak $1/$CONFIG_FILES
   10.20 +	if [ -d $1/etc/lighttpd.bak ]; then
   10.21 +		rm -rf $1/etc/lighttpd
   10.22 +		mv $1/etc/lighttpd.bak $1/etc/lighttpd
   10.23  	fi
   10.24  	# Just in case.
   10.25  	chown www.www $1/var/log/$PACKAGE
    11.1 --- a/linux-source/stuff/get-linux-source	Fri Dec 20 17:53:18 2013 +0100
    11.2 +++ b/linux-source/stuff/get-linux-source	Fri Dec 20 17:54:40 2013 +0100
    11.3 @@ -11,6 +11,9 @@
    11.4  	url=$(echo $url | sed "s|.*/linux/kernel|$i/linux/kernel|")
    11.5  done
    11.6  
    11.7 +mirror_src=http://mirror.slitaz.org/sources/packages-$(cat /etc/slitaz-release)
    11.8 +busybox wget -s $url || url=$mirror_src/l/$(basename $url)
    11.9 +
   11.10  if [ ! -d $SOURCES_REPOSITORY ]; then
   11.11  	mkdir -p $SOURCES_REPOSITORY
   11.12  fi
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/luafilesystem/receipt	Fri Dec 20 17:54:40 2013 +0100
    12.3 @@ -0,0 +1,28 @@
    12.4 +# SliTaz package receipt.
    12.5 +
    12.6 +PACKAGE="luafilesystem"
    12.7 +VERSION="1.6.2"
    12.8 +CATEGORY="development"
    12.9 +SHORT_DESC="File System Library for Lua."
   12.10 +MAINTAINER="paul@slitaz.org"
   12.11 +DEPENDS="lua"
   12.12 +BUILD_DEPENDS="lua lua-dev git bzip2"
   12.13 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   12.14 +WEB_SITE="http://keplerproject.github.io/luafilesystem/"
   12.15 +WGET_URL="git|"git://github.com/keplerproject/luafilesystem.git
   12.16 +
   12.17 +# Rules to configure and make the package.
   12.18 +compile_rules()
   12.19 +{
   12.20 +	cd $src
   12.21 +	make PREFIX=/usr
   12.22 +}
   12.23 +
   12.24 +# Rules to gen a SliTaz package suitable for Tazpkg.
   12.25 +genpkg_rules()
   12.26 +{
   12.27 +	mkdir -p $fs/usr/lib/lua/5.1
   12.28 +	cp -a $src/src/lfs.so $fs/usr/lib/lua/5.1
   12.29 +
   12.30 +}
   12.31 +
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/luakit/receipt	Fri Dec 20 17:54:40 2013 +0100
    13.3 @@ -0,0 +1,31 @@
    13.4 +# SliTaz package receipt.
    13.5 +
    13.6 +PACKAGE="luakit"
    13.7 +VERSION="2012.09.13-r1"
    13.8 +CATEGORY="network"
    13.9 +SHORT_DESC="Fast, small, webkit based browser framework extensible by Lua."
   13.10 +MAINTAINER="paul@slitaz.org"
   13.11 +DEPENDS="lua luafilesystem gtk+ libwebkit libunique sqlite"
   13.12 +BUILD_DEPENDS="lua-dev gtk+-dev libwebkit-dev libunique-dev 
   13.13 +sqlite-dev git bzip2 luafilesystem"
   13.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   13.15 +WEB_SITE="http://mason-larobina.github.io/luakit/"
   13.16 +WGET_URL="git|git://github.com/mason-larobina/luakit.git"
   13.17 +
   13.18 +# Rules to configure and make the package.
   13.19 +compile_rules()
   13.20 +{
   13.21 +	cd $src
   13.22 +	make PREFIX=/usr
   13.23 +	make install DESTDIR=$DESTDIR PREFIX=/usr
   13.24 +}
   13.25 +
   13.26 +# Rules to gen a SliTaz package suitable for Tazpkg.
   13.27 +genpkg_rules()
   13.28 +{
   13.29 +	mkdir -p $fs 
   13.30 +	cp -a $install/etc $fs
   13.31 +	cp -a $install/usr $fs
   13.32 +	rm -rf $fs/usr/share/man
   13.33 +}
   13.34 +
    14.1 --- a/lxc/receipt	Fri Dec 20 17:53:18 2013 +0100
    14.2 +++ b/lxc/receipt	Fri Dec 20 17:54:40 2013 +0100
    14.3 @@ -10,7 +10,7 @@
    14.4  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    14.5  
    14.6  DEPENDS="libcap perl"
    14.7 -BUILD_DEPENDS="libcap-dev"
    14.8 +BUILD_DEPENDS="libcap-dev util-linux-ng-getopt"
    14.9  
   14.10  # Rules to configure and make the package.
   14.11  compile_rules()
    15.1 --- a/manaplus/receipt	Fri Dec 20 17:53:18 2013 +0100
    15.2 +++ b/manaplus/receipt	Fri Dec 20 17:54:40 2013 +0100
    15.3 @@ -1,20 +1,19 @@
    15.4  # SliTaz package receipt.
    15.5  PACKAGE="manaplus"
    15.6 -VERSION="1.3.5.26"
    15.7 +VERSION="1.3.8.4"
    15.8  CATEGORY="games"
    15.9  SHORT_DESC="Extended client for Evol Online and The Mana World"
   15.10  MAINTAINER="admin@trixarian.net"
   15.11 -TARBALL="manaplus-linux.tar.bz2"
   15.12 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   15.13  WEB_SITE="http://manaplus.org/"
   15.14 -WGET_URL="http://download.evolonline.org/manaplus/download/$TARBALL"
   15.15 -BUILD_DEPENDS="autoconf curl-dev enet libxml2-dev libsdl-mixer-dev libsdl-image-dev libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev png-dev zlib-dev"
   15.16 +WGET_URL="http://download.evolonline.org/manaplus/download/$VERSION/$TARBALL"
   15.17 +BUILD_DEPENDS="curl-dev enet libxml2-dev libsdl-mixer-dev libsdl-image-dev libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev png-dev zlib-dev"
   15.18  DEPENDS="curl physfs libxml2 libsdl-mixer libsdl-image libsdl-net libsdl-ttf libpng libsdl-gfx ttf-dejavu zlib"
   15.19  
   15.20  # Rules to configure and make the package.
   15.21  compile_rules()
   15.22  {
   15.23  	cd $src
   15.24 -	autoreconf -i &&
   15.25  	./configure --prefix=/usr --without-opengl $CONFIGURE_ARGS &&
   15.26  	make &&
   15.27  	make DESTDIR=$PWD/_pkg install
   15.28 @@ -26,9 +25,7 @@
   15.29  	mkdir -p $fs/usr/share
   15.30  	cp -a $_pkg/usr/bin $fs/usr
   15.31  	cp -a $_pkg/usr/share/applications $fs/usr/share/
   15.32 -	cp -a $_pkg/usr/share/doc $fs/usr/share/
   15.33 -	cp -a $_pkg/usr/share/games $fs/usr/share/
   15.34 -	cp -a $_pkg/usr/share/icons $fs/usr/share/
   15.35  	cp -a $_pkg/usr/share/locale $fs/usr/share/
   15.36 +	cp -a $_pkg/usr/share/manaplus $fs/usr/share/
   15.37  	cp -a $_pkg/usr/share/pixmaps $fs/usr/share/
   15.38  }
    16.1 --- a/nginx/receipt	Fri Dec 20 17:53:18 2013 +0100
    16.2 +++ b/nginx/receipt	Fri Dec 20 17:54:40 2013 +0100
    16.3 @@ -11,6 +11,7 @@
    16.4  WGET_URL="${WEB_SITE}download//$TARBALL"
    16.5  DEPENDS="pcre openssl zlib"
    16.6  BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev"
    16.7 +PROVIDE="lighttpd"
    16.8  CONFIG_FILES="/etc/nginx"
    16.9  
   16.10  # Rules to configure and make the package.
   16.11 @@ -56,36 +57,38 @@
   16.12  # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
   16.13  genpkg_rules()
   16.14  {
   16.15 -	cp -a $_pkg/* $fs/
   16.16 -	rm -rf $fs/usr/html
   16.17 -	cp -a stuff/* $fs
   16.18 +        cp -a $_pkg/* $fs/
   16.19 +        rm -rf $fs/usr/html
   16.20 +        cp -a stuff/* $fs
   16.21 +        sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
   16.22  }
   16.23  
   16.24  # Pre and post install commands for Tazpkg.
   16.25  # We stop the server by default in case of upgarde.
   16.26  pre_install()
   16.27  {
   16.28 -	echo "Processing pre-install commands..."
   16.29 -	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
   16.30 -	# Backup config file.
   16.31 -	if [ -d $1/$CONFIG_FILES ]; then
   16.32 +        echo "Processing pre-install commands..."
   16.33 +        [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
   16.34 +        # Backup config file.
   16.35 +        if [ -d $1/$CONFIG_FILES ]; then
   16.36  		cp -a $1/$CONFIG_FILES $1/$CONFIG_FILES.bak
   16.37 -	fi
   16.38 +        fi
   16.39  }
   16.40  post_install()
   16.41  {
   16.42 -	echo "Processing post-install commands..."
   16.43 -	# Restore original config.
   16.44 -	if [ -d $1/$CONFIG_FILES.bak ]; then
   16.45 +        echo "Processing post-install commands..."
   16.46 +        mkdir -p /var/spool/nginx
   16.47 +        # Restore original config.
   16.48 +        if [ -d $1/$CONFIG_FILES.bak ]; then
   16.49  		rm -rf $1/$CONFIG_FILES
   16.50  		mv $1/$CONFIG_FILES.bak $1/$CONFIG_FILES
   16.51 -	fi
   16.52 -	# Just in case.
   16.53 -	chown www.www $1/var/log/$PACKAGE
   16.54 -	if [ -z "$1" ]; then
   16.55 +        fi
   16.56 +        # Just in case.
   16.57 +        chown www.www $1/var/log/$PACKAGE
   16.58 +        if [ -z "$1" ]; then
   16.59  		for i in apache lighttpd ; do
   16.60  			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   16.61  		done
   16.62  		/etc/init.d/$PACKAGE start
   16.63 -	fi
   16.64 +        fi
   16.65  }
    17.1 --- a/ntp/stuff/ntp	Fri Dec 20 17:53:18 2013 +0100
    17.2 +++ b/ntp/stuff/ntp	Fri Dec 20 17:54:40 2013 +0100
    17.3 @@ -25,6 +25,7 @@
    17.4      echo -n "Starting $DESC: $NAME... "
    17.5      $DAEMON $OPTIONS
    17.6      status
    17.7 +    pgrep $DAEMON > $PIDFILE	# it seems that -p doesn't work ?
    17.8      ;;
    17.9    stop)
   17.10      if ! active_pidfile $PIDFILE ntpd ; then
   17.11 @@ -45,6 +46,7 @@
   17.12      kill `cat $PIDFILE`
   17.13      $DAEMON $OPTIONS
   17.14      status
   17.15 +    pgrep $DAEMON > $PIDFILE	# it seems that -p doesn't work ?
   17.16      ;;
   17.17    *)
   17.18      echo ""
    18.1 --- a/qemu/receipt	Fri Dec 20 17:53:18 2013 +0100
    18.2 +++ b/qemu/receipt	Fri Dec 20 17:54:40 2013 +0100
    18.3 @@ -11,7 +11,7 @@
    18.4  TAGS="virtualization"
    18.5  
    18.6  DEPENDS="alsa-lib gnutls libsdl bluez libtasn1 libsasl vde2 libcurl \
    18.7 -attr util-linux-ng-uuid"
    18.8 +attr util-linux-ng-uuid libgcrypt"
    18.9  BUILD_DEPENDS="gettext perl alsa-lib-dev gnutls-dev libsdl-dev bluez-dev \
   18.10  libtasn1-dev vde2-dev curl-dev attr-dev util-linux-ng-uuid-dev"
   18.11  
    19.1 --- a/scummvm/receipt	Fri Dec 20 17:53:18 2013 +0100
    19.2 +++ b/scummvm/receipt	Fri Dec 20 17:54:40 2013 +0100
    19.3 @@ -1,7 +1,7 @@
    19.4  # SliTaz package receipt.
    19.5  
    19.6  PACKAGE="scummvm"
    19.7 -VERSION="1.5.0"
    19.8 +VERSION="1.6.0"
    19.9  CATEGORY="games"
   19.10  SHORT_DESC="A 'virtual machine' for several classic graphical point-and-click adventure games."
   19.11  MAINTAINER="admin@trixarian.net"
    20.1 --- a/util-linux-ng-flock/receipt	Fri Dec 20 17:53:18 2013 +0100
    20.2 +++ b/util-linux-ng-flock/receipt	Fri Dec 20 17:54:40 2013 +0100
    20.3 @@ -19,10 +19,10 @@
    20.4  # Overlap busybox
    20.5  pre_install()
    20.6  {
    20.7 -	rm -f $1/usr/bin/blkid
    20.8 +	rm -f $1/usr/bin/flock
    20.9  }
   20.10  
   20.11  post_remove()
   20.12  {
   20.13 -	ln -s /bin/busybox /usr/bin/blkid
   20.14 +	ln -s /bin/busybox /usr/bin/flock
   20.15  }