# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1257800105 -3600
# Node ID 350536878fe30ff998e46f81ce8f528eadd6c0e1
# Parent  74dcbc43857b9d56e6d0d73603f4eb448e5bc057# Parent  d3eca578f816ad3dd7615a23a4495c830a724bb9
Merge

diff -r 74dcbc43857b -r 350536878fe3 busybox/stuff/init
--- a/busybox/stuff/init	Sun Nov 08 23:33:00 2009 +0100
+++ b/busybox/stuff/init	Mon Nov 09 21:55:05 2009 +0100
@@ -1,7 +1,52 @@
 #!/bin/sh
 
+mount_mapper()
+{
+	mount $root /mnt
+	if [ -d /mnt/etc ]; then
+		umount /sys
+		for i in /dev/mapper $@ ; do
+			cp -a $i /mnt$i
+		done
+		umount /proc
+		echo -e "\\033[70G[ \\033[1;33mOK\\033[0;39m ]"
+		exec /sbin/switch_root mnt /sbin/init
+	fi
+	echo -e "\\033[70G[ \\033[1;31mFailed\\033[0;39m ]"
+}
+
+mount -t proc proc /proc
+mount -t sysfs sysfs /sys
+if grep -q dmraid= /proc/cmdline; then
+	root="$(sed 's/.*dmraid=\([^ ]*\).*/\1/' < /proc/cmdline)"
+	echo -n "Switching / to dmraid $root..."
+	case "$(dmraid -s | grep ^type | awk '{ print $3 }')" in
+	mirror)		modprobe dm-mirror;;
+	raid[456]*)	modprobe raid456;;
+	esac
+	name=$(dmraid -s | grep ^name | awk '{ print $3 }')
+	case "$root" in
+	/dev/*);;
+	p*) root=/dev/mapper/${name}$root ;;
+	*)  root=/dev/mapper/${name}p$root ;;
+	esac
+	dmraid -ay
+	mount_mapper
+elif grep -q softraid= /proc/cmdline; then
+	root="$(sed 's/.*softraid=\([^ ]*\).*/\1/' < /proc/cmdline)"
+	echo -n "Switching / to softraid $root..."
+	mdadm --examine --scan --config=partitions > /etc/mdadm.conf
+	grep level=raid /etc/mdadm.conf | while read line; do
+		case "$line" in
+		*=raid1\ *)	modprobe dm-mirror ;;
+		*=raid[456]\ *)	modprobe raid456 ;;
+		esac
+	done
+	mdadm --assemble --scan
+	mount_mapper /etc/mdadm.conf
+fi
+umount /sys
 echo -n "Switching / to tmpfs..."
-mount -t proc proc /proc
 size="$(grep rootfssize= < /proc/cmdline | \
 	sed 's/.*rootfssize=\([0-9]*[kmg%]\).*/-o size=\1/')"
 free=$(busybox free | busybox awk '/Mem:/ { print int(($4*100)/$3) }')
diff -r 74dcbc43857b -r 350536878fe3 linux-wireless/receipt
--- a/linux-wireless/receipt	Sun Nov 08 23:33:00 2009 +0100
+++ b/linux-wireless/receipt	Mon Nov 09 21:55:05 2009 +0100
@@ -21,7 +21,7 @@
     export _pkg
     
     $src/slitaz/list_modules.sh drivers/net/wireless drivers/staging/wlan-ng \
-    drivers/staging/rt2860 drivers/staging/rt2870 drivers/staging/echo drivers/leds net/wireless net/mac80211 | while read module; do
+    drivers/staging/rt2860 drivers/staging/rt2870 drivers/staging/rt3070 drivers/staging/echo drivers/leds net/wireless net/mac80211 | while read module; do
     	dir=$path/$(dirname $module)
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
diff -r 74dcbc43857b -r 350536878fe3 linux/receipt
--- a/linux/receipt	Sun Nov 08 23:33:00 2009 +0100
+++ b/linux/receipt	Mon Nov 09 21:55:05 2009 +0100
@@ -20,6 +20,7 @@
 		git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2
 		cd aufs2 && git checkout origin/aufs2-30
 		cp -a Documentation fs include $src
