wok-next rev 19663

Now only one missing package for slitaz-base.flavor: syslinux :((((((((((((
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Mar 17 12:37:35 2017 +0200 (2017-03-17)
parents 76fa6609f50b
children d4a1a09fab2c
files compton/receipt dev86/receipt isapnptools-dev/receipt isapnptools/receipt kbd-base/receipt pcmciautils/receipt posixovl/receipt ppp-dev/receipt ppp-pam/receipt ppp/receipt rp-pppoe/receipt rp-pppoe/stuff/pppoe-setup sysfsutils-dev/receipt sysfsutils/receipt ucl-dev/receipt ucl/receipt ucl/stuff/patches/01-Examples.patch ucl/stuff/patches/02-Autoreconf.patch ucl/stuff/patches/03-Reproducible-build.patch ucl/stuff/patches/04-Static-assert.patch ucl/stuff/patches/series upx/receipt
line diff
     1.1 --- a/compton/receipt	Thu Mar 16 18:37:27 2017 +0100
     1.2 +++ b/compton/receipt	Fri Mar 17 12:37:35 2017 +0200
     1.3 @@ -12,7 +12,7 @@
     1.4  HOST_ARCH="i486 arm"
     1.5  
     1.6  DEPENDS="xorg-libXcomposite xorg-libXrandr libdrm xorg-xwininfo xorg-xprop"
     1.7 -BUILD_DEPENDS="xorg-libXcomposite xorg-libXrandr-dev libdrm-dev \
     1.8 +BUILD_DEPENDS="xorg-libXcomposite-dev xorg-libXrandr-dev libdrm-dev \
     1.9  xorg-libXfixes-dev xorg-libXdamage-dev xorg-libXinerama-dev pcre-dev"
    1.10  
    1.11  # Rules to configure and make the package.
     2.1 --- a/dev86/receipt	Thu Mar 16 18:37:27 2017 +0100
     2.2 +++ b/dev86/receipt	Fri Mar 17 12:37:35 2017 +0200
     2.3 @@ -6,12 +6,13 @@
     2.4  SHORT_DESC="Linux 8086 development environment."
     2.5  MAINTAINER="pascal.bellard@slitaz.org"
     2.6  LICENSE="GPL2"
     2.7 -TARBALL="$PACKAGE-$VERSION.tar.gz"
     2.8  WEB_SITE="http://www.debath.co.uk/"
     2.9 -WGET_URL="https://github.com/lkundrak/dev86/archive/v$VERSION.tar.gz"
    2.10  TAGS="compiler C assembler 8086"
    2.11  
    2.12 -BUILD_DEPENDS="wget"
    2.13 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.14 +WGET_URL="$GITHUB/lkundrak/dev86/tarball/v$VERSION"
    2.15 +
    2.16 +BUILD_DEPENDS="coreutils-file-output-full" # for `cat -v`
    2.17  
    2.18  # Rules to configure and make the package.
    2.19  compile_rules()
    2.20 @@ -36,8 +37,9 @@
    2.21  {
    2.22  	[ "$1" ] && return
    2.23  	register=/proc/sys/fs/binfmt_misc/register
    2.24 -	[ -f $register ] || modprobe binfmt_misc
    2.25 +	[ -f $register ] || modprobe binfmt_misc 2> /dev/null || true
    2.26  	[ -f $register ] && cat > $register <<EOT
    2.27  :i86-elks:M::\x01\x03\x20\x00:\xff\xff\xff\x83:/usr/bin/elksemu:
    2.28  EOT
    2.29 +	true
    2.30  }
     3.1 --- a/isapnptools-dev/receipt	Thu Mar 16 18:37:27 2017 +0100
     3.2 +++ b/isapnptools-dev/receipt	Fri Mar 17 12:37:35 2017 +0200
     3.3 @@ -6,13 +6,13 @@
     3.4  SHORT_DESC="ISA Plug-And-Play configuration devel files."
     3.5  MAINTAINER="pascal.bellard@slitaz.org"
     3.6  LICENSE="GPL2"
     3.7 +WEB_SITE="http://www.roestock.demon.co.uk/isapnptools/"
     3.8 +
     3.9  WANTED="isapnptools"
    3.10 -WEB_SITE="http://www.roestock.demon.co.uk/isapnptools/"
    3.11 +DEPENDS="isapnptools"
    3.12  
    3.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.14  genpkg_rules()
    3.15  {
    3.16 -	mkdir $fs/usr
    3.17 -	cp -a $install/usr/include $fs/usr
    3.18 -	cp -a $install/usr/lib $fs/usr
    3.19 +	cook_copy_files *.h *.a
    3.20  }
     4.1 --- a/isapnptools/receipt	Thu Mar 16 18:37:27 2017 +0100
     4.2 +++ b/isapnptools/receipt	Fri Mar 17 12:37:35 2017 +0200
     4.3 @@ -6,24 +6,24 @@
     4.4  SHORT_DESC="ISA Plug-And-Play configuration."
     4.5  MAINTAINER="pascal.bellard@slitaz.org"
     4.6  LICENSE="GPL2"
     4.7 +WEB_SITE="http://www.roestock.demon.co.uk/isapnptools/"
     4.8 +
     4.9  TARBALL="$PACKAGE-$VERSION.tgz"
    4.10 -WEB_SITE="http://www.roestock.demon.co.uk/isapnptools/"
    4.11  WGET_URL="ftp://metalab.unc.edu/pub/Linux/system/hardware/$TARBALL"
    4.12  
    4.13 +BUILD_DEPENDS="gfortran"
    4.14 +
    4.15  # Rules to configure and make the package.
    4.16  compile_rules()
    4.17  {
    4.18 -	cd $src
    4.19 -	./configure --prefix=/usr --bindir=/bin \
    4.20 -	--libexecdir=/usr/bin --mandir=/usr/share/man \
    4.21 -	$CONFIGURE_ARGS
    4.22 -	make
    4.23 -	make DESTDIR=$DESTDIR install
    4.24 +	./configure \
    4.25 +		--sbindir=/sbin \
    4.26 +	$CONFIGURE_ARGS &&
    4.27 +	make && make install
    4.28  }
    4.29  
    4.30  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.31  genpkg_rules()
    4.32  {
    4.33 -	# move /usr/sbin/* /sbin to use pnptools *before* mounting /usr
    4.34 -	cp -a $install/usr/sbin $fs
    4.35 +	cook_copy_folders sbin
    4.36  }
     5.1 --- a/kbd-base/receipt	Thu Mar 16 18:37:27 2017 +0100
     5.2 +++ b/kbd-base/receipt	Fri Mar 17 12:37:35 2017 +0200
     5.3 @@ -10,7 +10,6 @@
     5.4  HOST_ARCH="i486 arm"
     5.5  
     5.6  WANTED="kbd"
     5.7 -DEPENDS="kbd"
     5.8  
     5.9  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.10  genpkg_rules()
     6.1 --- a/pcmciautils/receipt	Thu Mar 16 18:37:27 2017 +0100
     6.2 +++ b/pcmciautils/receipt	Fri Mar 17 12:37:35 2017 +0200
     6.3 @@ -6,41 +6,41 @@
     6.4  SHORT_DESC="Utilities for inserting and removing PCMCIA cards"
     6.5  MAINTAINER="pankso@slitaz.org"
     6.6  LICENSE="GPL2"
     6.7 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
     6.8  WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
     6.9 +
    6.10 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.11  #WGET_URL="http://www.kernel.org/pub/linux/utils/kernel/pcmcia/$TARBALL"
    6.12  WGET_URL="http://sourceware.mirrors.tds.net/pub/kernel.org/linux/utils/kernel/pcmcia/$TARBALL"
    6.13  
    6.14 -DEPENDS="linux sysfsutils udev"
    6.15 -BUILD_DEPENDS="sysfsutils-dev bison flex"
    6.16 +DEPENDS="sysfsutils eudev"
    6.17 +BUILD_DEPENDS="sysfsutils-dev"
    6.18  
    6.19  # Rules to configure and make the package.
    6.20  compile_rules()
    6.21  {
    6.22 -	# We need lex...
    6.23  	make
    6.24 +
    6.25 +	mkdir -p $install/sbin
    6.26 +	cp -a pccardctl $install/sbin
    6.27 +
    6.28 +	mkdir -p $install/lib/udev
    6.29 +	cp -a pcmcia-check-broken-cis pcmcia-socket-startup $install/lib/udev
    6.30 +
    6.31 +	mkdir -p $install/etc/udev/rules.d
    6.32 +	cp -a $src/udev/60-pcmcia.rules $install/etc/udev/rules.d
    6.33 +
    6.34 +	mkdir -p $install/etc/pcmcia
    6.35 +	cp -a $src/config/config.opts $install/etc/pcmcia
    6.36 +
    6.37  }
    6.38  
    6.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.40  genpkg_rules()
    6.41  {
    6.42 -	mkdir -p $fs/sbin $fs/etc/udev/rules.d $fs/etc/pcmcia
    6.43 -	cp -a $src/pccardctl $fs/sbin
    6.44 -	cp -a $src/pcmcia-check-broken-cis $fs/sbin
    6.45 -	cp -a $src/pcmcia-socket-startup $fs/sbin
    6.46 -	# Udev rules and config.
    6.47 -	cp -a $src/udev/60-pcmcia.rules $fs/etc/udev/rules.d
    6.48 -	cp -a $src/config/config.opts $fs/etc/pcmcia
    6.49 -	# Fix path
    6.50 -	sed -i s#/lib/udev/pcmcia-check-broken-cis#/sbin/pcmcia-check-broken-cis# \
    6.51 -		$fs/etc/udev/rules.d/60-pcmcia.rules
    6.52 -	sed -i s#/lib/udev/pcmcia-socket-startup#/sbin/pcmcia-socket-startup# \
    6.53 -		$fs/etc/udev/rules.d/60-pcmcia.rules
    6.54 +	cook_copy_folders etc lib sbin
    6.55  }
    6.56  
    6.57  post_install()
    6.58  {
    6.59 -	echo
    6.60 -	tazpkg reconfigure udev --root="$1"
    6.61 -	echo
    6.62 +	tazpkg reconfigure eudev --root="$1/" --quiet
    6.63  }
     7.1 --- a/posixovl/receipt	Thu Mar 16 18:37:27 2017 +0100
     7.2 +++ b/posixovl/receipt	Fri Mar 17 12:37:35 2017 +0200
     7.3 @@ -6,12 +6,13 @@
     7.4  SHORT_DESC="FUSE file system that provides POSIX functionality"
     7.5  MAINTAINER="pascal.bellard@slitaz.org"
     7.6  LICENSE="GPL2"
     7.7 -TARBALL="$PACKAGE-$VERSION.tar.xz"
     7.8 -WEB_SITE="http://$PACKAGE.sourceforge.net/"
     7.9 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    7.10 +WEB_SITE="https://sourceforge.net/projects/posixovl/"
    7.11  TAGS="filesystem"
    7.12  
    7.13 -DEPENDS="fuse attr"
    7.14 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    7.15 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    7.16 +
    7.17 +DEPENDS="fuse"
    7.18  BUILD_DEPENDS="autoconf automake fuse-dev attr-dev"
    7.19  
    7.20  # Rules to configure and make the package.
    7.21 @@ -22,15 +23,13 @@
    7.22  	grep -q 'else if (!S_ISREG' posixovl.c ||
    7.23  	sed -i 's/if (!S_ISREG/if (S_ISLNK(cb->ll.mode))\n\t\tcb->sb.st_size = strlen(cb->ll.target);\n\telse &/' posixovl.c
    7.24  	sed -i 's/cb->ll.size/0/' posixovl.c
    7.25 +
    7.26  	sh autogen.sh
    7.27 -	./configure --prefix=/usr --mandir=/usr/share/man \
    7.28 -	$CONFIGURE_ARGS &&
    7.29 -	make
    7.30 +	./configure $CONFIGURE_ARGS && make && make install
    7.31  }
    7.32  
    7.33  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.34  genpkg_rules()
    7.35  {
    7.36 -	mkdir -p $fs/usr/sbin
    7.37 -	cp $src/mount.posixovl $fs/usr/sbin 
    7.38 +	cook_copy_folders sbin
    7.39  }
     8.1 --- a/ppp-dev/receipt	Thu Mar 16 18:37:27 2017 +0100
     8.2 +++ b/ppp-dev/receipt	Fri Mar 17 12:37:35 2017 +0200
     8.3 @@ -7,12 +7,13 @@
     8.4  MAINTAINER="pankso@slitaz.org"
     8.5  LICENSE="BSD GPL"
     8.6  WEB_SITE="http://ppp.samba.org/"
     8.7 +HOST_ARCH="i486 arm"
     8.8 +
     8.9  WANTED="ppp"
    8.10 -HOST_ARCH="i486 arm"
    8.11 +DEPENDS="ppp"
    8.12  
    8.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.14  genpkg_rules()
    8.15  {
    8.16 -	mkdir -p $fs/usr
    8.17 -	cp -a $install/usr/include $fs/usr
    8.18 +	cook_copy_folders include
    8.19  }
     9.1 --- a/ppp-pam/receipt	Thu Mar 16 18:37:27 2017 +0100
     9.2 +++ b/ppp-pam/receipt	Fri Mar 17 12:37:35 2017 +0200
     9.3 @@ -6,22 +6,23 @@
     9.4  SHORT_DESC="Implements the Point-to-Point Protocol (PPP) with PAM support."
     9.5  MAINTAINER="pascal.bellard@slitaz.org"
     9.6  LICENSE="BSD GPL"
     9.7 -SOURCE="ppp"
     9.8 -TARBALL="$SOURCE-$VERSION.tar.gz"
     9.9  WEB_SITE="http://ppp.samba.org/"
    9.10 -WGET_URL="https://github.com/paulusmack/ppp/archive/$TARBALL"
    9.11  CONFIG_FILES="/etc/ppp/options /etc/ppp/*secrets"
    9.12 +PROVIDE="ppp:pam"
    9.13 +
    9.14 +TARBALL="ppp-$VERSION.tar.gz"
    9.15 +WGET_URL="$GITHUB/paulusmack/ppp/tarball/ppp-$VERSION"
    9.16  
    9.17  DEPENDS="pam"
    9.18 -BUILD_DEPENDS="wget pam pam-dev"
    9.19 -PROVIDE="ppp:pam"
    9.20 +BUILD_DEPENDS="pam-dev"
    9.21 +SIBLINGS="ppp"
    9.22  
    9.23  # Rules to configure and make the package.
    9.24  compile_rules()
    9.25  {
    9.26  	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
    9.27 -	./configure --prefix=/usr \
    9.28 -		$CONFIGURE_ARGS &&
    9.29 +
    9.30 +	./configure $CONFIGURE_ARGS &&
    9.31  	make &&
    9.32  	make DESTDIR=$DESTDIR/usr install
    9.33  }
    9.34 @@ -36,5 +37,5 @@
    9.35  
    9.36  pre_remove()
    9.37  {
    9.38 -    tazpkg get-install  ${PACKAGE%-pam}
    9.39 +	tazpkg get-install ppp
    9.40  }
    10.1 --- a/ppp/receipt	Thu Mar 16 18:37:27 2017 +0100
    10.2 +++ b/ppp/receipt	Fri Mar 17 12:37:35 2017 +0200
    10.3 @@ -6,24 +6,25 @@
    10.4  SHORT_DESC="Implements the Point-to-Point Protocol (PPP)."
    10.5  MAINTAINER="pankso@slitaz.org"
    10.6  LICENSE="BSD GPL"
    10.7 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    10.8  WEB_SITE="http://ppp.samba.org/"
    10.9 -WGET_URL="https://github.com/paulusmack/ppp/archive/$TARBALL"
   10.10  CONFIG_FILES="/etc/ppp/options /etc/ppp/*secrets"
   10.11  HOST_ARCH="i486 arm"
   10.12 +SUGGESTED="tazpanel"
   10.13  
   10.14 -BUILD_DEPENDS="wget"
   10.15 -SUGGESTED="tazpanel"
   10.16 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   10.17 +WGET_URL="$GITHUB/paulusmack/ppp/tarball/ppp-$VERSION"
   10.18 +
   10.19 +SIBLINGS="ppp-pam"
   10.20  
   10.21  # Rules to configure and make the package.
   10.22  compile_rules()
   10.23  {
   10.24  	case "$ARCH" in
   10.25 -	arm*)
   10.26 -		export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH
   10.27 +		arm*)
   10.28 +			export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH
   10.29  	esac
   10.30 -	./configure --prefix=/usr \
   10.31 -		$CONFIGURE_ARGS &&
   10.32 +
   10.33 +	./configure $CONFIGURE_ARGS &&
   10.34  	make &&
   10.35  	make DESTDIR=$DESTDIR/usr install
   10.36  }
   10.37 @@ -34,10 +35,10 @@
   10.38  	mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN
   10.39  	cp -a $install/usr/sbin $fs/usr
   10.40  	[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
   10.41 -	cp -a $stuff/ppp.cgi $fs/var/www/tazpanel
   10.42 -	ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp
   10.43 +	cp -a   $stuff/ppp.cgi $fs/var/www/tazpanel
   10.44 +	ln -s    ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp
   10.45  	ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp
   10.46 -	
   10.47 +
   10.48  	# Config files.
   10.49  	mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d
   10.50  	cp $stuff/README.scripts $fs/etc/ppp
   10.51 @@ -48,7 +49,7 @@
   10.52  	cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts
   10.53  	sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \
   10.54  		$fs/etc/ppp/scripts/ppp-on
   10.55 -	
   10.56 +
   10.57  	cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts
   10.58  	cp -a $src/scripts/callback $fs/etc/ppp/scripts
   10.59  	cp -a $src/scripts/redialer $fs/etc/ppp/scripts
   10.60 @@ -90,7 +91,7 @@
   10.61  	chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down
   10.62  
   10.63  	# insert #!/bin/sh  on top line in ip* scripts
   10.64 -	sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null	
   10.65 +	sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null
   10.66  	# add empty peers dir
   10.67  	mkdir -p $fs/etc/ppp/peers
   10.68  	# hide login/pass from regular users
    11.1 --- a/rp-pppoe/receipt	Thu Mar 16 18:37:27 2017 +0100
    11.2 +++ b/rp-pppoe/receipt	Fri Mar 17 12:37:35 2017 +0200
    11.3 @@ -1,38 +1,29 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="rp-pppoe"
    11.7 -VERSION="3.11"
    11.8 +VERSION="3.12"
    11.9  CATEGORY="network"
   11.10  SHORT_DESC="Roaring Penguin PPPoE client"
   11.11  MAINTAINER="pankso@slitaz.org"
   11.12  LICENSE="GPL2"
   11.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.14 -WEB_SITE="http://www.roaringpenguin.com/products/pppoe"
   11.15 -WGET_URL="http://www.roaringpenguin.com/files/download/$TARBALL"
   11.16 +WEB_SITE="https://www.roaringpenguin.com/products/pppoe"
   11.17  TAGS="network PPPoE"
   11.18  HOST_ARCH="i486"
   11.19  
   11.20 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   11.21 +WGET_URL="https://www.roaringpenguin.com/files/download/$TARBALL"
   11.22 +
   11.23  BUILD_DEPENDS="ppp"
   11.24  
   11.25  # Rules to configure and make the package.
   11.26  compile_rules()
   11.27  {
   11.28  	cd $src/src
   11.29 -	./configure \
   11.30 -		--prefix=/usr \
   11.31 -		$CONFIGURE_ARGS &&
   11.32 -	make &&
   11.33 -	make DESTDIR=$DESTDIR install
   11.34 +	./configure $CONFIGURE_ARGS && make && make install
   11.35  }
   11.36  
   11.37  # Rules to gen a SliTaz package suitable for Tazpkg.
   11.38  genpkg_rules()
   11.39  {
   11.40 -	mkdir -p $fs/usr
   11.41 -	
   11.42 -	cp -a $install/etc $fs
   11.43 -	cp -a $install/usr/sbin $fs/usr	
   11.44 -
   11.45 -	# Fix permissions on all scripts
   11.46 -	chmod -R 755 $fs/usr/sbin/*
   11.47 +	cook_copy_folders etc sbin
   11.48  }
    12.1 --- a/rp-pppoe/stuff/pppoe-setup	Thu Mar 16 18:37:27 2017 +0100
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,352 +0,0 @@
    12.4 -#!/bin/sh
    12.5 -#***********************************************************************
    12.6 -#
    12.7 -# pppoe-setup
    12.8 -#
    12.9 -# All-purpose slicing/dicing shell script to configure rp-pppoe.
   12.10 -#
   12.11 -# LIC: GPL
   12.12 -#
   12.13 -# Copyright (C) 2000 Roaring Penguin Software Inc.
   12.14 -#
   12.15 -# $Id: pppoe-setup.in,v 1.2 2005/08/10 00:25:18 dfs Exp $
   12.16 -#***********************************************************************
   12.17 -
   12.18 -# From AUTOCONF
   12.19 -prefix=/usr
   12.20 -exec_prefix=${prefix}
   12.21 -
   12.22 -# Paths to programs
   12.23 -IFCONFIG=/sbin/ifconfig
   12.24 -PPPD=/usr/sbin/pppd
   12.25 -PPPOE=${exec_prefix}/sbin/pppoe
   12.26 -ECHO=/bin/echo
   12.27 -LOGGER="/usr/bin/logger -t `basename $0`"
   12.28 -
   12.29 -# Set to "C" locale so we can parse messages from commands
   12.30 -LANG=C
   12.31 -export LANG
   12.32 -
   12.33 -CONFIG=/etc/ppp/pppoe.conf
   12.34 -
   12.35 -# Protect created files
   12.36 -umask 077
   12.37 -
   12.38 -copy() {
   12.39 -    cp $1 $2
   12.40 -    if [ "$?" != 0 ] ; then
   12.41 -	$ECHO "*** Error copying $1 to $2"
   12.42 -	$ECHO "*** Quitting."
   12.43 -	exit 1
   12.44 -    fi
   12.45 -}
   12.46 -
   12.47 -$ECHO "Welcome to the Roaring Penguin PPPoE client setup.  First, I will run"
   12.48 -$ECHO "some checks on your system to make sure the PPPoE client is installed"
   12.49 -$ECHO "properly..."
   12.50 -$ECHO ""
   12.51 -
   12.52 -# Must be root
   12.53 -if [ "`/bin/id -u`" != 0 ] ; then
   12.54 -    $ECHO "$0: Sorry, you must be root to run this script"
   12.55 -    exit 1
   12.56 -fi
   12.57 -
   12.58 -# Prototype config file must exist
   12.59 -if [ ! -r "$CONFIG" ] ; then
   12.60 -    $ECHO "Oh, dear, I don't see the file '$CONFIG' anywhere.  Please"
   12.61 -    $ECHO "re-install the PPPoE client."
   12.62 -    exit 1
   12.63 -fi
   12.64 -
   12.65 -# Must have pppd
   12.66 -if [ ! -x $PPPD ] ; then
   12.67 -    $ECHO "Oops, I can't execute the program '$PPPD'.  You"
   12.68 -    $ECHO "must install the PPP software suite, version 2.3.10 or later."
   12.69 -    exit 1
   12.70 -fi
   12.71 -export CONFIG
   12.72 -. $CONFIG
   12.73 -
   12.74 -if [ "$DEMAND" = "" ] ; then
   12.75 -    DEMAND=no
   12.76 -fi
   12.77 -
   12.78 -# pppoe must exist
   12.79 -if [ ! -x "$PPPOE" ] ; then
   12.80 -    $ECHO "Oh, dear, I can't execute the program '$PPPOE'.  Please"
   12.81 -    $ECHO "re-install the rp-pppoe client."
   12.82 -    exit 1
   12.83 -fi
   12.84 -
   12.85 -$ECHO "Looks good!  Now, please enter some information:"
   12.86 -
   12.87 -while [ true ] ; do
   12.88 -    $ECHO ""
   12.89 -    $ECHO "USER NAME"
   12.90 -    $ECHO ""
   12.91 -    printf "%s" ">>> Enter your PPPoE user name (default $USER): "
   12.92 -    read U
   12.93 -
   12.94 -    if [ "$U" = "" ] ; then
   12.95 -	U="$USER"
   12.96 -    fi
   12.97 -
   12.98 -    # Under Linux, "fix" the default interface if eth1 is not available
   12.99 -    if test `uname -s` = "Linux" ; then
  12.100 -	$IFCONFIG $ETH > /dev/null 2>&1 || ETH=eth0
  12.101 -    fi
  12.102 -    $ECHO ""
  12.103 -    $ECHO "INTERFACE"
  12.104 -    $ECHO ""
  12.105 -    $ECHO ">>> Enter the Ethernet interface connected to the DSL modem"
  12.106 -    $ECHO "For Solaris, this is likely to be something like /dev/hme0."
  12.107 -    $ECHO "For Linux, it will be ethn, where 'n' is a number."
  12.108 -    printf "%s" "(default $ETH): "
  12.109 -    read E
  12.110 -
  12.111 -    if [ "$E" = "" ] ; then
  12.112 -	E="$ETH"
  12.113 -    fi
  12.114 -
  12.115 -    $ECHO ""
  12.116 -    $ECHO "Do you want the link to come up on demand, or stay up continuously?"
  12.117 -    $ECHO "If you want it to come up on demand, enter the idle time in seconds"
  12.118 -    $ECHO "after which the link should be dropped.  If you want the link to"
  12.119 -    $ECHO "stay up permanently, enter 'no' (two letters, lower-case.)"
  12.120 -    $ECHO "NOTE: Demand-activated links do not interact well with dynamic IP"
  12.121 -    $ECHO "addresses.  You may have some problems with demand-activated links."
  12.122 -    printf "%s" ">>> Enter the demand value (default $DEMAND): "
  12.123 -    read D
  12.124 -    if [ "$D" = "" ] ; then
  12.125 -	D=$DEMAND
  12.126 -    fi
  12.127 -
  12.128 -    $ECHO ""
  12.129 -    $ECHO "DNS"
  12.130 -    $ECHO ""
  12.131 -    $ECHO "Please enter the IP address of your ISP's primary DNS server."
  12.132 -    $ECHO "If your ISP claims that 'the server will provide DNS addresses',"
  12.133 -    $ECHO "enter 'server' (all lower-case) here."
  12.134 -    $ECHO "If you just press enter, I will assume you know what you are"
  12.135 -    $ECHO "doing and not modify your DNS setup."
  12.136 -    printf "%s" ">>> Enter the DNS information here: "
  12.137 -
  12.138 -    read DNS1
  12.139 -
  12.140 -
  12.141 -    if [ "$DNS1" != "" ] ; then
  12.142 -        if [ "$DNS1" != "server" ] ; then
  12.143 -	    $ECHO "Please enter the IP address of your ISP's secondary DNS server."
  12.144 -	    $ECHO "If you just press enter, I will assume there is only one DNS server."
  12.145 -	    printf "%s" ">>> Enter the secondary DNS server address here: "
  12.146 -	    read DNS2
  12.147 -	fi
  12.148 -    fi
  12.149 -
  12.150 -    while [ true ] ; do
  12.151 -	$ECHO ""
  12.152 -	$ECHO "PASSWORD"
  12.153 -	$ECHO ""
  12.154 -	stty -echo
  12.155 -	printf "%s" ">>> Please enter your PPPoE password:    "
  12.156 -	read PWD1
  12.157 -	$ECHO ""
  12.158 -	printf "%s" ">>> Please re-enter your PPPoE password: "
  12.159 -	read PWD2
  12.160 -	$ECHO ""
  12.161 -	stty echo
  12.162 -	if [ "$PWD1" = "$PWD2" ] ; then
  12.163 -	    break
  12.164 -	fi
  12.165 -
  12.166 -	printf "%s" ">>> Sorry, the passwords do not match.  Try again? (y/n)"
  12.167 -	read ANS
  12.168 -	case "$ANS" in
  12.169 -	    N|No|NO|Non|n|no|non)
  12.170 -		$ECHO "OK, quitting.  Bye."
  12.171 -		exit 1
  12.172 -	esac
  12.173 -    done
  12.174 -
  12.175 -    # Firewalling
  12.176 -    $ECHO ""
  12.177 -    $ECHO "FIREWALLING"
  12.178 -    $ECHO ""
  12.179 -    if test `uname -s` != "Linux" ; then
  12.180 -	$ECHO "Sorry, firewalling is only supported under Linux.  Consult"
  12.181 -	$ECHO "your operating system manuals for details on setting up"
  12.182 -	$ECHO "packet filters for your system."
  12.183 -	FIREWALL=NONE
  12.184 -    else
  12.185 -	$ECHO "Please choose the firewall rules to use.  Note that these rules are"
  12.186 -	$ECHO "very basic.  You are strongly encouraged to use a more sophisticated"
  12.187 -	$ECHO "firewall setup; however, these will provide basic security.  If you"
  12.188 -	$ECHO "are running any servers on your machine, you must choose 'NONE' and"
  12.189 -	$ECHO "set up firewalling yourself.  Otherwise, the firewall rules will deny"
  12.190 -	$ECHO "access to all standard servers like Web, e-mail, ftp, etc.  If you"
  12.191 -	$ECHO "are using SSH, the rules will block outgoing SSH connections which"
  12.192 -	$ECHO "allocate a privileged source port."
  12.193 -	$ECHO ""
  12.194 -	while [ true ] ; do
  12.195 -	    $ECHO "The firewall choices are:"
  12.196 -	    $ECHO "0 - NONE: This script will not set any firewall rules.  You are responsible"
  12.197 -	    $ECHO "          for ensuring the security of your machine.  You are STRONGLY"
  12.198 -	    $ECHO "          recommended to use some kind of firewall rules."
  12.199 -	    $ECHO "1 - STANDALONE: Appropriate for a basic stand-alone web-surfing workstation"
  12.200 -	    $ECHO "2 - MASQUERADE: Appropriate for a machine acting as an Internet gateway"
  12.201 -	    $ECHO "                for a LAN"
  12.202 -	    printf "%s" ">>> Choose a type of firewall (0-2): "
  12.203 -	    read a
  12.204 -	    if [ "$a" = 0 -o "$a" = 1 -o "$a" = 2 ] ; then
  12.205 -		break
  12.206 -	    fi
  12.207 -	    $ECHO "Please enter a number from 0 to 2"
  12.208 -	done
  12.209 -
  12.210 -	case "$a" in
  12.211 -	    0)
  12.212 -		FIREWALL=NONE
  12.213 -		;;
  12.214 -	    1)
  12.215 -		FIREWALL=STANDALONE
  12.216 -		;;
  12.217 -	    2)
  12.218 -		FIREWALL=MASQUERADE
  12.219 -		;;
  12.220 -	esac
  12.221 -    fi
  12.222 -
  12.223 -    $ECHO ""
  12.224 -    $ECHO "** Summary of what you entered **"
  12.225 -    $ECHO ""
  12.226 -    $ECHO "Ethernet Interface: $E"
  12.227 -    $ECHO "User name:          $U"
  12.228 -    if [ "$D" = "no" ] ; then
  12.229 -	$ECHO "Activate-on-demand: No"
  12.230 -    else
  12.231 -	$ECHO "Activate-on-demand: Yes; idle timeout = $D seconds"
  12.232 -    fi
  12.233 -
  12.234 -    if [ "$DNS1" != "" ] ; then
  12.235 -        if [ "$DNS1" = "server" ] ; then
  12.236 -	    $ECHO "DNS addresses:      Supplied by ISP's server"
  12.237 -        else
  12.238 -	    $ECHO "Primary DNS:        $DNS1"
  12.239 -	    if [ "$DNS2" != "" ] ; then
  12.240 -		$ECHO "Secondary DNS:      $DNS2"
  12.241 -	    fi
  12.242 -        fi
  12.243 -    else
  12.244 -	$ECHO "DNS:                Do not adjust"
  12.245 -    fi
  12.246 -    $ECHO "Firewalling:        $FIREWALL"
  12.247 -    $ECHO ""
  12.248 -    while [ true ] ; do
  12.249 -        printf "%s" '>>> Accept these settings and adjust configuration files (y/n)? '
  12.250 -        read ANS
  12.251 -	case "ANS" in
  12.252 -	    Y|y|yes|Yes|oui|Oui)
  12.253 -		ANS=y
  12.254 -		;;
  12.255 -            N|n|no|No|non|Non)
  12.256 -		ANS=n
  12.257 -		;;
  12.258 -	esac
  12.259 -	if [ "$ANS" = "y" -o "$ANS" = "n" ] ; then
  12.260 -	    break
  12.261 -        fi
  12.262 -    done
  12.263 -    if [ "$ANS" = "y" ] ; then
  12.264 -	break
  12.265 -    fi
  12.266 -done
  12.267 -
  12.268 -# Adjust configuration files.  First to $CONFIG
  12.269 -
  12.270 -$ECHO "Adjusting $CONFIG"
  12.271 -
  12.272 -copy $CONFIG $CONFIG-bak
  12.273 -if [ "$DNS1" = "server" ] ; then
  12.274 -    DNSTYPE=SERVER
  12.275 -    DNS1=""
  12.276 -    PEERDNS=yes
  12.277 -else
  12.278 -    PEERDNS=no
  12.279 -    if [ "$DNS1" = "" ] ; then
  12.280 -	DNSTYPE=NOCHANGE
  12.281 -    else
  12.282 -	DNSTYPE=SPECIFY
  12.283 -    fi
  12.284 -fi
  12.285 -
  12.286 -# Where is pppd likely to put its pid?
  12.287 -if [ -d /var/run ] ; then
  12.288 -    VARRUN=/var/run
  12.289 -else
  12.290 -    VARRUN=/etc/ppp
  12.291 -fi
  12.292 -
  12.293 -# Some #$(*& ISP's use a slash in the user name...
  12.294 -sed -e "s&^USER=.*&USER='$U'&" \
  12.295 -    -e "s&^ETH=.*&ETH='$E'&" \
  12.296 -    -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-pppoe.pid\"&" \
  12.297 -    -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \
  12.298 -    -e "s/^DEMAND=.*/DEMAND=$D/" \
  12.299 -    -e "s/^DNSTYPE=.*/DNSTYPE=$DNSTYPE/" \
  12.300 -    -e "s/^DNS1=.*/DNS1=$DNS1/" \
  12.301 -    -e "s/^DNS2=.*/DNS2=$DNS2/" \
  12.302 -    -e "s/^PEERDNS=.*/PEERDNS=$PEERDNS/" \
  12.303 -    < $CONFIG-bak > $CONFIG
  12.304 -
  12.305 -if [ $? != 0 ] ; then
  12.306 -    $ECHO "** Error modifying $CONFIG"
  12.307 -    $ECHO "** Quitting"
  12.308 -    exit 1
  12.309 -fi
  12.310 -
  12.311 -if [ "$DNS1" != "" ] ; then
  12.312 -    if [ "$DNS1" != "server" ] ; then
  12.313 -	$ECHO "Adjusting /etc/resolv.conf"
  12.314 -	if [ -r /etc/resolv.conf ] ; then
  12.315 -	    grep -s "MADE-BY-RP-PPPOE" /etc/resolv.conf > /dev/null 2>&1
  12.316 -	    if [ "$?" != 0 ] ; then
  12.317 -		$ECHO "  (But first backing it up to /etc/resolv.conf-bak)"
  12.318 -		copy /etc/resolv.conf /etc/resolv.conf-bak
  12.319 -	    fi
  12.320 -	fi
  12.321 -	$ECHO "# MADE-BY-RP-PPPOE" > /etc/resolv.conf
  12.322 -	$ECHO "nameserver $DNS1" >> /etc/resolv.conf
  12.323 -	if [ "$DNS2" != "" ] ; then
  12.324 -	    $ECHO "nameserver $DNS2" >> /etc/resolv.conf
  12.325 -	fi
  12.326 -    fi
  12.327 -fi
  12.328 -
  12.329 -$ECHO "Adjusting /etc/ppp/pap-secrets and /etc/ppp/chap-secrets"
  12.330 -if [ -r /etc/ppp/pap-secrets ] ; then
  12.331 -    $ECHO "  (But first backing it up to /etc/ppp/pap-secrets-bak)"
  12.332 -    copy /etc/ppp/pap-secrets /etc/ppp/pap-secrets-bak
  12.333 -else
  12.334 -    cp /dev/null /etc/ppp/pap-secrets-bak
  12.335 -fi
  12.336 -if [ -r /etc/ppp/chap-secrets ] ; then
  12.337 -    $ECHO "  (But first backing it up to /etc/ppp/chap-secrets-bak)"
  12.338 -    copy /etc/ppp/chap-secrets /etc/ppp/chap-secrets-bak
  12.339 -else
  12.340 -    cp /dev/null /etc/ppp/chap-secrets-bak
  12.341 -fi
  12.342 -
  12.343 -egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
  12.344 -$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
  12.345 -egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
  12.346 -$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
  12.347 -
  12.348 -$ECHO ""
  12.349 -$ECHO ""
  12.350 -$ECHO ""
  12.351 -$ECHO "Congratulations, it should be all set up!"
  12.352 -$ECHO ""
  12.353 -$ECHO "Type 'pppoe-start' to bring up your PPPoE link and 'pppoe-stop' to bring"
  12.354 -$ECHO "it down.  Type 'pppoe-status' to see the link status."
  12.355 -exit 0
    13.1 --- a/sysfsutils-dev/receipt	Thu Mar 16 18:37:27 2017 +0100
    13.2 +++ b/sysfsutils-dev/receipt	Fri Mar 17 12:37:35 2017 +0200
    13.3 @@ -6,15 +6,13 @@
    13.4  SHORT_DESC="Utilites built upon sysfs."
    13.5  MAINTAINER="pankso@slitaz.org"
    13.6  LICENSE="GPL2 LGPL2.1"
    13.7 -WANTED="sysfsutils"
    13.8  WEB_SITE="http://linux-diag.sourceforge.net/Sysfsutils.html"
    13.9  
   13.10 -DEPENDS="linux sysfsutils"
   13.11 +WANTED="sysfsutils"
   13.12 +DEPENDS="sysfsutils"
   13.13  
   13.14  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.15  genpkg_rules()
   13.16  {
   13.17 -	mkdir -p $fs/usr/lib
   13.18 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
   13.19 -	cp -a $install/usr/include $fs/usr
   13.20 +	cook_copy_files *.h *.a *.la
   13.21  }
    14.1 --- a/sysfsutils/receipt	Thu Mar 16 18:37:27 2017 +0100
    14.2 +++ b/sysfsutils/receipt	Fri Mar 17 12:37:35 2017 +0200
    14.3 @@ -6,27 +6,23 @@
    14.4  SHORT_DESC="Utilites built upon sysfs."
    14.5  MAINTAINER="pankso@slitaz.org"
    14.6  LICENSE="GPL2 LGPL2.1"
    14.7 +WEB_SITE="http://linux-diag.sourceforge.net/Sysfsutils.html"
    14.8 +
    14.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   14.10 -WEB_SITE="http://linux-diag.sourceforge.net/Sysfsutils.html"
   14.11  WGET_URL="$SF_MIRROR/linux-diag/$TARBALL"
   14.12  
   14.13  DEPENDS="linux"
   14.14 -BLUID_DEPENDS="sysfsutils"
   14.15 +BUILD_DEPENDS="gfortran autoconf"
   14.16  
   14.17  # Rules to configure and make the package.
   14.18  compile_rules()
   14.19  {
   14.20 -	cd $src
   14.21 -	./configure --prefix=/usr --infodir=/usr/share/info \
   14.22 -	--mandir=/usr/share/man $CONFIGURE_ARGS
   14.23 -	make
   14.24 -	make DESTDIR=$DESTDIR install
   14.25 +	./configure $CONFIGURE_ARGS && make && make install
   14.26  }
   14.27  
   14.28  # Rules to gen a SliTaz package suitable for Tazpkg.
   14.29  genpkg_rules()
   14.30  {
   14.31 -	mkdir -p $fs/usr/lib
   14.32 -	cp -a $install/usr/bin $fs/usr
   14.33 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   14.34 +	cook_copy_folders bin
   14.35 +	cook_copy_files *.so*
   14.36  }
    15.1 --- a/ucl-dev/receipt	Thu Mar 16 18:37:27 2017 +0100
    15.2 +++ b/ucl-dev/receipt	Fri Mar 17 12:37:35 2017 +0200
    15.3 @@ -6,15 +6,13 @@
    15.4  SHORT_DESC="ucl development files"
    15.5  MAINTAINER="devl547@gmail.com"
    15.6  LICENSE="GPL2"
    15.7 -WANTED="ucl"
    15.8  WEB_SITE="http://www.oberhumer.com/opensource/ucl/"
    15.9  
   15.10 +WANTED="ucl"
   15.11  DEPENDS="ucl"
   15.12  
   15.13  # Rules to gen a SliTaz package suitable for Tazpkg.
   15.14  genpkg_rules()
   15.15  {
   15.16 -	mkdir -p $fs/usr/lib
   15.17 -	cp -a $install/usr/include $fs/usr
   15.18 +	cook_copy_files *.h
   15.19  }
   15.20 -
    16.1 --- a/ucl/receipt	Thu Mar 16 18:37:27 2017 +0100
    16.2 +++ b/ucl/receipt	Fri Mar 17 12:37:35 2017 +0200
    16.3 @@ -7,20 +7,27 @@
    16.4  MAINTAINER="devl547@gmail.com"
    16.5  LICENSE="GPL2"
    16.6  WEB_SITE="http://www.oberhumer.com/opensource/ucl/"
    16.7 +
    16.8  TARBALL="$PACKAGE-$VERSION.tar.gz"
    16.9  WGET_URL="$WEB_SITE/download/$TARBALL"
   16.10  
   16.11 +BUILD_DEPENDS="gfortran"
   16.12 +
   16.13  # Rules to configure and make the package.
   16.14  compile_rules()
   16.15  {
   16.16 -	cd $src
   16.17 -	./configure --enable-shared $CONFIGURE_ARGS && 
   16.18 +	while read i; do
   16.19 +		patch -p1 -i $stuff/patches/$i
   16.20 +	done < $stuff/patches/series
   16.21 +
   16.22 +	./configure \
   16.23 +		--enable-shared \
   16.24 +		$CONFIGURE_ARGS &&
   16.25  	make && make install
   16.26  }
   16.27  
   16.28  # Rules to gen a SliTaz package suitable for Tazpkg.
   16.29  genpkg_rules()
   16.30  {
   16.31 -	mkdir -p $fs/usr/lib
   16.32 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   16.33 +	cook_copy_files *.so*
   16.34  }
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/ucl/stuff/patches/01-Examples.patch	Fri Mar 17 12:37:35 2017 +0200
    17.3 @@ -0,0 +1,50 @@
    17.4 +From: Robert Luberda <robert@debian.org>
    17.5 +Date: Mon, 26 Jul 2004 20:44:00 +0200
    17.6 +Subject: 01 Examples.
    17.7 +
    17.8 +Fix examples.
    17.9 +---
   17.10 + examples/portab.h  | 2 +-
   17.11 + examples/simple.c  | 2 +-
   17.12 + examples/uclpack.c | 2 +-
   17.13 + 3 files changed, 3 insertions(+), 3 deletions(-)
   17.14 +
   17.15 +diff --git a/examples/portab.h b/examples/portab.h
   17.16 +index 6cf0752..719839c 100644
   17.17 +--- a/examples/portab.h
   17.18 ++++ b/examples/portab.h
   17.19 +@@ -28,7 +28,7 @@
   17.20 + 
   17.21 + #include <ucl/uclconf.h>
   17.22 + 
   17.23 +-#if 1
   17.24 ++#if 0
   17.25 + 
   17.26 + #include "examples/portab_a.h"
   17.27 + 
   17.28 +diff --git a/examples/simple.c b/examples/simple.c
   17.29 +index 5fd54be..faecf60 100644
   17.30 +--- a/examples/simple.c
   17.31 ++++ b/examples/simple.c
   17.32 +@@ -32,7 +32,7 @@
   17.33 + 
   17.34 + /* portability layer */
   17.35 + #define WANT_UCL_MALLOC 1
   17.36 +-#include "examples/portab.h"
   17.37 ++#include "portab.h"
   17.38 + 
   17.39 + 
   17.40 + /*************************************************************************
   17.41 +diff --git a/examples/uclpack.c b/examples/uclpack.c
   17.42 +index a340c24..a104876 100644
   17.43 +--- a/examples/uclpack.c
   17.44 ++++ b/examples/uclpack.c
   17.45 +@@ -60,7 +60,7 @@
   17.46 + #define WANT_UCL_UCLOCK 1
   17.47 + #endif
   17.48 + #define WANT_UCL_WILDARGV 1
   17.49 +-#include "examples/portab.h"
   17.50 ++#include "portab.h"
   17.51 + 
   17.52 + 
   17.53 + static const char *progname = NULL;
    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/ucl/stuff/patches/02-Autoreconf.patch	Fri Mar 17 12:37:35 2017 +0200
    18.3 @@ -0,0 +1,377 @@
    18.4 +From: Robert Luberda <robert@debian.org>
    18.5 +Date: Wed, 21 May 2014 23:23:49 +0200
    18.6 +Subject: 02 Autoreconf
    18.7 +
    18.8 +Fix autoconf files to make it possible to call autoreconf, see bug #744671.
    18.9 +The acc[123].m4 files were extracted from the original aclocal.m4 file.
   18.10 +---
   18.11 + Makefile.am          |   2 +
   18.12 + configure.ac         |   4 +-
   18.13 + examples/Makefile.am |   2 +-
   18.14 + m4/acc1.m4           |  97 ++++++++++++++++++++++++++++++++++
   18.15 + m4/acc2.m4           |  42 +++++++++++++++
   18.16 + m4/acc3.m4           | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++
   18.17 + src/Makefile.am      |   5 +-
   18.18 + 7 files changed, 290 insertions(+), 5 deletions(-)
   18.19 + create mode 100644 m4/acc1.m4
   18.20 + create mode 100644 m4/acc2.m4
   18.21 + create mode 100644 m4/acc3.m4
   18.22 +
   18.23 +diff --git a/Makefile.am b/Makefile.am
   18.24 +index 3570c33..f615f27 100644
   18.25 +--- a/Makefile.am
   18.26 ++++ b/Makefile.am
   18.27 +@@ -5,6 +5,8 @@
   18.28 + 
   18.29 + AUTOMAKE_OPTIONS = 1.8.5 foreign
   18.30 + 
   18.31 ++ACLOCAL_AMFLAGS = -I m4
   18.32 ++
   18.33 + SUBDIRS = include src examples
   18.34 + 
   18.35 + dist-hook:
   18.36 +diff --git a/configure.ac b/configure.ac
   18.37 +index 16adb1d..96ffde0 100644
   18.38 +--- a/configure.ac
   18.39 ++++ b/configure.ac
   18.40 +@@ -47,8 +47,10 @@ AC_CANONICAL_HOST
   18.41 + AC_CANONICAL_TARGET
   18.42 + AM_MAINTAINER_MODE
   18.43 + 
   18.44 ++AC_CONFIG_MACRO_DIR([m4])
   18.45 ++
   18.46 + if test -z "$ac_abs_top_srcdir"; then
   18.47 +-    _AC_SRCPATHS(.)
   18.48 ++    _AC_SRCDIRS(.)
   18.49 + fi
   18.50 + if test -r .Conf.settings1; then
   18.51 +     . ./.Conf.settings1
   18.52 +diff --git a/examples/Makefile.am b/examples/Makefile.am
   18.53 +index 4f1be03..bd33c6a 100644
   18.54 +--- a/examples/Makefile.am
   18.55 ++++ b/examples/Makefile.am
   18.56 +@@ -3,7 +3,7 @@
   18.57 + # Copyright (C) 1996-2004 Markus F.X.J. Oberhumer
   18.58 + #
   18.59 + 
   18.60 +-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
   18.61 ++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)
   18.62 + 
   18.63 + noinst_PROGRAMS = simple uclpack
   18.64 + 
   18.65 +diff --git a/m4/acc1.m4 b/m4/acc1.m4
   18.66 +new file mode 100644
   18.67 +index 0000000..d1ccb5b
   18.68 +--- /dev/null
   18.69 ++++ b/m4/acc1.m4
   18.70 +@@ -0,0 +1,97 @@
   18.71 ++# serial 1
   18.72 ++
   18.73 ++# /***********************************************************************
   18.74 ++# // standard ACC macros
   18.75 ++# ************************************************************************/
   18.76 ++
   18.77 ++AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
   18.78 ++AC_C_BIGENDIAN([AC_DEFINE(ACC_ENDIAN_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ENDIAN_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
   18.79 ++])#
   18.80 ++
   18.81 ++AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
   18.82 ++AC_HEADER_TIME
   18.83 ++AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h])
   18.84 ++])#
   18.85 ++
   18.86 ++AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
   18.87 ++AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
   18.88 ++])#
   18.89 ++
   18.90 ++
   18.91 ++AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
   18.92 ++AC_CHECK_SIZEOF(short)
   18.93 ++AC_CHECK_SIZEOF(int)
   18.94 ++AC_CHECK_SIZEOF(long)
   18.95 ++
   18.96 ++AC_CHECK_SIZEOF(ptrdiff_t)
   18.97 ++AC_CHECK_SIZEOF(size_t)
   18.98 ++AC_CHECK_SIZEOF(void *)
   18.99 ++AC_CHECK_SIZEOF(char *)
  18.100 ++
  18.101 ++AC_CHECK_SIZEOF(long long)
  18.102 ++AC_CHECK_SIZEOF(unsigned long long)
  18.103 ++AC_CHECK_SIZEOF(__int64)
  18.104 ++AC_CHECK_SIZEOF(unsigned __int64)
  18.105 ++])#
  18.106 ++
  18.107 ++
  18.108 ++# /***********************************************************************
  18.109 ++# // Check for ACC_conformance
  18.110 ++# ************************************************************************/
  18.111 ++
  18.112 ++AC_DEFUN([mfx_ACC_ACCCHK], [
  18.113 ++mfx_tmp=$1
  18.114 ++mfx_save_CPPFLAGS=$CPPFLAGS
  18.115 ++dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
  18.116 ++test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
  18.117 ++
  18.118 ++AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
  18.119 ++
  18.120 ++AC_LANG_CONFTEST([AC_LANG_PROGRAM(
  18.121 ++[[#define ACC_CONFIG_NO_HEADER 1
  18.122 ++#include "acc/acc.h"
  18.123 ++#include "acc/acc_incd.h"
  18.124 ++#undef ACCCHK_ASSERT
  18.125 ++#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT_HEADER(expr)
  18.126 ++#include "acc/acc_chk.ch"
  18.127 ++#undef ACCCHK_ASSERT
  18.128 ++static void test_acc_compile_time_assert(void) {
  18.129 ++#define ACCCHK_ASSERT(expr)     ACC_COMPILE_TIME_ASSERT(expr)
  18.130 ++#include "acc/acc_chk.ch"
  18.131 ++#undef ACCCHK_ASSERT
  18.132 ++}
  18.133 ++#undef NDEBUG
  18.134 ++#include <assert.h>
  18.135 ++static int test_acc_run_time_assert(int r) {
  18.136 ++#define ACCCHK_ASSERT(expr)     assert(expr);
  18.137 ++#include "acc/acc_chk.ch"
  18.138 ++#undef ACCCHK_ASSERT
  18.139 ++return r;
  18.140 ++}
  18.141 ++]], [[
  18.142 ++test_acc_compile_time_assert();
  18.143 ++if (test_acc_run_time_assert(1) != 1) return 1;
  18.144 ++]]
  18.145 ++)])
  18.146 ++
  18.147 ++mfx_tmp=FAILED
  18.148 ++_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
  18.149 ++rm -f conftest.$ac_ext conftest.$ac_objext
  18.150 ++
  18.151 ++CPPFLAGS=$mfx_save_CPPFLAGS
  18.152 ++
  18.153 ++AC_MSG_RESULT([$mfx_tmp])
  18.154 ++case x$mfx_tmp in
  18.155 ++  xpassed | xyes) ;;
  18.156 ++  *)
  18.157 ++    AC_MSG_NOTICE([])
  18.158 ++    AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
  18.159 ++    AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
  18.160 ++    AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
  18.161 ++    AC_MSG_NOTICE([Thanks for your support.])
  18.162 ++    AC_MSG_NOTICE([])
  18.163 ++    AC_MSG_ERROR([ACC conformance test failed. Stop.])
  18.164 ++dnl    AS_EXIT
  18.165 ++    ;;
  18.166 ++esac
  18.167 ++])# mfx_ACC_ACCCHK
  18.168 +diff --git a/m4/acc2.m4 b/m4/acc2.m4
  18.169 +new file mode 100644
  18.170 +index 0000000..f0ce59b
  18.171 +--- /dev/null
  18.172 ++++ b/m4/acc2.m4
  18.173 +@@ -0,0 +1,42 @@
  18.174 ++# serial 1
  18.175 ++
  18.176 ++AC_DEFUN([mfx_PROG_CPPFLAGS], [
  18.177 ++AC_MSG_CHECKING([whether the C preprocessor needs special flags])
  18.178 ++
  18.179 ++AC_LANG_CONFTEST([AC_LANG_PROGRAM(
  18.180 ++[[#include <limits.h>
  18.181 ++#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
  18.182 ++#  include "your C preprocessor is broken 1"
  18.183 ++#elif (0xffffu == 0xfffffffful)
  18.184 ++#  include "your C preprocessor is broken 2"
  18.185 ++#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX)
  18.186 ++#  include "your C preprocessor is broken 3"
  18.187 ++#endif
  18.188 ++]], [[ ]]
  18.189 ++)])
  18.190 ++
  18.191 ++mfx_save_CPPFLAGS=$CPPFLAGS
  18.192 ++mfx_tmp=ERROR
  18.193 ++for mfx_arg in "" -no-cpp-precomp
  18.194 ++do
  18.195 ++  CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS"
  18.196 ++  _AC_COMPILE_IFELSE([],
  18.197 ++[mfx_tmp=$mfx_arg
  18.198 ++break])
  18.199 ++done
  18.200 ++CPPFLAGS=$mfx_save_CPPFLAGS
  18.201 ++rm -f conftest.$ac_ext conftest.$ac_objext
  18.202 ++case x$mfx_tmp in
  18.203 ++  x)
  18.204 ++    AC_MSG_RESULT([none needed]) ;;
  18.205 ++  xERROR)
  18.206 ++    AC_MSG_RESULT([ERROR])
  18.207 ++    AC_MSG_ERROR([your C preprocessor is broken - for details see config.log])
  18.208 ++    ;;
  18.209 ++  *)
  18.210 ++    AC_MSG_RESULT([$mfx_tmp])
  18.211 ++    CPPFLAGS="$mfx_tmp $CPPFLAGS"
  18.212 ++    ;;
  18.213 ++esac
  18.214 ++])# mfx_PROG_CPPFLAGS
  18.215 ++
  18.216 +diff --git a/m4/acc3.m4 b/m4/acc3.m4
  18.217 +new file mode 100644
  18.218 +index 0000000..a6ff628
  18.219 +--- /dev/null
  18.220 ++++ b/m4/acc3.m4
  18.221 +@@ -0,0 +1,143 @@
  18.222 ++# serial 3
  18.223 ++
  18.224 ++AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [
  18.225 ++AC_CACHE_CHECK([whether limits.h is sane],
  18.226 ++mfx_cv_header_sane_limits_h,
  18.227 ++[AC_TRY_COMPILE([#include <limits.h>
  18.228 ++#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
  18.229 ++#  if defined(__APPLE__) && defined(__GNUC__)
  18.230 ++#    error "your preprocessor is broken - use compiler option -no-cpp-precomp"
  18.231 ++#  else
  18.232 ++#    include "your preprocessor is broken"
  18.233 ++#  endif
  18.234 ++#endif
  18.235 ++#define MFX_0xffff          0xffff
  18.236 ++#define MFX_0xffffffffL     4294967295ul
  18.237 ++#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
  18.238 ++#  include "error CHAR_BIT"
  18.239 ++#endif
  18.240 ++#if !defined(UCHAR_MAX)
  18.241 ++#  include "error UCHAR_MAX 1"
  18.242 ++#endif
  18.243 ++#if !defined(USHRT_MAX)
  18.244 ++#  include "error USHRT_MAX 1"
  18.245 ++#endif
  18.246 ++#if !defined(UINT_MAX)
  18.247 ++#  include "error UINT_MAX 1"
  18.248 ++#endif
  18.249 ++#if !defined(ULONG_MAX)
  18.250 ++#  include "error ULONG_MAX 1"
  18.251 ++#endif
  18.252 ++#if !defined(SHRT_MAX)
  18.253 ++#  include "error SHRT_MAX 1"
  18.254 ++#endif
  18.255 ++#if !defined(INT_MAX)
  18.256 ++#  include "error INT_MAX 1"
  18.257 ++#endif
  18.258 ++#if !defined(LONG_MAX)
  18.259 ++#  include "error LONG_MAX 1"
  18.260 ++#endif
  18.261 ++#if (UCHAR_MAX < 1)
  18.262 ++#  include "error UCHAR_MAX 2"
  18.263 ++#endif
  18.264 ++#if (USHRT_MAX < 1)
  18.265 ++#  include "error USHRT_MAX 2"
  18.266 ++#endif
  18.267 ++#if (UINT_MAX < 1)
  18.268 ++#  include "error UINT_MAX 2"
  18.269 ++#endif
  18.270 ++#if (ULONG_MAX < 1)
  18.271 ++#  include "error ULONG_MAX 2"
  18.272 ++#endif
  18.273 ++#if (UCHAR_MAX < 0xff)
  18.274 ++#  include "error UCHAR_MAX 3"
  18.275 ++#endif
  18.276 ++#if (USHRT_MAX < MFX_0xffff)
  18.277 ++#  include "error USHRT_MAX 3"
  18.278 ++#endif
  18.279 ++#if (UINT_MAX < MFX_0xffff)
  18.280 ++#  include "error UINT_MAX 3"
  18.281 ++#endif
  18.282 ++#if (ULONG_MAX < MFX_0xffffffffL)
  18.283 ++#  include "error ULONG_MAX 3"
  18.284 ++#endif
  18.285 ++#if (USHRT_MAX > UINT_MAX)
  18.286 ++#  include "error USHRT_MAX vs UINT_MAX"
  18.287 ++#endif
  18.288 ++#if (UINT_MAX > ULONG_MAX)
  18.289 ++#  include "error UINT_MAX vs ULONG_MAX"
  18.290 ++#endif
  18.291 ++],[
  18.292 ++#if (USHRT_MAX == MFX_0xffff)
  18.293 ++{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; }
  18.294 ++#elif (USHRT_MAX >= MFX_0xffff)
  18.295 ++{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; }
  18.296 ++#endif
  18.297 ++#if (UINT_MAX == MFX_0xffff)
  18.298 ++{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; }
  18.299 ++#elif (UINT_MAX >= MFX_0xffff)
  18.300 ++{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; }
  18.301 ++#endif
  18.302 ++#if (ULONG_MAX == MFX_0xffff)
  18.303 ++{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; }
  18.304 ++#elif (ULONG_MAX >= MFX_0xffff)
  18.305 ++{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; }
  18.306 ++#endif
  18.307 ++#if (USHRT_MAX == MFX_0xffffffffL)
  18.308 ++{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; }
  18.309 ++#elif (USHRT_MAX >= MFX_0xffffffffL)
  18.310 ++{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; }
  18.311 ++#endif
  18.312 ++#if (UINT_MAX == MFX_0xffffffffL)
  18.313 ++{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; }
  18.314 ++#elif (UINT_MAX >= MFX_0xffffffffL)
  18.315 ++{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; }
  18.316 ++#endif
  18.317 ++#if (ULONG_MAX == MFX_0xffffffffL)
  18.318 ++{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; }
  18.319 ++#elif (ULONG_MAX >= MFX_0xffffffffL)
  18.320 ++{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; }
  18.321 ++#endif
  18.322 ++],
  18.323 ++mfx_cv_header_sane_limits_h=yes,
  18.324 ++mfx_cv_header_sane_limits_h=no)])
  18.325 ++])
  18.326 ++
  18.327 ++# /***********************************************************************
  18.328 ++# //
  18.329 ++# ************************************************************************/
  18.330 ++
  18.331 ++dnl more types which are not yet covered by ACC
  18.332 ++
  18.333 ++AC_DEFUN([mfx_CHECK_SIZEOF], [
  18.334 ++AC_CHECK_SIZEOF(__int32)
  18.335 ++AC_CHECK_SIZEOF(unsigned __int32)
  18.336 ++AC_CHECK_SIZEOF(intmax_t)
  18.337 ++AC_CHECK_SIZEOF(uintmax_t)
  18.338 ++AC_CHECK_SIZEOF(intptr_t)
  18.339 ++AC_CHECK_SIZEOF(uintptr_t)
  18.340 ++
  18.341 ++AC_CHECK_SIZEOF(float)
  18.342 ++AC_CHECK_SIZEOF(double)
  18.343 ++AC_CHECK_SIZEOF(long double)
  18.344 ++
  18.345 ++AC_CHECK_SIZEOF(dev_t)
  18.346 ++AC_CHECK_SIZEOF(fpos_t)
  18.347 ++AC_CHECK_SIZEOF(mode_t)
  18.348 ++AC_CHECK_SIZEOF(off_t)
  18.349 ++AC_CHECK_SIZEOF(ssize_t)
  18.350 ++AC_CHECK_SIZEOF(time_t)
  18.351 ++])#
  18.352 ++
  18.353 ++
  18.354 ++
  18.355 ++AC_DEFUN([mfx_CHECK_LIB_WINMM], [
  18.356 ++if test "X$GCC" = Xyes; then
  18.357 ++case $host_os in
  18.358 ++cygwin* | mingw* | pw32*)
  18.359 ++     LIBS="$LIBS -lwinmm" ;;
  18.360 ++*)
  18.361 ++     ;;
  18.362 ++esac
  18.363 ++fi
  18.364 ++])#
  18.365 +diff --git a/src/Makefile.am b/src/Makefile.am
  18.366 +index 78d0e51..bdb99a0 100644
  18.367 +--- a/src/Makefile.am
  18.368 ++++ b/src/Makefile.am
  18.369 +@@ -6,9 +6,8 @@
  18.370 + VPATH = @srcdir@@UCL_ASM_VPATH@
  18.371 + SUFFIXES = .S
  18.372 + 
  18.373 +-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
  18.374 +-CPPFLAGS = $(UCL_CPPFLAGS) $(configure_CPPFLAGS) $(UCL_EXTRA_CPPFLAGS)
  18.375 +-CFLAGS = $(UCL_CFLAGS) $(configure_CFLAGS) $(UCL_EXTRA_CFLAGS)
  18.376 ++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) $(UCL_CPPFLAGS) $(configure_CPPFLAGS) $(UCL_EXTRA_CPPFLAGS)
  18.377 ++AM_CFLAGS = $(UCL_CFLAGS) $(configure_CFLAGS) $(UCL_EXTRA_CFLAGS)
  18.378 + 
  18.379 + lib_LTLIBRARIES = libucl.la
  18.380 + 
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/ucl/stuff/patches/03-Reproducible-build.patch	Fri Mar 17 12:37:35 2017 +0200
    19.3 @@ -0,0 +1,27 @@
    19.4 +From: Robert Luberda <robert@debian.org>
    19.5 +Date: Sun, 31 May 2015 13:09:15 +0200
    19.6 +Subject: 03 Reproducible build
    19.7 +
    19.8 +Introduced BUILD_DATETIME pre-processor variable to
    19.9 +be used instead of __DATE__ __TIME__ to make build
   19.10 +reproducible.
   19.11 +---
   19.12 + src/ucl_util.c | 4 ++++
   19.13 + 1 file changed, 4 insertions(+)
   19.14 +
   19.15 +diff --git a/src/ucl_util.c b/src/ucl_util.c
   19.16 +index 7e49a2a..58aa0ea 100644
   19.17 +--- a/src/ucl_util.c
   19.18 ++++ b/src/ucl_util.c
   19.19 +@@ -55,7 +55,11 @@ static const char __ucl_copyright[] =
   19.20 +     "<markus@oberhumer.com>\n"
   19.21 +     "http://www.oberhumer.com $\n\n"
   19.22 +     "$Id: UCL version: v" UCL_VERSION_STRING ", " UCL_VERSION_DATE " $\n"
   19.23 ++#if defined (BUILD_DATETIME)
   19.24 ++    "$Built: " BUILD_DATETIME " $\n"
   19.25 ++#else
   19.26 +     "$Built: " __DATE__ " " __TIME__ " $\n"
   19.27 ++#endif
   19.28 +     "$Info: " ACC_INFO_OS
   19.29 + #if defined(ACC_INFO_OS_POSIX)
   19.30 +     "/" ACC_INFO_OS_POSIX
    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/ucl/stuff/patches/04-Static-assert.patch	Fri Mar 17 12:37:35 2017 +0200
    20.3 @@ -0,0 +1,34 @@
    20.4 +From: Robert Luberda <robert@debian.org>
    20.5 +Date: Sat, 2 Jul 2016 22:23:20 +0200
    20.6 +Subject: Switch to _Static_assert
    20.7 +
    20.8 +Use _Static_assert for compile-time assertion to fix
    20.9 +build failures with gcc-6 (closes: #811707)
   20.10 +---
   20.11 + acc/acc_defs.h | 6 ++++++
   20.12 + 1 file changed, 6 insertions(+)
   20.13 +
   20.14 +diff --git a/acc/acc_defs.h b/acc/acc_defs.h
   20.15 +index 866b7bd..5ee3761 100644
   20.16 +--- a/acc/acc_defs.h
   20.17 ++++ b/acc/acc_defs.h
   20.18 +@@ -87,6 +87,9 @@
   20.19 + 
   20.20 + /* This can be put into a header file but may get ignored by some compilers. */
   20.21 + #if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
   20.22 ++# define ACC_COMPILE_TIME_ASSERT_HEADER(e) _Static_assert(e, #e);
   20.23 ++#endif
   20.24 ++#if !defined(ACC_COMPILE_TIME_ASSERT_HEADER)
   20.25 + #  if (ACC_CC_AZTECC || ACC_CC_ZORTECHC)
   20.26 + #    define ACC_COMPILE_TIME_ASSERT_HEADER(e)  extern int __acc_cta[1-!(e)];
   20.27 + #  elif (ACC_CC_DMC || ACC_CC_SYMANTECC)
   20.28 +@@ -100,6 +103,9 @@
   20.29 + 
   20.30 + /* This must appear within a function body. */
   20.31 + #if !defined(ACC_COMPILE_TIME_ASSERT)
   20.32 ++# define ACC_COMPILE_TIME_ASSERT(e) _Static_assert(e, #e);
   20.33 ++#endif
   20.34 ++#if !defined(ACC_COMPILE_TIME_ASSERT)
   20.35 + #  if (ACC_CC_AZTECC)
   20.36 + #    define ACC_COMPILE_TIME_ASSERT(e)  {typedef int __acc_cta_t[1-!(e)];}
   20.37 + #  elif (ACC_CC_DMC || ACC_CC_PACIFICC || ACC_CC_SYMANTECC || ACC_CC_ZORTECHC)
    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/ucl/stuff/patches/series	Fri Mar 17 12:37:35 2017 +0200
    21.3 @@ -0,0 +1,4 @@
    21.4 +01-Examples.patch
    21.5 +02-Autoreconf.patch
    21.6 +03-Reproducible-build.patch
    21.7 +04-Static-assert.patch
    22.1 --- a/upx/receipt	Thu Mar 16 18:37:27 2017 +0100
    22.2 +++ b/upx/receipt	Fri Mar 17 12:37:35 2017 +0200
    22.3 @@ -1,45 +1,41 @@
    22.4  # SliTaz package receipt.
    22.5  
    22.6  PACKAGE="upx"
    22.7 -VERSION="3.91"
    22.8 +VERSION="3.93"
    22.9  CATEGORY="system-tools"
   22.10  SHORT_DESC="Ultimate Packer for eXecutables (free version using UCL compression)"
   22.11  MAINTAINER="devl547@gmail.com"
   22.12  LICENSE="GPL2"
   22.13 -WEB_SITE="http://upx.sourceforge.net/"
   22.14 -TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
   22.15 -WGET_URL="http://upx.sourceforge.net/download/$TARBALL"
   22.16 -PATCH="http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2"
   22.17 -EXTRA_SOURCE_FILES="$PATCH"
   22.18 +WEB_SITE="https://upx.github.io/"
   22.19 +
   22.20 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   22.21 +WGET_URL="https://github.com/upx/upx/archive/v$VERSION.tar.gz"
   22.22 +TARBALL2="upx-lzma-sdk-$VERSION.tar.gz"
   22.23 +WGET_URL2="https://github.com/upx/upx-lzma-sdk/archive/v$VERSION.tar.gz"
   22.24  
   22.25  DEPENDS="ucl zlib"
   22.26 -BUILD_DEPENDS="ucl-dev zlib-dev"
   22.27 +BUILD_DEPENDS="ucl-dev zlib-dev perl"
   22.28  
   22.29  # Rules to configure and make the package.
   22.30  compile_rules()
   22.31  {
   22.32 -	[ -s $SOURCES_REPOSITORY/$(basename $PATCH) ] ||
   22.33 -		wget -P $SOURCES_REPOSITORY $PATCH
   22.34 -	tar -xjpf $SOURCES_REPOSITORY/$(basename $PATCH)
   22.35 -	CXXFLAGS="$CXXFLAGS -DWITH_ZLIB=1"
   22.36 -	cd $src
   22.37 -	UPX_LZMADIR=$src make all
   22.38 +	[ -s $SOURCES_REPOSITORY/$TARBALL2 ] ||
   22.39 +		wget -O $SOURCES_REPOSITORY/$TARBALL2 $WGET_URL2
   22.40 +	tar -xf $SOURCES_REPOSITORY/$TARBALL2
   22.41 +	rm -r $src/src/lzma-sdk
   22.42 +	mv    $src/$(basename $TARBALL2 .tar.gz) $src/src/lzma-sdk
   22.43 +
   22.44 +	make CHECK_WHITESPACE=/bin/true all
   22.45 +
   22.46 +	mkdir -p $install/usr/bin $install/usr/share/man/man1
   22.47 +	cp -a $src/src/upx.out $install/usr/bin/upx
   22.48 +	cp -a $src/doc $install/usr/share
   22.49 +	rm $install/usr/share/doc/Makefile
   22.50 +	mv $install/usr/share/doc/upx.1 $install/usr/share/man/man1
   22.51  }
   22.52  
   22.53  # Rules to gen a SliTaz package suitable for Tazpkg.
   22.54  genpkg_rules()
   22.55  {
   22.56 -	mkdir -p $fs/usr/bin $install/usr/share/doc $install/usr/share/man
   22.57 -	cp -a $src/src/upx.out $fs/usr/bin/upx
   22.58 -	cp $src/doc/*.txt $install/usr/share/doc
   22.59 -	cp $src/doc/*.doc $install/usr/share/doc
   22.60 -	cp $src/doc/*.html $install/usr/share/doc
   22.61 -	cp $src/LICENSE $install/usr/share/doc
   22.62 -	cp $src/COPYING $install/usr/share/doc
   22.63 -	cp $src/README* $install/usr/share/doc
   22.64 -	cp $src/THANKS $install/usr/share/doc
   22.65 -	cp $src/NEWS $install/usr/share/doc
   22.66 -	cp $src/BUGS $install/usr/share/doc
   22.67 -	cp $src/*.txt $install/usr/share/doc
   22.68 -	cp $src/doc/*.1 $install/usr/share/man
   22.69 +	cook_copy_files upx
   22.70  }