# HG changeset patch
# User Stanislas Leduc <shann@slitaz.org>
# Date 1387558480 -3600
# Node ID 0d00466fb4e4c4e60777a904621484b62d6273db
# Parent  647d73170189d45f0a2db9a112913fc234a7ad46# Parent  fd0d0addaaf910916b5cd4c1e33356c5758c2204
Fix issue with busybox rm  (--preserve-root option doesn't implemented)

diff -r 647d73170189 -r 0d00466fb4e4 apache-dev/receipt
--- a/apache-dev/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/apache-dev/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache-dev"
-VERSION="2.2.22"
+VERSION="2.2.25"
 CATEGORY="development"
 SHORT_DESC="HTTP server development files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 647d73170189 -r 0d00466fb4e4 apache-doc/receipt
--- a/apache-doc/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/apache-doc/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache-doc"
-VERSION="2.2.22"
+VERSION="2.2.25"
 CATEGORY="development"
 SHORT_DESC="HTTP server documentation files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 647d73170189 -r 0d00466fb4e4 apache/receipt
--- a/apache/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/apache/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache"
-VERSION="2.2.22"
+VERSION="2.2.25"
 CATEGORY="network"
 SHORT_DESC="Secure, efficient and extensible HTTP server."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 647d73170189 -r 0d00466fb4e4 aria2/receipt
--- a/aria2/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/aria2/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -9,7 +9,7 @@
 WEB_SITE="http://aria2.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="zlib libxml2 gnutls"
+DEPENDS="zlib libxml2 gnutls libgcrypt"
 BUILD_DEPENDS="zlib-dev gettext libxml2-dev gnutls-dev pkg-config gmp-dev \
 nettle-dev"
 
diff -r 647d73170189 -r 0d00466fb4e4 bozohttpd/receipt
--- a/bozohttpd/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/bozohttpd/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -12,6 +12,7 @@
 WEB_SITE="http://www.eterna.com.au/$PACKAGE/"
 WGET_URL="http://www.eterna.com.au/$PACKAGE/$TARBALL"
 TAGS="http server lightweight cgi ipv6 ssl"
+PROVIDE="lighttpd"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 647d73170189 -r 0d00466fb4e4 cherokee/receipt
--- a/cherokee/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/cherokee/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -8,6 +8,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.cherokee-project.com/"
 WGET_URL="http://www.cherokee-project.com/download/1.2/$VERSION/$TARBALL"
+PROVIDE="lighttpd"
 
 DEPENDS="pcre cyrus-sasl openssl python libmysqlclient libldap ffmpeg"
 BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl-dev openldap-dev python-dev pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake"
diff -r 647d73170189 -r 0d00466fb4e4 cherokee/stuff/cherokee
--- a/cherokee/stuff/cherokee	Fri Dec 20 17:53:18 2013 +0100
+++ b/cherokee/stuff/cherokee	Fri Dec 20 17:54:40 2013 +0100
@@ -19,7 +19,7 @@
       exit 1
     fi
     echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS -k start 
+    $DAEMON $OPTIONS -d &>/dev/null  
     status
     ;;
   stop)
@@ -28,17 +28,7 @@
       exit 1
     fi
     echo -n "Stopping $DESC: $NAME... "
-    $DAEMON $OPTION -k stop
-    rm $PIDFILE
-    status
-    ;;
-  reload)
-    if ! active_pidfile $PIDFILE cherokee ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Stopping $DESC: $NAME... "
-    $DAEMON $OPTION -k graceful
+    kill $(cat $PIDFILE)
     status
     ;;
   restart)
@@ -47,15 +37,19 @@
       exit 1
     fi
     echo -n "Restarting $DESC: $NAME... "
-    $DAEMON $OPTIONS -k restart
+    kill $(cat $PIDFILE)
+    rm $PIDFILE
+    sleep 2
+    $DAEMON $OPTIONS -d &>/dev/null
     status
     ;;
   *)
     echo ""
-    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
+    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
     echo ""
     exit 1
     ;;
 esac
 
 exit 0
+
diff -r 647d73170189 -r 0d00466fb4e4 cyrus-imapd/receipt
--- a/cyrus-imapd/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/cyrus-imapd/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -109,6 +109,11 @@
 Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
 ----
 EOF
+
+	# A security hole with ssh...
+	[ -f $1/etc/ssh/sshd_config ] &&
+	! grep -q cyrus $1/etc/ssh/sshd_config &&
+	echo "DenyUsers cyrus" >> $1/etc/ssh/sshd_config
 }
 
 post_remove()
diff -r 647d73170189 -r 0d00466fb4e4 haproxy/receipt
--- a/haproxy/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/haproxy/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="haproxy"
-VERSION="1.4.18"
+VERSION="1.4.24"
 CATEGORY="network"
 SHORT_DESC="Reliable, High Performance TCP/HTTP Load Balancer."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 647d73170189 -r 0d00466fb4e4 lighttpd/receipt