+		cp -a *.patch ../stuff
 	fi
 	cd $src
 	# SliTaz db
@@ -30,22 +31,23 @@
 	# Misc patches from pascal
 	while read patch_file; do
 		echo "$patch_file" >> slitaz/patches
-		cp ../stuff/$patch_file slitaz/$patch_file
+		#cp ../stuff/$patch_file slitaz/$patch_file
+		cp ../stuff/$patch_file slitaz
 		if [ -f done.$patch_file ]; then
 			echo "Skipping $patch_file"
 			continue
 		fi
 		echo "Apply $patch_file"
-		patch -p1 < $patch_file || exit 1
+		patch -p1 < slitaz/$patch_file || exit 1
 		touch done.$patch_file
 	done <<EOT
-../stuff/$PACKAGE-utf8-$VERSION.u
-../stuff/$PACKAGE-diff-$VERSION.u
-../stuff/$PACKAGE-freeinitrd-$VERSION.u
-../stuff/$PACKAGE-unlzma-$VERSION.u
-../aufs2/aufs2-base.patch
-../aufs2/aufs2-kbuild.patch
-../aufs2/aufs2-standalone.patch
+$PACKAGE-utf8-$VERSION.u
+$PACKAGE-diff-$VERSION.u
+$PACKAGE-freeinitrd-$VERSION.u
+$PACKAGE-unlzma-$VERSION.u
+aufs2-base.patch
+aufs2-kbuild.patch
+aufs2-standalone.patch
 EOT
 	make mrproper
 	cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config
@@ -93,6 +95,8 @@
     do
     	echo tazwok cook ${i%/receipt}
     done
+    # check and echo any module in kernel .config that's not added to one of linux-* pkgs
+	./stuff/check_modules.sh 
 }
 
 # Pre and post install commands for Tazpkg.
diff -r 74dcbc43857b -r 350536878fe3 linux/stuff/check_modules.sh
--- a/linux/stuff/check_modules.sh	Sun Nov 08 23:33:00 2009 +0100
+++ b/linux/stuff/check_modules.sh	Mon Nov 09 21:55:05 2009 +0100
@@ -2,10 +2,11 @@
 # Echo any module in kernel .config that's not added to one of linux-* pkgs
 # 2009/06/18 <jozee@slitaz.org> - GNU General Public License.
 #
