wok-next rev 19743
Remake/fix: alsa-lib, alsaplayer; update base (LFS) packages: bash, binutils, bison, bzip2, diffutils, file, findutils, gawk, gcc, gettext, glibc, gmp, m4, mpc-library, mpfr, ncurses, patch, xz; update: tazpkg, cookutils, svgcleaner.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Jun 06 17:37:54 2017 +0300 (2017-06-06) |
| parents | 2677e3dc38b0 |
| children | c36fd2641cd6 |
| files | alsa-lib/receipt alsaplayer/receipt bash/receipt binutils/receipt bison/receipt bzip2/receipt cookutils/receipt diffutils/receipt file/description.file.txt file/description.libmagic-dev.txt file/description.libmagic.txt file/description.python-magic.txt file/description.txt file/receipt findutils/receipt gawk/receipt gcc-lib-base/description.txt gcc-lib-base/receipt gcc-lib-math/receipt gcc/description.gcc-lib-base.txt gcc/description.gcc.txt gcc/description.txt gcc/receipt gcc/stuff/gcc-4.5.2-startfiles_fix-1.patch gettext-base/description.txt gettext-base/receipt gettext-base/stuff/gettext.sh gettext-tools/description.txt gettext-tools/receipt gettext/description.gettext-base.txt gettext/description.gettext-tools.txt gettext/description.gettext.txt gettext/description.txt gettext/receipt gettext/stuff/gettext.sh gfortran/receipt glibc-base/receipt glibc-base/stuff/arm-files.list glibc-base/stuff/i486-files.list glibc-base/stuff/mkdir.list glibc-base/stuff/nsswitch.conf glibc-base/stuff/wanted-files.list glibc-dev/receipt glibc-locale/receipt glibc/receipt glibc/stuff/glibc-2.24-fhs-1.patch glibc/stuff/glibc-po.patch glibc/stuff/nscd glibc/stuff/nsswitch.conf glibc/stuff/patches/glibc-2.25-fhs-1.patch glibc/stuff/patches/glibc-po.patch glibc/stuff/patches/series gmp-dev/receipt gmp/receipt libbfd/receipt libgfortran/receipt libgomp/receipt libmagic-dev/description.txt libmagic-dev/receipt libmagic/description.txt libmagic/receipt libobjc/receipt m4/receipt mpc-library-dev/receipt mpc-library/receipt mpc-library/stuff/libmpc-0.9-configure_cflags_egrep_issue.patch mpfr-dev/receipt mpfr/receipt mpfr/stuff/mpfr-3.1.0.patch mpfr/stuff/mpfr-3.1.2-upstream_fixes-3.patch ncurses-dev/receipt ncurses-extra/receipt ncurses-libform/receipt ncurses-libmenu/receipt ncurses-libpanel/description.txt ncurses-libpanel/receipt ncurses/description.ncurses-libpanel.txt ncurses/receipt nscd/receipt nscd/stuff/nscd patch/receipt python-magic/description.txt python-magic/receipt svgcleaner/receipt tazpkg/receipt xz/receipt |
line diff
1.1 --- a/alsa-lib/receipt Mon Jun 05 19:31:24 2017 +0000 1.2 +++ b/alsa-lib/receipt Tue Jun 06 17:37:54 2017 +0300 1.3 @@ -3,22 +3,27 @@ 1.4 PACKAGE="alsa-lib" 1.5 VERSION="1.0.27.2" 1.6 CATEGORY="multimedia" 1.7 -SHORT_DESC="Alsa sound libraries." 1.8 +SHORT_DESC="ALSA sound libraries" 1.9 MAINTAINER="pankso@slitaz.org" 1.10 LICENSE="LGPL2.1" 1.11 +WEB_SITE="http://www.alsa-project.org/" 1.12 +HOST_ARCH="i486 arm" 1.13 + 1.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.15 -WEB_SITE="http://www.alsa-project.org/" 1.16 WGET_URL="ftp://ftp.alsa-project.org/pub/lib/$TARBALL" 1.17 -HOST_ARCH="i486 arm" 1.18 1.19 SPLIT="alsa-lib-dev" 1.20 1.21 # Rules to configure and make the package. 1.22 compile_rules() 1.23 { 1.24 - ./configure --disable-python \ 1.25 + ./configure \ 1.26 + --disable-python \ 1.27 $CONFIGURE_ARGS && 1.28 make && make -j1 install 1.29 + 1.30 + mkdir -p $install/etc 1.31 + cp $stuff/asound.conf $install/etc 1.32 } 1.33 1.34 # Rules to gen a SliTaz package suitable for Tazpkg. 1.35 @@ -28,12 +33,8 @@ 1.36 case $PACKAGE in 1.37 alsa-lib) 1.38 copy @std 1.39 - mkdir -p $fs/etc 1.40 - cp $stuff/asound.conf $fs/etc 1.41 DEPENDS="linux" 1.42 ;; 1.43 - alsa-lib-dev) 1.44 - copy @dev ;; 1.45 + *-dev) copy @dev;; 1.46 esac 1.47 } 1.48 -
2.1 --- a/alsaplayer/receipt Mon Jun 05 19:31:24 2017 +0000 2.2 +++ b/alsaplayer/receipt Tue Jun 06 17:37:54 2017 +0300 2.3 @@ -3,24 +3,18 @@ 2.4 PACKAGE="alsaplayer" 2.5 VERSION="0.99.81" 2.6 CATEGORY="multimedia" 2.7 -SHORT_DESC="Alsa GTK+ PCM audio player." 2.8 +SHORT_DESC="ALSA GTK+ PCM audio player" 2.9 MAINTAINER="pankso@slitaz.org" 2.10 LICENSE="GPL3" 2.11 WEB_SITE="http://alsaplayer.sourceforge.net/" 2.12 +HOST_ARCH="i486 arm" 2.13 + 2.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.15 WGET_URL="${WEB_SITE}$TARBALL" 2.16 -TAGS="music audio player mp3 ogg flac" 2.17 -HOST_ARCH="i486 arm" 2.18 2.19 -SUGGESTED="alsaplayer-scopes libid3tag flac" 2.20 - 2.21 -BUILD_DEPENDS="gtk+-dev alsa-lib-dev libmad-dev libogg-dev libvorbis-dev" 2.22 -SPLIT="alsaplayer-dev alsaplayer-scopes" 2.23 - 2.24 -# Handle cross compilation. 2.25 -case "$ARCH" in 2.26 - i?86) BUILD_DEPENDS="$BUILD_DEPENDS flac-dev" ;; 2.27 -esac 2.28 +BUILD_DEPENDS="gtk+-dev alsa-lib-dev libmad-dev libogg-dev libvorbis-dev flac-dev" 2.29 +BUILD_DEPENDS_arm="gtk+-dev alsa-lib-dev libmad-dev libogg-dev libvorbis-dev" 2.30 +SPLIT="alsaplayer-scopes alsaplayer-dev" 2.31 2.32 # Rules to configure and make the package. 2.33 compile_rules() 2.34 @@ -47,18 +41,17 @@ 2.35 case $PACKAGE in 2.36 alsaplayer) 2.37 copy @std 2.38 - # Remove devel files and scopes. 2.39 - rm $fs/usr/lib/alsaplayer/*/*.*a 2.40 + # Remove scopes 2.41 rm -rf $fs/usr/lib/alsaplayer/scopes2 2.42 DEPENDS="gtk+ alsa-lib libmad libogg libvorbis xorg-libXdamage" 2.43 - ;; 2.44 - alsaplayer-dev) 2.45 - copy @dev 2.46 + TAGS="music audio player mp3 ogg flac" 2.47 + SUGGESTED="alsaplayer-scopes libid3tag flac" 2.48 ;; 2.49 alsaplayer-scopes) 2.50 - mkdir -p $fs/usr/lib/alsaplayer 2.51 - cp -a $install/usr/lib/alsaplayer/scopes2 \ 2.52 - $fs/usr/lib/alsaplayer 2.53 + copy scopes2/ 2.54 + CAT="multimedia|visualisations" 2.55 + DEPENDS="alsaplayer" 2.56 ;; 2.57 + *-dev) copy @dev;; 2.58 esac 2.59 }
3.1 --- a/bash/receipt Mon Jun 05 19:31:24 2017 +0000 3.2 +++ b/bash/receipt Tue Jun 06 17:37:54 2017 +0300 3.3 @@ -1,7 +1,7 @@ 3.4 -# SliTaz package receipt. 3.5 +# SliTaz package receipt v2. 3.6 3.7 PACKAGE="bash" 3.8 -VERSION="4.3.48" 3.9 +VERSION="4.4.12" 3.10 BASEVERSION="${VERSION%.*}" 3.11 CATEGORY="shells" 3.12 SHORT_DESC="The GNU bourne shell" 3.13 @@ -18,8 +18,8 @@ 3.14 BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.}); do printf "bash${BASEVERSION/./}-%03d " $i; done)" 3.15 EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES" 3.16 3.17 -DEPENDS="ncurses readline" 3.18 BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext patch" 3.19 +SPLIT="bash-dev" 3.20 3.21 patch_bash() 3.22 { 3.23 @@ -75,6 +75,10 @@ 3.24 # Bash doesn't care about DESTDIR in environnment variable. 3.25 make DESTDIR=$DESTDIR install 3.26 3.27 + # Config files 3.28 + cp -a $stuff/etc $install 3.29 + chown -R root:root $install 3.30 + 3.31 # Check bash against vulnerabilities 3.32 [ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] || 3.33 wget -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL 3.34 @@ -88,13 +92,17 @@ 3.35 # Rules to gen a SliTaz package suitable for Tazpkg. 3.36 genpkg_rules() 3.37 { 3.38 - cook_copy_folders bin 3.39 - # Config files 3.40 - cp -a $stuff/etc $fs 3.41 + case $PACKAGE in 3.42 + bash) 3.43 + copy @std 3.44 + DEPENDS="ncurses readline" 3.45 + ;; 3.46 + *-dev) copy @dev;; 3.47 + esac 3.48 } 3.49 3.50 3.51 -post_install() 3.52 +post_install_bash() 3.53 { 3.54 mkdir -p "$1/etc/skel"; cp -a "$1/etc/bashrc" "$1/etc/skel/.bashrc" 3.55 3.56 @@ -118,7 +126,7 @@ 3.57 } 3.58 3.59 3.60 -pre_remove() 3.61 +pre_remove_bash() 3.62 { 3.63 echo 3.64 echo 'Setting /bin/sh as default shell for all users'
4.1 --- a/binutils/receipt Mon Jun 05 19:31:24 2017 +0000 4.2 +++ b/binutils/receipt Tue Jun 06 17:37:54 2017 +0300 4.3 @@ -1,9 +1,9 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="binutils" 4.8 VERSION="2.27" 4.9 CATEGORY="development" 4.10 -SHORT_DESC="GNU assembler, linker and binary utilities." 4.11 +SHORT_DESC="GNU assembler, linker and binary utilities" 4.12 MAINTAINER="pankso@slitaz.org" 4.13 LICENSE="GPL2 LGPL2 GPL3 LGPL3" 4.14 WEB_SITE="http://www.gnu.org/software/binutils/" 4.15 @@ -13,14 +13,9 @@ 4.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 4.18 4.19 -PROVIDE="libbfd" 4.20 -DEPENDS="glibc zlib flex" 4.21 BUILD_DEPENDS="glibc-dev zlib-dev texinfo bison flex gettext-tools" 4.22 - 4.23 -# Handle cross compilation. 4.24 -case "$ARCH" in 4.25 - arm) BUILD_DEPENDS="" ;; 4.26 -esac 4.27 +BUILD_DEPENDS_arm="" 4.28 +SPLIT="libbfd" 4.29 4.30 # Rules to configure and make the package. 4.31 compile_rules() 4.32 @@ -61,6 +56,15 @@ 4.33 # Rules to gen a SliTaz package suitable for Tazpkg. 4.34 genpkg_rules() 4.35 { 4.36 - cook_copy_folders bin lib include 4.37 - find $fs -name '*.la' -delete 4.38 + case $PACKAGE in 4.39 + binutils) 4.40 + copy @std @dev 4.41 + DEPENDS="glibc zlib flex libbfd" 4.42 + ;; 4.43 + libbfd) 4.44 + copy libbfd*.so 4.45 + CAT="system-tools|Binary File Descriptor library" 4.46 + DEPENDS="zlib" 4.47 + ;; 4.48 + esac 4.49 }
5.1 --- a/bison/receipt Mon Jun 05 19:31:24 2017 +0000 5.2 +++ b/bison/receipt Tue Jun 06 17:37:54 2017 +0300 5.3 @@ -1,9 +1,9 @@ 5.4 -# SliTaz package receipt. 5.5 +# SliTaz package receipt v2. 5.6 5.7 PACKAGE="bison" 5.8 VERSION="3.0.4" 5.9 CATEGORY="development" 5.10 -SHORT_DESC="GNU parser generator." 5.11 +SHORT_DESC="GNU parser generator" 5.12 MAINTAINER="pankso@slitaz.org" 5.13 LICENSE="GPL3" 5.14 WEB_SITE="https://www.gnu.org/software/bison/" 5.15 @@ -13,7 +13,6 @@ 5.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 5.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 5.18 5.19 -DEPENDS="m4" 5.20 BUILD_DEPENDS="m4 perl libxslt gettext" 5.21 5.22 # Rules to configure and make the package. 5.23 @@ -28,5 +27,6 @@ 5.24 # Rules to gen a SliTaz package suitable for Tazpkg. 5.25 genpkg_rules() 5.26 { 5.27 - cook_copy_folders bin lib aclocal bison 5.28 + copy bin/ lib/ aclocal/ bison/ 5.29 + DEPENDS="m4" 5.30 }
6.1 --- a/bzip2/receipt Mon Jun 05 19:31:24 2017 +0000 6.2 +++ b/bzip2/receipt Tue Jun 06 17:37:54 2017 +0300 6.3 @@ -51,7 +51,7 @@ 6.4 ;; 6.5 bzip2-apps) 6.6 copy bin/ 6.7 - find $fs \( -name bzip2 -o -name bunzip2 -o -name bzcat \) -delete 6.8 + remove_already_packed 6.9 DEPENDS="bzlib" 6.10 CAT="utilities|apps" 6.11 ;;
7.1 --- a/cookutils/receipt Mon Jun 05 19:31:24 2017 +0000 7.2 +++ b/cookutils/receipt Tue Jun 06 17:37:54 2017 +0300 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="cookutils" 7.7 -VERSION="912" 7.8 +VERSION="913" 7.9 CATEGORY="base-system" 7.10 SHORT_DESC="SliTaz packages builder new generation" 7.11 MAINTAINER="pankso@slitaz.org"
8.1 --- a/diffutils/receipt Mon Jun 05 19:31:24 2017 +0000 8.2 +++ b/diffutils/receipt Tue Jun 06 17:37:54 2017 +0300 8.3 @@ -1,9 +1,9 @@ 8.4 -# SliTaz package receipt. 8.5 +# SliTaz package receipt v2. 8.6 8.7 PACKAGE="diffutils" 8.8 VERSION="3.5" 8.9 CATEGORY="development" 8.10 -SHORT_DESC="Show differences between two files." 8.11 +SHORT_DESC="Show differences between two files" 8.12 MAINTAINER="pascal.bellard@slitaz.org" 8.13 LICENSE="GPL3" 8.14 WEB_SITE="https://www.gnu.org/software/diffutils/" 8.15 @@ -20,12 +20,5 @@ 8.16 # Rules to gen a SliTaz package suitable for Tazpkg. 8.17 genpkg_rules() 8.18 { 8.19 - cook_copy_folders bin 8.20 + copy @std 8.21 } 8.22 - 8.23 -# Overlap busybox 8.24 -post_remove() 8.25 -{ 8.26 - ln -s /bin/busybox "$1/usr/bin/diff" 8.27 - ln -s /bin/busybox "$1/usr/bin/cmp" 8.28 -}
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/file/description.file.txt Tue Jun 06 17:37:54 2017 +0300 9.3 @@ -0,0 +1,3 @@ 9.4 +File tests each argument in an attempt to classify it. There are three sets 9.5 +of tests, performed in this order: filesystem tests, magic number tests, and 9.6 +language tests. The first test that succeeds causes the file type to be printed.
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/file/description.libmagic-dev.txt Tue Jun 06 17:37:54 2017 +0300 10.3 @@ -0,0 +1,4 @@ 10.4 +This library can be used to classify files according to magic number tests. 10.5 +It implements the core functionality of the file command. 10.6 + 10.7 +This package contains the development files.
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/file/description.libmagic.txt Tue Jun 06 17:37:54 2017 +0300 11.3 @@ -0,0 +1,2 @@ 11.4 +This library can be used to classify files according to magic number tests. 11.5 +It implements the core functionality of the file command.
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/file/description.python-magic.txt Tue Jun 06 17:37:54 2017 +0300 12.3 @@ -0,0 +1,4 @@ 12.4 +This library can be used to classify files according to magic number tests. 12.5 +It implements the core functionality of the file command. 12.6 + 12.7 +This package contains the Python bindings.
13.1 --- a/file/description.txt Mon Jun 05 19:31:24 2017 +0000 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,3 +0,0 @@ 13.4 -File tests each argument in an attempt to classify it. There are three sets 13.5 -of tests, performed in this order: filesystem tests, magic number tests, and 13.6 -language tests. The first test that succeeds causes the file type to be printed.
14.1 --- a/file/receipt Mon Jun 05 19:31:24 2017 +0000 14.2 +++ b/file/receipt Tue Jun 06 17:37:54 2017 +0300 14.3 @@ -1,29 +1,25 @@ 14.4 -# SliTaz package receipt. 14.5 +# SliTaz package receipt v2. 14.6 14.7 PACKAGE="file" 14.8 -VERSION="5.28" 14.9 +VERSION="5.31" 14.10 CATEGORY="system-tools" 14.11 SHORT_DESC="Determines file type using 'magic' numbers" 14.12 MAINTAINER="erjo@slitaz.org" 14.13 LICENSE="BSD" 14.14 -WEB_SITE="http://www.darwinsys.com/file/" 14.15 +WEB_SITE="https://github.com/file/file" 14.16 HOST_ARCH="i486 arm" 14.17 14.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 14.19 -WGET_URL="ftp://ftp.astron.com/pub/file/$TARBALL" 14.20 +WGET_URL="https://github.com/file/file/archive/FILE${VERSION/./_}.tar.gz" 14.21 14.22 -DEPENDS="zlib libmagic" 14.23 -BUILD_DEPENDS="zlib-dev python setuptools" 14.24 +BUILD_DEPENDS="automake libtool zlib-dev python setuptools" 14.25 +BUILD_DEPENDS_arm="" 14.26 SPLIT="libmagic libmagic-dev python-magic" 14.27 14.28 -# Handle cross compilation. python is installed in a ARM cook env. 14.29 -case "$ARCH" in 14.30 - arm) BUILD_DEPENDS="" ;; 14.31 -esac 14.32 - 14.33 # Rules to configure and make the package. 14.34 compile_rules() 14.35 { 14.36 + autoreconf -f -i && 14.37 ./configure $CONFIGURE_ARGS && make && make install 14.38 14.39 cd python 14.40 @@ -31,14 +27,33 @@ 14.41 python setup.py install --root=$DESTDIR 14.42 } 14.43 14.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 14.45 -genpkg_rules() 14.46 -{ 14.47 - cook_copy_files file magic.mgc 14.48 -} 14.49 - 14.50 # Be sure it as cross compile. 14.51 testsuite() 14.52 { 14.53 readelf -h $install/usr/bin/file 14.54 } 14.55 + 14.56 +# Rules to gen a SliTaz package suitable for Tazpkg. 14.57 +genpkg_rules() 14.58 +{ 14.59 + case $PACKAGE in 14.60 + file) 14.61 + copy file magic.mgc 14.62 + DEPENDS="zlib libmagic" 14.63 + ;; 14.64 + libmagic) 14.65 + copy *.so* 14.66 + CAT="libs|library" 14.67 + DEPENDS="zlib" 14.68 + ;; 14.69 + libmagic-dev) 14.70 + copy @dev 14.71 + DEPENDS="libmagic" 14.72 + ;; 14.73 + python-magic) 14.74 + copy python*/ 14.75 + CAT="development|Python bindings" 14.76 + DEPENDS="file python" 14.77 + ;; 14.78 + esac 14.79 +}
15.1 --- a/findutils/receipt Mon Jun 05 19:31:24 2017 +0000 15.2 +++ b/findutils/receipt Tue Jun 06 17:37:54 2017 +0300 15.3 @@ -1,9 +1,9 @@ 15.4 -# SliTaz package receipt. 15.5 +# SliTaz package receipt v2. 15.6 15.7 PACKAGE="findutils" 15.8 VERSION="4.6.0" 15.9 CATEGORY="utilities" 15.10 -SHORT_DESC="GNU utilities and tools to find/locate." 15.11 +SHORT_DESC="GNU utilities and tools to find/locate" 15.12 MAINTAINER="pankso@slitaz.org" 15.13 LICENSE="GPL3" 15.14 WEB_SITE="https://www.gnu.org/software/findutils/" 15.15 @@ -11,8 +11,6 @@ 15.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 15.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 15.18 15.19 -DEPENDS="glibc-base slitaz-base-files" 15.20 - 15.21 # Rules to configure and make the package. 15.22 compile_rules() 15.23 { 15.24 @@ -26,12 +24,6 @@ 15.25 # Rules to gen a SliTaz package suitable for Tazpkg. 15.26 genpkg_rules() 15.27 { 15.28 - cook_copy_folders bin libexec 15.29 + copy @std 15.30 + DEPENDS="glibc-base slitaz-base-files" 15.31 } 15.32 - 15.33 -# Restore Busybox symlinks after removing the package 15.34 -post_remove() 15.35 -{ 15.36 - ln -s /bin/busybox /usr/bin/find 15.37 - ln -s /bin/busybox /usr/bin/xargs 15.38 -}
16.1 --- a/gawk/receipt Mon Jun 05 19:31:24 2017 +0000 16.2 +++ b/gawk/receipt Tue Jun 06 17:37:54 2017 +0300 16.3 @@ -1,9 +1,9 @@ 16.4 -# SliTaz package receipt. 16.5 +# SliTaz package receipt v2. 16.6 16.7 PACKAGE="gawk" 16.8 -VERSION="4.1.3" 16.9 +VERSION="4.1.4" 16.10 CATEGORY="development" 16.11 -SHORT_DESC="GNU awk to handle simple data-reformatting." 16.12 +SHORT_DESC="GNU awk to handle simple data-reformatting" 16.13 MAINTAINER="pankso@slitaz.org" 16.14 LICENSE="GPL3" 16.15 WEB_SITE="http://www.gnu.org/software/gawk/" 16.16 @@ -12,8 +12,8 @@ 16.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 16.18 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 16.19 16.20 -DEPENDS="readline" 16.21 BUILD_DEPENDS="readline-dev gettext" 16.22 +SPLIT="gawk-dev" 16.23 16.24 # Rules to compile & install the temporary toolchain. 16.25 cook_tmp_toolchain() 16.26 @@ -31,17 +31,11 @@ 16.27 # Rules to gen a SliTaz package suitable for Tazpkg. 16.28 genpkg_rules() 16.29 { 16.30 - cook_copy_folders bin lib awk 16.31 + case $PACKAGE in 16.32 + gawk) 16.33 + copy @std 16.34 + DEPENDS="readline" 16.35 + ;; 16.36 + *-dev) copy @dev;; 16.37 + esac 16.38 } 16.39 - 16.40 -# Pre and post install commands for Tazpkg. 16.41 -# We must remove all Busybox symlink before installing. 16.42 -pre_install() 16.43 -{ 16.44 - rm -f "$1/usr/bin/awk" 16.45 -} 16.46 - 16.47 -post_remove() 16.48 -{ 16.49 - ln -s /bin/busybox "$1/usr/bin/awk" 16.50 -}
17.1 --- a/gcc-lib-base/description.txt Mon Jun 05 19:31:24 2017 +0000 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,3 +0,0 @@ 17.4 -The GNU Compiler Collection includes front ends for C, C++, Objective-C, 17.5 -Fortran, Java, Ada, and Go, as well as libraries for these languages 17.6 -(libstdc++, libgcj,...).
18.1 --- a/gcc-lib-base/receipt Mon Jun 05 19:31:24 2017 +0000 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,31 +0,0 @@ 18.4 -# SliTaz package receipt. 18.5 - 18.6 -PACKAGE="gcc-lib-base" 18.7 -VERSION="6.2.0" 18.8 -CATEGORY="development" 18.9 -SHORT_DESC="GCC base libraries, libgcc_s and libstdc++." 18.10 -WEB_SITE="http://gcc.gnu.org/" 18.11 -MAINTAINER="pankso@slitaz.org" 18.12 -LICENSE="GPL2" 18.13 -HOST_ARCH="i486 arm" 18.14 - 18.15 -WANTED="gcc" 18.16 - 18.17 -# Handle multiarch compilation. 18.18 -case "$ARCH" in 18.19 - arm) WANTED="" ;; 18.20 -esac 18.21 - 18.22 -# Rules to gen a SliTaz package suitable for Tazpkg. 18.23 -genpkg_rules() 18.24 -{ 18.25 - mkdir -p $fs/usr/lib 18.26 - case "$ARCH" in 18.27 - arm) libdir=$CROSS_TREE/tools/arm-slitaz-linux-gnueabi/lib ;; 18.28 - i?86) libdir=$install/usr/lib ;; 18.29 - esac 18.30 - cp -a $libdir/libgcc_s.so* $fs/usr/lib 18.31 - cp -a $libdir/libstdc++.so* $fs/usr/lib 18.32 - rm -f $fs/usr/lib/*-gdb.py 18.33 -} 18.34 -
19.1 --- a/gcc-lib-math/receipt Mon Jun 05 19:31:24 2017 +0000 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,28 +0,0 @@ 19.4 -# SliTaz package receipt. 19.5 - 19.6 -PACKAGE="gcc-lib-math" 19.7 -VERSION="6.2.0" 19.8 -CATEGORY="development" 19.9 -SHORT_DESC="GCC math libraries, libquadmath." 19.10 -WEB_SITE="http://gcc.gnu.org/" 19.11 -MAINTAINER="pankso@slitaz.org" 19.12 -LICENSE="GPL2" 19.13 -WANTED="gcc" 19.14 -HOST_ARCH="i486 arm" 19.15 - 19.16 -# Handle multiarch compilation. 19.17 -case "$ARCH" in 19.18 - arm) WANTED="" ;; 19.19 -esac 19.20 - 19.21 -# Rules to gen a SliTaz package suitable for Tazpkg. 19.22 -genpkg_rules() 19.23 -{ 19.24 - mkdir -p $fs/usr/lib 19.25 - case "$ARCH" in 19.26 - arm) libdir=$CROSS_TREE/tools/arm-slitaz-linux-gnueabi/lib ;; 19.27 - i?86) libdir=$install/usr/lib ;; 19.28 - esac 19.29 - cp -a $libdir/libquadmath.so* $fs/usr/lib 19.30 -} 19.31 -
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/gcc/description.gcc-lib-base.txt Tue Jun 06 17:37:54 2017 +0300 20.3 @@ -0,0 +1,3 @@ 20.4 +The GNU Compiler Collection includes front ends for C, C++, Objective-C, 20.5 +Fortran, Java, Ada, and Go, as well as libraries for these languages 20.6 +(libstdc++, libgcj,...).
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/gcc/description.gcc.txt Tue Jun 06 17:37:54 2017 +0300 21.3 @@ -0,0 +1,3 @@ 21.4 +The GNU Compiler Collection includes front ends for C, C++, Objective-C, 21.5 +Fortran, Java, Ada, and Go, as well as libraries for these languages (libstdc++, 21.6 +libgcj,...).
22.1 --- a/gcc/description.txt Mon Jun 05 19:31:24 2017 +0000 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,3 +0,0 @@ 22.4 -The GNU Compiler Collection includes front ends for C, C++, Objective-C, 22.5 -Fortran, Java, Ada, and Go, as well as libraries for these languages (libstdc++, 22.6 -libgcj,...).
23.1 --- a/gcc/receipt Mon Jun 05 19:31:24 2017 +0000 23.2 +++ b/gcc/receipt Tue Jun 06 17:37:54 2017 +0300 23.3 @@ -1,22 +1,19 @@ 23.4 -# SliTaz package receipt. 23.5 +# SliTaz package receipt v2. 23.6 23.7 PACKAGE="gcc" 23.8 -VERSION="6.2.0" 23.9 +VERSION="6.3.0" 23.10 CATEGORY="development" 23.11 -SHORT_DESC="The GNU Compiler Collection." 23.12 +SHORT_DESC="The GNU Compiler Collection" 23.13 MAINTAINER="pankso@slitaz.org" 23.14 LICENSE="GPL2" 23.15 WEB_SITE="http://gcc.gnu.org/" 23.16 +#HOST_ARCH="i486 arm" 23.17 + 23.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 23.19 WGET_URL="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$TARBALL" 23.20 -TAGS="compiler C" 23.21 -#HOST_ARCH="i486 arm" 23.22 23.23 -# We need gawk since busybox awk is not sufficient. We have BUILD_DEPENDS 23.24 -# for cookutils that are not used by tazwok/cook-toolchain since it installs 23.25 -# and uses its own copy. 23.26 -DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils" 23.27 BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev" 23.28 +SPLIT="gcc-lib-base gcc-lib-math gfortran libgfortran libgomp libobjc" 23.29 23.30 # Handle cross compilation (native i486/ARM gcc) 23.31 case "$ARCH" in 23.32 @@ -64,8 +61,8 @@ 23.33 --enable-clocale=gnu \ 23.34 --enable-threads=posix \ 23.35 --disable-bootstrap \ 23.36 - ${CONFIGURE_ARGS} && 23.37 - make && make install ;; 23.38 + ${CONFIGURE_ARGS} 23.39 + ;; 23.40 *) 23.41 # Used by default to produce a full featured X86 GCC compiler. 23.42 echo "cook: configure GCC for: final/full build" 23.43 @@ -82,44 +79,81 @@ 23.44 --enable-threads=posix \ 23.45 --disable-bootstrap \ 23.46 --with-pkgversion="$pkgversion" \ 23.47 - ${CONFIGURE_ARGS} ${ARCH_ARGS} && 23.48 - make && make install ;; 23.49 + ${CONFIGURE_ARGS} ${ARCH_ARGS} 23.50 + ;; 23.51 + esac && 23.52 + make && make install 23.53 + 23.54 + # ARM packages use another libs... 23.55 + case "$ARCH" in 23.56 + arm) 23.57 + libdir="$CROSS_TREE/tools/arm-slitaz-linux-gnueabi/lib" 23.58 + cp -af $libdir/libgcc_s.so* $install/usr/lib # for gcc-lib-base 23.59 + cp -af $libdir/libstdc++.so* $install/usr/lib 23.60 + cp -af $libdir/libquadmath.so* $install/usr/lib # for gcc-lib-math 23.61 + ;; 23.62 esac 23.63 } 23.64 23.65 # Rules to gen a SliTaz package suitable for Tazpkg. 23.66 genpkg_rules() 23.67 { 23.68 - mkdir -p $fs/usr/share 23.69 - cp -a $install/usr/bin $fs/usr 23.70 + case $PACKAGE in 23.71 + gcc) 23.72 + copy bin/ lib/ include/ 23.73 + rm -f \ 23.74 + $fs/usr/lib/libgcc_s.so* \ 23.75 + $fs/usr/lib/libstdc++.so* \ 23.76 + $fs/usr/lib/libquadmath.so* \ 23.77 + $fs/usr/lib/libgfortran.* \ 23.78 + $fs/usr/lib/libgomp.so* \ 23.79 + $fs/usr/lib/libobjc.so* 23.80 + $fs/usr/bin/*gfortran \ 23.81 + $fs/usr/lib/gcc/$HOST_SYSTEM/$VERSION/f951 23.82 + rm -rf \ 23.83 + $fs/usr/lib/gcc/$HOST_SYSTEM/$VERSION/finclude 23.84 23.85 - # Copy all libs. Remove libgcc_s.so and libstdc++.so they goes in 23.86 - # the gcc-lib-base package. 23.87 - cp -a $install/usr/lib $fs/usr 23.88 - rm -f $fs/usr/lib/libgcc_s.so* 23.89 - rm -f $fs/usr/lib/libstdc++.so* 23.90 - rm -f $fs/usr/lib/libgomp.so* 23.91 - rm -f $fs/usr/lib/libobjc.so* 23.92 - 23.93 - # Include files. 23.94 - cp -a $install/usr/include $fs/usr 23.95 - 23.96 - # Gfortran goes in gfortran package. 23.97 - rm -f $fs/usr/bin/*gfortran 23.98 - rm -f $fs/usr/lib/libgfortran* 23.99 - rm -f $fs/usr/lib/gcc/*/$VERSION/libgfortran* 23.100 - rm -rf $fs/usr/lib/gcc/*/$VERSION/f* 23.101 - 23.102 - # Remove build directory. 23.103 - rm -rf $WOK/$PACKAGE/source/$PACKAGE-build 23.104 - rm -rf $WOK/$PACKAGE/$PACKAGE-build 23.105 + # Remove build directory. 23.106 + rm -rf $WOK/$PACKAGE/source/$PACKAGE-build 23.107 + rm -rf $WOK/$PACKAGE/$PACKAGE-build 23.108 + DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils" 23.109 + TAGS="compiler C" 23.110 + ;; 23.111 + gcc-lib-base) 23.112 + copy libgcc_s.so* libstdc++.so* 23.113 + rm $fs/usr/lib/*.py 23.114 + CAT="development|base libraries" 23.115 + ;; 23.116 + gcc-lib-math) 23.117 + copy libquadmath.so* 23.118 + CAT="development|math libraries" 23.119 + ;; 23.120 + gfortran) 23.121 + copy *gfortran libgfortran.* f951 finclude/ 23.122 + rm $fs/usr/lib/libgfortran.so* 23.123 + CAT="development|fortran extension" 23.124 + TAGS="compiler fortran" 23.125 + DEPENDS="gcc libgfortran" 23.126 + ;; 23.127 + libgfortran) 23.128 + copy libgfortran.so* 23.129 + CAT="libdevel|fortran runtime" 23.130 + ;; 23.131 + libgomp) 23.132 + copy libgomp.so* 23.133 + CAT="development|API specification for parallel programming" 23.134 + ;; 23.135 + libobjc) 23.136 + copy libobjc.so* 23.137 + CATEGORY="libdevel|API for gcc object" 23.138 + DEPENDS="gcc-lib-base" 23.139 + ;; 23.140 + esac 23.141 } 23.142 23.143 # Post install commands for Tazpkg. 23.144 -post_install() 23.145 +post_install_gcc() 23.146 { 23.147 - [ -f "$1/lib/cpp" ] || 23.148 - ln -s ../usr/bin/cpp "$1/lib" 23.149 - [ -f "$1/usr/bin/cc" ] || 23.150 - ln -s gcc "$1/usr/bin/cc" 23.151 + [ -f "$1/lib/cpp" ] || ln -s ../usr/bin/cpp "$1/lib" 23.152 + [ -f "$1/usr/bin/cc" ] || ln -s gcc "$1/usr/bin/cc" 23.153 }
24.1 --- a/gcc/stuff/gcc-4.5.2-startfiles_fix-1.patch Mon Jun 05 19:31:24 2017 +0000 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,33 +0,0 @@ 24.4 -Submitted By: Jeremy Huntwork (jhuntwork AT linuxfromscratch DOT org) 24.5 -Date: 2008-12-05 24.6 -Initial Package Version: 4.3.2 24.7 -Upstream Status: See below. 24.8 -Origin: DIY Linux, See below. 24.9 -Description: Original patch follows: 24.10 - 24.11 -# DIY Linux Patch 24.12 -Date: 2008-09-09 24.13 -Author: Refer Origin. 24.14 -Origin: Partial revert of http://gcc.gnu.org/ml/gcc-cvs/2006-11/msg00416.html 24.15 -Maker: Greg Schafer <gschafer@zip.com.au> 24.16 -Upstream Status: Not applicable. Tweak only for Temptools phase GCC-Pass2. 24.17 -Description: Partially revert GCC driver to pre-GCC-4.3 state to allow startfiles to be 24.18 - found in $prefix when GCC is configured for a non-standard prefix eg: /temptools. Full 24.19 - background info in thread starting here: http://gcc.gnu.org/ml/gcc/2008-03/msg00095.html 24.20 - and GCC bugzilla here: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35532 24.21 - 24.22 -diff -Naur gcc-4.3.0-RC-20080222.orig/gcc/gcc.c gcc-4.3.0-RC-20080222/gcc/gcc.c 24.23 ---- gcc-4.3.0-RC-20080222.orig/gcc/gcc.c 2008-01-24 18:57:12.000000000 +0000 24.24 -+++ gcc-4.3.0-RC-20080222/gcc/gcc.c 2008-03-02 06:07:36.000000000 +0000 24.25 -@@ -6370,6 +6370,11 @@ 24.26 - machine_suffix, 24.27 - standard_startfile_prefix, NULL), 24.28 - NULL, PREFIX_PRIORITY_LAST, 0, 1); 24.29 -+ add_prefix (&startfile_prefixes, 24.30 -+ concat (standard_exec_prefix, 24.31 -+ machine_suffix, 24.32 -+ standard_startfile_prefix, NULL), 24.33 -+ NULL, PREFIX_PRIORITY_LAST, 0, 1); 24.34 - } 24.35 - 24.36 - /* Sysrooted prefixes are relocated because target_system_root is
25.1 --- a/gettext-base/description.txt Mon Jun 05 19:31:24 2017 +0000 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,3 +0,0 @@ 25.4 -This package offers to programmers, translators, and even users, a well 25.5 -integrated set of tools and documentation to develop native language support for 25.6 -applications.
26.1 --- a/gettext-base/receipt Mon Jun 05 19:31:24 2017 +0000 26.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 26.3 @@ -1,26 +0,0 @@ 26.4 -# SliTaz package receipt. 26.5 - 26.6 -PACKAGE="gettext-base" 26.7 -VERSION="0.19.8.1" 26.8 -CATEGORY="base-system" 26.9 -SHORT_DESC="Base tools from the GNU Translation Project." 26.10 -MAINTAINER="pankso@slitaz.org" 26.11 -LICENSE="GPL3" 26.12 -WEB_SITE="http://www.gnu.org/software/gettext/" 26.13 -HOST_ARCH="i486 arm" 26.14 - 26.15 -DEPENDS="glibc-base" 26.16 -WANTED="gettext" 26.17 - 26.18 -# Just to be sure when cross compiling, gettext is part of base system. 26.19 -testsuite() 26.20 -{ 26.21 - readelf -h $install/usr/bin/gettext 26.22 -} 26.23 - 26.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 26.25 -genpkg_rules() 26.26 -{ 26.27 - cook_copy_files gettext ngettext envsubst 26.28 - install -m755 $stuff/gettext.sh $fs/usr/bin 26.29 -}
27.1 --- a/gettext-base/stuff/gettext.sh Mon Jun 05 19:31:24 2017 +0000 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,7 +0,0 @@ 27.4 -#!/bin/sh 27.5 -eval_gettext() { 27.6 - gettext "$1" | (export PATH $(envsubst --variables "$1"); envsubst "$1") 27.7 -} 27.8 -eval_ngettext() { 27.9 - ngettext "$1" "$2" "$3" | (export PATH $(envsubst --variables "$1 $2"); envsubst "$1 $2") 27.10 -}
28.1 --- a/gettext-tools/description.txt Mon Jun 05 19:31:24 2017 +0000 28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 28.3 @@ -1,7 +0,0 @@ 28.4 -This package is a part of GNU gettext, it contains: 28.5 - 28.6 - * `xgettext`: Extract translatable strings from given input files 28.7 - * `msgmerge`: Merges two Uniforum style .po files together 28.8 - * `msgfmt`: Generate binary message catalog from textual translation 28.9 - description 28.10 - * `msgcat`: Concatenates and merges the specified PO files
29.1 --- a/gettext-tools/receipt Mon Jun 05 19:31:24 2017 +0000 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,19 +0,0 @@ 29.4 -# SliTaz package receipt. 29.5 - 29.6 -PACKAGE="gettext-tools" 29.7 -VERSION="0.19.8.1" 29.8 -CATEGORY="libs" 29.9 -SHORT_DESC="GNU gettext tools to manage translations" 29.10 -MAINTAINER="al.bobylev@gmail.com" 29.11 -LICENSE="GPL3" 29.12 -WEB_SITE="http://www.gnu.org/software/gettext/" 29.13 - 29.14 -WANTED="gettext" 29.15 -DEPENDS="acl attr glib libcroco libgomp liblzma libxml2 pcre zlib" 29.16 - 29.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 29.18 -genpkg_rules() 29.19 -{ 29.20 - cook_copy_files msgcat msgfmt msgmerge xgettext libgettextlib*.so* \ 29.21 - libgettextsrc*.so* 29.22 -}
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/gettext/description.gettext-base.txt Tue Jun 06 17:37:54 2017 +0300 30.3 @@ -0,0 +1,3 @@ 30.4 +This package offers to programmers, translators, and even users, a well 30.5 +integrated set of tools and documentation to develop native language support for 30.6 +applications.
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/gettext/description.gettext-tools.txt Tue Jun 06 17:37:54 2017 +0300 31.3 @@ -0,0 +1,7 @@ 31.4 +This package is a part of GNU gettext, it contains: 31.5 + 31.6 + * `xgettext`: Extract translatable strings from given input files 31.7 + * `msgmerge`: Merges two Uniforum style .po files together 31.8 + * `msgfmt`: Generate binary message catalog from textual translation 31.9 + description 31.10 + * `msgcat`: Concatenates and merges the specified PO files
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/gettext/description.gettext.txt Tue Jun 06 17:37:54 2017 +0300 32.3 @@ -0,0 +1,17 @@ 32.4 +This is the GNU gettext package. It is interesting for authors or maintainers of 32.5 +other packages or programs which they want to see internationalized. As one step 32.6 +the handling of messages in different languages should be implemented. For this 32.7 +task GNU gettext provides the needed tools and library functions. 32.8 + 32.9 +It is also interesting for translators, because GNU gettext provides the 32.10 +'msgmerge' program, which prepares a message catalog before a translation 32.11 +update. 32.12 + 32.13 +Users of GNU packages should also install GNU gettext because some other GNU 32.14 +packages will use the gettext program included in this package to 32.15 +internationalize the messages given by shell scripts. 32.16 + 32.17 + * [The homepage of this package](http://www.gnu.org/software/gettext/) 32.18 + * [The primary FTP site for its distribution] 32.19 + (ftp://ftp.gnu.org/pub/gnu/gettext/) 32.20 + * Send comments and bug reports to <bug-gnu-gettext@gnu.org>
33.1 --- a/gettext/description.txt Mon Jun 05 19:31:24 2017 +0000 33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 33.3 @@ -1,17 +0,0 @@ 33.4 -This is the GNU gettext package. It is interesting for authors or maintainers of 33.5 -other packages or programs which they want to see internationalized. As one step 33.6 -the handling of messages in different languages should be implemented. For this 33.7 -task GNU gettext provides the needed tools and library functions. 33.8 - 33.9 -It is also interesting for translators, because GNU gettext provides the 33.10 -'msgmerge' program, which prepares a message catalog before a translation 33.11 -update. 33.12 - 33.13 -Users of GNU packages should also install GNU gettext because some other GNU 33.14 -packages will use the gettext program included in this package to 33.15 -internationalize the messages given by shell scripts. 33.16 - 33.17 - * [The homepage of this package](http://www.gnu.org/software/gettext/) 33.18 - * [The primary FTP site for its distribution] 33.19 - (ftp://ftp.gnu.org/pub/gnu/gettext/) 33.20 - * Send comments and bug reports to <bug-gnu-gettext@gnu.org>
34.1 --- a/gettext/receipt Mon Jun 05 19:31:24 2017 +0000 34.2 +++ b/gettext/receipt Tue Jun 06 17:37:54 2017 +0300 34.3 @@ -1,9 +1,9 @@ 34.4 -# SliTaz package receipt. 34.5 +# SliTaz package receipt v2. 34.6 34.7 PACKAGE="gettext" 34.8 VERSION="0.19.8.1" 34.9 CATEGORY="development" 34.10 -SHORT_DESC="Utilities for the GNU Translation Project." 34.11 +SHORT_DESC="Utilities for the GNU Translation Project" 34.12 MAINTAINER="pankso@slitaz.org" 34.13 LICENSE="GPL3" 34.14 WEB_SITE="https://www.gnu.org/software/gettext/" 34.15 @@ -12,16 +12,13 @@ 34.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 34.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 34.18 34.19 -# Runtime depends, then dev-depends 34.20 -DEPENDS="gettext-base gettext-tools libcroco liblzma libxml2 \ 34.21 -acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4" 34.22 BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev" 34.23 +BUILD_DEPENDS_arm="attr-dev ncurses-dev libxml2-tools libxml2-dev" 34.24 SPLIT="gettext-base gettext-tools" 34.25 34.26 # Handle cross compilation. Glibc-locale are installed in cross chroot. 34.27 case "$ARCH" in 34.28 - arm) BUILD_DEPENDS="attr-dev ncurses-dev libxml2-tools libxml2-dev" 34.29 - ARCH_ARGS="--disable-acl" ;; 34.30 + arm) ARCH_ARGS="--disable-acl" ;; 34.31 esac 34.32 34.33 # Rules to configure and make the package. 34.34 @@ -29,22 +26,44 @@ 34.35 { 34.36 ./configure $CONFIGURE_ARGS $ARCH_ARGS && 34.37 make && make install 34.38 + 34.39 + # stripped gettext.sh 34.40 + rm $install/usr/bin/gettext.sh 34.41 + install -m755 $stuff/gettext.sh $install/usr/bin 34.42 +} 34.43 + 34.44 +# Just to be sure when cross compiling, gettext is part of base system. 34.45 +testsuite() 34.46 +{ 34.47 + readelf -h $install/usr/bin/gettext 34.48 } 34.49 34.50 # Rules to gen a SliTaz package suitable for Tazpkg. 34.51 genpkg_rules() 34.52 { 34.53 - mkdir -p $fs/usr/share 34.54 - cp -a $install/usr/bin $fs/usr 34.55 - cp -a $install/usr/lib $fs/usr 34.56 - cp -a $install/usr/include $fs/usr 34.57 - cp -a $install/usr/share/aclocal $fs/usr/share 34.58 - cp -a $install/usr/share/gettext $fs/usr/share 34.59 - 34.60 - # Remove "gettext-base" and "gettext-tools" files. 34.61 - for bin in gettext gettext.sh envsubst ngettext msgcat msgfmt msgmerge xgettext; do 34.62 - rm $fs/usr/bin/$bin 34.63 - done 34.64 - rm $fs/usr/lib/libgettextlib*.so* 34.65 - rm $fs/usr/lib/libgettextsrc*.so* 34.66 + case $PACKAGE in 34.67 + gettext) 34.68 + copy @std @dev 34.69 + # Remove "gettext-base" and "gettext-tools" files. 34.70 + for i in gettext gettext.sh envsubst ngettext \ 34.71 + msgcat msgfmt msgmerge xgettext \ 34.72 + libgettextlib*.so* libgettextsrc*.so*; do 34.73 + find $fs -name "$i" -delete 34.74 + done 34.75 + # Runtime depends, then dev-depends 34.76 + DEPENDS="gettext-base gettext-tools libcroco liblzma libxml2 \ 34.77 + acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4" 34.78 + ;; 34.79 + gettext-base) 34.80 + copy gettext gettext.sh envsubst ngettext 34.81 + CAT="base-system|base tools" 34.82 + DEPENDS="glibc-base" 34.83 + ;; 34.84 + gettext-tools) 34.85 + copy msgcat msgfmt msgmerge xgettext \ 34.86 + libgettextlib*.so* libgettextsrc*.so* 34.87 + CAT="libs|tools" 34.88 + DEPENDS="acl attr glib libcroco libgomp liblzma libxml2 pcre zlib" 34.89 + ;; 34.90 + esac 34.91 }
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/gettext/stuff/gettext.sh Tue Jun 06 17:37:54 2017 +0300 35.3 @@ -0,0 +1,7 @@ 35.4 +#!/bin/sh 35.5 +eval_gettext() { 35.6 + gettext "$1" | (export PATH $(envsubst --variables "$1"); envsubst "$1") 35.7 +} 35.8 +eval_ngettext() { 35.9 + ngettext "$1" "$2" "$3" | (export PATH $(envsubst --variables "$1 $2"); envsubst "$1 $2") 35.10 +}
36.1 --- a/gfortran/receipt Mon Jun 05 19:31:24 2017 +0000 36.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 36.3 @@ -1,26 +0,0 @@ 36.4 -# SliTaz package receipt. 36.5 - 36.6 -PACKAGE="gfortran" 36.7 -VERSION="6.2.0" 36.8 -CATEGORY="development" 36.9 -SHORT_DESC="GCC fortran extension." 36.10 -WEB_SITE="http://gcc.gnu.org/" 36.11 -MAINTAINER="pascal.bellard@slitaz.org" 36.12 -LICENSE="GPL2" 36.13 -TAGS="compiler fortran" 36.14 - 36.15 -DEPENDS="gcc libgfortran" 36.16 -WANTED="gcc" 36.17 - 36.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 36.19 -genpkg_rules() 36.20 -{ 36.21 - mkdir -p $fs/usr/lib/gcc/$HOST_SYSTEM/$VERSION $fs/usr/bin 36.22 - cp -a $install/usr/bin/*gfortran $fs/usr/bin 36.23 - cp -a $install/usr/lib/libgfortran*a $fs/usr/lib 36.24 - cp -a $install/usr/lib/libgfortran.spec $fs/usr/lib 36.25 - cp -a $install/usr/lib/gcc/$HOST_SYSTEM/$VERSION/f* \ 36.26 - $fs/usr/lib/gcc/$HOST_SYSTEM/$VERSION 36.27 -# cp -a $install/usr/lib/gcc/$HOST_SYSTEM/$VERSION/libgfortran* \ 36.28 -# $fs/usr/lib/gcc/$HOST_SYSTEM/$VERSION 36.29 -}
37.1 --- a/glibc-base/receipt Mon Jun 05 19:31:24 2017 +0000 37.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 37.3 @@ -1,164 +0,0 @@ 37.4 -# SliTaz package receipt. 37.5 - 37.6 -PACKAGE="glibc-base" 37.7 -VERSION="2.24" 37.8 -CATEGORY="base-system" 37.9 -SHORT_DESC="GNU libc minimal libraries and UTF-8 support for SliTaz." 37.10 -WEB_SITE="http://www.gnu.org/software/libc/" 37.11 -MAINTAINER="pankso@slitaz.org" 37.12 -LICENSE="GPL2" 37.13 -HOST_ARCH="i486 arm x86_64" 37.14 - 37.15 -WANTED="glibc" 37.16 - 37.17 -# Locales include by default, other locales are in: locale-** and glibc-locale 37.18 -DEFAULT_LOCALE="en_US en_GB" 37.19 - 37.20 -# Handle multiarch compilation. 37.21 -case "$ARCH" in 37.22 - arm*|x86_64) VERSION="2.13" WANTED="" ;; 37.23 -esac 37.24 - 37.25 -# Handle multiarch installation. 37.26 -case "$SLITAZ_ARCH" in 37.27 - arm*|x86_64) VERSION="2.13" WANTED="" ;; 37.28 -esac 37.29 - 37.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 37.31 -# 37.32 -# Full glibc is very long to compile (see package glibc for more 37.33 -# informations). You can use the precompiled package available on 37.34 -# SliTaz mirror to build a distro without recompiling glibc. 37.35 -# 37.36 - 37.37 -# i18n 37.38 -get_locales() 37.39 -{ 37.40 - local path=$1 37.41 - for i in $DEFAULT_LOCALE; do 37.42 - cp $install/$path/i18n/locales/$i $fs/usr/share/i18n/locales 37.43 - done 37.44 -} 37.45 - 37.46 -genpkg_rules() 37.47 -{ 37.48 - case "$ARCH" in 37.49 - arm*) 37.50 - # Mkdir's. 37.51 - for dir in $(cat $stuff/mkdir.list) 37.52 - do 37.53 - mkdir -p ${fs}$dir 37.54 - done 37.55 - 37.56 - # Eglibc is cross compiled by cross to have a toolchain so we can 37.57 - # use these files instead of recooking it. ARM use Eglibc 37.58 - echo "Using cross compiled Eglibc..." 37.59 - install=/cross/$ARCH/sysroot 37.60 - 37.61 - # /usr/{bin,share} /usr/lib/gconv 37.62 - for file in $(cat $stuff/arm-files.list) 37.63 - do 37.64 - cp -a ${install}$file ${fs}$file 37.65 - done 37.66 - 37.67 - # libs 37.68 - for lib in libcrypt libm libc libresolv librt libutil libpthread \ 37.69 - libnss_* libnsl libanl libdl 37.70 - do 37.71 - cp -a $install/lib/${lib}-*.so $fs/lib 37.72 - cp -a $install/lib/${lib}.so* $fs/lib 37.73 - cp -a $install/usr/lib/${lib}.so $fs/usr/lib 37.74 - done 37.75 - cp -a $install/lib/ld-*.so* $fs/lib 37.76 - cp -a $install/usr/lib/libc_nonshared.a $fs/usr/lib 37.77 - cp -a $install/usr/lib/libpthread_nonshared.a $fs/usr/lib 37.78 - cp $install/etc/rpc $fs/etc 37.79 - touch $fs/etc/ld.so.conf 37.80 - touch $fs/etc/ld.so.cache 37.81 - get_locales "usr/share" ;; 37.82 - x86_64) 37.83 - # Mkdir's. 37.84 - for dir in $(cat $stuff/mkdir.list) 37.85 - do 37.86 - mkdir -p ${fs}$dir 37.87 - done 37.88 - 37.89 - # EXPERIMENTAL: Glibc is cross compiled by cross to have a 37.90 - # toolchain so we can use these files instead of recooking it. 37.91 - echo "Using cross compiled Glibc..." 37.92 - install=/usr/cross/$ARCH 37.93 - 37.94 - # /usr/{bin,share} /usr/lib/gconv 37.95 - for file in $(cat $stuff/arm-files.list) 37.96 - do 37.97 - cp -a ${install}$file ${fs}/usr/$file 37.98 - done 37.99 - 37.100 - # /lib 37.101 - for lib in libcrypt libm libc libresolv librt libutil libpthread \ 37.102 - libnss_* libnsl libanl libdl 37.103 - do 37.104 - cp -a $install/lib/${lib}-*.so $fs/lib 37.105 - cp -a $install/lib/${lib}.so* $fs/lib 37.106 - done 37.107 - cp -a $install/lib/ld-*.so* $fs/lib 37.108 - cp -a $install/lib/libc_nonshared.a $fs/lib 37.109 - cp -a $install/lib/libpthread_nonshared.a $fs/lib 37.110 - cp $install/etc/rpc $fs/etc 37.111 - touch $fs/etc/ld.so.conf 37.112 - get_locales "share" 37.113 - # Fix libraries search path 37.114 - sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so 37.115 - sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libpthread.so ;; 37.116 - *) 37.117 - cook_copy_files \ 37.118 - ld-*.so* ld.so* \ 37.119 - libanl-*.so* libanl.so* \ 37.120 - libc-*.so* libc.so* \ 37.121 - libcrypt-*.so* libcrypt.so* \ 37.122 - libdl-*.so* libdl.so* \ 37.123 - libm-*.so* libm.so* \ 37.124 - libnsl-*.so* libnsl.so* \ 37.125 - libnss_compat-*.so* libnss_compat.so* \ 37.126 - libnss_dns-*.so* libnss_dns.so* \ 37.127 - libnss_files-*.so* libnss_files.so* \ 37.128 - libpthread-*.so* libpthread.so* \ 37.129 - libresolv-*.so* libresolv.so* \ 37.130 - librt-*.so* librt.so* \ 37.131 - libthread_db-*.so* libthread_db.so* \ 37.132 - libutil-*.so* libutil.so* \ 37.133 - \ 37.134 - UNICODE.so gconv-modules ANSI_X3.110.so ISO8859-1.so \ 37.135 - ISO8859-15.so UTF-16.so CP1252.so IBM437.so IBM850.so \ 37.136 - \ 37.137 - i18n iso14651_t1 iso14651_t1_common translit_neutral \ 37.138 - translit_combining translit_circle translit_cjk_compat \ 37.139 - translit_compat translit_font translit_fraction translit_narrow \ 37.140 - translit_small translit_wide \ 37.141 - \ 37.142 - locale localedef locale.alias UTF-8.gz UTC rpc \ 37.143 - $DEFAULT_LOCALE 37.144 - mkdir -p $fs/etc 37.145 - cp $stuff/nsswitch.conf $fs/etc 37.146 - esac 37.147 -} 37.148 - 37.149 -# Remove an eventual locale-archive since we use directories. 37.150 -pre_install() 37.151 -{ 37.152 - rm -f $root/usr/lib/locale/locale-archive 37.153 -} 37.154 - 37.155 -# Glibc-base is auto-updated in chroot but when cross-compiling we need 37.156 -# to have /usr/cross/$ARCH search path in libc.so 37.157 -post_install() 37.158 -{ 37.159 - # x86_64 37.160 - if echo $root | grep -q /usr/cross/x86_64; then 37.161 - echo "Fixing x86_64: $root/lib/libc.so" 37.162 - cat > $root/lib/libc.so << EOT 37.163 -OUTPUT_FORMAT(elf64-x86-64) 37.164 -GROUP ( $root/lib/libc.so.6 $root/lib/libc_nonshared.a AS_NEEDED ( $root/lib/ld-linux-x86-64.so.2 ) ) 37.165 -EOT 37.166 - fi 37.167 -}
38.1 --- a/glibc-base/stuff/arm-files.list Mon Jun 05 19:31:24 2017 +0000 38.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 38.3 @@ -1,41 +0,0 @@ 38.4 -/usr/lib/gconv/UNICODE.so 38.5 -/usr/lib/gconv/gconv-modules 38.6 -/usr/lib/gconv/ANSI_X3.110.so 38.7 -/usr/lib/gconv/ISO8859-1.so 38.8 -/usr/lib/gconv/ISO8859-15.so 38.9 -/usr/lib/gconv/UTF-16.so 38.10 -/usr/lib/gconv/CP1252.so 38.11 -/usr/lib/gconv/IBM437.so 38.12 -/usr/lib/gconv/IBM850.so 38.13 - 38.14 -/usr/bin/locale 38.15 -/usr/bin/localedef 38.16 - 38.17 -/usr/share/locale/locale.alias 38.18 -/usr/share/i18n/charmaps/UTF-8.gz 38.19 - 38.20 -/usr/share/i18n/locales/i18n 38.21 -/usr/share/i18n/locales/iso14651_t1 38.22 -/usr/share/i18n/locales/iso14651_t1_common 38.23 -/usr/share/i18n/locales/translit_neutral 38.24 -/usr/share/i18n/locales/translit_combining 38.25 -/usr/share/i18n/locales/translit_circle 38.26 -/usr/share/i18n/locales/translit_cjk_compat 38.27 -/usr/share/i18n/locales/translit_compat 38.28 -/usr/share/i18n/locales/translit_font 38.29 -/usr/share/i18n/locales/translit_fraction 38.30 -/usr/share/i18n/locales/translit_narrow 38.31 -/usr/share/i18n/locales/translit_small 38.32 -/usr/share/i18n/locales/translit_wide 38.33 - 38.34 -/usr/share/zoneinfo/Europe/Madrid 38.35 -/usr/share/zoneinfo/Europe/London 38.36 -/usr/share/zoneinfo/Europe/Zurich 38.37 -/usr/share/zoneinfo/Europe/Paris 38.38 -/usr/share/zoneinfo/UTC 38.39 -/usr/share/zoneinfo/CET 38.40 -/usr/share/zoneinfo/America/Montreal 38.41 -/usr/share/zoneinfo/America/New_York 38.42 -/usr/share/zoneinfo/America/Los_Angeles 38.43 -/usr/share/zoneinfo/America/Sao_Paulo 38.44 -/usr/share/zoneinfo/America/Mexico_City
39.1 --- a/glibc-base/stuff/i486-files.list Mon Jun 05 19:31:24 2017 +0000 39.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 39.3 @@ -1,80 +0,0 @@ 39.4 -/lib/libutil-2.14.1.so 39.5 -/lib/libnss_dns-2.14.1.so 39.6 -/lib/libnsl-2.14.1.so 39.7 -/lib/libanl-2.14.1.so 39.8 -/lib/libm-2.14.1.so 39.9 -/lib/libpthread-2.14.1.so 39.10 -/lib/libthread_db-1.0.so 39.11 -/lib/libnss_compat-2.14.1.so 39.12 -/lib/libc-2.14.1.so 39.13 -/lib/librt-2.14.1.so 39.14 -/lib/libcrypt-2.14.1.so 39.15 -/lib/ld-2.14.1.so 39.16 -/lib/libresolv-2.14.1.so 39.17 -/lib/libnss_files-2.14.1.so 39.18 -/lib/libdl-2.14.1.so 39.19 - 39.20 -/usr/lib/gconv/UNICODE.so 39.21 -/usr/lib/gconv/gconv-modules 39.22 -/usr/lib/gconv/ANSI_X3.110.so 39.23 -/usr/lib/gconv/ISO8859-1.so 39.24 -/usr/lib/gconv/ISO8859-15.so 39.25 -/usr/lib/gconv/UTF-16.so 39.26 -/usr/lib/gconv/CP1252.so 39.27 -/usr/lib/gconv/IBM437.so 39.28 -/usr/lib/gconv/IBM850.so 39.29 - 39.30 -/usr/bin/locale 39.31 -/usr/bin/localedef 39.32 - 39.33 -/usr/share/locale/locale.alias 39.34 -/usr/share/i18n/charmaps/UTF-8.gz 39.35 - 39.36 -/usr/share/i18n/locales/i18n 39.37 -/usr/share/i18n/locales/iso14651_t1 39.38 -/usr/share/i18n/locales/iso14651_t1_common 39.39 -/usr/share/i18n/locales/translit_neutral 39.40 -/usr/share/i18n/locales/translit_combining 39.41 -/usr/share/i18n/locales/translit_circle 39.42 -/usr/share/i18n/locales/translit_cjk_compat 39.43 -/usr/share/i18n/locales/translit_compat 39.44 -/usr/share/i18n/locales/translit_font 39.45 -/usr/share/i18n/locales/translit_fraction 39.46 -/usr/share/i18n/locales/translit_narrow 39.47 -/usr/share/i18n/locales/translit_small 39.48 -/usr/share/i18n/locales/translit_wide 39.49 - 39.50 -/usr/share/zoneinfo/UTC 39.51 - 39.52 -/etc/rpc 39.53 -/etc/ld.so.conf 39.54 -/etc/ld.so.cache 39.55 - 39.56 -/lib/libc.so.6 39.57 -/lib/librt.so.1 39.58 -/lib/libdl.so.2 39.59 -/lib/libanl.so.1 39.60 -/lib/libutil.so.1 39.61 -/lib/libnss_dns.so.2 39.62 -/lib/libnss_compat.so.2 39.63 -/lib/libcrypt.so.1 39.64 -/lib/libpthread.so.0 39.65 -/lib/libthread_db.so.1 39.66 -/lib/libm.so.6 39.67 -/lib/ld-linux.so.2 39.68 -/lib/libresolv.so.2 39.69 -/lib/libnsl.so.1 39.70 -/lib/libnss_files.so.2 39.71 - 39.72 -/usr/lib/libnss_dns.so 39.73 -/usr/lib/libnss_files.so 39.74 -/usr/lib/libcrypt.so 39.75 -/usr/lib/libnss_compat.so 39.76 -/usr/lib/libdl.so 39.77 -/usr/lib/libm.so 39.78 -/usr/lib/librt.so 39.79 -/usr/lib/libresolv.so 39.80 -/usr/lib/libnsl.so 39.81 -/usr/lib/libutil.so 39.82 -/usr/lib/libanl.so 39.83 -/usr/lib/libthread_db.so
40.1 --- a/glibc-base/stuff/mkdir.list Mon Jun 05 19:31:24 2017 +0000 40.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 40.3 @@ -1,10 +0,0 @@ 40.4 -/etc 40.5 -/lib 40.6 -/usr/bin 40.7 -/usr/lib/gconv 40.8 -/usr/lib/locale 40.9 -/usr/share/zoneinfo/America 40.10 -/usr/share/zoneinfo/Europe 40.11 -/usr/share/i18n/locales 40.12 -/usr/share/i18n/charmaps 40.13 -/usr/share/locale
41.1 --- a/glibc-base/stuff/nsswitch.conf Mon Jun 05 19:31:24 2017 +0000 41.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 41.3 @@ -1,15 +0,0 @@ 41.4 -# Begin /etc/nsswitch.conf 41.5 - 41.6 -passwd: files 41.7 -group: files 41.8 -shadow: files 41.9 - 41.10 -hosts: files dns 41.11 -networks: files 41.12 - 41.13 -protocols: files 41.14 -services: files 41.15 -ethers: files 41.16 -rpc: files 41.17 - 41.18 -# End /etc/nsswitch.conf
42.1 --- a/glibc-base/stuff/wanted-files.list Mon Jun 05 19:31:24 2017 +0000 42.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 42.3 @@ -1,80 +0,0 @@ 42.4 -/lib/libutil-2.14.1.so 42.5 -/lib/libnss_dns-2.14.1.so 42.6 -/lib/libnsl-2.14.1.so 42.7 -/lib/libanl-2.14.1.so 42.8 -/lib/libm-2.14.1.so 42.9 -/lib/libpthread-2.14.1.so 42.10 -/lib/libthread_db-1.0.so 42.11 -/lib/libnss_compat-2.14.1.so 42.12 -/lib/libc-2.14.1.so 42.13 -/lib/librt-2.14.1.so 42.14 -/lib/libcrypt-2.14.1.so 42.15 -/lib/ld-2.14.1.so 42.16 -/lib/libresolv-2.14.1.so 42.17 -/lib/libnss_files-2.14.1.so 42.18 -/lib/libdl-2.14.1.so 42.19 - 42.20 -/usr/lib/gconv/UNICODE.so 42.21 -/usr/lib/gconv/gconv-modules 42.22 -/usr/lib/gconv/ANSI_X3.110.so 42.23 -/usr/lib/gconv/ISO8859-1.so 42.24 -/usr/lib/gconv/ISO8859-15.so 42.25 -/usr/lib/gconv/UTF-16.so 42.26 -/usr/lib/gconv/CP1252.so 42.27 -/usr/lib/gconv/IBM437.so 42.28 -/usr/lib/gconv/IBM850.so 42.29 - 42.30 -/usr/bin/locale 42.31 -/usr/bin/localedef 42.32 - 42.33 -/usr/share/locale/locale.alias 42.34 -/usr/share/i18n/charmaps/UTF-8.gz 42.35 - 42.36 -/usr/share/i18n/locales/i18n 42.37 -/usr/share/i18n/locales/iso14651_t1 42.38 -/usr/share/i18n/locales/iso14651_t1_common 42.39 -/usr/share/i18n/locales/translit_neutral 42.40 -/usr/share/i18n/locales/translit_combining 42.41 -/usr/share/i18n/locales/translit_circle 42.42 -/usr/share/i18n/locales/translit_cjk_compat 42.43 -/usr/share/i18n/locales/translit_compat 42.44 -/usr/share/i18n/locales/translit_font 42.45 -/usr/share/i18n/locales/translit_fraction 42.46 -/usr/share/i18n/locales/translit_narrow 42.47 -/usr/share/i18n/locales/translit_small 42.48 -/usr/share/i18n/locales/translit_wide 42.49 - 42.50 -/usr/share/zoneinfo/UTC 42.51 - 42.52 -/etc/rpc 42.53 -/etc/ld.so.conf 42.54 -/etc/ld.so.cache 42.55 - 42.56 -/lib/libc.so.6 42.57 -/lib/librt.so.1 42.58 -/lib/libdl.so.2 42.59 -/lib/libanl.so.1 42.60 -/lib/libutil.so.1 42.61 -/lib/libnss_dns.so.2 42.62 -/lib/libnss_compat.so.2 42.63 -/lib/libcrypt.so.1 42.64 -/lib/libpthread.so.0 42.65 -/lib/libthread_db.so.1 42.66 -/lib/libm.so.6 42.67 -/lib/ld-linux.so.2 42.68 -/lib/libresolv.so.2 42.69 -/lib/libnsl.so.1 42.70 -/lib/libnss_files.so.2 42.71 - 42.72 -/usr/lib/libnss_dns.so 42.73 -/usr/lib/libnss_files.so 42.74 -/usr/lib/libcrypt.so 42.75 -/usr/lib/libnss_compat.so 42.76 -/usr/lib/libdl.so 42.77 -/usr/lib/libm.so 42.78 -/usr/lib/librt.so 42.79 -/usr/lib/libresolv.so 42.80 -/usr/lib/libnsl.so 42.81 -/usr/lib/libutil.so 42.82 -/usr/lib/libanl.so 42.83 -/usr/lib/libthread_db.so
43.1 --- a/glibc-dev/receipt Mon Jun 05 19:31:24 2017 +0000 43.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 43.3 @@ -1,38 +0,0 @@ 43.4 -# SliTaz package receipt. 43.5 - 43.6 -PACKAGE="glibc-dev" 43.7 -VERSION="2.24" 43.8 -CATEGORY="development" 43.9 -SHORT_DESC="The GNU C libraries devel files (Part of SliTaz toolchain)." 43.10 -MAINTAINER="pankso@slitaz.org" 43.11 -LICENSE="GPL2" 43.12 -WEB_SITE="http://www.gnu.org/software/libc/" 43.13 - 43.14 -WANTED="glibc" 43.15 -DEPENDS="glibc-base" 43.16 - 43.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 43.18 -# 43.19 -# This package is part of the toolchain. We use list to mkdir and cp files. 43.20 -# 43.21 -genpkg_rules() 43.22 -{ 43.23 - # Mass copy and then remove all files specified in stuff/base-files.list. 43.24 - # We get the files from glibc-base. Locale files are in: glibc-locale. 43.25 - cp -a $install/* $fs 43.26 - 43.27 - action "Removing all glibc-base files..." 43.28 - for file in $(cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list); do 43.29 - rm -f ${fs}$file 43.30 - done 43.31 - rm -rf $fs/etc 43.32 - rm -rf $fs/usr/share 43.33 - status 43.34 - 43.35 - action "Removing all glibc-locale files..." 43.36 - for file in $(cat $WOK/glibc-locale/taz/glibc-locale-$VERSION/files.list); do 43.37 - rm -f ${fs}$file 43.38 - done 43.39 - rm -rf $fs/usr/lib/gconv 43.40 - status 43.41 -}
44.1 --- a/glibc-locale/receipt Mon Jun 05 19:31:24 2017 +0000 44.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 44.3 @@ -1,36 +0,0 @@ 44.4 -# SliTaz package receipt. 44.5 - 44.6 -PACKAGE="glibc-locale" 44.7 -VERSION="2.24" 44.8 -CATEGORY="system-tools" 44.9 -SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)." 44.10 -MAINTAINER="pankso@slitaz.org" 44.11 -LICENSE="GPL2" 44.12 -WEB_SITE="http://www.gnu.org/software/libc/" 44.13 - 44.14 -WANTED="glibc" 44.15 -DEPENDS="glibc-base" 44.16 -BUILD_DEPENDS="slitaz-i18n" 44.17 - 44.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 44.19 -genpkg_rules() 44.20 -{ 44.21 - cook_copy_folders gconv locale i18n 44.22 - cook_copy_files iconv tzselect 44.23 - 44.24 - # Rm base files. 44.25 - action "* Removing all base files..." 44.26 - for file in $(cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list); do 44.27 - rm -f ${fs}$file 44.28 - done 44.29 - status 44.30 - 44.31 - # Rm files provided by locale-pack. 44.32 - . $WOK/slitaz-i18n/stuff/locale-pack.conf 44.33 - echo -n "* Removing locale: " 44.34 - for i in $LOCALE_PACK; do 44.35 - echo -n "$i " 44.36 - rm -rf $fs/usr/share/locale/$i 44.37 - done 44.38 - status 44.39 -}
45.1 --- a/glibc/receipt Mon Jun 05 19:31:24 2017 +0000 45.2 +++ b/glibc/receipt Tue Jun 06 17:37:54 2017 +0300 45.3 @@ -1,9 +1,9 @@ 45.4 -# SliTaz package receipt. 45.5 +# SliTaz package receipt v2. 45.6 45.7 PACKAGE="glibc" 45.8 -VERSION="2.24" 45.9 +VERSION="2.25" 45.10 CATEGORY="meta" 45.11 -SHORT_DESC="The GNU C libraries. This package is used to compile the libc." 45.12 +SHORT_DESC="The GNU C libraries" 45.13 MAINTAINER="pankso@slitaz.org" 45.14 LICENSE="GPL2" 45.15 WEB_SITE="http://www.gnu.org/software/libc/" 45.16 @@ -12,20 +12,30 @@ 45.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 45.18 45.19 DEPENDS="glibc-base glibc-locale glibc-dev" 45.20 -BUILD_DEPENDS="linux-api-headers autoconf bash advancecomp gawk gettext bison \ 45.21 +BUILD_DEPENDS="linux-api-headers autoconf bash gawk gettext bison \ 45.22 texinfo" 45.23 -SPLIT="glibc-base glibc-locale glibc-dev" 45.24 +# slitaz-i18n should present in wok 45.25 +SPLIT="glibc-base glibc-locale nscd glibc-dev" 45.26 + 45.27 +# Locales include to glibc-base package by default, other locales are in: locale-** and glibc-locale 45.28 +DEFAULT_LOCALE="en_US en_GB" 45.29 + 45.30 +# Handle multiarch compilation. 45.31 +case "$ARCH" in 45.32 + arm*|x86_64) VERSION="2.13";; 45.33 +esac 45.34 + 45.35 +# Handle multiarch installation. 45.36 +case "$SLITAZ_ARCH" in 45.37 + arm*|x86_64) VERSION="2.13";; 45.38 +esac 45.39 + 45.40 45.41 # Rules to compile & install the temporary toolchain. 45.42 cook_tmp_toolchain() 45.43 { 45.44 unset CFLAGS CXXFLAGS 45.45 - case $ARCH in 45.46 - i386|i486) 45.47 - echo "CFLAGS += -O2 -march=i486 -mtune=i486" > configparms ;; 45.48 - *) 45.49 - echo "CFLAGS += -O2 -march=$ARCH -mtune=$ARCH" > configparms ;; 45.50 - esac 45.51 + echo "CFLAGS += -O2 -march=${ARCH/i386/i486} -mtune=${ARCH/i386/i486}" > configparms ;; 45.52 45.53 { 45.54 # Build in a separate directory. 45.55 @@ -57,25 +67,15 @@ 45.56 compile_rules() 45.57 { 45.58 # Glibc needs ld.so.conf in the install destdir. 45.59 - mkdir -p $WOK/$PACKAGE/install/etc 45.60 - touch $WOK/$PACKAGE/install/etc/ld.so.conf 45.61 + mkdir -p $install/etc 45.62 + touch $install/etc/ld.so.conf 45.63 45.64 - # Read the INSTALL file in glibc. Also Glibc dont build with -Os flag. 45.65 + # Read the INSTALL file in glibc. Also Glibc don't build with -Os flag. 45.66 # --enale-kernel use latest SliTaz Kernel version. From Glibc INSTALL: 45.67 # "The higher the VERSION number is, the less compatibility code is 45.68 # added, and the faster the code gets." 45.69 unset CFLAGS CXXFLAGS 45.70 - case "$ARCH" in 45.71 - i386|i486) 45.72 - echo "CFLAGS += -O2 -march=i486 -mtune=i486" > configparms ;; 45.73 - *) 45.74 - echo "CFLAGS += -O2 -march=$ARCH -mtune=$ARCH" > configparms ;; 45.75 - esac 45.76 - 45.77 - # Glibc FHS Patch - LFS 7.10 45.78 - patch -p1 -i $stuff/glibc-2.24-fhs-1.patch 45.79 - # Remove restricted '\v' from po files 45.80 - patch -p1 -i $stuff/glibc-po.patch 45.81 + echo "CFLAGS += -O2 -march=${ARCH/i386/i486} -mtune=${ARCH/i386/i486}" > configparms ;; 45.82 45.83 { 45.84 mkdir build 45.85 @@ -92,18 +92,13 @@ 45.86 make -j1 && make install_root=$DESTDIR install 45.87 } || return 1 45.88 45.89 - if [ -n "$(which advdef)" ]; then 45.90 - action 'Recompress charmaps...' 45.91 - local size0=$(ls -l $install/usr/share/i18n/charmaps/*.gz | awk '{s+=$5}END{print s}') 45.92 - local time0=$(date +%s) 45.93 - for i in $install/usr/share/i18n/charmaps/*.gz; do 45.94 - advdef -z4q $i 45.95 - done 45.96 - local size1=$(ls -l $install/usr/share/i18n/charmaps/*.gz | awk '{s+=$5}END{print s}') 45.97 - local time1=$(date +%s) 45.98 - status 45.99 - comp_summary "$time0" "$time1" "$size0" "$size1" 45.100 - fi 45.101 + # nscd 45.102 + mkdir -p $install/etc/init.d $install/var/db 45.103 + cp $stuff/nscd $install/etc/init.d 45.104 + chmod +x $fs/etc/init.d/nscd 45.105 + 45.106 + # nsswitch.conf 45.107 + cp $stuff/nsswitch.conf $install/etc 45.108 45.109 # If temporary toolchain was previously used, switch to regular toolchain. 45.110 if [ -d /tools ]; then 45.111 @@ -118,13 +113,117 @@ 45.112 fi 45.113 } 45.114 45.115 +# i18n 45.116 +get_locales() 45.117 +{ 45.118 + local path=$1 45.119 + for i in $DEFAULT_LOCALE; do 45.120 + cp $install/$path/i18n/locales/$i $fs/usr/share/i18n/locales 45.121 + done 45.122 +} 45.123 + 45.124 +mk_dirs() 45.125 +{ 45.126 + mkdir -p \ 45.127 + $fs/etc \ 45.128 + $fs/lib \ 45.129 + $fs/usr/bin \ 45.130 + $fs/usr/lib/gconv \ 45.131 + $fs/usr/lib/locale \ 45.132 + $fs/usr/share/zoneinfo/America \ 45.133 + $fs/usr/share/zoneinfo/Europe \ 45.134 + $fs/usr/share/i18n/locales \ 45.135 + $fs/usr/share/i18n/charmaps \ 45.136 + $fs/usr/share/locale 45.137 +} 45.138 + 45.139 # Rules to gen a SliTaz package suitable for Tazpkg. 45.140 genpkg_rules() 45.141 { 45.142 - LOCALE="" 45.143 - mkdir -p $fs/var 45.144 + case $PACKAGE in 45.145 + glibc) 45.146 + LOCALE="" 45.147 + ;; 45.148 + glibc-base) 45.149 + case "$ARCH" in 45.150 + arm*) 45.151 + # Eglibc is cross compiled by cross to have a toolchain so we can 45.152 + # use these files instead of recooking it. ARM use Eglibc 45.153 + echo "Using cross compiled Eglibc..." 45.154 + install="/cross/$ARCH/sysroot" 45.155 + copy libc_nonshared.a libpthread_nonshared.a 45.156 + ;; 45.157 + x86_64) 45.158 + # EXPERIMENTAL: Glibc is cross compiled by cross to have a 45.159 + # toolchain so we can use these files instead of recooking it. 45.160 + echo "Using cross compiled Glibc..." 45.161 + install="/usr/cross/$ARCH" 45.162 + copy libc_nonshared.a libpthread_nonshared.a 45.163 + ;; 45.164 + esac 45.165 + copy \ 45.166 + ld-*.so* ld.so* \ 45.167 + libanl-*.so* libanl.so* \ 45.168 + libc-*.so* libc.so* \ 45.169 + libcrypt-*.so* libcrypt.so* \ 45.170 + libdl-*.so* libdl.so* \ 45.171 + libm-*.so* libm.so* \ 45.172 + libnsl-*.so* libnsl.so* \ 45.173 + libnss_compat-*.so* libnss_compat.so* \ 45.174 + libnss_dns-*.so* libnss_dns.so* \ 45.175 + libnss_files-*.so* libnss_files.so* \ 45.176 + libpthread-*.so* libpthread.so* \ 45.177 + libresolv-*.so* libresolv.so* \ 45.178 + librt-*.so* librt.so* \ 45.179 + libthread_db-*.so* libthread_db.so* \ 45.180 + libutil-*.so* libutil.so* \ 45.181 + \ 45.182 + UNICODE.so gconv-modules ANSI_X3.110.so ISO8859-1.so \ 45.183 + ISO8859-15.so UTF-16.so CP1252.so IBM437.so IBM850.so \ 45.184 + \ 45.185 + i18n iso14651_t1 iso14651_t1_common \ 45.186 + translit_neutral translit_combining translit_circle \ 45.187 + translit_cjk_compat translit_compat translit_font \ 45.188 + translit_fraction translit_narrow translit_small \ 45.189 + translit_wide \ 45.190 + \ 45.191 + locale localedef locale.alias UTF-8.gz UTC rpc \ 45.192 + nsswitch.conf \ 45.193 + $DEFAULT_LOCALE 45.194 45.195 - # check install 45.196 - ls $install/lib/ | tr '\n' ' ' | fold -s 45.197 - echo 45.198 + case "$ARCH" in 45.199 + x86_64) 45.200 + # Fix libraries search path 45.201 + sed -i "s|/usr/cross/$ARCH||g" $fs/lib/libc.so 45.202 + sed -i "s|/usr/cross/$ARCH||g" $fs/lib/libpthread.so 45.203 + ;; 45.204 + esac 45.205 + CAT="base-system|minimal libraries and UTF-8 support for SliTaz" 45.206 + ;; 45.207 + glibc-locale) 45.208 + copy gconv/ locale/ i18n/ iconv tzselect 45.209 + # Remove glibc-base files 45.210 + remove_already_packed 45.211 + 45.212 + # Remove files provided by locale-pack. 45.213 + . $WOK/slitaz-i18n/stuff/locale-pack.conf 45.214 + echo -n "Removing locale: " 45.215 + for i in $LOCALE_PACK; do 45.216 + echo -n "$i " 45.217 + rm -rf $fs/usr/share/locale/$i 45.218 + done 45.219 + status 45.220 + CAT="system-tools|locale files and utilities" 45.221 + DEPENDS="glibc-base" 45.222 + ;; 45.223 + nscd) 45.224 + copy /var/db/ nscd getent nscd.conf 45.225 + CAT="base-system|name-server caching daemon" 45.226 + ;; 45.227 + glibc-dev) 45.228 + cp -a $install/* $fs 45.229 + remove_already_packed 45.230 + DEPENDS="glibc-base" 45.231 + ;; 45.232 + esac 45.233 }
46.1 --- a/glibc/stuff/glibc-2.24-fhs-1.patch Mon Jun 05 19:31:24 2017 +0000 46.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 46.3 @@ -1,72 +0,0 @@ 46.4 -Submitted By: Armin K. <krejzi at email dot com> 46.5 -Date: 2013-02-11 46.6 -Initial Package Version: 2.17 46.7 -Upstream Status: Not Applicable 46.8 -Origin: Self 46.9 -Description: This patch removes references to /var/db directory which is not part 46.10 - of FHS and replaces them with more suitable directories in /var 46.11 - hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db. 46.12 - 46.13 ---- a/Makeconfig 2012-12-25 04:02:13.000000000 +0100 46.14 -+++ b/Makeconfig 2013-02-11 01:32:32.500667439 +0100 46.15 -@@ -250,7 +250,7 @@ 46.16 - 46.17 - # Directory for the database files and Makefile for nss_db. 46.18 - ifndef vardbdir 46.19 --vardbdir = $(localstatedir)/db 46.20 -+vardbdir = $(localstatedir)/lib/nss_db 46.21 - endif 46.22 - inst_vardbdir = $(install_root)$(vardbdir) 46.23 - 46.24 ---- a/nscd/nscd.h 2012-12-25 04:02:13.000000000 +0100 46.25 -+++ b/nscd/nscd.h 2013-02-11 01:32:32.500667439 +0100 46.26 -@@ -112,11 +112,11 @@ 46.27 - 46.28 - 46.29 - /* Paths of the file for the persistent storage. */ 46.30 --#define _PATH_NSCD_PASSWD_DB "/var/db/nscd/passwd" 46.31 --#define _PATH_NSCD_GROUP_DB "/var/db/nscd/group" 46.32 --#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts" 46.33 --#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services" 46.34 --#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup" 46.35 -+#define _PATH_NSCD_PASSWD_DB "/var/cache/nscd/passwd" 46.36 -+#define _PATH_NSCD_GROUP_DB "/var/cache/nscd/group" 46.37 -+#define _PATH_NSCD_HOSTS_DB "/var/cache/nscd/hosts" 46.38 -+#define _PATH_NSCD_SERVICES_DB "/var/cache/nscd/services" 46.39 -+#define _PATH_NSCD_NETGROUP_DB "/var/cache/nscd/netgroup" 46.40 - 46.41 - /* Path used when not using persistent storage. */ 46.42 - #define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX" 46.43 ---- a/nss/db-Makefile 2012-12-25 04:02:13.000000000 +0100 46.44 -+++ b/nss/db-Makefile 2013-02-11 01:32:32.500667439 +0100 46.45 -@@ -22,7 +22,7 @@ 46.46 - /etc/rpc /etc/services /etc/shadow /etc/gshadow \ 46.47 - /etc/netgroup) 46.48 - 46.49 --VAR_DB = /var/db 46.50 -+VAR_DB = /var/lib/nss_db 46.51 - 46.52 - AWK = awk 46.53 - MAKEDB = makedb --quiet 46.54 ---- a/sysdeps/generic/paths.h 2012-12-25 04:02:13.000000000 +0100 46.55 -+++ b/sysdeps/generic/paths.h 2013-02-11 01:32:32.500667439 +0100 46.56 -@@ -68,7 +68,7 @@ 46.57 - /* Provide trailing slash, since mostly used for building pathnames. */ 46.58 - #define _PATH_DEV "/dev/" 46.59 - #define _PATH_TMP "/tmp/" 46.60 --#define _PATH_VARDB "/var/db/" 46.61 -+#define _PATH_VARDB "/var/lib/nss_db/" 46.62 - #define _PATH_VARRUN "/var/run/" 46.63 - #define _PATH_VARTMP "/var/tmp/" 46.64 - 46.65 ---- a/sysdeps/unix/sysv/linux/paths.h 2012-12-25 04:02:13.000000000 +0100 46.66 -+++ b/sysdeps/unix/sysv/linux/paths.h 2013-02-11 01:32:32.504000831 +0100 46.67 -@@ -68,7 +68,7 @@ 46.68 - /* Provide trailing slash, since mostly used for building pathnames. */ 46.69 - #define _PATH_DEV "/dev/" 46.70 - #define _PATH_TMP "/tmp/" 46.71 --#define _PATH_VARDB "/var/db/" 46.72 -+#define _PATH_VARDB "/var/lib/nss_db/" 46.73 - #define _PATH_VARRUN "/var/run/" 46.74 - #define _PATH_VARTMP "/var/tmp/" 46.75 -
47.1 --- a/glibc/stuff/glibc-po.patch Mon Jun 05 19:31:24 2017 +0000 47.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 47.3 @@ -1,249 +0,0 @@ 47.4 -warning: internationalized messages should not contain the '\v' escape sequence 47.5 - 47.6 ---- a/po/cs.po 47.7 -+++ b/po/cs.po 47.8 -@@ -153,7 +153,8 @@ 47.9 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.10 - "is -, output is written to standard output.\n" 47.11 - msgstr "" 47.12 --"Generuje katalog zpráv.\vJe-li VSTUPNÍ_SOUBOR -, vstup bude načten ze standardního vstupu.\n" 47.13 -+"Generuje katalog zpráv.\n" 47.14 -+"Je-li VSTUPNÍ_SOUBOR -, vstup bude načten ze standardního vstupu.\n" 47.15 - "Je-li VÝSTUPNÍ_SOUBOR -, výstup bude zapsán na standardní výstup.\n" 47.16 - 47.17 - #: catgets/gencat.c:123 47.18 ---- a/po/da.po 47.19 -+++ b/po/da.po 47.20 -@@ -131,7 +131,8 @@ 47.21 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.22 - "is -, output is written to standard output.\n" 47.23 - msgstr "" 47.24 --"Generér meddelelseskatalog.\vHvis INDFIL er '-' læses inddata fra standard ind.\n" 47.25 -+"Generér meddelelseskatalog.\n" 47.26 -+"Hvis INDFIL er '-' læses inddata fra standard ind.\n" 47.27 - "Hvis UDFIL er '-' skrives uddata til standard ud.\n" 47.28 - 47.29 - #: catgets/gencat.c:123 47.30 ---- a/po/de.po 47.31 -+++ b/po/de.po 47.32 -@@ -131,7 +131,8 @@ 47.33 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.34 - "is -, output is written to standard output.\n" 47.35 - msgstr "" 47.36 --"Einen Message-Katalog generieren.\vWenn als INPUT-FILE - angegeben wird, wird\n" 47.37 -+"Einen Message-Katalog generieren.\n" 47.38 -+"Wenn als INPUT-FILE - angegeben wird, wird\n" 47.39 - "von der Standardeingabe gelesen. Wenn die OUTPUT-FILE - ist, wird auf die\n" 47.40 - "Standardausgabe geschrieben.\n" 47.41 - 47.42 ---- a/po/en_GB.po 47.43 -+++ b/po/en_GB.po 47.44 -@@ -1878,11 +1878,12 @@ 47.45 - 47.46 - #: catgets/gencat.c:116 47.47 - msgid "" 47.48 --"Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard " 47.49 -+"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard " 47.50 - "input. If OUTPUT-FILE\n" 47.51 - "is -, output is written to standard output.\n" 47.52 - msgstr "" 47.53 --"Generate message catalogue.\\vIf INPUT-FILE is -, input is read from standard " 47.54 -+"Generate message catalogue.\n" 47.55 -+"If INPUT-FILE is -, input is read from standard " 47.56 - "input. If OUTPUT-FILE\n" 47.57 - "is -, output is written to standard output.\n" 47.58 - 47.59 ---- a/po/eo.po 47.60 -+++ a/po/eo.po 47.61 -@@ -138,7 +138,8 @@ 47.62 - "is -, output is written to standard output.\n" 47.63 - msgstr "" 47.64 - " \n" 47.65 --"Generas mesaĝan katalogon.\vSe ENIGDOSIERO estas «-», ĉefenigujo legiĝas. Se ELIGDOSIERO estas «-», la eligo skribiĝas al ĉefeligujo.\n" 47.66 -+"Generas mesaĝan katalogon.\n" 47.67 -+"Se ENIGDOSIERO estas «-», ĉefenigujo legiĝas. Se ELIGDOSIERO estas «-», la eligo skribiĝas al ĉefeligujo.\n" 47.68 - 47.69 - #: catgets/gencat.c:123 47.70 - msgid "" 47.71 ---- a/po/es.po 47.72 -+++ b/po/es.po 47.73 -@@ -151,7 +151,8 @@ 47.74 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.75 - "is -, output is written to standard output.\n" 47.76 - msgstr "" 47.77 --"Genera un catálogo de mensajes.\vSi FICHERO-ENTRADA es -, la entrada\n" 47.78 -+"Genera un catálogo de mensajes.\n" 47.79 -+"Si FICHERO-ENTRADA es -, la entrada\n" 47.80 - "se lee de la entrada estándar. Si FICHERO-SALIDA es -, el resultado se\n" 47.81 - "escribe en la salida estándar.\n" 47.82 - 47.83 ---- a/po/fi.po 47.84 -+++ b/po/fi.po 47.85 -@@ -151,7 +151,8 @@ 47.86 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.87 - "is -, output is written to standard output.\n" 47.88 - msgstr "" 47.89 --"Luo viestikatalogi.\vJos SYÖTETIEDOSTO on -, syöte luetaan vakiosyötteestä. Jos TULOSTIEDOSTO\n" 47.90 -+"Luo viestikatalogi.\n" 47.91 -+"Jos SYÖTETIEDOSTO on -, syöte luetaan vakiosyötteestä. Jos TULOSTIEDOSTO\n" 47.92 - "on -, tuloste kirjoitetaan vakiotulosteeseen.\n" 47.93 - 47.94 - #: catgets/gencat.c:123 47.95 ---- a/po/fr.po 47.96 -+++ b/po/fr.po 47.97 -@@ -136,7 +136,8 @@ 47.98 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.99 - "is -, output is written to standard output.\n" 47.100 - msgstr "" 47.101 --"Génère le catalogue de messages.\vSi le FICHIER_D_ENTRÉE est -, l'entrée est lue depuis l'entrée standard.\n" 47.102 -+"Génère le catalogue de messages.\n" 47.103 -+"Si le FICHIER_D_ENTRÉE est -, l'entrée est lue depuis l'entrée standard.\n" 47.104 - "Si le FICHIER_DE_SORTIE est -, la sortie est dirigée sur la sortie standard.\n" 47.105 - 47.106 - #: catgets/gencat.c:123 47.107 ---- a/po/hr.po 47.108 -+++ b/po/hr.po 47.109 -@@ -132,7 +132,9 @@ 47.110 - msgid "" 47.111 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.112 - "is -, output is written to standard output.\n" 47.113 --msgstr "Napravi katalog poruka.\vAko je ULAZNA-DATOTEKA -, ulaz se čita sa standardnog ulaza. Ako je IZLAZNA-DATOTEKA -, izlaz se ispisuje na standardni izlaz.\n" 47.114 -+msgstr "" 47.115 -+"Napravi katalog poruka.\n" 47.116 -+"Ako je ULAZNA-DATOTEKA -, ulaz se čita sa standardnog ulaza. Ako je IZLAZNA-DATOTEKA -, izlaz se ispisuje na standardni izlaz.\n" 47.117 - 47.118 - #: catgets/gencat.c:123 47.119 - msgid "" 47.120 ---- a/po/hu.po 47.121 -+++ b/po/hu.po 47.122 -@@ -132,7 +132,8 @@ 47.123 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.124 - "is -, output is written to standard output.\n" 47.125 - msgstr "" 47.126 --"Üzenetkatalógus előállítása\v Ha a BEMENETIFÁJL a -, akkor a szabványos bemenetet olvassa. Ha a \n" 47.127 -+"Üzenetkatalógus előállítása\n" 47.128 -+"Ha a BEMENETIFÁJL a -, akkor a szabványos bemenetet olvassa. Ha a \n" 47.129 - "KIMENETIFÁJL a -, akkor a szabványos kimenetre ír.\n" 47.130 - 47.131 - #: catgets/gencat.c:123 47.132 ---- a/po/ia.po 47.133 -+++ b/po/ia.po 47.134 -@@ -131,7 +131,8 @@ 47.135 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.136 - "is -, output is written to standard output.\n" 47.137 - msgstr "" 47.138 --"Generar un catalogo de messages.\vSi FILE-INPUT es -, le entrata se lege del input standard.\n" 47.139 -+"Generar un catalogo de messages.\n" 47.140 -+"Si FILE-INPUT es -, le entrata se lege del input standard.\n" 47.141 - "Si FILE-OUTPUT es -, le resultato se scribe al output standard.\n" 47.142 - 47.143 - #: catgets/gencat.c:123 47.144 ---- a/po/it.po 47.145 -+++ b/po/it.po 47.146 -@@ -143,7 +143,8 @@ 47.147 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.148 - "is -, output is written to standard output.\n" 47.149 - msgstr "" 47.150 --"Genera un catalogo di messaggi.\vSe FILE-INPUT è -, l'input è letto dallo standard input.\n" 47.151 -+"Genera un catalogo di messaggi.\n" 47.152 -+"Se FILE-INPUT è -, l'input è letto dallo standard input.\n" 47.153 - "Se FILE-OUTPUT è -, l'output è scritto sullo standard output.\n" 47.154 - 47.155 - #: catgets/gencat.c:123 47.156 ---- a/po/nl.po 47.157 -+++ b/po/nl.po 47.158 -@@ -145,7 +145,8 @@ 47.159 - "is -, output is written to standard output.\n" 47.160 - msgstr "" 47.161 - " \n" 47.162 --"Een berichtencatalogus genereren.\vAls INVOERBESTAND '-' is, wordt van standaardinvoer gelezen.\n" 47.163 -+"Een berichtencatalogus genereren.\n" 47.164 -+"Als INVOERBESTAND '-' is, wordt van standaardinvoer gelezen.\n" 47.165 - "Als UITVOERBESTAND '-' is, wordt naar standaarduitvoer geschreven.\n" 47.166 - 47.167 - #: catgets/gencat.c:123 47.168 ---- a/po/pl.po 47.169 -+++ b/po/pl.po 47.170 -@@ -131,7 +131,8 @@ 47.171 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.172 - "is -, output is written to standard output.\n" 47.173 - msgstr "" 47.174 --"Generowanie katalogu komunikatów.\vJeśli PLIK-WE to -, dane są czytane ze standardowego wejścia. Jeśli PLIK-WY\n" 47.175 -+"Generowanie katalogu komunikatów.\n" 47.176 -+"Jeśli PLIK-WE to -, dane są czytane ze standardowego wejścia. Jeśli PLIK-WY\n" 47.177 - "to -, dane są zapisywane na standardowe wyjście.\n" 47.178 - 47.179 - #: catgets/gencat.c:123 47.180 ---- a/po/ru.po 47.181 -+++ b/po/ru.po 47.182 -@@ -138,7 +138,8 @@ 47.183 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.184 - "is -, output is written to standard output.\n" 47.185 - msgstr "" 47.186 --"Генерирует каталог сообщений.\vЕсли ВХОДНОЙ-ФАЙЛ задан как -, читает стандартный ввод. Если\n" 47.187 -+"Генерирует каталог сообщений.\n" 47.188 -+"Если ВХОДНОЙ-ФАЙЛ задан как -, читает стандартный ввод. Если\n" 47.189 - "ВЫХОДНОЙ-ФАЙЛ задан как -, результат печатается на стандартный вывод.\n" 47.190 - 47.191 - #: catgets/gencat.c:123 47.192 ---- a/po/sl.po 47.193 -+++ b/po/sl.po 47.194 -@@ -131,7 +131,9 @@ 47.195 - msgid "" 47.196 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.197 - "is -, output is written to standard output.\n" 47.198 --msgstr "Ustvari katalog sporočil.\vČe je VHODNA_DATOTEKA enaka -, se vhod bere s standardnega vhoda. Če je IZHODNA_DATOTEKA enaka -, se izhod zapisuje na standardni izhod.\n" 47.199 -+msgstr "" 47.200 -+"Ustvari katalog sporočil.\n" 47.201 -+"Če je VHODNA_DATOTEKA enaka -, se vhod bere s standardnega vhoda. Če je IZHODNA_DATOTEKA enaka -, se izhod zapisuje na standardni izhod.\n" 47.202 - 47.203 - #: catgets/gencat.c:123 47.204 - msgid "" 47.205 ---- a/po/sv.po 47.206 -+++ b/po/sv.po 47.207 -@@ -131,7 +131,8 @@ 47.208 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.209 - "is -, output is written to standard output.\n" 47.210 - msgstr "" 47.211 --"Skapa meddelandekatalog.\vOm INFIL är - så läses standard in. Om UTFIL\n" 47.212 -+"Skapa meddelandekatalog.\n" 47.213 -+"Om INFIL är - så läses standard in. Om UTFIL\n" 47.214 - "är - så skrivs resultatet till standard ut.\n" 47.215 - 47.216 - #: catgets/gencat.c:123 47.217 ---- a/po/uk.po 47.218 -+++ b/po/uk.po 47.219 -@@ -133,7 +133,8 @@ 47.220 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.221 - "is -, output is written to standard output.\n" 47.222 - msgstr "" 47.223 --"Створити каталог повідомлень.\vЯкщо як файл ВХІДНИЙ-ФАЙЛ\n" 47.224 -+"Створити каталог повідомлень.\n" 47.225 -+"Якщо як файл ВХІДНИЙ-ФАЙЛ\n" 47.226 - "вказано -, вивід відбуватиметься у стандартний вивід.\n" 47.227 - 47.228 - #: catgets/gencat.c:123 47.229 ---- a/po/zh_CN.po 47.230 -+++ b/po/zh_CN.po 47.231 -@@ -137,7 +137,8 @@ 47.232 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.233 - "is -, output is written to standard output.\n" 47.234 - msgstr "" 47.235 --"产生消息 catelog。\\v如果输入文件名是 -, 将从标准输入读取输入。\n" 47.236 -+"产生消息 catelog。\n" 47.237 -+"如果输入文件名是 -, 将从标准输入读取输入。\n" 47.238 - "如果输出文件名是 -, 则输出将写到标准输出去。\n" 47.239 - 47.240 - #: catgets/gencat.c:123 47.241 ---- a/po/zh_TW.po 47.242 -+++ b/po/zh_TW.po 47.243 -@@ -134,7 +134,8 @@ 47.244 - "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 47.245 - "is -, output is written to standard output.\n" 47.246 - msgstr "" 47.247 --"產生訊息 catelog。\\v如果輸入檔名是 -, 將從標準輸入讀取輸入。\n" 47.248 -+"產生訊息 catelog。\n" 47.249 -+"如果輸入檔名是 -, 將從標準輸入讀取輸入。\n" 47.250 - "如果輸出檔名是 -, 則輸出將寫到標準輸出去。\n" 47.251 - 47.252 - #: catgets/gencat.c:123
48.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 48.2 +++ b/glibc/stuff/nscd Tue Jun 06 17:37:54 2017 +0300 48.3 @@ -0,0 +1,60 @@ 48.4 +#!/bin/sh 48.5 +# /etc/init.d/nscd : Start, stop and restart nscd server on SliTaz, at 48.6 +# boot time or with the command line. 48.7 +# 48.8 +# To start nscd server at boot time, just put nscd in the $RUN_DAEMONS 48.9 +# variable of /etc/rcS.conf and configure options with /etc/daemons.conf 48.10 +# 48.11 +. /etc/init.d/rc.functions 48.12 +. /etc/daemons.conf 48.13 + 48.14 +NAME=nscd 48.15 +DESC="$(_ 'name-server caching daemon')" 48.16 +DAEMON=/usr/sbin/nscd 48.17 +OPTIONS=$NSCD_OPTIONS 48.18 +PIDFILE=/var/run/nscd/nscd.pid 48.19 + 48.20 +[ -d /var/run/nscd ] || mkdir /var/run/nscd 48.21 +[ -d /var/db/nscd ] || mkdir /var/db/nscd 48.22 + 48.23 +case "$1" in 48.24 + start) 48.25 + if active_pidfile $PIDFILE nscd ; then 48.26 + _ '%s is already running.' $NAME 48.27 + exit 1 48.28 + fi 48.29 + action 'Starting %s: %s...' "$DESC" $NAME 48.30 + $DAEMON $OPTIONS 48.31 + status 48.32 + sleep 2 48.33 + ;; 48.34 + stop) 48.35 + if ! active_pidfile $PIDFILE nscd ; then 48.36 + _ '%s is not running.' $NAME 48.37 + exit 1 48.38 + fi 48.39 + action 'Stopping %s: %s...' "$DESC" $NAME 48.40 + kill $(cat $PIDFILE) 48.41 + status 48.42 + sleep 2 48.43 + ;; 48.44 + restart) 48.45 + if ! active_pidfile $PIDFILE nscd ; then 48.46 + _ '%s is not running.' $NAME 48.47 + exit 1 48.48 + fi 48.49 + action 'Restarting %s: %s...' "$DESC" $NAME 48.50 + kill $(cat $PIDFILE) 48.51 + sleep 2 48.52 + $DAEMON $OPTIONS 48.53 + status 48.54 + sleep 2 48.55 + ;; 48.56 + *) 48.57 + emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 48.58 + newline 48.59 + exit 1 48.60 + ;; 48.61 +esac 48.62 + 48.63 +exit 0
49.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 49.2 +++ b/glibc/stuff/nsswitch.conf Tue Jun 06 17:37:54 2017 +0300 49.3 @@ -0,0 +1,15 @@ 49.4 +# Begin /etc/nsswitch.conf 49.5 + 49.6 +passwd: files 49.7 +group: files 49.8 +shadow: files 49.9 + 49.10 +hosts: files dns 49.11 +networks: files 49.12 + 49.13 +protocols: files 49.14 +services: files 49.15 +ethers: files 49.16 +rpc: files 49.17 + 49.18 +# End /etc/nsswitch.conf
50.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 50.2 +++ b/glibc/stuff/patches/glibc-2.25-fhs-1.patch Tue Jun 06 17:37:54 2017 +0300 50.3 @@ -0,0 +1,72 @@ 50.4 +Submitted By: Armin K. <krejzi at email dot com> 50.5 +Date: 2013-02-11 50.6 +Initial Package Version: 2.17 50.7 +Upstream Status: Not Applicable 50.8 +Origin: Self 50.9 +Description: This patch removes references to /var/db directory which is not part 50.10 + of FHS and replaces them with more suitable directories in /var 50.11 + hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db. 50.12 + 50.13 +--- a/Makeconfig 2012-12-25 04:02:13.000000000 +0100 50.14 ++++ b/Makeconfig 2013-02-11 01:32:32.500667439 +0100 50.15 +@@ -250,7 +250,7 @@ 50.16 + 50.17 + # Directory for the database files and Makefile for nss_db. 50.18 + ifndef vardbdir 50.19 +-vardbdir = $(localstatedir)/db 50.20 ++vardbdir = $(localstatedir)/lib/nss_db 50.21 + endif 50.22 + inst_vardbdir = $(install_root)$(vardbdir) 50.23 + 50.24 +--- a/nscd/nscd.h 2012-12-25 04:02:13.000000000 +0100 50.25 ++++ b/nscd/nscd.h 2013-02-11 01:32:32.500667439 +0100 50.26 +@@ -112,11 +112,11 @@ 50.27 + 50.28 + 50.29 + /* Paths of the file for the persistent storage. */ 50.30 +-#define _PATH_NSCD_PASSWD_DB "/var/db/nscd/passwd" 50.31 +-#define _PATH_NSCD_GROUP_DB "/var/db/nscd/group" 50.32 +-#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts" 50.33 +-#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services" 50.34 +-#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup" 50.35 ++#define _PATH_NSCD_PASSWD_DB "/var/cache/nscd/passwd" 50.36 ++#define _PATH_NSCD_GROUP_DB "/var/cache/nscd/group" 50.37 ++#define _PATH_NSCD_HOSTS_DB "/var/cache/nscd/hosts" 50.38 ++#define _PATH_NSCD_SERVICES_DB "/var/cache/nscd/services" 50.39 ++#define _PATH_NSCD_NETGROUP_DB "/var/cache/nscd/netgroup" 50.40 + 50.41 + /* Path used when not using persistent storage. */ 50.42 + #define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX" 50.43 +--- a/nss/db-Makefile 2012-12-25 04:02:13.000000000 +0100 50.44 ++++ b/nss/db-Makefile 2013-02-11 01:32:32.500667439 +0100 50.45 +@@ -22,7 +22,7 @@ 50.46 + /etc/rpc /etc/services /etc/shadow /etc/gshadow \ 50.47 + /etc/netgroup) 50.48 + 50.49 +-VAR_DB = /var/db 50.50 ++VAR_DB = /var/lib/nss_db 50.51 + 50.52 + AWK = awk 50.53 + MAKEDB = makedb --quiet 50.54 +--- a/sysdeps/generic/paths.h 2012-12-25 04:02:13.000000000 +0100 50.55 ++++ b/sysdeps/generic/paths.h 2013-02-11 01:32:32.500667439 +0100 50.56 +@@ -68,7 +68,7 @@ 50.57 + /* Provide trailing slash, since mostly used for building pathnames. */ 50.58 + #define _PATH_DEV "/dev/" 50.59 + #define _PATH_TMP "/tmp/" 50.60 +-#define _PATH_VARDB "/var/db/" 50.61 ++#define _PATH_VARDB "/var/lib/nss_db/" 50.62 + #define _PATH_VARRUN "/var/run/" 50.63 + #define _PATH_VARTMP "/var/tmp/" 50.64 + 50.65 +--- a/sysdeps/unix/sysv/linux/paths.h 2012-12-25 04:02:13.000000000 +0100 50.66 ++++ b/sysdeps/unix/sysv/linux/paths.h 2013-02-11 01:32:32.504000831 +0100 50.67 +@@ -68,7 +68,7 @@ 50.68 + /* Provide trailing slash, since mostly used for building pathnames. */ 50.69 + #define _PATH_DEV "/dev/" 50.70 + #define _PATH_TMP "/tmp/" 50.71 +-#define _PATH_VARDB "/var/db/" 50.72 ++#define _PATH_VARDB "/var/lib/nss_db/" 50.73 + #define _PATH_VARRUN "/var/run/" 50.74 + #define _PATH_VARTMP "/var/tmp/" 50.75 +
51.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 51.2 +++ b/glibc/stuff/patches/glibc-po.patch Tue Jun 06 17:37:54 2017 +0300 51.3 @@ -0,0 +1,249 @@ 51.4 +warning: internationalized messages should not contain the '\v' escape sequence 51.5 + 51.6 +--- a/po/cs.po 51.7 ++++ b/po/cs.po 51.8 +@@ -153,7 +153,8 @@ 51.9 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.10 + "is -, output is written to standard output.\n" 51.11 + msgstr "" 51.12 +-"Generuje katalog zpráv.\vJe-li VSTUPNÍ_SOUBOR -, vstup bude načten ze standardního vstupu.\n" 51.13 ++"Generuje katalog zpráv.\n" 51.14 ++"Je-li VSTUPNÍ_SOUBOR -, vstup bude načten ze standardního vstupu.\n" 51.15 + "Je-li VÝSTUPNÍ_SOUBOR -, výstup bude zapsán na standardní výstup.\n" 51.16 + 51.17 + #: catgets/gencat.c:123 51.18 +--- a/po/da.po 51.19 ++++ b/po/da.po 51.20 +@@ -131,7 +131,8 @@ 51.21 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.22 + "is -, output is written to standard output.\n" 51.23 + msgstr "" 51.24 +-"Generér meddelelseskatalog.\vHvis INDFIL er '-' læses inddata fra standard ind.\n" 51.25 ++"Generér meddelelseskatalog.\n" 51.26 ++"Hvis INDFIL er '-' læses inddata fra standard ind.\n" 51.27 + "Hvis UDFIL er '-' skrives uddata til standard ud.\n" 51.28 + 51.29 + #: catgets/gencat.c:123 51.30 +--- a/po/de.po 51.31 ++++ b/po/de.po 51.32 +@@ -131,7 +131,8 @@ 51.33 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.34 + "is -, output is written to standard output.\n" 51.35 + msgstr "" 51.36 +-"Einen Message-Katalog generieren.\vWenn als INPUT-FILE - angegeben wird, wird\n" 51.37 ++"Einen Message-Katalog generieren.\n" 51.38 ++"Wenn als INPUT-FILE - angegeben wird, wird\n" 51.39 + "von der Standardeingabe gelesen. Wenn die OUTPUT-FILE - ist, wird auf die\n" 51.40 + "Standardausgabe geschrieben.\n" 51.41 + 51.42 +--- a/po/en_GB.po 51.43 ++++ b/po/en_GB.po 51.44 +@@ -1878,11 +1878,12 @@ 51.45 + 51.46 + #: catgets/gencat.c:116 51.47 + msgid "" 51.48 +-"Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard " 51.49 ++"Generate message catalog.\vIf INPUT-FILE is -, input is read from standard " 51.50 + "input. If OUTPUT-FILE\n" 51.51 + "is -, output is written to standard output.\n" 51.52 + msgstr "" 51.53 +-"Generate message catalogue.\\vIf INPUT-FILE is -, input is read from standard " 51.54 ++"Generate message catalogue.\n" 51.55 ++"If INPUT-FILE is -, input is read from standard " 51.56 + "input. If OUTPUT-FILE\n" 51.57 + "is -, output is written to standard output.\n" 51.58 + 51.59 +--- a/po/eo.po 51.60 ++++ a/po/eo.po 51.61 +@@ -138,7 +138,8 @@ 51.62 + "is -, output is written to standard output.\n" 51.63 + msgstr "" 51.64 + " \n" 51.65 +-"Generas mesaĝan katalogon.\vSe ENIGDOSIERO estas «-», ĉefenigujo legiĝas. Se ELIGDOSIERO estas «-», la eligo skribiĝas al ĉefeligujo.\n" 51.66 ++"Generas mesaĝan katalogon.\n" 51.67 ++"Se ENIGDOSIERO estas «-», ĉefenigujo legiĝas. Se ELIGDOSIERO estas «-», la eligo skribiĝas al ĉefeligujo.\n" 51.68 + 51.69 + #: catgets/gencat.c:123 51.70 + msgid "" 51.71 +--- a/po/es.po 51.72 ++++ b/po/es.po 51.73 +@@ -151,7 +151,8 @@ 51.74 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.75 + "is -, output is written to standard output.\n" 51.76 + msgstr "" 51.77 +-"Genera un catálogo de mensajes.\vSi FICHERO-ENTRADA es -, la entrada\n" 51.78 ++"Genera un catálogo de mensajes.\n" 51.79 ++"Si FICHERO-ENTRADA es -, la entrada\n" 51.80 + "se lee de la entrada estándar. Si FICHERO-SALIDA es -, el resultado se\n" 51.81 + "escribe en la salida estándar.\n" 51.82 + 51.83 +--- a/po/fi.po 51.84 ++++ b/po/fi.po 51.85 +@@ -151,7 +151,8 @@ 51.86 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.87 + "is -, output is written to standard output.\n" 51.88 + msgstr "" 51.89 +-"Luo viestikatalogi.\vJos SYÖTETIEDOSTO on -, syöte luetaan vakiosyötteestä. Jos TULOSTIEDOSTO\n" 51.90 ++"Luo viestikatalogi.\n" 51.91 ++"Jos SYÖTETIEDOSTO on -, syöte luetaan vakiosyötteestä. Jos TULOSTIEDOSTO\n" 51.92 + "on -, tuloste kirjoitetaan vakiotulosteeseen.\n" 51.93 + 51.94 + #: catgets/gencat.c:123 51.95 +--- a/po/fr.po 51.96 ++++ b/po/fr.po 51.97 +@@ -136,7 +136,8 @@ 51.98 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.99 + "is -, output is written to standard output.\n" 51.100 + msgstr "" 51.101 +-"Génère le catalogue de messages.\vSi le FICHIER_D_ENTRÉE est -, l'entrée est lue depuis l'entrée standard.\n" 51.102 ++"Génère le catalogue de messages.\n" 51.103 ++"Si le FICHIER_D_ENTRÉE est -, l'entrée est lue depuis l'entrée standard.\n" 51.104 + "Si le FICHIER_DE_SORTIE est -, la sortie est dirigée sur la sortie standard.\n" 51.105 + 51.106 + #: catgets/gencat.c:123 51.107 +--- a/po/hr.po 51.108 ++++ b/po/hr.po 51.109 +@@ -132,7 +132,9 @@ 51.110 + msgid "" 51.111 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.112 + "is -, output is written to standard output.\n" 51.113 +-msgstr "Napravi katalog poruka.\vAko je ULAZNA-DATOTEKA -, ulaz se čita sa standardnog ulaza. Ako je IZLAZNA-DATOTEKA -, izlaz se ispisuje na standardni izlaz.\n" 51.114 ++msgstr "" 51.115 ++"Napravi katalog poruka.\n" 51.116 ++"Ako je ULAZNA-DATOTEKA -, ulaz se čita sa standardnog ulaza. Ako je IZLAZNA-DATOTEKA -, izlaz se ispisuje na standardni izlaz.\n" 51.117 + 51.118 + #: catgets/gencat.c:123 51.119 + msgid "" 51.120 +--- a/po/hu.po 51.121 ++++ b/po/hu.po 51.122 +@@ -132,7 +132,8 @@ 51.123 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.124 + "is -, output is written to standard output.\n" 51.125 + msgstr "" 51.126 +-"Üzenetkatalógus előállítása\v Ha a BEMENETIFÁJL a -, akkor a szabványos bemenetet olvassa. Ha a \n" 51.127 ++"Üzenetkatalógus előállítása\n" 51.128 ++"Ha a BEMENETIFÁJL a -, akkor a szabványos bemenetet olvassa. Ha a \n" 51.129 + "KIMENETIFÁJL a -, akkor a szabványos kimenetre ír.\n" 51.130 + 51.131 + #: catgets/gencat.c:123 51.132 +--- a/po/ia.po 51.133 ++++ b/po/ia.po 51.134 +@@ -131,7 +131,8 @@ 51.135 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.136 + "is -, output is written to standard output.\n" 51.137 + msgstr "" 51.138 +-"Generar un catalogo de messages.\vSi FILE-INPUT es -, le entrata se lege del input standard.\n" 51.139 ++"Generar un catalogo de messages.\n" 51.140 ++"Si FILE-INPUT es -, le entrata se lege del input standard.\n" 51.141 + "Si FILE-OUTPUT es -, le resultato se scribe al output standard.\n" 51.142 + 51.143 + #: catgets/gencat.c:123 51.144 +--- a/po/it.po 51.145 ++++ b/po/it.po 51.146 +@@ -143,7 +143,8 @@ 51.147 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.148 + "is -, output is written to standard output.\n" 51.149 + msgstr "" 51.150 +-"Genera un catalogo di messaggi.\vSe FILE-INPUT è -, l'input è letto dallo standard input.\n" 51.151 ++"Genera un catalogo di messaggi.\n" 51.152 ++"Se FILE-INPUT è -, l'input è letto dallo standard input.\n" 51.153 + "Se FILE-OUTPUT è -, l'output è scritto sullo standard output.\n" 51.154 + 51.155 + #: catgets/gencat.c:123 51.156 +--- a/po/nl.po 51.157 ++++ b/po/nl.po 51.158 +@@ -145,7 +145,8 @@ 51.159 + "is -, output is written to standard output.\n" 51.160 + msgstr "" 51.161 + " \n" 51.162 +-"Een berichtencatalogus genereren.\vAls INVOERBESTAND '-' is, wordt van standaardinvoer gelezen.\n" 51.163 ++"Een berichtencatalogus genereren.\n" 51.164 ++"Als INVOERBESTAND '-' is, wordt van standaardinvoer gelezen.\n" 51.165 + "Als UITVOERBESTAND '-' is, wordt naar standaarduitvoer geschreven.\n" 51.166 + 51.167 + #: catgets/gencat.c:123 51.168 +--- a/po/pl.po 51.169 ++++ b/po/pl.po 51.170 +@@ -131,7 +131,8 @@ 51.171 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.172 + "is -, output is written to standard output.\n" 51.173 + msgstr "" 51.174 +-"Generowanie katalogu komunikatów.\vJeśli PLIK-WE to -, dane są czytane ze standardowego wejścia. Jeśli PLIK-WY\n" 51.175 ++"Generowanie katalogu komunikatów.\n" 51.176 ++"Jeśli PLIK-WE to -, dane są czytane ze standardowego wejścia. Jeśli PLIK-WY\n" 51.177 + "to -, dane są zapisywane na standardowe wyjście.\n" 51.178 + 51.179 + #: catgets/gencat.c:123 51.180 +--- a/po/ru.po 51.181 ++++ b/po/ru.po 51.182 +@@ -138,7 +138,8 @@ 51.183 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.184 + "is -, output is written to standard output.\n" 51.185 + msgstr "" 51.186 +-"Генерирует каталог сообщений.\vЕсли ВХОДНОЙ-ФАЙЛ задан как -, читает стандартный ввод. Если\n" 51.187 ++"Генерирует каталог сообщений.\n" 51.188 ++"Если ВХОДНОЙ-ФАЙЛ задан как -, читает стандартный ввод. Если\n" 51.189 + "ВЫХОДНОЙ-ФАЙЛ задан как -, результат печатается на стандартный вывод.\n" 51.190 + 51.191 + #: catgets/gencat.c:123 51.192 +--- a/po/sl.po 51.193 ++++ b/po/sl.po 51.194 +@@ -131,7 +131,9 @@ 51.195 + msgid "" 51.196 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.197 + "is -, output is written to standard output.\n" 51.198 +-msgstr "Ustvari katalog sporočil.\vČe je VHODNA_DATOTEKA enaka -, se vhod bere s standardnega vhoda. Če je IZHODNA_DATOTEKA enaka -, se izhod zapisuje na standardni izhod.\n" 51.199 ++msgstr "" 51.200 ++"Ustvari katalog sporočil.\n" 51.201 ++"Če je VHODNA_DATOTEKA enaka -, se vhod bere s standardnega vhoda. Če je IZHODNA_DATOTEKA enaka -, se izhod zapisuje na standardni izhod.\n" 51.202 + 51.203 + #: catgets/gencat.c:123 51.204 + msgid "" 51.205 +--- a/po/sv.po 51.206 ++++ b/po/sv.po 51.207 +@@ -131,7 +131,8 @@ 51.208 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.209 + "is -, output is written to standard output.\n" 51.210 + msgstr "" 51.211 +-"Skapa meddelandekatalog.\vOm INFIL är - så läses standard in. Om UTFIL\n" 51.212 ++"Skapa meddelandekatalog.\n" 51.213 ++"Om INFIL är - så läses standard in. Om UTFIL\n" 51.214 + "är - så skrivs resultatet till standard ut.\n" 51.215 + 51.216 + #: catgets/gencat.c:123 51.217 +--- a/po/uk.po 51.218 ++++ b/po/uk.po 51.219 +@@ -133,7 +133,8 @@ 51.220 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.221 + "is -, output is written to standard output.\n" 51.222 + msgstr "" 51.223 +-"Створити каталог повідомлень.\vЯкщо як файл ВХІДНИЙ-ФАЙЛ\n" 51.224 ++"Створити каталог повідомлень.\n" 51.225 ++"Якщо як файл ВХІДНИЙ-ФАЙЛ\n" 51.226 + "вказано -, вивід відбуватиметься у стандартний вивід.\n" 51.227 + 51.228 + #: catgets/gencat.c:123 51.229 +--- a/po/zh_CN.po 51.230 ++++ b/po/zh_CN.po 51.231 +@@ -137,7 +137,8 @@ 51.232 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.233 + "is -, output is written to standard output.\n" 51.234 + msgstr "" 51.235 +-"产生消息 catelog。\\v如果输入文件名是 -, 将从标准输入读取输入。\n" 51.236 ++"产生消息 catelog。\n" 51.237 ++"如果输入文件名是 -, 将从标准输入读取输入。\n" 51.238 + "如果输出文件名是 -, 则输出将写到标准输出去。\n" 51.239 + 51.240 + #: catgets/gencat.c:123 51.241 +--- a/po/zh_TW.po 51.242 ++++ b/po/zh_TW.po 51.243 +@@ -134,7 +134,8 @@ 51.244 + "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n" 51.245 + "is -, output is written to standard output.\n" 51.246 + msgstr "" 51.247 +-"產生訊息 catelog。\\v如果輸入檔名是 -, 將從標準輸入讀取輸入。\n" 51.248 ++"產生訊息 catelog。\n" 51.249 ++"如果輸入檔名是 -, 將從標準輸入讀取輸入。\n" 51.250 + "如果輸出檔名是 -, 則輸出將寫到標準輸出去。\n" 51.251 + 51.252 + #: catgets/gencat.c:123
52.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 52.2 +++ b/glibc/stuff/patches/series Tue Jun 06 17:37:54 2017 +0300 52.3 @@ -0,0 +1,2 @@ 52.4 +glibc-2.25-fhs-1.patch 52.5 +glibc-po.patch
53.1 --- a/gmp-dev/receipt Mon Jun 05 19:31:24 2017 +0000 53.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 53.3 @@ -1,19 +0,0 @@ 53.4 -# SliTaz package receipt 53.5 - 53.6 -PACKAGE="gmp-dev" 53.7 -VERSION="6.1.1" 53.8 -CATEGORY="development" 53.9 -SHORT_DESC="GNU Multiple Precision Arithmetic devel files." 53.10 -MAINTAINER="pankso@slitaz.org" 53.11 -LICENSE="GPL3" 53.12 -WEB_SITE="https://gmplib.org/" 53.13 -HOST_ARCH="i486 arm" 53.14 - 53.15 -WANTED="gmp" 53.16 -DEPENDS="gmp" 53.17 - 53.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 53.19 -genpkg_rules() 53.20 -{ 53.21 - cook_copy_files *.h *.la 53.22 -}
54.1 --- a/gmp/receipt Mon Jun 05 19:31:24 2017 +0000 54.2 +++ b/gmp/receipt Tue Jun 06 17:37:54 2017 +0300 54.3 @@ -1,9 +1,9 @@ 54.4 -# SliTaz package receipt 54.5 +# SliTaz package receipt v2. 54.6 54.7 PACKAGE="gmp" 54.8 -VERSION="6.1.1" 54.9 -CATEGORY="development" 54.10 -SHORT_DESC="GNU Multiple Precision Arithmetic Library." 54.11 +VERSION="6.1.2" 54.12 +CATEGORY="libdevel" 54.13 +SHORT_DESC="GNU Multiple Precision Arithmetic Library" 54.14 MAINTAINER="pankso@slitaz.org" 54.15 LICENSE="GPL3" 54.16 WEB_SITE="https://gmplib.org/" 54.17 @@ -13,6 +13,7 @@ 54.18 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 54.19 54.20 BUILD_DEPENDS="binutils m4 ncurses-dev readline-dev texinfo" 54.21 +SPLIT="gmp-dev" 54.22 54.23 # Rules to configure and make the package. 54.24 compile_rules() 54.25 @@ -26,12 +27,6 @@ 54.26 make && make html && make install && make install-html 54.27 } 54.28 54.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 54.30 -genpkg_rules() 54.31 -{ 54.32 - cook_copy_files *.so* 54.33 -} 54.34 - 54.35 testsuite() 54.36 { 54.37 checklog=$(mktemp) 54.38 @@ -40,3 +35,12 @@ 54.39 echo "$pass / 190 tests passed" 54.40 rm $checklog 54.41 } 54.42 + 54.43 +# Rules to gen a SliTaz package suitable for Tazpkg. 54.44 +genpkg_rules() 54.45 +{ 54.46 + case $PACKAGE in 54.47 + gmp) copy @std;; 54.48 + *-dev) copy @dev;; 54.49 + esac 54.50 +}
55.1 --- a/libbfd/receipt Mon Jun 05 19:31:24 2017 +0000 55.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 55.3 @@ -1,19 +0,0 @@ 55.4 -# SliTaz package receipt. 55.5 - 55.6 -PACKAGE="libbfd" 55.7 -VERSION="2.27" 55.8 -CATEGORY="system-tools" 55.9 -SHORT_DESC="Binary File Descriptor library" 55.10 -MAINTAINER="erjo@slitaz.org" 55.11 -LICENSE="GPL2" 55.12 -WEB_SITE="http://www.gnu.org/software/binutils/" 55.13 -WANTED="binutils" 55.14 - 55.15 -DEPENDS="zlib" 55.16 - 55.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 55.18 -genpkg_rules() 55.19 -{ 55.20 - mkdir -p $fs/usr/lib 55.21 - cp -a $install/usr/lib/libbfd*.so $fs/usr/lib 55.22 -}
56.1 --- a/libgfortran/receipt Mon Jun 05 19:31:24 2017 +0000 56.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 56.3 @@ -1,18 +0,0 @@ 56.4 -# SliTaz package receipt. 56.5 - 56.6 -PACKAGE="libgfortran" 56.7 -VERSION="6.2.0" 56.8 -CATEGORY="misc" 56.9 -SHORT_DESC="GCC fortran runtime." 56.10 -WEB_SITE="http://gcc.gnu.org/" 56.11 -MAINTAINER="pascal.bellard@slitaz.org" 56.12 -LICENSE="GPL2" 56.13 - 56.14 -WANTED="gcc" 56.15 - 56.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 56.17 -genpkg_rules() 56.18 -{ 56.19 - mkdir -p $fs/usr/lib 56.20 - cp -a $install/usr/lib/libgfortran.so* $fs/usr/lib 56.21 -}
57.1 --- a/libgomp/receipt Mon Jun 05 19:31:24 2017 +0000 57.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 57.3 @@ -1,18 +0,0 @@ 57.4 -# SliTaz package receipt. 57.5 - 57.6 -PACKAGE="libgomp" 57.7 -VERSION="6.2.0" 57.8 -CATEGORY="development" 57.9 -SHORT_DESC="API specification for parallel programming." 57.10 -MAINTAINER="pascal.bellard@slitaz.org" 57.11 -LICENSE="GPL2" 57.12 -WEB_SITE="http://gcc.gnu.org/" 57.13 - 57.14 -WANTED="gcc" 57.15 - 57.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 57.17 -genpkg_rules() 57.18 -{ 57.19 - mkdir -p $fs/usr/lib 57.20 - cp -a $install/usr/lib/libgomp.so* $fs/usr/lib 57.21 -}
58.1 --- a/libmagic-dev/description.txt Mon Jun 05 19:31:24 2017 +0000 58.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 58.3 @@ -1,4 +0,0 @@ 58.4 -This library can be used to classify files according to magic number tests. 58.5 -It implements the core functionality of the file command. 58.6 - 58.7 -This package contains the development files.
59.1 --- a/libmagic-dev/receipt Mon Jun 05 19:31:24 2017 +0000 59.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 59.3 @@ -1,19 +0,0 @@ 59.4 -# SliTaz package receipt. 59.5 - 59.6 -PACKAGE="libmagic-dev" 59.7 -VERSION="5.28" 59.8 -CATEGORY="development" 59.9 -SHORT_DESC="File type determination library using 'magic' numbers (development)" 59.10 -MAINTAINER="erjo@slitaz.org" 59.11 -LICENSE="BSD" 59.12 -WEB_SITE="http://www.darwinsys.com/file/" 59.13 -HOST_ARCH="i486 arm" 59.14 - 59.15 -WANTED="file" 59.16 -DEPENDS="libmagic" 59.17 - 59.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 59.19 -genpkg_rules() 59.20 -{ 59.21 - cook_copy_files *.h *.la 59.22 -}
60.1 --- a/libmagic/description.txt Mon Jun 05 19:31:24 2017 +0000 60.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 60.3 @@ -1,2 +0,0 @@ 60.4 -This library can be used to classify files according to magic number tests. 60.5 -It implements the core functionality of the file command.
61.1 --- a/libmagic/receipt Mon Jun 05 19:31:24 2017 +0000 61.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 61.3 @@ -1,19 +0,0 @@ 61.4 -# SliTaz package receipt. 61.5 - 61.6 -PACKAGE="libmagic" 61.7 -VERSION="5.28" 61.8 -CATEGORY="system-tools" 61.9 -SHORT_DESC="File type determination library using 'magic' numbers" 61.10 -MAINTAINER="erjo@slitaz.org" 61.11 -LICENSE="BSD" 61.12 -WEB_SITE="http://www.darwinsys.com/file/" 61.13 -HOST_ARCH="i486 arm" 61.14 - 61.15 -WANTED="file" 61.16 -DEPENDS="zlib" 61.17 - 61.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 61.19 -genpkg_rules() 61.20 -{ 61.21 - cook_copy_files *.so* 61.22 -}
62.1 --- a/libobjc/receipt Mon Jun 05 19:31:24 2017 +0000 62.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 62.3 @@ -1,19 +0,0 @@ 62.4 -# SliTaz package receipt. 62.5 - 62.6 -PACKAGE="libobjc" 62.7 -VERSION="6.2.0" 62.8 -CATEGORY="development" 62.9 -SHORT_DESC="API for gcc object" 62.10 -MAINTAINER="slaxemulator@gmail.com" 62.11 -LICENSE="GPL2" 62.12 -WEB_SITE="http://gcc.gnu.org/" 62.13 - 62.14 -DEPENDS="gcc-lib-base" 62.15 -WANTED="gcc" 62.16 - 62.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 62.18 -genpkg_rules() 62.19 -{ 62.20 - mkdir -p $fs/usr/lib 62.21 - cp -a $install/usr/lib/libobjc.so* $fs/usr/lib 62.22 -}
63.1 --- a/m4/receipt Mon Jun 05 19:31:24 2017 +0000 63.2 +++ b/m4/receipt Tue Jun 06 17:37:54 2017 +0300 63.3 @@ -1,9 +1,9 @@ 63.4 -# SliTaz package receipt. 63.5 +# SliTaz package receipt v2. 63.6 63.7 PACKAGE="m4" 63.8 -VERSION="1.4.17" 63.9 +VERSION="1.4.18" 63.10 CATEGORY="development" 63.11 -SHORT_DESC="GNU traditional Unix macro processor." 63.12 +SHORT_DESC="GNU traditional Unix macro processor" 63.13 MAINTAINER="pankso@slitaz.org" 63.14 LICENSE="GPL3" 63.15 WEB_SITE="https://www.gnu.org/software/m4/m4.html"
64.1 --- a/mpc-library-dev/receipt Mon Jun 05 19:31:24 2017 +0000 64.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 64.3 @@ -1,19 +0,0 @@ 64.4 -# SliTaz package receipt. 64.5 - 64.6 -PACKAGE="mpc-library-dev" 64.7 -VERSION="1.0.3" 64.8 -CATEGORY="development" 64.9 -SHORT_DESC="MPC is a C library for the arithmetic of complex numbers." 64.10 -MAINTAINER="pankso@slitaz.org" 64.11 -LICENSE="GPL2" 64.12 -WEB_SITE="http://www.multiprecision.org/" 64.13 -HOST_ARCH="i486 arm" 64.14 - 64.15 -WANTED="mpc-library" 64.16 -DEPENDS="mpc-library mpfr-dev gmp-dev" 64.17 - 64.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 64.19 -genpkg_rules() 64.20 -{ 64.21 - cook_copy_files *.h *.la 64.22 -}
65.1 --- a/mpc-library/receipt Mon Jun 05 19:31:24 2017 +0000 65.2 +++ b/mpc-library/receipt Tue Jun 06 17:37:54 2017 +0300 65.3 @@ -1,9 +1,9 @@ 65.4 -# SliTaz package receipt. 65.5 +# SliTaz package receipt v2. 65.6 65.7 PACKAGE="mpc-library" 65.8 VERSION="1.0.3" 65.9 CATEGORY="development" 65.10 -SHORT_DESC="MPC is a C library for the arithmetic of complex numbers." 65.11 +SHORT_DESC="MPC library: complex numbers arithmetic" 65.12 MAINTAINER="pankso@slitaz.org" 65.13 LICENSE="GPL2" 65.14 WEB_SITE="http://www.multiprecision.org/" 65.15 @@ -12,13 +12,11 @@ 65.16 TARBALL="mpc-$VERSION.tar.gz" 65.17 WGET_URL="${WEB_SITE}mpc/download/$TARBALL" 65.18 65.19 -DEPENDS="mpfr gmp" 65.20 BUILD_DEPENDS="mpfr-dev gmp-dev texinfo" 65.21 +SPLIT="mpc-library-dev" 65.22 65.23 compile_rules() 65.24 { 65.25 - #patch -Np1 -i $stuff/libmpc-0.9-configure_cflags_egrep_issue.patch 65.26 - 65.27 ./configure \ 65.28 --disable-static \ 65.29 --docdir=/usr/share/doc/mpc-$VERSION \ 65.30 @@ -29,5 +27,14 @@ 65.31 # Rules to gen a SliTaz package suitable for Tazpkg. 65.32 genpkg_rules() 65.33 { 65.34 - cook_copy_files *.so* 65.35 + case $PACKAGE in 65.36 + mpc-library) 65.37 + copy @std 65.38 + DEPENDS="mpfr gmp" 65.39 + ;; 65.40 + *-dev) 65.41 + copy @dev 65.42 + DEPENDS="mpc-library mpfr-dev gmp-dev" 65.43 + ;; 65.44 + esac 65.45 }
66.1 --- a/mpc-library/stuff/libmpc-0.9-configure_cflags_egrep_issue.patch Mon Jun 05 19:31:24 2017 +0000 66.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 66.3 @@ -1,63 +0,0 @@ 66.4 ---- trunk/configure.ac 2011/02/21 12:18:31 932 66.5 -+++ trunk/configure.ac 2011/02/21 16:41:09 936 66.6 -@@ -33,7 +33,7 @@ 66.7 - AC_CANONICAL_HOST 66.8 - AC_CONFIG_MACRO_DIR([m4]) 66.9 - 66.10 --dnl Extra arguments to configure 66.11 -+# Extra arguments to configure 66.12 - AC_ARG_WITH([mpfr_include], 66.13 - [AC_HELP_STRING([--with-mpfr-include=DIR], 66.14 - [MPFR include directory])], 66.15 -@@ -85,18 +85,19 @@ 66.16 - ) 66.17 - 66.18 - 66.19 --dnl Setup CC and CFLAGS 66.20 -+# Setup CC and CFLAGS 66.21 -+AC_PROG_CC 66.22 -+AC_LANG(C) 66.23 - 66.24 --dnl Check for user specification of CC or CFLAGS 66.25 -+# Set up LibTool 66.26 -+AC_PROG_LIBTOOL 66.27 -+ 66.28 -+# Check for user specification of CC or CFLAGS 66.29 - if test -n "$CFLAGS" || test -n "$CC" ; then 66.30 - user_redefine_cc=yes 66.31 - fi 66.32 - 66.33 --# Check for programs 66.34 --AC_PROG_CC 66.35 --AC_LANG(C) 66.36 -- 66.37 --dnl Check GMP Header 66.38 -+# Check GMP Header 66.39 - AC_MSG_CHECKING(for gmp.h) 66.40 - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ 66.41 - #include "gmp.h" 66.42 -@@ -105,22 +106,19 @@ 66.43 - AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) 66.44 - ]) 66.45 - 66.46 --dnl Check for GMP CFLAGS in gmp.h 66.47 -+# Check for GMP CFLAGS in gmp.h 66.48 - if test -z "$user_redefine_cc" ; then 66.49 - MPC_GMP_CC_CFLAGS 66.50 - fi 66.51 - 66.52 - 66.53 --dnl Configs for Windows DLLs 66.54 -+# Configs for Windows DLLs 66.55 - case $host in 66.56 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) 66.57 - MPC_WINDOWS 66.58 - esac 66.59 - 66.60 - 66.61 --dnl Finally set up LibTool 66.62 --AC_PROG_LIBTOOL 66.63 -- 66.64 - # Checks for header files. 66.65 - AC_HEADER_STDC 66.66 - AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
67.1 --- a/mpfr-dev/receipt Mon Jun 05 19:31:24 2017 +0000 67.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 67.3 @@ -1,19 +0,0 @@ 67.4 -# SliTaz package receipt 67.5 - 67.6 -PACKAGE="mpfr-dev" 67.7 -VERSION="3.1.4" 67.8 -CATEGORY="development" 67.9 -SHORT_DESC="GNU Multiple Precision Arithmetic devel files." 67.10 -MAINTAINER="pankso@slitaz.org" 67.11 -LICENSE="GPL3" 67.12 -WEB_SITE="http://www.mpfr.org/" 67.13 -HOST_ARCH="i486 arm" 67.14 - 67.15 -WANTED="mpfr" 67.16 -DEPENDS="mpfr" 67.17 - 67.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 67.19 -genpkg_rules() 67.20 -{ 67.21 - cook_copy_files *.*a *.h 67.22 -}
68.1 --- a/mpfr/receipt Mon Jun 05 19:31:24 2017 +0000 68.2 +++ b/mpfr/receipt Tue Jun 06 17:37:54 2017 +0300 68.3 @@ -1,9 +1,9 @@ 68.4 -# SliTaz package receipt 68.5 +# SliTaz package receipt v2. 68.6 68.7 PACKAGE="mpfr" 68.8 -VERSION="3.1.4" 68.9 -CATEGORY="development" 68.10 -SHORT_DESC="C library for multiple-precision floating-point computations." 68.11 +VERSION="3.1.5" 68.12 +CATEGORY="libdevel" 68.13 +SHORT_DESC="Multiple-precision floating-point computations" 68.14 MAINTAINER="pankso@slitaz.org" 68.15 LICENSE="GPL3" 68.16 WEB_SITE="http://www.mpfr.org/" 68.17 @@ -12,8 +12,8 @@ 68.18 TARBALL="$PACKAGE-$VERSION.tar.xz" 68.19 WGET_URL="http://www.mpfr.org/$PACKAGE-$VERSION/$TARBALL" 68.20 68.21 -DEPENDS="gmp" 68.22 BUILD_DEPENDS="gmp-dev texinfo" 68.23 +SPLIT="mpfr-dev" 68.24 68.25 #--with-gmp-lib=/cross/$ARCH/sysroot/usr/lib 68.26 #--with-gmp-include=/cross/$ARCH/sysroot/usr/include 68.27 @@ -21,8 +21,6 @@ 68.28 # Rules to configure and make the package. 68.29 compile_rules() 68.30 { 68.31 -# patch -Np1 -i $stuff/mpfr-3.1.2-upstream_fixes-3.patch 68.32 - 68.33 ./configure \ 68.34 --disable-static \ 68.35 --enable-thread-safe \ 68.36 @@ -31,13 +29,16 @@ 68.37 make && make html && make install && make install-html 68.38 } 68.39 68.40 -# Rules to gen a SliTaz package suitable for Tazpkg. 68.41 -genpkg_rules() 68.42 -{ 68.43 - cook_copy_files *.so* 68.44 -} 68.45 - 68.46 testsuite() 68.47 { 68.48 case "$ARCH" in i?86) make check;; esac 68.49 } 68.50 + 68.51 +# Rules to gen a SliTaz package suitable for Tazpkg. 68.52 +genpkg_rules() 68.53 +{ 68.54 + case $PACKAGE in 68.55 + mpfr) copy @std; DEPENDS="gmp";; 68.56 + *-dev) copy @dev;; 68.57 + esac 68.58 +}
69.1 --- a/mpfr/stuff/mpfr-3.1.0.patch Mon Jun 05 19:31:24 2017 +0000 69.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 69.3 @@ -1,473 +0,0 @@ 69.4 -Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> 69.5 -Date: 2011-12-22 69.6 -Initial Package Version: 3.1.0 69.7 -Upstream Status: Already in upstream patch repo 69.8 -Origin: Upstream 69.9 -Description: This patch contains patches for several bugs in MPFR, 69.10 - the main one being a rounding related error with the 69.11 - mpfr_*printf functions. 69.12 - 69.13 -diff -Naur mpfr-3.1.0.orig/PATCHES mpfr-3.1.0/PATCHES 69.14 ---- mpfr-3.1.0.orig/PATCHES 2011-10-03 08:17:15.000000000 +0000 69.15 -+++ mpfr-3.1.0/PATCHES 2011-12-22 11:08:42.188819413 +0000 69.16 -@@ -0,0 +1,4 @@ 69.17 -+gmp41compat 69.18 -+vasprintf 69.19 -+lib-search-path 69.20 -+mpfr_unlikely 69.21 -diff -Naur mpfr-3.1.0.orig/VERSION mpfr-3.1.0/VERSION 69.22 ---- mpfr-3.1.0.orig/VERSION 2011-10-03 08:17:15.000000000 +0000 69.23 -+++ mpfr-3.1.0/VERSION 2011-11-28 12:22:52.000000000 +0000 69.24 -@@ -1 +1 @@ 69.25 --3.1.0 69.26 -+3.1.0-p4 69.27 -diff -Naur mpfr-3.1.0.orig/doc/mpfr.info mpfr-3.1.0/doc/mpfr.info 69.28 ---- mpfr-3.1.0.orig/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 69.29 -+++ mpfr-3.1.0/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 69.30 -@@ -2994,11 +2994,12 @@ 69.31 - 69.32 - * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their 69.33 - behavior no longer depends on the platform (assuming this is also 69.34 -- true for GMP's random generator). As a consequence, the returned 69.35 -- values can be different between MPFR 3.1 and previous MPFR 69.36 -- versions. Note: as the reproducibility of these functions was not 69.37 -- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded 69.38 -- as backward incompatible with previous versions. 69.39 -+ true for GMP's random generator, which is not the case between GMP 69.40 -+ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, 69.41 -+ the returned values can be different between MPFR 3.1 and previous 69.42 -+ MPFR versions. Note: as the reproducibility of these functions 69.43 -+ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ 69.44 -+ regarded as backward incompatible with previous versions. 69.45 - 69.46 - 69.47 - 69.48 -@@ -4239,13 +4240,13 @@ 69.49 - Node: Type and Macro Changes129308 69.50 - Node: Added Functions132029 69.51 - Node: Changed Functions134972 69.52 --Node: Removed Functions139167 69.53 --Node: Other Changes139579 69.54 --Node: Contributors141108 69.55 --Node: References143574 69.56 --Node: GNU Free Documentation License145315 69.57 --Node: Concept Index167758 69.58 --Node: Function and Type Index173677 69.59 -+Node: Removed Functions139253 69.60 -+Node: Other Changes139665 69.61 -+Node: Contributors141194 69.62 -+Node: References143660 69.63 -+Node: GNU Free Documentation License145401 69.64 -+Node: Concept Index167844 69.65 -+Node: Function and Type Index173763 69.66 - 69.67 - End Tag Table 69.68 - 69.69 -diff -Naur mpfr-3.1.0.orig/doc/mpfr.texi mpfr-3.1.0/doc/mpfr.texi 69.70 ---- mpfr-3.1.0.orig/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 69.71 -+++ mpfr-3.1.0/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 69.72 -@@ -3466,8 +3466,9 @@ 69.73 - a lack of specification. 69.74 - 69.75 - @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. 69.76 --Their behavior no longer depends on the platform (assuming this is also 69.77 --true for GMP's random generator). As a consequence, the returned values 69.78 -+Their behavior no longer depends on the platform (assuming this is also true 69.79 -+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if 69.80 -+@code{gmp_randinit_default} is used). As a consequence, the returned values 69.81 - can be different between MPFR 3.1 and previous MPFR versions. 69.82 - Note: as the reproducibility of these functions was not specified 69.83 - before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as 69.84 -diff -Naur mpfr-3.1.0.orig/src/mpfr-impl.h mpfr-3.1.0/src/mpfr-impl.h 69.85 ---- mpfr-3.1.0.orig/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 69.86 -+++ mpfr-3.1.0/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 69.87 -@@ -988,10 +988,11 @@ 69.88 - ******************************************************/ 69.89 - 69.90 - /* Theses macros help the compiler to determine if a test is 69.91 -- * likely or unlikely. */ 69.92 -+ likely or unlikely. The !! is necessary in case x is larger 69.93 -+ than a long. */ 69.94 - #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) 69.95 - # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) 69.96 --# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) 69.97 -+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) 69.98 - #else 69.99 - # define MPFR_LIKELY(x) (x) 69.100 - # define MPFR_UNLIKELY(x) (x) 69.101 -diff -Naur mpfr-3.1.0.orig/src/mpfr.h mpfr-3.1.0/src/mpfr.h 69.102 ---- mpfr-3.1.0.orig/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 69.103 -+++ mpfr-3.1.0/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 69.104 -@@ -27,7 +27,7 @@ 69.105 - #define MPFR_VERSION_MAJOR 3 69.106 - #define MPFR_VERSION_MINOR 1 69.107 - #define MPFR_VERSION_PATCHLEVEL 0 69.108 --#define MPFR_VERSION_STRING "3.1.0" 69.109 -+#define MPFR_VERSION_STRING "3.1.0-p4" 69.110 - 69.111 - /* Macros dealing with MPFR VERSION */ 69.112 - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) 69.113 -diff -Naur mpfr-3.1.0.orig/src/vasprintf.c mpfr-3.1.0/src/vasprintf.c 69.114 ---- mpfr-3.1.0.orig/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 69.115 -+++ mpfr-3.1.0/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 69.116 -@@ -1178,7 +1178,7 @@ 69.117 - mpfr_exp_t exp; 69.118 - char * str; 69.119 - const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); 69.120 -- const int keep_trailing_zeros = spec_g && spec.alt; 69.121 -+ const int keep_trailing_zeros = !spec_g || spec.alt; 69.122 - 69.123 - /* WARNING: an empty precision field is forbidden (it means precision = 6 69.124 - and it should have been changed to 6 before the function call) */ 69.125 -@@ -1356,7 +1356,7 @@ 69.126 - else 69.127 - /* 1 <= |p| */ 69.128 - { 69.129 -- size_t nsd; /* Number of significant digits */ 69.130 -+ size_t str_len; 69.131 - 69.132 - /* Determine the position of the most significant decimal digit. */ 69.133 - exp = floor_log10 (p); 69.134 -@@ -1365,12 +1365,10 @@ 69.135 - /* P is too large to print all its integral part digits */ 69.136 - return -1; 69.137 - 69.138 -- np->ip_size = exp + 1; 69.139 -- 69.140 -- nsd = spec.prec + np->ip_size; 69.141 - if (dec_info == NULL) 69.142 -- { 69.143 -- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); 69.144 -+ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ 69.145 -+ str = 69.146 -+ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); 69.147 - register_string (np->sl, str); 69.148 - } 69.149 - else 69.150 -@@ -1379,81 +1377,60 @@ 69.151 - str = dec_info->str; 69.152 - } 69.153 - np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ 69.154 -+ str_len = strlen (str); 69.155 -+ 69.156 -+ /* integral part */ 69.157 -+ if (exp > str_len) 69.158 -+ /* mpfr_get_str gives no trailing zero when p is rounded up to the next 69.159 -+ power of 10 (p integer, so no fractional part) */ 69.160 -+ { 69.161 -+ np->ip_trailing_zeros = exp - str_len; 69.162 -+ np->ip_size = str_len; 69.163 -+ } 69.164 -+ else 69.165 -+ np->ip_size = exp; 69.166 - 69.167 - if (spec.group) 69.168 - /* thousands separator in integral part */ 69.169 - np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; 69.170 - 69.171 -- if (nsd == 0 || (spec_g && !spec.alt)) 69.172 -- /* compute how much non-zero digits in integral and fractional 69.173 -- parts */ 69.174 -+ /* fractional part */ 69.175 -+ str += np->ip_size; 69.176 -+ str_len -= np->ip_size; 69.177 -+ if (!keep_trailing_zeros) 69.178 -+ /* remove trailing zeros, if any */ 69.179 - { 69.180 -- size_t str_len; 69.181 -- str_len = strlen (str); /* note: the sign has been skipped */ 69.182 -- 69.183 -- if (exp > str_len) 69.184 -- /* mpfr_get_str doesn't give the trailing zeros when p is a 69.185 -- multiple of 10 (p integer, so no fractional part) */ 69.186 -+ char *ptr = str + str_len - 1; /* pointer to the last digit of 69.187 -+ str */ 69.188 -+ while ((*ptr == '0') && (str_len != 0)) 69.189 - { 69.190 -- np->ip_trailing_zeros = exp - str_len; 69.191 -- np->ip_size = str_len; 69.192 -- if (spec.alt) 69.193 -- np->point = MPFR_DECIMAL_POINT; 69.194 -- } 69.195 -- else 69.196 -- /* str may contain some digits which are in fractional part */ 69.197 -- { 69.198 -- char *ptr; 69.199 -- 69.200 -- ptr = str + str_len - 1; /* points to the end of str */ 69.201 -- str_len -= np->ip_size; /* number of digits in fractional 69.202 -- part */ 69.203 -- 69.204 -- if (!keep_trailing_zeros) 69.205 -- /* remove trailing zeros, if any */ 69.206 -- { 69.207 -- while ((*ptr == '0') && (str_len != 0)) 69.208 -- { 69.209 -- --ptr; 69.210 -- --str_len; 69.211 -- } 69.212 -- } 69.213 -- 69.214 -- if (str_len > INT_MAX) 69.215 -- /* too many digits in fractional part */ 69.216 -- return -1; 69.217 -- 69.218 -- if (str_len != 0) 69.219 -- /* some digits in fractional part */ 69.220 -- { 69.221 -- np->point = MPFR_DECIMAL_POINT; 69.222 -- np->fp_ptr = str + np->ip_size; 69.223 -- np->fp_size = str_len; 69.224 -- } 69.225 -+ --ptr; 69.226 -+ --str_len; 69.227 - } 69.228 - } 69.229 -- else 69.230 -- /* spec.prec digits in fractional part */ 69.231 -- { 69.232 -- if (np->ip_size == exp - 1) 69.233 -- /* the absolute value of the number has been rounded up to a power 69.234 -- of ten. 69.235 -- Insert an additional zero in integral part and put the rest of 69.236 -- them in fractional part. */ 69.237 -- np->ip_trailing_zeros = 1; 69.238 - 69.239 -- if (spec.prec != 0) 69.240 -- { 69.241 -- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); 69.242 -- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); 69.243 -+ if (str_len > 0) 69.244 -+ /* some nonzero digits in fractional part */ 69.245 -+ { 69.246 -+ if (str_len > INT_MAX) 69.247 -+ /* too many digits in fractional part */ 69.248 -+ return -1; 69.249 -+ 69.250 -+ np->point = MPFR_DECIMAL_POINT; 69.251 -+ np->fp_ptr = str; 69.252 -+ np->fp_size = str_len; 69.253 -+ } 69.254 - 69.255 -- np->point = MPFR_DECIMAL_POINT; 69.256 -- np->fp_ptr = str + np->ip_size; 69.257 -- np->fp_size = spec.prec; 69.258 -- } 69.259 -- else if (spec.alt) 69.260 -- np->point = MPFR_DECIMAL_POINT; 69.261 -+ if (keep_trailing_zeros && str_len < spec.prec) 69.262 -+ /* add missing trailing zeros */ 69.263 -+ { 69.264 -+ np->point = MPFR_DECIMAL_POINT; 69.265 -+ np->fp_trailing_zeros = spec.prec - np->fp_size; 69.266 - } 69.267 -+ 69.268 -+ if (spec.alt) 69.269 -+ /* add decimal point even if no digits follow it */ 69.270 -+ np->point = MPFR_DECIMAL_POINT; 69.271 - } 69.272 - 69.273 - return 0; 69.274 -diff -Naur mpfr-3.1.0.orig/src/version.c mpfr-3.1.0/src/version.c 69.275 ---- mpfr-3.1.0.orig/src/version.c 2011-10-03 08:17:09.000000000 +0000 69.276 -+++ mpfr-3.1.0/src/version.c 2011-11-28 12:22:52.000000000 +0000 69.277 -@@ -25,5 +25,5 @@ 69.278 - const char * 69.279 - mpfr_get_version (void) 69.280 - { 69.281 -- return "3.1.0"; 69.282 -+ return "3.1.0-p4"; 69.283 - } 69.284 -diff -Naur mpfr-3.1.0.orig/tests/Makefile.am mpfr-3.1.0/tests/Makefile.am 69.285 ---- mpfr-3.1.0.orig/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 69.286 -+++ mpfr-3.1.0/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 69.287 -@@ -65,8 +65,24 @@ 69.288 - TESTS = $(check_PROGRAMS) 69.289 - TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) 69.290 - 69.291 --# Option to prevent libtool from generating wrapper scripts for the tests. 69.292 -+# The -no-install option prevents libtool from generating wrapper scripts 69.293 -+# for the tests. 69.294 - # This is useful to easily run the test scripts under valgrind or gdb. 69.295 - # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 69.296 - # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. 69.297 --AM_LDFLAGS = -no-install 69.298 -+# 69.299 -+# The -L$(top_builddir)/src/.libs option is necessary for some platforms, 69.300 -+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR 69.301 -+# library is already installed in the corresponding lib directory: its 69.302 -+# purpose is to make sure that the local .libs comes first in the library 69.303 -+# search path (otherwise the tests are linked against the old MPFR library 69.304 -+# by the LINK command -- see the generated Makefile). See: 69.305 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html 69.306 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html 69.307 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html 69.308 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html 69.309 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html 69.310 -+# and 69.311 -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 69.312 -+# 69.313 -+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs 69.314 -diff -Naur mpfr-3.1.0.orig/tests/Makefile.in mpfr-3.1.0/tests/Makefile.in 69.315 ---- mpfr-3.1.0.orig/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 69.316 -+++ mpfr-3.1.0/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 69.317 -@@ -1124,11 +1124,27 @@ 69.318 - TESTS = $(check_PROGRAMS) 69.319 - TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) 69.320 - 69.321 --# Option to prevent libtool from generating wrapper scripts for the tests. 69.322 -+# The -no-install option prevents libtool from generating wrapper scripts 69.323 -+# for the tests. 69.324 - # This is useful to easily run the test scripts under valgrind or gdb. 69.325 - # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 69.326 - # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. 69.327 --AM_LDFLAGS = -no-install 69.328 -+# 69.329 -+# The -L$(top_builddir)/src/.libs option is necessary for some platforms, 69.330 -+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR 69.331 -+# library is already installed in the corresponding lib directory: its 69.332 -+# purpose is to make sure that the local .libs comes first in the library 69.333 -+# search path (otherwise the tests are linked against the old MPFR library 69.334 -+# by the LINK command -- see the generated Makefile). See: 69.335 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html 69.336 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html 69.337 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html 69.338 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html 69.339 -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html 69.340 -+# and 69.341 -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 69.342 -+# 69.343 -+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs 69.344 - all: all-am 69.345 - 69.346 - .SUFFIXES: 69.347 -diff -Naur mpfr-3.1.0.orig/tests/trandom.c mpfr-3.1.0/tests/trandom.c 69.348 ---- mpfr-3.1.0.orig/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 69.349 -+++ mpfr-3.1.0/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 69.350 -@@ -114,21 +114,29 @@ 69.351 - mpfr_t x; 69.352 - gmp_randstate_t s; 69.353 - 69.354 -+#if __MPFR_GMP(4,2,0) 69.355 -+# define C1 "0.895943" 69.356 -+# define C2 "0.848824" 69.357 -+#else 69.358 -+# define C1 "0.479652" 69.359 -+# define C2 "0.648529" 69.360 -+#endif 69.361 -+ 69.362 - gmp_randinit_default (s); 69.363 - gmp_randseed_ui (s, 42); 69.364 - mpfr_init2 (x, 17); 69.365 - mpfr_urandomb (x, s); 69.366 -- if (mpfr_cmp_str1 (x, "0.895943") != 0) 69.367 -+ if (mpfr_cmp_str1 (x, C1) != 0) 69.368 - { 69.369 -- printf ("Error in bug20100914, expected 0.895943, got "); 69.370 -+ printf ("Error in bug20100914, expected " C1 ", got "); 69.371 - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); 69.372 - printf ("\n"); 69.373 - exit (1); 69.374 - } 69.375 - mpfr_urandomb (x, s); 69.376 -- if (mpfr_cmp_str1 (x, "0.848824") != 0) 69.377 -+ if (mpfr_cmp_str1 (x, C2) != 0) 69.378 - { 69.379 -- printf ("Error in bug20100914, expected 0.848824, got "); 69.380 -+ printf ("Error in bug20100914, expected " C2 ", got "); 69.381 - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); 69.382 - printf ("\n"); 69.383 - exit (1); 69.384 -diff -Naur mpfr-3.1.0.orig/tests/tsprintf.c mpfr-3.1.0/tests/tsprintf.c 69.385 ---- mpfr-3.1.0.orig/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 69.386 -+++ mpfr-3.1.0/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 69.387 -@@ -475,6 +475,18 @@ 69.388 - check_sprintf ("-1.", "%- #0.1RG", x); 69.389 - 69.390 - /* precision zero */ 69.391 -+ mpfr_set_d (x, 9.5, MPFR_RNDN); 69.392 -+ check_sprintf ("9", "%.0RDf", x); 69.393 -+ check_sprintf ("10", "%.0RUf", x); 69.394 -+ 69.395 -+ mpfr_set_d (x, 19.5, MPFR_RNDN); 69.396 -+ check_sprintf ("19", "%.0RDf", x); 69.397 -+ check_sprintf ("20", "%.0RUf", x); 69.398 -+ 69.399 -+ mpfr_set_d (x, 99.5, MPFR_RNDN); 69.400 -+ check_sprintf ("99", "%.0RDf", x); 69.401 -+ check_sprintf ("100", "%.0RUf", x); 69.402 -+ 69.403 - mpfr_set_d (x, -9.5, MPFR_RNDN); 69.404 - check_sprintf ("-10", "%.0RDf", x); 69.405 - check_sprintf ("-10", "%.0RYf", x); 69.406 -@@ -1078,6 +1090,23 @@ 69.407 - mpfr_clear (x); 69.408 - } 69.409 - 69.410 -+static void 69.411 -+bug20111102 (void) 69.412 -+{ 69.413 -+ mpfr_t t; 69.414 -+ char s[100]; 69.415 -+ 69.416 -+ mpfr_init2 (t, 84); 69.417 -+ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); 69.418 -+ mpfr_sprintf (s, "%.20RNg", t); 69.419 -+ if (strcmp (s, "1000") != 0) 69.420 -+ { 69.421 -+ printf ("Error in bug20111102, expected 1000, got %s\n", s); 69.422 -+ exit (1); 69.423 -+ } 69.424 -+ mpfr_clear (t); 69.425 -+} 69.426 -+ 69.427 - /* In particular, the following test makes sure that the rounding 69.428 - * for %Ra and %Rb is not done on the MPFR number itself (as it 69.429 - * would overflow). Note: it has been reported on comp.std.c that 69.430 -@@ -1161,6 +1190,7 @@ 69.431 - locale = setlocale (LC_ALL, "C"); 69.432 - #endif 69.433 - 69.434 -+ bug20111102 (); 69.435 - native_types (); 69.436 - hexadecimal (); 69.437 - binary (); 69.438 -diff -Naur mpfr-3.1.0.orig/tests/turandom.c mpfr-3.1.0/tests/turandom.c 69.439 ---- mpfr-3.1.0.orig/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 69.440 -+++ mpfr-3.1.0/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 69.441 -@@ -160,23 +160,29 @@ 69.442 - mpfr_t x; 69.443 - gmp_randstate_t s; 69.444 - 69.445 -+#if __MPFR_GMP(4,2,0) 69.446 -+# define C1 "0.8488312" 69.447 -+# define C2 "0.8156509" 69.448 -+#else 69.449 -+# define C1 "0.6485367" 69.450 -+# define C2 "0.9362717" 69.451 -+#endif 69.452 -+ 69.453 - gmp_randinit_default (s); 69.454 - gmp_randseed_ui (s, 42); 69.455 - mpfr_init2 (x, 17); 69.456 - mpfr_urandom (x, s, MPFR_RNDN); 69.457 -- /* the following values are obtained on a 32-bit computer, we should get 69.458 -- the same values on a 64-bit computer */ 69.459 -- if (mpfr_cmp_str1 (x, "0.8488312") != 0) 69.460 -+ if (mpfr_cmp_str1 (x, C1) != 0) 69.461 - { 69.462 -- printf ("Error in bug20100914, expected 0.8488312, got "); 69.463 -+ printf ("Error in bug20100914, expected " C1 ", got "); 69.464 - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); 69.465 - printf ("\n"); 69.466 - exit (1); 69.467 - } 69.468 - mpfr_urandom (x, s, MPFR_RNDN); 69.469 -- if (mpfr_cmp_str1 (x, "0.8156509") != 0) 69.470 -+ if (mpfr_cmp_str1 (x, C2) != 0) 69.471 - { 69.472 -- printf ("Error in bug20100914, expected 0.8156509, got "); 69.473 -+ printf ("Error in bug20100914, expected " C2 ", got "); 69.474 - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); 69.475 - printf ("\n"); 69.476 - exit (1);
70.1 --- a/mpfr/stuff/mpfr-3.1.2-upstream_fixes-3.patch Mon Jun 05 19:31:24 2017 +0000 70.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 70.3 @@ -1,1199 +0,0 @@ 70.4 -Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> 70.5 -Updated By: Armin K. <krejzi at email dot com> 70.6 -Date: 2015-02-06 70.7 -Initial Package Version: 3.1.2 70.8 -Upstream Status: Already in upstream patch repo 70.9 -Origin: Upstream 70.10 -Description: This patch contains patches for several bugs in MPFR. 70.11 - Note that the patch for configure.ac has been 70.12 - removed to prevent unneeded regeneration of build 70.13 - files. 70.14 - See http://www.mpfr.org/mpfr-current/allpatches 70.15 - 70.16 ---- a/PATCHES 2013-03-13 16:37:38.000000000 +0100 70.17 -+++ b/PATCHES 2014-12-31 14:56:02.685641958 +0100 70.18 -@@ -0,0 +1,11 @@ 70.19 -+strtofr 70.20 -+vasprintf 70.21 -+div-overflow 70.22 -+gmp6-compat 70.23 -+exp3 70.24 -+li2-return 70.25 -+custom_init_set 70.26 -+printf-alt0 70.27 -+clang-divby0 70.28 -+fits-smallneg 70.29 -+exp_2 70.30 ---- a/src/div.c 2013-03-13 16:37:33.000000000 +0100 70.31 -+++ b/src/div.c 2014-12-31 14:56:02.686641971 +0100 70.32 -@@ -750,7 +750,9 @@ 70.33 - truncate_check_qh: 70.34 - if (qh) 70.35 - { 70.36 -- qexp ++; 70.37 -+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX)) 70.38 -+ qexp ++; 70.39 -+ /* else qexp is now incorrect, but one will still get an overflow */ 70.40 - q0p[q0size - 1] = MPFR_LIMB_HIGHBIT; 70.41 - } 70.42 - goto truncate; 70.43 -@@ -765,7 +767,9 @@ 70.44 - inex = 1; /* always here */ 70.45 - if (mpn_add_1 (q0p, q0p, q0size, MPFR_LIMB_ONE << sh)) 70.46 - { 70.47 -- qexp ++; 70.48 -+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX)) 70.49 -+ qexp ++; 70.50 -+ /* else qexp is now incorrect, but one will still get an overflow */ 70.51 - q0p[q0size - 1] = MPFR_LIMB_HIGHBIT; 70.52 - } 70.53 - 70.54 ---- a/src/exp_2.c 2013-03-13 16:37:28.000000000 +0100 70.55 -+++ b/src/exp_2.c 2014-12-31 14:56:02.686641971 +0100 70.56 -@@ -204,7 +204,7 @@ 70.57 - for (k = 0; k < K; k++) 70.58 - { 70.59 - mpz_mul (ss, ss, ss); 70.60 -- exps <<= 1; 70.61 -+ exps *= 2; 70.62 - exps += mpz_normalize (ss, ss, q); 70.63 - } 70.64 - mpfr_set_z (s, ss, MPFR_RNDN); 70.65 ---- a/src/exp3.c 2013-03-13 16:37:34.000000000 +0100 70.66 -+++ b/src/exp3.c 2014-12-31 14:56:02.686641971 +0100 70.67 -@@ -283,7 +283,7 @@ 70.68 - } 70.69 - } 70.70 - 70.71 -- if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDD, MPFR_RNDZ, 70.72 -+ if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDN, MPFR_RNDZ, 70.73 - MPFR_PREC(y) + (rnd_mode == MPFR_RNDN))) 70.74 - { 70.75 - inexact = mpfr_set (y, shift_x > 0 ? t : tmp, rnd_mode); 70.76 ---- a/src/fits_u.h 2013-03-13 16:37:35.000000000 +0100 70.77 -+++ b/src/fits_u.h 2014-12-31 14:56:02.686641971 +0100 70.78 -@@ -32,17 +32,20 @@ 70.79 - int res; 70.80 - 70.81 - if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) 70.82 -- /* Zero always fit */ 70.83 -- return MPFR_IS_ZERO (f) ? 1 : 0; 70.84 -- else if (MPFR_IS_NEG (f)) 70.85 -- /* Negative numbers don't fit */ 70.86 -- return 0; 70.87 -- /* now it fits if 70.88 -- (a) f <= MAXIMUM 70.89 -- (b) round(f, prec(slong), rnd) <= MAXIMUM */ 70.90 -+ return MPFR_IS_ZERO (f) ? 1 : 0; /* Zero always fits */ 70.91 - 70.92 - e = MPFR_GET_EXP (f); 70.93 - 70.94 -+ if (MPFR_IS_NEG (f)) 70.95 -+ return e >= 1 ? 0 /* f <= -1 does not fit */ 70.96 -+ : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1) /* directed mode */ 70.97 -+ : e < 0 ? 1 /* f > -1/2 fits in MPFR_RNDN */ 70.98 -+ : mpfr_powerof2_raw(f); /* -1/2 fits, -1 < f < -1/2 don't */ 70.99 -+ 70.100 -+ /* Now it fits if 70.101 -+ (a) f <= MAXIMUM 70.102 -+ (b) round(f, prec(slong), rnd) <= MAXIMUM */ 70.103 -+ 70.104 - /* first compute prec(MAXIMUM); fits in an int */ 70.105 - for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++); 70.106 - 70.107 ---- a/src/fits_uintmax.c 2013-03-13 16:37:33.000000000 +0100 70.108 -+++ b/src/fits_uintmax.c 2014-12-31 14:56:02.686641971 +0100 70.109 -@@ -27,51 +27,19 @@ 70.110 - #include "mpfr-intmax.h" 70.111 - #include "mpfr-impl.h" 70.112 - 70.113 --#ifdef _MPFR_H_HAVE_INTMAX_T 70.114 -- 70.115 --/* We can't use fits_u.h <= mpfr_cmp_ui */ 70.116 --int 70.117 --mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd) 70.118 --{ 70.119 -- mpfr_exp_t e; 70.120 -- int prec; 70.121 -- uintmax_t s; 70.122 -- mpfr_t x; 70.123 -- int res; 70.124 -- 70.125 -- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) 70.126 -- /* Zero always fit */ 70.127 -- return MPFR_IS_ZERO (f) ? 1 : 0; 70.128 -- else if (MPFR_IS_NEG (f)) 70.129 -- /* Negative numbers don't fit */ 70.130 -- return 0; 70.131 -- /* now it fits if 70.132 -- (a) f <= MAXIMUM 70.133 -- (b) round(f, prec(slong), rnd) <= MAXIMUM */ 70.134 -- 70.135 -- e = MPFR_GET_EXP (f); 70.136 -+/* Note: though mpfr-impl.h is included in fits_u.h, we also include it 70.137 -+ above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not 70.138 -+ defined; this is necessary to avoid an empty translation unit, which 70.139 -+ is forbidden by ISO C. Without this, a failing test can be reproduced 70.140 -+ by creating an invalid stdint.h somewhere in the default include path 70.141 -+ and by compiling MPFR with "gcc -ansi -pedantic-errors". */ 70.142 - 70.143 -- /* first compute prec(MAXIMUM); fits in an int */ 70.144 -- for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++); 70.145 -- 70.146 -- /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */ 70.147 -- 70.148 -- /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */ 70.149 -- if (e <= prec - 1) 70.150 -- return 1; 70.151 -- 70.152 -- /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */ 70.153 -- if (e >= prec + 1) 70.154 -- return 0; 70.155 -+#ifdef _MPFR_H_HAVE_INTMAX_T 70.156 - 70.157 -- MPFR_ASSERTD (e == prec); 70.158 -+#define FUNCTION mpfr_fits_uintmax_p 70.159 -+#define MAXIMUM MPFR_UINTMAX_MAX 70.160 -+#define TYPE uintmax_t 70.161 - 70.162 -- /* hard case: first round to prec bits, then check */ 70.163 -- mpfr_init2 (x, prec); 70.164 -- mpfr_set (x, f, rnd); 70.165 -- res = MPFR_GET_EXP (x) == e; 70.166 -- mpfr_clear (x); 70.167 -- return res; 70.168 --} 70.169 -+#include "fits_u.h" 70.170 - 70.171 - #endif 70.172 ---- a/src/init2.c 2013-03-13 16:37:32.000000000 +0100 70.173 -+++ b/src/init2.c 2014-12-31 14:56:02.686641971 +0100 70.174 -@@ -30,11 +30,11 @@ 70.175 - 70.176 - /* Check if we can represent the number of limbs 70.177 - * associated to the maximum of mpfr_prec_t*/ 70.178 -- MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/BYTES_PER_MP_LIMB) ); 70.179 -+ MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/MPFR_BYTES_PER_MP_LIMB) ); 70.180 - 70.181 -- /* Check for correct GMP_NUMB_BITS and BYTES_PER_MP_LIMB */ 70.182 -- MPFR_ASSERTN( GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT 70.183 -- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ); 70.184 -+ /* Check for correct GMP_NUMB_BITS and MPFR_BYTES_PER_MP_LIMB */ 70.185 -+ MPFR_ASSERTN( GMP_NUMB_BITS == MPFR_BYTES_PER_MP_LIMB * CHAR_BIT 70.186 -+ && sizeof(mp_limb_t) == MPFR_BYTES_PER_MP_LIMB ); 70.187 - 70.188 - MPFR_ASSERTN (mp_bits_per_limb == GMP_NUMB_BITS); 70.189 - 70.190 ---- a/src/li2.c 2013-03-13 16:37:32.000000000 +0100 70.191 -+++ b/src/li2.c 2014-12-31 14:56:02.686641971 +0100 70.192 -@@ -630,5 +630,5 @@ 70.193 - return mpfr_check_range (y, inexact, rnd_mode); 70.194 - } 70.195 - 70.196 -- MPFR_ASSERTN (0); /* should never reach this point */ 70.197 -+ MPFR_RET_NEVER_GO_HERE (); 70.198 - } 70.199 ---- a/src/mpfr-gmp.h 2013-03-13 16:37:32.000000000 +0100 70.200 -+++ b/src/mpfr-gmp.h 2014-12-31 14:56:02.687641984 +0100 70.201 -@@ -72,7 +72,6 @@ 70.202 - #endif 70.203 - 70.204 - /* Define some macros */ 70.205 --#define BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT) 70.206 - 70.207 - #define MP_LIMB_T_MAX (~(mp_limb_t)0) 70.208 - 70.209 -@@ -96,19 +95,19 @@ 70.210 - #define SHRT_HIGHBIT SHRT_MIN 70.211 - 70.212 - /* MP_LIMB macros */ 70.213 --#define MPN_ZERO(dst, n) memset((dst), 0, (n)*BYTES_PER_MP_LIMB) 70.214 --#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB) 70.215 --#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB) 70.216 -+#define MPN_ZERO(dst, n) memset((dst), 0, (n)*MPFR_BYTES_PER_MP_LIMB) 70.217 -+#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB) 70.218 -+#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB) 70.219 - #define MPN_COPY(dst,src,n) \ 70.220 - do \ 70.221 - { \ 70.222 - if ((dst) != (src)) \ 70.223 - { \ 70.224 - MPFR_ASSERTD ((char *) (dst) >= (char *) (src) + \ 70.225 -- (n) * BYTES_PER_MP_LIMB || \ 70.226 -+ (n) * MPFR_BYTES_PER_MP_LIMB || \ 70.227 - (char *) (src) >= (char *) (dst) + \ 70.228 -- (n) * BYTES_PER_MP_LIMB); \ 70.229 -- memcpy ((dst), (src), (n) * BYTES_PER_MP_LIMB); \ 70.230 -+ (n) * MPFR_BYTES_PER_MP_LIMB); \ 70.231 -+ memcpy ((dst), (src), (n) * MPFR_BYTES_PER_MP_LIMB); \ 70.232 - } \ 70.233 - } \ 70.234 - while (0) 70.235 ---- a/src/mpfr.h 2013-03-13 16:37:37.000000000 +0100 70.236 -+++ b/src/mpfr.h 2014-12-31 14:56:02.687641984 +0100 70.237 -@@ -27,7 +27,7 @@ 70.238 - #define MPFR_VERSION_MAJOR 3 70.239 - #define MPFR_VERSION_MINOR 1 70.240 - #define MPFR_VERSION_PATCHLEVEL 2 70.241 --#define MPFR_VERSION_STRING "3.1.2" 70.242 -+#define MPFR_VERSION_STRING "3.1.2-p11" 70.243 - 70.244 - /* Macros dealing with MPFR VERSION */ 70.245 - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) 70.246 -@@ -861,7 +861,7 @@ 70.247 - _t = (mpfr_kind_t) _k; \ 70.248 - _s = 1; \ 70.249 - } else { \ 70.250 -- _t = (mpfr_kind_t) -k; \ 70.251 -+ _t = (mpfr_kind_t) - _k; \ 70.252 - _s = -1; \ 70.253 - } \ 70.254 - _e = _t == MPFR_REGULAR_KIND ? (e) : \ 70.255 ---- a/src/mpfr-impl.h 2013-03-13 16:37:36.000000000 +0100 70.256 -+++ b/src/mpfr-impl.h 2014-12-31 14:56:02.687641984 +0100 70.257 -@@ -191,7 +191,7 @@ 70.258 - # endif 70.259 - #endif 70.260 - 70.261 -- 70.262 -+#define MPFR_BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT) 70.263 - 70.264 - /****************************************************** 70.265 - ******************** Check GMP *********************** 70.266 -@@ -468,8 +468,16 @@ 70.267 - #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1) 70.268 - 70.269 - /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0 70.270 -- at compile time. */ 70.271 --#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200) 70.272 -+ at compile time. 70.273 -+ Clang with -fsanitize=undefined is a bit similar due to a bug: 70.274 -+ http://llvm.org/bugs/show_bug.cgi?id=17381 70.275 -+ but even without its sanitizer, it may be better to use the 70.276 -+ double_zero version until IEEE 754 division by zero is properly 70.277 -+ supported: 70.278 -+ http://llvm.org/bugs/show_bug.cgi?id=17000 70.279 -+*/ 70.280 -+#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \ 70.281 -+ defined(__clang__) 70.282 - static double double_zero = 0.0; 70.283 - # define DBL_NAN (double_zero/double_zero) 70.284 - # define DBL_POS_INF ((double) 1.0/double_zero) 70.285 -@@ -501,6 +509,8 @@ 70.286 - (with Xcode 2.4.1, i.e. the latest one). */ 70.287 - #define LVALUE(x) (&(x) == &(x) || &(x) != &(x)) 70.288 - #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX)) 70.289 -+/* The DOUBLE_ISNAN(x) macro is also valid on long double x 70.290 -+ (assuming that the compiler isn't too broken). */ 70.291 - #ifdef MPFR_NANISNAN 70.292 - /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations. 70.293 - The + must not be replaced by a ||. With gcc -ffast-math, NaN is 70.294 -@@ -920,7 +930,7 @@ 70.295 - #define MPFR_SET_ALLOC_SIZE(x, n) \ 70.296 - ( ((mp_size_t*) MPFR_MANT(x))[-1] = n) 70.297 - #define MPFR_MALLOC_SIZE(s) \ 70.298 -- ( sizeof(mpfr_size_limb_t) + BYTES_PER_MP_LIMB * ((size_t) s) ) 70.299 -+ ( sizeof(mpfr_size_limb_t) + MPFR_BYTES_PER_MP_LIMB * ((size_t) s) ) 70.300 - #define MPFR_SET_MANT_PTR(x,p) \ 70.301 - (MPFR_MANT(x) = (mp_limb_t*) ((mpfr_size_limb_t*) p + 1)) 70.302 - #define MPFR_GET_REAL_PTR(x) \ 70.303 -@@ -954,7 +964,7 @@ 70.304 - #endif 70.305 - 70.306 - #define MPFR_TMP_LIMBS_ALLOC(N) \ 70.307 -- ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * BYTES_PER_MP_LIMB)) 70.308 -+ ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * MPFR_BYTES_PER_MP_LIMB)) 70.309 - 70.310 - /* temporary allocate 1 limb at xp, and initialize mpfr variable x */ 70.311 - /* The temporary var doesn't have any size field, but it doesn't matter 70.312 ---- a/src/mul.c 2013-03-13 16:37:37.000000000 +0100 70.313 -+++ b/src/mul.c 2014-12-31 14:56:02.688641997 +0100 70.314 -@@ -106,7 +106,7 @@ 70.315 - MPFR_ASSERTD(tn <= k); 70.316 - 70.317 - /* Check for no size_t overflow*/ 70.318 -- MPFR_ASSERTD((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB); 70.319 -+ MPFR_ASSERTD((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB); 70.320 - MPFR_TMP_MARK(marker); 70.321 - tmp = MPFR_TMP_LIMBS_ALLOC (k); 70.322 - 70.323 -@@ -301,7 +301,7 @@ 70.324 - MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ 70.325 - 70.326 - /* Check for no size_t overflow*/ 70.327 -- MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB); 70.328 -+ MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB); 70.329 - MPFR_TMP_MARK (marker); 70.330 - tmp = MPFR_TMP_LIMBS_ALLOC (k); 70.331 - 70.332 ---- a/src/stack_interface.c 2013-03-13 16:37:32.000000000 +0100 70.333 -+++ b/src/stack_interface.c 2014-12-31 14:56:02.688641997 +0100 70.334 -@@ -26,7 +26,7 @@ 70.335 - size_t 70.336 - mpfr_custom_get_size (mpfr_prec_t prec) 70.337 - { 70.338 -- return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; 70.339 -+ return MPFR_PREC2LIMBS (prec) * MPFR_BYTES_PER_MP_LIMB; 70.340 - } 70.341 - 70.342 - #undef mpfr_custom_init 70.343 ---- a/src/strtofr.c 2013-03-13 16:37:32.000000000 +0100 70.344 -+++ b/src/strtofr.c 2014-12-31 14:56:02.688641997 +0100 70.345 -@@ -473,8 +473,10 @@ 70.346 - /* prec bits corresponds to ysize limbs */ 70.347 - ysize_bits = ysize * GMP_NUMB_BITS; 70.348 - /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ 70.349 -- y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 1); 70.350 -- y += ysize; /* y has (ysize+1) allocated limbs */ 70.351 -+ /* we need to allocate one more limb to work around bug 70.352 -+ https://gmplib.org/list-archives/gmp-bugs/2013-December/003267.html */ 70.353 -+ y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 2); 70.354 -+ y += ysize; /* y has (ysize+2) allocated limbs */ 70.355 - 70.356 - /* pstr_size is the number of characters we read in pstr->mant 70.357 - to have at least ysize full limbs. 70.358 ---- a/src/vasprintf.c 2013-03-13 16:37:37.000000000 +0100 70.359 -+++ b/src/vasprintf.c 2014-12-31 14:56:02.688641997 +0100 70.360 -@@ -884,14 +884,18 @@ 70.361 - first digit, we want the exponent for radix two and the decimal 70.362 - point AFTER the first digit. */ 70.363 - { 70.364 -- MPFR_ASSERTN (exp > MPFR_EMIN_MIN /4); /* possible overflow */ 70.365 -+ /* An integer overflow is normally not possible since MPFR_EXP_MIN 70.366 -+ is twice as large as MPFR_EMIN_MIN. */ 70.367 -+ MPFR_ASSERTN (exp > (MPFR_EXP_MIN + 3) / 4); 70.368 - exp = (exp - 1) * 4; 70.369 - } 70.370 - else 70.371 - /* EXP is the exponent for decimal point BEFORE the first digit, we 70.372 - want the exponent for decimal point AFTER the first digit. */ 70.373 - { 70.374 -- MPFR_ASSERTN (exp > MPFR_EMIN_MIN); /* possible overflow */ 70.375 -+ /* An integer overflow is normally not possible since MPFR_EXP_MIN 70.376 -+ is twice as large as MPFR_EMIN_MIN. */ 70.377 -+ MPFR_ASSERTN (exp > MPFR_EXP_MIN); 70.378 - --exp; 70.379 - } 70.380 - } 70.381 -@@ -1040,7 +1044,7 @@ 70.382 - } 70.383 - 70.384 - /* Determine the different parts of the string representation of the regular 70.385 -- number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'. 70.386 -+ number P when spec.spec is 'e', 'E', 'g', or 'G'. 70.387 - DEC_INFO contains the previously computed exponent and string or is NULL. 70.388 - 70.389 - return -1 if some field > INT_MAX */ 70.390 -@@ -1167,7 +1171,7 @@ 70.391 - } 70.392 - 70.393 - /* Determine the different parts of the string representation of the regular 70.394 -- number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'. 70.395 -+ number P when spec.spec is 'f', 'F', 'g', or 'G'. 70.396 - DEC_INFO contains the previously computed exponent and string or is NULL. 70.397 - 70.398 - return -1 if some field of number_parts is greater than INT_MAX */ 70.399 -@@ -1559,7 +1563,7 @@ 70.400 - /* fractional part */ 70.401 - { 70.402 - np->point = MPFR_DECIMAL_POINT; 70.403 -- np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ? 70.404 -+ np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ? 70.405 - spec.prec - 1 : spec.prec; 70.406 - } 70.407 - else if (spec.alt) 70.408 ---- a/src/version.c 2013-03-13 16:37:34.000000000 +0100 70.409 -+++ b/src/version.c 2014-12-31 14:56:02.688641997 +0100 70.410 -@@ -25,5 +25,5 @@ 70.411 - const char * 70.412 - mpfr_get_version (void) 70.413 - { 70.414 -- return "3.1.2"; 70.415 -+ return "3.1.2-p11"; 70.416 - } 70.417 ---- a/tests/tdiv.c 2013-03-13 16:37:44.000000000 +0100 70.418 -+++ b/tests/tdiv.c 2014-12-31 14:56:02.689642010 +0100 70.419 -@@ -1104,6 +1104,96 @@ 70.420 - #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS) 70.421 - #include "tgeneric.c" 70.422 - 70.423 -+static void 70.424 -+test_extreme (void) 70.425 -+{ 70.426 -+ mpfr_t x, y, z; 70.427 -+ mpfr_exp_t emin, emax; 70.428 -+ mpfr_prec_t p[4] = { 8, 32, 64, 256 }; 70.429 -+ int xi, yi, zi, j, r; 70.430 -+ unsigned int flags, ex_flags; 70.431 -+ 70.432 -+ emin = mpfr_get_emin (); 70.433 -+ emax = mpfr_get_emax (); 70.434 -+ 70.435 -+ mpfr_set_emin (MPFR_EMIN_MIN); 70.436 -+ mpfr_set_emax (MPFR_EMAX_MAX); 70.437 -+ 70.438 -+ for (xi = 0; xi < 4; xi++) 70.439 -+ { 70.440 -+ mpfr_init2 (x, p[xi]); 70.441 -+ mpfr_setmax (x, MPFR_EMAX_MAX); 70.442 -+ MPFR_ASSERTN (mpfr_check (x)); 70.443 -+ for (yi = 0; yi < 4; yi++) 70.444 -+ { 70.445 -+ mpfr_init2 (y, p[yi]); 70.446 -+ mpfr_setmin (y, MPFR_EMIN_MIN); 70.447 -+ for (j = 0; j < 2; j++) 70.448 -+ { 70.449 -+ MPFR_ASSERTN (mpfr_check (y)); 70.450 -+ for (zi = 0; zi < 4; zi++) 70.451 -+ { 70.452 -+ mpfr_init2 (z, p[zi]); 70.453 -+ RND_LOOP (r) 70.454 -+ { 70.455 -+ mpfr_clear_flags (); 70.456 -+ mpfr_div (z, x, y, (mpfr_rnd_t) r); 70.457 -+ flags = __gmpfr_flags; 70.458 -+ MPFR_ASSERTN (mpfr_check (z)); 70.459 -+ ex_flags = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT; 70.460 -+ if (flags != ex_flags) 70.461 -+ { 70.462 -+ printf ("Bad flags in test_extreme on z = a/b" 70.463 -+ " with %s and\n", 70.464 -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); 70.465 -+ printf ("a = "); 70.466 -+ mpfr_dump (x); 70.467 -+ printf ("b = "); 70.468 -+ mpfr_dump (y); 70.469 -+ printf ("Expected flags:"); 70.470 -+ flags_out (ex_flags); 70.471 -+ printf ("Got flags: "); 70.472 -+ flags_out (flags); 70.473 -+ printf ("z = "); 70.474 -+ mpfr_dump (z); 70.475 -+ exit (1); 70.476 -+ } 70.477 -+ mpfr_clear_flags (); 70.478 -+ mpfr_div (z, y, x, (mpfr_rnd_t) r); 70.479 -+ flags = __gmpfr_flags; 70.480 -+ MPFR_ASSERTN (mpfr_check (z)); 70.481 -+ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; 70.482 -+ if (flags != ex_flags) 70.483 -+ { 70.484 -+ printf ("Bad flags in test_extreme on z = a/b" 70.485 -+ " with %s and\n", 70.486 -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); 70.487 -+ printf ("a = "); 70.488 -+ mpfr_dump (y); 70.489 -+ printf ("b = "); 70.490 -+ mpfr_dump (x); 70.491 -+ printf ("Expected flags:"); 70.492 -+ flags_out (ex_flags); 70.493 -+ printf ("Got flags: "); 70.494 -+ flags_out (flags); 70.495 -+ printf ("z = "); 70.496 -+ mpfr_dump (z); 70.497 -+ exit (1); 70.498 -+ } 70.499 -+ } 70.500 -+ mpfr_clear (z); 70.501 -+ } /* zi */ 70.502 -+ mpfr_nextabove (y); 70.503 -+ } /* j */ 70.504 -+ mpfr_clear (y); 70.505 -+ } /* yi */ 70.506 -+ mpfr_clear (x); 70.507 -+ } /* xi */ 70.508 -+ 70.509 -+ set_emin (emin); 70.510 -+ set_emax (emax); 70.511 -+} 70.512 -+ 70.513 - int 70.514 - main (int argc, char *argv[]) 70.515 - { 70.516 -@@ -1130,6 +1220,7 @@ 70.517 - test_20070603 (); 70.518 - test_20070628 (); 70.519 - test_generic (2, 800, 50); 70.520 -+ test_extreme (); 70.521 - 70.522 - tests_end_mpfr (); 70.523 - return 0; 70.524 ---- a/tests/texp.c 2013-03-13 16:37:44.000000000 +0100 70.525 -+++ b/tests/texp.c 2014-12-31 14:56:02.689642010 +0100 70.526 -@@ -150,6 +150,22 @@ 70.527 - exit (1); 70.528 - } 70.529 - 70.530 -+ mpfr_set_prec (x, 118); 70.531 -+ mpfr_set_str_binary (x, "0.1110010100011101010000111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E-86"); 70.532 -+ mpfr_set_prec (y, 118); 70.533 -+ mpfr_exp_2 (y, x, MPFR_RNDU); 70.534 -+ mpfr_exp_3 (x, x, MPFR_RNDU); 70.535 -+ if (mpfr_cmp (x, y)) 70.536 -+ { 70.537 -+ printf ("mpfr_exp_2 and mpfr_exp_3 differ for prec=118\n"); 70.538 -+ printf ("mpfr_exp_2 gives "); 70.539 -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); 70.540 -+ printf ("\nmpfr_exp_3 gives "); 70.541 -+ mpfr_out_str (stdout, 2, 0, x, MPFR_RNDN); 70.542 -+ printf ("\n"); 70.543 -+ exit (1); 70.544 -+ } 70.545 -+ 70.546 - mpfr_clear (x); 70.547 - mpfr_clear (y); 70.548 - return 0; 70.549 ---- a/tests/tfits.c 2013-03-13 16:37:45.000000000 +0100 70.550 -+++ b/tests/tfits.c 2014-12-31 14:56:02.689642010 +0100 70.551 -@@ -33,155 +33,176 @@ 70.552 - #include "mpfr-intmax.h" 70.553 - #include "mpfr-test.h" 70.554 - 70.555 --#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); } 70.556 --#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); } 70.557 -+#define ERROR1(N) \ 70.558 -+ do \ 70.559 -+ { \ 70.560 -+ printf("Error %d for rnd = %s and x = ", N, \ 70.561 -+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); \ 70.562 -+ mpfr_dump(x); \ 70.563 -+ exit(1); \ 70.564 -+ } \ 70.565 -+ while (0) 70.566 - 70.567 - static void check_intmax (void); 70.568 - 70.569 - int 70.570 - main (void) 70.571 - { 70.572 -- mpfr_t x; 70.573 -+ mpfr_t x, y; 70.574 -+ int i, r; 70.575 - 70.576 - tests_start_mpfr (); 70.577 - 70.578 - mpfr_init2 (x, 256); 70.579 -+ mpfr_init2 (y, 8); 70.580 - 70.581 -- /* Check NAN */ 70.582 -- mpfr_set_nan (x); 70.583 -- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.584 -- ERROR1; 70.585 -- if (mpfr_fits_slong_p (x, MPFR_RNDN)) 70.586 -- ERROR1; 70.587 -- if (mpfr_fits_uint_p (x, MPFR_RNDN)) 70.588 -- ERROR1; 70.589 -- if (mpfr_fits_sint_p (x, MPFR_RNDN)) 70.590 -- ERROR1; 70.591 -- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.592 -- ERROR1; 70.593 -- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.594 -- ERROR1; 70.595 -- 70.596 -- /* Check INF */ 70.597 -- mpfr_set_inf (x, 1); 70.598 -- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.599 -- ERROR1; 70.600 -- if (mpfr_fits_slong_p (x, MPFR_RNDN)) 70.601 -- ERROR1; 70.602 -- if (mpfr_fits_uint_p (x, MPFR_RNDN)) 70.603 -- ERROR1; 70.604 -- if (mpfr_fits_sint_p (x, MPFR_RNDN)) 70.605 -- ERROR1; 70.606 -- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.607 -- ERROR1; 70.608 -- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.609 -- ERROR1; 70.610 -- 70.611 -- /* Check Zero */ 70.612 -- MPFR_SET_ZERO (x); 70.613 -- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.614 -- ERROR2; 70.615 -- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) 70.616 -- ERROR2; 70.617 -- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) 70.618 -- ERROR2; 70.619 -- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) 70.620 -- ERROR2; 70.621 -- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.622 -- ERROR2; 70.623 -- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.624 -- ERROR2; 70.625 -- 70.626 -- /* Check small op */ 70.627 -- mpfr_set_str1 (x, "1@-1"); 70.628 -- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.629 -- ERROR2; 70.630 -- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) 70.631 -- ERROR2; 70.632 -- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) 70.633 -- ERROR2; 70.634 -- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) 70.635 -- ERROR2; 70.636 -- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.637 -- ERROR2; 70.638 -- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.639 -- ERROR2; 70.640 -- 70.641 -- /* Check 17 */ 70.642 -- mpfr_set_ui (x, 17, MPFR_RNDN); 70.643 -- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.644 -- ERROR2; 70.645 -- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) 70.646 -- ERROR2; 70.647 -- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) 70.648 -- ERROR2; 70.649 -- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) 70.650 -- ERROR2; 70.651 -- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.652 -- ERROR2; 70.653 -- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.654 -- ERROR2; 70.655 -- 70.656 -- /* Check all other values */ 70.657 -- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); 70.658 -- mpfr_mul_2exp (x, x, 1, MPFR_RNDN); 70.659 -- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.660 -- ERROR1; 70.661 -- if (mpfr_fits_slong_p (x, MPFR_RNDN)) 70.662 -- ERROR1; 70.663 -- mpfr_mul_2exp (x, x, 40, MPFR_RNDN); 70.664 -- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.665 -- ERROR1; 70.666 -- if (mpfr_fits_uint_p (x, MPFR_RNDN)) 70.667 -- ERROR1; 70.668 -- if (mpfr_fits_sint_p (x, MPFR_RNDN)) 70.669 -- ERROR1; 70.670 -- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.671 -- ERROR1; 70.672 -- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.673 -- ERROR1; 70.674 -- 70.675 -- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); 70.676 -- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.677 -- ERROR2; 70.678 -- mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); 70.679 -- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) 70.680 -- ERROR2; 70.681 -- mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); 70.682 -- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) 70.683 -- ERROR2; 70.684 -- mpfr_set_ui (x, INT_MAX, MPFR_RNDN); 70.685 -- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) 70.686 -- ERROR2; 70.687 -- mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); 70.688 -- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.689 -- ERROR2; 70.690 -- mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); 70.691 -- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.692 -- ERROR2; 70.693 -- 70.694 -- mpfr_set_si (x, 1, MPFR_RNDN); 70.695 -- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) 70.696 -- ERROR2; 70.697 -- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.698 -- ERROR2; 70.699 -- 70.700 -- /* Check negative value */ 70.701 -- mpfr_set_si (x, -1, MPFR_RNDN); 70.702 -- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) 70.703 -- ERROR2; 70.704 -- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) 70.705 -- ERROR2; 70.706 -- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) 70.707 -- ERROR2; 70.708 -- if (mpfr_fits_uint_p (x, MPFR_RNDN)) 70.709 -- ERROR1; 70.710 -- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) 70.711 -- ERROR1; 70.712 -- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) 70.713 -- ERROR1; 70.714 -+ RND_LOOP (r) 70.715 -+ { 70.716 -+ 70.717 -+ /* Check NAN */ 70.718 -+ mpfr_set_nan (x); 70.719 -+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.720 -+ ERROR1 (1); 70.721 -+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.722 -+ ERROR1 (2); 70.723 -+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.724 -+ ERROR1 (3); 70.725 -+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.726 -+ ERROR1 (4); 70.727 -+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.728 -+ ERROR1 (5); 70.729 -+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.730 -+ ERROR1 (6); 70.731 -+ 70.732 -+ /* Check INF */ 70.733 -+ mpfr_set_inf (x, 1); 70.734 -+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.735 -+ ERROR1 (7); 70.736 -+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.737 -+ ERROR1 (8); 70.738 -+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.739 -+ ERROR1 (9); 70.740 -+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.741 -+ ERROR1 (10); 70.742 -+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.743 -+ ERROR1 (11); 70.744 -+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.745 -+ ERROR1 (12); 70.746 -+ 70.747 -+ /* Check Zero */ 70.748 -+ MPFR_SET_ZERO (x); 70.749 -+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.750 -+ ERROR1 (13); 70.751 -+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.752 -+ ERROR1 (14); 70.753 -+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.754 -+ ERROR1 (15); 70.755 -+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.756 -+ ERROR1 (16); 70.757 -+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.758 -+ ERROR1 (17); 70.759 -+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.760 -+ ERROR1 (18); 70.761 -+ 70.762 -+ /* Check small positive op */ 70.763 -+ mpfr_set_str1 (x, "1@-1"); 70.764 -+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.765 -+ ERROR1 (19); 70.766 -+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.767 -+ ERROR1 (20); 70.768 -+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.769 -+ ERROR1 (21); 70.770 -+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.771 -+ ERROR1 (22); 70.772 -+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.773 -+ ERROR1 (23); 70.774 -+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.775 -+ ERROR1 (24); 70.776 -+ 70.777 -+ /* Check 17 */ 70.778 -+ mpfr_set_ui (x, 17, MPFR_RNDN); 70.779 -+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.780 -+ ERROR1 (25); 70.781 -+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.782 -+ ERROR1 (26); 70.783 -+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.784 -+ ERROR1 (27); 70.785 -+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.786 -+ ERROR1 (28); 70.787 -+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.788 -+ ERROR1 (29); 70.789 -+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.790 -+ ERROR1 (30); 70.791 -+ 70.792 -+ /* Check all other values */ 70.793 -+ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); 70.794 -+ mpfr_mul_2exp (x, x, 1, MPFR_RNDN); 70.795 -+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.796 -+ ERROR1 (31); 70.797 -+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.798 -+ ERROR1 (32); 70.799 -+ mpfr_mul_2exp (x, x, 40, MPFR_RNDN); 70.800 -+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.801 -+ ERROR1 (33); 70.802 -+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.803 -+ ERROR1 (34); 70.804 -+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.805 -+ ERROR1 (35); 70.806 -+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.807 -+ ERROR1 (36); 70.808 -+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.809 -+ ERROR1 (37); 70.810 -+ 70.811 -+ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); 70.812 -+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) 70.813 -+ ERROR1 (38); 70.814 -+ mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); 70.815 -+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.816 -+ ERROR1 (39); 70.817 -+ mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); 70.818 -+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) 70.819 -+ ERROR1 (40); 70.820 -+ mpfr_set_ui (x, INT_MAX, MPFR_RNDN); 70.821 -+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.822 -+ ERROR1 (41); 70.823 -+ mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); 70.824 -+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) 70.825 -+ ERROR1 (42); 70.826 -+ mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); 70.827 -+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.828 -+ ERROR1 (43); 70.829 -+ 70.830 -+ mpfr_set_si (x, 1, MPFR_RNDN); 70.831 -+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.832 -+ ERROR1 (44); 70.833 -+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.834 -+ ERROR1 (45); 70.835 -+ 70.836 -+ /* Check negative op */ 70.837 -+ for (i = 1; i <= 4; i++) 70.838 -+ { 70.839 -+ int inv; 70.840 -+ 70.841 -+ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); 70.842 -+ mpfr_rint (y, x, (mpfr_rnd_t) r); 70.843 -+ inv = MPFR_NOTZERO (y); 70.844 -+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv) 70.845 -+ ERROR1 (46); 70.846 -+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) 70.847 -+ ERROR1 (47); 70.848 -+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv) 70.849 -+ ERROR1 (48); 70.850 -+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) 70.851 -+ ERROR1 (49); 70.852 -+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv) 70.853 -+ ERROR1 (50); 70.854 -+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) 70.855 -+ ERROR1 (51); 70.856 -+ } 70.857 -+ } 70.858 - 70.859 - mpfr_clear (x); 70.860 -+ mpfr_clear (y); 70.861 - 70.862 - check_intmax (); 70.863 - 70.864 -@@ -189,85 +210,98 @@ 70.865 - return 0; 70.866 - } 70.867 - 70.868 --static void check_intmax (void) 70.869 -+static void 70.870 -+check_intmax (void) 70.871 - { 70.872 - #ifdef _MPFR_H_HAVE_INTMAX_T 70.873 -- mpfr_t x; 70.874 -+ mpfr_t x, y; 70.875 -+ int i, r; 70.876 - 70.877 -- mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT); 70.878 -+ mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT); 70.879 -+ mpfr_init2 (y, 8); 70.880 - 70.881 -- /* Check NAN */ 70.882 -- mpfr_set_nan (x); 70.883 -- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.884 -- ERROR1; 70.885 -- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.886 -- ERROR1; 70.887 -- 70.888 -- /* Check INF */ 70.889 -- mpfr_set_inf (x, 1); 70.890 -- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.891 -- ERROR1; 70.892 -- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.893 -- ERROR1; 70.894 -- 70.895 -- /* Check Zero */ 70.896 -- MPFR_SET_ZERO (x); 70.897 -- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.898 -- ERROR2; 70.899 -- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.900 -- ERROR2; 70.901 -- 70.902 -- /* Check small op */ 70.903 -- mpfr_set_str1 (x, "1@-1"); 70.904 -- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.905 -- ERROR2; 70.906 -- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.907 -- ERROR2; 70.908 -- 70.909 -- /* Check 17 */ 70.910 -- mpfr_set_ui (x, 17, MPFR_RNDN); 70.911 -- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.912 -- ERROR2; 70.913 -- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.914 -- ERROR2; 70.915 -- 70.916 -- /* Check hugest */ 70.917 -- mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); 70.918 -- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.919 -- ERROR1; 70.920 -- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.921 -- ERROR1; 70.922 -- 70.923 -- /* Check all other values */ 70.924 -- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); 70.925 -- mpfr_add_ui (x, x, 1, MPFR_RNDN); 70.926 -- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.927 -- ERROR1; 70.928 -- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); 70.929 -- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.930 -- ERROR2; 70.931 -- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); 70.932 -- mpfr_add_ui (x, x, 1, MPFR_RNDN); 70.933 -- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.934 -- ERROR1; 70.935 -- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); 70.936 -- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.937 -- ERROR2; 70.938 -- mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); 70.939 -- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.940 -- ERROR2; 70.941 -- mpfr_sub_ui (x, x, 1, MPFR_RNDN); 70.942 -- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.943 -- ERROR1; 70.944 -- 70.945 -- /* Check negative value */ 70.946 -- mpfr_set_si (x, -1, MPFR_RNDN); 70.947 -- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) 70.948 -- ERROR2; 70.949 -- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) 70.950 -- ERROR1; 70.951 -+ RND_LOOP (r) 70.952 -+ { 70.953 -+ /* Check NAN */ 70.954 -+ mpfr_set_nan (x); 70.955 -+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.956 -+ ERROR1 (52); 70.957 -+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.958 -+ ERROR1 (53); 70.959 -+ 70.960 -+ /* Check INF */ 70.961 -+ mpfr_set_inf (x, 1); 70.962 -+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.963 -+ ERROR1 (54); 70.964 -+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.965 -+ ERROR1 (55); 70.966 -+ 70.967 -+ /* Check Zero */ 70.968 -+ MPFR_SET_ZERO (x); 70.969 -+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.970 -+ ERROR1 (56); 70.971 -+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.972 -+ ERROR1 (57); 70.973 -+ 70.974 -+ /* Check positive small op */ 70.975 -+ mpfr_set_str1 (x, "1@-1"); 70.976 -+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.977 -+ ERROR1 (58); 70.978 -+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.979 -+ ERROR1 (59); 70.980 -+ 70.981 -+ /* Check 17 */ 70.982 -+ mpfr_set_ui (x, 17, MPFR_RNDN); 70.983 -+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.984 -+ ERROR1 (60); 70.985 -+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.986 -+ ERROR1 (61); 70.987 -+ 70.988 -+ /* Check hugest */ 70.989 -+ mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); 70.990 -+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.991 -+ ERROR1 (62); 70.992 -+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.993 -+ ERROR1 (63); 70.994 -+ 70.995 -+ /* Check all other values */ 70.996 -+ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); 70.997 -+ mpfr_add_ui (x, x, 1, MPFR_RNDN); 70.998 -+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.999 -+ ERROR1 (64); 70.1000 -+ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); 70.1001 -+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) 70.1002 -+ ERROR1 (65); 70.1003 -+ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); 70.1004 -+ mpfr_add_ui (x, x, 1, MPFR_RNDN); 70.1005 -+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.1006 -+ ERROR1 (66); 70.1007 -+ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); 70.1008 -+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.1009 -+ ERROR1 (67); 70.1010 -+ mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); 70.1011 -+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.1012 -+ ERROR1 (68); 70.1013 -+ mpfr_sub_ui (x, x, 1, MPFR_RNDN); 70.1014 -+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.1015 -+ ERROR1 (69); 70.1016 -+ 70.1017 -+ /* Check negative op */ 70.1018 -+ for (i = 1; i <= 4; i++) 70.1019 -+ { 70.1020 -+ int inv; 70.1021 -+ 70.1022 -+ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); 70.1023 -+ mpfr_rint (y, x, (mpfr_rnd_t) r); 70.1024 -+ inv = MPFR_NOTZERO (y); 70.1025 -+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv) 70.1026 -+ ERROR1 (70); 70.1027 -+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) 70.1028 -+ ERROR1 (71); 70.1029 -+ } 70.1030 -+ } 70.1031 - 70.1032 - mpfr_clear (x); 70.1033 -+ mpfr_clear (y); 70.1034 - #endif 70.1035 - } 70.1036 -- 70.1037 ---- a/tests/tget_flt.c 2013-03-13 16:37:44.000000000 +0100 70.1038 -+++ b/tests/tget_flt.c 2014-12-31 14:56:02.690642023 +0100 70.1039 -@@ -28,9 +28,17 @@ 70.1040 - main (void) 70.1041 - { 70.1042 - mpfr_t x, y; 70.1043 -- float f, g, infp; 70.1044 -+ float f, g; 70.1045 - int i; 70.1046 -+#if !defined(MPFR_ERRDIVZERO) 70.1047 -+ float infp; 70.1048 -+#endif 70.1049 - 70.1050 -+ tests_start_mpfr (); 70.1051 -+ 70.1052 -+#if !defined(MPFR_ERRDIVZERO) 70.1053 -+ /* The definition of DBL_POS_INF involves a division by 0. This makes 70.1054 -+ "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */ 70.1055 - infp = (float) DBL_POS_INF; 70.1056 - if (infp * 0.5 != infp) 70.1057 - { 70.1058 -@@ -38,8 +46,7 @@ 70.1059 - fprintf (stderr, "(this is probably a compiler bug, please report)\n"); 70.1060 - exit (1); 70.1061 - } 70.1062 -- 70.1063 -- tests_start_mpfr (); 70.1064 -+#endif 70.1065 - 70.1066 - mpfr_init2 (x, 24); 70.1067 - mpfr_init2 (y, 24); 70.1068 -@@ -353,6 +360,7 @@ 70.1069 - printf ("expected %.8e, got %.8e\n", g, f); 70.1070 - exit (1); 70.1071 - } 70.1072 -+#if !defined(MPFR_ERRDIVZERO) 70.1073 - f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule), 70.1074 - thus we should get +Inf */ 70.1075 - g = infp; 70.1076 -@@ -376,6 +384,7 @@ 70.1077 - printf ("expected %.8e, got %.8e\n", g, f); 70.1078 - exit (1); 70.1079 - } 70.1080 -+#endif 70.1081 - 70.1082 - mpfr_clear (x); 70.1083 - mpfr_clear (y); 70.1084 ---- a/tests/tset_ld.c 2013-03-13 16:37:44.000000000 +0100 70.1085 -+++ b/tests/tset_ld.c 2014-12-31 14:56:02.690642023 +0100 70.1086 -@@ -47,8 +47,11 @@ 70.1087 - static int 70.1088 - Isnan_ld (long double d) 70.1089 - { 70.1090 -- double e = (double) d; 70.1091 -- if (DOUBLE_ISNAN (e)) 70.1092 -+ /* Do not convert d to double as this can give an overflow, which 70.1093 -+ may confuse compilers without IEEE 754 support (such as clang 70.1094 -+ -fsanitize=undefined), or trigger a trap if enabled. 70.1095 -+ The DOUBLE_ISNAN macro should work fine on long double. */ 70.1096 -+ if (DOUBLE_ISNAN (d)) 70.1097 - return 1; 70.1098 - LONGDOUBLE_NAN_ACTION (d, goto yes); 70.1099 - return 0; 70.1100 ---- a/tests/tsprintf.c 2013-03-13 16:37:44.000000000 +0100 70.1101 -+++ b/tests/tsprintf.c 2014-12-31 14:56:02.690642023 +0100 70.1102 -@@ -456,10 +456,16 @@ 70.1103 - check_sprintf ("1.999900 ", "%-#10.7RG", x); 70.1104 - check_sprintf ("1.9999 ", "%-10.7RG", x); 70.1105 - mpfr_set_ui (x, 1, MPFR_RNDN); 70.1106 -+ check_sprintf ("1.", "%#.1Rg", x); 70.1107 -+ check_sprintf ("1. ", "%-#5.1Rg", x); 70.1108 -+ check_sprintf (" 1.0", "%#5.2Rg", x); 70.1109 - check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x); 70.1110 - check_sprintf ("1", "%.30Rg", x); 70.1111 - mpfr_set_ui (x, 0, MPFR_RNDN); 70.1112 -- check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x); 70.1113 -+ check_sprintf ("0.", "%#.1Rg", x); 70.1114 -+ check_sprintf ("0. ", "%-#5.1Rg", x); 70.1115 -+ check_sprintf (" 0.0", "%#5.2Rg", x); 70.1116 -+ check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x); 70.1117 - check_sprintf ("0", "%.30Rg", x); 70.1118 - 70.1119 - /* following tests with precision 53 bits */ 70.1120 -@@ -1178,6 +1184,69 @@ 70.1121 - check_emax_aux (MPFR_EMAX_MAX); 70.1122 - } 70.1123 - 70.1124 -+static void 70.1125 -+check_emin_aux (mpfr_exp_t e) 70.1126 -+{ 70.1127 -+ mpfr_t x; 70.1128 -+ char *s1, s2[256]; 70.1129 -+ int i; 70.1130 -+ mpfr_exp_t emin; 70.1131 -+ mpz_t ee; 70.1132 -+ 70.1133 -+ MPFR_ASSERTN (e >= LONG_MIN); 70.1134 -+ emin = mpfr_get_emin (); 70.1135 -+ set_emin (e); 70.1136 -+ 70.1137 -+ mpfr_init2 (x, 16); 70.1138 -+ mpz_init (ee); 70.1139 -+ 70.1140 -+ mpfr_setmin (x, e); 70.1141 -+ mpz_set_si (ee, e); 70.1142 -+ mpz_sub_ui (ee, ee, 1); 70.1143 -+ 70.1144 -+ i = mpfr_asprintf (&s1, "%Ra", x); 70.1145 -+ MPFR_ASSERTN (i > 0); 70.1146 -+ 70.1147 -+ gmp_snprintf (s2, 256, "0x1p%Zd", ee); 70.1148 -+ 70.1149 -+ if (strcmp (s1, s2) != 0) 70.1150 -+ { 70.1151 -+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e); 70.1152 -+ printf ("Expected %s\n", s2); 70.1153 -+ printf ("Got %s\n", s1); 70.1154 -+ exit (1); 70.1155 -+ } 70.1156 -+ 70.1157 -+ mpfr_free_str (s1); 70.1158 -+ 70.1159 -+ i = mpfr_asprintf (&s1, "%Rb", x); 70.1160 -+ MPFR_ASSERTN (i > 0); 70.1161 -+ 70.1162 -+ gmp_snprintf (s2, 256, "1p%Zd", ee); 70.1163 -+ 70.1164 -+ if (strcmp (s1, s2) != 0) 70.1165 -+ { 70.1166 -+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e); 70.1167 -+ printf ("Expected %s\n", s2); 70.1168 -+ printf ("Got %s\n", s1); 70.1169 -+ exit (1); 70.1170 -+ } 70.1171 -+ 70.1172 -+ mpfr_free_str (s1); 70.1173 -+ 70.1174 -+ mpfr_clear (x); 70.1175 -+ mpz_clear (ee); 70.1176 -+ set_emin (emin); 70.1177 -+} 70.1178 -+ 70.1179 -+static void 70.1180 -+check_emin (void) 70.1181 -+{ 70.1182 -+ check_emin_aux (-15); 70.1183 -+ check_emin_aux (mpfr_get_emin ()); 70.1184 -+ check_emin_aux (MPFR_EMIN_MIN); 70.1185 -+} 70.1186 -+ 70.1187 - int 70.1188 - main (int argc, char **argv) 70.1189 - { 70.1190 -@@ -1197,6 +1266,7 @@ 70.1191 - decimal (); 70.1192 - mixed (); 70.1193 - check_emax (); 70.1194 -+ check_emin (); 70.1195 - 70.1196 - #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) 70.1197 - locale_da_DK (); 70.1198 ---- a/VERSION 2013-03-13 16:37:28.000000000 +0100 70.1199 -+++ b/VERSION 2014-12-31 14:56:02.690642023 +0100 70.1200 -@@ -1 +1 @@ 70.1201 --3.1.2 70.1202 -+3.1.2-p11
71.1 --- a/ncurses-dev/receipt Mon Jun 05 19:31:24 2017 +0000 71.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 71.3 @@ -1,20 +0,0 @@ 71.4 -# SliTaz package receipt. 71.5 - 71.6 -PACKAGE="ncurses-dev" 71.7 -VERSION="6.0" 71.8 -CATEGORY="development" 71.9 -SHORT_DESC="Library of functions to manage display on terminals (development files)" 71.10 -MAINTAINER="pankso@slitaz.org" 71.11 -LICENSE="MIT" 71.12 -WEB_SITE="https://www.gnu.org/software/ncurses/" 71.13 -HOST_ARCH="i486 arm" 71.14 - 71.15 -WANTED="ncurses" 71.16 -DEPENDS="ncurses ncurses-extra ncurses-libform ncurses-libmenu ncurses-libpanel" 71.17 - 71.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 71.19 -genpkg_rules() 71.20 -{ 71.21 - cook_copy_files ncursesw6-config *.h *.a *.pc *.so 71.22 - cook_split_rm $DEPENDS 71.23 -}
72.1 --- a/ncurses-extra/receipt Mon Jun 05 19:31:24 2017 +0000 72.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 72.3 @@ -1,23 +0,0 @@ 72.4 -# SliTaz package receipt. 72.5 - 72.6 -PACKAGE="ncurses-extra" 72.7 -VERSION="6.0" 72.8 -CATEGORY="base-system" 72.9 -SHORT_DESC="Extra files for the ncurses library." 72.10 -MAINTAINER="pascal.bellard@slitaz.org" 72.11 -LICENSE="MIT" 72.12 -WEB_SITE="http://invisible-island.net/ncurses/" 72.13 -HOST_ARCH="i486 arm" 72.14 - 72.15 -WANTED="ncurses" 72.16 -DEPENDS="ncurses" 72.17 -BUILD_DEPENDS="ncurses-dev" 72.18 - 72.19 -# Rules to gen a SliTaz package suitable for Tazpkg. 72.20 -genpkg_rules() 72.21 -{ 72.22 - cook_copy_folders bin terminfo 72.23 - 72.24 - # Split ncurses package 72.25 - cook_split_rm ncurses ncurses-dev 72.26 -}
73.1 --- a/ncurses-libform/receipt Mon Jun 05 19:31:24 2017 +0000 73.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 73.3 @@ -1,19 +0,0 @@ 73.4 -# SliTaz package receipt. 73.5 - 73.6 -PACKAGE="ncurses-libform" 73.7 -VERSION="6.0" 73.8 -CATEGORY="libs" 73.9 -SHORT_DESC="Curses extension for programming forms" 73.10 -MAINTAINER="al.bobylev@gmail.com" 73.11 -LICENSE="MIT" 73.12 -WEB_SITE="https://www.gnu.org/software/ncurses/" 73.13 -HOST_ARCH="i486 arm" 73.14 - 73.15 -DEPENDS="ncurses" 73.16 -WANTED="ncurses" 73.17 - 73.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 73.19 -genpkg_rules() 73.20 -{ 73.21 - cook_copy_files libformw.so* 73.22 -}
74.1 --- a/ncurses-libmenu/receipt Mon Jun 05 19:31:24 2017 +0000 74.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 74.3 @@ -1,19 +0,0 @@ 74.4 -# SliTaz package receipt. 74.5 - 74.6 -PACKAGE="ncurses-libmenu" 74.7 -VERSION="6.0" 74.8 -CATEGORY="libs" 74.9 -SHORT_DESC="Curses extension for programming menus" 74.10 -MAINTAINER="al.bobylev@gmail.com" 74.11 -LICENSE="MIT" 74.12 -WEB_SITE="https://www.gnu.org/software/ncurses/" 74.13 -HOST_ARCH="i486 arm" 74.14 - 74.15 -DEPENDS="ncurses" 74.16 -WANTED="ncurses" 74.17 - 74.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 74.19 -genpkg_rules() 74.20 -{ 74.21 - cook_copy_files libmenuw.so* 74.22 -}
75.1 --- a/ncurses-libpanel/description.txt Mon Jun 05 19:31:24 2017 +0000 75.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 75.3 @@ -1,8 +0,0 @@ 75.4 -libpanel - panel stack extension for curses 75.5 - 75.6 -Panels are **curses** windows with the added feature of depth. Panel functions 75.7 -allow the use of stacked windows and ensure the proper portions of each window 75.8 -and the curses **stdscr** window are hidden or displayed when panels are added, 75.9 -moved, modified or removed. The set of currently visible panels is the stack of 75.10 -panels. The **stdscr** window is beneath all panels, and is not considered part 75.11 -of the stack.
76.1 --- a/ncurses-libpanel/receipt Mon Jun 05 19:31:24 2017 +0000 76.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 76.3 @@ -1,19 +0,0 @@ 76.4 -# SliTaz package receipt. 76.5 - 76.6 -PACKAGE="ncurses-libpanel" 76.7 -VERSION="6.0" 76.8 -CATEGORY="libs" 76.9 -SHORT_DESC="Panel stack extension for curses" 76.10 -MAINTAINER="al.bobylev@gmail.com" 76.11 -LICENSE="MIT" 76.12 -WEB_SITE="https://www.gnu.org/software/ncurses/" 76.13 -HOST_ARCH="i486 arm" 76.14 - 76.15 -DEPENDS="ncurses" 76.16 -WANTED="ncurses" 76.17 - 76.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 76.19 -genpkg_rules() 76.20 -{ 76.21 - cook_copy_files libpanelw.so* 76.22 -}
77.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 77.2 +++ b/ncurses/description.ncurses-libpanel.txt Tue Jun 06 17:37:54 2017 +0300 77.3 @@ -0,0 +1,8 @@ 77.4 +libpanel - panel stack extension for curses 77.5 + 77.6 +Panels are **curses** windows with the added feature of depth. Panel functions 77.7 +allow the use of stacked windows and ensure the proper portions of each window 77.8 +and the curses **stdscr** window are hidden or displayed when panels are added, 77.9 +moved, modified or removed. The set of currently visible panels is the stack of 77.10 +panels. The **stdscr** window is beneath all panels, and is not considered part 77.11 +of the stack.
78.1 --- a/ncurses/receipt Mon Jun 05 19:31:24 2017 +0000 78.2 +++ b/ncurses/receipt Tue Jun 06 17:37:54 2017 +0300 78.3 @@ -1,9 +1,9 @@ 78.4 -# SliTaz package receipt. 78.5 +# SliTaz package receipt v2. 78.6 78.7 PACKAGE="ncurses" 78.8 VERSION="6.0" 78.9 CATEGORY="base-system" 78.10 -SHORT_DESC="Library of functions to manage display on terminals." 78.11 +SHORT_DESC="Manage display on terminals" 78.12 MAINTAINER="pankso@slitaz.org" 78.13 LICENSE="MIT" 78.14 WEB_SITE="https://www.gnu.org/software/ncurses/" 78.15 @@ -13,13 +13,10 @@ 78.16 HOST_ARCH="i486 arm" 78.17 78.18 BUILD_DEPENDS="flex" 78.19 +BUILD_DEPENDS_arm="" 78.20 SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra \ 78.21 ncurses-dev" 78.22 78.23 -case "$ARCH" in 78.24 - arm) BUILD_DEPENDS="" ;; 78.25 -esac 78.26 - 78.27 # Rules to configure and make the package. 78.28 compile_rules() 78.29 { 78.30 @@ -60,20 +57,35 @@ 78.31 # Rules to gen a SliTaz package suitable for Tazpkg. 78.32 genpkg_rules() 78.33 { 78.34 - # binaries and library 78.35 - cook_copy_files clear tset reset libncursesw.so* 78.36 - 78.37 - # tabset 78.38 - cook_copy_folders tabset 78.39 - 78.40 - # terminfo 78.41 - cook_copy_files ansi linux rxvt vt100 vt102* xterm xterm-256color \ 78.42 - xterm-color xterm-new xterm-vt220 78.43 + case $PACKAGE in 78.44 + ncurses) 78.45 + copy clear tset reset libncursesw.so* tabset/ \ 78.46 + ansi linux rxvt vt100 vt102* xterm xterm-256color xterm-color \ 78.47 + xterm-new xterm-vt220 78.48 + ;; 78.49 + ncurses-libform) 78.50 + copy libformw.so* 78.51 + CAT="libs|forms extension" 78.52 + DEPENDS="ncurses" 78.53 + ;; 78.54 + ncurses-libmenu) 78.55 + copy libmenuw.so* 78.56 + CAT="libs|menus extension" 78.57 + DEPENDS="ncurses" 78.58 + ;; 78.59 + ncurses-libpanel) 78.60 + copy libpanelw.so* 78.61 + CATEGORY="libs|panel stack extension" 78.62 + DEPENDS="ncurses" 78.63 + ;; 78.64 + ncurses-extra) 78.65 + copy @std 78.66 + remove_already_packed 78.67 + CAT="base-system|extra files" 78.68 + DEPENDS="ncurses" 78.69 + ;; 78.70 + ncurses-dev) 78.71 + copy @dev 78.72 + ;; 78.73 + esac 78.74 } 78.75 - 78.76 -post_remove() 78.77 -{ 78.78 - # restore Busybox applet links 78.79 - ln -s /bin/busybox $root/usr/bin/clear 78.80 - ln -s /bin/busybox $root/usr/bin/reset 78.81 -}
79.1 --- a/nscd/receipt Mon Jun 05 19:31:24 2017 +0000 79.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 79.3 @@ -1,22 +0,0 @@ 79.4 -# SliTaz package receipt. 79.5 - 79.6 -PACKAGE="nscd" 79.7 -VERSION="2.24" 79.8 -CATEGORY="base-system" 79.9 -SHORT_DESC="passwd, group and host lookups cache." 79.10 -WEB_SITE="http://gcc.gnu.org/" 79.11 -WANTED="glibc" 79.12 -MAINTAINER="pascal.bellard@slitaz.org" 79.13 -LICENSE="GPL2" 79.14 - 79.15 -# Rules to gen a SliTaz package suitable for Tazpkg. 79.16 -# 79.17 -genpkg_rules() 79.18 -{ 79.19 - mkdir -p $fs/usr/sbin $fs/usr/bin $fs/etc/init.d $fs/var/db 79.20 - cp $install/usr/sbin/nscd $fs/usr/sbin/ 79.21 - cp $install/usr/bin/getent $fs/usr/bin/ 79.22 - cp $src/nscd/nscd.conf $fs/etc 79.23 - cp $stuff/nscd $fs/etc/init.d 79.24 - chmod +x $fs/etc/init.d/nscd 79.25 -}
80.1 --- a/nscd/stuff/nscd Mon Jun 05 19:31:24 2017 +0000 80.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 80.3 @@ -1,60 +0,0 @@ 80.4 -#!/bin/sh 80.5 -# /etc/init.d/nscd : Start, stop and restart nscd server on SliTaz, at 80.6 -# boot time or with the command line. 80.7 -# 80.8 -# To start nscd server at boot time, just put nscd in the $RUN_DAEMONS 80.9 -# variable of /etc/rcS.conf and configure options with /etc/daemons.conf 80.10 -# 80.11 -. /etc/init.d/rc.functions 80.12 -. /etc/daemons.conf 80.13 - 80.14 -NAME=nscd 80.15 -DESC="$(_ 'name-server caching daemon')" 80.16 -DAEMON=/usr/sbin/nscd 80.17 -OPTIONS=$NSCD_OPTIONS 80.18 -PIDFILE=/var/run/nscd/nscd.pid 80.19 - 80.20 -[ -d /var/run/nscd ] || mkdir /var/run/nscd 80.21 -[ -d /var/db/nscd ] || mkdir /var/db/nscd 80.22 - 80.23 -case "$1" in 80.24 - start) 80.25 - if active_pidfile $PIDFILE nscd ; then 80.26 - _ '%s is already running.' $NAME 80.27 - exit 1 80.28 - fi 80.29 - action 'Starting %s: %s...' "$DESC" $NAME 80.30 - $DAEMON $OPTIONS 80.31 - status 80.32 - sleep 2 80.33 - ;; 80.34 - stop) 80.35 - if ! active_pidfile $PIDFILE nscd ; then 80.36 - _ '%s is not running.' $NAME 80.37 - exit 1 80.38 - fi 80.39 - action 'Stopping %s: %s...' "$DESC" $NAME 80.40 - kill $(cat $PIDFILE) 80.41 - status 80.42 - sleep 2 80.43 - ;; 80.44 - restart) 80.45 - if ! active_pidfile $PIDFILE nscd ; then 80.46 - _ '%s is not running.' $NAME 80.47 - exit 1 80.48 - fi 80.49 - action 'Restarting %s: %s...' "$DESC" $NAME 80.50 - kill $(cat $PIDFILE) 80.51 - sleep 2 80.52 - $DAEMON $OPTIONS 80.53 - status 80.54 - sleep 2 80.55 - ;; 80.56 - *) 80.57 - emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]" 80.58 - newline 80.59 - exit 1 80.60 - ;; 80.61 -esac 80.62 - 80.63 -exit 0
81.1 --- a/patch/receipt Mon Jun 05 19:31:24 2017 +0000 81.2 +++ b/patch/receipt Tue Jun 06 17:37:54 2017 +0300 81.3 @@ -1,9 +1,9 @@ 81.4 -# SliTaz package receipt. 81.5 +# SliTaz package receipt v2. 81.6 81.7 PACKAGE="patch" 81.8 VERSION="2.7.5" 81.9 CATEGORY="utilities" 81.10 -SHORT_DESC="Utilitie to patch file with diff file." 81.11 +SHORT_DESC="Utility to patch file with diff file" 81.12 MAINTAINER="pankso@slitaz.org" 81.13 LICENSE="GPL3" 81.14 WEB_SITE="http://savannah.gnu.org/projects/patch/" 81.15 @@ -12,7 +12,6 @@ 81.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 81.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 81.18 81.19 -DEPENDS="attr" 81.20 BUILD_DEPENDS="attr-dev" 81.21 81.22 # Rules to configure and make the package. 81.23 @@ -24,17 +23,17 @@ 81.24 # Rules to gen a SliTaz package suitable for Tazpkg. 81.25 genpkg_rules() 81.26 { 81.27 - mkdir -p $fs/usr/bin 81.28 - cp -a $install/usr/bin/patch $fs/usr/bin 81.29 + copy patch 81.30 + DEPENDS="attr" 81.31 } 81.32 81.33 -# Prevent erasing busybox... 81.34 -pre_install() 81.35 -{ 81.36 - rm -f "$1/usr/bin/patch" 81.37 -} 81.38 - 81.39 -post_remove() 81.40 -{ 81.41 - ln -s /bin/busybox "$1/usr/bin/patch" 81.42 -} 81.43 +## Prevent erasing busybox... 81.44 +#pre_install() 81.45 +#{ 81.46 +# rm -f "$1/usr/bin/patch" 81.47 +#} 81.48 +# 81.49 +#post_remove() 81.50 +#{ 81.51 +# ln -s /bin/busybox "$1/usr/bin/patch" 81.52 +#}
82.1 --- a/python-magic/description.txt Mon Jun 05 19:31:24 2017 +0000 82.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 82.3 @@ -1,4 +0,0 @@ 82.4 -This library can be used to classify files according to magic number tests. 82.5 -It implements the core functionality of the file command. 82.6 - 82.7 -This package contains the Python bindings.
83.1 --- a/python-magic/receipt Mon Jun 05 19:31:24 2017 +0000 83.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 83.3 @@ -1,18 +0,0 @@ 83.4 -# SliTaz package receipt. 83.5 - 83.6 -PACKAGE="python-magic" 83.7 -VERSION="5.28" 83.8 -CATEGORY="development" 83.9 -SHORT_DESC="File type determination library using 'magic' numbers (Python bindings)" 83.10 -MAINTAINER="pascal.bellard@slitaz.org" 83.11 -LICENSE="BSD" 83.12 -WEB_SITE="http://www.darwinsys.com/file/" 83.13 - 83.14 -WANTED="file" 83.15 -DEPENDS="file python" 83.16 - 83.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 83.18 -genpkg_rules() 83.19 -{ 83.20 - cook_copy_folders python* 83.21 -}
84.1 --- a/svgcleaner/receipt Mon Jun 05 19:31:24 2017 +0000 84.2 +++ b/svgcleaner/receipt Tue Jun 06 17:37:54 2017 +0300 84.3 @@ -1,8 +1,8 @@ 84.4 -# SliTaz package receipt. 84.5 +# SliTaz package receipt v2. 84.6 84.7 PACKAGE="svgcleaner" 84.8 -VERSION="0.8.1" 84.9 -#COMMIT="1f579e8" 84.10 +VERSION="0.9.0" 84.11 +#COMMIT="16e20b3" 84.12 CATEGORY="graphics" 84.13 SHORT_DESC="Clean up SVG files from the unnecessary data" 84.14 MAINTAINER="al.bobylev@gmail.com" 84.15 @@ -28,5 +28,5 @@ 84.16 # Rules to gen a SliTaz package suitable for Tazpkg. 84.17 genpkg_rules() 84.18 { 84.19 - cook_copy_files svgcleaner 84.20 + copy svgcleaner 84.21 }
85.1 --- a/tazpkg/receipt Mon Jun 05 19:31:24 2017 +0000 85.2 +++ b/tazpkg/receipt Tue Jun 06 17:37:54 2017 +0300 85.3 @@ -1,7 +1,7 @@ 85.4 # SliTaz package receipt. 85.5 85.6 PACKAGE="tazpkg" 85.7 -VERSION="946" 85.8 +VERSION="947" 85.9 CATEGORY="base-system" 85.10 SHORT_DESC="SliTaz packages manager" 85.11 MAINTAINER="pankso@slitaz.org"