--- a/lighttpd/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/lighttpd/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -77,17 +77,17 @@
 	echo "Processing pre-install commands..."
 	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
 	# Backup config file.
-	if [ -d $1/$CONFIG_FILES ]; then
-		cp -a $1/$CONFIG_FILES $1/$CONFIG_FILES.bak
+	if [ -d $1/etc/lighttpd ]; then
+		cp -a $1/etc/lighttpd $1/etc/lighttpd.bak
 	fi
 }
 post_install()
 {
 	echo "Processing post-install commands..."
 	# Restore original config.
-	if [ -d $1/$CONFIG_FILES.bak ]; then
-		rm -rf $1/$CONFIG_FILES
-		mv $1/$CONFIG_FILES.bak $1/$CONFIG_FILES
+	if [ -d $1/etc/lighttpd.bak ]; then
+		rm -rf $1/etc/lighttpd
+		mv $1/etc/lighttpd.bak $1/etc/lighttpd
 	fi
 	# Just in case.
 	chown www.www $1/var/log/$PACKAGE
diff -r 647d73170189 -r 0d00466fb4e4 linux-source/stuff/get-linux-source
--- a/linux-source/stuff/get-linux-source	Fri Dec 20 17:53:18 2013 +0100
+++ b/linux-source/stuff/get-linux-source	Fri Dec 20 17:54:40 2013 +0100
@@ -11,6 +11,9 @@
 	url=$(echo $url | sed "s|.*/linux/kernel|$i/linux/kernel|")
 done
 
+mirror_src=http://mirror.slitaz.org/sources/packages-$(cat /etc/slitaz-release)
+busybox wget -s $url || url=$mirror_src/l/$(basename $url)
+
 if [ ! -d $SOURCES_REPOSITORY ]; then
 	mkdir -p $SOURCES_REPOSITORY
 fi
diff -r 647d73170189 -r 0d00466fb4e4 luafilesystem/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/luafilesystem/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -0,0 +1,28 @@
+# SliTaz package receipt.
+
+PACKAGE="luafilesystem"
+VERSION="1.6.2"
+CATEGORY="development"
+SHORT_DESC="File System Library for Lua."
+MAINTAINER="paul@slitaz.org"
+DEPENDS="lua"
+BUILD_DEPENDS="lua lua-dev git bzip2"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WEB_SITE="http://keplerproject.github.io/luafilesystem/"
+WGET_URL="git|"git://github.com/keplerproject/luafilesystem.git
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	make PREFIX=/usr
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib/lua/5.1
+	cp -a $src/src/lfs.so $fs/usr/lib/lua/5.1
+
+}
+
diff -r 647d73170189 -r 0d00466fb4e4 luakit/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/luakit/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -0,0 +1,31 @@
+# SliTaz package receipt.
+
+PACKAGE="luakit"
+VERSION="2012.09.13-r1"
+CATEGORY="network"
+SHORT_DESC="Fast, small, webkit based browser framework extensible by Lua."
+MAINTAINER="paul@slitaz.org"
+DEPENDS="lua luafilesystem gtk+ libwebkit libunique sqlite"
+BUILD_DEPENDS="lua-dev gtk+-dev libwebkit-dev libunique-dev 
+sqlite-dev git bzip2 luafilesystem"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WEB_SITE="http://mason-larobina.github.io/luakit/"
+WGET_URL="git|git://github.com/mason-larobina/luakit.git"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd $src
+	make PREFIX=/usr
+	make install DESTDIR=$DESTDIR PREFIX=/usr
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs 
+	cp -a $install/etc $fs
+	cp -a $install/usr $fs
+	rm -rf $fs/usr/share/man
+}
+
diff -r 647d73170189 -r 0d00466fb4e4 lxc/receipt
--- a/lxc/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/lxc/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -10,7 +10,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 DEPENDS="libcap perl"
-BUILD_DEPENDS="libcap-dev"
+BUILD_DEPENDS="libcap-dev util-linux-ng-getopt"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 647d73170189 -r 0d00466fb4e4 manaplus/receipt
--- a/manaplus/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/manaplus/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -1,20 +1,19 @@
 # SliTaz package receipt.
 PACKAGE="manaplus"
-VERSION="1.3.5.26"
+VERSION="1.3.8.4"
 CATEGORY="games"
 SHORT_DESC="Extended client for Evol Online and The Mana World"
 MAINTAINER="admin@trixarian.net"
-TARBALL="manaplus-linux.tar.bz2"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://manaplus.org/"
-WGET_URL="http://download.evolonline.org/manaplus/download/$TARBALL"
-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"
+WGET_URL="http://download.evolonline.org/manaplus/download/$VERSION/$TARBALL"
+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"
 DEPENDS="curl physfs libxml2 libsdl-mixer libsdl-image libsdl-net libsdl-ttf libpng libsdl-gfx ttf-dejavu zlib"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	autoreconf -i &&
 	./configure --prefix=/usr --without-opengl $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$PWD/_pkg install
@@ -26,9 +25,7 @@
 	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/applications $fs/usr/share/