-    
-	VERSION=$1
-	WOK=$2
-	src=$WOK/linux/linux-$VERSION
+    . /etc/tazwok.conf
+	
+	VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
+	src="$WOK/linux/linux-$VERSION"
+	
 	cd $src
 	mkdir -p ../stuff/tmp
 	rm -f ../stuff/tmp/* # clean up
@@ -35,9 +36,11 @@
 	done
 	if [ -f ../stuff/tmp/unpackaged-modules-"$VERSION".list ]; then
 		echo "======================================================================"
-		echo " Some modules selected in .config were not categorized in linux-* pkgs"
-		echo "Check linux/stuff/tmp/unpackaged-modules-$VERSION.list to see"
+		echo " These modules selected in .config were not categorized in linux-* pkgs:"
 		cat ../stuff/tmp/unpackaged-modules-$VERSION.list 
+		#echo "Check linux/stuff/tmp/unpackaged-modules-$VERSION.list to see"
+		echo "======================================================================"
 	else
 		rm -r ../stuff/tmp
 	fi
+    
diff -r 74dcbc43857b -r 350536878fe3 linux/stuff/linux-2.6.30.6-slitaz.config
--- a/linux/stuff/linux-2.6.30.6-slitaz.config	Sun Nov 08 23:33:00 2009 +0100
+++ b/linux/stuff/linux-2.6.30.6-slitaz.config	Mon Nov 09 21:55:05 2009 +0100
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.30.6
-# Fri Sep 25 01:17:11 2009
+# Fri Nov  6 10:51:41 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -343,11 +343,11 @@
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
 # CONFIG_ACPI_BUTTON is not set
 CONFIG_ACPI_VIDEO=m
-# CONFIG_ACPI_FAN is not set
+CONFIG_ACPI_FAN=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
@@ -376,8 +376,8 @@
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -939,7 +939,7 @@
 # CONFIG_PNPBIOS is not set
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=y
+CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
 # CONFIG_BLK_CPQ_DA is not set
@@ -1272,7 +1272,7 @@
 # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set
 # CONFIG_IEEE1394_ETH1394 is not set
 CONFIG_IEEE1394_RAWIO=m
-# CONFIG_IEEE1394_VIDEO1394 is not set
+CONFIG_IEEE1394_VIDEO1394=m
 # CONFIG_IEEE1394_DV1394 is not set
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
 # CONFIG_I2O is not set
@@ -1378,7 +1378,7 @@
 CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AC3200 is not set
 CONFIG_APRICOT=m
-CONFIG_B44=y
+CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI=y
@@ -1480,17 +1480,20 @@
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_RFKILL is not set
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLWIFI_RFKILL=y
 # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
 # CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLAGN is not set
+CONFIG_IWLAGN=m
+CONFIG_IWL4965=y
+CONFIG_IWL5000=y
 CONFIG_IWL3945=m
 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 # CONFIG_HOSTAP is not set
 CONFIG_B43=m
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_PCMCIA is not set
 CONFIG_B43_LEDS=y
 # CONFIG_B43_DEBUG is not set
 CONFIG_B43LEGACY=m
@@ -1674,7 +1677,7 @@
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_SERIAL=m
 # CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_INPORT=m
@@ -2085,11 +2088,13 @@
 #
 # Sonics Silicon Backplane
 #
-CONFIG_SSB=y
+CONFIG_SSB=m
 CONFIG_SSB_SPROM=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
@@ -2502,7 +2507,8 @@
 CONFIG_SND_HDA_CODEC_CMEDIA=y
 CONFIG_SND_HDA_CODEC_SI3054=y
 CONFIG_SND_HDA_GENERIC=y
-# CONFIG_SND_HDA_POWER_SAVE is not set
+CONFIG_SND_HDA_POWER_SAVE=y
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
 CONFIG_SND_HIFIER=m
@@ -2595,9 +2601,9 @@
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
+CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_MON is not set
+CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
 # CONFIG_USB_WUSB_CBAF_DEBUG is not set
@@ -2613,7 +2619,6 @@
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -2842,7 +2847,7 @@
 # CONFIG_OTUS is not set
 CONFIG_RT2860=m
 CONFIG_RT2870=m
-# CONFIG_RT3070 is not set
+CONFIG_RT3070=m
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
@@ -3017,8 +3022,8 @@
 # CONFIG_AUFS_SHWH is not set
 # CONFIG_AUFS_BR_RAMFS is not set
 # CONFIG_AUFS_BR_FUSE is not set
+CONFIG_AUFS_BDEV_LOOP=y
 # CONFIG_AUFS_DEBUG is not set
-CONFIG_AUFS_BDEV_LOOP=y
 # CONFIG_NILFS2_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
diff -r 74dcbc43857b -r 350536878fe3 linux/stuff/modules-2.6.30.6.list
--- a/linux/stuff/modules-2.6.30.6.list	Sun Nov 08 23:33:00 2009 +0100
+++ b/linux/stuff/modules-2.6.30.6.list	Mon Nov 09 21:55:05 2009 +0100
@@ -56,7 +56,9 @@
 drivers/net/phy/libphy.ko.gz
 drivers/net/phy/lxt.ko.gz
 drivers/net/phy/marvell.ko.gz
-drivers/net/phy/qsemi.ko.gz
+drivers/net/phy/qsemi.ko.gz 
+drivers/net/phy/smsc.ko.gz 
+drivers/net/dnet.ko.gz
 drivers/net/sc92031.ko.gz
 drivers/net/sis190.ko.gz
 drivers/net/skge.ko.gz
@@ -78,9 +80,13 @@
 drivers/net/usb/rndis_host.ko.gz
 drivers/net/usb/usbnet.ko.gz
 drivers/net/usb/zaurus.ko.gz
+drivers/net/usb/cdc_eem.ko.gz 
+drivers/net/usb/dm9601.ko.gz
 drivers/net/via-velocity.ko.gz
 drivers/net/wd.ko.gz
 drivers/net/8390p.ko.gz
+drivers/net/b44.ko.gz
+drivers/net/r6040.ko.gz
 drivers/ide/ide-cs.ko.gz
 drivers/watchdog/softdog.ko.gz
 drivers/parport/parport.ko.gz
@@ -97,7 +103,12 @@
 drivers/usb/serial/ch341.ko.gz
 drivers/usb/serial/pl2303.ko.gz
 drivers/usb/serial/usbserial.ko.gz
+drivers/usb/mon/usbmon.ko.gz
+drivers/ssb/ssb.ko.gz
+drivers/block/floppy.ko.gz
+drivers/input/mouse/sermouse.ko.gz
 fs/binfmt_misc.ko.gz
+fs/fat/msdos.ko.gz
 net/ipv4/netfilter/ipt_REJECT.ko.gz
 net/netfilter/nfnetlink.ko.gz
 net/netfilter/nfnetlink_log.ko.gz
diff -r 74dcbc43857b -r 350536878fe3 mirror-tools/stuff/usr/bin/mkpkgiso
--- a/mirror-tools/stuff/usr/bin/mkpkgiso	Sun Nov 08 23:33:00 2009 +0100
+++ b/mirror-tools/stuff/usr/bin/mkpkgiso	Mon Nov 09 21:55:05 2009 +0100
@@ -5,19 +5,23 @@
 # Authors : Eric Joseph-Alexandre <erjo@slitaz.org>
 #	    Pascal Bellard <pascal.bellard@slitaz.org>
 
-VERSION=0.6
+VERSION=0.7
 
+PKG_VER=$1
 ROOT=/home/slitaz/iso
+REPOS=/var/www/slitaz/mirror/packages/$PKG_VER
+IFMEM_C32=/var/www/slitaz/mirror/pxe/ifmem.c32
+ISO_DIR=/var/www/slitaz/mirror/iso/$PKG_VER
+
+[ -s /etc/slitaz/mkpkgiso.conf ] && . /etc/slitaz/mkpkgiso.conf
+[ -s ./mkpkgiso.conf ] && . ./mkpkgiso.conf
+
 SORT_DIR=${ROOT}/_iso.$$
 TEMP_DIR=${ROOT}/_iso.$$
 SORT_FILE=${ROOT}/_sort.$$
-PKG_VER=$1
 shift
 OPTIONS=$@
 PKG_DIR=$TEMP_DIR/packages/$PKG_VER
-REPOS=/var/www/slitaz/mirror/packages/$PKG_VER
-PXE_DIR=/var/www/slitaz/mirror/pxe
-ISO_DIR=/var/www/slitaz/mirror/iso/$PKG_VER
 LOG=$PWD/$(basename $0).log
 
 #
@@ -32,6 +36,8 @@
 Usage: $(basename $0) <Version> 
 	[--boot [--auto-install] [--loram-detect]]|--webboot] [--filter]
 	[--wok] [--wok-stable] [--website][--dry-run]
+Example:
+$(basename $0) cooking --boot --auto-install --loram-detect --filter --wok --website
 EOT
 	exit 1
 fi
@@ -45,18 +51,33 @@
 # Status function.
 status()
 {
-    local CHECK=$?
-    echo -en "\\033[70G[ "
-    if [ $CHECK = 0 ]; then
-        echo -en "\\033[1;33mOK"
-    else
-        echo -en "\\033[1;31mFailed"
-    fi
-    echo -e "\\033[0;39m ]"
+	local CHECK=$?
+	echo -en "\\033[70G[ "
+	if [ $CHECK = 0 ]; then
+		echo -en "\\033[1;33mOK"
+	else
+		echo -en "\\033[1;31mFailed"
+	fi
+	echo -e "\\033[0;39m ]"
+}
+
+need()
+{
+	found=1
+	for i in $@ ; do
+		[ -s $i ] && continue
+		echo "Missing: $i "
+		found=0
+	done
+	[ $found -ne 0 ] && return
+	status
+	rm -rf $TEMP_DIR $SORT_FILE
+	exit 1
 }
 
 # Create temp directory
 mkdir -p $TEMP_DIR/packages/$PKG_VER
+which genisoimage > /dev/null || need /usr/bin/genisoimage
 
 # Prepare evrything for ISO
 
@@ -176,12 +197,9 @@
 # Copy hg subtree
 get_from_hg()
 {
-[ /slitaz/home/slitaz/hg/$1 ] || return
 echo -n "Adding $2"
-/usr/sbin/chroot /slitaz hg --repository /home/slitaz/hg/$1 pull >/dev/null
-/usr/sbin/chroot /slitaz hg --repository /home/slitaz/hg/$1 update >/dev/null
-mkdir $TEMP_DIR/$1
-cp -a /slitaz/home/slitaz/hg/$1/* $TEMP_DIR/$1
+wget -q -O - http://hg.slitaz.org/$1/archive/tip.tar.bz2 | tar xjf - -C $TEMP_DIR
+mv $TEMP_DIR/$1-* $TEMP_DIR/$1
 status
 echo "$(du -hs $TEMP_DIR/$1 | awk '{ print $1 }') used by $2."
 }
@@ -210,8 +228,6 @@
 --website)
 	if get_from_hg website "web site"; then
 		echo "$SORT_DIR/website -6000" >> $SORT_FILE
-		echo "$(echo $SORT_DIR/packages/*/lighttpd-[0-9]*) -7100" >> $SORT_FILE
-		echo "$(echo $SORT_DIR/packages/*/pcre-[0-9]*) -7100" >> $SORT_FILE
 		cat >>$TEMP_DIR/install.sh<<EOF
 echo "=> slitaz web site installed in file://\$DIR/website/index.html"
 EOF
