wok-next rev 19601

Update/recook bunch of packages (some with known cook fails)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jan 27 15:35:03 2017 +0200 (2017-01-27)
parents 1a6d268d7cca
children d441da4a124b
files busybox/receipt busybox/stuff/1.26/bug9471.u cdrkit-audio/receipt cdrkit-isoinfo/receipt cdrkit/receipt cookutils-daemon/receipt cookutils/receipt depmod/receipt dialog/receipt dropbear-pam/receipt dropbear/receipt e2fsprogs/receipt fuse-dev/receipt fuse/description.txt fuse/receipt gettext-tools/receipt gettext/receipt grub4dos-linux/receipt grub4dos/description.txt grub4dos/receipt ipxe/receipt lzlib-dev/receipt lzlib/receipt lzma/receipt memtest-serial/receipt memtest/receipt module-init-tools/receipt pam-dev/receipt pam/receipt parted/receipt pciids/receipt smake/receipt tazpkg/receipt usbids/receipt xorg-util-macros/receipt
line diff
     1.1 --- a/busybox/receipt	Mon Jan 23 11:20:11 2017 +0200
     1.2 +++ b/busybox/receipt	Fri Jan 27 15:35:03 2017 +0200
     1.3 @@ -46,6 +46,7 @@
     1.4  ftpd.u
     1.5  shutdown.u
     1.6  scriptreplay.u
     1.7 +bug9471.u
     1.8  EOT
     1.9  	cp $stuff/${VERSION%.*}/.config .
    1.10  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/busybox/stuff/1.26/bug9471.u	Fri Jan 27 15:35:03 2017 +0200
     2.3 @@ -0,0 +1,28 @@
     2.4 +--- busybox-1.26.2/networking/wget.c
     2.5 ++++ busybox-1.26.2/networking/wget.c
     2.6 +@@ -1093,12 +1093,19 @@
     2.7 + 		}
     2.8 + 
     2.9 + 		fflush(sfp);
    2.10 +-		/* If we use SSL helper, keeping our end of the socket open for writing
    2.11 +-		 * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF)
    2.12 +-		 * even after child closes its copy of the fd.
    2.13 +-		 * This helps:
    2.14 +-		 */
    2.15 +-		shutdown(fileno(sfp), SHUT_WR);
    2.16 ++/* Tried doing this unconditionally.
    2.17 ++ * Cloudflare and nginx/1.11.5 are shocked to see SHUT_WR on non-HTTPS.
    2.18 ++ */
    2.19 ++#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER
    2.20 ++		if (target.protocol == P_HTTPS) {
    2.21 ++			/* If we use SSL helper, keeping our end of the socket open for writing
    2.22 ++			 * makes our end (i.e. the same fd!) readable (EAGAIN instead of EOF)
    2.23 ++			 * even after child closes its copy of the fd.
    2.24 ++			 * This helps:
    2.25 ++			 */
    2.26 ++			shutdown(fileno(sfp), SHUT_WR);
    2.27 ++		}
    2.28 ++#endif
    2.29 + 
    2.30 + 		/*
    2.31 + 		 * Retrieve HTTP response line and check for "200" status code.
     3.1 --- a/cdrkit-audio/receipt	Mon Jan 23 11:20:11 2017 +0200
     3.2 +++ b/cdrkit-audio/receipt	Fri Jan 27 15:35:03 2017 +0200
     3.3 @@ -6,8 +6,9 @@
     3.4  SHORT_DESC="Icedax, cdda2ogg and other tools for extracting audio files."
     3.5  MAINTAINER="pankso@slitaz.org"
     3.6  LICENSE="GPL2"
     3.7 +WEB_SITE="http://www.cdrkit.org/"
     3.8 +
     3.9  WANTED="cdrkit"
    3.10 -WEB_SITE="http://www.cdrkit.org/"
    3.11  
    3.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.13  genpkg_rules()
     4.1 --- a/cdrkit-isoinfo/receipt	Mon Jan 23 11:20:11 2017 +0200
     4.2 +++ b/cdrkit-isoinfo/receipt	Fri Jan 27 15:35:03 2017 +0200
     4.3 @@ -6,8 +6,9 @@
     4.4  SHORT_DESC="Isoinfo Utility programs for iso9660 images"
     4.5  MAINTAINER="jozee@slitaz.org"
     4.6  LICENSE="GPL2"
     4.7 +WEB_SITE="http://www.cdrkit.org/"
     4.8 +
     4.9  WANTED="cdrkit"
    4.10 -WEB_SITE="http://www.cdrkit.org/"
    4.11  
    4.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.13  genpkg_rules()
     5.1 --- a/cdrkit/receipt	Mon Jan 23 11:20:11 2017 +0200
     5.2 +++ b/cdrkit/receipt	Fri Jan 27 15:35:03 2017 +0200
     5.3 @@ -6,13 +6,15 @@
     5.4  SHORT_DESC="Wodim for recording/blanking CDs/DVDs and genisoimage for ISO."
     5.5  MAINTAINER="pankso@slitaz.org"
     5.6  LICENSE="GPL2"
     5.7 +WEB_SITE="http://www.cdrkit.org/"
     5.8 +
     5.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.10 -WEB_SITE="http://www.cdrkit.org/"
    5.11  WGET_URL="http://cdrkit.org/releases/$TARBALL"
    5.12  EXTRA_SOURCE_FILES="cdrkit-1.1.9-efi-boot.patch"
    5.13  
    5.14  DEPENDS="libcap zlib bzlib attr"
    5.15  BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev"
    5.16 +SPLIT="cdrkit-audio cdrkit-isoinfo"
    5.17  
    5.18  # Rules to configure and make the package.
    5.19  compile_rules()
     6.1 --- a/cookutils-daemon/receipt	Mon Jan 23 11:20:11 2017 +0200
     6.2 +++ b/cookutils-daemon/receipt	Fri Jan 27 15:35:03 2017 +0200
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="cookutils-daemon"
     6.7 -VERSION="869"
     6.8 +VERSION="872"
     6.9  CATEGORY="system-tools"
    6.10  SHORT_DESC="SliTaz Cooker daemon script for build host."
    6.11  MAINTAINER="pankso@slitaz.org"
     7.1 --- a/cookutils/receipt	Mon Jan 23 11:20:11 2017 +0200
     7.2 +++ b/cookutils/receipt	Fri Jan 27 15:35:03 2017 +0200
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="cookutils"
     7.7 -VERSION="869"
     7.8 +VERSION="872"
     7.9  CATEGORY="base-system"
    7.10  SHORT_DESC="SliTaz packages builder new generation."
    7.11  MAINTAINER="pankso@slitaz.org"
     8.1 --- a/depmod/receipt	Mon Jan 23 11:20:11 2017 +0200
     8.2 +++ b/depmod/receipt	Fri Jan 27 15:35:03 2017 +0200
     8.3 @@ -7,8 +7,8 @@
     8.4  MAINTAINER="pascal.bellard@slitaz.org"
     8.5  LICENSE="GPL2"
     8.6  WEB_SITE="https://www.kernel.org/pub/linux/utils/kernel/module-init-tools/"
     8.7 +
     8.8  WANTED="module-init-tools"
     8.9 -
    8.10  DEPENDS="wget glibc-base gcc-lib-base zlib lzlib"
    8.11  
    8.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.13 @@ -23,8 +23,3 @@
    8.14  {
    8.15  	rm -f "$1/sbin/depmod"
    8.16  }
    8.17 -
    8.18 -post_remove()
    8.19 -{
    8.20 -	ln -s /bin/busybox "$1/sbin/depmod"
    8.21 -}
     9.1 --- a/dialog/receipt	Mon Jan 23 11:20:11 2017 +0200
     9.2 +++ b/dialog/receipt	Fri Jan 27 15:35:03 2017 +0200
     9.3 @@ -13,7 +13,7 @@
     9.4  WGET_URL="ftp://invisible-island.net/dialog/$TARBALL"
     9.5  
     9.6  DEPENDS="ncurses"
     9.7 -BUILD_DEPENDS="ncurses-dev"
     9.8 +BUILD_DEPENDS="ncurses-dev gettext"
     9.9  
    9.10  # Rules to configure and make the package.
    9.11  compile_rules()
    10.1 --- a/dropbear-pam/receipt	Mon Jan 23 11:20:11 2017 +0200
    10.2 +++ b/dropbear-pam/receipt	Fri Jan 27 15:35:03 2017 +0200
    10.3 @@ -6,12 +6,13 @@
    10.4  SHORT_DESC="Light SSH client and server using PAM."
    10.5  MAINTAINER="pascal.bellard@slitaz.org"
    10.6  LICENSE="MIT"
    10.7 -WANTED="dropbear"
    10.8 -DEPENDS="dropbear pam"
    10.9  WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
   10.10  PROVIDE="dropbear:pam ssh:pam"
   10.11  TAGS="ssh"
   10.12  
   10.13 +WANTED="dropbear"
   10.14 +DEPENDS="dropbear pam"
   10.15 +
   10.16  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.17  genpkg_rules()
   10.18  {
    11.1 --- a/dropbear/receipt	Mon Jan 23 11:20:11 2017 +0200
    11.2 +++ b/dropbear/receipt	Fri Jan 27 15:35:03 2017 +0200
    11.3 @@ -6,17 +6,19 @@
    11.4  SHORT_DESC="Lightweight SSH2 server and client"
    11.5  MAINTAINER="pascal.bellard@slitaz.org"
    11.6  LICENSE="MIT"
    11.7 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    11.8  WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
    11.9 -WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
   11.10  CONFIG_FILES="/etc/dropbear"
   11.11  SUGGESTED="sftp-server"
   11.12  PROVIDE="ssh"
   11.13  TAGS="ssh"
   11.14  HOST_ARCH="i486 arm"
   11.15  
   11.16 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   11.17 +WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
   11.18 +
   11.19  DEPENDS="zlib"
   11.20  BUILD_DEPENDS="zlib-dev pam pam-dev"
   11.21 +SPLIT="dropbear-pam"
   11.22  
   11.23  # Handle multiarch compilation.
   11.24  case "$ARCH" in
    12.1 --- a/e2fsprogs/receipt	Mon Jan 23 11:20:11 2017 +0200
    12.2 +++ b/e2fsprogs/receipt	Fri Jan 27 15:35:03 2017 +0200
    12.3 @@ -76,8 +76,3 @@
    12.4  {
    12.5  	rm -f $1/sbin/tune2fs
    12.6  }
    12.7 -
    12.8 -post_remove()
    12.9 -{
   12.10 -	ln -s /bin/busybox $1/sbin/tune2fs
   12.11 -}
    13.1 --- a/fuse-dev/receipt	Mon Jan 23 11:20:11 2017 +0200
    13.2 +++ b/fuse-dev/receipt	Fri Jan 27 15:35:03 2017 +0200
    13.3 @@ -1,9 +1,9 @@
    13.4  # SliTaz package receipt.
    13.5  
    13.6  PACKAGE="fuse-dev"
    13.7 -VERSION="2.9.3"
    13.8 +VERSION="2.9.7"
    13.9  CATEGORY="development"
   13.10 -SHORT_DESC="Fuse Filsystem devel files"
   13.11 +SHORT_DESC="Fuse Filsystem in user space (development files)"
   13.12  MAINTAINER="pankso@slitaz.org"
   13.13  LICENSE="GPL2"
   13.14  WEB_SITE="http://fuse.sourceforge.net/"
   13.15 @@ -14,8 +14,5 @@
   13.16  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.17  genpkg_rules()
   13.18  {
   13.19 -	mkdir -p $fs/usr/lib
   13.20 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
   13.21 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   13.22 -	cp -a $install/usr/include $fs/usr
   13.23 +	cook_copy_files *.h *.la *.pc
   13.24  }
    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/fuse/description.txt	Fri Jan 27 15:35:03 2017 +0200
    14.3 @@ -0,0 +1,4 @@
    14.4 +FUSE (Filesystem in Userspace) is a simple interface for userspace programs to
    14.5 +export a virtual filesystem to the Linux kernel. Fuse also aims to provide a
    14.6 +secure method for non privileged users to create and mount their own filesystem
    14.7 +implementations.
    15.1 --- a/fuse/receipt	Mon Jan 23 11:20:11 2017 +0200
    15.2 +++ b/fuse/receipt	Fri Jan 27 15:35:03 2017 +0200
    15.3 @@ -1,32 +1,38 @@
    15.4  # SliTaz package receipt.
    15.5  
    15.6  PACKAGE="fuse"
    15.7 -VERSION="2.9.3"
    15.8 +VERSION="2.9.7"
    15.9  CATEGORY="system-tools"
   15.10  SHORT_DESC="Fuse Filsystem in user space."
   15.11  MAINTAINER="pankso@slitaz.org"
   15.12  LICENSE="GPL2"
   15.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   15.14  WEB_SITE="http://fuse.sourceforge.net/"
   15.15 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   15.16  TAGS="filesystem"
   15.17  HOST_ARCH="i486 arm"
   15.18  
   15.19 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   15.20 +WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL"
   15.21 +
   15.22  # Rules to configure and make the package.
   15.23  compile_rules()
   15.24  {
   15.25  	./configure \
   15.26 +		--disable-static \
   15.27 +		INIT_D_PATH=/tmp/init.d \
   15.28  		$CONFIGURE_ARGS &&
   15.29  	make && make install
   15.30 +
   15.31 +	mkdir -p $install/lib
   15.32 +	mv $install/usr/lib/libfuse.so.* $install/lib
   15.33 +	ln -sf ../../lib/libfuse.so.$VERSION $install/usr/lib/libfuse.so
   15.34 +
   15.35 +	mkdir -p $install/usr/share/doc/fuse-$VERSION/api
   15.36 +	cp doc/html/* $install/usr/share/doc/fuse-$VERSION/api
   15.37  }
   15.38  
   15.39  # Rules to gen a SliTaz package suitable for Tazpkg.
   15.40  genpkg_rules()
   15.41  {
   15.42 -	mkdir -p $fs/usr/lib
   15.43 -	cp -a $install/dev $fs
   15.44 -	cp -a $install/sbin $fs
   15.45 -	cp -a $install/usr/bin $fs/usr
   15.46 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   15.47 +	cook_copy_folders dev etc sbin bin
   15.48 +	cook_copy_files *.so*
   15.49  }
   15.50 -
    16.1 --- a/gettext-tools/receipt	Mon Jan 23 11:20:11 2017 +0200
    16.2 +++ b/gettext-tools/receipt	Fri Jan 27 15:35:03 2017 +0200
    16.3 @@ -9,7 +9,7 @@
    16.4  WEB_SITE="http://www.gnu.org/software/gettext/"
    16.5  
    16.6  WANTED="gettext"
    16.7 -DEPENDS="acl attr glib libcroco libgomp libxml2 pcre zlib"
    16.8 +DEPENDS="acl attr glib libcroco libgomp liblzma libxml2 pcre zlib"
    16.9  
   16.10  # Rules to gen a SliTaz package suitable for Tazpkg.
   16.11  genpkg_rules()
    17.1 --- a/gettext/receipt	Mon Jan 23 11:20:11 2017 +0200
    17.2 +++ b/gettext/receipt	Fri Jan 27 15:35:03 2017 +0200
    17.3 @@ -13,7 +13,7 @@
    17.4  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    17.5  
    17.6  # Runtime depends, then dev-depends
    17.7 -DEPENDS="gettext-base gettext-tools libcroco libxml2 \
    17.8 +DEPENDS="gettext-base gettext-tools libcroco liblzma libxml2 \
    17.9  acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4"
   17.10  BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev"
   17.11  SPLIT="gettext-base gettext-tools"
    18.1 --- a/grub4dos-linux/receipt	Mon Jan 23 11:20:11 2017 +0200
    18.2 +++ b/grub4dos-linux/receipt	Fri Jan 27 15:35:03 2017 +0200
    18.3 @@ -7,8 +7,9 @@
    18.4  MAINTAINER="pascal.bellard@slitaz.org"
    18.5  LICENSE="GPL2"
    18.6  WEB_SITE="http://grub4dos.sourceforge.net/"
    18.7 +PROVIDE="grub"
    18.8 +
    18.9  WANTED="grub4dos"
   18.10 -PROVIDE="grub"
   18.11  
   18.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   18.13  genpkg_rules()
   18.14 @@ -20,4 +21,3 @@
   18.15  	cp -a  $install/usr/lib/grub/$libarch/*stage* \
   18.16  		$fs/usr/lib/grub/$libarch
   18.17  }
   18.18 -
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/grub4dos/description.txt	Fri Jan 27 15:35:03 2017 +0200
    19.3 @@ -0,0 +1,4 @@
    19.4 +GRUB for DOS is the DOS extension of GRUB. It enables DOS users to run the
    19.5 +configuration console directly in real mode. The project also contains an
    19.6 +utility called WINGRUB, an GUI intends to help configuring and installing GRUB
    19.7 +in the WINDOWS environment.
    20.1 --- a/grub4dos/receipt	Mon Jan 23 11:20:11 2017 +0200
    20.2 +++ b/grub4dos/receipt	Fri Jan 27 15:35:03 2017 +0200
    20.3 @@ -6,16 +6,17 @@
    20.4  SHORT_DESC="Some enhancments of grub boot loader."
    20.5  MAINTAINER="pascal.bellard@slitaz.org"
    20.6  LICENSE="GPL2"
    20.7 +WEB_SITE="https://gna.org/projects/grub4dos/"
    20.8 +
    20.9  TARBALL="$PACKAGE-$VERSION-src.zip"
   20.10 -WEB_SITE="http://grub4dos.sourceforge.net/"
   20.11 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   20.12 +WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE-$VERSION-src.zip"
   20.13  
   20.14  BUILD_DEPENDS="lzma gcc3"
   20.15 +SPLIT="grub4dos-linux"
   20.16  
   20.17  # Rules to configure and make the package.
   20.18  compile_rules()
   20.19  {
   20.20 -	cd $src
   20.21  	for i in $stuff/*.diff ; do
   20.22  		[ -f $(basename $i) ] && continue
   20.23  		patch -p1 < $i
    21.1 --- a/ipxe/receipt	Mon Jan 23 11:20:11 2017 +0200
    21.2 +++ b/ipxe/receipt	Fri Jan 27 15:35:03 2017 +0200
    21.3 @@ -1,18 +1,18 @@
    21.4  # SliTaz package receipt.
    21.5  
    21.6  PACKAGE="ipxe"
    21.7 -VERSION="1.0.0-20160119"
    21.8 -GIT_TAG="3c26ffafceef176286c108fe2b01ccebd83062a0"
    21.9 +VERSION="41f786c"
   21.10  CATEGORY="system-tools"
   21.11  SHORT_DESC="Open source network boot firmware."
   21.12  MAINTAINER="pascal.bellard@slitaz.org"
   21.13 -LICENSE="GPL2"
   21.14 +LICENSE="GPL2 UBDL"
   21.15  WEB_SITE="http://ipxe.org/"
   21.16 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
   21.17 -WGET_URL="https://git.ipxe.org/ipxe.git/snapshot/$GIT_TAG.tar.bz2"
   21.18 +
   21.19 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   21.20 +WGET_URL="$GITHUB/ipxe/ipxe/tarball/$VERSION"
   21.21  
   21.22  DEPENDS=""
   21.23 -BUILD_DEPENDS="perl wget liblzma-dev"
   21.24 +BUILD_DEPENDS="perl liblzma-dev"
   21.25  
   21.26  # Rules to configure and make the package.
   21.27  compile_rules()
   21.28 @@ -25,6 +25,10 @@
   21.29  	    -e 's|//\(#define.*CONSOLE_CMD\)|\1|' \
   21.30  	    -e 's|//\(#define.*REBOOT_CMD\)|\1|' config/general.h
   21.31  	cp $stuff/lkrnprefix.S arch/i386/prefix
   21.32 +
   21.33 +	make all
   21.34 +	separator
   21.35 +
   21.36  	make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \
   21.37  	     bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \
   21.38  	     bin/ipxe.kkkpxe bin/ipxe.nbi bin/ipxe.lkrn EMBED=$stuff/ipxe.cmd
    22.1 --- a/lzlib-dev/receipt	Mon Jan 23 11:20:11 2017 +0200
    22.2 +++ b/lzlib-dev/receipt	Fri Jan 27 15:35:03 2017 +0200
    22.3 @@ -7,8 +7,9 @@
    22.4  MAINTAINER="pascal.bellard@slitaz.org"
    22.5  LICENSE="LGPL2.1"
    22.6  WEB_SITE="http://sourceforge.net/projects/sevenzip/"
    22.7 +HOST_ARCH="i486 arm"
    22.8 +
    22.9  WANTED="lzma"
   22.10 -HOST_ARCH="i486 arm"
   22.11  
   22.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   22.13  genpkg_rules()
   22.14 @@ -16,4 +17,3 @@
   22.15  	mkdir -p $fs/usr/include
   22.16  	cp -a $src/CPP/7zip/Compress/LZMA_Alone/lzlib.h $fs/usr/include
   22.17  }
   22.18 -
    23.1 --- a/lzlib/receipt	Mon Jan 23 11:20:11 2017 +0200
    23.2 +++ b/lzlib/receipt	Fri Jan 27 15:35:03 2017 +0200
    23.3 @@ -7,9 +7,10 @@
    23.4  MAINTAINER="pascal.bellard@slitaz.org"
    23.5  LICENSE="LGPL2.1"
    23.6  WEB_SITE="http://sourceforge.net/projects/sevenzip/"
    23.7 +HOST_ARCH="i486 arm"
    23.8 +
    23.9 +WANTED="lzma"
   23.10  DEPENDS="zlib gcc-lib-base"
   23.11 -WANTED="lzma"
   23.12 -HOST_ARCH="i486 arm"
   23.13  
   23.14  # Rules to gen a SliTaz package suitable for Tazpkg.
   23.15  genpkg_rules()
   23.16 @@ -19,4 +20,3 @@
   23.17  	ln -s liblz.so.1.0.0 $fs/lib/liblz.so
   23.18  	ln -s liblz.so.1.0.0 $fs/lib/liblz.so.1
   23.19  }
   23.20 -
    24.1 --- a/lzma/receipt	Mon Jan 23 11:20:11 2017 +0200
    24.2 +++ b/lzma/receipt	Fri Jan 27 15:35:03 2017 +0200
    24.3 @@ -6,13 +6,16 @@
    24.4  SHORT_DESC="Compressor with a high compression ratio."
    24.5  MAINTAINER="pascal.bellard@slitaz.org"
    24.6  LICENSE="LGPL2.1"
    24.7 -TARBALL="lzma$(echo $VERSION | sed 's/\.//').tar.bz2"
    24.8  WEB_SITE="http://sourceforge.net/projects/sevenzip/"
    24.9 -WGET_URL="$SF_MIRROR/sevenzip/$TARBALL"
   24.10  TAGS="compression archive"
   24.11  HOST_ARCH="i486 arm"
   24.12  
   24.13 +TARBALL="lzma$(echo $VERSION | sed 's/\.//').tar.bz2"
   24.14 +WGET_URL="$SF_MIRROR/sevenzip/$TARBALL"
   24.15 +
   24.16  DEPENDS="lzlib zlib gcc-lib-base"
   24.17 +BUILD_DEPENDS="zlib-dev"
   24.18 +SPLIT="lzlib lzlib-dev"
   24.19  
   24.20  # Rules to configure and make the package.
   24.21  compile_rules()
   24.22 @@ -22,7 +25,7 @@
   24.23  		touch done.lzlib.u
   24.24  	fi
   24.25  	cd CPP/7zip/Compress/LZMA_Alone
   24.26 -	
   24.27 +
   24.28  	# Handle cross compilation
   24.29  	case "$ARCH" in
   24.30  		arm)
   24.31 @@ -33,12 +36,11 @@
   24.32  	# Remove copyright message.
   24.33  	sed '/MY_VERSION_COPYRIGHT_DATE/d' -i LzmaAlone.cpp
   24.34  
   24.35 -	make -f makefile.gcc lzma 2> /dev/null
   24.36 +	make -f makefile.gcc lzma 2>/dev/null
   24.37  	make -f makefile.gcc liblz.so.1.0.0 &&
   24.38  	make -f makefile.gcc lzma
   24.39  }
   24.40  
   24.41 -
   24.42  # Rules to gen a SliTaz package suitable for Tazpkg.
   24.43  genpkg_rules()
   24.44  {
   24.45 @@ -49,9 +51,3 @@
   24.46  	ln -s lzma $fs/usr/bin/unlzma
   24.47  	ln -s lzma $fs/usr/bin/lzcat
   24.48  }
   24.49 -
   24.50 -post_remove()
   24.51 -{
   24.52 -	ln -s /bin/busybox "$1/usr/bin/unlzma"
   24.53 -	ln -s /bin/busybox "$1/usr/bin/lzcat"
   24.54 -}
    25.1 --- a/memtest-serial/receipt	Mon Jan 23 11:20:11 2017 +0200
    25.2 +++ b/memtest-serial/receipt	Fri Jan 27 15:35:03 2017 +0200
    25.3 @@ -7,6 +7,7 @@
    25.4  MAINTAINER="pascal.bellard@slitaz.org"
    25.5  LICENSE="GPL2"
    25.6  WEB_SITE="http://www.memtest.org/"
    25.7 +
    25.8  WANTED="memtest"
    25.9  
   25.10  # Rules to gen a SliTaz package suitable for Tazpkg.
    26.1 --- a/memtest/receipt	Mon Jan 23 11:20:11 2017 +0200
    26.2 +++ b/memtest/receipt	Fri Jan 27 15:35:03 2017 +0200
    26.3 @@ -6,17 +6,18 @@
    26.4  SHORT_DESC="Memory failures detection tool."
    26.5  MAINTAINER="pascal.bellard@slitaz.org"
    26.6  LICENSE="GPL2"
    26.7 +WEB_SITE="http://www.memtest.org/"
    26.8 +
    26.9  SOURCE="memtest86+"
   26.10  TARBALL="$SOURCE-$VERSION.tar.gz"
   26.11 -WEB_SITE="http://www.memtest.org/"
   26.12  WGET_URL="${WEB_SITE}download/$VERSION/$TARBALL"
   26.13  
   26.14  BUILD_DEPENDS="xz"
   26.15 +SPLIT="memtest-serial"
   26.16  
   26.17  # Rules to configure and make the package.
   26.18  compile_rules()
   26.19  {
   26.20 -	cd $src
   26.21  	sed -i '/scp memtest.bin/d' Makefile
   26.22  	for i in array-size io setup ; do
   26.23  		patch -p1 < $stuff/$SOURCE-$VERSION-$i.patch
    27.1 --- a/module-init-tools/receipt	Mon Jan 23 11:20:11 2017 +0200
    27.2 +++ b/module-init-tools/receipt	Fri Jan 27 15:35:03 2017 +0200
    27.3 @@ -6,8 +6,9 @@
    27.4  SHORT_DESC="Kernel modules manipulation tools."
    27.5  MAINTAINER="pascal.bellard@slitaz.org"
    27.6  LICENSE="GPL2"
    27.7 +WEB_SITE="https://www.kernel.org/pub/linux/utils/kernel/module-init-tools/"
    27.8 +
    27.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   27.10 -WEB_SITE="https://www.kernel.org/pub/linux/utils/kernel/module-init-tools/"
   27.11  WGET_URL="${WEB_SITE}$TARBALL"
   27.12  
   27.13  DEPENDS="glibc-base gcc-lib-base zlib lzlib depmod"
   27.14 @@ -29,8 +30,11 @@
   27.15  	# Don't generate manpages to avoid failure.
   27.16  	echo '.so man5/modprobe.conf.5' > modprobe.d.5
   27.17  
   27.18 -	./configure --enable-zlib \
   27.19 -	--sbindir=/sbin --bindir=/bin --sysconfdir=/etc \
   27.20 +	./configure \
   27.21 +		--enable-zlib \
   27.22 +		--sbindir=/sbin \
   27.23 +		--bindir=/bin \
   27.24 +		--sysconfdir=/etc \
   27.25  	$CONFIGURE_ARGS &&
   27.26  	make &&	make install
   27.27  }
   27.28 @@ -59,13 +63,3 @@
   27.29  	# BusyBox puts lsmod in /sbin, not /bin
   27.30  	rm -f "$1/sbin/lsmod"
   27.31  }
   27.32 -
   27.33 -post_remove()
   27.34 -{
   27.35 -	ln -s /bin/busybox "$1/sbin/insmod"
   27.36 -	ln -s /bin/busybox "$1/sbin/modinfo"
   27.37 -	ln -s /bin/busybox "$1/sbin/modprobe"
   27.38 -	ln -s /bin/busybox "$1/sbin/rmmod"
   27.39 -	# BusyBox puts lsmod in /sbin, not /bin
   27.40 -	ln -s /bin/busybox "$1/sbin/lsmod"
   27.41 -}
    28.1 --- a/pam-dev/receipt	Mon Jan 23 11:20:11 2017 +0200
    28.2 +++ b/pam-dev/receipt	Fri Jan 27 15:35:03 2017 +0200
    28.3 @@ -1,16 +1,15 @@
    28.4  # SliTaz package receipt.
    28.5  
    28.6  PACKAGE="pam-dev"
    28.7 -VERSION="1.2.0"
    28.8 +VERSION="1.3.0"
    28.9  CATEGORY="development"
   28.10  SHORT_DESC="Pluggable Authentication Modules, development files."
   28.11  MAINTAINER="pascal.bellard@slitaz.org"
   28.12  LICENSE="BSD GPL2"
   28.13 -WANTED="pam"
   28.14 -SOURCE="Linux-PAM"
   28.15  WEB_SITE="http://www.us.kernel.org/pub/linux/libs/pam/"
   28.16  HOST_ARCH="i486 arm"
   28.17  
   28.18 +WANTED="pam"
   28.19  DEPENDS="pam"
   28.20  
   28.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    29.1 --- a/pam/receipt	Mon Jan 23 11:20:11 2017 +0200
    29.2 +++ b/pam/receipt	Fri Jan 27 15:35:03 2017 +0200
    29.3 @@ -1,24 +1,25 @@
    29.4  # SliTaz package receipt.
    29.5  
    29.6  PACKAGE="pam"
    29.7 -VERSION="1.2.0"
    29.8 +VERSION="1.3.0"
    29.9  CATEGORY="system-tools"
   29.10  SHORT_DESC="Pluggable Authentication Modules."
   29.11  MAINTAINER="pascal.bellard@slitaz.org"
   29.12  LICENSE="BSD GPL2"
   29.13 -SOURCE="Linux-PAM"
   29.14 -TARBALL="$SOURCE-$VERSION.tar.bz2"
   29.15 -WEB_SITE="http://www.us.kernel.org/pub/linux/libs/pam/"
   29.16 -WGET_URL="http://gentoo.osuosl.org/distfiles/$TARBALL"
   29.17 +WEB_SITE="http://www.linux-pam.org/"
   29.18  HOST_ARCH="i486 arm"
   29.19  
   29.20 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   29.21 +WGET_URL="http://www.linux-pam.org/library/Linux-PAM-$VERSION.tar.bz2"
   29.22 +
   29.23  DEPENDS="glibc-base libdb"
   29.24  BUILD_DEPENDS="flex db-dev libdb"
   29.25  
   29.26  # Rules to configure and make the package.
   29.27  compile_rules()
   29.28  {
   29.29 -	./configure --sysconfdir=/etc \
   29.30 +	./configure \
   29.31 +		--sysconfdir=/etc \
   29.32  		$CONFIGURE_ARGS &&
   29.33  	make && make install
   29.34  }
   29.35 @@ -32,7 +33,7 @@
   29.36  	cp -a $install/lib/*so* $fs/lib
   29.37  	cp -a $install/lib/security $fs/lib
   29.38  	rm -f $fs/lib/security/*.la
   29.39 -	cp -a $stuff/* $fs	
   29.40 +	cp -a $stuff/* $fs
   29.41  }
   29.42  
   29.43  pre_remove()
    30.1 --- a/parted/receipt	Mon Jan 23 11:20:11 2017 +0200
    30.2 +++ b/parted/receipt	Fri Jan 27 15:35:03 2017 +0200
    30.3 @@ -6,10 +6,11 @@
    30.4  SHORT_DESC="GNU parted partition editor."
    30.5  MAINTAINER="pankso@slitaz.org"
    30.6  LICENSE="GPL3"
    30.7 +WEB_SITE="http://www.gnu.org/software/parted/index.shtml"
    30.8 +HOST_ARCH="i486 arm"
    30.9 +
   30.10 +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
   30.11  TARBALL="$PACKAGE-$VERSION.tar.xz"
   30.12 -WEB_SITE="http://www.gnu.org/software/parted/index.shtml"
   30.13 -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
   30.14 -HOST_ARCH="i486 arm"
   30.15  
   30.16  DEPENDS="util-linux-uuid util-linux-blkid"
   30.17  BUILD_DEPENDS="e2fsprogs-dev util-linux-uuid-dev util-linux-blkid-dev"
   30.18 @@ -24,6 +25,7 @@
   30.19  	grep -qs 'define u8' libparted/arch/linux.c ||
   30.20  	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
   30.21  		libparted/arch/linux.c
   30.22 +
   30.23  	./configure \
   30.24  		--disable-debug \
   30.25  		--disable-Werror \
    31.1 --- a/pciids/receipt	Mon Jan 23 11:20:11 2017 +0200
    31.2 +++ b/pciids/receipt	Fri Jan 27 15:35:03 2017 +0200
    31.3 @@ -1,27 +1,29 @@
    31.4  # SliTaz package receipt.
    31.5  
    31.6  PACKAGE="pciids"
    31.7 -VERSION="20150414"
    31.8 +VERSION="9cecb39"
    31.9  CATEGORY="misc"
   31.10  SHORT_DESC="List of PCI ID's"
   31.11  MAINTAINER="slaxemulator@gmail.com"
   31.12  LICENSE="BSD GPL2"
   31.13 -WEB_SITE="http://pciids.sourceforge.net/"
   31.14 -TARBALL="pci-$VERSION.ids.gz"
   31.15 -WGET_URL="${WEB_SITE}v2.2/pci.ids.gz"
   31.16 +WEB_SITE="http://pci-ids.ucw.cz/"
   31.17  HOST_ARCH="i486 arm"
   31.18  
   31.19 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   31.20 +WGET_URL="$GITHUB/pciutils/pciids/tarball/$VERSION"
   31.21 +
   31.22  BUILD_DEPENDS="advancecomp"
   31.23  
   31.24  # Rules to configure and make the package.
   31.25  compile_rules()
   31.26  {
   31.27 -	advdef -z4 pci-$VERSION.ids.gz
   31.28 +	gzip pci.ids
   31.29 +	advdef -z4 pci.ids.gz
   31.30  }
   31.31  
   31.32  # Rules to gen a SliTaz package suitable for Tazpkg.
   31.33  genpkg_rules()
   31.34  {
   31.35  	mkdir -p $fs/usr/share/misc
   31.36 -	cp $src/pci-$VERSION.ids.gz $fs/usr/share/misc/pci.ids.gz
   31.37 +	cp $src/pci.ids.gz $fs/usr/share/misc
   31.38  }
    32.1 --- a/smake/receipt	Mon Jan 23 11:20:11 2017 +0200
    32.2 +++ b/smake/receipt	Fri Jan 27 15:35:03 2017 +0200
    32.3 @@ -1,27 +1,26 @@
    32.4  # SliTaz package receipt.
    32.5  
    32.6  PACKAGE="smake"
    32.7 -VERSION="1.2a49"
    32.8 +VERSION="1.2.5"
    32.9  CATEGORY="development"
   32.10 -SHORT_DESC="Generate executables and other files from source."
   32.11 +SHORT_DESC="Highly portable UNIX make implementation"
   32.12  MAINTAINER="pascal.bellard@slitaz.org"
   32.13  LICENSE="GPL2 LGPL2.1 CDDL"
   32.14 +WEB_SITE="https://sourceforge.net/projects/s-make/"
   32.15 +
   32.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   32.17 -WEB_SITE="http://www.berlios.de/"
   32.18 -WGET_URL="ftp://ftp.berlios.de/pub/smake/alpha/$TARBALL"
   32.19 +WGET_URL="$SF_MIRROR/s-make/$TARBALL"
   32.20  
   32.21 -DEPENDS=""
   32.22 -BUILD_DEPENDS=""
   32.23 +BUILD_DEPENDS="e2fsprogs-dev"
   32.24  
   32.25  # Rules to configure and make the package.
   32.26  compile_rules()
   32.27  {
   32.28 -	make INS_BASE=/usr MANDIR=share/man DESTDIR=$DESTDIR install
   32.29 +	make INS_BASE=/usr DESTDIR=$DESTDIR install
   32.30  }
   32.31  
   32.32  # Rules to gen a SliTaz package suitable for Tazpkg.
   32.33  genpkg_rules()
   32.34  {
   32.35 -	mkdir -p $fs/usr
   32.36 -	cp -a $install/usr/bin $fs/usr
   32.37 +	cook_copy_folders bin
   32.38  }
    33.1 --- a/tazpkg/receipt	Mon Jan 23 11:20:11 2017 +0200
    33.2 +++ b/tazpkg/receipt	Fri Jan 27 15:35:03 2017 +0200
    33.3 @@ -1,7 +1,7 @@
    33.4  # SliTaz package receipt.
    33.5  
    33.6  PACKAGE="tazpkg"
    33.7 -VERSION="933"
    33.8 +VERSION="938"
    33.9  CATEGORY="base-system"
   33.10  SHORT_DESC="SliTaz packages manager"
   33.11  MAINTAINER="pankso@slitaz.org"
   33.12 @@ -9,12 +9,12 @@
   33.13  WEB_SITE="http://www.slitaz.org/"
   33.14  TAGS="slitaz package-manager"
   33.15  HOST_ARCH="i486 arm"
   33.16 -SUGGESTED="tazpanel"
   33.17  
   33.18  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   33.19  WGET_URL="http://hg.slitaz.org/tazpkg/archive/$VERSION.tar.bz2"
   33.20  
   33.21  DEPENDS="busybox gettext-base"
   33.22 +SUGGESTED="tazpanel"
   33.23  BUILD_DEPENDS="gettext tidy-html5 libnotify-dev"
   33.24  
   33.25  # Gettext is part of cross-chroot
   33.26 @@ -54,7 +54,7 @@
   33.27  
   33.28  	# Make sure new config is present
   33.29  	if ! grep -q ^NOTIFY_GEOM "$root/etc/slitaz/tazpkg.conf"; then
   33.30 -		cat >> "$root/etc/slitaz/tazpkg.conf" << "EOT"
   33.31 +		cat >> "$root/etc/slitaz/tazpkg.conf" <<EOT
   33.32  # The geometry of the desktop notification
   33.33  NOTIFY_GEOM="360x80-0+24"
   33.34  
    34.1 --- a/usbids/receipt	Mon Jan 23 11:20:11 2017 +0200
    34.2 +++ b/usbids/receipt	Fri Jan 27 15:35:03 2017 +0200
    34.3 @@ -1,27 +1,32 @@
    34.4  # SliTaz package receipt.
    34.5  
    34.6  PACKAGE="usbids"
    34.7 -VERSION="20150331"
    34.8 +VERSION="20161205"
    34.9  CATEGORY="misc"
   34.10  SHORT_DESC="List of USB ID's"
   34.11  MAINTAINER="slaxemulator@gmail.com"
   34.12  LICENSE="PublicDomain"
   34.13 -WEB_SITE="http://www.linux-usb.org/"
   34.14 -TARBALL="usb-$VERSION.ids.gz"
   34.15 -WGET_URL="${WEB_SITE}usb.ids.gz"
   34.16 +WEB_SITE="http://www.linux-usb.org/usb-ids.html"
   34.17  HOST_ARCH="i486 arm"
   34.18  
   34.19 -BUILD_DEPENDS="advancecomp"
   34.20 +TARBALL="$PACKAGE-$VERSION.gz"
   34.21 +WGET_URL="http://www.linux-usb.org/usb.ids.gz"
   34.22  
   34.23  # Rules to configure and make the package.
   34.24  compile_rules()
   34.25  {
   34.26 -	advdef -z4 usb-$VERSION.ids.gz
   34.27 +	ver=$(zcat $TARBALL | fgrep '# Version:' | tr -cd '0-9')
   34.28 +	separator
   34.29 +	echo "Receipt version: $VERSION"
   34.30 +	echo "Actual  version: $ver"
   34.31 +	separator
   34.32 +
   34.33 +	mkdir -p $install/usr/share/misc
   34.34 +	cp $src/$TARBALL $install/usr/share/misc/usb.ids.gz
   34.35  }
   34.36  
   34.37  # Rules to gen a SliTaz package suitable for Tazpkg.
   34.38  genpkg_rules()
   34.39  {
   34.40 -	mkdir -p $fs/usr/share/misc
   34.41 -	cp $src/usb-$VERSION.ids.gz $fs/usr/share/misc/usb.ids.gz
   34.42 +	cook_copy_files usb.ids.gz
   34.43  }
    35.1 --- a/xorg-util-macros/receipt	Mon Jan 23 11:20:11 2017 +0200
    35.2 +++ b/xorg-util-macros/receipt	Fri Jan 27 15:35:03 2017 +0200
    35.3 @@ -1,16 +1,17 @@
    35.4  # SliTaz package receipt.
    35.5  
    35.6  PACKAGE="xorg-util-macros"
    35.7 -VERSION="1.17"
    35.8 +VERSION="1.19.0"
    35.9  CATEGORY="development"
   35.10  SHORT_DESC="A set of autoconf project macros for X.Org modules"
   35.11  MAINTAINER="gokhlayeh@slitaz.org"
   35.12  LICENSE="other"
   35.13  WEB_SITE="http://www.x.org/"
   35.14 +HOST_ARCH="i486 arm x86_64"
   35.15 +
   35.16  SOURCE="util-macros"
   35.17  TARBALL="$SOURCE-$VERSION.tar.bz2"
   35.18  WGET_URL="$XORG_MIRROR/util/$TARBALL"
   35.19 -HOST_ARCH="i486 arm x86_64"
   35.20  
   35.21  DEPENDS="m4"
   35.22