-	cp -a $_pkg/usr/share/doc $fs/usr/share/
-	cp -a $_pkg/usr/share/games $fs/usr/share/
-	cp -a $_pkg/usr/share/icons $fs/usr/share/
 	cp -a $_pkg/usr/share/locale $fs/usr/share/
+	cp -a $_pkg/usr/share/manaplus $fs/usr/share/
 	cp -a $_pkg/usr/share/pixmaps $fs/usr/share/
 }
diff -r 647d73170189 -r 0d00466fb4e4 nginx/receipt
--- a/nginx/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/nginx/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -11,6 +11,7 @@
 WGET_URL="${WEB_SITE}download//$TARBALL"
 DEPENDS="pcre openssl zlib"
 BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev"
+PROVIDE="lighttpd"
 CONFIG_FILES="/etc/nginx"
 
 # Rules to configure and make the package.
@@ -56,36 +57,38 @@
 # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
 genpkg_rules()
 {
-	cp -a $_pkg/* $fs/
-	rm -rf $fs/usr/html
-	cp -a stuff/* $fs
+        cp -a $_pkg/* $fs/
+        rm -rf $fs/usr/html
+        cp -a stuff/* $fs
+        sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
 }
 
 # Pre and post install commands for Tazpkg.
 # We stop the server by default in case of upgarde.
 pre_install()
 {
-	echo "Processing pre-install commands..."
-	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
-	# Backup config file.
-	if [ -d $1/$CONFIG_FILES ]; then
+        echo "Processing pre-install commands..."
+        [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
+        # Backup config file.
+        if [ -d $1/$CONFIG_FILES ]; then
 		cp -a $1/$CONFIG_FILES $1/$CONFIG_FILES.bak
-	fi
+        fi
 }
 post_install()
 {
-	echo "Processing post-install commands..."
-	# Restore original config.
-	if [ -d $1/$CONFIG_FILES.bak ]; then
+        echo "Processing post-install commands..."
+        mkdir -p /var/spool/nginx
+        # Restore original config.
+        if [ -d $1/$CONFIG_FILES.bak ]; then
 		rm -rf $1/$CONFIG_FILES
 		mv $1/$CONFIG_FILES.bak $1/$CONFIG_FILES
-	fi
-	# Just in case.
-	chown www.www $1/var/log/$PACKAGE
-	if [ -z "$1" ]; then
+        fi
+        # Just in case.
+        chown www.www $1/var/log/$PACKAGE
+        if [ -z "$1" ]; then
 		for i in apache lighttpd ; do
 			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
 		done
 		/etc/init.d/$PACKAGE start
-	fi
+        fi
 }
diff -r 647d73170189 -r 0d00466fb4e4 ntp/stuff/ntp
--- a/ntp/stuff/ntp	Fri Dec 20 17:53:18 2013 +0100
+++ b/ntp/stuff/ntp	Fri Dec 20 17:54:40 2013 +0100
@@ -25,6 +25,7 @@
     echo -n "Starting $DESC: $NAME... "
     $DAEMON $OPTIONS
     status
+    pgrep $DAEMON > $PIDFILE	# it seems that -p doesn't work ?
     ;;
   stop)
     if ! active_pidfile $PIDFILE ntpd ; then
@@ -45,6 +46,7 @@
     kill `cat $PIDFILE`
     $DAEMON $OPTIONS
     status
+    pgrep $DAEMON > $PIDFILE	# it seems that -p doesn't work ?
     ;;
   *)
     echo ""
diff -r 647d73170189 -r 0d00466fb4e4 qemu/receipt
--- a/qemu/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/qemu/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -11,7 +11,7 @@
 TAGS="virtualization"
 
 DEPENDS="alsa-lib gnutls libsdl bluez libtasn1 libsasl vde2 libcurl \
-attr util-linux-ng-uuid"
+attr util-linux-ng-uuid libgcrypt"
 BUILD_DEPENDS="gettext perl alsa-lib-dev gnutls-dev libsdl-dev bluez-dev \
 libtasn1-dev vde2-dev curl-dev attr-dev util-linux-ng-uuid-dev"
 
diff -r 647d73170189 -r 0d00466fb4e4 scummvm/receipt
--- a/scummvm/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/scummvm/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="scummvm"
-VERSION="1.5.0"
+VERSION="1.6.0"
 CATEGORY="games"
 SHORT_DESC="A 'virtual machine' for several classic graphical point-and-click adventure games."
 MAINTAINER="admin@trixarian.net"
diff -r 647d73170189 -r 0d00466fb4e4 util-linux-ng-flock/receipt
--- a/util-linux-ng-flock/receipt	Fri Dec 20 17:53:18 2013 +0100
+++ b/util-linux-ng-flock/receipt	Fri Dec 20 17:54:40 2013 +0100
@@ -19,10 +19,10 @@
 # Overlap busybox
 pre_install()
 {
-	rm -f $1/usr/bin/blkid
+	rm -f $1/usr/bin/flock
 }
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/blkid
+	ln -s /bin/busybox /usr/bin/flock
 }