@@ -238,7 +254,9 @@
 isoloram=$ISO_DIR/flavors/slitaz-loram-cdrom-sqfs.iso
 case " $OPTIONS " in
 *\ --boot\ *)
-    echo -n "Creating boot tree"
+	echo -n "Creating boot tree"
+	need $iso
+	which isoinfo > /dev/null || need /usr/bin/isoinfo
 	isoinfo -R -l -i $iso | awk '/^Directory/ { path=$4 } /^-/ { print path$12  }' | while read file; do
 		[ "$(basename $file)" == ".." ] && continue
 		[ "$file" = "/boot/isolinux/boot.cat" ] && continue
@@ -249,22 +267,24 @@
 	if [ -f "$(echo $TEMP_DIR/boot/vmlinuz*)" ]; then
 		rm -f $TEMP_DIR/boot/bzImage
 		ln $TEMP_DIR/boot/vmlinuz* $TEMP_DIR/boot/bzImage
-    fi
+	fi
 	status
 	BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \
 -c boot/isolinux/boot.cat  -no-emul-boot -boot-load-size 4 -boot-info-table"
-    case " $OPTIONS " in
+	case " $OPTIONS " in
 	*\ --auto-install\ *)
-    	echo -n "Enable auto install"
+		echo -n "Enable auto install"
 		sed -i "s/rw root/rw config=LABEL=packages-$PKG_VER,install.sh root/" \
 			$TEMP_DIR/boot/isolinux/*.cfg
 		status
 		;;
 	esac
-    [ -f $PXE_DIR/ifmem.c32 -a -f $isoloram ] && case " $OPTIONS " in
+	case " $OPTIONS " in
 	*\ --loram-detect\ *)
-    	echo -n "Enable loram autodetection"
-		cp $PXE_DIR/ifmem.c32 "$TEMP_DIR/boot/isolinux"
+		echo -n "Enable loram autodetection"
+		need $IFMEM_C32 $isoloram
+		which isoinfo > /dev/null || need /usr/bin/isoinfo
+		cp $IFMEM_C32 "$TEMP_DIR/boot/isolinux"
 		isoinfo -R -x "/usr.sqfs" -i $isoloram > "$TEMP_DIR/usr.sqfs"
 		echo "$SORT_DIR/usr.sqfs -5000" >> $SORT_FILE
 		isoinfo -R -x "/boot/rootfs.gz" -i $isoloram > \
@@ -300,18 +320,19 @@
 	;;
 *\ --webboot\ *)
 	if extract_boot gpxe; then
-    	echo -n "Creating web boot tree"
-		mkdir $TEMP_DIR/boot/isolinux/
-		isoinfo -x "/BOOT/ISOLINUX/ISOLINUX.BIN;1" -i $iso > \
-			$TEMP_DIR/boot/isolinux/isolinux.bin
-		mv $TEMP_DIR/boot/gpxe $TEMP_DIR/boot/isolinux
-		echo "$SORT_DIR/boot 0" >> $SORT_FILE
-		cat > $TEMP_DIR/boot/isolinux/isolinux.cfg <<EOT
+	echo -n "Creating web boot tree"
+	which isoinfo > /dev/null || need /usr/bin/isoinfo
+	mkdir $TEMP_DIR/boot/isolinux/
+	isoinfo -R -x "/boot/isolinux/isolinux.bin" -i $iso > \
+		$TEMP_DIR/boot/isolinux/isolinux.bin
+	mv $TEMP_DIR/boot/gpxe $TEMP_DIR/boot/isolinux
+	echo "$SORT_DIR/boot 0" >> $SORT_FILE
+	cat > $TEMP_DIR/boot/isolinux/isolinux.cfg <<EOT
 default gpxe
 append http://mirror.slitaz.org/pxe/pxelinux.0
 EOT
-		status
-		BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \
+	status
+	BOOT_OPT="-sort $SORT_FILE -b boot/isolinux/isolinux.bin \
 -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table"
 	fi
 	;;
@@ -319,7 +340,7 @@
 
 if [ -n "$BOOT_OPT" ]; then
 	echo "$(du -chs $TEMP_DIR/boot $TEMP_DIR/usr.sqfs 2> /dev/null | \
-		    tail -1 | awk '{ print $1 }') used by boot."
+		    awk 'END { print $1 }') used by boot."
 fi
 
 case " $OPTIONS " in
@@ -330,7 +351,7 @@
 esac
 # Gen ISO
 echo -n "Generating iso image"
-/usr/bin/genisoimage -R -J -f -V $VOLUME_ID \
+genisoimage -R -J -f -V $VOLUME_ID \
  -P "$PUBLISHER" -md5-list $REPOS/packages.md5 \
  -quiet -o $OUTPUT $BOOT_OPT $TEMP_DIR
 status 
@@ -339,11 +360,11 @@
 
 cd ${ROOT}
 echo -n "Create hybrid DVD/CDROM"
-[ -x /usr/bin/isohybrid ] && /usr/bin/isohybrid $IMAGE 2> /dev/null
+which isohybrid > /dev/null && isohybrid $IMAGE 2> /dev/null
 status
 
 echo -n "Calculate md5sum"
-/usr/bin/md5sum $IMAGE > $(basename $IMAGE .iso).md5
+md5sum $IMAGE > $(basename $IMAGE .iso).md5
 status
 
 echo -n "Moving file to mirror"
diff -r 74dcbc43857b -r 350536878fe3 mplayer-svn/receipt
--- a/mplayer-svn/receipt	Sun Nov 08 23:33:00 2009 +0100
+++ b/mplayer-svn/receipt	Mon Nov 09 21:55:05 2009 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="mplayer-svn"
-VERSION="29268"
+VERSION="29843"
 CATEGORY="multimedia"
 SHORT_DESC="Mplayer SVN version"
 MAINTAINER="pankso@slitaz.org"
@@ -16,7 +16,7 @@
 # This package is compiled against shared ffmpeg. Compiling with shared ffmpeg on svn version is always challenging.
 # Tip: Try to use the same day ffmpeg and mplayer versions (use: svn info), very likely to succeed
 # To compile with in-built ffmpeg (and double the size of pkg), remove from compile options:
-#  --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a 
+#  --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a 
 
 compile_rules()
 {
@@ -53,14 +53,14 @@
 		--disable-jack \
 		--disable-liblzo \
 		--disable-libdv \
-		 --disable-libavcodec_a \
-		--disable-libavformat_a \
-		--disable-libpostproc_a \
-		--disable-libswscale_a \
-		--disable-fribidi --target=i386-linux --disable-libavutil_a \
+		--disable-speex \
+		--disable-openal \
+		--disable-faad \
+		--disable-libavcodec_mpegaudio_hp \
+		--disable-fribidi --target=i386-linux  \
 		--disable-tv --disable-tv-teletext --disable-radio-v4l2 --disable-v4l2 \
 		--disable-musepack --disable-dvdnav --disable-esd --disable-mga \
-		--disable-libamr_nb --disable-lirc --disable-nas --disable-vdpau \
+		--disable-lirc --disable-lircc --disable-smb --disable-nemesi --disable-nas --disable-vdpau \
 		--enable-gui --enable-freetype &&
 	make &&
 	make DESTDIR=$PWD/../_pkg install
diff -r 74dcbc43857b -r 350536878fe3 mplayer-svn/stuff/mplayer-svn-29843-liba52-gcc44.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mplayer-svn/stuff/mplayer-svn-29843-liba52-gcc44.u	Mon Nov 09 21:55:05 2009 +0100
@@ -0,0 +1,12 @@
+--- configure	2009-04-16 12:02:10.000000000 +0200
++++ configure	2009-05-22 15:23:38.000000000 +0200
+@@ -6501,6 +6501,7 @@
+ def_liba52='#undef CONFIG_LIBA52'
+ def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
+ if test "$_liba52_internal" = yes ; then
++	test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /")
+   _liba52=yes
+   def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
+   _res_comment="internal"
+
+
diff -r 74dcbc43857b -r 350536878fe3 poppler/receipt
--- a/poppler/receipt	Sun Nov 08 23:33:00 2009 +0100
+++ b/poppler/receipt	Mon Nov 09 21:55:05 2009 +0100
@@ -5,9 +5,9 @@
 CATEGORY="office"
 SHORT_DESC="Poppler is a PDF rendering library."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="expat freetype glib jpeg libxml2 xorg-libXdamage"
+DEPENDS="expat freetype glib jpeg libxml2 xorg-libXdamage lcms"
 BUILD_DEPENDS="$DEPENDS expat-dev pkg-config jpeg-dev libxml2-dev \
-freetype-dev fontconfig-dev glib-dev Qt4-dev"
+freetype-dev fontconfig-dev glib-dev Qt4-dev lcms-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://poppler.freedesktop.org/"
 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
diff -r 74dcbc43857b -r 350536878fe3 pygtk/receipt
--- a/pygtk/receipt	Sun Nov 08 23:33:00 2009 +0100
+++ b/pygtk/receipt	Mon Nov 09 21:55:05 2009 +0100
@@ -7,7 +7,8 @@
 MAINTAINER="erjo@slitaz.org"
 DEPENDS="python pycairo pygobject expat gtk+ libglade libxml2 xorg-libX11 \
 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
-xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXdamage"
+xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
+xorg-libXdamage libffi"
 BUILD_DEPENDS="pygobject-dev pycairo-dev libglade-dev"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.pygtk.org/"
diff -r 74dcbc43857b -r 350536878fe3 slitaz-mercurial-style/stuff/templates/slitaz/index.tmpl
--- a/slitaz-mercurial-style/stuff/templates/slitaz/index.tmpl	Sun Nov 08 23:33:00 2009 +0100
+++ b/slitaz-mercurial-style/stuff/templates/slitaz/index.tmpl	Mon Nov 09 21:55:05 2009 +0100
@@ -18,7 +18,7 @@
 <div class="nav_box">
 <h4>About SliTaz repos</h4>
 <p>
-This web interface let you follow in real time all improvments, fixes
+This web interface lets you follow in real time all improvements, fixes
 and other changes made by SliTaz contributors.
 </p>
 </div>
diff -r 74dcbc43857b -r 350536878fe3 smplayer/receipt
--- a/smplayer/receipt	Sun Nov 08 23:33:00 2009 +0100
+++ b/smplayer/receipt	Mon Nov 09 21:55:05 2009 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="smplayer"
-VERSION="0.6.7"
+VERSION="0.6.8"
 CATEGORY="multimedia"
 SHORT_DESC="QT-based front-end for MPlayer"
 MAINTAINER="jozee@slitaz.org"