wok-next rev 20443
The rest of my "home work" for update many packages (up to Xorg, GTK and Openbox) for Next and mainly for Next64. Since this point this repository is open for commits. Many errors are expected due to harfbuzz-freetype dependency loop...
line diff
1.1 --- a/915resolution/receipt Sat Feb 24 10:43:01 2018 +0200 1.2 +++ b/915resolution/receipt Sat Feb 24 16:17:33 2018 +0200 1.3 @@ -1,4 +1,4 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="915resolution" 1.8 VERSION="0.5.3" 1.9 @@ -6,23 +6,18 @@ 1.10 SHORT_DESC="Intel video BIOS hack to support certain resolutions" 1.11 MAINTAINER="erjo@slitaz.org" 1.12 LICENSE="PublicDomain" 1.13 +WEB_SITE="http://915resolution.mango-lang.org/" 1.14 + 1.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.16 -WEB_SITE="http://915resolution.mango-lang.org/" 1.17 WGET_URL="$WEB_SITE$TARBALL" 1.18 -TAGS="widescreen resolution" 1.19 1.20 -DEPENDS="" 1.21 - 1.22 -# Rules to configure and make the package. 1.23 -compile_rules() 1.24 -{ 1.25 +compile_rules() { 1.26 make 1.27 + install -Dm755 $src/915resolution $install/usr/sbin/915resolution 1.28 + install -Dm755 $src/dump_bios $install/usr/sbin/dump_bios 1.29 } 1.30 1.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.32 -genpkg_rules() 1.33 -{ 1.34 - mkdir -p $fs/usr/sbin 1.35 - install $src/$PACKAGE $fs/usr/sbin 1.36 - install $src/dump_bios $fs/usr/sbin 1.37 +genpkg_rules() { 1.38 + copy @std 1.39 + TAGS="widescreen resolution" 1.40 }
2.1 --- a/advancecomp/receipt Sat Feb 24 10:43:01 2018 +0200 2.2 +++ b/advancecomp/receipt Sat Feb 24 16:17:33 2018 +0200 2.3 @@ -1,51 +1,48 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="advancecomp" 2.7 -VERSION="2.0" 2.8 -COMMIT="4e04906" 2.9 +VERSION="2.1" 2.10 +COMMIT="ea4f30c" 2.11 CATEGORY="system-tools" 2.12 SHORT_DESC="Recompression utilities for .ZIP, .PNG, .MNG and .GZ" 2.13 MAINTAINER="pascal.bellard@slitaz.org" 2.14 LICENSE="GPL2" 2.15 WEB_SITE="http://www.advancemame.it/comp-readme" 2.16 -TAGS="compression archive" 2.17 +HOST_ARCH="i486 x86_64" 2.18 2.19 TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.gz" 2.20 WGET_URL="$GITHUB/amadvance/advancecomp/tarball/${COMMIT:-v$VERSION}" 2.21 2.22 BUILD_DEPENDS="automake zlib-dev" 2.23 -SPLIT="advancecomp-static" 2.24 +SPLIT="advancecomp advancecomp-static:static" 2.25 2.26 -# Rules to configure and make the package. 2.27 -compile_rules() 2.28 -{ 2.29 +compile_rules() { 2.30 ./autogen.sh && 2.31 2.32 - # make statically linked tools 2.33 - ./configure \ 2.34 - LDFLAGS='-static' \ 2.35 - --bindir=/usr/sbin \ 2.36 - $CONFIGURE_ARGS && 2.37 - make && make install && 2.38 + case "$SET" in 2.39 + static) 2.40 + ./configure \ 2.41 + LDFLAGS='-static' \ 2.42 + $CONFIGURE_ARGS;; 2.43 + *) 2.44 + ./configure $CONFIGURE_ARGS;; 2.45 + esac && 2.46 2.47 - # make dynamically linked tools 2.48 - make clean && 2.49 - ./configure $CONFIGURE_ARGS && make && make install 2.50 + make && make install 2.51 } 2.52 2.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.54 -genpkg_rules() 2.55 -{ 2.56 +genpkg_rules() { 2.57 case $PACKAGE in 2.58 advancecomp) 2.59 - copy bin/ 2.60 + copy @std 2.61 DEPENDS="zlib" 2.62 ;; 2.63 *-static) 2.64 - copy sbin/ 2.65 + copy @std 2.66 CAT="system-tools|static binary" 2.67 DEPENDS=" " 2.68 PROVIDE="advancecomp" 2.69 ;; 2.70 esac 2.71 + TAGS="compression archive" 2.72 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/amd-microcode/receipt Sat Feb 24 16:17:33 2018 +0200 3.3 @@ -0,0 +1,35 @@ 3.4 +# SliTaz package receipt v2. 3.5 + 3.6 +PACKAGE="amd-microcode" 3.7 +VERSION="20180125" # just date of creating the receipt 3.8 +CATEGORY="kernel" 3.9 +SHORT_DESC="AMD processor microcode update for Linux" 3.10 +MAINTAINER="al.bobylev@gmail.com" 3.11 +LICENSE="unknown" 3.12 +WEB_SITE="http://linuxfromscratch.org/blfs/view/svn/postlfs/firmware.html#and-microcode" # yes, "and" is typo 3.13 +# See also: https://wiki.gentoo.org/wiki/AMD_microcode 3.14 + 3.15 +compile_rules() { 3.16 + mkdir -p $install/lib/firmware/amd-ucode 3.17 + 3.18 + for i in microcode_amd.bin microcode_amd_fam15h.bin microcode_amd_fam16h.bin; do 3.19 + [ -f "$SRC/$i" ] || 3.20 + wget -O "$SRC/$i" http://anduin.linuxfromscratch.org/BLFS/linux-firmware/amd-ucode/$i 3.21 + if [ ! -f "$SRC/$i" ]; then 3.22 + echo "ERROR: can't get $i" 3.23 + return 1 3.24 + fi 3.25 + cp "$SRC/$i" $install/lib/firmware/amd-ucode/ 3.26 + done 3.27 +} 3.28 + 3.29 +genpkg_rules() { 3.30 + copy @std 3.31 + DEPENDS="linux" 3.32 +} 3.33 + 3.34 +post_install_amd_microcode() { 3.35 + if [ -z "$1" -a -e /sys/devices/system/cpu/microcode/reload ]; then 3.36 + echo 1 > /sys/devices/system/cpu/microcode/reload 3.37 + fi 3.38 +}
4.1 --- a/apr-util/receipt Sat Feb 24 10:43:01 2018 +0200 4.2 +++ b/apr-util/receipt Sat Feb 24 16:17:33 2018 +0200 4.3 @@ -40,7 +40,7 @@ 4.4 ;; 4.5 apr-dbd-mysql) 4.6 copy *mysql*.so 4.7 - DEPENDS="apr-util libcrypto libmysqlclient libssl zlib" 4.8 + DEPENDS="apr-util libmysqlclient openssl zlib" 4.9 CAT="libdevel|MySQL DBD driver" 4.10 ;; 4.11 apr-dbd-odbc) 4.12 @@ -60,7 +60,7 @@ 4.13 ;; 4.14 apr-crypto) 4.15 copy *crypto*.so 4.16 - DEPENDS="apr-util libcrypto libssl" 4.17 + DEPENDS="apr-util openssl" 4.18 CAT="libdevel|OpenSSL crypto plugin" 4.19 ;; 4.20 apr-dbm-gdbm)
5.1 --- a/at-spi2-atk/receipt Sat Feb 24 10:43:01 2018 +0200 5.2 +++ b/at-spi2-atk/receipt Sat Feb 24 16:17:33 2018 +0200 5.3 @@ -7,35 +7,31 @@ 5.4 MAINTAINER="yuripourre@gmail.com" 5.5 LICENSE="GPL3" 5.6 WEB_SITE="https://www.gnome.org/" 5.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/at-spi2-atk.html" 5.8 5.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 5.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 5.11 5.12 -BUILD_DEPENDS="dbus-dev glib-dev atk-dev at-spi2-core-dev" 5.13 +BUILD_DEPENDS="dbus-dev glib-dev atk-dev at-spi2-core-dev xorg-libSM-dev \ 5.14 +xorg-libX11-dev" 5.15 SPLIT="at-spi2-atk-dev" 5.16 5.17 -# Rules to configure and make the package. 5.18 -compile_rules() 5.19 -{ 5.20 - # http://www.linuxfromscratch.org/blfs/view/stable/x/at-spi2-atk.html 5.21 - ./configure $CONFIGURE_ARGS && make && make install 5.22 +compile_rules() { 5.23 + fix ld 5.24 + ./configure $CONFIGURE_ARGS && 5.25 + fix libtool && 5.26 + make && make install 5.27 } 5.28 5.29 -genpkg_rules() 5.30 -{ 5.31 +genpkg_rules() { 5.32 case $PACKAGE in 5.33 at-spi2-atk) 5.34 copy @std 5.35 - DEPENDS="at-spi2-core atk dbus glib libffi pcre util-linux-uuid \ 5.36 - xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \ 5.37 - xorg-libxcb" 5.38 + DEPENDS="at-spi2-core atk dbus glib" 5.39 ;; 5.40 - at-spi2-atk-dev) 5.41 + *-dev) 5.42 copy @dev 5.43 - DEPENDS="at-spi2-atk \ 5.44 - at-spi2-core-dev atk-dev dbus-dev glib-dev libffi-dev pcre-dev \ 5.45 - util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \ 5.46 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev" 5.47 + DEPENDS="at-spi2-atk at-spi2-core-dev glib-dev" 5.48 ;; 5.49 esac 5.50 }
6.1 --- a/at-spi2-core/receipt Sat Feb 24 10:43:01 2018 +0200 6.2 +++ b/at-spi2-core/receipt Sat Feb 24 16:17:33 2018 +0200 6.3 @@ -7,6 +7,7 @@ 6.4 MAINTAINER="al.bobylev@gmail.com" 6.5 LICENSE="GPL3" 6.6 WEB_SITE="https://www.gnome.org/" 6.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/at-spi2-core.html" 6.8 6.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 6.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 6.11 @@ -15,32 +16,25 @@ 6.12 xorg-libXtst-dev xorg-libSM-dev gobject-introspection-dev" 6.13 SPLIT="at-spi2-core-dev" 6.14 6.15 -# Rules to configure and make the package. 6.16 -compile_rules() 6.17 -{ 6.18 - # http://www.linuxfromscratch.org/blfs/view/stable/x/at-spi2-core.html 6.19 +compile_rules() { 6.20 + fix ld 6.21 ./configure \ 6.22 --sysconfdir=/etc \ 6.23 $CONFIGURE_ARGS && 6.24 + fix libtool && 6.25 make && 6.26 make install 6.27 } 6.28 6.29 -genpkg_rules() 6.30 -{ 6.31 +genpkg_rules() { 6.32 case $PACKAGE in 6.33 at-spi2-core) 6.34 copy @std 6.35 - DEPENDS="dbus glib libffi pcre util-linux-blkid util-linux-mount \ 6.36 - util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 6.37 - xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXtst xorg-libxcb zlib" 6.38 + DEPENDS="dbus glib xorg-libX11 xorg-libXtst" 6.39 ;; 6.40 - at-spi2-core-dev) 6.41 + *-dev) 6.42 copy @dev 6.43 - DEPENDS="at-spi2-core \ 6.44 - dbus-dev glib-dev gobject-introspection-dev libffi-dev pcre-dev \ 6.45 - util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \ 6.46 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libxcb-dev" 6.47 + DEPENDS="at-spi2-core dbus-dev glib-dev" 6.48 ;; 6.49 esac 6.50 }
7.1 --- a/atk/receipt Sat Feb 24 10:43:01 2018 +0200 7.2 +++ b/atk/receipt Sat Feb 24 16:17:33 2018 +0200 7.3 @@ -1,33 +1,34 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="atk" 7.7 -VERSION="2.22.0" 7.8 +VERSION="2.24.0" 7.9 CATEGORY="x-window" 7.10 SHORT_DESC="Accessibility toolkit" 7.11 MAINTAINER="pankso@slitaz.org" 7.12 LICENSE="GPL2" 7.13 WEB_SITE="https://www.gnome.org/" 7.14 -TAGS="accessibility" 7.15 -HOST_ARCH="i486 arm" 7.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/atk.html" 7.17 7.18 TARBALL="$PACKAGE-$VERSION.tar.xz" 7.19 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 7.20 7.21 +BUILD_DEPENDS_arm="glib-dev" 7.22 BUILD_DEPENDS="glib-dev gettext gobject-introspection-dev" 7.23 -BUILD_DEPENDS_arm="glib-dev" 7.24 SPLIT="atk-dev" 7.25 7.26 -# Rules to configure and make the package. 7.27 -compile_rules() 7.28 -{ 7.29 +compile_rules() { 7.30 ./configure $CONFIGURE_ARGS && make && make install 7.31 } 7.32 7.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.34 -genpkg_rules() 7.35 -{ 7.36 +genpkg_rules() { 7.37 case $PACKAGE in 7.38 - atk) copy @std; DEPENDS="glib";; 7.39 - *-dev) copy @dev;; 7.40 + atk) 7.41 + copy @std 7.42 + DEPENDS="glib" 7.43 + TAGS="accessibility" 7.44 + ;; 7.45 + *-dev) 7.46 + copy @dev 7.47 + ;; 7.48 esac 7.49 }
8.1 --- a/autoconf213/receipt Sat Feb 24 10:43:01 2018 +0200 8.2 +++ b/autoconf213/receipt Sat Feb 24 16:17:33 2018 +0200 8.3 @@ -26,3 +26,4 @@ 8.4 copy @std @dev 8.5 DEPENDS="m4 perl" 8.6 } 8.7 +
9.1 --- a/busybox/receipt Sat Feb 24 10:43:01 2018 +0200 9.2 +++ b/busybox/receipt Sat Feb 24 16:17:33 2018 +0200 9.3 @@ -7,17 +7,18 @@ 9.4 MAINTAINER="pascal.bellard@slitaz.org" 9.5 LICENSE="GPL2" 9.6 WEB_SITE="https://busybox.net/" 9.7 -HOST_ARCH="i486 arm" 9.8 9.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 9.10 WGET_URL="${WEB_SITE}downloads/$TARBALL" 9.11 9.12 BUILD_DEPENDS_arm="bzip2" 9.13 BUILD_DEPENDS="patch bzip2 gettext perl pam-dev" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc 9.14 -#SPLIT="busybox-boot busybox-pam busybox-static ssfs-busybox" 9.15 -SPLIT="busybox-pam ssfs-busybox" 9.16 +case "$ARCH" in 9.17 + arm*) SPLIT='';; 9.18 + x86_64) SPLIT="busybox busybox-pam:pam";; 9.19 + *) SPLIT="busybox busybox-pam:pam ssfs-busybox:ssfs busybox-boot:boot busybox-static:static";; 9.20 +esac 9.21 9.22 -# Rules to configure and make the package. 9.23 compile_rules() { 9.24 case "$ARCH" in 9.25 arm*) 9.26 @@ -26,29 +27,100 @@ 9.27 make oldconfig && 9.28 make && make install || return 1 9.29 chmod 4755 $src/_install/bin/busybox 9.30 + return 0 9.31 ;; 9.32 - x86_64) 9.33 - echo "TODO" 9.34 - ;; 9.35 - i?86) 9.36 - echo 'Making busybox' 9.37 - cp $stuff/.config $src && 9.38 + esac 9.39 + 9.40 +alias ar=/usr/bin/ar 9.41 + 9.42 + # Next both for i?86 and x86_64 native compilation 9.43 + case "$SET" in 9.44 + '') 9.45 + cp $stuff/.config $src 9.46 make oldconfig && 9.47 - make && 9.48 - make install || return 1 9.49 + make AR=/usr/bin/ar && 9.50 + make AR=/usr/bin/ar install || return 1 9.51 strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr \ 9.52 $src/_install/bin/busybox 9.53 - mv docs/busybox.1 docs/busybox.base.1 9.54 9.55 - # prepare busybox-pam package 9.56 - echo 'Making busybox-pam' 9.57 - sed -i 's|# CONFIG_PAM is not set|CONFIG_PAM=y|' $src/.config 9.58 + # Making translations 9.59 + make -C $stuff/po install 9.60 + 9.61 + cook_pick_manpages $src/docs/busybox.1 9.62 + cook_pick_docs \ 9.63 + $src/docs/*.txt \ 9.64 + $src/docs/*.htm* \ 9.65 + $src/docs/cgi 9.66 + 9.67 + cp -a $src/_install/* $install; rm -rf $src/_install 9.68 + 9.69 + [ -e $install/sbin/ip ] && ln -s busybox $install/bin/ip 9.70 + rm -f $install/bin/bbconfig $install/usr/bin/ar 9.71 + mkdir -p \ 9.72 + $install/etc/init.d \ 9.73 + $install/var/spool/cron/crontabs \ 9.74 + $install/var/spool/lpd \ 9.75 + $install/var/lib/misc \ 9.76 + $install/etc/modprobe.d \ 9.77 + $install/usr/share/udhcpc 9.78 + 9.79 + # Busybox config files 9.80 + cp -a $stuff/etc/* $install/etc 9.81 + chown -R 0.0 $install/etc 9.82 + chmod 600 $install/etc/busybox.conf 9.83 + 9.84 + # Daemon scripts 9.85 + cp $stuff/daemon $install/etc/init.d 9.86 + for i in crond dnsd ftpd httpd inetd lpd klogd ntpd syslogd \ 9.87 + telnetd tftpd udhcpd zcip; do 9.88 + grep -qi "config_$i=y" $stuff/.config && 9.89 + ln -s daemon $install/etc/init.d/$i 9.90 + done 9.91 + rm $install/linuxrc 9.92 + 9.93 + # Udhcpc stuff 9.94 + install -m755 $stuff/udhcp.script $install/usr/share/udhcpc/default.script 9.95 + 9.96 + # Httpd stuff (httphelper.sh found in slitaz-base-files package) 9.97 + ln -s /usr/lib/slitaz/httphelper.sh $install/usr/bin/httpd_helper.sh 9.98 + cp -r $stuff/www $install/var 9.99 + 9.100 + # Update copyright year 9.101 + grep -rl 'YEAR' $install/var/www | xargs sed -i "s|YEAR|$(date +%Y)|" 9.102 + ;; 9.103 + 9.104 + pam) 9.105 + sed 's|# CONFIG_PAM is not set|CONFIG_PAM=y|' $stuff/.config > $src/.config 9.106 make oldconfig && 9.107 - make || return 1 9.108 + make AR=/usr/bin/ar || return 1 9.109 strip --strip-unneeded -R .eh_frame -R .eh_frame_hdr busybox 9.110 - mv busybox busybox-pam 9.111 - mv docs/busybox.1 docs/busybox.pam.1 9.112 9.113 +# mv docs/busybox.1 docs/busybox.pam.1 9.114 + mkdir -p \ 9.115 + $install/bin/ \ 9.116 + $install/etc/pam.d/ 9.117 + cp -a $src/busybox $install/bin 9.118 + cp $stuff/login $install/etc/pam.d/ 9.119 + ;; 9.120 + 9.121 + ssfs) 9.122 + # WARNING! This branch not tested yet! 9.123 + # 9.124 + rootfs="$src/ssfs-busybox/usr/share/ssfs/rootfs" 9.125 + mkdir -p $rootfs/etc 9.126 + cp $stuff/.config-ssfs $src/.config 9.127 + make oldconfig && 9.128 + make busybox && 9.129 + make CONFIG_PREFIX=$rootfs install || return 1 9.130 + cp $stuff/busybox.conf-ssfs $rootfs/etc/busybox.conf 9.131 + chown -R 0.0 $rootfs/etc 9.132 + chmod 0600 $rootfs/etc/busybox.conf 9.133 + chmod 4755 $rootfs/bin/busybox 9.134 + ;; 9.135 + 9.136 + static) 9.137 + # WARNING! This branch not tested yet! 9.138 + # 9.139 # prepare busybox-static package 9.140 if [ -n "$(/usr/bin/uclibc-i486-gcc --version 2>/dev/null)" ]; then 9.141 echo 'Making busybox-uclibc' 9.142 @@ -85,82 +157,41 @@ 9.143 mv busybox busybox-diet 9.144 mv -f docs/busybox.1 docs/busybox.static.1 9.145 fi 9.146 - 9.147 - # prepare ssfs-busybox package 9.148 - echo 'Making busybox-ssfs' 9.149 - rootfs="$src/ssfs-busybox/usr/share/ssfs/rootfs" 9.150 - mkdir -p $rootfs/etc 9.151 - cp $stuff/.config-ssfs $src/.config 9.152 - make oldconfig && 9.153 - make busybox && 9.154 - make CONFIG_PREFIX=$rootfs install || return 1 9.155 - cp $stuff/busybox.conf-ssfs $rootfs/etc/busybox.conf 9.156 - chown -R 0.0 $rootfs/etc 9.157 - chmod 0600 $rootfs/etc/busybox.conf 9.158 - chmod 4755 $rootfs/bin/busybox 9.159 - 9.160 - echo 'Making translations' 9.161 - make -C $stuff/po install 9.162 - cp docs/busybox.base.1 docs/busybox.1 9.163 ;; 9.164 - 9.165 esac 9.166 - 9.167 - cook_pick_manpages $src/docs/busybox.1 9.168 - cook_pick_docs \ 9.169 - $src/docs/*.txt \ 9.170 - $src/docs/*.htm* \ 9.171 - $src/docs/cgi 9.172 } 9.173 9.174 # Cross compilation check. 9.175 testsuite() { 9.176 - readelf -h $src/_install/bin/busybox 9.177 + readelf -h $install/bin/busybox 9.178 } 9.179 9.180 # Rules to gen a SliTaz package suitable for Tazpkg. 9.181 genpkg_rules() { 9.182 case $PACKAGE in 9.183 busybox) 9.184 + copy @std *.mo 9.185 DEPENDS="slitaz-base-files glibc-base ncurses" 9.186 CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \ 9.187 /etc/resolv.conf /etc/httpd.conf" 9.188 - cp -a $src/_install/* $fs 9.189 - [ -e $fs/sbin/ip ] && ln -s busybox $fs/bin/ip 9.190 - rm -f $fs/bin/bbconfig $fs/usr/bin/ar 9.191 - mkdir -p \ 9.192 - $fs/etc/init.d \ 9.193 - $fs/var/spool/cron/crontabs \ 9.194 - $fs/var/spool/lpd \ 9.195 - $fs/var/lib/misc \ 9.196 - $fs/etc/modprobe.d \ 9.197 - $fs/usr/share/udhcpc 9.198 + ;; 9.199 + busybox-pam) 9.200 + copy @std 9.201 + CAT="base-system|with PAM support" 9.202 + DEPENDS="busybox pam" 9.203 + CONFIG_FILES="/etc/pam.d" 9.204 + PROVIDE="busybox:pam" 9.205 + ;; 9.206 + ssfs-busybox) 9.207 + # NOTE: We install files in Ssfs data directory to always have ready 9.208 + # to create chroot on the server and provide an easy way to update 9.209 + # the vdisk. We don't do a static build, we need some shared lib in 9.210 + # the chroot anyway. Busybox is configured to not use /usr and with 9.211 + # a minimal set of applets. 9.212 9.213 - # Busybox config files 9.214 - cp -a $stuff/etc/* $fs/etc 9.215 - chown -R 0.0 $fs/etc 9.216 - chmod 600 $fs/etc/busybox.conf 9.217 - 9.218 - # Daemon scripts 9.219 - cp $stuff/daemon $fs/etc/init.d 9.220 - for i in crond dnsd ftpd httpd inetd lpd klogd ntpd syslogd \ 9.221 - telnetd tftpd udhcpd zcip; do 9.222 - grep -qi "config_$i=y" $stuff/.config && 9.223 - ln -s daemon $fs/etc/init.d/$i 9.224 - done 9.225 - rm $fs/linuxrc 9.226 - 9.227 - # Udhcpc stuff 9.228 - cp $stuff/udhcp.script $fs/usr/share/udhcpc/default.script 9.229 - chmod +x $fs/usr/share/udhcpc/default.script 9.230 - 9.231 - # Httpd stuff (httphelper.sh found in slitaz-base-files package) 9.232 - ln -s /usr/lib/slitaz/httphelper.sh $fs/usr/bin/httpd_helper.sh 9.233 - cp -r $stuff/www $fs/var 9.234 - 9.235 - # Update copyright year 9.236 - grep -rl 'YEAR' $fs/var/www | xargs sed -i "s|YEAR|$(date +%Y)|" 9.237 - : 9.238 + CAT="base-system|for Ssfs virtual disk minimal chroot" 9.239 + rootfs=$fs/usr/share/ssfs/rootfs 9.240 + cp -a $src/ssfs-busybox/* $fs 9.241 ;; 9.242 busybox-boot) 9.243 jslinux=false 9.244 @@ -201,17 +232,6 @@ 9.245 $fs/usr/share/boot/dev \ 9.246 $fs/usr/share/boot/init 9.247 ;; 9.248 - busybox-pam) 9.249 - CAT="base-system|with PAM support" 9.250 - DEPENDS="busybox pam" 9.251 - CONFIG_FILES="/etc/pam.d" 9.252 - PROVIDE="busybox:pam" 9.253 - mkdir -p \ 9.254 - $fs/bin/ \ 9.255 - $fs/etc/pam.d/ 9.256 - cp -a $src/busybox-pam $fs/bin/busybox 9.257 - cp $stuff/login $fs/etc/pam.d/ 9.258 - ;; 9.259 busybox-static) 9.260 CAT="base-system|static version" 9.261 DEPENDS=" " 9.262 @@ -228,17 +248,6 @@ 9.263 done 9.264 cp -a $src/busybox-$CHOICE $fs/usr/share/boot/busybox-static 9.265 ;; 9.266 - ssfs-busybox) 9.267 - # NOTE: We install files in Ssfs data directory to always have ready 9.268 - # to create chroot on the server and provide an easy way to update 9.269 - # the vdisk. We don't do a static build, we need some shared lib in 9.270 - # the chroot anyway. Busybox is configured to not use /usr and with 9.271 - # a minimal set of applets. 9.272 - 9.273 - CAT="base-system|for Ssfs virtual disk minimal chroot" 9.274 - rootfs=$fs/usr/share/ssfs/rootfs 9.275 - cp -a $src/ssfs-busybox/* $fs 9.276 - ;; 9.277 esac 9.278 } 9.279
10.1 --- a/busybox/stuff/.config Sat Feb 24 10:43:01 2018 +0200 10.2 +++ b/busybox/stuff/.config Sat Feb 24 16:17:33 2018 +0200 10.3 @@ -106,7 +106,7 @@ 10.4 CONFIG_UNICODE_USING_LOCALE=y 10.5 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set 10.6 CONFIG_SUBST_WCHAR=63 10.7 -CONFIG_LAST_SUPPORTED_WCHAR=11263 10.8 +CONFIG_LAST_SUPPORTED_WCHAR=196607 10.9 CONFIG_UNICODE_COMBINING_WCHARS=y 10.10 CONFIG_UNICODE_WIDE_WCHARS=y 10.11 # CONFIG_UNICODE_BIDI_SUPPORT is not set
11.1 --- a/cairo/receipt Sat Feb 24 10:43:01 2018 +0200 11.2 +++ b/cairo/receipt Sat Feb 24 16:17:33 2018 +0200 11.3 @@ -7,39 +7,44 @@ 11.4 MAINTAINER="pankso@slitaz.org" 11.5 LICENSE="MPL LGPL2.1" 11.6 WEB_SITE="https://www.cairographics.org/" 11.7 -HOST_ARCH="i486 arm" 11.8 11.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 11.10 WGET_URL="${WEB_SITE}releases/$TARBALL" 11.11 11.12 BUILD_DEPENDS="pkg-config glib-dev libpng16-dev zlib-dev fontconfig-dev \ 11.13 -freetype-dev xorg-libX11-dev xorg-libXext-dev pixman-dev xorg-libXau-dev \ 11.14 -xorg-libXdmcp-dev xorg-libXrender-dev xcb-util-dev libxcb-dev expat-dev \ 11.15 -libxml2-dev" 11.16 -SPLIT="cairo-tools cairo-dev" 11.17 -SIBLINGS="cairo-gl" 11.18 +freetype-dev xorg-libX11-dev xorg-libXext-dev xorg-pixman-dev xorg-libXau-dev \ 11.19 +xorg-libXdmcp-dev xorg-libXrender-dev xorg-xcb-util-dev xorg-libxcb-dev \ 11.20 +expat-dev libxml2-dev" 11.21 +SPLIT="cairo cairo-tools cairo-dev" 11.22 11.23 -# Handle cross compilation 11.24 -case "$ARCH" in 11.25 - arm*) export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib" ;; 11.26 -esac 11.27 +#BUILD_DEPENDS="$BUILD_DEPENDS mesa-dev eudev-dev xorg-libXxf86vm-dev \ 11.28 +#libdrm-dev libegl-mesa xorg-libxshmfence-dev" 11.29 +#SPLIT="$SPLIT cairo-gl:gl cairo-gl-tools:gl cairo-gl-dev:gl" 11.30 11.31 -# Rules to configure and make the package. 11.32 -compile_rules() 11.33 -{ 11.34 +compile_rules() { 11.35 + case "$ARCH" in 11.36 + arm*) export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib";; 11.37 + esac 11.38 + 11.39 + case "$SET" in 11.40 + gl) SET_ARGS='--enable-gl';; 11.41 + *) SET_ARGS='--disable-gl';; 11.42 + esac 11.43 + 11.44 + fix ld 11.45 ./configure \ 11.46 + --disable-silent-rules \ 11.47 --enable-xcb \ 11.48 --enable-xlib-xcb \ 11.49 --enable-tee \ 11.50 --disable-static \ 11.51 - $CONFIGURE_ARGS && 11.52 + $SET_ARGS $ARCH_ARGS $CONFIGURE_ARGS && 11.53 + fix libtool && 11.54 make $MAKEFLAGS && 11.55 make DESTDIR=$DESTDIR install 11.56 } 11.57 11.58 -# Rules to gen a SliTaz package suitable for Tazpkg. 11.59 -genpkg_rules() 11.60 -{ 11.61 +genpkg_rules() { 11.62 case $PACKAGE in 11.63 cairo) 11.64 copy libcairo.so* libcairo-gobject.so* libcairo-script-interpreter.so* 11.65 @@ -59,5 +64,29 @@ 11.66 libxml2-dev pcre-dev pixman-dev xorg-libX11-dev xorg-libXau-dev \ 11.67 xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev" 11.68 ;; 11.69 + 11.70 + cairo-gl) 11.71 + copy usr/lib/*.so* 11.72 + CAT="x-window|with GL support" 11.73 + DEPENDS="bzlib fontconfig freetype glib glibc-base harfbuzz libdrm \ 11.74 + libffi libpng16 libxcb libxml2 mesa libegl-mesa pcre pixman eudev \ 11.75 + xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp xorg-libXext \ 11.76 + xorg-libXfixes xorg-libXrender xorg-libXxf86vm zlib" 11.77 + ;; 11.78 + cairo-gl-tools) 11.79 + copy usr/bin/ usr/lib/cairo/*.so* 11.80 + CAT="development|development tools with GL support" 11.81 + DEPENDS="cairo-gl libbfd wayland" 11.82 + ;; 11.83 + cairo-gl-dev) 11.84 + copy @dev 11.85 + CAT="development|development files with GL support" 11.86 + DEPENDS="cairo-gl cairo-gl-tools fontconfig-dev freetype-dev \ 11.87 + glib-dev harfbuzz-dev libdrm-dev libffi-dev libpng-dev libxcb-dev \ 11.88 + libxml2-dev mesa-wayland-dev pcre-dev pixman-dev udev-dev \ 11.89 + wayland-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdamage-dev \ 11.90 + xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \ 11.91 + xorg-libXrender-dev xorg-libXxf86vm-dev" 11.92 + ;; 11.93 esac 11.94 }
12.1 --- a/cdrkit/receipt Sat Feb 24 10:43:01 2018 +0200 12.2 +++ b/cdrkit/receipt Sat Feb 24 16:17:33 2018 +0200 12.3 @@ -15,9 +15,7 @@ 12.4 BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev" 12.5 SPLIT="cdrkit cdrkit-audio cdrkit-isoinfo readom" 12.6 12.7 -# Rules to configure and make the package. 12.8 -compile_rules() 12.9 -{ 12.10 +compile_rules() { 12.11 sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \ 12.12 genisoimage/CMakeLists.txt 12.13 [ -s $SOURCES_REPOSITORY/cdrkit-1.1.9-efi-boot.patch ] || 12.14 @@ -26,44 +24,42 @@ 12.15 make PREFIX=/usr && make install PREFIX=/usr 12.16 } 12.17 12.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.19 -genpkg_rules() 12.20 -{ 12.21 +genpkg_rules() { 12.22 case $PACKAGE in 12.23 - cdrkit) 12.24 - DEPENDS="libcap zlib bzlib attr" 12.25 - mkdir -p $fs/usr/bin 12.26 - cp $install/usr/bin/genisoimage $fs/usr/bin 12.27 - cp $install/usr/bin/wodim $fs/usr/bin 12.28 - # Make symlinks for cdrtools compatibility 12.29 - cd $fs/usr/bin 12.30 - ln -s wodim cdrecord 12.31 - ln -s genisoimage mkisofs 12.32 - ln -s genisoimage mkhybrid 12.33 - ;; 12.34 - cdrkit-audio) 12.35 - CAT="multimedia|Icedax, cdda2ogg and other tools for extracting audio files." 12.36 - mkdir -p $fs/usr/bin 12.37 - cp -a $install/usr/bin/cdda* $fs/usr/bin 12.38 - cp $install/usr/bin/icedax $fs/usr/bin 12.39 - cp $install/usr/bin/pitchplay $fs/usr/bin 12.40 - # Make symlinks for cdrtools compatibility 12.41 - cd $fs/usr/bin 12.42 - ln -s icedax cdda2wav 12.43 - ;; 12.44 - cdrkit-isoinfo) 12.45 - CAT="multimedia|Isoinfo Utility programs for iso9660 images" 12.46 - mkdir -p $fs/usr/bin 12.47 - cp -a $install/usr/bin/isoinfo $fs/usr/bin 12.48 - ;; 12.49 - readom) 12.50 - CAT="utilities|readom as readcd for use with graveman" 12.51 - mkdir -p $fs/usr/bin 12.52 - cp $install/usr/bin/readom $fs/usr/bin 12.53 + cdrkit) 12.54 + DEPENDS="libcap zlib bzlib attr" 12.55 + mkdir -p $fs/usr/bin 12.56 + cp $install/usr/bin/genisoimage $fs/usr/bin 12.57 + cp $install/usr/bin/wodim $fs/usr/bin 12.58 + # Make symlinks for cdrtools compatibility 12.59 + cd $fs/usr/bin 12.60 + ln -s wodim cdrecord 12.61 + ln -s genisoimage mkisofs 12.62 + ln -s genisoimage mkhybrid 12.63 + ;; 12.64 + cdrkit-audio) 12.65 + CAT="multimedia|Icedax, cdda2ogg and other tools for extracting audio files." 12.66 + mkdir -p $fs/usr/bin 12.67 + cp -a $install/usr/bin/cdda* $fs/usr/bin 12.68 + cp $install/usr/bin/icedax $fs/usr/bin 12.69 + cp $install/usr/bin/pitchplay $fs/usr/bin 12.70 + # Make symlinks for cdrtools compatibility 12.71 + cd $fs/usr/bin 12.72 + ln -s icedax cdda2wav 12.73 + ;; 12.74 + cdrkit-isoinfo) 12.75 + CAT="multimedia|Isoinfo Utility programs for iso9660 images" 12.76 + mkdir -p $fs/usr/bin 12.77 + cp -a $install/usr/bin/isoinfo $fs/usr/bin 12.78 + ;; 12.79 + readom) 12.80 + CAT="utilities|readom as readcd for use with graveman" 12.81 + mkdir -p $fs/usr/bin 12.82 + cp $install/usr/bin/readom $fs/usr/bin 12.83 12.84 - # Make symlinks for cdrtools compatibility 12.85 - cd $fs/usr/bin 12.86 - ln -s readom readcd 12.87 - ;; 12.88 + # Make symlinks for cdrtools compatibility 12.89 + cd $fs/usr/bin 12.90 + ln -s readom readcd 12.91 + ;; 12.92 esac 12.93 }
13.1 --- a/cherrytree/receipt Sat Feb 24 10:43:01 2018 +0200 13.2 +++ b/cherrytree/receipt Sat Feb 24 16:17:33 2018 +0200 13.3 @@ -1,31 +1,23 @@ 13.4 -# SliTaz package receipt. 13.5 +# SliTaz package receipt v2. 13.6 13.7 PACKAGE="cherrytree" 13.8 -VERSION="0.28.5" 13.9 +VERSION="0.38.4" 13.10 CATEGORY="office" 13.11 SHORT_DESC="A hierarchical note taking application" 13.12 MAINTAINER="al.bobylev@gmail.com" 13.13 -LICENSE="GPL2" 13.14 -WEB_SITE="http://www.giuspen.com/cherrytree/" 13.15 +LICENSE="GPL3" 13.16 +WEB_SITE="https://www.giuspen.com/cherrytree/" 13.17 + 13.18 TARBALL="$PACKAGE-$VERSION.tar.xz" 13.19 WGET_URL="http://www.giuspen.com/software/$TARBALL" 13.20 13.21 -DEPENDS="python pygtk pygtksourceview p7zip-full" 13.22 BUILD_DEPENDS="python desktop-file-utils pygtksourceview-dev gettext" 13.23 13.24 -# Rules to configure and make the package. 13.25 -compile_rules() 13.26 -{ 13.27 +compile_rules() { 13.28 python setup.py install --prefix=$install/usr -f 13.29 } 13.30 13.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 13.32 -genpkg_rules() 13.33 -{ 13.34 - mkdir -p $fs/usr/share 13.35 - cp -a $install/usr/bin $fs/usr 13.36 - cp -a $install/usr/lib $fs/usr 13.37 - cp -a $install/usr/share/applications $fs/usr/share 13.38 - cp -a $install/usr/share/cherrytree $fs/usr/share 13.39 - cp -a $install/usr/share/icons $fs/usr/share 13.40 +genpkg_rules() { 13.41 + copy @std 13.42 + DEPENDS="python pygtk pygtksourceview p7zip-full" 13.43 }
14.1 --- a/cmake/receipt Sat Feb 24 10:43:01 2018 +0200 14.2 +++ b/cmake/receipt Sat Feb 24 16:17:33 2018 +0200 14.3 @@ -15,9 +15,7 @@ 14.4 BUILD_DEPENDS="zlib-dev curl-dev bzip2-dev xz-dev libarchive-dev \ 14.5 expat-dev ncurses-dev gfortran" 14.6 14.7 -# Rules to configure and make the package. 14.8 -compile_rules() 14.9 -{ 14.10 +compile_rules() { 14.11 sed -i '/CMAKE_USE_LIBUV 1/s/1/0/' CMakeLists.txt && 14.12 sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake && 14.13 14.14 @@ -32,9 +30,7 @@ 14.15 make DESTDIR=$DESTDIR install 14.16 } 14.17 14.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 14.19 -genpkg_rules() 14.20 -{ 14.21 +genpkg_rules() { 14.22 copy @std @dev 14.23 DEPENDS="expat libarchive libcurl ncurses-libform zlib" 14.24 }
15.1 --- a/colord/receipt Sat Feb 24 10:43:01 2018 +0200 15.2 +++ b/colord/receipt Sat Feb 24 16:17:33 2018 +0200 15.3 @@ -7,6 +7,7 @@ 15.4 MAINTAINER="al.bobylev@gmail.com" 15.5 LICENSE="GPL2" 15.6 WEB_SITE="https://www.freedesktop.org/software/colord/" 15.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/colord.html" 15.8 15.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 15.10 WGET_URL="http://www.freedesktop.org/software/colord/releases/$TARBALL" 15.11 @@ -15,9 +16,14 @@ 15.12 libgusb-dev lcms2-dev sqlite3-dev libgudev-dev polkit-dev dbus-dev vala" 15.13 SPLIT="colord-dev" 15.14 15.15 -# Rules to configure and make the package. 15.16 -compile_rules() 15.17 -{ 15.18 +compile_rules() { 15.19 + if ! grep -q colord "/etc/passwd"; then 15.20 + addgroup -g 71 colord 15.21 + adduser -g "Color Daemon Owner" -h /var/lib/colord -u 71 \ 15.22 + -G colord -s /bin/false -D colord 15.23 + fi 15.24 + 15.25 + fix ld 15.26 ./configure \ 15.27 --sysconfdir=/etc \ 15.28 --localstatedir=/var \ 15.29 @@ -29,22 +35,25 @@ 15.30 --disable-static \ 15.31 --with-systemdsystemunitdir=no \ 15.32 $CONFIGURE_ARGS && 15.33 + fix libtool && 15.34 make && make install 15.35 } 15.36 15.37 -# Rules to gen a SliTaz package suitable for Tazpkg. 15.38 -genpkg_rules() 15.39 -{ 15.40 +genpkg_rules() { 15.41 case $PACKAGE in 15.42 colord) 15.43 copy @std 15.44 - DEPENDS="eudev glib lcms2 libffi libgudev libgusb libsqlite3 \ 15.45 - libusb pcre polkit zlib" 15.46 + DEPENDS="eudev glib lcms2 libgudev libgusb libsqlite3 polkit" 15.47 ;; 15.48 colord-dev) 15.49 copy @dev 15.50 - DEPENDS="colord eudev-dev glib-dev glibc-dev lcms2-dev libffi-dev \ 15.51 - libgudev-dev libgusb-dev libusb-dev pcre-dev zlib-dev" 15.52 + DEPENDS="colord eudev-dev glib-dev lcms2-dev libgusb-dev" 15.53 ;; 15.54 esac 15.55 } 15.56 + 15.57 +post_install_colord() { 15.58 + chroot "$1/" /usr/sbin/addgroup -g 71 colord && 15.59 + chroot "$1/" /usr/sbin/adduser -g "Color Daemon Owner" -h /var/lib/colord \ 15.60 + -u 71 -G colord -s /bin/false -D colord 15.61 +}
16.1 --- a/consolekit2/receipt Sat Feb 24 10:43:01 2018 +0200 16.2 +++ b/consolekit2/receipt Sat Feb 24 16:17:33 2018 +0200 16.3 @@ -7,38 +7,31 @@ 16.4 MAINTAINER="al.bobylev@gmail.com" 16.5 LICENSE="GPL2" 16.6 WEB_SITE="https://github.com/Consolekit2/ConsoleKit2" 16.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/consolekit.html" 16.8 16.9 TARBALL="ConsoleKit2-$VERSION.tar.bz2" 16.10 WGET_URL="https://github.com/Consolekit2/ConsoleKit2/releases/download/$VERSION/$TARBALL" 16.11 16.12 BUILD_DEPENDS="xorg-libX11-dev gettext dbus-dev glib-dev polkit-dev eudev-dev \ 16.13 -xmlto libxslt docbook-xsl" 16.14 +xmlto libxslt docbook-xsl libxml2-tools" 16.15 SPLIT="consolekit2-dev" 16.16 16.17 -# Rules to configure and make the package. 16.18 -compile_rules() 16.19 -{ 16.20 - # http://www.linuxfromscratch.org/blfs/view/stable/postlfs/consolekit.html 16.21 - 16.22 +compile_rules() { 16.23 ./configure \ 16.24 - --sysconfdir=/etc \ 16.25 --localstatedir=/var \ 16.26 --enable-udev-acl \ 16.27 --enable-polkit \ 16.28 --with-xinitrc-dir=/etc/X11/app-defaults/xinitrc.d \ 16.29 - --docdir=/usr/share/doc/ConsoleKit-$VERSION \ 16.30 --with-systemdsystemunitdir=no \ 16.31 --enable-docbook-docs \ 16.32 $CONFIGURE_ARGS && 16.33 - make && make install && 16.34 + make && make install || return 1 16.35 16.36 mv -v $install/etc/X11/app-defaults/xinitrc.d/90-consolekit \ 16.37 $install/etc/X11/app-defaults/xinitrc.d/90-consolekit.sh 16.38 } 16.39 16.40 -# Rules to gen a SliTaz package suitable for Tazpkg. 16.41 -genpkg_rules() 16.42 -{ 16.43 +genpkg_rules() { 16.44 case $PACKAGE in 16.45 consolekit2) 16.46 copy @std
17.1 --- a/cookutils/receipt Sat Feb 24 10:43:01 2018 +0200 17.2 +++ b/cookutils/receipt Sat Feb 24 16:17:33 2018 +0200 17.3 @@ -1,7 +1,7 @@ 17.4 # SliTaz package receipt v2. 17.5 17.6 PACKAGE="cookutils" 17.7 -VERSION="1024" 17.8 +VERSION="1032" 17.9 CATEGORY="base-system" 17.10 SHORT_DESC="SliTaz packages builder new generation" 17.11 MAINTAINER="pankso@slitaz.org" 17.12 @@ -16,6 +16,11 @@ 17.13 compile_rules() { 17.14 make DESTDIR=$install install 17.15 17.16 + # Set correct architecture 17.17 + sed -i "/^ARCH=/ s|.*|ARCH=\"$ARCH\"|" $install/etc/slitaz/cook.conf 17.18 + # FIXME: is 'thunk-extern' supported? 17.19 + sed -i 's|thunk-extern|thunk|' $install/etc/slitaz/cook.conf 17.20 + 17.21 #Symlink cooker to busybox httpd server root 17.22 ln -s cgi-bin/cooker $install/var/www/cooker 17.23 } 17.24 @@ -25,7 +30,7 @@ 17.25 case $PACKAGE in 17.26 cookutils) 17.27 copy '*/'; rm -r $fs/etc/init.d 17.28 - DEPENDS="sdft lzma bzip2 tazpkg cacerts openssl" 17.29 + DEPENDS="sdft xz bzip2 tazpkg cacerts openssl" 17.30 ;; 17.31 cookutils-daemon) 17.32 COOKOPTS="!menus"
18.1 --- a/coreutils/stuff/patches/coreutils-8.27-i18n-1.patch Sat Feb 24 10:43:01 2018 +0200 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,5521 +0,0 @@ 18.4 -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) 18.5 -Date: 2017-03-12 18.6 -Initial Package Version: 8.27 18.7 -Upstream Status: Rejected 18.8 -Origin: Based on Fedora's i18n patches at 18.9 - http://pkgs.fedoraproject.org/cgit/rpms/coreutils.git/tree/ 18.10 -Description: Fixes i18n issues with various Coreutils programs 18.11 - 18.12 -diff -Naurp coreutils-8.27-orig/bootstrap.conf coreutils-8.27/bootstrap.conf 18.13 ---- coreutils-8.27-orig/bootstrap.conf 2017-03-07 23:34:06.000000000 -0600 18.14 -+++ coreutils-8.27/bootstrap.conf 2017-03-11 23:47:38.068058445 -0600 18.15 -@@ -152,6 +152,7 @@ gnulib_modules=" 18.16 - maintainer-makefile 18.17 - malloc-gnu 18.18 - manywarnings 18.19 -+ mbfile 18.20 - mbrlen 18.21 - mbrtowc 18.22 - mbsalign 18.23 -diff -Naurp coreutils-8.27-orig/configure.ac coreutils-8.27/configure.ac 18.24 ---- coreutils-8.27-orig/configure.ac 2017-02-26 08:52:29.000000000 -0600 18.25 -+++ coreutils-8.27/configure.ac 2017-03-11 23:47:38.068058445 -0600 18.26 -@@ -429,6 +429,8 @@ fi 18.27 - # I'm leaving it here for now. This whole thing needs to be modernized... 18.28 - gl_WINSIZE_IN_PTEM 18.29 - 18.30 -+gl_MBFILE 18.31 -+ 18.32 - gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H 18.33 - 18.34 - if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \ 18.35 -diff -Naurp coreutils-8.27-orig/lib/linebuffer.h coreutils-8.27/lib/linebuffer.h 18.36 ---- coreutils-8.27-orig/lib/linebuffer.h 2017-01-01 16:35:38.000000000 -0600 18.37 -+++ coreutils-8.27/lib/linebuffer.h 2017-03-11 23:47:13.089286391 -0600 18.38 -@@ -21,6 +21,11 @@ 18.39 - 18.40 - # include <stdio.h> 18.41 - 18.42 -+/* Get mbstate_t. */ 18.43 -+# if HAVE_WCHAR_H 18.44 -+# include <wchar.h> 18.45 -+# endif 18.46 -+ 18.47 - /* A 'struct linebuffer' holds a line of text. */ 18.48 - 18.49 - struct linebuffer 18.50 -@@ -28,6 +33,9 @@ struct linebuffer 18.51 - size_t size; /* Allocated. */ 18.52 - size_t length; /* Used. */ 18.53 - char *buffer; 18.54 -+# if HAVE_WCHAR_H 18.55 -+ mbstate_t state; 18.56 -+# endif 18.57 - }; 18.58 - 18.59 - /* Initialize linebuffer LINEBUFFER for use. */ 18.60 -diff -Naurp coreutils-8.27-orig/lib/mbfile.c coreutils-8.27/lib/mbfile.c 18.61 ---- coreutils-8.27-orig/lib/mbfile.c 1969-12-31 18:00:00.000000000 -0600 18.62 -+++ coreutils-8.27/lib/mbfile.c 2017-03-11 23:47:38.069058397 -0600 18.63 -@@ -0,0 +1,3 @@ 18.64 -+#include <config.h> 18.65 -+#define MBFILE_INLINE _GL_EXTERN_INLINE 18.66 -+#include "mbfile.h" 18.67 -diff -Naurp coreutils-8.27-orig/lib/mbfile.h coreutils-8.27/lib/mbfile.h 18.68 ---- coreutils-8.27-orig/lib/mbfile.h 1969-12-31 18:00:00.000000000 -0600 18.69 -+++ coreutils-8.27/lib/mbfile.h 2017-03-11 23:47:38.069058397 -0600 18.70 -@@ -0,0 +1,255 @@ 18.71 -+/* Multibyte character I/O: macros for multi-byte encodings. 18.72 -+ Copyright (C) 2001, 2005, 2009-2017 Free Software Foundation, Inc. 18.73 -+ 18.74 -+ This program is free software: you can redistribute it and/or modify 18.75 -+ it under the terms of the GNU General Public License as published by 18.76 -+ the Free Software Foundation; either version 3 of the License, or 18.77 -+ (at your option) any later version. 18.78 -+ 18.79 -+ This program is distributed in the hope that it will be useful, 18.80 -+ but WITHOUT ANY WARRANTY; without even the implied warranty of 18.81 -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18.82 -+ GNU General Public License for more details. 18.83 -+ 18.84 -+ You should have received a copy of the GNU General Public License 18.85 -+ along with this program. If not, see <http://www.gnu.org/licenses/>. */ 18.86 -+ 18.87 -+/* Written by Mitsuru Chinen <mchinen@yamato.ibm.com> 18.88 -+ and Bruno Haible <bruno@clisp.org>. */ 18.89 -+ 18.90 -+/* The macros in this file implement multi-byte character input from a 18.91 -+ stream. 18.92 -+ 18.93 -+ mb_file_t 18.94 -+ is the type for multibyte character input stream, usable for variable 18.95 -+ declarations. 18.96 -+ 18.97 -+ mbf_char_t 18.98 -+ is the type for multibyte character or EOF, usable for variable 18.99 -+ declarations. 18.100 -+ 18.101 -+ mbf_init (mbf, stream) 18.102 -+ initializes the MB_FILE for reading from stream. 18.103 -+ 18.104 -+ mbf_getc (mbc, mbf) 18.105 -+ reads the next multibyte character from mbf and stores it in mbc. 18.106 -+ 18.107 -+ mb_iseof (mbc) 18.108 -+ returns true if mbc represents the EOF value. 18.109 -+ 18.110 -+ Here are the function prototypes of the macros. 18.111 -+ 18.112 -+ extern void mbf_init (mb_file_t mbf, FILE *stream); 18.113 -+ extern void mbf_getc (mbf_char_t mbc, mb_file_t mbf); 18.114 -+ extern bool mb_iseof (const mbf_char_t mbc); 18.115 -+ */ 18.116 -+ 18.117 -+#ifndef _MBFILE_H 18.118 -+#define _MBFILE_H 1 18.119 -+ 18.120 -+#include <assert.h> 18.121 -+#include <stdbool.h> 18.122 -+#include <stdio.h> 18.123 -+#include <string.h> 18.124 -+ 18.125 -+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before 18.126 -+ <wchar.h>. 18.127 -+ BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before 18.128 -+ <wchar.h>. */ 18.129 -+#include <stdio.h> 18.130 -+#include <time.h> 18.131 -+#include <wchar.h> 18.132 -+ 18.133 -+#include "mbchar.h" 18.134 -+ 18.135 -+#ifndef _GL_INLINE_HEADER_BEGIN 18.136 -+ #error "Please include config.h first." 18.137 -+#endif 18.138 -+_GL_INLINE_HEADER_BEGIN 18.139 -+#ifndef MBFILE_INLINE 18.140 -+# define MBFILE_INLINE _GL_INLINE 18.141 -+#endif 18.142 -+ 18.143 -+struct mbfile_multi { 18.144 -+ FILE *fp; 18.145 -+ bool eof_seen; 18.146 -+ bool have_pushback; 18.147 -+ mbstate_t state; 18.148 -+ unsigned int bufcount; 18.149 -+ char buf[MBCHAR_BUF_SIZE]; 18.150 -+ struct mbchar pushback; 18.151 -+}; 18.152 -+ 18.153 -+MBFILE_INLINE void 18.154 -+mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf) 18.155 -+{ 18.156 -+ size_t bytes; 18.157 -+ 18.158 -+ /* If EOF has already been seen, don't use getc. This matters if 18.159 -+ mbf->fp is connected to an interactive tty. */ 18.160 -+ if (mbf->eof_seen) 18.161 -+ goto eof; 18.162 -+ 18.163 -+ /* Return character pushed back, if there is one. */ 18.164 -+ if (mbf->have_pushback) 18.165 -+ { 18.166 -+ mb_copy (mbc, &mbf->pushback); 18.167 -+ mbf->have_pushback = false; 18.168 -+ return; 18.169 -+ } 18.170 -+ 18.171 -+ /* Before using mbrtowc, we need at least one byte. */ 18.172 -+ if (mbf->bufcount == 0) 18.173 -+ { 18.174 -+ int c = getc (mbf->fp); 18.175 -+ if (c == EOF) 18.176 -+ { 18.177 -+ mbf->eof_seen = true; 18.178 -+ goto eof; 18.179 -+ } 18.180 -+ mbf->buf[0] = (unsigned char) c; 18.181 -+ mbf->bufcount++; 18.182 -+ } 18.183 -+ 18.184 -+ /* Handle most ASCII characters quickly, without calling mbrtowc(). */ 18.185 -+ if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0])) 18.186 -+ { 18.187 -+ /* These characters are part of the basic character set. ISO C 99 18.188 -+ guarantees that their wide character code is identical to their 18.189 -+ char code. */ 18.190 -+ mbc->wc = mbc->buf[0] = mbf->buf[0]; 18.191 -+ mbc->wc_valid = true; 18.192 -+ mbc->ptr = &mbc->buf[0]; 18.193 -+ mbc->bytes = 1; 18.194 -+ mbf->bufcount = 0; 18.195 -+ return; 18.196 -+ } 18.197 -+ 18.198 -+ /* Use mbrtowc on an increasing number of bytes. Read only as many bytes 18.199 -+ from mbf->fp as needed. This is needed to give reasonable interactive 18.200 -+ behaviour when mbf->fp is connected to an interactive tty. */ 18.201 -+ for (;;) 18.202 -+ { 18.203 -+ /* We don't know whether the 'mbrtowc' function updates the state when 18.204 -+ it returns -2, - this is the ISO C 99 and glibc-2.2 behaviour - or 18.205 -+ not - amended ANSI C, glibc-2.1 and Solaris 2.7 behaviour. We 18.206 -+ don't have an autoconf test for this, yet. 18.207 -+ The new behaviour would allow us to feed the bytes one by one into 18.208 -+ mbrtowc. But the old behaviour forces us to feed all bytes since 18.209 -+ the end of the last character into mbrtowc. Since we want to retry 18.210 -+ with more bytes when mbrtowc returns -2, we must backup the state 18.211 -+ before calling mbrtowc, because implementations with the new 18.212 -+ behaviour will clobber it. */ 18.213 -+ mbstate_t backup_state = mbf->state; 18.214 -+ 18.215 -+ bytes = mbrtowc (&mbc->wc, &mbf->buf[0], mbf->bufcount, &mbf->state); 18.216 -+ 18.217 -+ if (bytes == (size_t) -1) 18.218 -+ { 18.219 -+ /* An invalid multibyte sequence was encountered. */ 18.220 -+ /* Return a single byte. */ 18.221 -+ bytes = 1; 18.222 -+ mbc->wc_valid = false; 18.223 -+ break; 18.224 -+ } 18.225 -+ else if (bytes == (size_t) -2) 18.226 -+ { 18.227 -+ /* An incomplete multibyte character. */ 18.228 -+ mbf->state = backup_state; 18.229 -+ if (mbf->bufcount == MBCHAR_BUF_SIZE) 18.230 -+ { 18.231 -+ /* An overlong incomplete multibyte sequence was encountered. */ 18.232 -+ /* Return a single byte. */ 18.233 -+ bytes = 1; 18.234 -+ mbc->wc_valid = false; 18.235 -+ break; 18.236 -+ } 18.237 -+ else 18.238 -+ { 18.239 -+ /* Read one more byte and retry mbrtowc. */ 18.240 -+ int c = getc (mbf->fp); 18.241 -+ if (c == EOF) 18.242 -+ { 18.243 -+ /* An incomplete multibyte character at the end. */ 18.244 -+ mbf->eof_seen = true; 18.245 -+ bytes = mbf->bufcount; 18.246 -+ mbc->wc_valid = false; 18.247 -+ break; 18.248 -+ } 18.249 -+ mbf->buf[mbf->bufcount] = (unsigned char) c; 18.250 -+ mbf->bufcount++; 18.251 -+ } 18.252 -+ } 18.253 -+ else 18.254 -+ { 18.255 -+ if (bytes == 0) 18.256 -+ { 18.257 -+ /* A null wide character was encountered. */ 18.258 -+ bytes = 1; 18.259 -+ assert (mbf->buf[0] == '\0'); 18.260 -+ assert (mbc->wc == 0); 18.261 -+ } 18.262 -+ mbc->wc_valid = true; 18.263 -+ break; 18.264 -+ } 18.265 -+ } 18.266 -+ 18.267 -+ /* Return the multibyte sequence mbf->buf[0..bytes-1]. */ 18.268 -+ mbc->ptr = &mbc->buf[0]; 18.269 -+ memcpy (&mbc->buf[0], &mbf->buf[0], bytes); 18.270 -+ mbc->bytes = bytes; 18.271 -+ 18.272 -+ mbf->bufcount -= bytes; 18.273 -+ if (mbf->bufcount > 0) 18.274 -+ { 18.275 -+ /* It's not worth calling memmove() for so few bytes. */ 18.276 -+ unsigned int count = mbf->bufcount; 18.277 -+ char *p = &mbf->buf[0]; 18.278 -+ 18.279 -+ do 18.280 -+ { 18.281 -+ *p = *(p + bytes); 18.282 -+ p++; 18.283 -+ } 18.284 -+ while (--count > 0); 18.285 -+ } 18.286 -+ return; 18.287 -+ 18.288 -+eof: 18.289 -+ /* An mbchar_t with bytes == 0 is used to indicate EOF. */ 18.290 -+ mbc->ptr = NULL; 18.291 -+ mbc->bytes = 0; 18.292 -+ mbc->wc_valid = false; 18.293 -+ return; 18.294 -+} 18.295 -+ 18.296 -+MBFILE_INLINE void 18.297 -+mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf) 18.298 -+{ 18.299 -+ mb_copy (&mbf->pushback, mbc); 18.300 -+ mbf->have_pushback = true; 18.301 -+} 18.302 -+ 18.303 -+typedef struct mbfile_multi mb_file_t; 18.304 -+ 18.305 -+typedef mbchar_t mbf_char_t; 18.306 -+ 18.307 -+#define mbf_init(mbf, stream) \ 18.308 -+ ((mbf).fp = (stream), \ 18.309 -+ (mbf).eof_seen = false, \ 18.310 -+ (mbf).have_pushback = false, \ 18.311 -+ memset (&(mbf).state, '\0', sizeof (mbstate_t)), \ 18.312 -+ (mbf).bufcount = 0) 18.313 -+ 18.314 -+#define mbf_getc(mbc, mbf) mbfile_multi_getc (&(mbc), &(mbf)) 18.315 -+ 18.316 -+#define mbf_ungetc(mbc, mbf) mbfile_multi_ungetc (&(mbc), &(mbf)) 18.317 -+ 18.318 -+#define mb_iseof(mbc) ((mbc).bytes == 0) 18.319 -+ 18.320 -+#ifndef _GL_INLINE_HEADER_BEGIN 18.321 -+ #error "Please include config.h first." 18.322 -+#endif 18.323 -+_GL_INLINE_HEADER_BEGIN 18.324 -+ 18.325 -+#endif /* _MBFILE_H */ 18.326 -diff -Naurp coreutils-8.27-orig/m4/mbfile.m4 coreutils-8.27/m4/mbfile.m4 18.327 ---- coreutils-8.27-orig/m4/mbfile.m4 1969-12-31 18:00:00.000000000 -0600 18.328 -+++ coreutils-8.27/m4/mbfile.m4 2017-03-11 23:47:38.070058349 -0600 18.329 -@@ -0,0 +1,14 @@ 18.330 -+# mbfile.m4 serial 7 18.331 -+dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. 18.332 -+dnl This file is free software; the Free Software Foundation 18.333 -+dnl gives unlimited permission to copy and/or distribute it, 18.334 -+dnl with or without modifications, as long as this notice is preserved. 18.335 -+ 18.336 -+dnl autoconf tests required for use of mbfile.h 18.337 -+dnl From Bruno Haible. 18.338 -+ 18.339 -+AC_DEFUN([gl_MBFILE], 18.340 -+[ 18.341 -+ AC_REQUIRE([AC_TYPE_MBSTATE_T]) 18.342 -+ : 18.343 -+]) 18.344 -diff -Naurp coreutils-8.27-orig/src/cut.c coreutils-8.27/src/cut.c 18.345 ---- coreutils-8.27-orig/src/cut.c 2017-01-01 16:34:24.000000000 -0600 18.346 -+++ coreutils-8.27/src/cut.c 2017-03-11 23:47:59.526048471 -0600 18.347 -@@ -28,6 +28,11 @@ 18.348 - #include <assert.h> 18.349 - #include <getopt.h> 18.350 - #include <sys/types.h> 18.351 -+ 18.352 -+/* Get mbstate_t, mbrtowc(). */ 18.353 -+#if HAVE_WCHAR_H 18.354 -+# include <wchar.h> 18.355 -+#endif 18.356 - #include "system.h" 18.357 - 18.358 - #include "error.h" 18.359 -@@ -38,6 +43,18 @@ 18.360 - 18.361 - #include "set-fields.h" 18.362 - 18.363 -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC 18.364 -+ installation; work around this configuration error. */ 18.365 -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 18.366 -+# undef MB_LEN_MAX 18.367 -+# define MB_LEN_MAX 16 18.368 -+#endif 18.369 -+ 18.370 -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ 18.371 -+#if HAVE_MBRTOWC && defined mbstate_t 18.372 -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) 18.373 -+#endif 18.374 -+ 18.375 - /* The official name of this program (e.g., no 'g' prefix). */ 18.376 - #define PROGRAM_NAME "cut" 18.377 - 18.378 -@@ -54,6 +71,52 @@ 18.379 - } \ 18.380 - while (0) 18.381 - 18.382 -+/* Refill the buffer BUF to get a multibyte character. */ 18.383 -+#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM) \ 18.384 -+ do \ 18.385 -+ { \ 18.386 -+ if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM)) \ 18.387 -+ { \ 18.388 -+ memmove (BUF, BUFPOS, BUFLEN); \ 18.389 -+ BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \ 18.390 -+ BUFPOS = BUF; \ 18.391 -+ } \ 18.392 -+ } \ 18.393 -+ while (0) 18.394 -+ 18.395 -+/* Get wide character on BUFPOS. BUFPOS is not included after that. 18.396 -+ If byte sequence is not valid as a character, CONVFAIL is true. Otherwise false. */ 18.397 -+#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \ 18.398 -+ do \ 18.399 -+ { \ 18.400 -+ mbstate_t state_bak; \ 18.401 -+ \ 18.402 -+ if (BUFLEN < 1) \ 18.403 -+ { \ 18.404 -+ WC = WEOF; \ 18.405 -+ break; \ 18.406 -+ } \ 18.407 -+ \ 18.408 -+ /* Get a wide character. */ \ 18.409 -+ CONVFAIL = false; \ 18.410 -+ state_bak = STATE; \ 18.411 -+ MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE); \ 18.412 -+ \ 18.413 -+ switch (MBLENGTH) \ 18.414 -+ { \ 18.415 -+ case (size_t)-1: \ 18.416 -+ case (size_t)-2: \ 18.417 -+ CONVFAIL = true; \ 18.418 -+ STATE = state_bak; \ 18.419 -+ /* Fall througn. */ \ 18.420 -+ \ 18.421 -+ case 0: \ 18.422 -+ MBLENGTH = 1; \ 18.423 -+ break; \ 18.424 -+ } \ 18.425 -+ } \ 18.426 -+ while (0) 18.427 -+ 18.428 - 18.429 - /* Pointer inside RP. When checking if a byte or field is selected 18.430 - by a finite range, we check if it is between CURRENT_RP.LO 18.431 -@@ -61,6 +124,9 @@ 18.432 - CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */ 18.433 - static struct field_range_pair *current_rp; 18.434 - 18.435 -+/* Length of the delimiter given as argument to -d. */ 18.436 -+size_t delimlen; 18.437 -+ 18.438 - /* This buffer is used to support the semantics of the -s option 18.439 - (or lack of same) when the specified field list includes (does 18.440 - not include) the first field. In both of those cases, the entire 18.441 -@@ -77,15 +143,25 @@ enum operating_mode 18.442 - { 18.443 - undefined_mode, 18.444 - 18.445 -- /* Output characters that are in the given bytes. */ 18.446 -+ /* Output bytes that are at the given positions. */ 18.447 - byte_mode, 18.448 - 18.449 -+ /* Output characters that are at the given positions. */ 18.450 -+ character_mode, 18.451 -+ 18.452 - /* Output the given delimiter-separated fields. */ 18.453 - field_mode 18.454 - }; 18.455 - 18.456 - static enum operating_mode operating_mode; 18.457 - 18.458 -+/* If nonzero, when in byte mode, don't split multibyte characters. */ 18.459 -+static int byte_mode_character_aware; 18.460 -+ 18.461 -+/* If nonzero, the function for single byte locale is work 18.462 -+ if this program runs on multibyte locale. */ 18.463 -+static int force_singlebyte_mode; 18.464 -+ 18.465 - /* If true do not output lines containing no delimiter characters. 18.466 - Otherwise, all such lines are printed. This option is valid only 18.467 - with field mode. */ 18.468 -@@ -97,6 +173,9 @@ static bool complement; 18.469 - 18.470 - /* The delimiter character for field mode. */ 18.471 - static unsigned char delim; 18.472 -+#if HAVE_WCHAR_H 18.473 -+static wchar_t wcdelim; 18.474 -+#endif 18.475 - 18.476 - /* The delimiter for each line/record. */ 18.477 - static unsigned char line_delim = '\n'; 18.478 -@@ -164,7 +243,7 @@ Print selected parts of lines from each 18.479 - -f, --fields=LIST select only these fields; also print any line\n\ 18.480 - that contains no delimiter character, unless\n\ 18.481 - the -s option is specified\n\ 18.482 -- -n (ignored)\n\ 18.483 -+ -n with -b: don't split multibyte characters\n\ 18.484 - "), stdout); 18.485 - fputs (_("\ 18.486 - --complement complement the set of selected bytes, characters\n\ 18.487 -@@ -280,6 +359,82 @@ cut_bytes (FILE *stream) 18.488 - } 18.489 - } 18.490 - 18.491 -+#if HAVE_MBRTOWC 18.492 -+/* This function is in use for the following case. 18.493 -+ 18.494 -+ 1. Read from the stream STREAM, printing to standard output any selected 18.495 -+ characters. 18.496 -+ 18.497 -+ 2. Read from stream STREAM, printing to standard output any selected bytes, 18.498 -+ without splitting multibyte characters. */ 18.499 -+ 18.500 -+static void 18.501 -+cut_characters_or_cut_bytes_no_split (FILE *stream) 18.502 -+{ 18.503 -+ size_t idx; /* number of bytes or characters in the line so far. */ 18.504 -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ 18.505 -+ char *bufpos; /* Next read position of BUF. */ 18.506 -+ size_t buflen; /* The length of the byte sequence in buf. */ 18.507 -+ wint_t wc; /* A gotten wide character. */ 18.508 -+ size_t mblength; /* The byte size of a multibyte character which shows 18.509 -+ as same character as WC. */ 18.510 -+ mbstate_t state; /* State of the stream. */ 18.511 -+ bool convfail = false; /* true, when conversion failed. Otherwise false. */ 18.512 -+ /* Whether to begin printing delimiters between ranges for the current line. 18.513 -+ Set after we've begun printing data corresponding to the first range. */ 18.514 -+ bool print_delimiter = false; 18.515 -+ 18.516 -+ idx = 0; 18.517 -+ buflen = 0; 18.518 -+ bufpos = buf; 18.519 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.520 -+ 18.521 -+ current_rp = frp; 18.522 -+ 18.523 -+ while (1) 18.524 -+ { 18.525 -+ REFILL_BUFFER (buf, bufpos, buflen, stream); 18.526 -+ 18.527 -+ GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail); 18.528 -+ (void) convfail; /* ignore unused */ 18.529 -+ 18.530 -+ if (wc == WEOF) 18.531 -+ { 18.532 -+ if (idx > 0) 18.533 -+ putchar (line_delim); 18.534 -+ break; 18.535 -+ } 18.536 -+ else if (wc == line_delim) 18.537 -+ { 18.538 -+ putchar (line_delim); 18.539 -+ idx = 0; 18.540 -+ print_delimiter = false; 18.541 -+ current_rp = frp; 18.542 -+ } 18.543 -+ else 18.544 -+ { 18.545 -+ next_item (&idx); 18.546 -+ if (print_kth (idx)) 18.547 -+ { 18.548 -+ if (output_delimiter_specified) 18.549 -+ { 18.550 -+ if (print_delimiter && is_range_start_index (idx)) 18.551 -+ { 18.552 -+ fwrite (output_delimiter_string, sizeof (char), 18.553 -+ output_delimiter_length, stdout); 18.554 -+ } 18.555 -+ print_delimiter = true; 18.556 -+ } 18.557 -+ fwrite (bufpos, mblength, sizeof(char), stdout); 18.558 -+ } 18.559 -+ } 18.560 -+ 18.561 -+ buflen -= mblength; 18.562 -+ bufpos += mblength; 18.563 -+ } 18.564 -+} 18.565 -+#endif 18.566 -+ 18.567 - /* Read from stream STREAM, printing to standard output any selected fields. */ 18.568 - 18.569 - static void 18.570 -@@ -425,13 +580,211 @@ cut_fields (FILE *stream) 18.571 - } 18.572 - } 18.573 - 18.574 -+#if HAVE_MBRTOWC 18.575 -+static void 18.576 -+cut_fields_mb (FILE *stream) 18.577 -+{ 18.578 -+ int c; 18.579 -+ size_t field_idx; 18.580 -+ int found_any_selected_field; 18.581 -+ int buffer_first_field; 18.582 -+ int empty_input; 18.583 -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ 18.584 -+ char *bufpos; /* Next read position of BUF. */ 18.585 -+ size_t buflen; /* The length of the byte sequence in buf. */ 18.586 -+ wint_t wc = 0; /* A gotten wide character. */ 18.587 -+ size_t mblength; /* The byte size of a multibyte character which shows 18.588 -+ as same character as WC. */ 18.589 -+ mbstate_t state; /* State of the stream. */ 18.590 -+ bool convfail = false; /* true, when conversion failed. Otherwise false. */ 18.591 -+ 18.592 -+ current_rp = frp; 18.593 -+ 18.594 -+ found_any_selected_field = 0; 18.595 -+ field_idx = 1; 18.596 -+ bufpos = buf; 18.597 -+ buflen = 0; 18.598 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.599 -+ 18.600 -+ c = getc (stream); 18.601 -+ empty_input = (c == EOF); 18.602 -+ if (c != EOF) 18.603 -+ { 18.604 -+ ungetc (c, stream); 18.605 -+ wc = 0; 18.606 -+ } 18.607 -+ else 18.608 -+ wc = WEOF; 18.609 -+ 18.610 -+ /* To support the semantics of the -s flag, we may have to buffer 18.611 -+ all of the first field to determine whether it is `delimited.' 18.612 -+ But that is unnecessary if all non-delimited lines must be printed 18.613 -+ and the first field has been selected, or if non-delimited lines 18.614 -+ must be suppressed and the first field has *not* been selected. 18.615 -+ That is because a non-delimited line has exactly one field. */ 18.616 -+ buffer_first_field = (suppress_non_delimited ^ !print_kth (1)); 18.617 -+ 18.618 -+ while (1) 18.619 -+ { 18.620 -+ if (field_idx == 1 && buffer_first_field) 18.621 -+ { 18.622 -+ int len = 0; 18.623 -+ 18.624 -+ while (1) 18.625 -+ { 18.626 -+ REFILL_BUFFER (buf, bufpos, buflen, stream); 18.627 -+ 18.628 -+ GET_NEXT_WC_FROM_BUFFER 18.629 -+ (wc, bufpos, buflen, mblength, state, convfail); 18.630 -+ 18.631 -+ if (wc == WEOF) 18.632 -+ break; 18.633 -+ 18.634 -+ field_1_buffer = xrealloc (field_1_buffer, len + mblength); 18.635 -+ memcpy (field_1_buffer + len, bufpos, mblength); 18.636 -+ len += mblength; 18.637 -+ buflen -= mblength; 18.638 -+ bufpos += mblength; 18.639 -+ 18.640 -+ if (!convfail && (wc == line_delim || wc == wcdelim)) 18.641 -+ break; 18.642 -+ } 18.643 -+ 18.644 -+ if (len <= 0 && wc == WEOF) 18.645 -+ break; 18.646 -+ 18.647 -+ /* If the first field extends to the end of line (it is not 18.648 -+ delimited) and we are printing all non-delimited lines, 18.649 -+ print this one. */ 18.650 -+ if (convfail || (!convfail && wc != wcdelim)) 18.651 -+ { 18.652 -+ if (suppress_non_delimited) 18.653 -+ { 18.654 -+ /* Empty. */ 18.655 -+ } 18.656 -+ else 18.657 -+ { 18.658 -+ fwrite (field_1_buffer, sizeof (char), len, stdout); 18.659 -+ /* Make sure the output line is newline terminated. */ 18.660 -+ if (convfail || (!convfail && wc != line_delim)) 18.661 -+ putchar (line_delim); 18.662 -+ } 18.663 -+ continue; 18.664 -+ } 18.665 -+ 18.666 -+ if (print_kth (1)) 18.667 -+ { 18.668 -+ /* Print the field, but not the trailing delimiter. */ 18.669 -+ fwrite (field_1_buffer, sizeof (char), len - 1, stdout); 18.670 -+ found_any_selected_field = 1; 18.671 -+ } 18.672 -+ next_item (&field_idx); 18.673 -+ } 18.674 -+ 18.675 -+ if (wc != WEOF) 18.676 -+ { 18.677 -+ if (print_kth (field_idx)) 18.678 -+ { 18.679 -+ if (found_any_selected_field) 18.680 -+ { 18.681 -+ fwrite (output_delimiter_string, sizeof (char), 18.682 -+ output_delimiter_length, stdout); 18.683 -+ } 18.684 -+ found_any_selected_field = 1; 18.685 -+ } 18.686 -+ 18.687 -+ while (1) 18.688 -+ { 18.689 -+ REFILL_BUFFER (buf, bufpos, buflen, stream); 18.690 -+ 18.691 -+ GET_NEXT_WC_FROM_BUFFER 18.692 -+ (wc, bufpos, buflen, mblength, state, convfail); 18.693 -+ 18.694 -+ if (wc == WEOF) 18.695 -+ break; 18.696 -+ else if (!convfail && (wc == wcdelim || wc == line_delim)) 18.697 -+ { 18.698 -+ buflen -= mblength; 18.699 -+ bufpos += mblength; 18.700 -+ break; 18.701 -+ } 18.702 -+ 18.703 -+ if (print_kth (field_idx)) 18.704 -+ fwrite (bufpos, mblength, sizeof(char), stdout); 18.705 -+ 18.706 -+ buflen -= mblength; 18.707 -+ bufpos += mblength; 18.708 -+ } 18.709 -+ } 18.710 -+ 18.711 -+ if ((!convfail || wc == line_delim) && buflen < 1) 18.712 -+ wc = WEOF; 18.713 -+ 18.714 -+ if (!convfail && wc == wcdelim) 18.715 -+ next_item (&field_idx); 18.716 -+ else if (wc == WEOF || (!convfail && wc == line_delim)) 18.717 -+ { 18.718 -+ if (found_any_selected_field 18.719 -+ || (!empty_input && !(suppress_non_delimited && field_idx == 1))) 18.720 -+ putchar (line_delim); 18.721 -+ if (wc == WEOF) 18.722 -+ break; 18.723 -+ field_idx = 1; 18.724 -+ current_rp = frp; 18.725 -+ found_any_selected_field = 0; 18.726 -+ } 18.727 -+ } 18.728 -+} 18.729 -+#endif 18.730 -+ 18.731 - static void 18.732 - cut_stream (FILE *stream) 18.733 - { 18.734 -- if (operating_mode == byte_mode) 18.735 -- cut_bytes (stream); 18.736 -+#if HAVE_MBRTOWC 18.737 -+ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) 18.738 -+ { 18.739 -+ switch (operating_mode) 18.740 -+ { 18.741 -+ case byte_mode: 18.742 -+ if (byte_mode_character_aware) 18.743 -+ cut_characters_or_cut_bytes_no_split (stream); 18.744 -+ else 18.745 -+ cut_bytes (stream); 18.746 -+ break; 18.747 -+ 18.748 -+ case character_mode: 18.749 -+ cut_characters_or_cut_bytes_no_split (stream); 18.750 -+ break; 18.751 -+ 18.752 -+ case field_mode: 18.753 -+ if (delimlen == 1) 18.754 -+ { 18.755 -+ /* Check if we have utf8 multibyte locale, so we can use this 18.756 -+ optimization because of uniqueness of characters, which is 18.757 -+ not true for e.g. SJIS */ 18.758 -+ char * loc = setlocale(LC_CTYPE, NULL); 18.759 -+ if (loc && (strstr (loc, "UTF-8") || strstr (loc, "utf-8") || 18.760 -+ strstr (loc, "UTF8") || strstr (loc, "utf8"))) 18.761 -+ { 18.762 -+ cut_fields (stream); 18.763 -+ break; 18.764 -+ } 18.765 -+ } 18.766 -+ cut_fields_mb (stream); 18.767 -+ break; 18.768 -+ 18.769 -+ default: 18.770 -+ abort (); 18.771 -+ } 18.772 -+ } 18.773 - else 18.774 -- cut_fields (stream); 18.775 -+#endif 18.776 -+ { 18.777 -+ if (operating_mode == field_mode) 18.778 -+ cut_fields (stream); 18.779 -+ else 18.780 -+ cut_bytes (stream); 18.781 -+ } 18.782 - } 18.783 - 18.784 - /* Process file FILE to standard output. 18.785 -@@ -483,6 +836,7 @@ main (int argc, char **argv) 18.786 - bool ok; 18.787 - bool delim_specified = false; 18.788 - char *spec_list_string IF_LINT ( = NULL); 18.789 -+ char mbdelim[MB_LEN_MAX + 1]; 18.790 - 18.791 - initialize_main (&argc, &argv); 18.792 - set_program_name (argv[0]); 18.793 -@@ -505,7 +859,6 @@ main (int argc, char **argv) 18.794 - switch (optc) 18.795 - { 18.796 - case 'b': 18.797 -- case 'c': 18.798 - /* Build the byte list. */ 18.799 - if (operating_mode != undefined_mode) 18.800 - FATAL_ERROR (_("only one type of list may be specified")); 18.801 -@@ -513,6 +866,14 @@ main (int argc, char **argv) 18.802 - spec_list_string = optarg; 18.803 - break; 18.804 - 18.805 -+ case 'c': 18.806 -+ /* Build the character list. */ 18.807 -+ if (operating_mode != undefined_mode) 18.808 -+ FATAL_ERROR (_("only one type of list may be specified")); 18.809 -+ operating_mode = character_mode; 18.810 -+ spec_list_string = optarg; 18.811 -+ break; 18.812 -+ 18.813 - case 'f': 18.814 - /* Build the field list. */ 18.815 - if (operating_mode != undefined_mode) 18.816 -@@ -524,10 +885,38 @@ main (int argc, char **argv) 18.817 - case 'd': 18.818 - /* New delimiter. */ 18.819 - /* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */ 18.820 -- if (optarg[0] != '\0' && optarg[1] != '\0') 18.821 -- FATAL_ERROR (_("the delimiter must be a single character")); 18.822 -- delim = optarg[0]; 18.823 -- delim_specified = true; 18.824 -+ { 18.825 -+#if HAVE_MBRTOWC 18.826 -+ if(MB_CUR_MAX > 1) 18.827 -+ { 18.828 -+ mbstate_t state; 18.829 -+ 18.830 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.831 -+ delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state); 18.832 -+ 18.833 -+ if (delimlen == (size_t)-1 || delimlen == (size_t)-2) 18.834 -+ ++force_singlebyte_mode; 18.835 -+ else 18.836 -+ { 18.837 -+ delimlen = (delimlen < 1) ? 1 : delimlen; 18.838 -+ if (wcdelim != L'\0' && *(optarg + delimlen) != '\0') 18.839 -+ FATAL_ERROR (_("the delimiter must be a single character")); 18.840 -+ memcpy (mbdelim, optarg, delimlen); 18.841 -+ mbdelim[delimlen] = '\0'; 18.842 -+ if (delimlen == 1) 18.843 -+ delim = *optarg; 18.844 -+ } 18.845 -+ } 18.846 -+ 18.847 -+ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) 18.848 -+#endif 18.849 -+ { 18.850 -+ if (optarg[0] != '\0' && optarg[1] != '\0') 18.851 -+ FATAL_ERROR (_("the delimiter must be a single character")); 18.852 -+ delim = (unsigned char) optarg[0]; 18.853 -+ } 18.854 -+ delim_specified = true; 18.855 -+ } 18.856 - break; 18.857 - 18.858 - case OUTPUT_DELIMITER_OPTION: 18.859 -@@ -540,6 +929,7 @@ main (int argc, char **argv) 18.860 - break; 18.861 - 18.862 - case 'n': 18.863 -+ byte_mode_character_aware = 1; 18.864 - break; 18.865 - 18.866 - case 's': 18.867 -@@ -579,15 +969,34 @@ main (int argc, char **argv) 18.868 - | (complement ? SETFLD_COMPLEMENT : 0) ); 18.869 - 18.870 - if (!delim_specified) 18.871 -- delim = '\t'; 18.872 -+ { 18.873 -+ delim = '\t'; 18.874 -+#ifdef HAVE_MBRTOWC 18.875 -+ wcdelim = L'\t'; 18.876 -+ mbdelim[0] = '\t'; 18.877 -+ mbdelim[1] = '\0'; 18.878 -+ delimlen = 1; 18.879 -+#endif 18.880 -+ } 18.881 - 18.882 - if (output_delimiter_string == NULL) 18.883 - { 18.884 -- static char dummy[2]; 18.885 -- dummy[0] = delim; 18.886 -- dummy[1] = '\0'; 18.887 -- output_delimiter_string = dummy; 18.888 -- output_delimiter_length = 1; 18.889 -+#ifdef HAVE_MBRTOWC 18.890 -+ if (MB_CUR_MAX > 1 && !force_singlebyte_mode) 18.891 -+ { 18.892 -+ output_delimiter_string = xstrdup(mbdelim); 18.893 -+ output_delimiter_length = delimlen; 18.894 -+ } 18.895 -+ 18.896 -+ if (MB_CUR_MAX <= 1 || force_singlebyte_mode) 18.897 -+#endif 18.898 -+ { 18.899 -+ static char dummy[2]; 18.900 -+ dummy[0] = delim; 18.901 -+ dummy[1] = '\0'; 18.902 -+ output_delimiter_string = dummy; 18.903 -+ output_delimiter_length = 1; 18.904 -+ } 18.905 - } 18.906 - 18.907 - if (optind == argc) 18.908 -diff -Naurp coreutils-8.27-orig/src/expand.c coreutils-8.27/src/expand.c 18.909 ---- coreutils-8.27-orig/src/expand.c 2017-02-26 15:42:25.000000000 -0600 18.910 -+++ coreutils-8.27/src/expand.c 2017-03-11 23:49:06.758133530 -0600 18.911 -@@ -37,6 +37,9 @@ 18.912 - #include <stdio.h> 18.913 - #include <getopt.h> 18.914 - #include <sys/types.h> 18.915 -+ 18.916 -+#include <mbfile.h> 18.917 -+ 18.918 - #include "system.h" 18.919 - #include "die.h" 18.920 - #include "xstrndup.h" 18.921 -@@ -100,19 +103,41 @@ expand (void) 18.922 - { 18.923 - /* Input stream. */ 18.924 - FILE *fp = next_file (NULL); 18.925 -+ mb_file_t mbf; 18.926 -+ mbf_char_t c; 18.927 -+ /* True if the starting locale is utf8. */ 18.928 -+ bool using_utf_locale; 18.929 -+ 18.930 -+ /* True if the first file contains BOM header. */ 18.931 -+ bool found_bom; 18.932 -+ using_utf_locale=check_utf_locale(); 18.933 - 18.934 - if (!fp) 18.935 - return; 18.936 -+ mbf_init (mbf, fp); 18.937 -+ found_bom=check_bom(fp,&mbf); 18.938 - 18.939 -- while (true) 18.940 -+ if (using_utf_locale == false && found_bom == true) 18.941 -+ { 18.942 -+ /*try using some predefined locale */ 18.943 -+ 18.944 -+ if (set_utf_locale () != 0) 18.945 - { 18.946 -- /* Input character, or EOF. */ 18.947 -- int c; 18.948 -+ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); 18.949 -+ } 18.950 -+ } 18.951 -+ 18.952 - 18.953 -+ if (found_bom == true) 18.954 -+ { 18.955 -+ print_bom(); 18.956 -+ } 18.957 -+ 18.958 -+ while (true) 18.959 -+ { 18.960 - /* If true, perform translations. */ 18.961 - bool convert = true; 18.962 - 18.963 -- 18.964 - /* The following variables have valid values only when CONVERT 18.965 - is true: */ 18.966 - 18.967 -@@ -122,17 +147,48 @@ expand (void) 18.968 - /* Index in TAB_LIST of next tab stop to examine. */ 18.969 - size_t tab_index = 0; 18.970 - 18.971 -- 18.972 - /* Convert a line of text. */ 18.973 - 18.974 - do 18.975 - { 18.976 -- while ((c = getc (fp)) < 0 && (fp = next_file (fp))) 18.977 -- continue; 18.978 -+ while (true) { 18.979 -+ mbf_getc (c, mbf); 18.980 -+ if ((mb_iseof (c)) && (fp = next_file (fp))) 18.981 -+ { 18.982 -+ mbf_init (mbf, fp); 18.983 -+ if (fp!=NULL) 18.984 -+ { 18.985 -+ if (check_bom(fp,&mbf)==true) 18.986 -+ { 18.987 -+ /*Not the first file - check BOM header*/ 18.988 -+ if (using_utf_locale==false && found_bom==false) 18.989 -+ { 18.990 -+ /*BOM header in subsequent file but not in the first one. */ 18.991 -+ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); 18.992 -+ } 18.993 -+ } 18.994 -+ else 18.995 -+ { 18.996 -+ if(using_utf_locale==false && found_bom==true) 18.997 -+ { 18.998 -+ /*First file conatined BOM header - locale was switched to UTF 18.999 -+ /*all subsequent files should contain BOM. */ 18.1000 -+ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); 18.1001 -+ } 18.1002 -+ } 18.1003 -+ } 18.1004 -+ continue; 18.1005 -+ } 18.1006 -+ else 18.1007 -+ { 18.1008 -+ break; 18.1009 -+ } 18.1010 -+ } 18.1011 -+ 18.1012 - 18.1013 - if (convert) 18.1014 - { 18.1015 -- if (c == '\t') 18.1016 -+ if (mb_iseq (c, '\t')) 18.1017 - { 18.1018 - /* Column the next input tab stop is on. */ 18.1019 - uintmax_t next_tab_column; 18.1020 -@@ -151,32 +207,34 @@ expand (void) 18.1021 - if (putchar (' ') < 0) 18.1022 - die (EXIT_FAILURE, errno, _("write error")); 18.1023 - 18.1024 -- c = ' '; 18.1025 -+ mb_setascii (&c, ' '); 18.1026 - } 18.1027 -- else if (c == '\b') 18.1028 -+ else if (mb_iseq (c, '\b')) 18.1029 - { 18.1030 - /* Go back one column, and force recalculation of the 18.1031 - next tab stop. */ 18.1032 - column -= !!column; 18.1033 - tab_index -= !!tab_index; 18.1034 - } 18.1035 -- else 18.1036 -+ /* A leading control character could make us trip over. */ 18.1037 -+ else if (!mb_iscntrl (c)) 18.1038 - { 18.1039 -- column++; 18.1040 -+ column += mb_width (c); 18.1041 - if (!column) 18.1042 - die (EXIT_FAILURE, 0, _("input line is too long")); 18.1043 - } 18.1044 - 18.1045 -- convert &= convert_entire_line || !! isblank (c); 18.1046 -+ convert &= convert_entire_line || mb_isblank (c); 18.1047 - } 18.1048 - 18.1049 -- if (c < 0) 18.1050 -+ if (mb_iseof (c)) 18.1051 - return; 18.1052 - 18.1053 -- if (putchar (c) < 0) 18.1054 -+ mb_putc (c, stdout); 18.1055 -+ if (ferror (stdout)) 18.1056 - die (EXIT_FAILURE, errno, _("write error")); 18.1057 - } 18.1058 -- while (c != '\n'); 18.1059 -+ while (!mb_iseq (c, '\n')); 18.1060 - } 18.1061 - } 18.1062 - 18.1063 -diff -Naurp coreutils-8.27-orig/src/expand-common.c coreutils-8.27/src/expand-common.c 18.1064 ---- coreutils-8.27-orig/src/expand-common.c 2017-03-01 11:22:55.000000000 -0600 18.1065 -+++ coreutils-8.27/src/expand-common.c 2017-03-11 23:49:06.757133570 -0600 18.1066 -@@ -18,6 +18,7 @@ 18.1067 - 18.1068 - #include <stdio.h> 18.1069 - #include <sys/types.h> 18.1070 -+#include <mbfile.h> 18.1071 - #include "system.h" 18.1072 - #include "die.h" 18.1073 - #include "error.h" 18.1074 -@@ -105,6 +106,119 @@ set_extend_size (uintmax_t tabval) 18.1075 - return ok; 18.1076 - } 18.1077 - 18.1078 -+extern int 18.1079 -+set_utf_locale (void) 18.1080 -+{ 18.1081 -+ /*try using some predefined locale */ 18.1082 -+ const char* predef_locales[] = {"C.UTF8","en_US.UTF8","en_GB.UTF8"}; 18.1083 -+ 18.1084 -+ const int predef_locales_count=3; 18.1085 -+ for (int i=0;i<predef_locales_count;i++) 18.1086 -+ { 18.1087 -+ if (setlocale(LC_ALL,predef_locales[i])!=NULL) 18.1088 -+ { 18.1089 -+ break; 18.1090 -+ } 18.1091 -+ else if (i==predef_locales_count-1) 18.1092 -+ { 18.1093 -+ return 1; 18.1094 -+ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); 18.1095 -+ } 18.1096 -+ } 18.1097 -+ return 0; 18.1098 -+} 18.1099 -+ 18.1100 -+extern bool 18.1101 -+check_utf_locale(void) 18.1102 -+{ 18.1103 -+ char* locale = setlocale (LC_CTYPE , NULL); 18.1104 -+ if (locale == NULL) 18.1105 -+ { 18.1106 -+ return false; 18.1107 -+ } 18.1108 -+ else if (strcasestr(locale, "utf8") == NULL && strcasestr(locale, "utf-8") == NULL) 18.1109 -+ { 18.1110 -+ return false; 18.1111 -+ } 18.1112 -+ return true; 18.1113 -+} 18.1114 -+ 18.1115 -+extern bool 18.1116 -+check_bom(FILE* fp, mb_file_t *mbf) 18.1117 -+{ 18.1118 -+ int c; 18.1119 -+ 18.1120 -+ 18.1121 -+ c=fgetc(fp); 18.1122 -+ 18.1123 -+ /*test BOM header of the first file */ 18.1124 -+ mbf->bufcount=0; 18.1125 -+ if (c == 0xEF) 18.1126 -+ { 18.1127 -+ c=fgetc(fp); 18.1128 -+ } 18.1129 -+ else 18.1130 -+ { 18.1131 -+ if (c != EOF) 18.1132 -+ { 18.1133 -+ ungetc(c,fp); 18.1134 -+ } 18.1135 -+ return false; 18.1136 -+ } 18.1137 -+ 18.1138 -+ if (c == 0xBB) 18.1139 -+ { 18.1140 -+ c=fgetc(fp); 18.1141 -+ } 18.1142 -+ else 18.1143 -+ { 18.1144 -+ if ( c!= EOF ) 18.1145 -+ { 18.1146 -+ mbf->buf[0]=(unsigned char) 0xEF; 18.1147 -+ mbf->bufcount=1; 18.1148 -+ ungetc(c,fp); 18.1149 -+ return false; 18.1150 -+ } 18.1151 -+ else 18.1152 -+ { 18.1153 -+ ungetc(0xEF,fp); 18.1154 -+ return false; 18.1155 -+ } 18.1156 -+ } 18.1157 -+ if (c == 0xBF) 18.1158 -+ { 18.1159 -+ mbf->bufcount=0; 18.1160 -+ return true; 18.1161 -+ } 18.1162 -+ else 18.1163 -+ { 18.1164 -+ if (c != EOF) 18.1165 -+ { 18.1166 -+ mbf->buf[0]=(unsigned char) 0xEF; 18.1167 -+ mbf->buf[1]=(unsigned char) 0xBB; 18.1168 -+ mbf->bufcount=2; 18.1169 -+ ungetc(c,fp); 18.1170 -+ return false; 18.1171 -+ } 18.1172 -+ else 18.1173 -+ { 18.1174 -+ mbf->buf[0]=(unsigned char) 0xEF; 18.1175 -+ mbf->bufcount=1; 18.1176 -+ ungetc(0xBB,fp); 18.1177 -+ return false; 18.1178 -+ } 18.1179 -+ } 18.1180 -+ return false; 18.1181 -+} 18.1182 -+ 18.1183 -+extern void 18.1184 -+print_bom(void) 18.1185 -+{ 18.1186 -+ putc (0xEF, stdout); 18.1187 -+ putc (0xBB, stdout); 18.1188 -+ putc (0xBF, stdout); 18.1189 -+} 18.1190 -+ 18.1191 - /* Add the comma or blank separated list of tab stops STOPS 18.1192 - to the list of tab stops. */ 18.1193 - extern void 18.1194 -diff -Naurp coreutils-8.27-orig/src/expand-common.h coreutils-8.27/src/expand-common.h 18.1195 ---- coreutils-8.27-orig/src/expand-common.h 2017-01-01 16:34:24.000000000 -0600 18.1196 -+++ coreutils-8.27/src/expand-common.h 2017-03-11 23:49:06.758133530 -0600 18.1197 -@@ -34,6 +34,18 @@ extern size_t max_column_width; 18.1198 - /* The desired exit status. */ 18.1199 - extern int exit_status; 18.1200 - 18.1201 -+extern int 18.1202 -+set_utf_locale (void); 18.1203 -+ 18.1204 -+extern bool 18.1205 -+check_utf_locale(void); 18.1206 -+ 18.1207 -+extern bool 18.1208 -+check_bom(FILE* fp, mb_file_t *mbf); 18.1209 -+ 18.1210 -+extern void 18.1211 -+print_bom(void); 18.1212 -+ 18.1213 - /* Add tab stop TABVAL to the end of 'tab_list'. */ 18.1214 - extern void 18.1215 - add_tab_stop (uintmax_t tabval); 18.1216 -diff -Naurp coreutils-8.27-orig/src/fold.c coreutils-8.27/src/fold.c 18.1217 ---- coreutils-8.27-orig/src/fold.c 2017-01-01 16:34:24.000000000 -0600 18.1218 -+++ coreutils-8.27/src/fold.c 2017-03-11 23:49:30.982169404 -0600 18.1219 -@@ -22,12 +22,34 @@ 18.1220 - #include <getopt.h> 18.1221 - #include <sys/types.h> 18.1222 - 18.1223 -+/* Get mbstate_t, mbrtowc(), wcwidth(). */ 18.1224 -+#if HAVE_WCHAR_H 18.1225 -+# include <wchar.h> 18.1226 -+#endif 18.1227 -+ 18.1228 -+/* Get iswprint(), iswblank(), wcwidth(). */ 18.1229 -+#if HAVE_WCTYPE_H 18.1230 -+# include <wctype.h> 18.1231 -+#endif 18.1232 -+ 18.1233 - #include "system.h" 18.1234 - #include "die.h" 18.1235 - #include "error.h" 18.1236 - #include "fadvise.h" 18.1237 - #include "xdectoint.h" 18.1238 - 18.1239 -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC 18.1240 -+ installation; work around this configuration error. */ 18.1241 -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 18.1242 -+# undef MB_LEN_MAX 18.1243 -+# define MB_LEN_MAX 16 18.1244 -+#endif 18.1245 -+ 18.1246 -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ 18.1247 -+#if HAVE_MBRTOWC && defined mbstate_t 18.1248 -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) 18.1249 -+#endif 18.1250 -+ 18.1251 - #define TAB_WIDTH 8 18.1252 - 18.1253 - /* The official name of this program (e.g., no 'g' prefix). */ 18.1254 -@@ -35,20 +57,41 @@ 18.1255 - 18.1256 - #define AUTHORS proper_name ("David MacKenzie") 18.1257 - 18.1258 -+#define FATAL_ERROR(Message) \ 18.1259 -+ do \ 18.1260 -+ { \ 18.1261 -+ error (0, 0, (Message)); \ 18.1262 -+ usage (2); \ 18.1263 -+ } \ 18.1264 -+ while (0) 18.1265 -+ 18.1266 -+enum operating_mode 18.1267 -+{ 18.1268 -+ /* Fold texts by columns that are at the given positions. */ 18.1269 -+ column_mode, 18.1270 -+ 18.1271 -+ /* Fold texts by bytes that are at the given positions. */ 18.1272 -+ byte_mode, 18.1273 -+ 18.1274 -+ /* Fold texts by characters that are at the given positions. */ 18.1275 -+ character_mode, 18.1276 -+}; 18.1277 -+ 18.1278 -+/* The argument shows current mode. (Default: column_mode) */ 18.1279 -+static enum operating_mode operating_mode; 18.1280 -+ 18.1281 - /* If nonzero, try to break on whitespace. */ 18.1282 - static bool break_spaces; 18.1283 - 18.1284 --/* If nonzero, count bytes, not column positions. */ 18.1285 --static bool count_bytes; 18.1286 -- 18.1287 - /* If nonzero, at least one of the files we read was standard input. */ 18.1288 - static bool have_read_stdin; 18.1289 - 18.1290 --static char const shortopts[] = "bsw:0::1::2::3::4::5::6::7::8::9::"; 18.1291 -+static char const shortopts[] = "bcsw:0::1::2::3::4::5::6::7::8::9::"; 18.1292 - 18.1293 - static struct option const longopts[] = 18.1294 - { 18.1295 - {"bytes", no_argument, NULL, 'b'}, 18.1296 -+ {"characters", no_argument, NULL, 'c'}, 18.1297 - {"spaces", no_argument, NULL, 's'}, 18.1298 - {"width", required_argument, NULL, 'w'}, 18.1299 - {GETOPT_HELP_OPTION_DECL}, 18.1300 -@@ -76,6 +119,7 @@ Wrap input lines in each FILE, writing t 18.1301 - 18.1302 - fputs (_("\ 18.1303 - -b, --bytes count bytes rather than columns\n\ 18.1304 -+ -c, --characters count characters rather than columns\n\ 18.1305 - -s, --spaces break at spaces\n\ 18.1306 - -w, --width=WIDTH use WIDTH columns instead of 80\n\ 18.1307 - "), stdout); 18.1308 -@@ -93,7 +137,7 @@ Wrap input lines in each FILE, writing t 18.1309 - static size_t 18.1310 - adjust_column (size_t column, char c) 18.1311 - { 18.1312 -- if (!count_bytes) 18.1313 -+ if (operating_mode != byte_mode) 18.1314 - { 18.1315 - if (c == '\b') 18.1316 - { 18.1317 -@@ -116,30 +160,14 @@ adjust_column (size_t column, char c) 18.1318 - to stdout, with maximum line length WIDTH. 18.1319 - Return true if successful. */ 18.1320 - 18.1321 --static bool 18.1322 --fold_file (char const *filename, size_t width) 18.1323 -+static void 18.1324 -+fold_text (FILE *istream, size_t width, int *saved_errno) 18.1325 - { 18.1326 -- FILE *istream; 18.1327 - int c; 18.1328 - size_t column = 0; /* Screen column where next char will go. */ 18.1329 - size_t offset_out = 0; /* Index in 'line_out' for next char. */ 18.1330 - static char *line_out = NULL; 18.1331 - static size_t allocated_out = 0; 18.1332 -- int saved_errno; 18.1333 -- 18.1334 -- if (STREQ (filename, "-")) 18.1335 -- { 18.1336 -- istream = stdin; 18.1337 -- have_read_stdin = true; 18.1338 -- } 18.1339 -- else 18.1340 -- istream = fopen (filename, "r"); 18.1341 -- 18.1342 -- if (istream == NULL) 18.1343 -- { 18.1344 -- error (0, errno, "%s", quotef (filename)); 18.1345 -- return false; 18.1346 -- } 18.1347 - 18.1348 - fadvise (istream, FADVISE_SEQUENTIAL); 18.1349 - 18.1350 -@@ -169,6 +197,15 @@ fold_file (char const *filename, size_t 18.1351 - bool found_blank = false; 18.1352 - size_t logical_end = offset_out; 18.1353 - 18.1354 -+ /* If LINE_OUT has no wide character, 18.1355 -+ put a new wide character in LINE_OUT 18.1356 -+ if column is bigger than width. */ 18.1357 -+ if (offset_out == 0) 18.1358 -+ { 18.1359 -+ line_out[offset_out++] = c; 18.1360 -+ continue; 18.1361 -+ } 18.1362 -+ 18.1363 - /* Look for the last blank. */ 18.1364 - while (logical_end) 18.1365 - { 18.1366 -@@ -215,11 +252,220 @@ fold_file (char const *filename, size_t 18.1367 - line_out[offset_out++] = c; 18.1368 - } 18.1369 - 18.1370 -- saved_errno = errno; 18.1371 -+ *saved_errno = errno; 18.1372 -+ 18.1373 -+ if (offset_out) 18.1374 -+ fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); 18.1375 -+ 18.1376 -+} 18.1377 -+ 18.1378 -+#if HAVE_MBRTOWC 18.1379 -+static void 18.1380 -+fold_multibyte_text (FILE *istream, size_t width, int *saved_errno) 18.1381 -+{ 18.1382 -+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ 18.1383 -+ size_t buflen = 0; /* The length of the byte sequence in buf. */ 18.1384 -+ char *bufpos = buf; /* Next read position of BUF. */ 18.1385 -+ wint_t wc; /* A gotten wide character. */ 18.1386 -+ size_t mblength; /* The byte size of a multibyte character which shows 18.1387 -+ as same character as WC. */ 18.1388 -+ mbstate_t state, state_bak; /* State of the stream. */ 18.1389 -+ int convfail = 0; /* 1, when conversion is failed. Otherwise 0. */ 18.1390 -+ 18.1391 -+ static char *line_out = NULL; 18.1392 -+ size_t offset_out = 0; /* Index in `line_out' for next char. */ 18.1393 -+ static size_t allocated_out = 0; 18.1394 -+ 18.1395 -+ int increment; 18.1396 -+ size_t column = 0; 18.1397 -+ 18.1398 -+ size_t last_blank_pos; 18.1399 -+ size_t last_blank_column; 18.1400 -+ int is_blank_seen; 18.1401 -+ int last_blank_increment = 0; 18.1402 -+ int is_bs_following_last_blank; 18.1403 -+ size_t bs_following_last_blank_num; 18.1404 -+ int is_cr_after_last_blank; 18.1405 -+ 18.1406 -+#define CLEAR_FLAGS \ 18.1407 -+ do \ 18.1408 -+ { \ 18.1409 -+ last_blank_pos = 0; \ 18.1410 -+ last_blank_column = 0; \ 18.1411 -+ is_blank_seen = 0; \ 18.1412 -+ is_bs_following_last_blank = 0; \ 18.1413 -+ bs_following_last_blank_num = 0; \ 18.1414 -+ is_cr_after_last_blank = 0; \ 18.1415 -+ } \ 18.1416 -+ while (0) 18.1417 -+ 18.1418 -+#define START_NEW_LINE \ 18.1419 -+ do \ 18.1420 -+ { \ 18.1421 -+ putchar ('\n'); \ 18.1422 -+ column = 0; \ 18.1423 -+ offset_out = 0; \ 18.1424 -+ CLEAR_FLAGS; \ 18.1425 -+ } \ 18.1426 -+ while (0) 18.1427 -+ 18.1428 -+ CLEAR_FLAGS; 18.1429 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.1430 -+ 18.1431 -+ for (;; bufpos += mblength, buflen -= mblength) 18.1432 -+ { 18.1433 -+ if (buflen < MB_LEN_MAX && !feof (istream) && !ferror (istream)) 18.1434 -+ { 18.1435 -+ memmove (buf, bufpos, buflen); 18.1436 -+ buflen += fread (buf + buflen, sizeof(char), BUFSIZ, istream); 18.1437 -+ bufpos = buf; 18.1438 -+ } 18.1439 -+ 18.1440 -+ if (buflen < 1) 18.1441 -+ break; 18.1442 -+ 18.1443 -+ /* Get a wide character. */ 18.1444 -+ state_bak = state; 18.1445 -+ mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &state); 18.1446 -+ 18.1447 -+ switch (mblength) 18.1448 -+ { 18.1449 -+ case (size_t)-1: 18.1450 -+ case (size_t)-2: 18.1451 -+ convfail++; 18.1452 -+ state = state_bak; 18.1453 -+ /* Fall through. */ 18.1454 -+ 18.1455 -+ case 0: 18.1456 -+ mblength = 1; 18.1457 -+ break; 18.1458 -+ } 18.1459 -+ 18.1460 -+rescan: 18.1461 -+ if (convfail) 18.1462 -+ increment = 1; 18.1463 -+ else if (wc == L'\n') 18.1464 -+ { 18.1465 -+ /* preserve newline */ 18.1466 -+ fwrite (line_out, sizeof(char), offset_out, stdout); 18.1467 -+ START_NEW_LINE; 18.1468 -+ continue; 18.1469 -+ } 18.1470 -+ else if (operating_mode == byte_mode) /* byte mode */ 18.1471 -+ increment = mblength; 18.1472 -+ else if (operating_mode == character_mode) /* character mode */ 18.1473 -+ increment = 1; 18.1474 -+ else /* column mode */ 18.1475 -+ { 18.1476 -+ switch (wc) 18.1477 -+ { 18.1478 -+ case L'\b': 18.1479 -+ increment = (column > 0) ? -1 : 0; 18.1480 -+ break; 18.1481 -+ 18.1482 -+ case L'\r': 18.1483 -+ increment = -1 * column; 18.1484 -+ break; 18.1485 -+ 18.1486 -+ case L'\t': 18.1487 -+ increment = 8 - column % 8; 18.1488 -+ break; 18.1489 -+ 18.1490 -+ default: 18.1491 -+ increment = wcwidth (wc); 18.1492 -+ increment = (increment < 0) ? 0 : increment; 18.1493 -+ } 18.1494 -+ } 18.1495 -+ 18.1496 -+ if (column + increment > width && break_spaces && last_blank_pos) 18.1497 -+ { 18.1498 -+ fwrite (line_out, sizeof(char), last_blank_pos, stdout); 18.1499 -+ putchar ('\n'); 18.1500 -+ 18.1501 -+ offset_out = offset_out - last_blank_pos; 18.1502 -+ column = column - last_blank_column + ((is_cr_after_last_blank) 18.1503 -+ ? last_blank_increment : bs_following_last_blank_num); 18.1504 -+ memmove (line_out, line_out + last_blank_pos, offset_out); 18.1505 -+ CLEAR_FLAGS; 18.1506 -+ goto rescan; 18.1507 -+ } 18.1508 -+ 18.1509 -+ if (column + increment > width && column != 0) 18.1510 -+ { 18.1511 -+ fwrite (line_out, sizeof(char), offset_out, stdout); 18.1512 -+ START_NEW_LINE; 18.1513 -+ goto rescan; 18.1514 -+ } 18.1515 -+ 18.1516 -+ if (allocated_out < offset_out + mblength) 18.1517 -+ { 18.1518 -+ line_out = X2REALLOC (line_out, &allocated_out); 18.1519 -+ } 18.1520 -+ 18.1521 -+ memcpy (line_out + offset_out, bufpos, mblength); 18.1522 -+ offset_out += mblength; 18.1523 -+ column += increment; 18.1524 -+ 18.1525 -+ if (is_blank_seen && !convfail && wc == L'\r') 18.1526 -+ is_cr_after_last_blank = 1; 18.1527 -+ 18.1528 -+ if (is_bs_following_last_blank && !convfail && wc == L'\b') 18.1529 -+ ++bs_following_last_blank_num; 18.1530 -+ else 18.1531 -+ is_bs_following_last_blank = 0; 18.1532 -+ 18.1533 -+ if (break_spaces && !convfail && iswblank (wc)) 18.1534 -+ { 18.1535 -+ last_blank_pos = offset_out; 18.1536 -+ last_blank_column = column; 18.1537 -+ is_blank_seen = 1; 18.1538 -+ last_blank_increment = increment; 18.1539 -+ is_bs_following_last_blank = 1; 18.1540 -+ bs_following_last_blank_num = 0; 18.1541 -+ is_cr_after_last_blank = 0; 18.1542 -+ } 18.1543 -+ } 18.1544 -+ 18.1545 -+ *saved_errno = errno; 18.1546 - 18.1547 - if (offset_out) 18.1548 - fwrite (line_out, sizeof (char), (size_t) offset_out, stdout); 18.1549 - 18.1550 -+} 18.1551 -+#endif 18.1552 -+ 18.1553 -+/* Fold file FILENAME, or standard input if FILENAME is "-", 18.1554 -+ to stdout, with maximum line length WIDTH. 18.1555 -+ Return 0 if successful, 1 if an error occurs. */ 18.1556 -+ 18.1557 -+static bool 18.1558 -+fold_file (char const *filename, size_t width) 18.1559 -+{ 18.1560 -+ FILE *istream; 18.1561 -+ int saved_errno; 18.1562 -+ 18.1563 -+ if (STREQ (filename, "-")) 18.1564 -+ { 18.1565 -+ istream = stdin; 18.1566 -+ have_read_stdin = 1; 18.1567 -+ } 18.1568 -+ else 18.1569 -+ istream = fopen (filename, "r"); 18.1570 -+ 18.1571 -+ if (istream == NULL) 18.1572 -+ { 18.1573 -+ error (0, errno, "%s", filename); 18.1574 -+ return 1; 18.1575 -+ } 18.1576 -+ 18.1577 -+ /* Define how ISTREAM is being folded. */ 18.1578 -+#if HAVE_MBRTOWC 18.1579 -+ if (MB_CUR_MAX > 1) 18.1580 -+ fold_multibyte_text (istream, width, &saved_errno); 18.1581 -+ else 18.1582 -+#endif 18.1583 -+ fold_text (istream, width, &saved_errno); 18.1584 -+ 18.1585 - if (ferror (istream)) 18.1586 - { 18.1587 - error (0, saved_errno, "%s", quotef (filename)); 18.1588 -@@ -252,7 +498,8 @@ main (int argc, char **argv) 18.1589 - 18.1590 - atexit (close_stdout); 18.1591 - 18.1592 -- break_spaces = count_bytes = have_read_stdin = false; 18.1593 -+ operating_mode = column_mode; 18.1594 -+ break_spaces = have_read_stdin = false; 18.1595 - 18.1596 - while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) 18.1597 - { 18.1598 -@@ -261,7 +508,15 @@ main (int argc, char **argv) 18.1599 - switch (optc) 18.1600 - { 18.1601 - case 'b': /* Count bytes rather than columns. */ 18.1602 -- count_bytes = true; 18.1603 -+ if (operating_mode != column_mode) 18.1604 -+ FATAL_ERROR (_("only one way of folding may be specified")); 18.1605 -+ operating_mode = byte_mode; 18.1606 -+ break; 18.1607 -+ 18.1608 -+ case 'c': 18.1609 -+ if (operating_mode != column_mode) 18.1610 -+ FATAL_ERROR (_("only one way of folding may be specified")); 18.1611 -+ operating_mode = character_mode; 18.1612 - break; 18.1613 - 18.1614 - case 's': /* Break at word boundaries. */ 18.1615 -diff -Naurp coreutils-8.27-orig/src/join.c coreutils-8.27/src/join.c 18.1616 ---- coreutils-8.27-orig/src/join.c 2017-01-01 16:34:24.000000000 -0600 18.1617 -+++ coreutils-8.27/src/join.c 2017-03-11 23:47:13.091286290 -0600 18.1618 -@@ -22,19 +22,33 @@ 18.1619 - #include <sys/types.h> 18.1620 - #include <getopt.h> 18.1621 - 18.1622 -+/* Get mbstate_t, mbrtowc(), mbrtowc(), wcwidth(). */ 18.1623 -+#if HAVE_WCHAR_H 18.1624 -+# include <wchar.h> 18.1625 -+#endif 18.1626 -+ 18.1627 -+/* Get iswblank(), towupper. */ 18.1628 -+#if HAVE_WCTYPE_H 18.1629 -+# include <wctype.h> 18.1630 -+#endif 18.1631 -+ 18.1632 - #include "system.h" 18.1633 - #include "die.h" 18.1634 - #include "error.h" 18.1635 - #include "fadvise.h" 18.1636 - #include "hard-locale.h" 18.1637 - #include "linebuffer.h" 18.1638 --#include "memcasecmp.h" 18.1639 - #include "quote.h" 18.1640 - #include "stdio--.h" 18.1641 - #include "xmemcoll.h" 18.1642 - #include "xstrtol.h" 18.1643 - #include "argmatch.h" 18.1644 - 18.1645 -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ 18.1646 -+#if HAVE_MBRTOWC && defined mbstate_t 18.1647 -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) 18.1648 -+#endif 18.1649 -+ 18.1650 - /* The official name of this program (e.g., no 'g' prefix). */ 18.1651 - #define PROGRAM_NAME "join" 18.1652 - 18.1653 -@@ -136,10 +150,12 @@ static struct outlist outlist_head; 18.1654 - /* Last element in 'outlist', where a new element can be added. */ 18.1655 - static struct outlist *outlist_end = &outlist_head; 18.1656 - 18.1657 --/* Tab character separating fields. If negative, fields are separated 18.1658 -- by any nonempty string of blanks, otherwise by exactly one 18.1659 -- tab character whose value (when cast to unsigned char) equals TAB. */ 18.1660 --static int tab = -1; 18.1661 -+/* Tab character separating fields. If NULL, fields are separated 18.1662 -+ by any nonempty string of blanks. */ 18.1663 -+static char *tab = NULL; 18.1664 -+ 18.1665 -+/* The number of bytes used for tab. */ 18.1666 -+static size_t tablen = 0; 18.1667 - 18.1668 - /* If nonzero, check that the input is correctly ordered. */ 18.1669 - static enum 18.1670 -@@ -276,13 +292,14 @@ xfields (struct line *line) 18.1671 - if (ptr == lim) 18.1672 - return; 18.1673 - 18.1674 -- if (0 <= tab && tab != '\n') 18.1675 -+ if (tab != NULL) 18.1676 - { 18.1677 -+ unsigned char t = tab[0]; 18.1678 - char *sep; 18.1679 -- for (; (sep = memchr (ptr, tab, lim - ptr)) != NULL; ptr = sep + 1) 18.1680 -+ for (; (sep = memchr (ptr, t, lim - ptr)) != NULL; ptr = sep + 1) 18.1681 - extract_field (line, ptr, sep - ptr); 18.1682 - } 18.1683 -- else if (tab < 0) 18.1684 -+ else 18.1685 - { 18.1686 - /* Skip leading blanks before the first field. */ 18.1687 - while (field_sep (*ptr)) 18.1688 -@@ -306,6 +323,147 @@ xfields (struct line *line) 18.1689 - extract_field (line, ptr, lim - ptr); 18.1690 - } 18.1691 - 18.1692 -+#if HAVE_MBRTOWC 18.1693 -+static void 18.1694 -+xfields_multibyte (struct line *line) 18.1695 -+{ 18.1696 -+ char *ptr = line->buf.buffer; 18.1697 -+ char const *lim = ptr + line->buf.length - 1; 18.1698 -+ wchar_t wc = 0; 18.1699 -+ size_t mblength = 1; 18.1700 -+ mbstate_t state, state_bak; 18.1701 -+ 18.1702 -+ memset (&state, 0, sizeof (mbstate_t)); 18.1703 -+ 18.1704 -+ if (ptr >= lim) 18.1705 -+ return; 18.1706 -+ 18.1707 -+ if (tab != NULL) 18.1708 -+ { 18.1709 -+ char *sep = ptr; 18.1710 -+ for (; ptr < lim; ptr = sep + mblength) 18.1711 -+ { 18.1712 -+ sep = ptr; 18.1713 -+ while (sep < lim) 18.1714 -+ { 18.1715 -+ state_bak = state; 18.1716 -+ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); 18.1717 -+ 18.1718 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.1719 -+ { 18.1720 -+ mblength = 1; 18.1721 -+ state = state_bak; 18.1722 -+ } 18.1723 -+ mblength = (mblength < 1) ? 1 : mblength; 18.1724 -+ 18.1725 -+ if (mblength == tablen && !memcmp (sep, tab, mblength)) 18.1726 -+ break; 18.1727 -+ else 18.1728 -+ { 18.1729 -+ sep += mblength; 18.1730 -+ continue; 18.1731 -+ } 18.1732 -+ } 18.1733 -+ 18.1734 -+ if (sep >= lim) 18.1735 -+ break; 18.1736 -+ 18.1737 -+ extract_field (line, ptr, sep - ptr); 18.1738 -+ } 18.1739 -+ } 18.1740 -+ else 18.1741 -+ { 18.1742 -+ /* Skip leading blanks before the first field. */ 18.1743 -+ while(ptr < lim) 18.1744 -+ { 18.1745 -+ state_bak = state; 18.1746 -+ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); 18.1747 -+ 18.1748 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.1749 -+ { 18.1750 -+ mblength = 1; 18.1751 -+ state = state_bak; 18.1752 -+ break; 18.1753 -+ } 18.1754 -+ mblength = (mblength < 1) ? 1 : mblength; 18.1755 -+ 18.1756 -+ if (!iswblank(wc) && wc != '\n') 18.1757 -+ break; 18.1758 -+ ptr += mblength; 18.1759 -+ } 18.1760 -+ 18.1761 -+ do 18.1762 -+ { 18.1763 -+ char *sep; 18.1764 -+ state_bak = state; 18.1765 -+ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); 18.1766 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.1767 -+ { 18.1768 -+ mblength = 1; 18.1769 -+ state = state_bak; 18.1770 -+ break; 18.1771 -+ } 18.1772 -+ mblength = (mblength < 1) ? 1 : mblength; 18.1773 -+ 18.1774 -+ sep = ptr + mblength; 18.1775 -+ while (sep < lim) 18.1776 -+ { 18.1777 -+ state_bak = state; 18.1778 -+ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); 18.1779 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.1780 -+ { 18.1781 -+ mblength = 1; 18.1782 -+ state = state_bak; 18.1783 -+ break; 18.1784 -+ } 18.1785 -+ mblength = (mblength < 1) ? 1 : mblength; 18.1786 -+ 18.1787 -+ if (iswblank (wc) || wc == '\n') 18.1788 -+ break; 18.1789 -+ 18.1790 -+ sep += mblength; 18.1791 -+ } 18.1792 -+ 18.1793 -+ extract_field (line, ptr, sep - ptr); 18.1794 -+ if (sep >= lim) 18.1795 -+ return; 18.1796 -+ 18.1797 -+ state_bak = state; 18.1798 -+ mblength = mbrtowc (&wc, sep, lim - sep + 1, &state); 18.1799 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.1800 -+ { 18.1801 -+ mblength = 1; 18.1802 -+ state = state_bak; 18.1803 -+ break; 18.1804 -+ } 18.1805 -+ mblength = (mblength < 1) ? 1 : mblength; 18.1806 -+ 18.1807 -+ ptr = sep + mblength; 18.1808 -+ while (ptr < lim) 18.1809 -+ { 18.1810 -+ state_bak = state; 18.1811 -+ mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state); 18.1812 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.1813 -+ { 18.1814 -+ mblength = 1; 18.1815 -+ state = state_bak; 18.1816 -+ break; 18.1817 -+ } 18.1818 -+ mblength = (mblength < 1) ? 1 : mblength; 18.1819 -+ 18.1820 -+ if (!iswblank (wc) && wc != '\n') 18.1821 -+ break; 18.1822 -+ 18.1823 -+ ptr += mblength; 18.1824 -+ } 18.1825 -+ } 18.1826 -+ while (ptr < lim); 18.1827 -+ } 18.1828 -+ 18.1829 -+ extract_field (line, ptr, lim - ptr); 18.1830 -+} 18.1831 -+#endif 18.1832 -+ 18.1833 - static void 18.1834 - freeline (struct line *line) 18.1835 - { 18.1836 -@@ -327,56 +485,133 @@ keycmp (struct line const *line1, struct 18.1837 - size_t jf_1, size_t jf_2) 18.1838 - { 18.1839 - /* Start of field to compare in each file. */ 18.1840 -- char *beg1; 18.1841 -- char *beg2; 18.1842 -- 18.1843 -- size_t len1; 18.1844 -- size_t len2; /* Length of fields to compare. */ 18.1845 -+ char *beg[2]; 18.1846 -+ char *copy[2]; 18.1847 -+ size_t len[2]; /* Length of fields to compare. */ 18.1848 - int diff; 18.1849 -+ int i, j; 18.1850 -+ int mallocd = 0; 18.1851 - 18.1852 - if (jf_1 < line1->nfields) 18.1853 - { 18.1854 -- beg1 = line1->fields[jf_1].beg; 18.1855 -- len1 = line1->fields[jf_1].len; 18.1856 -+ beg[0] = line1->fields[jf_1].beg; 18.1857 -+ len[0] = line1->fields[jf_1].len; 18.1858 - } 18.1859 - else 18.1860 - { 18.1861 -- beg1 = NULL; 18.1862 -- len1 = 0; 18.1863 -+ beg[0] = NULL; 18.1864 -+ len[0] = 0; 18.1865 - } 18.1866 - 18.1867 - if (jf_2 < line2->nfields) 18.1868 - { 18.1869 -- beg2 = line2->fields[jf_2].beg; 18.1870 -- len2 = line2->fields[jf_2].len; 18.1871 -+ beg[1] = line2->fields[jf_2].beg; 18.1872 -+ len[1] = line2->fields[jf_2].len; 18.1873 - } 18.1874 - else 18.1875 - { 18.1876 -- beg2 = NULL; 18.1877 -- len2 = 0; 18.1878 -+ beg[1] = NULL; 18.1879 -+ len[1] = 0; 18.1880 - } 18.1881 - 18.1882 -- if (len1 == 0) 18.1883 -- return len2 == 0 ? 0 : -1; 18.1884 -- if (len2 == 0) 18.1885 -+ if (len[0] == 0) 18.1886 -+ return len[1] == 0 ? 0 : -1; 18.1887 -+ if (len[1] == 0) 18.1888 - return 1; 18.1889 - 18.1890 - if (ignore_case) 18.1891 - { 18.1892 -- /* FIXME: ignore_case does not work with NLS (in particular, 18.1893 -- with multibyte chars). */ 18.1894 -- diff = memcasecmp (beg1, beg2, MIN (len1, len2)); 18.1895 -+#ifdef HAVE_MBRTOWC 18.1896 -+ if (MB_CUR_MAX > 1) 18.1897 -+ { 18.1898 -+ size_t mblength; 18.1899 -+ wchar_t wc, uwc; 18.1900 -+ mbstate_t state, state_bak; 18.1901 -+ 18.1902 -+ memset (&state, '\0', sizeof (mbstate_t)); 18.1903 -+ 18.1904 -+ for (i = 0; i < 2; i++) 18.1905 -+ { 18.1906 -+ mallocd = 1; 18.1907 -+ copy[i] = xmalloc (len[i] + 1); 18.1908 -+ memset (copy[i], '\0',len[i] + 1); 18.1909 -+ 18.1910 -+ for (j = 0; j < MIN (len[0], len[1]);) 18.1911 -+ { 18.1912 -+ state_bak = state; 18.1913 -+ mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state); 18.1914 -+ 18.1915 -+ switch (mblength) 18.1916 -+ { 18.1917 -+ case (size_t) -1: 18.1918 -+ case (size_t) -2: 18.1919 -+ state = state_bak; 18.1920 -+ /* Fall through */ 18.1921 -+ case 0: 18.1922 -+ mblength = 1; 18.1923 -+ break; 18.1924 -+ 18.1925 -+ default: 18.1926 -+ uwc = towupper (wc); 18.1927 -+ 18.1928 -+ if (uwc != wc) 18.1929 -+ { 18.1930 -+ mbstate_t state_wc; 18.1931 -+ size_t mblen; 18.1932 -+ 18.1933 -+ memset (&state_wc, '\0', sizeof (mbstate_t)); 18.1934 -+ mblen = wcrtomb (copy[i] + j, uwc, &state_wc); 18.1935 -+ assert (mblen != (size_t)-1); 18.1936 -+ } 18.1937 -+ else 18.1938 -+ memcpy (copy[i] + j, beg[i] + j, mblength); 18.1939 -+ } 18.1940 -+ j += mblength; 18.1941 -+ } 18.1942 -+ copy[i][j] = '\0'; 18.1943 -+ } 18.1944 -+ } 18.1945 -+ else 18.1946 -+#endif 18.1947 -+ { 18.1948 -+ for (i = 0; i < 2; i++) 18.1949 -+ { 18.1950 -+ mallocd = 1; 18.1951 -+ copy[i] = xmalloc (len[i] + 1); 18.1952 -+ 18.1953 -+ for (j = 0; j < MIN (len[0], len[1]); j++) 18.1954 -+ copy[i][j] = toupper (beg[i][j]); 18.1955 -+ 18.1956 -+ copy[i][j] = '\0'; 18.1957 -+ } 18.1958 -+ } 18.1959 - } 18.1960 - else 18.1961 - { 18.1962 -- if (hard_LC_COLLATE) 18.1963 -- return xmemcoll (beg1, len1, beg2, len2); 18.1964 -- diff = memcmp (beg1, beg2, MIN (len1, len2)); 18.1965 -+ copy[0] = beg[0]; 18.1966 -+ copy[1] = beg[1]; 18.1967 - } 18.1968 - 18.1969 -+ if (hard_LC_COLLATE) 18.1970 -+ { 18.1971 -+ diff = xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]); 18.1972 -+ 18.1973 -+ if (mallocd) 18.1974 -+ for (i = 0; i < 2; i++) 18.1975 -+ free (copy[i]); 18.1976 -+ 18.1977 -+ return diff; 18.1978 -+ } 18.1979 -+ diff = memcmp (copy[0], copy[1], MIN (len[0], len[1])); 18.1980 -+ 18.1981 -+ if (mallocd) 18.1982 -+ for (i = 0; i < 2; i++) 18.1983 -+ free (copy[i]); 18.1984 -+ 18.1985 -+ 18.1986 - if (diff) 18.1987 - return diff; 18.1988 -- return len1 < len2 ? -1 : len1 != len2; 18.1989 -+ return len[0] - len[1]; 18.1990 - } 18.1991 - 18.1992 - /* Check that successive input lines PREV and CURRENT from input file 18.1993 -@@ -468,6 +703,11 @@ get_line (FILE *fp, struct line **linep, 18.1994 - } 18.1995 - ++line_no[which - 1]; 18.1996 - 18.1997 -+#if HAVE_MBRTOWC 18.1998 -+ if (MB_CUR_MAX > 1) 18.1999 -+ xfields_multibyte (line); 18.2000 -+ else 18.2001 -+#endif 18.2002 - xfields (line); 18.2003 - 18.2004 - if (prevline[which - 1]) 18.2005 -@@ -567,21 +807,28 @@ prfield (size_t n, struct line const *li 18.2006 - 18.2007 - /* Output all the fields in line, other than the join field. */ 18.2008 - 18.2009 -+#define PUT_TAB_CHAR \ 18.2010 -+ do \ 18.2011 -+ { \ 18.2012 -+ (tab != NULL) ? \ 18.2013 -+ fwrite(tab, sizeof(char), tablen, stdout) : putchar (' '); \ 18.2014 -+ } \ 18.2015 -+ while (0) 18.2016 -+ 18.2017 - static void 18.2018 - prfields (struct line const *line, size_t join_field, size_t autocount) 18.2019 - { 18.2020 - size_t i; 18.2021 - size_t nfields = autoformat ? autocount : line->nfields; 18.2022 -- char output_separator = tab < 0 ? ' ' : tab; 18.2023 - 18.2024 - for (i = 0; i < join_field && i < nfields; ++i) 18.2025 - { 18.2026 -- putchar (output_separator); 18.2027 -+ PUT_TAB_CHAR; 18.2028 - prfield (i, line); 18.2029 - } 18.2030 - for (i = join_field + 1; i < nfields; ++i) 18.2031 - { 18.2032 -- putchar (output_separator); 18.2033 -+ PUT_TAB_CHAR; 18.2034 - prfield (i, line); 18.2035 - } 18.2036 - } 18.2037 -@@ -592,7 +839,6 @@ static void 18.2038 - prjoin (struct line const *line1, struct line const *line2) 18.2039 - { 18.2040 - const struct outlist *outlist; 18.2041 -- char output_separator = tab < 0 ? ' ' : tab; 18.2042 - size_t field; 18.2043 - struct line const *line; 18.2044 - 18.2045 -@@ -626,7 +872,7 @@ prjoin (struct line const *line1, struct 18.2046 - o = o->next; 18.2047 - if (o == NULL) 18.2048 - break; 18.2049 -- putchar (output_separator); 18.2050 -+ PUT_TAB_CHAR; 18.2051 - } 18.2052 - putchar (eolchar); 18.2053 - } 18.2054 -@@ -1104,20 +1350,43 @@ main (int argc, char **argv) 18.2055 - 18.2056 - case 't': 18.2057 - { 18.2058 -- unsigned char newtab = optarg[0]; 18.2059 -+ char *newtab = NULL; 18.2060 -+ size_t newtablen; 18.2061 -+ newtab = xstrdup (optarg); 18.2062 -+#if HAVE_MBRTOWC 18.2063 -+ if (MB_CUR_MAX > 1) 18.2064 -+ { 18.2065 -+ mbstate_t state; 18.2066 -+ 18.2067 -+ memset (&state, 0, sizeof (mbstate_t)); 18.2068 -+ newtablen = mbrtowc (NULL, newtab, 18.2069 -+ strnlen (newtab, MB_LEN_MAX), 18.2070 -+ &state); 18.2071 -+ if (newtablen == (size_t) 0 18.2072 -+ || newtablen == (size_t) -1 18.2073 -+ || newtablen == (size_t) -2) 18.2074 -+ newtablen = 1; 18.2075 -+ } 18.2076 -+ else 18.2077 -+#endif 18.2078 -+ newtablen = 1; 18.2079 - if (! newtab) 18.2080 -- newtab = '\n'; /* '' => process the whole line. */ 18.2081 -+ newtab = (char*)"\n"; /* '' => process the whole line. */ 18.2082 - else if (optarg[1]) 18.2083 - { 18.2084 -- if (STREQ (optarg, "\\0")) 18.2085 -- newtab = '\0'; 18.2086 -- else 18.2087 -- die (EXIT_FAILURE, 0, _("multi-character tab %s"), 18.2088 -- quote (optarg)); 18.2089 -+ if (newtablen == 1 && newtab[1]) 18.2090 -+ { 18.2091 -+ if (STREQ (newtab, "\\0")) 18.2092 -+ newtab[0] = '\0'; 18.2093 -+ } 18.2094 -+ } 18.2095 -+ if (tab != NULL && strcmp (tab, newtab)) 18.2096 -+ { 18.2097 -+ free (newtab); 18.2098 -+ die (EXIT_FAILURE, 0, _("incompatible tabs")); 18.2099 - } 18.2100 -- if (0 <= tab && tab != newtab) 18.2101 -- die (EXIT_FAILURE, 0, _("incompatible tabs")); 18.2102 - tab = newtab; 18.2103 -+ tablen = newtablen; 18.2104 - } 18.2105 - break; 18.2106 - 18.2107 -diff -Naurp coreutils-8.27-orig/src/pr.c coreutils-8.27/src/pr.c 18.2108 ---- coreutils-8.27-orig/src/pr.c 2017-01-01 16:34:24.000000000 -0600 18.2109 -+++ coreutils-8.27/src/pr.c 2017-03-11 23:47:13.094286139 -0600 18.2110 -@@ -311,6 +311,24 @@ 18.2111 - 18.2112 - #include <getopt.h> 18.2113 - #include <sys/types.h> 18.2114 -+ 18.2115 -+/* Get MB_LEN_MAX. */ 18.2116 -+#include <limits.h> 18.2117 -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC 18.2118 -+ installation; work around this configuration error. */ 18.2119 -+#if !defined MB_LEN_MAX || MB_LEN_MAX == 1 18.2120 -+# define MB_LEN_MAX 16 18.2121 -+#endif 18.2122 -+ 18.2123 -+/* Get MB_CUR_MAX. */ 18.2124 -+#include <stdlib.h> 18.2125 -+ 18.2126 -+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ 18.2127 -+/* Get mbstate_t, mbrtowc(), wcwidth(). */ 18.2128 -+#if HAVE_WCHAR_H 18.2129 -+# include <wchar.h> 18.2130 -+#endif 18.2131 -+ 18.2132 - #include "system.h" 18.2133 - #include "die.h" 18.2134 - #include "error.h" 18.2135 -@@ -324,6 +342,18 @@ 18.2136 - #include "xstrtol.h" 18.2137 - #include "xdectoint.h" 18.2138 - 18.2139 -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ 18.2140 -+#if HAVE_MBRTOWC && defined mbstate_t 18.2141 -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) 18.2142 -+#endif 18.2143 -+ 18.2144 -+#ifndef HAVE_DECL_WCWIDTH 18.2145 -+"this configure-time declaration test was not run" 18.2146 -+#endif 18.2147 -+#if !HAVE_DECL_WCWIDTH 18.2148 -+extern int wcwidth (); 18.2149 -+#endif 18.2150 -+ 18.2151 - /* The official name of this program (e.g., no 'g' prefix). */ 18.2152 - #define PROGRAM_NAME "pr" 18.2153 - 18.2154 -@@ -416,7 +446,20 @@ struct COLUMN 18.2155 - 18.2156 - typedef struct COLUMN COLUMN; 18.2157 - 18.2158 --static int char_to_clump (char c); 18.2159 -+/* Funtion pointers to switch functions for single byte locale or for 18.2160 -+ multibyte locale. If multibyte functions do not exist in your sysytem, 18.2161 -+ these pointers always point the function for single byte locale. */ 18.2162 -+static void (*print_char) (char c); 18.2163 -+static int (*char_to_clump) (char c); 18.2164 -+ 18.2165 -+/* Functions for single byte locale. */ 18.2166 -+static void print_char_single (char c); 18.2167 -+static int char_to_clump_single (char c); 18.2168 -+ 18.2169 -+/* Functions for multibyte locale. */ 18.2170 -+static void print_char_multi (char c); 18.2171 -+static int char_to_clump_multi (char c); 18.2172 -+ 18.2173 - static bool read_line (COLUMN *p); 18.2174 - static bool print_page (void); 18.2175 - static bool print_stored (COLUMN *p); 18.2176 -@@ -428,6 +471,7 @@ static void add_line_number (COLUMN *p); 18.2177 - static void getoptnum (const char *n_str, int min, int *num, 18.2178 - const char *errfmt); 18.2179 - static void getoptarg (char *arg, char switch_char, char *character, 18.2180 -+ int *character_length, int *character_width, 18.2181 - int *number); 18.2182 - static void print_files (int number_of_files, char **av); 18.2183 - static void init_parameters (int number_of_files); 18.2184 -@@ -441,7 +485,6 @@ static void store_char (char c); 18.2185 - static void pad_down (unsigned int lines); 18.2186 - static void read_rest_of_line (COLUMN *p); 18.2187 - static void skip_read (COLUMN *p, int column_number); 18.2188 --static void print_char (char c); 18.2189 - static void cleanup (void); 18.2190 - static void print_sep_string (void); 18.2191 - static void separator_string (const char *optarg_S); 18.2192 -@@ -453,7 +496,7 @@ static COLUMN *column_vector; 18.2193 - we store the leftmost columns contiguously in buff. 18.2194 - To print a line from buff, get the index of the first character 18.2195 - from line_vector[i], and print up to line_vector[i + 1]. */ 18.2196 --static char *buff; 18.2197 -+static unsigned char *buff; 18.2198 - 18.2199 - /* Index of the position in buff where the next character 18.2200 - will be stored. */ 18.2201 -@@ -557,7 +600,7 @@ static int chars_per_column; 18.2202 - static bool untabify_input = false; 18.2203 - 18.2204 - /* (-e) The input tab character. */ 18.2205 --static char input_tab_char = '\t'; 18.2206 -+static char input_tab_char[MB_LEN_MAX] = "\t"; 18.2207 - 18.2208 - /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ... 18.2209 - where the leftmost column is 1. */ 18.2210 -@@ -567,7 +610,10 @@ static int chars_per_input_tab = 8; 18.2211 - static bool tabify_output = false; 18.2212 - 18.2213 - /* (-i) The output tab character. */ 18.2214 --static char output_tab_char = '\t'; 18.2215 -+static char output_tab_char[MB_LEN_MAX] = "\t"; 18.2216 -+ 18.2217 -+/* (-i) The byte length of output tab character. */ 18.2218 -+static int output_tab_char_length = 1; 18.2219 - 18.2220 - /* (-i) The width of the output tab. */ 18.2221 - static int chars_per_output_tab = 8; 18.2222 -@@ -637,7 +683,13 @@ static int line_number; 18.2223 - static bool numbered_lines = false; 18.2224 - 18.2225 - /* (-n) Character which follows each line number. */ 18.2226 --static char number_separator = '\t'; 18.2227 -+static char number_separator[MB_LEN_MAX] = "\t"; 18.2228 -+ 18.2229 -+/* (-n) The byte length of the character which follows each line number. */ 18.2230 -+static int number_separator_length = 1; 18.2231 -+ 18.2232 -+/* (-n) The character width of the character which follows each line number. */ 18.2233 -+static int number_separator_width = 0; 18.2234 - 18.2235 - /* (-n) line counting starts with 1st line of input file (not with 1st 18.2236 - line of 1st page printed). */ 18.2237 -@@ -690,6 +742,7 @@ static bool use_col_separator = false; 18.2238 - -a|COLUMN|-m is a 'space' and with the -J option a 'tab'. */ 18.2239 - static char const *col_sep_string = ""; 18.2240 - static int col_sep_length = 0; 18.2241 -+static int col_sep_width = 0; 18.2242 - static char *column_separator = (char *) " "; 18.2243 - static char *line_separator = (char *) "\t"; 18.2244 - 18.2245 -@@ -851,6 +904,13 @@ separator_string (const char *optarg_S) 18.2246 - integer_overflow (); 18.2247 - col_sep_length = len; 18.2248 - col_sep_string = optarg_S; 18.2249 -+ 18.2250 -+#if HAVE_MBRTOWC 18.2251 -+ if (MB_CUR_MAX > 1) 18.2252 -+ col_sep_width = mbswidth (col_sep_string, 0); 18.2253 -+ else 18.2254 -+#endif 18.2255 -+ col_sep_width = col_sep_length; 18.2256 - } 18.2257 - 18.2258 - int 18.2259 -@@ -875,6 +935,21 @@ main (int argc, char **argv) 18.2260 - 18.2261 - atexit (close_stdout); 18.2262 - 18.2263 -+/* Define which functions are used, the ones for single byte locale or the ones 18.2264 -+ for multibyte locale. */ 18.2265 -+#if HAVE_MBRTOWC 18.2266 -+ if (MB_CUR_MAX > 1) 18.2267 -+ { 18.2268 -+ print_char = print_char_multi; 18.2269 -+ char_to_clump = char_to_clump_multi; 18.2270 -+ } 18.2271 -+ else 18.2272 -+#endif 18.2273 -+ { 18.2274 -+ print_char = print_char_single; 18.2275 -+ char_to_clump = char_to_clump_single; 18.2276 -+ } 18.2277 -+ 18.2278 - n_files = 0; 18.2279 - file_names = (argc > 1 18.2280 - ? xnmalloc (argc - 1, sizeof (char *)) 18.2281 -@@ -951,8 +1026,12 @@ main (int argc, char **argv) 18.2282 - break; 18.2283 - case 'e': 18.2284 - if (optarg) 18.2285 -- getoptarg (optarg, 'e', &input_tab_char, 18.2286 -- &chars_per_input_tab); 18.2287 -+ { 18.2288 -+ int dummy_length, dummy_width; 18.2289 -+ 18.2290 -+ getoptarg (optarg, 'e', input_tab_char, &dummy_length, 18.2291 -+ &dummy_width, &chars_per_input_tab); 18.2292 -+ } 18.2293 - /* Could check tab width > 0. */ 18.2294 - untabify_input = true; 18.2295 - break; 18.2296 -@@ -965,8 +1044,12 @@ main (int argc, char **argv) 18.2297 - break; 18.2298 - case 'i': 18.2299 - if (optarg) 18.2300 -- getoptarg (optarg, 'i', &output_tab_char, 18.2301 -- &chars_per_output_tab); 18.2302 -+ { 18.2303 -+ int dummy_width; 18.2304 -+ 18.2305 -+ getoptarg (optarg, 'i', output_tab_char, &output_tab_char_length, 18.2306 -+ &dummy_width, &chars_per_output_tab); 18.2307 -+ } 18.2308 - /* Could check tab width > 0. */ 18.2309 - tabify_output = true; 18.2310 - break; 18.2311 -@@ -984,8 +1067,8 @@ main (int argc, char **argv) 18.2312 - case 'n': 18.2313 - numbered_lines = true; 18.2314 - if (optarg) 18.2315 -- getoptarg (optarg, 'n', &number_separator, 18.2316 -- &chars_per_number); 18.2317 -+ getoptarg (optarg, 'n', number_separator, &number_separator_length, 18.2318 -+ &number_separator_width, &chars_per_number); 18.2319 - break; 18.2320 - case 'N': 18.2321 - skip_count = false; 18.2322 -@@ -1010,6 +1093,7 @@ main (int argc, char **argv) 18.2323 - /* Reset an additional input of -s, -S dominates -s */ 18.2324 - col_sep_string = ""; 18.2325 - col_sep_length = 0; 18.2326 -+ col_sep_width = 0; 18.2327 - use_col_separator = true; 18.2328 - if (optarg) 18.2329 - separator_string (optarg); 18.2330 -@@ -1166,10 +1250,45 @@ getoptnum (const char *n_str, int min, i 18.2331 - a number. */ 18.2332 - 18.2333 - static void 18.2334 --getoptarg (char *arg, char switch_char, char *character, int *number) 18.2335 -+getoptarg (char *arg, char switch_char, char *character, int *character_length, 18.2336 -+ int *character_width, int *number) 18.2337 - { 18.2338 - if (!ISDIGIT (*arg)) 18.2339 -- *character = *arg++; 18.2340 -+ { 18.2341 -+#ifdef HAVE_MBRTOWC 18.2342 -+ if (MB_CUR_MAX > 1) /* for multibyte locale. */ 18.2343 -+ { 18.2344 -+ wchar_t wc; 18.2345 -+ size_t mblength; 18.2346 -+ int width; 18.2347 -+ mbstate_t state = {'\0'}; 18.2348 -+ 18.2349 -+ mblength = mbrtowc (&wc, arg, strnlen(arg, MB_LEN_MAX), &state); 18.2350 -+ 18.2351 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.2352 -+ { 18.2353 -+ *character_length = 1; 18.2354 -+ *character_width = 1; 18.2355 -+ } 18.2356 -+ else 18.2357 -+ { 18.2358 -+ *character_length = (mblength < 1) ? 1 : mblength; 18.2359 -+ width = wcwidth (wc); 18.2360 -+ *character_width = (width < 0) ? 0 : width; 18.2361 -+ } 18.2362 -+ 18.2363 -+ strncpy (character, arg, *character_length); 18.2364 -+ arg += *character_length; 18.2365 -+ } 18.2366 -+ else /* for single byte locale. */ 18.2367 -+#endif 18.2368 -+ { 18.2369 -+ *character = *arg++; 18.2370 -+ *character_length = 1; 18.2371 -+ *character_width = 1; 18.2372 -+ } 18.2373 -+ } 18.2374 -+ 18.2375 - if (*arg) 18.2376 - { 18.2377 - long int tmp_long; 18.2378 -@@ -1191,6 +1310,11 @@ static void 18.2379 - init_parameters (int number_of_files) 18.2380 - { 18.2381 - int chars_used_by_number = 0; 18.2382 -+ int mb_len = 1; 18.2383 -+#if HAVE_MBRTOWC 18.2384 -+ if (MB_CUR_MAX > 1) 18.2385 -+ mb_len = MB_LEN_MAX; 18.2386 -+#endif 18.2387 - 18.2388 - lines_per_body = lines_per_page - lines_per_header - lines_per_footer; 18.2389 - if (lines_per_body <= 0) 18.2390 -@@ -1228,7 +1352,7 @@ init_parameters (int number_of_files) 18.2391 - else 18.2392 - col_sep_string = column_separator; 18.2393 - 18.2394 -- col_sep_length = 1; 18.2395 -+ col_sep_length = col_sep_width = 1; 18.2396 - use_col_separator = true; 18.2397 - } 18.2398 - /* It's rather pointless to define a TAB separator with column 18.2399 -@@ -1258,11 +1382,11 @@ init_parameters (int number_of_files) 18.2400 - + TAB_WIDTH (chars_per_input_tab, chars_per_number); */ 18.2401 - 18.2402 - /* Estimate chars_per_text without any margin and keep it constant. */ 18.2403 -- if (number_separator == '\t') 18.2404 -+ if (number_separator[0] == '\t') 18.2405 - number_width = (chars_per_number 18.2406 - + TAB_WIDTH (chars_per_default_tab, chars_per_number)); 18.2407 - else 18.2408 -- number_width = chars_per_number + 1; 18.2409 -+ number_width = chars_per_number + number_separator_width; 18.2410 - 18.2411 - /* The number is part of the column width unless we are 18.2412 - printing files in parallel. */ 18.2413 -@@ -1271,7 +1395,7 @@ init_parameters (int number_of_files) 18.2414 - } 18.2415 - 18.2416 - int sep_chars, useful_chars; 18.2417 -- if (INT_MULTIPLY_WRAPV (columns - 1, col_sep_length, &sep_chars)) 18.2418 -+ if (INT_MULTIPLY_WRAPV (columns - 1, col_sep_width, &sep_chars)) 18.2419 - sep_chars = INT_MAX; 18.2420 - if (INT_SUBTRACT_WRAPV (chars_per_line - chars_used_by_number, sep_chars, 18.2421 - &useful_chars)) 18.2422 -@@ -1294,7 +1418,7 @@ init_parameters (int number_of_files) 18.2423 - We've to use 8 as the lower limit, if we use chars_per_default_tab = 8 18.2424 - to expand a tab which is not an input_tab-char. */ 18.2425 - free (clump_buff); 18.2426 -- clump_buff = xmalloc (MAX (8, chars_per_input_tab)); 18.2427 -+ clump_buff = xmalloc (mb_len * MAX (8, chars_per_input_tab)); 18.2428 - } 18.2429 - 18.2430 - /* Open the necessary files, 18.2431 -@@ -1402,7 +1526,7 @@ init_funcs (void) 18.2432 - 18.2433 - /* Enlarge p->start_position of first column to use the same form of 18.2434 - padding_not_printed with all columns. */ 18.2435 -- h = h + col_sep_length; 18.2436 -+ h = h + col_sep_width; 18.2437 - 18.2438 - /* This loop takes care of all but the rightmost column. */ 18.2439 - 18.2440 -@@ -1436,7 +1560,7 @@ init_funcs (void) 18.2441 - } 18.2442 - else 18.2443 - { 18.2444 -- h = h_next + col_sep_length; 18.2445 -+ h = h_next + col_sep_width; 18.2446 - h_next = h + chars_per_column; 18.2447 - } 18.2448 - } 18.2449 -@@ -1727,9 +1851,9 @@ static void 18.2450 - align_column (COLUMN *p) 18.2451 - { 18.2452 - padding_not_printed = p->start_position; 18.2453 -- if (col_sep_length < padding_not_printed) 18.2454 -+ if (col_sep_width < padding_not_printed) 18.2455 - { 18.2456 -- pad_across_to (padding_not_printed - col_sep_length); 18.2457 -+ pad_across_to (padding_not_printed - col_sep_width); 18.2458 - padding_not_printed = ANYWHERE; 18.2459 - } 18.2460 - 18.2461 -@@ -2004,13 +2128,13 @@ store_char (char c) 18.2462 - /* May be too generous. */ 18.2463 - buff = X2REALLOC (buff, &buff_allocated); 18.2464 - } 18.2465 -- buff[buff_current++] = c; 18.2466 -+ buff[buff_current++] = (unsigned char) c; 18.2467 - } 18.2468 - 18.2469 - static void 18.2470 - add_line_number (COLUMN *p) 18.2471 - { 18.2472 -- int i; 18.2473 -+ int i, j; 18.2474 - char *s; 18.2475 - int num_width; 18.2476 - 18.2477 -@@ -2027,22 +2151,24 @@ add_line_number (COLUMN *p) 18.2478 - /* Tabification is assumed for multiple columns, also for n-separators, 18.2479 - but 'default n-separator = TAB' hasn't been given priority over 18.2480 - equal column_width also specified by POSIX. */ 18.2481 -- if (number_separator == '\t') 18.2482 -+ if (number_separator[0] == '\t') 18.2483 - { 18.2484 - i = number_width - chars_per_number; 18.2485 - while (i-- > 0) 18.2486 - (p->char_func) (' '); 18.2487 - } 18.2488 - else 18.2489 -- (p->char_func) (number_separator); 18.2490 -+ for (j = 0; j < number_separator_length; j++) 18.2491 -+ (p->char_func) (number_separator[j]); 18.2492 - } 18.2493 - else 18.2494 - /* To comply with POSIX, we avoid any expansion of default TAB 18.2495 - separator with a single column output. No column_width requirement 18.2496 - has to be considered. */ 18.2497 - { 18.2498 -- (p->char_func) (number_separator); 18.2499 -- if (number_separator == '\t') 18.2500 -+ for (j = 0; j < number_separator_length; j++) 18.2501 -+ (p->char_func) (number_separator[j]); 18.2502 -+ if (number_separator[0] == '\t') 18.2503 - output_position = POS_AFTER_TAB (chars_per_output_tab, 18.2504 - output_position); 18.2505 - } 18.2506 -@@ -2203,7 +2329,7 @@ print_white_space (void) 18.2507 - while (goal - h_old > 1 18.2508 - && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal) 18.2509 - { 18.2510 -- putchar (output_tab_char); 18.2511 -+ fwrite (output_tab_char, sizeof(char), output_tab_char_length, stdout); 18.2512 - h_old = h_new; 18.2513 - } 18.2514 - while (++h_old <= goal) 18.2515 -@@ -2223,6 +2349,7 @@ print_sep_string (void) 18.2516 - { 18.2517 - char const *s = col_sep_string; 18.2518 - int l = col_sep_length; 18.2519 -+ int not_space_flag; 18.2520 - 18.2521 - if (separators_not_printed <= 0) 18.2522 - { 18.2523 -@@ -2234,6 +2361,7 @@ print_sep_string (void) 18.2524 - { 18.2525 - for (; separators_not_printed > 0; --separators_not_printed) 18.2526 - { 18.2527 -+ not_space_flag = 0; 18.2528 - while (l-- > 0) 18.2529 - { 18.2530 - /* 3 types of sep_strings: spaces only, spaces and chars, 18.2531 -@@ -2247,12 +2375,15 @@ print_sep_string (void) 18.2532 - } 18.2533 - else 18.2534 - { 18.2535 -+ not_space_flag = 1; 18.2536 - if (spaces_not_printed > 0) 18.2537 - print_white_space (); 18.2538 - putchar (*s++); 18.2539 -- ++output_position; 18.2540 - } 18.2541 - } 18.2542 -+ if (not_space_flag) 18.2543 -+ output_position += col_sep_width; 18.2544 -+ 18.2545 - /* sep_string ends with some spaces */ 18.2546 - if (spaces_not_printed > 0) 18.2547 - print_white_space (); 18.2548 -@@ -2280,7 +2411,7 @@ print_clump (COLUMN *p, int n, char *clu 18.2549 - required number of tabs and spaces. */ 18.2550 - 18.2551 - static void 18.2552 --print_char (char c) 18.2553 -+print_char_single (char c) 18.2554 - { 18.2555 - if (tabify_output) 18.2556 - { 18.2557 -@@ -2304,6 +2435,74 @@ print_char (char c) 18.2558 - putchar (c); 18.2559 - } 18.2560 - 18.2561 -+#ifdef HAVE_MBRTOWC 18.2562 -+static void 18.2563 -+print_char_multi (char c) 18.2564 -+{ 18.2565 -+ static size_t mbc_pos = 0; 18.2566 -+ static char mbc[MB_LEN_MAX] = {'\0'}; 18.2567 -+ static mbstate_t state = {'\0'}; 18.2568 -+ mbstate_t state_bak; 18.2569 -+ wchar_t wc; 18.2570 -+ size_t mblength; 18.2571 -+ int width; 18.2572 -+ 18.2573 -+ if (tabify_output) 18.2574 -+ { 18.2575 -+ state_bak = state; 18.2576 -+ mbc[mbc_pos++] = c; 18.2577 -+ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); 18.2578 -+ 18.2579 -+ while (mbc_pos > 0) 18.2580 -+ { 18.2581 -+ switch (mblength) 18.2582 -+ { 18.2583 -+ case (size_t)-2: 18.2584 -+ state = state_bak; 18.2585 -+ return; 18.2586 -+ 18.2587 -+ case (size_t)-1: 18.2588 -+ state = state_bak; 18.2589 -+ ++output_position; 18.2590 -+ putchar (mbc[0]); 18.2591 -+ memmove (mbc, mbc + 1, MB_CUR_MAX - 1); 18.2592 -+ --mbc_pos; 18.2593 -+ break; 18.2594 -+ 18.2595 -+ case 0: 18.2596 -+ mblength = 1; 18.2597 -+ 18.2598 -+ default: 18.2599 -+ if (wc == L' ') 18.2600 -+ { 18.2601 -+ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); 18.2602 -+ --mbc_pos; 18.2603 -+ ++spaces_not_printed; 18.2604 -+ return; 18.2605 -+ } 18.2606 -+ else if (spaces_not_printed > 0) 18.2607 -+ print_white_space (); 18.2608 -+ 18.2609 -+ /* Nonprintables are assumed to have width 0, except L'\b'. */ 18.2610 -+ if ((width = wcwidth (wc)) < 1) 18.2611 -+ { 18.2612 -+ if (wc == L'\b') 18.2613 -+ --output_position; 18.2614 -+ } 18.2615 -+ else 18.2616 -+ output_position += width; 18.2617 -+ 18.2618 -+ fwrite (mbc, sizeof(char), mblength, stdout); 18.2619 -+ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); 18.2620 -+ mbc_pos -= mblength; 18.2621 -+ } 18.2622 -+ } 18.2623 -+ return; 18.2624 -+ } 18.2625 -+ putchar (c); 18.2626 -+} 18.2627 -+#endif 18.2628 -+ 18.2629 - /* Skip to page PAGE before printing. 18.2630 - PAGE may be larger than total number of pages. */ 18.2631 - 18.2632 -@@ -2483,9 +2682,9 @@ read_line (COLUMN *p) 18.2633 - align_empty_cols = false; 18.2634 - } 18.2635 - 18.2636 -- if (col_sep_length < padding_not_printed) 18.2637 -+ if (col_sep_width < padding_not_printed) 18.2638 - { 18.2639 -- pad_across_to (padding_not_printed - col_sep_length); 18.2640 -+ pad_across_to (padding_not_printed - col_sep_width); 18.2641 - padding_not_printed = ANYWHERE; 18.2642 - } 18.2643 - 18.2644 -@@ -2555,7 +2754,7 @@ print_stored (COLUMN *p) 18.2645 - int i; 18.2646 - 18.2647 - int line = p->current_line++; 18.2648 -- char *first = &buff[line_vector[line]]; 18.2649 -+ unsigned char *first = &buff[line_vector[line]]; 18.2650 - /* FIXME 18.2651 - UMR: Uninitialized memory read: 18.2652 - * This is occurring while in: 18.2653 -@@ -2567,7 +2766,7 @@ print_stored (COLUMN *p) 18.2654 - xmalloc [xmalloc.c:94] 18.2655 - init_store_cols [pr.c:1648] 18.2656 - */ 18.2657 -- char *last = &buff[line_vector[line + 1]]; 18.2658 -+ unsigned char *last = &buff[line_vector[line + 1]]; 18.2659 - 18.2660 - pad_vertically = true; 18.2661 - 18.2662 -@@ -2586,9 +2785,9 @@ print_stored (COLUMN *p) 18.2663 - } 18.2664 - } 18.2665 - 18.2666 -- if (col_sep_length < padding_not_printed) 18.2667 -+ if (col_sep_width < padding_not_printed) 18.2668 - { 18.2669 -- pad_across_to (padding_not_printed - col_sep_length); 18.2670 -+ pad_across_to (padding_not_printed - col_sep_width); 18.2671 - padding_not_printed = ANYWHERE; 18.2672 - } 18.2673 - 18.2674 -@@ -2601,8 +2800,8 @@ print_stored (COLUMN *p) 18.2675 - if (spaces_not_printed == 0) 18.2676 - { 18.2677 - output_position = p->start_position + end_vector[line]; 18.2678 -- if (p->start_position - col_sep_length == chars_per_margin) 18.2679 -- output_position -= col_sep_length; 18.2680 -+ if (p->start_position - col_sep_width == chars_per_margin) 18.2681 -+ output_position -= col_sep_width; 18.2682 - } 18.2683 - 18.2684 - return true; 18.2685 -@@ -2621,7 +2820,7 @@ print_stored (COLUMN *p) 18.2686 - number of characters is 1.) */ 18.2687 - 18.2688 - static int 18.2689 --char_to_clump (char c) 18.2690 -+char_to_clump_single (char c) 18.2691 - { 18.2692 - unsigned char uc = c; 18.2693 - char *s = clump_buff; 18.2694 -@@ -2631,10 +2830,10 @@ char_to_clump (char c) 18.2695 - int chars; 18.2696 - int chars_per_c = 8; 18.2697 - 18.2698 -- if (c == input_tab_char) 18.2699 -+ if (c == input_tab_char[0]) 18.2700 - chars_per_c = chars_per_input_tab; 18.2701 - 18.2702 -- if (c == input_tab_char || c == '\t') 18.2703 -+ if (c == input_tab_char[0] || c == '\t') 18.2704 - { 18.2705 - width = TAB_WIDTH (chars_per_c, input_position); 18.2706 - 18.2707 -@@ -2715,6 +2914,164 @@ char_to_clump (char c) 18.2708 - return chars; 18.2709 - } 18.2710 - 18.2711 -+#ifdef HAVE_MBRTOWC 18.2712 -+static int 18.2713 -+char_to_clump_multi (char c) 18.2714 -+{ 18.2715 -+ static size_t mbc_pos = 0; 18.2716 -+ static char mbc[MB_LEN_MAX] = {'\0'}; 18.2717 -+ static mbstate_t state = {'\0'}; 18.2718 -+ mbstate_t state_bak; 18.2719 -+ wchar_t wc; 18.2720 -+ size_t mblength; 18.2721 -+ int wc_width; 18.2722 -+ register char *s = clump_buff; 18.2723 -+ register int i, j; 18.2724 -+ char esc_buff[4]; 18.2725 -+ int width; 18.2726 -+ int chars; 18.2727 -+ int chars_per_c = 8; 18.2728 -+ 18.2729 -+ state_bak = state; 18.2730 -+ mbc[mbc_pos++] = c; 18.2731 -+ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); 18.2732 -+ 18.2733 -+ width = 0; 18.2734 -+ chars = 0; 18.2735 -+ while (mbc_pos > 0) 18.2736 -+ { 18.2737 -+ switch (mblength) 18.2738 -+ { 18.2739 -+ case (size_t)-2: 18.2740 -+ state = state_bak; 18.2741 -+ return 0; 18.2742 -+ 18.2743 -+ case (size_t)-1: 18.2744 -+ state = state_bak; 18.2745 -+ mblength = 1; 18.2746 -+ 18.2747 -+ if (use_esc_sequence || use_cntrl_prefix) 18.2748 -+ { 18.2749 -+ width = +4; 18.2750 -+ chars = +4; 18.2751 -+ *s++ = '\\'; 18.2752 -+ sprintf (esc_buff, "%03o", (unsigned char) mbc[0]); 18.2753 -+ for (i = 0; i <= 2; ++i) 18.2754 -+ *s++ = (int) esc_buff[i]; 18.2755 -+ } 18.2756 -+ else 18.2757 -+ { 18.2758 -+ width += 1; 18.2759 -+ chars += 1; 18.2760 -+ *s++ = mbc[0]; 18.2761 -+ } 18.2762 -+ break; 18.2763 -+ 18.2764 -+ case 0: 18.2765 -+ mblength = 1; 18.2766 -+ /* Fall through */ 18.2767 -+ 18.2768 -+ default: 18.2769 -+ if (memcmp (mbc, input_tab_char, mblength) == 0) 18.2770 -+ chars_per_c = chars_per_input_tab; 18.2771 -+ 18.2772 -+ if (memcmp (mbc, input_tab_char, mblength) == 0 || c == '\t') 18.2773 -+ { 18.2774 -+ int width_inc; 18.2775 -+ 18.2776 -+ width_inc = TAB_WIDTH (chars_per_c, input_position); 18.2777 -+ width += width_inc; 18.2778 -+ 18.2779 -+ if (untabify_input) 18.2780 -+ { 18.2781 -+ for (i = width_inc; i; --i) 18.2782 -+ *s++ = ' '; 18.2783 -+ chars += width_inc; 18.2784 -+ } 18.2785 -+ else 18.2786 -+ { 18.2787 -+ for (i = 0; i < mblength; i++) 18.2788 -+ *s++ = mbc[i]; 18.2789 -+ chars += mblength; 18.2790 -+ } 18.2791 -+ } 18.2792 -+ else if ((wc_width = wcwidth (wc)) < 1) 18.2793 -+ { 18.2794 -+ if (use_esc_sequence) 18.2795 -+ { 18.2796 -+ for (i = 0; i < mblength; i++) 18.2797 -+ { 18.2798 -+ width += 4; 18.2799 -+ chars += 4; 18.2800 -+ *s++ = '\\'; 18.2801 -+ sprintf (esc_buff, "%03o", (unsigned char) mbc[i]); 18.2802 -+ for (j = 0; j <= 2; ++j) 18.2803 -+ *s++ = (int) esc_buff[j]; 18.2804 -+ } 18.2805 -+ } 18.2806 -+ else if (use_cntrl_prefix) 18.2807 -+ { 18.2808 -+ if (wc < 0200) 18.2809 -+ { 18.2810 -+ width += 2; 18.2811 -+ chars += 2; 18.2812 -+ *s++ = '^'; 18.2813 -+ *s++ = wc ^ 0100; 18.2814 -+ } 18.2815 -+ else 18.2816 -+ { 18.2817 -+ for (i = 0; i < mblength; i++) 18.2818 -+ { 18.2819 -+ width += 4; 18.2820 -+ chars += 4; 18.2821 -+ *s++ = '\\'; 18.2822 -+ sprintf (esc_buff, "%03o", (unsigned char) mbc[i]); 18.2823 -+ for (j = 0; j <= 2; ++j) 18.2824 -+ *s++ = (int) esc_buff[j]; 18.2825 -+ } 18.2826 -+ } 18.2827 -+ } 18.2828 -+ else if (wc == L'\b') 18.2829 -+ { 18.2830 -+ width += -1; 18.2831 -+ chars += 1; 18.2832 -+ *s++ = c; 18.2833 -+ } 18.2834 -+ else 18.2835 -+ { 18.2836 -+ width += 0; 18.2837 -+ chars += mblength; 18.2838 -+ for (i = 0; i < mblength; i++) 18.2839 -+ *s++ = mbc[i]; 18.2840 -+ } 18.2841 -+ } 18.2842 -+ else 18.2843 -+ { 18.2844 -+ width += wc_width; 18.2845 -+ chars += mblength; 18.2846 -+ for (i = 0; i < mblength; i++) 18.2847 -+ *s++ = mbc[i]; 18.2848 -+ } 18.2849 -+ } 18.2850 -+ memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength); 18.2851 -+ mbc_pos -= mblength; 18.2852 -+ } 18.2853 -+ 18.2854 -+ /* Too many backspaces must put us in position 0 -- never negative. */ 18.2855 -+ if (width < 0 && input_position == 0) 18.2856 -+ { 18.2857 -+ chars = 0; 18.2858 -+ input_position = 0; 18.2859 -+ } 18.2860 -+ else if (width < 0 && input_position <= -width) 18.2861 -+ input_position = 0; 18.2862 -+ else 18.2863 -+ input_position += width; 18.2864 -+ 18.2865 -+ return chars; 18.2866 -+} 18.2867 -+#endif 18.2868 -+ 18.2869 - /* We've just printed some files and need to clean up things before 18.2870 - looking for more options and printing the next batch of files. 18.2871 - 18.2872 -diff -Naurp coreutils-8.27-orig/src/sort.c coreutils-8.27/src/sort.c 18.2873 ---- coreutils-8.27-orig/src/sort.c 2017-01-01 16:34:24.000000000 -0600 18.2874 -+++ coreutils-8.27/src/sort.c 2017-03-11 23:49:22.416505389 -0600 18.2875 -@@ -29,6 +29,14 @@ 18.2876 - #include <sys/wait.h> 18.2877 - #include <signal.h> 18.2878 - #include <assert.h> 18.2879 -+#if HAVE_WCHAR_H 18.2880 -+# include <wchar.h> 18.2881 -+#endif 18.2882 -+/* Get isw* functions. */ 18.2883 -+#if HAVE_WCTYPE_H 18.2884 -+# include <wctype.h> 18.2885 -+#endif 18.2886 -+ 18.2887 - #include "system.h" 18.2888 - #include "argmatch.h" 18.2889 - #include "die.h" 18.2890 -@@ -165,14 +173,39 @@ static int decimal_point; 18.2891 - /* Thousands separator; if -1, then there isn't one. */ 18.2892 - static int thousands_sep; 18.2893 - 18.2894 -+/* True if -f is specified. */ 18.2895 -+static bool folding; 18.2896 -+ 18.2897 - /* Nonzero if the corresponding locales are hard. */ 18.2898 - static bool hard_LC_COLLATE; 18.2899 --#if HAVE_NL_LANGINFO 18.2900 -+#if HAVE_LANGINFO_CODESET 18.2901 - static bool hard_LC_TIME; 18.2902 - #endif 18.2903 - 18.2904 - #define NONZERO(x) ((x) != 0) 18.2905 - 18.2906 -+/* get a multibyte character's byte length. */ 18.2907 -+#define GET_BYTELEN_OF_CHAR(LIM, PTR, MBLENGTH, STATE) \ 18.2908 -+ do \ 18.2909 -+ { \ 18.2910 -+ wchar_t wc; \ 18.2911 -+ mbstate_t state_bak; \ 18.2912 -+ \ 18.2913 -+ state_bak = STATE; \ 18.2914 -+ mblength = mbrtowc (&wc, PTR, LIM - PTR, &STATE); \ 18.2915 -+ \ 18.2916 -+ switch (MBLENGTH) \ 18.2917 -+ { \ 18.2918 -+ case (size_t)-1: \ 18.2919 -+ case (size_t)-2: \ 18.2920 -+ STATE = state_bak; \ 18.2921 -+ /* Fall through. */ \ 18.2922 -+ case 0: \ 18.2923 -+ MBLENGTH = 1; \ 18.2924 -+ } \ 18.2925 -+ } \ 18.2926 -+ while (0) 18.2927 -+ 18.2928 - /* The kind of blanks for '-b' to skip in various options. */ 18.2929 - enum blanktype { bl_start, bl_end, bl_both }; 18.2930 - 18.2931 -@@ -346,13 +379,11 @@ static bool reverse; 18.2932 - they were read if all keys compare equal. */ 18.2933 - static bool stable; 18.2934 - 18.2935 --/* If TAB has this value, blanks separate fields. */ 18.2936 --enum { TAB_DEFAULT = CHAR_MAX + 1 }; 18.2937 -- 18.2938 --/* Tab character separating fields. If TAB_DEFAULT, then fields are 18.2939 -+/* Tab character separating fields. If tab_length is 0, then fields are 18.2940 - separated by the empty string between a non-blank character and a blank 18.2941 - character. */ 18.2942 --static int tab = TAB_DEFAULT; 18.2943 -+static char tab[MB_LEN_MAX + 1]; 18.2944 -+static size_t tab_length = 0; 18.2945 - 18.2946 - /* Flag to remove consecutive duplicate lines from the output. 18.2947 - Only the last of a sequence of equal lines will be output. */ 18.2948 -@@ -811,6 +842,46 @@ reap_all (void) 18.2949 - reap (-1); 18.2950 - } 18.2951 - 18.2952 -+/* Function pointers. */ 18.2953 -+static void 18.2954 -+(*inittables) (void); 18.2955 -+static char * 18.2956 -+(*begfield) (const struct line*, const struct keyfield *); 18.2957 -+static char * 18.2958 -+(*limfield) (const struct line*, const struct keyfield *); 18.2959 -+static void 18.2960 -+(*skipblanks) (char **ptr, char *lim); 18.2961 -+static int 18.2962 -+(*getmonth) (char const *, size_t, char **); 18.2963 -+static int 18.2964 -+(*keycompare) (const struct line *, const struct line *); 18.2965 -+static int 18.2966 -+(*numcompare) (const char *, const char *); 18.2967 -+ 18.2968 -+/* Test for white space multibyte character. 18.2969 -+ Set LENGTH the byte length of investigated multibyte character. */ 18.2970 -+#if HAVE_MBRTOWC 18.2971 -+static int 18.2972 -+ismbblank (const char *str, size_t len, size_t *length) 18.2973 -+{ 18.2974 -+ size_t mblength; 18.2975 -+ wchar_t wc; 18.2976 -+ mbstate_t state; 18.2977 -+ 18.2978 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.2979 -+ mblength = mbrtowc (&wc, str, len, &state); 18.2980 -+ 18.2981 -+ if (mblength == (size_t)-1 || mblength == (size_t)-2) 18.2982 -+ { 18.2983 -+ *length = 1; 18.2984 -+ return 0; 18.2985 -+ } 18.2986 -+ 18.2987 -+ *length = (mblength < 1) ? 1 : mblength; 18.2988 -+ return iswblank (wc) || wc == '\n'; 18.2989 -+} 18.2990 -+#endif 18.2991 -+ 18.2992 - /* Clean up any remaining temporary files. */ 18.2993 - 18.2994 - static void 18.2995 -@@ -1255,7 +1326,7 @@ zaptemp (char const *name) 18.2996 - free (node); 18.2997 - } 18.2998 - 18.2999 --#if HAVE_NL_LANGINFO 18.3000 -+#if HAVE_LANGINFO_CODESET 18.3001 - 18.3002 - static int 18.3003 - struct_month_cmp (void const *m1, void const *m2) 18.3004 -@@ -1270,7 +1341,7 @@ struct_month_cmp (void const *m1, void c 18.3005 - /* Initialize the character class tables. */ 18.3006 - 18.3007 - static void 18.3008 --inittables (void) 18.3009 -+inittables_uni (void) 18.3010 - { 18.3011 - size_t i; 18.3012 - 18.3013 -@@ -1282,7 +1353,7 @@ inittables (void) 18.3014 - fold_toupper[i] = toupper (i); 18.3015 - } 18.3016 - 18.3017 --#if HAVE_NL_LANGINFO 18.3018 -+#if HAVE_LANGINFO_CODESET 18.3019 - /* If we're not in the "C" locale, read different names for months. */ 18.3020 - if (hard_LC_TIME) 18.3021 - { 18.3022 -@@ -1364,6 +1435,84 @@ specify_nmerge (int oi, char c, char con 18.3023 - xstrtol_fatal (e, oi, c, long_options, s); 18.3024 - } 18.3025 - 18.3026 -+#if HAVE_MBRTOWC 18.3027 -+static void 18.3028 -+inittables_mb (void) 18.3029 -+{ 18.3030 -+ int i, j, k, l; 18.3031 -+ char *name, *s, *lc_time, *lc_ctype; 18.3032 -+ size_t s_len, mblength; 18.3033 -+ char mbc[MB_LEN_MAX]; 18.3034 -+ wchar_t wc, pwc; 18.3035 -+ mbstate_t state_mb, state_wc; 18.3036 -+ 18.3037 -+ lc_time = setlocale (LC_TIME, ""); 18.3038 -+ if (lc_time) 18.3039 -+ lc_time = xstrdup (lc_time); 18.3040 -+ 18.3041 -+ lc_ctype = setlocale (LC_CTYPE, ""); 18.3042 -+ if (lc_ctype) 18.3043 -+ lc_ctype = xstrdup (lc_ctype); 18.3044 -+ 18.3045 -+ if (lc_time && lc_ctype) 18.3046 -+ /* temporarily set LC_CTYPE to match LC_TIME, so that we can convert 18.3047 -+ * the names of months to upper case */ 18.3048 -+ setlocale (LC_CTYPE, lc_time); 18.3049 -+ 18.3050 -+ for (i = 0; i < MONTHS_PER_YEAR; i++) 18.3051 -+ { 18.3052 -+ s = (char *) nl_langinfo (ABMON_1 + i); 18.3053 -+ s_len = strlen (s); 18.3054 -+ monthtab[i].name = name = (char *) xmalloc (s_len + 1); 18.3055 -+ monthtab[i].val = i + 1; 18.3056 -+ 18.3057 -+ memset (&state_mb, '\0', sizeof (mbstate_t)); 18.3058 -+ memset (&state_wc, '\0', sizeof (mbstate_t)); 18.3059 -+ 18.3060 -+ for (j = 0; j < s_len;) 18.3061 -+ { 18.3062 -+ if (!ismbblank (s + j, s_len - j, &mblength)) 18.3063 -+ break; 18.3064 -+ j += mblength; 18.3065 -+ } 18.3066 -+ 18.3067 -+ for (k = 0; j < s_len;) 18.3068 -+ { 18.3069 -+ mblength = mbrtowc (&wc, (s + j), (s_len - j), &state_mb); 18.3070 -+ assert (mblength != (size_t)-1 && mblength != (size_t)-2); 18.3071 -+ if (mblength == 0) 18.3072 -+ break; 18.3073 -+ 18.3074 -+ pwc = towupper (wc); 18.3075 -+ if (pwc == wc) 18.3076 -+ { 18.3077 -+ memcpy (mbc, s + j, mblength); 18.3078 -+ j += mblength; 18.3079 -+ } 18.3080 -+ else 18.3081 -+ { 18.3082 -+ j += mblength; 18.3083 -+ mblength = wcrtomb (mbc, pwc, &state_wc); 18.3084 -+ assert (mblength != (size_t)0 && mblength != (size_t)-1); 18.3085 -+ } 18.3086 -+ 18.3087 -+ for (l = 0; l < mblength; l++) 18.3088 -+ name[k++] = mbc[l]; 18.3089 -+ } 18.3090 -+ name[k] = '\0'; 18.3091 -+ } 18.3092 -+ qsort ((void *) monthtab, MONTHS_PER_YEAR, 18.3093 -+ sizeof (struct month), struct_month_cmp); 18.3094 -+ 18.3095 -+ if (lc_time && lc_ctype) 18.3096 -+ /* restore the original locales */ 18.3097 -+ setlocale (LC_CTYPE, lc_ctype); 18.3098 -+ 18.3099 -+ free (lc_ctype); 18.3100 -+ free (lc_time); 18.3101 -+} 18.3102 -+#endif 18.3103 -+ 18.3104 - /* Specify the amount of main memory to use when sorting. */ 18.3105 - static void 18.3106 - specify_sort_size (int oi, char c, char const *s) 18.3107 -@@ -1597,7 +1746,7 @@ buffer_linelim (struct buffer const *buf 18.3108 - by KEY in LINE. */ 18.3109 - 18.3110 - static char * 18.3111 --begfield (struct line const *line, struct keyfield const *key) 18.3112 -+begfield_uni (const struct line *line, const struct keyfield *key) 18.3113 - { 18.3114 - char *ptr = line->text, *lim = ptr + line->length - 1; 18.3115 - size_t sword = key->sword; 18.3116 -@@ -1606,10 +1755,10 @@ begfield (struct line const *line, struc 18.3117 - /* The leading field separator itself is included in a field when -t 18.3118 - is absent. */ 18.3119 - 18.3120 -- if (tab != TAB_DEFAULT) 18.3121 -+ if (tab_length) 18.3122 - while (ptr < lim && sword--) 18.3123 - { 18.3124 -- while (ptr < lim && *ptr != tab) 18.3125 -+ while (ptr < lim && *ptr != tab[0]) 18.3126 - ++ptr; 18.3127 - if (ptr < lim) 18.3128 - ++ptr; 18.3129 -@@ -1635,11 +1784,70 @@ begfield (struct line const *line, struc 18.3130 - return ptr; 18.3131 - } 18.3132 - 18.3133 -+#if HAVE_MBRTOWC 18.3134 -+static char * 18.3135 -+begfield_mb (const struct line *line, const struct keyfield *key) 18.3136 -+{ 18.3137 -+ int i; 18.3138 -+ char *ptr = line->text, *lim = ptr + line->length - 1; 18.3139 -+ size_t sword = key->sword; 18.3140 -+ size_t schar = key->schar; 18.3141 -+ size_t mblength; 18.3142 -+ mbstate_t state; 18.3143 -+ 18.3144 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.3145 -+ 18.3146 -+ if (tab_length) 18.3147 -+ while (ptr < lim && sword--) 18.3148 -+ { 18.3149 -+ while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) 18.3150 -+ { 18.3151 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3152 -+ ptr += mblength; 18.3153 -+ } 18.3154 -+ if (ptr < lim) 18.3155 -+ { 18.3156 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3157 -+ ptr += mblength; 18.3158 -+ } 18.3159 -+ } 18.3160 -+ else 18.3161 -+ while (ptr < lim && sword--) 18.3162 -+ { 18.3163 -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) 18.3164 -+ ptr += mblength; 18.3165 -+ if (ptr < lim) 18.3166 -+ { 18.3167 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3168 -+ ptr += mblength; 18.3169 -+ } 18.3170 -+ while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) 18.3171 -+ ptr += mblength; 18.3172 -+ } 18.3173 -+ 18.3174 -+ if (key->skipsblanks) 18.3175 -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) 18.3176 -+ ptr += mblength; 18.3177 -+ 18.3178 -+ for (i = 0; i < schar; i++) 18.3179 -+ { 18.3180 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3181 -+ 18.3182 -+ if (ptr + mblength > lim) 18.3183 -+ break; 18.3184 -+ else 18.3185 -+ ptr += mblength; 18.3186 -+ } 18.3187 -+ 18.3188 -+ return ptr; 18.3189 -+} 18.3190 -+#endif 18.3191 -+ 18.3192 - /* Return the limit of (a pointer to the first character after) the field 18.3193 - in LINE specified by KEY. */ 18.3194 - 18.3195 - static char * 18.3196 --limfield (struct line const *line, struct keyfield const *key) 18.3197 -+limfield_uni (const struct line *line, const struct keyfield *key) 18.3198 - { 18.3199 - char *ptr = line->text, *lim = ptr + line->length - 1; 18.3200 - size_t eword = key->eword, echar = key->echar; 18.3201 -@@ -1654,10 +1862,10 @@ limfield (struct line const *line, struc 18.3202 - 'beginning' is the first character following the delimiting TAB. 18.3203 - Otherwise, leave PTR pointing at the first 'blank' character after 18.3204 - the preceding field. */ 18.3205 -- if (tab != TAB_DEFAULT) 18.3206 -+ if (tab_length) 18.3207 - while (ptr < lim && eword--) 18.3208 - { 18.3209 -- while (ptr < lim && *ptr != tab) 18.3210 -+ while (ptr < lim && *ptr != tab[0]) 18.3211 - ++ptr; 18.3212 - if (ptr < lim && (eword || echar)) 18.3213 - ++ptr; 18.3214 -@@ -1703,10 +1911,10 @@ limfield (struct line const *line, struc 18.3215 - */ 18.3216 - 18.3217 - /* Make LIM point to the end of (one byte past) the current field. */ 18.3218 -- if (tab != TAB_DEFAULT) 18.3219 -+ if (tab_length) 18.3220 - { 18.3221 - char *newlim; 18.3222 -- newlim = memchr (ptr, tab, lim - ptr); 18.3223 -+ newlim = memchr (ptr, tab[0], lim - ptr); 18.3224 - if (newlim) 18.3225 - lim = newlim; 18.3226 - } 18.3227 -@@ -1737,6 +1945,130 @@ limfield (struct line const *line, struc 18.3228 - return ptr; 18.3229 - } 18.3230 - 18.3231 -+#if HAVE_MBRTOWC 18.3232 -+static char * 18.3233 -+limfield_mb (const struct line *line, const struct keyfield *key) 18.3234 -+{ 18.3235 -+ char *ptr = line->text, *lim = ptr + line->length - 1; 18.3236 -+ size_t eword = key->eword, echar = key->echar; 18.3237 -+ int i; 18.3238 -+ size_t mblength; 18.3239 -+ mbstate_t state; 18.3240 -+ 18.3241 -+ if (echar == 0) 18.3242 -+ eword++; /* skip all of end field. */ 18.3243 -+ 18.3244 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.3245 -+ 18.3246 -+ if (tab_length) 18.3247 -+ while (ptr < lim && eword--) 18.3248 -+ { 18.3249 -+ while (ptr < lim && memcmp (ptr, tab, tab_length) != 0) 18.3250 -+ { 18.3251 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3252 -+ ptr += mblength; 18.3253 -+ } 18.3254 -+ if (ptr < lim && (eword | echar)) 18.3255 -+ { 18.3256 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3257 -+ ptr += mblength; 18.3258 -+ } 18.3259 -+ } 18.3260 -+ else 18.3261 -+ while (ptr < lim && eword--) 18.3262 -+ { 18.3263 -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) 18.3264 -+ ptr += mblength; 18.3265 -+ if (ptr < lim) 18.3266 -+ { 18.3267 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3268 -+ ptr += mblength; 18.3269 -+ } 18.3270 -+ while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength)) 18.3271 -+ ptr += mblength; 18.3272 -+ } 18.3273 -+ 18.3274 -+ 18.3275 -+# ifdef POSIX_UNSPECIFIED 18.3276 -+ /* Make LIM point to the end of (one byte past) the current field. */ 18.3277 -+ if (tab_length) 18.3278 -+ { 18.3279 -+ char *newlim, *p; 18.3280 -+ 18.3281 -+ newlim = NULL; 18.3282 -+ for (p = ptr; p < lim;) 18.3283 -+ { 18.3284 -+ if (memcmp (p, tab, tab_length) == 0) 18.3285 -+ { 18.3286 -+ newlim = p; 18.3287 -+ break; 18.3288 -+ } 18.3289 -+ 18.3290 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3291 -+ p += mblength; 18.3292 -+ } 18.3293 -+ } 18.3294 -+ else 18.3295 -+ { 18.3296 -+ char *newlim; 18.3297 -+ newlim = ptr; 18.3298 -+ 18.3299 -+ while (newlim < lim && ismbblank (newlim, lim - newlim, &mblength)) 18.3300 -+ newlim += mblength; 18.3301 -+ if (ptr < lim) 18.3302 -+ { 18.3303 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3304 -+ ptr += mblength; 18.3305 -+ } 18.3306 -+ while (newlim < lim && !ismbblank (newlim, lim - newlim, &mblength)) 18.3307 -+ newlim += mblength; 18.3308 -+ lim = newlim; 18.3309 -+ } 18.3310 -+# endif 18.3311 -+ 18.3312 -+ if (echar != 0) 18.3313 -+ { 18.3314 -+ /* If we're skipping leading blanks, don't start counting characters 18.3315 -+ * until after skipping past any leading blanks. */ 18.3316 -+ if (key->skipeblanks) 18.3317 -+ while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength)) 18.3318 -+ ptr += mblength; 18.3319 -+ 18.3320 -+ memset (&state, '\0', sizeof(mbstate_t)); 18.3321 -+ 18.3322 -+ /* Advance PTR by ECHAR (if possible), but no further than LIM. */ 18.3323 -+ for (i = 0; i < echar; i++) 18.3324 -+ { 18.3325 -+ GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state); 18.3326 -+ 18.3327 -+ if (ptr + mblength > lim) 18.3328 -+ break; 18.3329 -+ else 18.3330 -+ ptr += mblength; 18.3331 -+ } 18.3332 -+ } 18.3333 -+ 18.3334 -+ return ptr; 18.3335 -+} 18.3336 -+#endif 18.3337 -+ 18.3338 -+static void 18.3339 -+skipblanks_uni (char **ptr, char *lim) 18.3340 -+{ 18.3341 -+ while (*ptr < lim && blanks[to_uchar (**ptr)]) 18.3342 -+ ++(*ptr); 18.3343 -+} 18.3344 -+ 18.3345 -+#if HAVE_MBRTOWC 18.3346 -+static void 18.3347 -+skipblanks_mb (char **ptr, char *lim) 18.3348 -+{ 18.3349 -+ size_t mblength; 18.3350 -+ while (*ptr < lim && ismbblank (*ptr, lim - *ptr, &mblength)) 18.3351 -+ (*ptr) += mblength; 18.3352 -+} 18.3353 -+#endif 18.3354 -+ 18.3355 - /* Fill BUF reading from FP, moving buf->left bytes from the end 18.3356 - of buf->buf to the beginning first. If EOF is reached and the 18.3357 - file wasn't terminated by a newline, supply one. Set up BUF's line 18.3358 -@@ -1823,8 +2155,22 @@ fillbuf (struct buffer *buf, FILE *fp, c 18.3359 - else 18.3360 - { 18.3361 - if (key->skipsblanks) 18.3362 -- while (blanks[to_uchar (*line_start)]) 18.3363 -- line_start++; 18.3364 -+ { 18.3365 -+#if HAVE_MBRTOWC 18.3366 -+ if (MB_CUR_MAX > 1) 18.3367 -+ { 18.3368 -+ size_t mblength; 18.3369 -+ while (line_start < line->keylim && 18.3370 -+ ismbblank (line_start, 18.3371 -+ line->keylim - line_start, 18.3372 -+ &mblength)) 18.3373 -+ line_start += mblength; 18.3374 -+ } 18.3375 -+ else 18.3376 -+#endif 18.3377 -+ while (blanks[to_uchar (*line_start)]) 18.3378 -+ line_start++; 18.3379 -+ } 18.3380 - line->keybeg = line_start; 18.3381 - } 18.3382 - } 18.3383 -@@ -1958,12 +2304,10 @@ find_unit_order (char const *number) 18.3384 - <none/unknown> < K/k < M < G < T < P < E < Z < Y */ 18.3385 - 18.3386 - static int 18.3387 --human_numcompare (char const *a, char const *b) 18.3388 -+human_numcompare (char *a, char *b) 18.3389 - { 18.3390 -- while (blanks[to_uchar (*a)]) 18.3391 -- a++; 18.3392 -- while (blanks[to_uchar (*b)]) 18.3393 -- b++; 18.3394 -+ skipblanks(&a, a + strlen(a)); 18.3395 -+ skipblanks(&b, b + strlen(b)); 18.3396 - 18.3397 - int diff = find_unit_order (a) - find_unit_order (b); 18.3398 - return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep)); 18.3399 -@@ -1974,7 +2318,7 @@ human_numcompare (char const *a, char co 18.3400 - hideously fast. */ 18.3401 - 18.3402 - static int 18.3403 --numcompare (char const *a, char const *b) 18.3404 -+numcompare_uni (const char *a, const char *b) 18.3405 - { 18.3406 - while (blanks[to_uchar (*a)]) 18.3407 - a++; 18.3408 -@@ -1984,6 +2328,25 @@ numcompare (char const *a, char const *b 18.3409 - return strnumcmp (a, b, decimal_point, thousands_sep); 18.3410 - } 18.3411 - 18.3412 -+#if HAVE_MBRTOWC 18.3413 -+static int 18.3414 -+numcompare_mb (const char *a, const char *b) 18.3415 -+{ 18.3416 -+ size_t mblength, len; 18.3417 -+ len = strlen (a); /* okay for UTF-8 */ 18.3418 -+ while (*a && ismbblank (a, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) 18.3419 -+ { 18.3420 -+ a += mblength; 18.3421 -+ len -= mblength; 18.3422 -+ } 18.3423 -+ len = strlen (b); /* okay for UTF-8 */ 18.3424 -+ while (*b && ismbblank (b, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength)) 18.3425 -+ b += mblength; 18.3426 -+ 18.3427 -+ return strnumcmp (a, b, decimal_point, thousands_sep); 18.3428 -+} 18.3429 -+#endif /* HAV_EMBRTOWC */ 18.3430 -+ 18.3431 - /* Work around a problem whereby the long double value returned by glibc's 18.3432 - strtold ("NaN", ...) contains uninitialized bits: clear all bytes of 18.3433 - A and B before calling strtold. FIXME: remove this function once 18.3434 -@@ -2034,7 +2397,7 @@ general_numcompare (char const *sa, char 18.3435 - Return 0 if the name in S is not recognized. */ 18.3436 - 18.3437 - static int 18.3438 --getmonth (char const *month, char **ea) 18.3439 -+getmonth_uni (char const *month, size_t len, char **ea) 18.3440 - { 18.3441 - size_t lo = 0; 18.3442 - size_t hi = MONTHS_PER_YEAR; 18.3443 -@@ -2310,15 +2673,14 @@ debug_key (struct line const *line, stru 18.3444 - char saved = *lim; 18.3445 - *lim = '\0'; 18.3446 - 18.3447 -- while (blanks[to_uchar (*beg)]) 18.3448 -- beg++; 18.3449 -+ skipblanks (&beg, lim); 18.3450 - 18.3451 - char *tighter_lim = beg; 18.3452 - 18.3453 - if (lim < beg) 18.3454 - tighter_lim = lim; 18.3455 - else if (key->month) 18.3456 -- getmonth (beg, &tighter_lim); 18.3457 -+ getmonth (beg, lim-beg, &tighter_lim); 18.3458 - else if (key->general_numeric) 18.3459 - ignore_value (strtold (beg, &tighter_lim)); 18.3460 - else if (key->numeric || key->human_numeric) 18.3461 -@@ -2452,7 +2814,7 @@ key_warnings (struct keyfield const *gke 18.3462 - /* Warn about significant leading blanks. */ 18.3463 - bool implicit_skip = key_numeric (key) || key->month; 18.3464 - bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ 18.3465 -- if (!zero_width && !gkey_only && tab == TAB_DEFAULT && !line_offset 18.3466 -+ if (!zero_width && !gkey_only && !tab_length && !line_offset 18.3467 - && ((!key->skipsblanks && !implicit_skip) 18.3468 - || (!key->skipsblanks && key->schar) 18.3469 - || (!key->skipeblanks && key->echar))) 18.3470 -@@ -2510,11 +2872,87 @@ key_warnings (struct keyfield const *gke 18.3471 - error (0, 0, _("option '-r' only applies to last-resort comparison")); 18.3472 - } 18.3473 - 18.3474 -+#if HAVE_MBRTOWC 18.3475 -+static int 18.3476 -+getmonth_mb (const char *s, size_t len, char **ea) 18.3477 -+{ 18.3478 -+ char *month; 18.3479 -+ register size_t i; 18.3480 -+ register int lo = 0, hi = MONTHS_PER_YEAR, result; 18.3481 -+ char *tmp; 18.3482 -+ size_t wclength, mblength; 18.3483 -+ const char *pp; 18.3484 -+ const wchar_t *wpp; 18.3485 -+ wchar_t *month_wcs; 18.3486 -+ mbstate_t state; 18.3487 -+ 18.3488 -+ while (len > 0 && ismbblank (s, len, &mblength)) 18.3489 -+ { 18.3490 -+ s += mblength; 18.3491 -+ len -= mblength; 18.3492 -+ } 18.3493 -+ 18.3494 -+ if (len == 0) 18.3495 -+ return 0; 18.3496 -+ 18.3497 -+ if (SIZE_MAX - len < 1) 18.3498 -+ xalloc_die (); 18.3499 -+ 18.3500 -+ month = (char *) xnmalloc (len + 1, MB_CUR_MAX); 18.3501 -+ 18.3502 -+ pp = tmp = (char *) xnmalloc (len + 1, MB_CUR_MAX); 18.3503 -+ memcpy (tmp, s, len); 18.3504 -+ tmp[len] = '\0'; 18.3505 -+ wpp = month_wcs = (wchar_t *) xnmalloc (len + 1, sizeof (wchar_t)); 18.3506 -+ memset (&state, '\0', sizeof (mbstate_t)); 18.3507 -+ 18.3508 -+ wclength = mbsrtowcs (month_wcs, &pp, len + 1, &state); 18.3509 -+ if (wclength == (size_t)-1 || pp != NULL) 18.3510 -+ error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s)); 18.3511 -+ 18.3512 -+ for (i = 0; i < wclength; i++) 18.3513 -+ { 18.3514 -+ month_wcs[i] = towupper(month_wcs[i]); 18.3515 -+ if (iswblank (month_wcs[i])) 18.3516 -+ { 18.3517 -+ month_wcs[i] = L'\0'; 18.3518 -+ break; 18.3519 -+ } 18.3520 -+ } 18.3521 -+ 18.3522 -+ mblength = wcsrtombs (month, &wpp, (len + 1) * MB_CUR_MAX, &state); 18.3523 -+ assert (mblength != (-1) && wpp == NULL); 18.3524 -+ 18.3525 -+ do 18.3526 -+ { 18.3527 -+ int ix = (lo + hi) / 2; 18.3528 -+ 18.3529 -+ if (strncmp (month, monthtab[ix].name, strlen (monthtab[ix].name)) < 0) 18.3530 -+ hi = ix; 18.3531 -+ else 18.3532 -+ lo = ix; 18.3533 -+ } 18.3534 -+ while (hi - lo > 1); 18.3535 -+ 18.3536 -+ result = (!strncmp (month, monthtab[lo].name, strlen (monthtab[lo].name)) 18.3537 -+ ? monthtab[lo].val : 0); 18.3538 -+ 18.3539 -+ if (ea && result) 18.3540 -+ *ea = (char*) s + strlen (monthtab[lo].name); 18.3541 -+ 18.3542 -+ free (month); 18.3543 -+ free (tmp); 18.3544 -+ free (month_wcs); 18.3545 -+ 18.3546 -+ return result; 18.3547 -+} 18.3548 -+#endif 18.3549 -+ 18.3550 - /* Compare two lines A and B trying every key in sequence until there 18.3551 - are no more keys or a difference is found. */ 18.3552 - 18.3553 - static int 18.3554 --keycompare (struct line const *a, struct line const *b) 18.3555 -+keycompare_uni (const struct line *a, const struct line *b) 18.3556 - { 18.3557 - struct keyfield *key = keylist; 18.3558 - 18.3559 -@@ -2599,7 +3037,7 @@ keycompare (struct line const *a, struct 18.3560 - else if (key->human_numeric) 18.3561 - diff = human_numcompare (ta, tb); 18.3562 - else if (key->month) 18.3563 -- diff = getmonth (ta, NULL) - getmonth (tb, NULL); 18.3564 -+ diff = getmonth (ta, tlena, NULL) - getmonth (tb, tlenb, NULL); 18.3565 - else if (key->random) 18.3566 - diff = compare_random (ta, tlena, tb, tlenb); 18.3567 - else if (key->version) 18.3568 -@@ -2715,6 +3153,211 @@ keycompare (struct line const *a, struct 18.3569 - return key->reverse ? -diff : diff; 18.3570 - } 18.3571 - 18.3572 -+#if HAVE_MBRTOWC 18.3573 -+static int 18.3574 -+keycompare_mb (const struct line *a, const struct line *b) 18.3575 -+{ 18.3576 -+ struct keyfield *key = keylist; 18.3577 -+ 18.3578 -+ /* For the first iteration only, the key positions have been 18.3579 -+ precomputed for us. */ 18.3580 -+ char *texta = a->keybeg; 18.3581 -+ char *textb = b->keybeg; 18.3582 -+ char *lima = a->keylim; 18.3583 -+ char *limb = b->keylim; 18.3584 -+ 18.3585 -+ size_t mblength_a, mblength_b; 18.3586 -+ wchar_t wc_a, wc_b; 18.3587 -+ mbstate_t state_a, state_b; 18.3588 -+ 18.3589 -+ int diff = 0; 18.3590 -+ 18.3591 -+ memset (&state_a, '\0', sizeof(mbstate_t)); 18.3592 -+ memset (&state_b, '\0', sizeof(mbstate_t)); 18.3593 -+ /* Ignore keys with start after end. */ 18.3594 -+ if (a->keybeg - a->keylim > 0) 18.3595 -+ return 0; 18.3596 -+ 18.3597 -+ 18.3598 -+ /* Ignore and/or translate chars before comparing. */ 18.3599 -+# define IGNORE_CHARS(NEW_LEN, LEN, TEXT, COPY, WC, MBLENGTH, STATE) \ 18.3600 -+ do \ 18.3601 -+ { \ 18.3602 -+ wchar_t uwc; \ 18.3603 -+ char mbc[MB_LEN_MAX]; \ 18.3604 -+ mbstate_t state_wc; \ 18.3605 -+ \ 18.3606 -+ for (NEW_LEN = i = 0; i < LEN;) \ 18.3607 -+ { \ 18.3608 -+ mbstate_t state_bak; \ 18.3609 -+ \ 18.3610 -+ state_bak = STATE; \ 18.3611 -+ MBLENGTH = mbrtowc (&WC, TEXT + i, LEN - i, &STATE); \ 18.3612 -+ \ 18.3613 -+ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1 \ 18.3614 -+ || MBLENGTH == 0) \ 18.3615 -+ { \ 18.3616 -+ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \ 18.3617 -+ STATE = state_bak; \ 18.3618 -+ if (!ignore) \ 18.3619 -+ COPY[NEW_LEN++] = TEXT[i]; \ 18.3620 -+ i++; \ 18.3621 -+ continue; \ 18.3622 -+ } \ 18.3623 -+ \ 18.3624 -+ if (ignore) \ 18.3625 -+ { \ 18.3626 -+ if ((ignore == nonprinting && !iswprint (WC)) \ 18.3627 -+ || (ignore == nondictionary \ 18.3628 -+ && !iswalnum (WC) && !iswblank (WC))) \ 18.3629 -+ { \ 18.3630 -+ i += MBLENGTH; \ 18.3631 -+ continue; \ 18.3632 -+ } \ 18.3633 -+ } \ 18.3634 -+ \ 18.3635 -+ if (translate) \ 18.3636 -+ { \ 18.3637 -+ \ 18.3638 -+ uwc = towupper(WC); \ 18.3639 -+ if (WC == uwc) \ 18.3640 -+ { \ 18.3641 -+ memcpy (mbc, TEXT + i, MBLENGTH); \ 18.3642 -+ i += MBLENGTH; \ 18.3643 -+ } \ 18.3644 -+ else \ 18.3645 -+ { \ 18.3646 -+ i += MBLENGTH; \ 18.3647 -+ WC = uwc; \ 18.3648 -+ memset (&state_wc, '\0', sizeof (mbstate_t)); \ 18.3649 -+ \ 18.3650 -+ MBLENGTH = wcrtomb (mbc, WC, &state_wc); \ 18.3651 -+ assert (MBLENGTH != (size_t)-1 && MBLENGTH != 0); \ 18.3652 -+ } \ 18.3653 -+ \ 18.3654 -+ for (j = 0; j < MBLENGTH; j++) \ 18.3655 -+ COPY[NEW_LEN++] = mbc[j]; \ 18.3656 -+ } \ 18.3657 -+ else \ 18.3658 -+ for (j = 0; j < MBLENGTH; j++) \ 18.3659 -+ COPY[NEW_LEN++] = TEXT[i++]; \ 18.3660 -+ } \ 18.3661 -+ COPY[NEW_LEN] = '\0'; \ 18.3662 -+ } \ 18.3663 -+ while (0) 18.3664 -+ 18.3665 -+ /* Actually compare the fields. */ 18.3666 -+ 18.3667 -+ for (;;) 18.3668 -+ { 18.3669 -+ /* Find the lengths. */ 18.3670 -+ size_t lena = lima <= texta ? 0 : lima - texta; 18.3671 -+ size_t lenb = limb <= textb ? 0 : limb - textb; 18.3672 -+ 18.3673 -+ char enda IF_LINT (= 0); 18.3674 -+ char endb IF_LINT (= 0); 18.3675 -+ 18.3676 -+ char const *translate = key->translate; 18.3677 -+ bool const *ignore = key->ignore; 18.3678 -+ 18.3679 -+ if (ignore || translate) 18.3680 -+ { 18.3681 -+ if (SIZE_MAX - lenb - 2 < lena) 18.3682 -+ xalloc_die (); 18.3683 -+ char *copy_a = (char *) xnmalloc (lena + lenb + 2, MB_CUR_MAX); 18.3684 -+ char *copy_b = copy_a + lena * MB_CUR_MAX + 1; 18.3685 -+ size_t new_len_a, new_len_b; 18.3686 -+ size_t i, j; 18.3687 -+ 18.3688 -+ IGNORE_CHARS (new_len_a, lena, texta, copy_a, 18.3689 -+ wc_a, mblength_a, state_a); 18.3690 -+ IGNORE_CHARS (new_len_b, lenb, textb, copy_b, 18.3691 -+ wc_b, mblength_b, state_b); 18.3692 -+ texta = copy_a; textb = copy_b; 18.3693 -+ lena = new_len_a; lenb = new_len_b; 18.3694 -+ } 18.3695 -+ else 18.3696 -+ { 18.3697 -+ /* Use the keys in-place, temporarily null-terminated. */ 18.3698 -+ enda = texta[lena]; texta[lena] = '\0'; 18.3699 -+ endb = textb[lenb]; textb[lenb] = '\0'; 18.3700 -+ } 18.3701 -+ 18.3702 -+ if (key->random) 18.3703 -+ diff = compare_random (texta, lena, textb, lenb); 18.3704 -+ else if (key->numeric | key->general_numeric | key->human_numeric) 18.3705 -+ { 18.3706 -+ char savea = *lima, saveb = *limb; 18.3707 -+ 18.3708 -+ *lima = *limb = '\0'; 18.3709 -+ diff = (key->numeric ? numcompare (texta, textb) 18.3710 -+ : key->general_numeric ? general_numcompare (texta, textb) 18.3711 -+ : human_numcompare (texta, textb)); 18.3712 -+ *lima = savea, *limb = saveb; 18.3713 -+ } 18.3714 -+ else if (key->version) 18.3715 -+ diff = filevercmp (texta, textb); 18.3716 -+ else if (key->month) 18.3717 -+ diff = getmonth (texta, lena, NULL) - getmonth (textb, lenb, NULL); 18.3718 -+ else if (lena == 0) 18.3719 -+ diff = - NONZERO (lenb); 18.3720 -+ else if (lenb == 0) 18.3721 -+ diff = 1; 18.3722 -+ else if (hard_LC_COLLATE && !folding) 18.3723 -+ { 18.3724 -+ diff = xmemcoll0 (texta, lena + 1, textb, lenb + 1); 18.3725 -+ } 18.3726 -+ else 18.3727 -+ { 18.3728 -+ diff = memcmp (texta, textb, MIN (lena, lenb)); 18.3729 -+ if (diff == 0) 18.3730 -+ diff = lena < lenb ? -1 : lena != lenb; 18.3731 -+ } 18.3732 -+ 18.3733 -+ if (ignore || translate) 18.3734 -+ free (texta); 18.3735 -+ else 18.3736 -+ { 18.3737 -+ texta[lena] = enda; 18.3738 -+ textb[lenb] = endb; 18.3739 -+ } 18.3740 -+ 18.3741 -+ if (diff) 18.3742 -+ goto not_equal; 18.3743 -+ 18.3744 -+ key = key->next; 18.3745 -+ if (! key) 18.3746 -+ break; 18.3747 -+ 18.3748 -+ /* Find the beginning and limit of the next field. */ 18.3749 -+ if (key->eword != -1) 18.3750 -+ lima = limfield (a, key), limb = limfield (b, key); 18.3751 -+ else 18.3752 -+ lima = a->text + a->length - 1, limb = b->text + b->length - 1; 18.3753 -+ 18.3754 -+ if (key->sword != -1) 18.3755 -+ texta = begfield (a, key), textb = begfield (b, key); 18.3756 -+ else 18.3757 -+ { 18.3758 -+ texta = a->text, textb = b->text; 18.3759 -+ if (key->skipsblanks) 18.3760 -+ { 18.3761 -+ while (texta < lima && ismbblank (texta, lima - texta, &mblength_a)) 18.3762 -+ texta += mblength_a; 18.3763 -+ while (textb < limb && ismbblank (textb, limb - textb, &mblength_b)) 18.3764 -+ textb += mblength_b; 18.3765 -+ } 18.3766 -+ } 18.3767 -+ } 18.3768 -+ 18.3769 -+not_equal: 18.3770 -+ if (key && key->reverse) 18.3771 -+ return -diff; 18.3772 -+ else 18.3773 -+ return diff; 18.3774 -+} 18.3775 -+#endif 18.3776 -+ 18.3777 - /* Compare two lines A and B, returning negative, zero, or positive 18.3778 - depending on whether A compares less than, equal to, or greater than B. */ 18.3779 - 18.3780 -@@ -2742,7 +3385,7 @@ compare (struct line const *a, struct li 18.3781 - diff = - NONZERO (blen); 18.3782 - else if (blen == 0) 18.3783 - diff = 1; 18.3784 -- else if (hard_LC_COLLATE) 18.3785 -+ else if (hard_LC_COLLATE && !folding) 18.3786 - { 18.3787 - /* Note xmemcoll0 is a performance enhancement as 18.3788 - it will not unconditionally write '\0' after the 18.3789 -@@ -4139,6 +4782,7 @@ set_ordering (char const *s, struct keyf 18.3790 - break; 18.3791 - case 'f': 18.3792 - key->translate = fold_toupper; 18.3793 -+ folding = true; 18.3794 - break; 18.3795 - case 'g': 18.3796 - key->general_numeric = true; 18.3797 -@@ -4218,7 +4862,7 @@ main (int argc, char **argv) 18.3798 - initialize_exit_failure (SORT_FAILURE); 18.3799 - 18.3800 - hard_LC_COLLATE = hard_locale (LC_COLLATE); 18.3801 --#if HAVE_NL_LANGINFO 18.3802 -+#if HAVE_LANGINFO_CODESET 18.3803 - hard_LC_TIME = hard_locale (LC_TIME); 18.3804 - #endif 18.3805 - 18.3806 -@@ -4239,6 +4883,29 @@ main (int argc, char **argv) 18.3807 - thousands_sep = -1; 18.3808 - } 18.3809 - 18.3810 -+#if HAVE_MBRTOWC 18.3811 -+ if (MB_CUR_MAX > 1) 18.3812 -+ { 18.3813 -+ inittables = inittables_mb; 18.3814 -+ begfield = begfield_mb; 18.3815 -+ limfield = limfield_mb; 18.3816 -+ skipblanks = skipblanks_mb; 18.3817 -+ getmonth = getmonth_mb; 18.3818 -+ keycompare = keycompare_mb; 18.3819 -+ numcompare = numcompare_mb; 18.3820 -+ } 18.3821 -+ else 18.3822 -+#endif 18.3823 -+ { 18.3824 -+ inittables = inittables_uni; 18.3825 -+ begfield = begfield_uni; 18.3826 -+ limfield = limfield_uni; 18.3827 -+ skipblanks = skipblanks_uni; 18.3828 -+ getmonth = getmonth_uni; 18.3829 -+ keycompare = keycompare_uni; 18.3830 -+ numcompare = numcompare_uni; 18.3831 -+ } 18.3832 -+ 18.3833 - have_read_stdin = false; 18.3834 - inittables (); 18.3835 - 18.3836 -@@ -4513,13 +5180,34 @@ main (int argc, char **argv) 18.3837 - 18.3838 - case 't': 18.3839 - { 18.3840 -- char newtab = optarg[0]; 18.3841 -- if (! newtab) 18.3842 -+ char newtab[MB_LEN_MAX + 1]; 18.3843 -+ size_t newtab_length = 1; 18.3844 -+ strncpy (newtab, optarg, MB_LEN_MAX); 18.3845 -+ if (! newtab[0]) 18.3846 - die (SORT_FAILURE, 0, _("empty tab")); 18.3847 -- if (optarg[1]) 18.3848 -+#if HAVE_MBRTOWC 18.3849 -+ if (MB_CUR_MAX > 1) 18.3850 -+ { 18.3851 -+ wchar_t wc; 18.3852 -+ mbstate_t state; 18.3853 -+ 18.3854 -+ memset (&state, '\0', sizeof (mbstate_t)); 18.3855 -+ newtab_length = mbrtowc (&wc, newtab, strnlen (newtab, 18.3856 -+ MB_LEN_MAX), 18.3857 -+ &state); 18.3858 -+ switch (newtab_length) 18.3859 -+ { 18.3860 -+ case (size_t) -1: 18.3861 -+ case (size_t) -2: 18.3862 -+ case 0: 18.3863 -+ newtab_length = 1; 18.3864 -+ } 18.3865 -+ } 18.3866 -+#endif 18.3867 -+ if (newtab_length == 1 && optarg[1]) 18.3868 - { 18.3869 - if (STREQ (optarg, "\\0")) 18.3870 -- newtab = '\0'; 18.3871 -+ newtab[0] = '\0'; 18.3872 - else 18.3873 - { 18.3874 - /* Provoke with 'sort -txx'. Complain about 18.3875 -@@ -4530,9 +5218,11 @@ main (int argc, char **argv) 18.3876 - quote (optarg)); 18.3877 - } 18.3878 - } 18.3879 -- if (tab != TAB_DEFAULT && tab != newtab) 18.3880 -+ if (tab_length && (tab_length != newtab_length 18.3881 -+ || memcmp (tab, newtab, tab_length) != 0)) 18.3882 - die (SORT_FAILURE, 0, _("incompatible tabs")); 18.3883 -- tab = newtab; 18.3884 -+ memcpy (tab, newtab, newtab_length); 18.3885 -+ tab_length = newtab_length; 18.3886 - } 18.3887 - break; 18.3888 - 18.3889 -@@ -4770,12 +5460,10 @@ main (int argc, char **argv) 18.3890 - sort (files, nfiles, outfile, nthreads); 18.3891 - } 18.3892 - 18.3893 --#ifdef lint 18.3894 - if (files_from) 18.3895 - readtokens0_free (&tok); 18.3896 - else 18.3897 - free (files); 18.3898 --#endif 18.3899 - 18.3900 - if (have_read_stdin && fclose (stdin) == EOF) 18.3901 - sort_die (_("close failed"), "-"); 18.3902 -diff -Naurp coreutils-8.27-orig/src/unexpand.c coreutils-8.27/src/unexpand.c 18.3903 ---- coreutils-8.27-orig/src/unexpand.c 2017-01-01 16:34:24.000000000 -0600 18.3904 -+++ coreutils-8.27/src/unexpand.c 2017-03-11 23:49:06.758133530 -0600 18.3905 -@@ -38,6 +38,9 @@ 18.3906 - #include <stdio.h> 18.3907 - #include <getopt.h> 18.3908 - #include <sys/types.h> 18.3909 -+ 18.3910 -+#include <mbfile.h> 18.3911 -+ 18.3912 - #include "system.h" 18.3913 - #include "die.h" 18.3914 - #include "xstrndup.h" 18.3915 -@@ -107,24 +110,47 @@ unexpand (void) 18.3916 - { 18.3917 - /* Input stream. */ 18.3918 - FILE *fp = next_file (NULL); 18.3919 -+ mb_file_t mbf; 18.3920 - 18.3921 - /* The array of pending blanks. In non-POSIX locales, blanks can 18.3922 - include characters other than spaces, so the blanks must be 18.3923 - stored, not merely counted. */ 18.3924 -- char *pending_blank; 18.3925 -+ mbf_char_t *pending_blank; 18.3926 -+ /* True if the starting locale is utf8. */ 18.3927 -+ bool using_utf_locale; 18.3928 -+ 18.3929 -+ /* True if the first file contains BOM header. */ 18.3930 -+ bool found_bom; 18.3931 -+ using_utf_locale=check_utf_locale(); 18.3932 - 18.3933 - if (!fp) 18.3934 - return; 18.3935 -+ mbf_init (mbf, fp); 18.3936 -+ found_bom=check_bom(fp,&mbf); 18.3937 - 18.3938 -+ if (using_utf_locale == false && found_bom == true) 18.3939 -+ { 18.3940 -+ /*try using some predefined locale */ 18.3941 -+ 18.3942 -+ if (set_utf_locale () != 0) 18.3943 -+ { 18.3944 -+ error (EXIT_FAILURE, errno, _("cannot set UTF-8 locale")); 18.3945 -+ } 18.3946 -+ } 18.3947 - /* The worst case is a non-blank character, then one blank, then a 18.3948 - tab stop, then MAX_COLUMN_WIDTH - 1 blanks, then a non-blank; so 18.3949 - allocate MAX_COLUMN_WIDTH bytes to store the blanks. */ 18.3950 -- pending_blank = xmalloc (max_column_width); 18.3951 -+ pending_blank = xmalloc (max_column_width * sizeof (mbf_char_t)); 18.3952 -+ 18.3953 -+ if (found_bom == true) 18.3954 -+ { 18.3955 -+ print_bom(); 18.3956 -+ } 18.3957 - 18.3958 - while (true) 18.3959 - { 18.3960 - /* Input character, or EOF. */ 18.3961 -- int c; 18.3962 -+ mbf_char_t c; 18.3963 - 18.3964 - /* If true, perform translations. */ 18.3965 - bool convert = true; 18.3966 -@@ -158,12 +184,44 @@ unexpand (void) 18.3967 - 18.3968 - do 18.3969 - { 18.3970 -- while ((c = getc (fp)) < 0 && (fp = next_file (fp))) 18.3971 -- continue; 18.3972 -+ while (true) { 18.3973 -+ mbf_getc (c, mbf); 18.3974 -+ if ((mb_iseof (c)) && (fp = next_file (fp))) 18.3975 -+ { 18.3976 -+ mbf_init (mbf, fp); 18.3977 -+ if (fp!=NULL) 18.3978 -+ { 18.3979 -+ if (check_bom(fp,&mbf)==true) 18.3980 -+ { 18.3981 -+ /*Not the first file - check BOM header*/ 18.3982 -+ if (using_utf_locale==false && found_bom==false) 18.3983 -+ { 18.3984 -+ /*BOM header in subsequent file but not in the first one. */ 18.3985 -+ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); 18.3986 -+ } 18.3987 -+ } 18.3988 -+ else 18.3989 -+ { 18.3990 -+ if(using_utf_locale==false && found_bom==true) 18.3991 -+ { 18.3992 -+ /*First file conatined BOM header - locale was switched to UTF 18.3993 -+ /*all subsequent files should contain BOM. */ 18.3994 -+ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header")); 18.3995 -+ } 18.3996 -+ } 18.3997 -+ } 18.3998 -+ continue; 18.3999 -+ } 18.4000 -+ else 18.4001 -+ { 18.4002 -+ break; 18.4003 -+ } 18.4004 -+ } 18.4005 -+ 18.4006 - 18.4007 - if (convert) 18.4008 - { 18.4009 -- bool blank = !! isblank (c); 18.4010 -+ bool blank = mb_isblank (c); 18.4011 - 18.4012 - if (blank) 18.4013 - { 18.4014 -@@ -180,16 +238,16 @@ unexpand (void) 18.4015 - if (next_tab_column < column) 18.4016 - die (EXIT_FAILURE, 0, _("input line is too long")); 18.4017 - 18.4018 -- if (c == '\t') 18.4019 -+ if (mb_iseq (c, '\t')) 18.4020 - { 18.4021 - column = next_tab_column; 18.4022 - 18.4023 - if (pending) 18.4024 -- pending_blank[0] = '\t'; 18.4025 -+ mb_setascii (&pending_blank[0], '\t'); 18.4026 - } 18.4027 - else 18.4028 - { 18.4029 -- column++; 18.4030 -+ column += mb_width (c); 18.4031 - 18.4032 - if (! (prev_blank && column == next_tab_column)) 18.4033 - { 18.4034 -@@ -197,13 +255,14 @@ unexpand (void) 18.4035 - will be replaced by tabs. */ 18.4036 - if (column == next_tab_column) 18.4037 - one_blank_before_tab_stop = true; 18.4038 -- pending_blank[pending++] = c; 18.4039 -+ mb_copy (&pending_blank[pending++], &c); 18.4040 - prev_blank = true; 18.4041 - continue; 18.4042 - } 18.4043 - 18.4044 - /* Replace the pending blanks by a tab or two. */ 18.4045 -- pending_blank[0] = c = '\t'; 18.4046 -+ mb_setascii (&c, '\t'); 18.4047 -+ mb_setascii (&pending_blank[0], '\t'); 18.4048 - } 18.4049 - 18.4050 - /* Discard pending blanks, unless it was a single 18.4051 -@@ -211,7 +270,7 @@ unexpand (void) 18.4052 - pending = one_blank_before_tab_stop; 18.4053 - } 18.4054 - } 18.4055 -- else if (c == '\b') 18.4056 -+ else if (mb_iseq (c, '\b')) 18.4057 - { 18.4058 - /* Go back one column, and force recalculation of the 18.4059 - next tab stop. */ 18.4060 -@@ -219,9 +278,9 @@ unexpand (void) 18.4061 - next_tab_column = column; 18.4062 - tab_index -= !!tab_index; 18.4063 - } 18.4064 -- else 18.4065 -+ else if (!mb_iseq (c, '\n')) 18.4066 - { 18.4067 -- column++; 18.4068 -+ column += mb_width (c); 18.4069 - if (!column) 18.4070 - die (EXIT_FAILURE, 0, _("input line is too long")); 18.4071 - } 18.4072 -@@ -229,8 +288,11 @@ unexpand (void) 18.4073 - if (pending) 18.4074 - { 18.4075 - if (pending > 1 && one_blank_before_tab_stop) 18.4076 -- pending_blank[0] = '\t'; 18.4077 -- if (fwrite (pending_blank, 1, pending, stdout) != pending) 18.4078 -+ mb_setascii (&pending_blank[0], '\t'); 18.4079 -+ 18.4080 -+ for (int n = 0; n < pending; ++n) 18.4081 -+ mb_putc (pending_blank[n], stdout); 18.4082 -+ if (ferror (stdout)) 18.4083 - die (EXIT_FAILURE, errno, _("write error")); 18.4084 - pending = 0; 18.4085 - one_blank_before_tab_stop = false; 18.4086 -@@ -240,16 +302,17 @@ unexpand (void) 18.4087 - convert &= convert_entire_line || blank; 18.4088 - } 18.4089 - 18.4090 -- if (c < 0) 18.4091 -+ if (mb_iseof (c)) 18.4092 - { 18.4093 - free (pending_blank); 18.4094 - return; 18.4095 - } 18.4096 - 18.4097 -- if (putchar (c) < 0) 18.4098 -+ mb_putc (c, stdout); 18.4099 -+ if (ferror (stdout)) 18.4100 - die (EXIT_FAILURE, errno, _("write error")); 18.4101 - } 18.4102 -- while (c != '\n'); 18.4103 -+ while (!mb_iseq (c, '\n')); 18.4104 - } 18.4105 - } 18.4106 - 18.4107 -diff -Naurp coreutils-8.27-orig/src/uniq.c coreutils-8.27/src/uniq.c 18.4108 ---- coreutils-8.27-orig/src/uniq.c 2017-01-01 16:34:24.000000000 -0600 18.4109 -+++ coreutils-8.27/src/uniq.c 2017-03-11 23:47:13.098285938 -0600 18.4110 -@@ -21,6 +21,17 @@ 18.4111 - #include <getopt.h> 18.4112 - #include <sys/types.h> 18.4113 - 18.4114 -+/* Get mbstate_t, mbrtowc(). */ 18.4115 -+#if HAVE_WCHAR_H 18.4116 -+# include <wchar.h> 18.4117 -+#endif 18.4118 -+ 18.4119 -+/* Get isw* functions. */ 18.4120 -+#if HAVE_WCTYPE_H 18.4121 -+# include <wctype.h> 18.4122 -+#endif 18.4123 -+#include <assert.h> 18.4124 -+ 18.4125 - #include "system.h" 18.4126 - #include "argmatch.h" 18.4127 - #include "linebuffer.h" 18.4128 -@@ -32,9 +43,21 @@ 18.4129 - #include "stdio--.h" 18.4130 - #include "xmemcoll.h" 18.4131 - #include "xstrtol.h" 18.4132 --#include "memcasecmp.h" 18.4133 -+#include "xmemcoll.h" 18.4134 - #include "quote.h" 18.4135 - 18.4136 -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC 18.4137 -+ installation; work around this configuration error. */ 18.4138 -+#if !defined MB_LEN_MAX || MB_LEN_MAX < 2 18.4139 -+# define MB_LEN_MAX 16 18.4140 -+#endif 18.4141 -+ 18.4142 -+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ 18.4143 -+#if HAVE_MBRTOWC && defined mbstate_t 18.4144 -+# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) 18.4145 -+#endif 18.4146 -+ 18.4147 -+ 18.4148 - /* The official name of this program (e.g., no 'g' prefix). */ 18.4149 - #define PROGRAM_NAME "uniq" 18.4150 - 18.4151 -@@ -144,6 +167,10 @@ enum 18.4152 - GROUP_OPTION = CHAR_MAX + 1 18.4153 - }; 18.4154 - 18.4155 -+/* Function pointers. */ 18.4156 -+static char * 18.4157 -+(*find_field) (struct linebuffer *line); 18.4158 -+ 18.4159 - static struct option const longopts[] = 18.4160 - { 18.4161 - {"count", no_argument, NULL, 'c'}, 18.4162 -@@ -260,7 +287,7 @@ size_opt (char const *opt, char const *m 18.4163 - return a pointer to the beginning of the line's field to be compared. */ 18.4164 - 18.4165 - static char * _GL_ATTRIBUTE_PURE 18.4166 --find_field (struct linebuffer const *line) 18.4167 -+find_field_uni (struct linebuffer *line) 18.4168 - { 18.4169 - size_t count; 18.4170 - char const *lp = line->buffer; 18.4171 -@@ -280,6 +307,83 @@ find_field (struct linebuffer const *lin 18.4172 - return line->buffer + i; 18.4173 - } 18.4174 - 18.4175 -+#if HAVE_MBRTOWC 18.4176 -+ 18.4177 -+# define MBCHAR_TO_WCHAR(WC, MBLENGTH, LP, POS, SIZE, STATEP, CONVFAIL) \ 18.4178 -+ do \ 18.4179 -+ { \ 18.4180 -+ mbstate_t state_bak; \ 18.4181 -+ \ 18.4182 -+ CONVFAIL = 0; \ 18.4183 -+ state_bak = *STATEP; \ 18.4184 -+ \ 18.4185 -+ MBLENGTH = mbrtowc (&WC, LP + POS, SIZE - POS, STATEP); \ 18.4186 -+ \ 18.4187 -+ switch (MBLENGTH) \ 18.4188 -+ { \ 18.4189 -+ case (size_t)-2: \ 18.4190 -+ case (size_t)-1: \ 18.4191 -+ *STATEP = state_bak; \ 18.4192 -+ CONVFAIL++; \ 18.4193 -+ /* Fall through */ \ 18.4194 -+ case 0: \ 18.4195 -+ MBLENGTH = 1; \ 18.4196 -+ } \ 18.4197 -+ } \ 18.4198 -+ while (0) 18.4199 -+ 18.4200 -+static char * 18.4201 -+find_field_multi (struct linebuffer *line) 18.4202 -+{ 18.4203 -+ size_t count; 18.4204 -+ char *lp = line->buffer; 18.4205 -+ size_t size = line->length - 1; 18.4206 -+ size_t pos; 18.4207 -+ size_t mblength; 18.4208 -+ wchar_t wc; 18.4209 -+ mbstate_t *statep; 18.4210 -+ int convfail = 0; 18.4211 -+ 18.4212 -+ pos = 0; 18.4213 -+ statep = &(line->state); 18.4214 -+ 18.4215 -+ /* skip fields. */ 18.4216 -+ for (count = 0; count < skip_fields && pos < size; count++) 18.4217 -+ { 18.4218 -+ while (pos < size) 18.4219 -+ { 18.4220 -+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); 18.4221 -+ 18.4222 -+ if (convfail || !(iswblank (wc) || wc == '\n')) 18.4223 -+ { 18.4224 -+ pos += mblength; 18.4225 -+ break; 18.4226 -+ } 18.4227 -+ pos += mblength; 18.4228 -+ } 18.4229 -+ 18.4230 -+ while (pos < size) 18.4231 -+ { 18.4232 -+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); 18.4233 -+ 18.4234 -+ if (!convfail && (iswblank (wc) || wc == '\n')) 18.4235 -+ break; 18.4236 -+ 18.4237 -+ pos += mblength; 18.4238 -+ } 18.4239 -+ } 18.4240 -+ 18.4241 -+ /* skip fields. */ 18.4242 -+ for (count = 0; count < skip_chars && pos < size; count++) 18.4243 -+ { 18.4244 -+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); 18.4245 -+ pos += mblength; 18.4246 -+ } 18.4247 -+ 18.4248 -+ return lp + pos; 18.4249 -+} 18.4250 -+#endif 18.4251 -+ 18.4252 - /* Return false if two strings OLD and NEW match, true if not. 18.4253 - OLD and NEW point not to the beginnings of the lines 18.4254 - but rather to the beginnings of the fields to compare. 18.4255 -@@ -288,6 +392,8 @@ find_field (struct linebuffer const *lin 18.4256 - static bool 18.4257 - different (char *old, char *new, size_t oldlen, size_t newlen) 18.4258 - { 18.4259 -+ char *copy_old, *copy_new; 18.4260 -+ 18.4261 - if (check_chars < oldlen) 18.4262 - oldlen = check_chars; 18.4263 - if (check_chars < newlen) 18.4264 -@@ -295,14 +401,103 @@ different (char *old, char *new, size_t 18.4265 - 18.4266 - if (ignore_case) 18.4267 - { 18.4268 -- /* FIXME: This should invoke strcoll somehow. */ 18.4269 -- return oldlen != newlen || memcasecmp (old, new, oldlen); 18.4270 -+ size_t i; 18.4271 -+ 18.4272 -+ copy_old = xmalloc (oldlen + 1); 18.4273 -+ copy_new = xmalloc (oldlen + 1); 18.4274 -+ 18.4275 -+ for (i = 0; i < oldlen; i++) 18.4276 -+ { 18.4277 -+ copy_old[i] = toupper (old[i]); 18.4278 -+ copy_new[i] = toupper (new[i]); 18.4279 -+ } 18.4280 -+ bool rc = xmemcoll (copy_old, oldlen, copy_new, newlen); 18.4281 -+ free (copy_old); 18.4282 -+ free (copy_new); 18.4283 -+ return rc; 18.4284 - } 18.4285 -- else if (hard_LC_COLLATE) 18.4286 -- return xmemcoll (old, oldlen, new, newlen) != 0; 18.4287 - else 18.4288 -- return oldlen != newlen || memcmp (old, new, oldlen); 18.4289 -+ { 18.4290 -+ copy_old = (char *)old; 18.4291 -+ copy_new = (char *)new; 18.4292 -+ } 18.4293 -+ 18.4294 -+ return xmemcoll (copy_old, oldlen, copy_new, newlen); 18.4295 -+ 18.4296 -+} 18.4297 -+ 18.4298 -+#if HAVE_MBRTOWC 18.4299 -+static int 18.4300 -+different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate) 18.4301 -+{ 18.4302 -+ size_t i, j, chars; 18.4303 -+ const char *str[2]; 18.4304 -+ char *copy[2]; 18.4305 -+ size_t len[2]; 18.4306 -+ mbstate_t state[2]; 18.4307 -+ size_t mblength; 18.4308 -+ wchar_t wc, uwc; 18.4309 -+ mbstate_t state_bak; 18.4310 -+ 18.4311 -+ str[0] = old; 18.4312 -+ str[1] = new; 18.4313 -+ len[0] = oldlen; 18.4314 -+ len[1] = newlen; 18.4315 -+ state[0] = oldstate; 18.4316 -+ state[1] = newstate; 18.4317 -+ 18.4318 -+ for (i = 0; i < 2; i++) 18.4319 -+ { 18.4320 -+ copy[i] = xmalloc (len[i] + 1); 18.4321 -+ memset (copy[i], '\0', len[i] + 1); 18.4322 -+ 18.4323 -+ for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++) 18.4324 -+ { 18.4325 -+ state_bak = state[i]; 18.4326 -+ mblength = mbrtowc (&wc, str[i] + j, len[i] - j, &(state[i])); 18.4327 -+ 18.4328 -+ switch (mblength) 18.4329 -+ { 18.4330 -+ case (size_t)-1: 18.4331 -+ case (size_t)-2: 18.4332 -+ state[i] = state_bak; 18.4333 -+ /* Fall through */ 18.4334 -+ case 0: 18.4335 -+ mblength = 1; 18.4336 -+ break; 18.4337 -+ 18.4338 -+ default: 18.4339 -+ if (ignore_case) 18.4340 -+ { 18.4341 -+ uwc = towupper (wc); 18.4342 -+ 18.4343 -+ if (uwc != wc) 18.4344 -+ { 18.4345 -+ mbstate_t state_wc; 18.4346 -+ size_t mblen; 18.4347 -+ 18.4348 -+ memset (&state_wc, '\0', sizeof(mbstate_t)); 18.4349 -+ mblen = wcrtomb (copy[i] + j, uwc, &state_wc); 18.4350 -+ assert (mblen != (size_t)-1); 18.4351 -+ } 18.4352 -+ else 18.4353 -+ memcpy (copy[i] + j, str[i] + j, mblength); 18.4354 -+ } 18.4355 -+ else 18.4356 -+ memcpy (copy[i] + j, str[i] + j, mblength); 18.4357 -+ } 18.4358 -+ j += mblength; 18.4359 -+ } 18.4360 -+ copy[i][j] = '\0'; 18.4361 -+ len[i] = j; 18.4362 -+ } 18.4363 -+ int rc = xmemcoll (copy[0], len[0], copy[1], len[1]); 18.4364 -+ free (copy[0]); 18.4365 -+ free (copy[1]); 18.4366 -+ return rc; 18.4367 -+ 18.4368 - } 18.4369 -+#endif 18.4370 - 18.4371 - /* Output the line in linebuffer LINE to standard output 18.4372 - provided that the switches say it should be output. 18.4373 -@@ -367,19 +562,38 @@ check_file (const char *infile, const ch 18.4374 - char *prevfield IF_LINT ( = NULL); 18.4375 - size_t prevlen IF_LINT ( = 0); 18.4376 - bool first_group_printed = false; 18.4377 -+#if HAVE_MBRTOWC 18.4378 -+ mbstate_t prevstate; 18.4379 -+ 18.4380 -+ memset (&prevstate, '\0', sizeof (mbstate_t)); 18.4381 -+#endif 18.4382 - 18.4383 - while (!feof (stdin)) 18.4384 - { 18.4385 - char *thisfield; 18.4386 - size_t thislen; 18.4387 - bool new_group; 18.4388 -+#if HAVE_MBRTOWC 18.4389 -+ mbstate_t thisstate; 18.4390 -+#endif 18.4391 - 18.4392 - if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) 18.4393 - break; 18.4394 - 18.4395 - thisfield = find_field (thisline); 18.4396 - thislen = thisline->length - 1 - (thisfield - thisline->buffer); 18.4397 -+#if HAVE_MBRTOWC 18.4398 -+ if (MB_CUR_MAX > 1) 18.4399 -+ { 18.4400 -+ thisstate = thisline->state; 18.4401 - 18.4402 -+ new_group = (prevline->length == 0 18.4403 -+ || different_multi (thisfield, prevfield, 18.4404 -+ thislen, prevlen, 18.4405 -+ thisstate, prevstate)); 18.4406 -+ } 18.4407 -+ else 18.4408 -+#endif 18.4409 - new_group = (prevline->length == 0 18.4410 - || different (thisfield, prevfield, thislen, prevlen)); 18.4411 - 18.4412 -@@ -397,6 +611,10 @@ check_file (const char *infile, const ch 18.4413 - SWAP_LINES (prevline, thisline); 18.4414 - prevfield = thisfield; 18.4415 - prevlen = thislen; 18.4416 -+#if HAVE_MBRTOWC 18.4417 -+ if (MB_CUR_MAX > 1) 18.4418 -+ prevstate = thisstate; 18.4419 -+#endif 18.4420 - first_group_printed = true; 18.4421 - } 18.4422 - } 18.4423 -@@ -409,17 +627,26 @@ check_file (const char *infile, const ch 18.4424 - size_t prevlen; 18.4425 - uintmax_t match_count = 0; 18.4426 - bool first_delimiter = true; 18.4427 -+#if HAVE_MBRTOWC 18.4428 -+ mbstate_t prevstate; 18.4429 -+#endif 18.4430 - 18.4431 - if (readlinebuffer_delim (prevline, stdin, delimiter) == 0) 18.4432 - goto closefiles; 18.4433 - prevfield = find_field (prevline); 18.4434 - prevlen = prevline->length - 1 - (prevfield - prevline->buffer); 18.4435 -+#if HAVE_MBRTOWC 18.4436 -+ prevstate = prevline->state; 18.4437 -+#endif 18.4438 - 18.4439 - while (!feof (stdin)) 18.4440 - { 18.4441 - bool match; 18.4442 - char *thisfield; 18.4443 - size_t thislen; 18.4444 -+#if HAVE_MBRTOWC 18.4445 -+ mbstate_t thisstate = thisline->state; 18.4446 -+#endif 18.4447 - if (readlinebuffer_delim (thisline, stdin, delimiter) == 0) 18.4448 - { 18.4449 - if (ferror (stdin)) 18.4450 -@@ -428,6 +655,14 @@ check_file (const char *infile, const ch 18.4451 - } 18.4452 - thisfield = find_field (thisline); 18.4453 - thislen = thisline->length - 1 - (thisfield - thisline->buffer); 18.4454 -+#if HAVE_MBRTOWC 18.4455 -+ if (MB_CUR_MAX > 1) 18.4456 -+ { 18.4457 -+ match = !different_multi (thisfield, prevfield, 18.4458 -+ thislen, prevlen, thisstate, prevstate); 18.4459 -+ } 18.4460 -+ else 18.4461 -+#endif 18.4462 - match = !different (thisfield, prevfield, thislen, prevlen); 18.4463 - match_count += match; 18.4464 - 18.4465 -@@ -460,6 +695,9 @@ check_file (const char *infile, const ch 18.4466 - SWAP_LINES (prevline, thisline); 18.4467 - prevfield = thisfield; 18.4468 - prevlen = thislen; 18.4469 -+#if HAVE_MBRTOWC 18.4470 -+ prevstate = thisstate; 18.4471 -+#endif 18.4472 - if (!match) 18.4473 - match_count = 0; 18.4474 - } 18.4475 -@@ -506,6 +744,19 @@ main (int argc, char **argv) 18.4476 - 18.4477 - atexit (close_stdout); 18.4478 - 18.4479 -+#if HAVE_MBRTOWC 18.4480 -+ if (MB_CUR_MAX > 1) 18.4481 -+ { 18.4482 -+ find_field = find_field_multi; 18.4483 -+ } 18.4484 -+ else 18.4485 -+#endif 18.4486 -+ { 18.4487 -+ find_field = find_field_uni; 18.4488 -+ } 18.4489 -+ 18.4490 -+ 18.4491 -+ 18.4492 - skip_chars = 0; 18.4493 - skip_fields = 0; 18.4494 - check_chars = SIZE_MAX; 18.4495 -diff -Naurp coreutils-8.27-orig/tests/expand/mb.sh coreutils-8.27/tests/expand/mb.sh 18.4496 ---- coreutils-8.27-orig/tests/expand/mb.sh 1969-12-31 18:00:00.000000000 -0600 18.4497 -+++ coreutils-8.27/tests/expand/mb.sh 2017-03-11 23:49:06.759133489 -0600 18.4498 -@@ -0,0 +1,183 @@ 18.4499 -+#!/bin/sh 18.4500 -+ 18.4501 -+# Copyright (C) 2012-2017 Free Software Foundation, Inc. 18.4502 -+ 18.4503 -+# This program is free software: you can redistribute it and/or modify 18.4504 -+# it under the terms of the GNU General Public License as published by 18.4505 -+# the Free Software Foundation, either version 3 of the License, or 18.4506 -+# (at your option) any later version. 18.4507 -+ 18.4508 -+# This program is distributed in the hope that it will be useful, 18.4509 -+# but WITHOUT ANY WARRANTY; without even the implied warranty of 18.4510 -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18.4511 -+# GNU General Public License for more details. 18.4512 -+ 18.4513 -+# You should have received a copy of the GNU General Public License 18.4514 -+# along with this program. If not, see <http://www.gnu.org/licenses/>. 18.4515 -+ 18.4516 -+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src 18.4517 -+print_ver_ expand 18.4518 -+ 18.4519 -+export LC_ALL=en_US.UTF-8 18.4520 -+ 18.4521 -+#input containing multibyte characters 18.4522 -+cat <<\EOF > in || framework_failure_ 18.4523 -+1234567812345678123456781 18.4524 -+. . . . 18.4525 -+a b c d 18.4526 -+. . . . 18.4527 -+ä ö ü ß 18.4528 -+. . . . 18.4529 -+EOF 18.4530 -+env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ 18.4531 -+ 18.4532 -+cat <<\EOF > exp || framework_failure_ 18.4533 -+1234567812345678123456781 18.4534 -+. . . . 18.4535 -+a b c d 18.4536 -+. . . . 18.4537 -+ä ö ü ß 18.4538 -+. . . . 18.4539 -+ äöü . öüä. ä xx 18.4540 -+EOF 18.4541 -+ 18.4542 -+expand < in > out || fail=1 18.4543 -+compare exp out > /dev/null 2>&1 || fail=1 18.4544 -+ 18.4545 -+#multiple files as an input 18.4546 -+cat <<\EOF >> exp || framework_failure_ 18.4547 -+1234567812345678123456781 18.4548 -+. . . . 18.4549 -+a b c d 18.4550 -+. . . . 18.4551 -+ä ö ü ß 18.4552 -+. . . . 18.4553 -+ äöü . öüä. ä xx 18.4554 -+EOF 18.4555 -+ 18.4556 -+expand ./in ./in > out || fail=1 18.4557 -+compare exp out > /dev/null 2>&1 || fail=1 18.4558 -+ 18.4559 -+#test characters with display widths != 1 18.4560 -+env printf '12345678 18.4561 -+e\t|ascii(1) 18.4562 -+\u00E9\t|composed(1) 18.4563 -+e\u0301\t|decomposed(1) 18.4564 -+\u3000\t|ideo-space(2) 18.4565 -+\uFF0D\t|full-hypen(2) 18.4566 -+' > in || framework_failure_ 18.4567 -+ 18.4568 -+env printf '12345678 18.4569 -+e |ascii(1) 18.4570 -+\u00E9 |composed(1) 18.4571 -+e\u0301 |decomposed(1) 18.4572 -+\u3000 |ideo-space(2) 18.4573 -+\uFF0D |full-hypen(2) 18.4574 -+' > exp || framework_failure_ 18.4575 -+ 18.4576 -+expand < in > out || fail=1 18.4577 -+compare exp out > /dev/null 2>&1 || fail=1 18.4578 -+ 18.4579 -+#shouldn't fail with "input line too long" 18.4580 -+#when a line starts with a control character 18.4581 -+env printf '\n' > in || framework_failure_ 18.4582 -+ 18.4583 -+expand < in > out || fail=1 18.4584 -+compare in out > /dev/null 2>&1 || fail=1 18.4585 -+ 18.4586 -+#non-Unicode characters interspersed between Unicode ones 18.4587 -+env printf '12345678 18.4588 -+\t\xFF| 18.4589 -+\xFF\t| 18.4590 -+\t\xFFä| 18.4591 -+ä\xFF\t| 18.4592 -+\tä\xFF| 18.4593 -+\xFF\tä| 18.4594 -+äbcdef\xFF\t| 18.4595 -+' > in || framework_failure_ 18.4596 -+ 18.4597 -+env printf '12345678 18.4598 -+ \xFF| 18.4599 -+\xFF | 18.4600 -+ \xFFä| 18.4601 -+ä\xFF | 18.4602 -+ ä\xFF| 18.4603 -+\xFF ä| 18.4604 -+äbcdef\xFF | 18.4605 -+' > exp || framework_failure_ 18.4606 -+ 18.4607 -+expand < in > out || fail=1 18.4608 -+compare exp out > /dev/null 2>&1 || fail=1 18.4609 -+ 18.4610 -+ 18.4611 -+ 18.4612 -+#BOM header test 1 18.4613 -+printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ 18.4614 -+1234567812345678123456781 18.4615 -+. . . . 18.4616 -+a b c d 18.4617 -+. . . . 18.4618 -+ä ö ü ß 18.4619 -+. . . . 18.4620 -+EOF 18.4621 -+env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ 18.4622 -+ 18.4623 -+printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ 18.4624 -+1234567812345678123456781 18.4625 -+. . . . 18.4626 -+a b c d 18.4627 -+. . . . 18.4628 -+ä ö ü ß 18.4629 -+. . . . 18.4630 -+ äöü . öüä. ä xx 18.4631 -+EOF 18.4632 -+ 18.4633 -+ 18.4634 -+expand < in > out || fail=1 18.4635 -+compare exp out > /dev/null 2>&1 || fail=1 18.4636 -+ 18.4637 -+LANG=C expand < in > out || fail=1 18.4638 -+compare exp out > /dev/null 2>&1 || fail=1 18.4639 -+ 18.4640 -+LC_ALL=C expand < in > out || fail=1 18.4641 -+compare exp out > /dev/null 2>&1 || fail=1 18.4642 -+ 18.4643 -+ 18.4644 -+printf '\xEF\xBB\xBF' > in1; cat <<\EOF >> in1 || framework_failure_ 18.4645 -+1234567812345678123456781 18.4646 -+. . . . 18.4647 -+a b c d 18.4648 -+. . . . 18.4649 -+ä ö ü ß 18.4650 -+. . . . 18.4651 -+EOF 18.4652 -+env printf ' äöü\t. öüä. \tä xx\n' >> in1 || framework_failure_ 18.4653 -+ 18.4654 -+ 18.4655 -+printf '\xEF\xBB\xBF' > exp; cat <<\EOF >> exp || framework_failure_ 18.4656 -+1234567812345678123456781 18.4657 -+. . . . 18.4658 -+a b c d 18.4659 -+. . . . 18.4660 -+ä ö ü ß 18.4661 -+. . . . 18.4662 -+ äöü . öüä. ä xx 18.4663 -+1234567812345678123456781 18.4664 -+. . . . 18.4665 -+a b c d 18.4666 -+. . . . 18.4667 -+ä ö ü ß 18.4668 -+. . . . 18.4669 -+ äöü . öüä. ä xx 18.4670 -+EOF 18.4671 -+ 18.4672 -+expand in1 in1 > out || fail=1 18.4673 -+compare exp out > /dev/null 2>&1 || fail=1 18.4674 -+ 18.4675 -+LANG=C expand in1 in1 > out || fail=1 18.4676 -+compare exp out > /dev/null 2>&1 || fail=1 18.4677 -+ 18.4678 -+LC_ALL=C expand in1 in1 > out || fail=1 18.4679 -+compare exp out > /dev/null 2>&1 || fail=1 18.4680 -+ 18.4681 -+exit $fail 18.4682 -diff -Naurp coreutils-8.27-orig/tests/i18n/sort.sh coreutils-8.27/tests/i18n/sort.sh 18.4683 ---- coreutils-8.27-orig/tests/i18n/sort.sh 1969-12-31 18:00:00.000000000 -0600 18.4684 -+++ coreutils-8.27/tests/i18n/sort.sh 2017-03-11 23:47:13.100285838 -0600 18.4685 -@@ -0,0 +1,29 @@ 18.4686 -+#!/bin/sh 18.4687 -+# Verify sort's multi-byte support. 18.4688 -+ 18.4689 -+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src 18.4690 -+print_ver_ sort 18.4691 -+ 18.4692 -+export LC_ALL=en_US.UTF-8 18.4693 -+locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \ 18.4694 -+ || skip_ "No UTF-8 locale available" 18.4695 -+ 18.4696 -+# Enable heap consistency checkng on older systems 18.4697 -+export MALLOC_CHECK_=2 18.4698 -+ 18.4699 -+ 18.4700 -+# check buffer overflow issue due to 18.4701 -+# expanding multi-byte representation due to case conversion 18.4702 -+# https://bugzilla.suse.com/show_bug.cgi?id=928749 18.4703 -+cat <<EOF > exp 18.4704 -+. 18.4705 -+É‘ 18.4706 -+EOF 18.4707 -+cat <<EOF | sort -f > out || fail=1 18.4708 -+. 18.4709 -+É‘ 18.4710 -+EOF 18.4711 -+compare exp out || { fail=1; cat out; } 18.4712 -+ 18.4713 -+ 18.4714 -+Exit $fail 18.4715 -diff -Naurp coreutils-8.27-orig/tests/local.mk coreutils-8.27/tests/local.mk 18.4716 ---- coreutils-8.27-orig/tests/local.mk 2017-02-28 22:25:37.000000000 -0600 18.4717 -+++ coreutils-8.27/tests/local.mk 2017-03-11 23:47:38.072058253 -0600 18.4718 -@@ -352,6 +352,8 @@ all_tests = \ 18.4719 - tests/misc/sort-discrim.sh \ 18.4720 - tests/misc/sort-files0-from.pl \ 18.4721 - tests/misc/sort-float.sh \ 18.4722 -+ tests/misc/sort-mb-tests.sh \ 18.4723 -+ tests/i18n/sort.sh \ 18.4724 - tests/misc/sort-h-thousands-sep.sh \ 18.4725 - tests/misc/sort-merge.pl \ 18.4726 - tests/misc/sort-merge-fdlimit.sh \ 18.4727 -@@ -544,6 +546,7 @@ all_tests = \ 18.4728 - tests/du/threshold.sh \ 18.4729 - tests/du/trailing-slash.sh \ 18.4730 - tests/du/two-args.sh \ 18.4731 -+ tests/expand/mb.sh \ 18.4732 - tests/id/gnu-zero-uids.sh \ 18.4733 - tests/id/no-context.sh \ 18.4734 - tests/id/context.sh \ 18.4735 -@@ -684,6 +687,7 @@ all_tests = \ 18.4736 - tests/touch/read-only.sh \ 18.4737 - tests/touch/relative.sh \ 18.4738 - tests/touch/trailing-slash.sh \ 18.4739 -+ tests/unexpand/mb.sh \ 18.4740 - $(all_root_tests) 18.4741 - 18.4742 - # See tests/factor/create-test.sh. 18.4743 -diff -Naurp coreutils-8.27-orig/tests/misc/cut.pl coreutils-8.27/tests/misc/cut.pl 18.4744 ---- coreutils-8.27-orig/tests/misc/cut.pl 2017-01-01 16:34:24.000000000 -0600 18.4745 -+++ coreutils-8.27/tests/misc/cut.pl 2017-03-11 23:47:13.100285838 -0600 18.4746 -@@ -23,9 +23,11 @@ use strict; 18.4747 - # Turn off localization of executable's output. 18.4748 - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; 18.4749 - 18.4750 --my $mb_locale = $ENV{LOCALE_FR_UTF8}; 18.4751 -+my $mb_locale; 18.4752 -+# uncommented enable multibyte paths 18.4753 -+$mb_locale = $ENV{LOCALE_FR_UTF8}; 18.4754 - ! defined $mb_locale || $mb_locale eq 'none' 18.4755 -- and $mb_locale = 'C'; 18.4756 -+ and $mb_locale = 'C'; 18.4757 - 18.4758 - my $prog = 'cut'; 18.4759 - my $try = "Try '$prog --help' for more information.\n"; 18.4760 -@@ -240,6 +242,7 @@ if ($mb_locale ne 'C') 18.4761 - my @new_t = @$t; 18.4762 - my $test_name = shift @new_t; 18.4763 - 18.4764 -+ next if ($test_name =~ "newline-[12][0-9]"); 18.4765 - push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.4766 - } 18.4767 - push @Tests, @new; 18.4768 -diff -Naurp coreutils-8.27-orig/tests/misc/expand.pl coreutils-8.27/tests/misc/expand.pl 18.4769 ---- coreutils-8.27-orig/tests/misc/expand.pl 2017-03-01 11:16:46.000000000 -0600 18.4770 -+++ coreutils-8.27/tests/misc/expand.pl 2017-03-11 23:47:13.101285788 -0600 18.4771 -@@ -27,6 +27,15 @@ my $prog = 'expand'; 18.4772 - # Turn off localization of executable's output. 18.4773 - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; 18.4774 - 18.4775 -+#comment out next line to disable multibyte tests 18.4776 -+my $mb_locale = $ENV{LOCALE_FR_UTF8}; 18.4777 -+! defined $mb_locale || $mb_locale eq 'none' 18.4778 -+ and $mb_locale = 'C'; 18.4779 -+ 18.4780 -+my $prog = 'expand'; 18.4781 -+my $try = "Try \`$prog --help' for more information.\n"; 18.4782 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.4783 -+ 18.4784 - my @Tests = 18.4785 - ( 18.4786 - ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], 18.4787 -@@ -152,6 +161,8 @@ my @Tests = 18.4788 - ['trail9', '--tab=1,2 -t/5',{IN=>"\ta\tb\tc"}, {OUT=>" a b c"}], 18.4789 - 18.4790 - # Test errors 18.4791 -+ # FIXME: The following tests contain ‘quoting’ specific to LC_MESSAGES 18.4792 -+ # So we force LC_MESSAGES=C to make them pass. 18.4793 - ['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1}, 18.4794 - {ERR => "$prog: tab size contains invalid character(s): 'a'\n"}], 18.4795 - ['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1}, 18.4796 -@@ -168,6 +179,37 @@ my @Tests = 18.4797 - {ERR => "$prog: '/' specifier not at start of number: '/'\n"}], 18.4798 - ); 18.4799 - 18.4800 -+if ($mb_locale ne 'C') 18.4801 -+ { 18.4802 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.4803 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.4804 -+ # provide coverage for the distro-added multi-byte code paths. 18.4805 -+ my @new; 18.4806 -+ foreach my $t (@Tests) 18.4807 -+ { 18.4808 -+ my @new_t = @$t; 18.4809 -+ my $test_name = shift @new_t; 18.4810 -+ 18.4811 -+ # Depending on whether expand is multi-byte-patched, 18.4812 -+ # it emits different diagnostics: 18.4813 -+ # non-MB: invalid byte or field list 18.4814 -+ # MB: invalid byte, character or field list 18.4815 -+ # Adjust the expected error output accordingly. 18.4816 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.4817 -+ (@new_t)) 18.4818 -+ { 18.4819 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.4820 -+ push @new_t, $sub; 18.4821 -+ push @$t, $sub; 18.4822 -+ } 18.4823 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LANG=$mb_locale LC_MESSAGES=C"}]; 18.4824 -+ } 18.4825 -+ push @Tests, @new; 18.4826 -+ } 18.4827 -+ 18.4828 -+ 18.4829 -+@Tests = triple_test \@Tests; 18.4830 -+ 18.4831 - my $save_temps = $ENV{DEBUG}; 18.4832 - my $verbose = $ENV{VERBOSE}; 18.4833 - 18.4834 -diff -Naurp coreutils-8.27-orig/tests/misc/fold.pl coreutils-8.27/tests/misc/fold.pl 18.4835 ---- coreutils-8.27-orig/tests/misc/fold.pl 2017-01-01 16:34:24.000000000 -0600 18.4836 -+++ coreutils-8.27/tests/misc/fold.pl 2017-03-11 23:47:13.101285788 -0600 18.4837 -@@ -20,9 +20,18 @@ use strict; 18.4838 - 18.4839 - (my $program_name = $0) =~ s|.*/||; 18.4840 - 18.4841 -+my $prog = 'fold'; 18.4842 -+my $try = "Try \`$prog --help' for more information.\n"; 18.4843 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.4844 -+ 18.4845 - # Turn off localization of executable's output. 18.4846 - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; 18.4847 - 18.4848 -+# uncommented to enable multibyte paths 18.4849 -+my $mb_locale = $ENV{LOCALE_FR_UTF8}; 18.4850 -+! defined $mb_locale || $mb_locale eq 'none' 18.4851 -+ and $mb_locale = 'C'; 18.4852 -+ 18.4853 - my @Tests = 18.4854 - ( 18.4855 - ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}], 18.4856 -@@ -31,9 +40,48 @@ my @Tests = 18.4857 - ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}], 18.4858 - ); 18.4859 - 18.4860 -+# Add _POSIX2_VERSION=199209 to the environment of each test 18.4861 -+# that uses an old-style option like +1. 18.4862 -+if ($mb_locale ne 'C') 18.4863 -+ { 18.4864 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.4865 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.4866 -+ # provide coverage for the distro-added multi-byte code paths. 18.4867 -+ my @new; 18.4868 -+ foreach my $t (@Tests) 18.4869 -+ { 18.4870 -+ my @new_t = @$t; 18.4871 -+ my $test_name = shift @new_t; 18.4872 -+ 18.4873 -+ # Depending on whether fold is multi-byte-patched, 18.4874 -+ # it emits different diagnostics: 18.4875 -+ # non-MB: invalid byte or field list 18.4876 -+ # MB: invalid byte, character or field list 18.4877 -+ # Adjust the expected error output accordingly. 18.4878 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.4879 -+ (@new_t)) 18.4880 -+ { 18.4881 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.4882 -+ push @new_t, $sub; 18.4883 -+ push @$t, $sub; 18.4884 -+ } 18.4885 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.4886 -+ } 18.4887 -+ push @Tests, @new; 18.4888 -+ } 18.4889 -+ 18.4890 -+@Tests = triple_test \@Tests; 18.4891 -+ 18.4892 -+# Remember that triple_test creates from each test with exactly one "IN" 18.4893 -+# file two more tests (.p and .r suffix on name) corresponding to reading 18.4894 -+# input from a file and from a pipe. The pipe-reading test would fail 18.4895 -+# due to a race condition about 1 in 20 times. 18.4896 -+# Remove the IN_PIPE version of the "output-is-input" test above. 18.4897 -+# The others aren't susceptible because they have three inputs each. 18.4898 -+@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; 18.4899 -+ 18.4900 - my $save_temps = $ENV{DEBUG}; 18.4901 - my $verbose = $ENV{VERBOSE}; 18.4902 - 18.4903 --my $prog = 'fold'; 18.4904 - my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); 18.4905 - exit $fail; 18.4906 -diff -Naurp coreutils-8.27-orig/tests/misc/join.pl coreutils-8.27/tests/misc/join.pl 18.4907 ---- coreutils-8.27-orig/tests/misc/join.pl 2017-01-01 16:34:24.000000000 -0600 18.4908 -+++ coreutils-8.27/tests/misc/join.pl 2017-03-11 23:47:13.102285737 -0600 18.4909 -@@ -25,6 +25,15 @@ my $limits = getlimits (); 18.4910 - 18.4911 - my $prog = 'join'; 18.4912 - 18.4913 -+my $try = "Try \`$prog --help' for more information.\n"; 18.4914 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.4915 -+ 18.4916 -+my $mb_locale; 18.4917 -+#Comment out next line to disable multibyte tests 18.4918 -+$mb_locale = $ENV{LOCALE_FR_UTF8}; 18.4919 -+! defined $mb_locale || $mb_locale eq 'none' 18.4920 -+ and $mb_locale = 'C'; 18.4921 -+ 18.4922 - my $delim = chr 0247; 18.4923 - sub t_subst ($) 18.4924 - { 18.4925 -@@ -329,8 +338,49 @@ foreach my $t (@tv) 18.4926 - push @Tests, $new_ent; 18.4927 - } 18.4928 - 18.4929 -+# Add _POSIX2_VERSION=199209 to the environment of each test 18.4930 -+# that uses an old-style option like +1. 18.4931 -+if ($mb_locale ne 'C') 18.4932 -+ { 18.4933 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.4934 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.4935 -+ # provide coverage for the distro-added multi-byte code paths. 18.4936 -+ my @new; 18.4937 -+ foreach my $t (@Tests) 18.4938 -+ { 18.4939 -+ my @new_t = @$t; 18.4940 -+ my $test_name = shift @new_t; 18.4941 -+ 18.4942 -+ # Depending on whether join is multi-byte-patched, 18.4943 -+ # it emits different diagnostics: 18.4944 -+ # non-MB: invalid byte or field list 18.4945 -+ # MB: invalid byte, character or field list 18.4946 -+ # Adjust the expected error output accordingly. 18.4947 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.4948 -+ (@new_t)) 18.4949 -+ { 18.4950 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.4951 -+ push @new_t, $sub; 18.4952 -+ push @$t, $sub; 18.4953 -+ } 18.4954 -+ #Adjust the output some error messages including test_name for mb 18.4955 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR}} 18.4956 -+ (@new_t)) 18.4957 -+ { 18.4958 -+ my $sub2 = {ERR_SUBST => "s/$test_name-mb/$test_name/"}; 18.4959 -+ push @new_t, $sub2; 18.4960 -+ push @$t, $sub2; 18.4961 -+ } 18.4962 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.4963 -+ } 18.4964 -+ push @Tests, @new; 18.4965 -+ } 18.4966 -+ 18.4967 - @Tests = triple_test \@Tests; 18.4968 - 18.4969 -+#skip invalid-j-mb test, it is failing because of the format 18.4970 -+@Tests = grep {$_->[0] ne 'invalid-j-mb'} @Tests; 18.4971 -+ 18.4972 - my $save_temps = $ENV{DEBUG}; 18.4973 - my $verbose = $ENV{VERBOSE}; 18.4974 - 18.4975 -diff -Naurp coreutils-8.27-orig/tests/misc/sort-mb-tests.sh coreutils-8.27/tests/misc/sort-mb-tests.sh 18.4976 ---- coreutils-8.27-orig/tests/misc/sort-mb-tests.sh 1969-12-31 18:00:00.000000000 -0600 18.4977 -+++ coreutils-8.27/tests/misc/sort-mb-tests.sh 2017-03-11 23:47:13.102285737 -0600 18.4978 -@@ -0,0 +1,45 @@ 18.4979 -+#!/bin/sh 18.4980 -+# Verify sort's multi-byte support. 18.4981 -+ 18.4982 -+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src 18.4983 -+print_ver_ sort 18.4984 -+ 18.4985 -+export LC_ALL=en_US.UTF-8 18.4986 -+locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \ 18.4987 -+ || skip_ "No UTF-8 locale available" 18.4988 -+ 18.4989 -+ 18.4990 -+cat <<EOF > exp 18.4991 -+Bananaï¼ 5 18.4992 -+Appleï¼ 10 18.4993 -+Citrusï¼ 20 18.4994 -+Cherryï¼ 30 18.4995 -+EOF 18.4996 -+ 18.4997 -+cat <<EOF | sort -t ï¼ -k2 -n > out || fail=1 18.4998 -+Appleï¼ 10 18.4999 -+Bananaï¼ 5 18.5000 -+Citrusï¼ 20 18.5001 -+Cherryï¼ 30 18.5002 -+EOF 18.5003 -+ 18.5004 -+compare exp out || { fail=1; cat out; } 18.5005 -+ 18.5006 -+ 18.5007 -+cat <<EOF > exp 18.5008 -+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5 18.5009 -+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10 18.5010 -+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20 18.5011 -+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30 18.5012 -+EOF 18.5013 -+ 18.5014 -+cat <<EOF | sort -t ï¼ -k4 -n > out || fail=1 18.5015 -+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20 18.5016 -+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30 18.5017 -+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5 18.5018 -+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10 18.5019 -+EOF 18.5020 -+ 18.5021 -+compare exp out || { fail=1; cat out; } 18.5022 -+ 18.5023 -+Exit $fail 18.5024 -diff -Naurp coreutils-8.27-orig/tests/misc/sort-merge.pl coreutils-8.27/tests/misc/sort-merge.pl 18.5025 ---- coreutils-8.27-orig/tests/misc/sort-merge.pl 2017-01-01 16:34:24.000000000 -0600 18.5026 -+++ coreutils-8.27/tests/misc/sort-merge.pl 2017-03-11 23:47:13.102285737 -0600 18.5027 -@@ -26,6 +26,15 @@ my $prog = 'sort'; 18.5028 - # Turn off localization of executable's output. 18.5029 - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; 18.5030 - 18.5031 -+my $mb_locale; 18.5032 -+# uncommented according to upstream commit enabling multibyte paths 18.5033 -+$mb_locale = $ENV{LOCALE_FR_UTF8}; 18.5034 -+! defined $mb_locale || $mb_locale eq 'none' 18.5035 -+ and $mb_locale = 'C'; 18.5036 -+ 18.5037 -+my $try = "Try \`$prog --help' for more information.\n"; 18.5038 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.5039 -+ 18.5040 - # three empty files and one that says 'foo' 18.5041 - my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}}); 18.5042 - 18.5043 -@@ -77,6 +86,39 @@ my @Tests = 18.5044 - {OUT=>$big_input}], 18.5045 - ); 18.5046 - 18.5047 -+# Add _POSIX2_VERSION=199209 to the environment of each test 18.5048 -+# that uses an old-style option like +1. 18.5049 -+if ($mb_locale ne 'C') 18.5050 -+ { 18.5051 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.5052 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.5053 -+ # provide coverage for the distro-added multi-byte code paths. 18.5054 -+ my @new; 18.5055 -+ foreach my $t (@Tests) 18.5056 -+ { 18.5057 -+ my @new_t = @$t; 18.5058 -+ my $test_name = shift @new_t; 18.5059 -+ 18.5060 -+ # Depending on whether sort is multi-byte-patched, 18.5061 -+ # it emits different diagnostics: 18.5062 -+ # non-MB: invalid byte or field list 18.5063 -+ # MB: invalid byte, character or field list 18.5064 -+ # Adjust the expected error output accordingly. 18.5065 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.5066 -+ (@new_t)) 18.5067 -+ { 18.5068 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.5069 -+ push @new_t, $sub; 18.5070 -+ push @$t, $sub; 18.5071 -+ } 18.5072 -+ next if ($test_name =~ "nmerge-."); 18.5073 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.5074 -+ } 18.5075 -+ push @Tests, @new; 18.5076 -+ } 18.5077 -+ 18.5078 -+@Tests = triple_test \@Tests; 18.5079 -+ 18.5080 - my $save_temps = $ENV{DEBUG}; 18.5081 - my $verbose = $ENV{VERBOSE}; 18.5082 - 18.5083 -diff -Naurp coreutils-8.27-orig/tests/misc/sort.pl coreutils-8.27/tests/misc/sort.pl 18.5084 ---- coreutils-8.27-orig/tests/misc/sort.pl 2017-01-21 08:53:43.000000000 -0600 18.5085 -+++ coreutils-8.27/tests/misc/sort.pl 2017-03-11 23:47:13.103285687 -0600 18.5086 -@@ -24,10 +24,15 @@ my $prog = 'sort'; 18.5087 - # Turn off localization of executable's output. 18.5088 - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; 18.5089 - 18.5090 --my $mb_locale = $ENV{LOCALE_FR_UTF8}; 18.5091 -+my $mb_locale; 18.5092 -+#Comment out next line to disable multibyte tests 18.5093 -+$mb_locale = $ENV{LOCALE_FR_UTF8}; 18.5094 - ! defined $mb_locale || $mb_locale eq 'none' 18.5095 - and $mb_locale = 'C'; 18.5096 - 18.5097 -+my $try = "Try \`$prog --help' for more information.\n"; 18.5098 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.5099 -+ 18.5100 - # Since each test is run with a file name and with redirected stdin, 18.5101 - # the name in the diagnostic is either the file name or "-". 18.5102 - # Normalize each diagnostic to use '-'. 18.5103 -@@ -423,6 +428,38 @@ foreach my $t (@Tests) 18.5104 - } 18.5105 - } 18.5106 - 18.5107 -+if ($mb_locale ne 'C') 18.5108 -+ { 18.5109 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.5110 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.5111 -+ # provide coverage for the distro-added multi-byte code paths. 18.5112 -+ my @new; 18.5113 -+ foreach my $t (@Tests) 18.5114 -+ { 18.5115 -+ my @new_t = @$t; 18.5116 -+ my $test_name = shift @new_t; 18.5117 -+ 18.5118 -+ # Depending on whether sort is multi-byte-patched, 18.5119 -+ # it emits different diagnostics: 18.5120 -+ # non-MB: invalid byte or field list 18.5121 -+ # MB: invalid byte, character or field list 18.5122 -+ # Adjust the expected error output accordingly. 18.5123 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.5124 -+ (@new_t)) 18.5125 -+ { 18.5126 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.5127 -+ push @new_t, $sub; 18.5128 -+ push @$t, $sub; 18.5129 -+ } 18.5130 -+ #disable several failing tests until investigation, disable all tests with envvars set 18.5131 -+ next if (grep {ref $_ eq 'HASH' && exists $_->{ENV}} (@new_t)); 18.5132 -+ next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a"); 18.5133 -+ next if ($test_name =~ "11[ab]"); # avoid FP: expected result differs to MB result due to collation rules. 18.5134 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.5135 -+ } 18.5136 -+ push @Tests, @new; 18.5137 -+ } 18.5138 -+ 18.5139 - @Tests = triple_test \@Tests; 18.5140 - 18.5141 - # Remember that triple_test creates from each test with exactly one "IN" 18.5142 -@@ -432,6 +469,7 @@ foreach my $t (@Tests) 18.5143 - # Remove the IN_PIPE version of the "output-is-input" test above. 18.5144 - # The others aren't susceptible because they have three inputs each. 18.5145 - @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; 18.5146 -+@Tests = grep {$_->[0] ne 'output-is-input-mb.p'} @Tests; 18.5147 - 18.5148 - my $save_temps = $ENV{DEBUG}; 18.5149 - my $verbose = $ENV{VERBOSE}; 18.5150 -diff -Naurp coreutils-8.27-orig/tests/misc/unexpand.pl coreutils-8.27/tests/misc/unexpand.pl 18.5151 ---- coreutils-8.27-orig/tests/misc/unexpand.pl 2017-01-01 16:34:24.000000000 -0600 18.5152 -+++ coreutils-8.27/tests/misc/unexpand.pl 2017-03-11 23:47:13.103285687 -0600 18.5153 -@@ -27,6 +27,14 @@ my $limits = getlimits (); 18.5154 - 18.5155 - my $prog = 'unexpand'; 18.5156 - 18.5157 -+# comment out next line to disable multibyte tests 18.5158 -+my $mb_locale = $ENV{LOCALE_FR_UTF8}; 18.5159 -+! defined $mb_locale || $mb_locale eq 'none' 18.5160 -+ and $mb_locale = 'C'; 18.5161 -+ 18.5162 -+my $try = "Try \`$prog --help' for more information.\n"; 18.5163 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.5164 -+ 18.5165 - my @Tests = 18.5166 - ( 18.5167 - ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}], 18.5168 -@@ -128,6 +136,37 @@ my @Tests = 18.5169 - ['ts2', '-t5,8', {IN=>"x\t \t y\n"}, {OUT=>"x\t\t y\n"}], 18.5170 - ); 18.5171 - 18.5172 -+if ($mb_locale ne 'C') 18.5173 -+ { 18.5174 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.5175 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.5176 -+ # provide coverage for the distro-added multi-byte code paths. 18.5177 -+ my @new; 18.5178 -+ foreach my $t (@Tests) 18.5179 -+ { 18.5180 -+ my @new_t = @$t; 18.5181 -+ my $test_name = shift @new_t; 18.5182 -+ 18.5183 -+ # Depending on whether unexpand is multi-byte-patched, 18.5184 -+ # it emits different diagnostics: 18.5185 -+ # non-MB: invalid byte or field list 18.5186 -+ # MB: invalid byte, character or field list 18.5187 -+ # Adjust the expected error output accordingly. 18.5188 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.5189 -+ (@new_t)) 18.5190 -+ { 18.5191 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.5192 -+ push @new_t, $sub; 18.5193 -+ push @$t, $sub; 18.5194 -+ } 18.5195 -+ next if ($test_name =~ 'b-1'); 18.5196 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.5197 -+ } 18.5198 -+ push @Tests, @new; 18.5199 -+ } 18.5200 -+ 18.5201 -+@Tests = triple_test \@Tests; 18.5202 -+ 18.5203 - my $save_temps = $ENV{DEBUG}; 18.5204 - my $verbose = $ENV{VERBOSE}; 18.5205 - 18.5206 -diff -Naurp coreutils-8.27-orig/tests/misc/uniq.pl coreutils-8.27/tests/misc/uniq.pl 18.5207 ---- coreutils-8.27-orig/tests/misc/uniq.pl 2017-01-01 16:34:24.000000000 -0600 18.5208 -+++ coreutils-8.27/tests/misc/uniq.pl 2017-03-11 23:47:13.103285687 -0600 18.5209 -@@ -23,9 +23,17 @@ my $limits = getlimits (); 18.5210 - my $prog = 'uniq'; 18.5211 - my $try = "Try '$prog --help' for more information.\n"; 18.5212 - 18.5213 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.5214 -+ 18.5215 - # Turn off localization of executable's output. 18.5216 - @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; 18.5217 - 18.5218 -+my $mb_locale; 18.5219 -+#Comment out next line to disable multibyte tests 18.5220 -+$mb_locale = $ENV{LOCALE_FR_UTF8}; 18.5221 -+! defined $mb_locale || $mb_locale eq 'none' 18.5222 -+ and $mb_locale = 'C'; 18.5223 -+ 18.5224 - # When possible, create a "-z"-testing variant of each test. 18.5225 - sub add_z_variants($) 18.5226 - { 18.5227 -@@ -262,6 +270,53 @@ foreach my $t (@Tests) 18.5228 - and push @$t, {ENV=>'_POSIX2_VERSION=199209'}; 18.5229 - } 18.5230 - 18.5231 -+if ($mb_locale ne 'C') 18.5232 -+ { 18.5233 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.5234 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.5235 -+ # provide coverage for the distro-added multi-byte code paths. 18.5236 -+ my @new; 18.5237 -+ foreach my $t (@Tests) 18.5238 -+ { 18.5239 -+ my @new_t = @$t; 18.5240 -+ my $test_name = shift @new_t; 18.5241 -+ 18.5242 -+ # Depending on whether uniq is multi-byte-patched, 18.5243 -+ # it emits different diagnostics: 18.5244 -+ # non-MB: invalid byte or field list 18.5245 -+ # MB: invalid byte, character or field list 18.5246 -+ # Adjust the expected error output accordingly. 18.5247 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.5248 -+ (@new_t)) 18.5249 -+ { 18.5250 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.5251 -+ push @new_t, $sub; 18.5252 -+ push @$t, $sub; 18.5253 -+ } 18.5254 -+ # In test #145, replace the each ‘...’ by '...'. 18.5255 -+ if ($test_name =~ "145") 18.5256 -+ { 18.5257 -+ my $sub = { ERR_SUBST => "s/‘([^’]+)’/'\$1'/g"}; 18.5258 -+ push @new_t, $sub; 18.5259 -+ push @$t, $sub; 18.5260 -+ } 18.5261 -+ next if ( $test_name =~ "schar" 18.5262 -+ or $test_name =~ "^obs-plus" 18.5263 -+ or $test_name =~ "119"); 18.5264 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.5265 -+ } 18.5266 -+ push @Tests, @new; 18.5267 -+ } 18.5268 -+ 18.5269 -+# Remember that triple_test creates from each test with exactly one "IN" 18.5270 -+# file two more tests (.p and .r suffix on name) corresponding to reading 18.5271 -+# input from a file and from a pipe. The pipe-reading test would fail 18.5272 -+# due to a race condition about 1 in 20 times. 18.5273 -+# Remove the IN_PIPE version of the "output-is-input" test above. 18.5274 -+# The others aren't susceptible because they have three inputs each. 18.5275 -+ 18.5276 -+@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; 18.5277 -+ 18.5278 - @Tests = add_z_variants \@Tests; 18.5279 - @Tests = triple_test \@Tests; 18.5280 - 18.5281 -diff -Naurp coreutils-8.27-orig/tests/pr/pr-tests.pl coreutils-8.27/tests/pr/pr-tests.pl 18.5282 ---- coreutils-8.27-orig/tests/pr/pr-tests.pl 2017-01-01 16:34:24.000000000 -0600 18.5283 -+++ coreutils-8.27/tests/pr/pr-tests.pl 2017-03-11 23:47:13.103285687 -0600 18.5284 -@@ -24,6 +24,15 @@ use strict; 18.5285 - my $prog = 'pr'; 18.5286 - my $normalize_strerror = "s/': .*/'/"; 18.5287 - 18.5288 -+my $mb_locale; 18.5289 -+#Uncomment the following line to enable multibyte tests 18.5290 -+$mb_locale = $ENV{LOCALE_FR_UTF8}; 18.5291 -+! defined $mb_locale || $mb_locale eq 'none' 18.5292 -+ and $mb_locale = 'C'; 18.5293 -+ 18.5294 -+my $try = "Try \`$prog --help' for more information.\n"; 18.5295 -+my $inval = "$prog: invalid byte, character or field list\n$try"; 18.5296 -+ 18.5297 - my @tv = ( 18.5298 - 18.5299 - # -b option is no longer an official option. But it's still working to 18.5300 -@@ -474,8 +483,48 @@ push @Tests, 18.5301 - {IN=>{2=>"a\n"}}, 18.5302 - {OUT=>"a\t\t\t\t \t\t\ta\n"} ]; 18.5303 - 18.5304 -+# Add _POSIX2_VERSION=199209 to the environment of each test 18.5305 -+# that uses an old-style option like +1. 18.5306 -+if ($mb_locale ne 'C') 18.5307 -+ { 18.5308 -+ # Duplicate each test vector, appending "-mb" to the test name and 18.5309 -+ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we 18.5310 -+ # provide coverage for the distro-added multi-byte code paths. 18.5311 -+ my @new; 18.5312 -+ foreach my $t (@Tests) 18.5313 -+ { 18.5314 -+ my @new_t = @$t; 18.5315 -+ my $test_name = shift @new_t; 18.5316 -+ 18.5317 -+ # Depending on whether pr is multi-byte-patched, 18.5318 -+ # it emits different diagnostics: 18.5319 -+ # non-MB: invalid byte or field list 18.5320 -+ # MB: invalid byte, character or field list 18.5321 -+ # Adjust the expected error output accordingly. 18.5322 -+ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} 18.5323 -+ (@new_t)) 18.5324 -+ { 18.5325 -+ my $sub = {ERR_SUBST => 's/, character//'}; 18.5326 -+ push @new_t, $sub; 18.5327 -+ push @$t, $sub; 18.5328 -+ } 18.5329 -+ #temporarily skip some failing tests 18.5330 -+ next if ($test_name =~ "col-0" or $test_name =~ "col-inval" or $test_name =~ "asan1"); 18.5331 -+ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; 18.5332 -+ } 18.5333 -+ push @Tests, @new; 18.5334 -+ } 18.5335 -+ 18.5336 - @Tests = triple_test \@Tests; 18.5337 - 18.5338 -+# Remember that triple_test creates from each test with exactly one "IN" 18.5339 -+# file two more tests (.p and .r suffix on name) corresponding to reading 18.5340 -+# input from a file and from a pipe. The pipe-reading test would fail 18.5341 -+# due to a race condition about 1 in 20 times. 18.5342 -+# Remove the IN_PIPE version of the "output-is-input" test above. 18.5343 -+# The others aren't susceptible because they have three inputs each. 18.5344 -+@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests; 18.5345 -+ 18.5346 - my $save_temps = $ENV{DEBUG}; 18.5347 - my $verbose = $ENV{VERBOSE}; 18.5348 - 18.5349 -diff -Naurp coreutils-8.27-orig/tests/unexpand/mb.sh coreutils-8.27/tests/unexpand/mb.sh 18.5350 ---- coreutils-8.27-orig/tests/unexpand/mb.sh 1969-12-31 18:00:00.000000000 -0600 18.5351 -+++ coreutils-8.27/tests/unexpand/mb.sh 2017-03-11 23:49:06.759133489 -0600 18.5352 -@@ -0,0 +1,172 @@ 18.5353 -+#!/bin/sh 18.5354 -+ 18.5355 -+# Copyright (C) 2012-2017 Free Software Foundation, Inc. 18.5356 -+ 18.5357 -+# This program is free software: you can redistribute it and/or modify 18.5358 -+# it under the terms of the GNU General Public License as published by 18.5359 -+# the Free Software Foundation, either version 3 of the License, or 18.5360 -+# (at your option) any later version. 18.5361 -+ 18.5362 -+# This program is distributed in the hope that it will be useful, 18.5363 -+# but WITHOUT ANY WARRANTY; without even the implied warranty of 18.5364 -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18.5365 -+# GNU General Public License for more details. 18.5366 -+ 18.5367 -+# You should have received a copy of the GNU General Public License 18.5368 -+# along with this program. If not, see <http://www.gnu.org/licenses/>. 18.5369 -+ 18.5370 -+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src 18.5371 -+print_ver_ unexpand 18.5372 -+ 18.5373 -+export LC_ALL=en_US.UTF-8 18.5374 -+ 18.5375 -+#input containing multibyte characters 18.5376 -+cat > in <<\EOF 18.5377 -+1234567812345678123456781 18.5378 -+. . . . 18.5379 -+a b c d 18.5380 -+. . . . 18.5381 -+ä ö ü ß 18.5382 -+. . . . 18.5383 -+ äöü . öüä. ä xx 18.5384 -+EOF 18.5385 -+ 18.5386 -+cat > exp <<\EOF 18.5387 -+1234567812345678123456781 18.5388 -+. . . . 18.5389 -+a b c d 18.5390 -+. . . . 18.5391 -+ä ö ü ß 18.5392 -+. . . . 18.5393 -+ äöü . öüä. ä xx 18.5394 -+EOF 18.5395 -+ 18.5396 -+unexpand -a < in > out || fail=1 18.5397 -+compare exp out > /dev/null 2>&1 || fail=1 18.5398 -+ 18.5399 -+ 18.5400 -+#multiple files as an input 18.5401 -+cat >> exp <<\EOF 18.5402 -+1234567812345678123456781 18.5403 -+. . . . 18.5404 -+a b c d 18.5405 -+. . . . 18.5406 -+ä ö ü ß 18.5407 -+. . . . 18.5408 -+ äöü . öüä. ä xx 18.5409 -+EOF 18.5410 -+ 18.5411 -+ 18.5412 -+unexpand -a ./in ./in > out || fail=1 18.5413 -+compare exp out > /dev/null 2>&1 || fail=1 18.5414 -+ 18.5415 -+#test characters with a display width larger than 1 18.5416 -+ 18.5417 -+env printf '12345678 18.5418 -+e |ascii(1) 18.5419 -+\u00E9 |composed(1) 18.5420 -+e\u0301 |decomposed(1) 18.5421 -+\u3000 |ideo-space(2) 18.5422 -+\uFF0D |full-hypen(2) 18.5423 -+' > in || framework_failure_ 18.5424 -+ 18.5425 -+env printf '12345678 18.5426 -+e\t|ascii(1) 18.5427 -+\u00E9\t|composed(1) 18.5428 -+e\u0301\t|decomposed(1) 18.5429 -+\u3000\t|ideo-space(2) 18.5430 -+\uFF0D\t|full-hypen(2) 18.5431 -+' > exp || framework_failure_ 18.5432 -+ 18.5433 -+unexpand -a < in > out || fail=1 18.5434 -+compare exp out > /dev/null 2>&1 || fail=1 18.5435 -+ 18.5436 -+#test input where a blank of width > 1 is not being substituted 18.5437 -+in="$(LC_ALL=en_US.UTF-8 printf ' \u3000 ö ü ß')" 18.5438 -+exp=' 　 ö ü ß' 18.5439 -+ 18.5440 -+unexpand -a < in > out || fail=1 18.5441 -+compare exp out > /dev/null 2>&1 || fail=1 18.5442 -+ 18.5443 -+#non-Unicode characters interspersed between Unicode ones 18.5444 -+env printf '12345678 18.5445 -+ \xFF| 18.5446 -+\xFF | 18.5447 -+ \xFFä| 18.5448 -+ä\xFF | 18.5449 -+ ä\xFF| 18.5450 -+\xFF ä| 18.5451 -+äbcdef\xFF | 18.5452 -+' > in || framework_failure_ 18.5453 -+ 18.5454 -+env printf '12345678 18.5455 -+\t\xFF| 18.5456 -+\xFF\t| 18.5457 -+\t\xFFä| 18.5458 -+ä\xFF\t| 18.5459 -+\tä\xFF| 18.5460 -+\xFF\tä| 18.5461 -+äbcdef\xFF\t| 18.5462 -+' > exp || framework_failure_ 18.5463 -+ 18.5464 -+unexpand -a < in > out || fail=1 18.5465 -+compare exp out > /dev/null 2>&1 || fail=1 18.5466 -+ 18.5467 -+#BOM header test 1 18.5468 -+printf "\xEF\xBB\xBF" > in; cat <<\EOF >> in || framework_failure_ 18.5469 -+1234567812345678123456781 18.5470 -+. . . . 18.5471 -+a b c d 18.5472 -+. . . . 18.5473 -+ä ö ü ß 18.5474 -+. . . . 18.5475 -+ äöü . öüä. ä xx 18.5476 -+EOF 18.5477 -+env printf ' äöü\t. öüä. \tä xx\n' >> in || framework_failure_ 18.5478 -+ 18.5479 -+printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ 18.5480 -+1234567812345678123456781 18.5481 -+. . . . 18.5482 -+a b c d 18.5483 -+. . . . 18.5484 -+ä ö ü ß 18.5485 -+. . . . 18.5486 -+ äöü . öüä. ä xx 18.5487 -+EOF 18.5488 -+ 18.5489 -+unexpand < in > out || fail=1 18.5490 -+compare exp out > /dev/null 2>&1 || fail=1 18.5491 -+ 18.5492 -+LANG=C unexpand < in > out || fail=1 18.5493 -+compare exp out > /dev/null 2>&1 || fail=1 18.5494 -+ 18.5495 -+LC_ALL=C unexpand < in > out || fail=1 18.5496 -+compare exp out > /dev/null 2>&1 || fail=1 18.5497 -+ 18.5498 -+ 18.5499 -+printf "\xEF\xBB\xBF" > exp; cat <<\EOF >> exp || framework_failure_ 18.5500 -+1234567812345678123456781 18.5501 -+. . . . 18.5502 -+a b c d 18.5503 -+. . . . 18.5504 -+ä ö ü ß 18.5505 -+. . . . 18.5506 -+ äöü . öüä. ä xx 18.5507 -+1234567812345678123456781 18.5508 -+. . . . 18.5509 -+a b c d 18.5510 -+. . . . 18.5511 -+ä ö ü ß 18.5512 -+. . . . 18.5513 -+ äöü . öüä. ä xx 18.5514 -+EOF 18.5515 -+ 18.5516 -+ 18.5517 -+unexpand in in > out || fail=1 18.5518 -+compare exp out > /dev/null 2>&1 || fail=1 18.5519 -+ 18.5520 -+LANG=C unexpand in in > out || fail=1 18.5521 -+compare exp out > /dev/null 2>&1 || fail=1 18.5522 -+ 18.5523 -+LC_ALL=C unexpand in in > out || fail=1 18.5524 -+compare exp out > /dev/null 2>&1 || fail=1
19.1 --- a/cups/receipt Sat Feb 24 10:43:01 2018 +0200 19.2 +++ b/cups/receipt Sat Feb 24 16:17:33 2018 +0200 19.3 @@ -15,9 +15,7 @@ 19.4 python pam pam-dev" 19.5 SPLIT="libcups cups cups-pam cups-doc cups-dev" 19.6 19.7 -# Rules to configure and make the package. 19.8 -compile_rules() 19.9 -{ 19.10 +compile_rules() { 19.11 # gid 19 suggested by the BLFS is in use in SliTaz (by cdrom group), 19.12 # using 23 instead 19.13 addgroup -g 23 lpadmin 19.14 @@ -98,9 +96,7 @@ 19.15 done 19.16 } 19.17 19.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 19.19 -genpkg_rules() 19.20 -{ 19.21 +genpkg_rules() { 19.22 case $PACKAGE in 19.23 libcups) 19.24 copy libcups.so*
20.1 --- a/curl/receipt Sat Feb 24 10:43:01 2018 +0200 20.2 +++ b/curl/receipt Sat Feb 24 16:17:33 2018 +0200 20.3 @@ -1,41 +1,42 @@ 20.4 # SliTaz package receipt v2. 20.5 20.6 PACKAGE="curl" 20.7 -VERSION="7.54.0" 20.8 +VERSION="7.55.1" 20.9 CATEGORY="network" 20.10 SHORT_DESC="Tool and libs for transferring files with URL syntax" 20.11 MAINTAINER="pankso@slitaz.org" 20.12 LICENSE="MIT" 20.13 WEB_SITE="https://curl.haxx.se/" 20.14 -HOST_ARCH="i486 arm" 20.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/curl.html" 20.16 20.17 -TARBALL="$PACKAGE-$VERSION.tar.lzma" 20.18 +TARBALL="$PACKAGE-$VERSION.tar.xz" 20.19 WGET_URL="https://curl.haxx.se/download/$TARBALL" 20.20 20.21 BUILD_DEPENDS="zlib-dev openssl-dev libssh2-dev libidn2-dev" 20.22 SPLIT="libcurl curl-dev" 20.23 20.24 -# Rules to configure and make the package. 20.25 -compile_rules() 20.26 -{ 20.27 +compile_rules() { 20.28 ./configure \ 20.29 --disable-static \ 20.30 --enable-threaded-resolver \ 20.31 + --with-ca-path=/etc/ssl/certs \ 20.32 $CONFIGURE_ARGS && 20.33 - make && make install 20.34 + make && make install || return 1 20.35 + 20.36 + rm -rf docs/examples/.deps 20.37 + find docs \( -name Makefile\* -o -name \*.1 -o -name \*.3 \) -exec rm {} \; 20.38 + cook_pick_docs docs/* 20.39 } 20.40 20.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 20.42 -genpkg_rules() 20.43 -{ 20.44 +genpkg_rules() { 20.45 case $PACKAGE in 20.46 curl) 20.47 copy curl 20.48 - DEPENDS="libcrypto libcurl libssl zlib" 20.49 + DEPENDS="libcurl openssl zlib" 20.50 ;; 20.51 libcurl) 20.52 copy *.so* 20.53 - DEPENDS="libcrypto libidn2 libssh2 libssl zlib" 20.54 + DEPENDS="libidn2 libssh2 openssl zlib" 20.55 CAT="network|library" 20.56 ;; 20.57 curl-dev)
21.1 --- a/cyrus-sasl/receipt Sat Feb 24 10:43:01 2018 +0200 21.2 +++ b/cyrus-sasl/receipt Sat Feb 24 16:17:33 2018 +0200 21.3 @@ -12,84 +12,46 @@ 21.4 WGET_URL="ftp://ftp.cyrusimap.org/cyrus-sasl/$TARBALL" 21.5 21.6 BUILD_DEPENDS="automake libtool openldap-dev db-dev openssl-dev krb5-dev pam-dev" 21.7 -SPLIT="libsasl libsasl-without-ldap libsasl-modules cyrus-sasl cyrus-sasl-pam \ 21.8 -cyrus-sasl-dev" 21.9 +SPLIT="libsasl libsasl-modules cyrus-sasl cyrus-sasl-dev \ 21.10 +cyrus-sasl-pam:pam libsasl-without-ldap:wo" 21.11 21.12 -# Rules to configure and make the package. 21.13 -compile_rules() 21.14 -{ 21.15 +compile_rules() { 21.16 autoreconf -fi || return 1 21.17 21.18 mkdir -p $src/saslauthd/cmulocal 21.19 - cp -a $src $src-pam 21.20 - cp -a $src $src-without-ldap 21.21 + 21.22 + case "$SET" in 21.23 + '') SET_ARGS='--enable-auth-sasldb --without-pam --with-ldap';; 21.24 + pam) SET_ARGS='--enable-auth-sasldb --with-pam --with-ldap';; 21.25 + wo) SET_ARGS="--without-pam --disable-anon --disable-cram \ 21.26 + --disable-digest --disable-gssapi --enable-login --disable-otp \ 21.27 + --enable-plain";; 21.28 + esac 21.29 21.30 ./configure \ 21.31 --sysconfdir=/etc \ 21.32 - --enable-auth-sasldb \ 21.33 --with-dbpath=/var/lib/sasl/sasldb2 \ 21.34 --with-saslauthd=/var/run/saslauthd \ 21.35 - --without-pam \ 21.36 --with-devrandom=/dev/urandom \ 21.37 - --with-ldap \ 21.38 --with-openssl \ 21.39 + $SET_ARGS \ 21.40 $CONFIGURE_ARGS && 21.41 make && make install || return 1 21.42 21.43 - cd $src-pam 21.44 - ./configure \ 21.45 - --sysconfdir=/etc \ 21.46 - --enable-auth-sasldb \ 21.47 - --with-dbpath=/var/lib/sasl/sasldb2 \ 21.48 - --with-saslauthd=/var/run/saslauthd \ 21.49 - --with-pam \ 21.50 - --with-devrandom=/dev/urandom \ 21.51 - --with-ldap \ 21.52 - --with-openssl \ 21.53 - $CONFIGURE_ARGS && 21.54 - make && make DESTDIR=$DESTDIR-pam install || return 1 21.55 + cp -a $stuff/etc $install 21.56 + chown -R root:root $inst/etc 21.57 21.58 - for inst in $install $install-pam; do 21.59 - docdir="$inst/usr/share/doc/cyrus-sasl-$VERSION" 21.60 - mkdir -p $docdir && 21.61 - cd $src/doc && 21.62 - cp *.html *.txt ONEWS TODO ../saslauthd/LDAP_SASLAUTHD $docdir && 21.63 - cp -a $stuff/etc $inst && 21.64 - chown -R root:root $inst/etc 21.65 - done 21.66 - 21.67 - cd $src-without-ldap 21.68 - ./configure \ 21.69 - --prefix=/usr \ 21.70 - --infodir=/usr/share/info \ 21.71 - --without-pam \ 21.72 - --disable-anon \ 21.73 - --disable-cram \ 21.74 - --disable-digest \ 21.75 - --disable-gssapi \ 21.76 - --enable-login \ 21.77 - --disable-otp \ 21.78 - --enable-plain \ 21.79 - --with-openssl \ 21.80 - --with-devrandom=/dev/urandom \ 21.81 - --mandir=/usr/share/man $CONFIGURE_ARGS && 21.82 - make && make DESTDIR=$DESTDIR-without-ldap install 21.83 + cook_pick_docs doc/*.html doc/*.txt doc/ONEWS doc/TODO \ 21.84 + saslauthd/LDAP_SASLAUTHD 21.85 } 21.86 21.87 -# Rules to gen a SliTaz package suitable for Tazpkg. 21.88 -genpkg_rules() 21.89 -{ 21.90 +genpkg_rules() { 21.91 case $PACKAGE in 21.92 libsasl) 21.93 copy libsasl2*.so* 21.94 CAT="system-tools|library" 21.95 DEPENDS=" " 21.96 ;; 21.97 - libsasl-without-ldap) 21.98 - install=$install-without-ldap copy libsasl2*.so* 21.99 - CAT="system-tools|library" 21.100 - DEPENDS=" " 21.101 - ;; 21.102 libsasl-modules) 21.103 copy sasl2/*.so* 21.104 CAT="system-tools|library modules" 21.105 @@ -97,21 +59,25 @@ 21.106 DEPENDS="libcomerr3 libcrypto libdb libkrb5" 21.107 ;; 21.108 cyrus-sasl) 21.109 - copy @std 21.110 - remove_already_packed 21.111 + copy @std @rm 21.112 DEPENDS="libcomerr3 libcrypto libdb libkrb5 libldap \ 21.113 libsasl libsasl-modules libssl" 21.114 ;; 21.115 + *-dev) 21.116 + copy @dev 21.117 + DEPENDS="db-dev krb5-dev libcrypto-dev" 21.118 + ;; 21.119 cyrus-sasl-pam) 21.120 - install=$install-pam copy @std 21.121 + copy @std 21.122 rm -rf $fs/usr/lib 21.123 CAT="network|using PAM" 21.124 DEPENDS="libcomerr3 libcrypto libdb libkrb5 libldap \ 21.125 libsasl libsasl-modules libssl pam" 21.126 ;; 21.127 - *-dev) 21.128 - copy @dev 21.129 - DEPENDS="db-dev krb5-dev libcrypto-dev" 21.130 + libsasl-without-ldap) 21.131 + copy libsasl2*.so* 21.132 + CAT="system-tools|library" 21.133 + DEPENDS=" " 21.134 ;; 21.135 esac 21.136 }
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/cyrus-sasl/stuff/patches/cyrus-sasl-2.1.26-openssl-1.1.0-1.patch Sat Feb 24 16:17:33 2018 +0200 22.3 @@ -0,0 +1,447 @@ 22.4 +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> 22.5 +Date: 2017-05-27 22.6 +Initial Package Version: 2.1.26 22.7 +Upstream Status: Comitted 22.8 +Origin: https://github.com/cyrusimap/cyrus-sasl/commit/f607d99bf6e3e2074ab925f96765488f29b821ec 22.9 + https://github.com/cyrusimap/cyrus-sasl/commit/4c8e3f24bb943386a67b4de65bb849f562499dd0 22.10 + https://github.com/cyrusimap/cyrus-sasl/commit/652334b7701e9394b195d33183cb7ccd916296e8 22.11 + https://github.com/cyrusimap/cyrus-sasl/commit/4f3c6beac5a6db053f1d1309353fde6e653d026c 22.12 + https://github.com/cyrusimap/cyrus-sasl/commit/68fac2fb7166cb482a405f6c6613bce4c982a77e 22.13 +Description: Allow to build with OpenSSL-1.1.0. 22.14 + 22.15 + 22.16 +diff -Naurp cyrus-sasl-2.1.26-orig/plugins/ntlm.c cyrus-sasl-2.1.26/plugins/ntlm.c 22.17 +--- cyrus-sasl-2.1.26-orig/plugins/ntlm.c 2012-01-27 17:31:36.000000000 -0600 22.18 ++++ cyrus-sasl-2.1.26/plugins/ntlm.c 2017-05-26 23:42:19.293372476 -0500 22.19 +@@ -417,6 +417,29 @@ static unsigned char *P24(unsigned char 22.20 + return P24; 22.21 + } 22.22 + 22.23 ++static HMAC_CTX *_plug_HMAC_CTX_new(const sasl_utils_t *utils) 22.24 ++{ 22.25 ++ utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_new()"); 22.26 ++ 22.27 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L 22.28 ++ return HMAC_CTX_new(); 22.29 ++#else 22.30 ++ return utils->malloc(sizeof(HMAC_CTX)); 22.31 ++#endif 22.32 ++} 22.33 ++ 22.34 ++static void _plug_HMAC_CTX_free(HMAC_CTX *ctx, const sasl_utils_t *utils) 22.35 ++{ 22.36 ++ utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_free()"); 22.37 ++ 22.38 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L 22.39 ++ HMAC_CTX_free(ctx); 22.40 ++#else 22.41 ++ HMAC_cleanup(ctx); 22.42 ++ utils->free(ctx); 22.43 ++#endif 22.44 ++} 22.45 ++ 22.46 + static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd, 22.47 + const char *authid, const char *target, 22.48 + const unsigned char *challenge, 22.49 +@@ -424,7 +447,7 @@ static unsigned char *V2(unsigned char * 22.50 + const sasl_utils_t *utils, 22.51 + char **buf, unsigned *buflen, int *result) 22.52 + { 22.53 +- HMAC_CTX ctx; 22.54 ++ HMAC_CTX *ctx = NULL; 22.55 + unsigned char hash[EVP_MAX_MD_SIZE]; 22.56 + char *upper; 22.57 + unsigned int len; 22.58 +@@ -435,6 +458,10 @@ static unsigned char *V2(unsigned char * 22.59 + SETERROR(utils, "cannot allocate NTLMv2 hash"); 22.60 + *result = SASL_NOMEM; 22.61 + } 22.62 ++ else if ((ctx = _plug_HMAC_CTX_new(utils)) == NULL) { 22.63 ++ SETERROR(utils, "cannot allocate HMAC CTX"); 22.64 ++ *result = SASL_NOMEM; 22.65 ++ } 22.66 + else { 22.67 + /* NTLMv2hash = HMAC-MD5(NTLMhash, unicode(ucase(authid + domain))) */ 22.68 + P16_nt(hash, passwd, utils, buf, buflen, result); 22.69 +@@ -449,17 +476,18 @@ static unsigned char *V2(unsigned char * 22.70 + HMAC(EVP_md5(), hash, MD4_DIGEST_LENGTH, *buf, 2 * len, hash, &len); 22.71 + 22.72 + /* V2 = HMAC-MD5(NTLMv2hash, challenge + blob) + blob */ 22.73 +- HMAC_Init(&ctx, hash, len, EVP_md5()); 22.74 +- HMAC_Update(&ctx, challenge, NTLM_NONCE_LENGTH); 22.75 +- HMAC_Update(&ctx, blob, bloblen); 22.76 +- HMAC_Final(&ctx, V2, &len); 22.77 +- HMAC_cleanup(&ctx); 22.78 ++ HMAC_Init_ex(ctx, hash, len, EVP_md5(), NULL); 22.79 ++ HMAC_Update(ctx, challenge, NTLM_NONCE_LENGTH); 22.80 ++ HMAC_Update(ctx, blob, bloblen); 22.81 ++ HMAC_Final(ctx, V2, &len); 22.82 + 22.83 + /* the blob is concatenated outside of this function */ 22.84 + 22.85 + *result = SASL_OK; 22.86 + } 22.87 + 22.88 ++ if (ctx) _plug_HMAC_CTX_free(ctx, utils); 22.89 ++ 22.90 + return V2; 22.91 + } 22.92 + 22.93 +diff -Naurp cyrus-sasl-2.1.26-orig/plugins/otp.c cyrus-sasl-2.1.26/plugins/otp.c 22.94 +--- cyrus-sasl-2.1.26-orig/plugins/otp.c 2012-10-12 09:05:48.000000000 -0500 22.95 ++++ cyrus-sasl-2.1.26/plugins/otp.c 2017-05-26 23:42:19.293372476 -0500 22.96 +@@ -96,6 +96,28 @@ static algorithm_option_t algorithm_opti 22.97 + {NULL, 0, NULL} 22.98 + }; 22.99 + 22.100 ++static EVP_MD_CTX *_plug_EVP_MD_CTX_new(const sasl_utils_t *utils) 22.101 ++{ 22.102 ++ utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_new()"); 22.103 ++ 22.104 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L 22.105 ++ return EVP_MD_CTX_new(); 22.106 ++#else 22.107 ++ return utils->malloc(sizeof(EVP_MD_CTX)); 22.108 ++#endif 22.109 ++} 22.110 ++ 22.111 ++static void _plug_EVP_MD_CTX_free(EVP_MD_CTX *ctx, const sasl_utils_t *utils) 22.112 ++{ 22.113 ++ utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_free()"); 22.114 ++ 22.115 ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L 22.116 ++ EVP_MD_CTX_free(ctx); 22.117 ++#else 22.118 ++ utils->free(ctx); 22.119 ++#endif 22.120 ++} 22.121 ++ 22.122 + /* Convert the binary data into ASCII hex */ 22.123 + void bin2hex(unsigned char *bin, int binlen, char *hex) 22.124 + { 22.125 +@@ -116,17 +138,16 @@ void bin2hex(unsigned char *bin, int bin 22.126 + * swabbing bytes if necessary. 22.127 + */ 22.128 + static void otp_hash(const EVP_MD *md, char *in, size_t inlen, 22.129 +- unsigned char *out, int swab) 22.130 ++ unsigned char *out, int swab, EVP_MD_CTX *mdctx) 22.131 + { 22.132 +- EVP_MD_CTX mdctx; 22.133 +- char hash[EVP_MAX_MD_SIZE]; 22.134 ++ unsigned char hash[EVP_MAX_MD_SIZE]; 22.135 + unsigned int i; 22.136 + int j; 22.137 + unsigned hashlen; 22.138 + 22.139 +- EVP_DigestInit(&mdctx, md); 22.140 +- EVP_DigestUpdate(&mdctx, in, inlen); 22.141 +- EVP_DigestFinal(&mdctx, hash, &hashlen); 22.142 ++ EVP_DigestInit(mdctx, md); 22.143 ++ EVP_DigestUpdate(mdctx, in, inlen); 22.144 ++ EVP_DigestFinal(mdctx, hash, &hashlen); 22.145 + 22.146 + /* Fold the result into 64 bits */ 22.147 + for (i = OTP_HASH_SIZE; i < hashlen; i++) { 22.148 +@@ -149,7 +170,9 @@ static int generate_otp(const sasl_utils 22.149 + char *secret, char *otp) 22.150 + { 22.151 + const EVP_MD *md; 22.152 +- char *key; 22.153 ++ EVP_MD_CTX *mdctx = NULL; 22.154 ++ char *key = NULL; 22.155 ++ int r = SASL_OK; 22.156 + 22.157 + if (!(md = EVP_get_digestbyname(alg->evp_name))) { 22.158 + utils->seterror(utils->conn, 0, 22.159 +@@ -157,23 +180,32 @@ static int generate_otp(const sasl_utils 22.160 + return SASL_FAIL; 22.161 + } 22.162 + 22.163 ++ if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) { 22.164 ++ SETERROR(utils, "cannot allocate MD CTX"); 22.165 ++ r = SASL_NOMEM; 22.166 ++ goto done; 22.167 ++ } 22.168 ++ 22.169 + if ((key = utils->malloc(strlen(seed) + strlen(secret) + 1)) == NULL) { 22.170 + SETERROR(utils, "cannot allocate OTP key"); 22.171 +- return SASL_NOMEM; 22.172 ++ r = SASL_NOMEM; 22.173 ++ goto done; 22.174 + } 22.175 + 22.176 + /* initial step */ 22.177 + strcpy(key, seed); 22.178 + strcat(key, secret); 22.179 +- otp_hash(md, key, strlen(key), otp, alg->swab); 22.180 ++ otp_hash(md, key, strlen(key), otp, alg->swab, mdctx); 22.181 + 22.182 + /* computation step */ 22.183 + while (seq-- > 0) 22.184 +- otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab); 22.185 +- 22.186 +- utils->free(key); 22.187 ++ otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab, mdctx); 22.188 ++ 22.189 ++ done: 22.190 ++ if (key) utils->free(key); 22.191 ++ if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils); 22.192 + 22.193 +- return SASL_OK; 22.194 ++ return r; 22.195 + } 22.196 + 22.197 + static int parse_challenge(const sasl_utils_t *utils, 22.198 +@@ -693,7 +725,8 @@ static int strptrcasecmp(const void *arg 22.199 + 22.200 + /* Convert the 6 words into binary data */ 22.201 + static int word2bin(const sasl_utils_t *utils, 22.202 +- char *words, unsigned char *bin, const EVP_MD *md) 22.203 ++ char *words, unsigned char *bin, const EVP_MD *md, 22.204 ++ EVP_MD_CTX *mdctx) 22.205 + { 22.206 + int i, j; 22.207 + char *c, *word, buf[OTP_RESPONSE_MAX+1]; 22.208 +@@ -752,13 +785,12 @@ static int word2bin(const sasl_utils_t * 22.209 + 22.210 + /* alternate dictionary */ 22.211 + if (alt_dict) { 22.212 +- EVP_MD_CTX mdctx; 22.213 +- char hash[EVP_MAX_MD_SIZE]; 22.214 +- int hashlen; 22.215 ++ unsigned char hash[EVP_MAX_MD_SIZE]; 22.216 ++ unsigned hashlen; 22.217 + 22.218 +- EVP_DigestInit(&mdctx, md); 22.219 +- EVP_DigestUpdate(&mdctx, word, strlen(word)); 22.220 +- EVP_DigestFinal(&mdctx, hash, &hashlen); 22.221 ++ EVP_DigestInit(mdctx, md); 22.222 ++ EVP_DigestUpdate(mdctx, word, strlen(word)); 22.223 ++ EVP_DigestFinal(mdctx, hash, &hashlen); 22.224 + 22.225 + /* use lowest 11 bits */ 22.226 + x = ((hash[hashlen-2] & 0x7) << 8) | hash[hashlen-1]; 22.227 +@@ -802,6 +834,7 @@ static int verify_response(server_contex 22.228 + char *response) 22.229 + { 22.230 + const EVP_MD *md; 22.231 ++ EVP_MD_CTX *mdctx = NULL; 22.232 + char *c; 22.233 + int do_init = 0; 22.234 + unsigned char cur_otp[OTP_HASH_SIZE], prev_otp[OTP_HASH_SIZE]; 22.235 +@@ -815,6 +848,11 @@ static int verify_response(server_contex 22.236 + return SASL_FAIL; 22.237 + } 22.238 + 22.239 ++ if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) { 22.240 ++ SETERROR(utils, "cannot allocate MD CTX"); 22.241 ++ return SASL_NOMEM; 22.242 ++ } 22.243 ++ 22.244 + /* eat leading whitespace */ 22.245 + c = response; 22.246 + while (isspace((int) *c)) c++; 22.247 +@@ -824,7 +862,7 @@ static int verify_response(server_contex 22.248 + r = hex2bin(c+strlen(OTP_HEX_TYPE), cur_otp, OTP_HASH_SIZE); 22.249 + } 22.250 + else if (!strncasecmp(c, OTP_WORD_TYPE, strlen(OTP_WORD_TYPE))) { 22.251 +- r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md); 22.252 ++ r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md, mdctx); 22.253 + } 22.254 + else if (!strncasecmp(c, OTP_INIT_HEX_TYPE, 22.255 + strlen(OTP_INIT_HEX_TYPE))) { 22.256 +@@ -834,7 +872,7 @@ static int verify_response(server_contex 22.257 + else if (!strncasecmp(c, OTP_INIT_WORD_TYPE, 22.258 + strlen(OTP_INIT_WORD_TYPE))) { 22.259 + do_init = 1; 22.260 +- r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md); 22.261 ++ r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md, mdctx); 22.262 + } 22.263 + else { 22.264 + SETERROR(utils, "unknown OTP extended response type"); 22.265 +@@ -843,14 +881,15 @@ static int verify_response(server_contex 22.266 + } 22.267 + else { 22.268 + /* standard response, try word first, and then hex */ 22.269 +- r = word2bin(utils, c, cur_otp, md); 22.270 ++ r = word2bin(utils, c, cur_otp, md, mdctx); 22.271 + if (r != SASL_OK) 22.272 + r = hex2bin(c, cur_otp, OTP_HASH_SIZE); 22.273 + } 22.274 + 22.275 + if (r == SASL_OK) { 22.276 + /* do one more hash (previous otp) and compare to stored otp */ 22.277 +- otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab); 22.278 ++ otp_hash(md, (char *) cur_otp, OTP_HASH_SIZE, 22.279 ++ prev_otp, text->alg->swab, mdctx); 22.280 + 22.281 + if (!memcmp(prev_otp, text->otp, OTP_HASH_SIZE)) { 22.282 + /* update the secret with this seq/otp */ 22.283 +@@ -879,23 +918,28 @@ static int verify_response(server_contex 22.284 + *new_resp++ = '\0'; 22.285 + } 22.286 + 22.287 +- if (!(new_chal && new_resp)) 22.288 +- return SASL_BADAUTH; 22.289 ++ if (!(new_chal && new_resp)) { 22.290 ++ r = SASL_BADAUTH; 22.291 ++ goto done; 22.292 ++ } 22.293 + 22.294 + if ((r = parse_challenge(utils, new_chal, &alg, &seq, seed, 1)) 22.295 + != SASL_OK) { 22.296 +- return r; 22.297 ++ goto done; 22.298 + } 22.299 + 22.300 +- if (seq < 1 || !strcasecmp(seed, text->seed)) 22.301 +- return SASL_BADAUTH; 22.302 ++ if (seq < 1 || !strcasecmp(seed, text->seed)) { 22.303 ++ r = SASL_BADAUTH; 22.304 ++ goto done; 22.305 ++ } 22.306 + 22.307 + /* find the MDA */ 22.308 + if (!(md = EVP_get_digestbyname(alg->evp_name))) { 22.309 + utils->seterror(utils->conn, 0, 22.310 + "OTP algorithm %s is not available", 22.311 + alg->evp_name); 22.312 +- return SASL_BADAUTH; 22.313 ++ r = SASL_BADAUTH; 22.314 ++ goto done; 22.315 + } 22.316 + 22.317 + if (!strncasecmp(c, OTP_INIT_HEX_TYPE, strlen(OTP_INIT_HEX_TYPE))) { 22.318 +@@ -903,7 +947,7 @@ static int verify_response(server_contex 22.319 + } 22.320 + else if (!strncasecmp(c, OTP_INIT_WORD_TYPE, 22.321 + strlen(OTP_INIT_WORD_TYPE))) { 22.322 +- r = word2bin(utils, new_resp, new_otp, md); 22.323 ++ r = word2bin(utils, new_resp, new_otp, md, mdctx); 22.324 + } 22.325 + 22.326 + if (r == SASL_OK) { 22.327 +@@ -914,7 +958,10 @@ static int verify_response(server_contex 22.328 + memcpy(text->otp, new_otp, OTP_HASH_SIZE); 22.329 + } 22.330 + } 22.331 +- 22.332 ++ 22.333 ++ done: 22.334 ++ if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils); 22.335 ++ 22.336 + return r; 22.337 + } 22.338 + 22.339 +diff -Naurp cyrus-sasl-2.1.26-orig/saslauthd/lak.c cyrus-sasl-2.1.26/saslauthd/lak.c 22.340 +--- cyrus-sasl-2.1.26-orig/saslauthd/lak.c 2012-10-12 09:05:48.000000000 -0500 22.341 ++++ cyrus-sasl-2.1.26/saslauthd/lak.c 2017-05-26 23:42:19.293372476 -0500 22.342 +@@ -61,6 +61,35 @@ 22.343 + #include <sasl.h> 22.344 + #include "lak.h" 22.345 + 22.346 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L 22.347 ++static EVP_MD_CTX *EVP_MD_CTX_new(void) 22.348 ++{ 22.349 ++ return EVP_MD_CTX_create(); 22.350 ++} 22.351 ++static void EVP_MD_CTX_free(EVP_MD_CTX *ctx) 22.352 ++{ 22.353 ++ if (ctx == NULL) 22.354 ++ return; 22.355 ++ 22.356 ++ EVP_MD_CTX_destroy(ctx); 22.357 ++} 22.358 ++ 22.359 ++static EVP_ENCODE_CTX *EVP_ENCODE_CTX_new(void) 22.360 ++{ 22.361 ++ EVP_ENCODE_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); 22.362 ++ 22.363 ++ if (ctx != NULL) { 22.364 ++ memset(ctx, 0, sizeof(*ctx)); 22.365 ++ } 22.366 ++ return ctx; 22.367 ++} 22.368 ++static void EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx) 22.369 ++{ 22.370 ++ OPENSSL_free(ctx); 22.371 ++ return; 22.372 ++} 22.373 ++#endif 22.374 ++ 22.375 + typedef struct lak_auth_method { 22.376 + int method; 22.377 + int (*check) (LAK *lak, const char *user, const char *service, const char *realm, const char *password) ; 22.378 +@@ -1715,20 +1744,28 @@ static int lak_base64_decode( 22.379 + 22.380 + int rc, i, tlen = 0; 22.381 + char *text; 22.382 +- EVP_ENCODE_CTX EVP_ctx; 22.383 ++ EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new(); 22.384 + 22.385 +- text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1); 22.386 + if (text == NULL) 22.387 + return LAK_NOMEM; 22.388 + 22.389 +- EVP_DecodeInit(&EVP_ctx); 22.390 +- rc = EVP_DecodeUpdate(&EVP_ctx, text, &i, (char *)src, strlen(src)); 22.391 ++ text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1); 22.392 ++ if (text == NULL) { 22.393 ++ EVP_ENCODE_CTX_free(enc_ctx); 22.394 ++ return LAK_NOMEM; 22.395 ++ } 22.396 ++ 22.397 ++ EVP_DecodeInit(enc_ctx); 22.398 ++ rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src)); 22.399 + if (rc < 0) { 22.400 ++ EVP_ENCODE_CTX_free(enc_ctx); 22.401 + free(text); 22.402 + return LAK_FAIL; 22.403 + } 22.404 + tlen += i; 22.405 +- EVP_DecodeFinal(&EVP_ctx, text, &i); 22.406 ++ EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i); 22.407 ++ 22.408 ++ EVP_ENCODE_CTX_free(enc_ctx); 22.409 + 22.410 + *ret = text; 22.411 + if (rlen != NULL) 22.412 +@@ -1744,7 +1781,7 @@ static int lak_check_hashed( 22.413 + { 22.414 + int rc, clen; 22.415 + LAK_HASH_ROCK *hrock = (LAK_HASH_ROCK *) rock; 22.416 +- EVP_MD_CTX mdctx; 22.417 ++ EVP_MD_CTX *mdctx; 22.418 + const EVP_MD *md; 22.419 + unsigned char digest[EVP_MAX_MD_SIZE]; 22.420 + char *cred; 22.421 +@@ -1753,17 +1790,24 @@ static int lak_check_hashed( 22.422 + if (!md) 22.423 + return LAK_FAIL; 22.424 + 22.425 ++ mdctx = EVP_MD_CTX_new(); 22.426 ++ if (!mdctx) 22.427 ++ return LAK_NOMEM; 22.428 ++ 22.429 + rc = lak_base64_decode(hash, &cred, &clen); 22.430 +- if (rc != LAK_OK) 22.431 ++ if (rc != LAK_OK) { 22.432 ++ EVP_MD_CTX_free(mdctx); 22.433 + return rc; 22.434 ++ } 22.435 + 22.436 +- EVP_DigestInit(&mdctx, md); 22.437 +- EVP_DigestUpdate(&mdctx, passwd, strlen(passwd)); 22.438 ++ EVP_DigestInit(mdctx, md); 22.439 ++ EVP_DigestUpdate(mdctx, passwd, strlen(passwd)); 22.440 + if (hrock->salted) { 22.441 +- EVP_DigestUpdate(&mdctx, &cred[EVP_MD_size(md)], 22.442 ++ EVP_DigestUpdate(mdctx, &cred[EVP_MD_size(md)], 22.443 + clen - EVP_MD_size(md)); 22.444 + } 22.445 +- EVP_DigestFinal(&mdctx, digest, NULL); 22.446 ++ EVP_DigestFinal(mdctx, digest, NULL); 22.447 ++ EVP_MD_CTX_free(mdctx); 22.448 + 22.449 + rc = memcmp((char *)cred, (char *)digest, EVP_MD_size(md)); 22.450 + free(cred);
23.1 --- a/cyrus-sasl/stuff/patches/series Sat Feb 24 10:43:01 2018 +0200 23.2 +++ b/cyrus-sasl/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 23.3 @@ -1,1 +1,3 @@ 23.4 +# from BLFS 23.5 cyrus-sasl-2.1.26-fixes-3.patch 23.6 +cyrus-sasl-2.1.26-openssl-1.1.0-1.patch
24.1 --- a/db/receipt Sat Feb 24 10:43:01 2018 +0200 24.2 +++ b/db/receipt Sat Feb 24 16:17:33 2018 +0200 24.3 @@ -7,17 +7,13 @@ 24.4 MAINTAINER="pascal.bellard@slitaz.org" 24.5 LICENSE="BSD" 24.6 WEB_SITE="https://www.oracle.com/database/berkeley-db/db.html" 24.7 -TAGS="database" 24.8 -HOST_ARCH="i486 arm" 24.9 24.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 24.11 WGET_URL="http://download.oracle.com/berkeley-db/$TARBALL" 24.12 24.13 SPLIT="libdb libdb-cxx db-dev" 24.14 24.15 -# Rules to configure and make the package. 24.16 -compile_rules() 24.17 -{ 24.18 +compile_rules() { 24.19 cd $src/build_unix 24.20 ../dist/configure \ 24.21 --enable-cxx \ 24.22 @@ -29,13 +25,12 @@ 24.23 make docdir=/usr/share/doc/$PACKAGE-$VERSION install 24.24 } 24.25 24.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 24.27 -genpkg_rules() 24.28 -{ 24.29 +genpkg_rules() { 24.30 case $PACKAGE in 24.31 db) 24.32 copy bin/ 24.33 DEPENDS="libdb" 24.34 + TAGS="database" 24.35 ;; 24.36 libdb) 24.37 copy libdb-*so libdb.so
25.1 --- a/dbus-glib/receipt Sat Feb 24 10:43:01 2018 +0200 25.2 +++ b/dbus-glib/receipt Sat Feb 24 16:17:33 2018 +0200 25.3 @@ -8,7 +8,6 @@ 25.4 LICENSE="GPL2" 25.5 WEB_SITE="https://freedesktop.org/wiki/Software/DBusBindings/#dbus-glibobsoleteunmaintained" 25.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/dbus-glib.html" 25.7 -HOST_ARCH="i486 arm" 25.8 25.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 25.10 WGET_URL="http://dbus.freedesktop.org/releases/dbus-glib/$TARBALL" 25.11 @@ -17,7 +16,6 @@ 25.12 BUILD_DEPENDS="dbus-dev glib-dev expat-dev gettext gtk-doc" 25.13 SPLIT="dbus-glib-dev" 25.14 25.15 - 25.16 compile_rules() { 25.17 case "$ARCH" in 25.18 arm*) export ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} ;;
26.1 --- a/dbus/receipt Sat Feb 24 10:43:01 2018 +0200 26.2 +++ b/dbus/receipt Sat Feb 24 16:17:33 2018 +0200 26.3 @@ -8,22 +8,21 @@ 26.4 LICENSE="GPL2" 26.5 WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/" 26.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/dbus.html" 26.7 -HOST_ARCH="i486 arm" 26.8 26.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 26.10 WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL" 26.11 26.12 BUILD_DEPENDS="expat-dev xorg-libX11-dev glib-dev xorg-libICE-dev \ 26.13 -xorg-libSM-dev libxslt xmlto libxml2-tools docbook-xsl" 26.14 +xorg-libSM-dev libxslt xmlto libxml2-tools" # docbook-xsl 26.15 SPLIT="dbus-helper dbus-introspect dbus dbus-dev" 26.16 26.17 -# Rules to configure and make the package. 26.18 -compile_rules() 26.19 -{ 26.20 +compile_rules() { 26.21 + # temporarily: --disable-xml-docs 26.22 ./configure \ 26.23 --sysconfdir=/etc \ 26.24 --localstatedir=/var \ 26.25 --disable-doxygen-docs \ 26.26 + --disable-xml-docs \ 26.27 --disable-static \ 26.28 --docdir=/usr/share/doc/dbus-$VERSION \ 26.29 --with-console-auth-dir=/run/console/ \
27.1 --- a/desktop-file-utils/receipt Sat Feb 24 10:43:01 2018 +0200 27.2 +++ b/desktop-file-utils/receipt Sat Feb 24 16:17:33 2018 +0200 27.3 @@ -14,9 +14,7 @@ 27.4 BUILD_DEPENDS="pkg-config glib-dev" 27.5 SPLIT="desktop-file-validate-static desktop-file-utils-extra" 27.6 27.7 -# Rules to configure and make the package. 27.8 -compile_rules() 27.9 -{ 27.10 +compile_rules() { 27.11 ./configure $CONFIGURE_ARGS && make && make install && 27.12 27.13 make clean && 27.14 @@ -27,9 +25,7 @@ 27.15 make && make bin_PROGRAMS=desktop-file-validate LN_S=echo install 27.16 } 27.17 27.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 27.19 -genpkg_rules() 27.20 -{ 27.21 +genpkg_rules() { 27.22 val='desktop-file-validate' 27.23 case $PACKAGE in 27.24 desktop-file-utils)
28.1 --- a/dialog/receipt Sat Feb 24 10:43:01 2018 +0200 28.2 +++ b/dialog/receipt Sat Feb 24 16:17:33 2018 +0200 28.3 @@ -7,7 +7,6 @@ 28.4 MAINTAINER="pankso@slitaz.org" 28.5 LICENSE="LGPL2.1" 28.6 WEB_SITE="http://invisible-island.net/dialog/" 28.7 -HOST_ARCH="i486 arm" 28.8 28.9 TARBALL="$PACKAGE-$VERSION.tgz" 28.10 WGET_URL="ftp://ftp.invisible-island.net/dialog/$TARBALL" 28.11 @@ -15,9 +14,7 @@ 28.12 BUILD_DEPENDS="ncurses-dev gettext" 28.13 SPLIT="dialog-dev" 28.14 28.15 -# Rules to configure and make the package. 28.16 -compile_rules() 28.17 -{ 28.18 +compile_rules() { 28.19 ./configure \ 28.20 --prefix=/usr \ 28.21 --sysconfdir=/etc \ 28.22 @@ -25,16 +22,14 @@ 28.23 --enable-nls \ 28.24 --enable-widec \ 28.25 $CONFIGURE_ARGS && 28.26 - make && make DESTDIR=$DESTDIR install 28.27 + make && make DESTDIR=$DESTDIR install || return 1 28.28 28.29 # Config file. 28.30 mkdir -p $install/etc 28.31 cp $stuff/dialogrc $install/etc 28.32 } 28.33 28.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 28.35 -genpkg_rules() 28.36 -{ 28.37 +genpkg_rules() { 28.38 case $PACKAGE in 28.39 dialog) 28.40 copy @std
29.1 --- a/docbook-dsssl/receipt Sat Feb 24 10:43:01 2018 +0200 29.2 +++ b/docbook-dsssl/receipt Sat Feb 24 16:17:33 2018 +0200 29.3 @@ -11,9 +11,7 @@ 29.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 29.5 WGET_URL="$SF_MIRROR/docbook/$TARBALL" 29.6 29.7 -# Rules to configure and make the package. 29.8 -compile_rules() 29.9 -{ 29.10 +compile_rules() { 29.11 mkdir -p \ 29.12 $install/usr/bin \ 29.13 $install/usr/share/man/man1 \ 29.14 @@ -24,9 +22,7 @@ 29.15 cp -R * $install/usr/share/sgml/docbook/dsssl-stylesheets-$VERSION 29.16 } 29.17 29.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 29.19 -genpkg_rules() 29.20 -{ 29.21 +genpkg_rules() { 29.22 copy bin/ *.dcl *.dtd *.gml *.dsl *.ent *.sgm *.mod *.css *.js \ 29.23 frames/*.htm *.gif catalog VERSION 29.24 DEPENDS="sgml-common"
30.1 --- a/docbook-sgml/receipt Sat Feb 24 10:43:01 2018 +0200 30.2 +++ b/docbook-sgml/receipt Sat Feb 24 16:17:33 2018 +0200 30.3 @@ -12,9 +12,7 @@ 30.4 TARBALL="docbook-$VERSION.zip" 30.5 WGET_URL="http://www.docbook.org/sgml/$VERSION/$TARBALL" 30.6 30.7 -# Rules to configure and make the package. 30.8 -compile_rules() 30.9 -{ 30.10 +compile_rules() { 30.11 sed -i -e '/ISO 8879/d' \ 30.12 -e '/gml/d' docbook.cat 30.13 30.14 @@ -40,9 +38,7 @@ 30.15 touch $install/etc/sgml/catalog 30.16 } 30.17 30.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 30.19 -genpkg_rules() 30.20 -{ 30.21 +genpkg_rules() { 30.22 copy @std 30.23 DEPENDS="sgml-common" 30.24 CONFIG_FILES="/etc/sgml/catalog"
31.1 --- a/docbook-sgml3/receipt Sat Feb 24 10:43:01 2018 +0200 31.2 +++ b/docbook-sgml3/receipt Sat Feb 24 16:17:33 2018 +0200 31.3 @@ -12,9 +12,7 @@ 31.4 TARBALL="docbk31.zip" 31.5 WGET_URL="http://www.docbook.org/sgml/3.1/$TARBALL" 31.6 31.7 -# Rules to configure and make the package. 31.8 -compile_rules() 31.9 -{ 31.10 +compile_rules() { 31.11 sed -i -e '/ISO 8879/d' \ 31.12 -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' \ 31.13 docbook.cat 31.14 @@ -37,9 +35,7 @@ 31.15 touch $install/etc/sgml/catalog 31.16 } 31.17 31.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 31.19 -genpkg_rules() 31.20 -{ 31.21 +genpkg_rules() { 31.22 copy @std 31.23 DEPENDS="sgml-common" 31.24 CONFIG_FILES="/etc/sgml/catalog"
32.1 --- a/docbook-utils/receipt Sat Feb 24 10:43:01 2018 +0200 32.2 +++ b/docbook-utils/receipt Sat Feb 24 16:17:33 2018 +0200 32.3 @@ -13,9 +13,7 @@ 32.4 32.5 BUILD_DEPENDS="openjade docbook-dsssl docbook-sgml3" 32.6 32.7 -# Rules to configure and make the package. 32.8 -compile_rules() 32.9 -{ 32.10 +compile_rules() { 32.11 sed -i 's:/html::' doc/HTML/Makefile.in 32.12 32.13 ./configure \ 32.14 @@ -30,9 +28,7 @@ 32.15 done 32.16 } 32.17 32.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 32.19 -genpkg_rules() 32.20 -{ 32.21 +genpkg_rules() { 32.22 copy @std 32.23 DEPENDS="perl openjade docbook-dsssl docbook-sgml docbook-sgml3 perl-sgmlspm" 32.24 }
33.1 --- a/docbook-xml-412/receipt Sat Feb 24 10:43:01 2018 +0200 33.2 +++ b/docbook-xml-412/receipt Sat Feb 24 16:17:33 2018 +0200 33.3 @@ -1,4 +1,4 @@ 33.4 -# SliTaz package receipt. 33.5 +# SliTaz package receipt v2. 33.6 33.7 PACKAGE="docbook-xml-412" 33.8 VERSION="4.1.2" 33.9 @@ -11,19 +11,14 @@ 33.10 TARBALL="docbkx412.zip" 33.11 WGET_URL="http://www.docbook.org/xml/$VERSION/$TARBALL" 33.12 33.13 -DEPENDS="libxml2-tools libxml2" 33.14 - 33.15 -# Rules to configure and make the package. 33.16 -compile_rules() 33.17 -{ 33.18 +compile_rules() { 33.19 mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-${VERSION} 33.20 cp -dRf docbook.cat *.dtd ent/ *.mod \ 33.21 $DESTDIR/usr/share/xml/docbook/xml-dtd-${VERSION} 33.22 } 33.23 33.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 33.25 -genpkg_rules() 33.26 -{ 33.27 +genpkg_rules() { 33.28 mkdir -p $fs 33.29 cp -a $install/usr $fs 33.30 + DEPENDS="libxml2-tools libxml2" 33.31 }
34.1 --- a/docbook-xml-42/receipt Sat Feb 24 10:43:01 2018 +0200 34.2 +++ b/docbook-xml-42/receipt Sat Feb 24 16:17:33 2018 +0200 34.3 @@ -1,4 +1,4 @@ 34.4 -# SliTaz package receipt. 34.5 +# SliTaz package receipt v2. 34.6 34.7 PACKAGE="docbook-xml-42" 34.8 VERSION="4.2" 34.9 @@ -11,19 +11,14 @@ 34.10 TARBALL="docbook-xml-$VERSION.zip" 34.11 WGET_URL="http://www.docbook.org/xml/$VERSION/$TARBALL" 34.12 34.13 -DEPENDS="libxml2-tools libxml2" 34.14 - 34.15 -# Rules to configure and make the package. 34.16 -compile_rules() 34.17 -{ 34.18 +compile_rules() { 34.19 mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION 34.20 cp -dRf docbook.cat *.dtd ent/ *.mod \ 34.21 $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION 34.22 } 34.23 34.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 34.25 -genpkg_rules() 34.26 -{ 34.27 +genpkg_rules() { 34.28 mkdir -p $fs 34.29 cp -a $install/usr $fs 34.30 + DEPENDS="libxml2-tools libxml2" 34.31 }
35.1 --- a/docbook-xml-43/receipt Sat Feb 24 10:43:01 2018 +0200 35.2 +++ b/docbook-xml-43/receipt Sat Feb 24 16:17:33 2018 +0200 35.3 @@ -1,4 +1,4 @@ 35.4 -# SliTaz package receipt. 35.5 +# SliTaz package receipt v2. 35.6 35.7 PACKAGE="docbook-xml-43" 35.8 VERSION="4.3" 35.9 @@ -11,19 +11,14 @@ 35.10 TARBALL="docbook-xml-$VERSION.zip" 35.11 WGET_URL="http://www.docbook.org/xml/$VERSION/$TARBALL" 35.12 35.13 -DEPENDS="libxml2-tools libxml2" 35.14 - 35.15 -# Rules to configure and make the package. 35.16 -compile_rules() 35.17 -{ 35.18 +compile_rules() { 35.19 mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-${VERSION} 35.20 cp -dRf docbook.cat *.dtd ent/ *.mod \ 35.21 $DESTDIR/usr/share/xml/docbook/xml-dtd-${VERSION} 35.22 } 35.23 35.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 35.25 -genpkg_rules() 35.26 -{ 35.27 +genpkg_rules() { 35.28 mkdir -p $fs 35.29 cp -a $install/usr $fs 35.30 + DEPENDS="libxml2-tools libxml2" 35.31 }
36.1 --- a/docbook-xml-44/receipt Sat Feb 24 10:43:01 2018 +0200 36.2 +++ b/docbook-xml-44/receipt Sat Feb 24 16:17:33 2018 +0200 36.3 @@ -1,4 +1,4 @@ 36.4 -# SliTaz package receipt. 36.5 +# SliTaz package receipt v2. 36.6 36.7 PACKAGE="docbook-xml-44" 36.8 VERSION="4.4" 36.9 @@ -11,19 +11,14 @@ 36.10 TARBALL="docbook-xml-$VERSION.zip" 36.11 WGET_URL="http://www.docbook.org/xml/$VERSION/$TARBALL" 36.12 36.13 -DEPENDS="libxml2-tools libxml2" 36.14 - 36.15 -# Rules to configure and make the package. 36.16 -compile_rules() 36.17 -{ 36.18 +compile_rules() { 36.19 mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION 36.20 cp -dRf docbook.cat *.dtd ent/ *.mod \ 36.21 $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION 36.22 } 36.23 36.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 36.25 -genpkg_rules() 36.26 -{ 36.27 +genpkg_rules() { 36.28 mkdir -p $fs 36.29 cp -a $install/usr $fs 36.30 + DEPENDS="libxml2-tools libxml2" 36.31 }
37.1 --- a/docbook-xml/receipt Sat Feb 24 10:43:01 2018 +0200 37.2 +++ b/docbook-xml/receipt Sat Feb 24 16:17:33 2018 +0200 37.3 @@ -1,4 +1,4 @@ 37.4 -# SliTaz package receipt. 37.5 +# SliTaz package receipt v2. 37.6 37.7 PACKAGE="docbook-xml" 37.8 VERSION="4.5" 37.9 @@ -14,17 +14,13 @@ 37.10 DEPENDS="libxml2-tools libxml2 docbook-xml-412 docbook-xml-42 docbook-xml-43 \ 37.11 docbook-xml-44" 37.12 37.13 -# Rules to configure and make the package. 37.14 -compile_rules() 37.15 -{ 37.16 +compile_rules() { 37.17 mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION 37.18 cp -dRf docbook.cat *.dtd ent/ *.mod \ 37.19 $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION 37.20 } 37.21 37.22 -# Rules to gen a SliTaz package suitable for Tazpkg. 37.23 -genpkg_rules() 37.24 -{ 37.25 +genpkg_rules() { 37.26 mkdir -p $fs 37.27 cp -a $install/usr $fs 37.28 } 37.29 @@ -39,7 +35,7 @@ 37.30 fi 37.31 37.32 if [ "$1" ]; then 37.33 - mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null 37.34 + mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2>/dev/null 37.35 cp /etc/resolv.conf "$1/etc/resolv.conf" 37.36 fi 37.37 37.38 @@ -288,11 +284,10 @@ 37.39 "file:///etc/xml/docbook-xml" \ 37.40 "/etc/xml/catalog" 37.41 if [ -n "$1" ]; then 37.42 - mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null 37.43 + mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2>/dev/null 37.44 fi 37.45 } 37.46 37.47 -post_remove() 37.48 -{ 37.49 +post_remove() { 37.50 xmlcatalog --noout --del file:///etc/xml/docbook-xml "$1/etc/xml/catalog" 37.51 }
38.1 --- a/docbook-xsl/receipt Sat Feb 24 10:43:01 2018 +0200 38.2 +++ b/docbook-xsl/receipt Sat Feb 24 16:17:33 2018 +0200 38.3 @@ -1,74 +1,59 @@ 38.4 -# SliTaz package receipt. 38.5 +# SliTaz package receipt v2. 38.6 38.7 PACKAGE="docbook-xsl" 38.8 VERSION="1.79.1" 38.9 CATEGORY="development" 38.10 -SHORT_DESC="DocBook XSL stylesheets." 38.11 +SHORT_DESC="DocBook XSL stylesheets" 38.12 MAINTAINER="paul@slitaz.org" 38.13 LICENSE="MIT" 38.14 WEB_SITE="http://docbook.sourceforge.net/" 38.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html" 38.16 38.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 38.18 WGET_URL="$SF_MIRROR/docbook/$TARBALL" 38.19 38.20 -DEPENDS="docbook-xml libxml2-tools libxslt" 38.21 +compile_rules() { 38.22 + mkdir -p $install/usr/share/xml/docbook/stylesheet/docbook-xsl/ 38.23 38.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 38.25 -genpkg_rules() 38.26 -{ 38.27 - cd $src # do not remove 38.28 - pkgroot=$fs/usr/share/xml/docbook/stylesheet/$PACKAGE 38.29 - install -dm755 $pkgroot/common 38.30 - install -dm755 $pkgroot/params 38.31 - install -m644 VERSION.xsl $pkgroot 38.32 + cp -R \ 38.33 + VERSION assembly common eclipse epub epub3 extensions fo highlighting \ 38.34 + html htmlhelp images javahelp lib manpages params profiling roundtrip \ 38.35 + slides template tests tools webhelp website xhtml xhtml-1_1 xhtml5 \ 38.36 + $install/usr/share/xml/docbook/stylesheet/docbook-xsl/ && 38.37 38.38 - for fn in xml xsl dtd ent; do 38.39 - install -m644 common/*.${fn} $pkgroot/common/ 38.40 - done 38.41 + ln -s VERSION $install/usr/share/xml/docbook/stylesheet/docbook-xsl/VERSION.xsl && 38.42 38.43 - for fn in fo highlighting html roundtrip; do 38.44 - install -dm755 ${pkgroot}/${fn} 38.45 - install -m644 ${fn}/*.xml ${pkgroot}/${fn}/ 38.46 - install -m644 ${fn}/*.xsl ${pkgroot}/${fn}/ 38.47 - done 38.48 - 38.49 - for fn in eclipse htmlhelp javahelp lib manpages profiling template website xhtml xhtml-1_1; do 38.50 - install -dm755 ${pkgroot}/${fn} 38.51 - install -m644 ${fn}/*.xsl ${pkgroot}/${fn}/ 38.52 - done 38.53 + cook_pick_docs README RELEASE-NOTES* NEWS* 38.54 } 38.55 38.56 -# Pre and post install commands for Tazpkg. 38.57 -post_install() 38.58 -{ 38.59 +genpkg_rules() { 38.60 + copy @std 38.61 + DEPENDS="docbook-xml libxml2-tools libxslt" 38.62 +} 38.63 + 38.64 +post_install() { 38.65 if [ -n "$1" ]; then 38.66 mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2>/dev/null 38.67 cp /etc/resolv.conf "$1/etc/resolv.conf" 38.68 fi 38.69 38.70 U="http://docbook.sourceforge.net/release/xsl" 38.71 - F="/usr/share/xml/docbook/stylesheet/$PACKAGE" 38.72 + F="/usr/share/xml/docbook/stylesheet/docbook-xsl" 38.73 + C="/etc/xml/catalog" 38.74 38.75 # Create a /etc/xml/catalog file 38.76 - if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi && 38.77 + mkdir -p "$1/etc/xml" 38.78 if [ ! -f "$1/etc/xml/catalog" ]; then 38.79 - chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog 38.80 + chroot "$1/" xmlcatalog --noout --create "$C" 38.81 fi && 38.82 38.83 - chroot "$1/" xmlcatalog --noout --add "rewriteSystem" "$U/$VERSION" \ 38.84 - "$F" /etc/xml/catalog && 38.85 + chroot "$1/" xmlcatalog --noout --add rewriteSystem "$U/$VERSION" "$F" $C && 38.86 + chroot "$1/" xmlcatalog --noout --add rewriteURI "$U/$VERSION" "$F" $C && 38.87 + chroot "$1/" xmlcatalog --noout --add rewriteSystem "$U/current" "$F" $C && 38.88 + chroot "$1/" xmlcatalog --noout --add rewriteURI "$U/current" "$F" $C 38.89 38.90 - chroot "$1/" xmlcatalog --noout --add "rewriteURI" "$U/$VERSION" \ 38.91 - "$F" /etc/xml/catalog && 38.92 - 38.93 - chroot "$1/" xmlcatalog --noout --add "rewriteSystem" "$U/current" \ 38.94 - "$F" /etc/xml/catalog && 38.95 - 38.96 - chroot "$1/" xmlcatalog --noout --add "rewriteURI" "$U/current" \ 38.97 - "$F" /etc/xml/catalog 38.98 - 38.99 - # link nwalsh dir 38.100 - ln -s $PACKAGE "$1/usr/share/xml/docbook/stylesheet/nwalsh" 38.101 +# # link nwalsh dir 38.102 +# ln -sf docbook-xsl "$1/usr/share/xml/docbook/stylesheet/nwalsh" 38.103 38.104 if [ -n "$1" ]; then 38.105 mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2>/dev/null
39.1 --- a/dropbear/receipt Sat Feb 24 10:43:01 2018 +0200 39.2 +++ b/dropbear/receipt Sat Feb 24 16:17:33 2018 +0200 39.3 @@ -7,18 +7,17 @@ 39.4 MAINTAINER="pascal.bellard@slitaz.org" 39.5 LICENSE="MIT" 39.6 WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html" 39.7 -HOST_ARCH="i486 arm" 39.8 39.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 39.10 WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL" 39.11 39.12 -BUILD_DEPENDS_arm=" " 39.13 -BUILD_DEPENDS="zlib-dev pam pam-dev" 39.14 -SPLIT="dropbear-pam" 39.15 +case "$ARCH" in 39.16 + i486) BUILD_DEPENDS="zlib-dev pam pam-dev"; SPLIT="dropbear-pam";; 39.17 + x86_64) BUILD_DEPENDS="zlib-dev";; 39.18 + arm*) BUILD_DEPENDS="";; 39.19 +esac 39.20 39.21 -# Rules to configure and make the package. 39.22 -compile_rules() 39.23 -{ 39.24 +compile_rules() { 39.25 # Handle multiarch compilation. 39.26 case "$ARCH" in 39.27 arm) 39.28 @@ -48,7 +47,7 @@ 39.29 --enable-pam \ 39.30 $CONFIGURE_ARGS && 39.31 make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 && 39.32 - install -m755 dropbearmulti $install/usr/sbin/dropbear-pam 39.33 + install -m755 dropbearmulti $install/usr/sbin/dropbear-pam || return 1 39.34 ;; 39.35 esac 39.36 39.37 @@ -64,7 +63,6 @@ 39.38 mkdir -p $install/etc 39.39 cp -a $stuff/dropbear $install/etc 39.40 cp -a $stuff/init.d $install/etc 39.41 - ln -s daemon $install/etc/init.d/sshd 39.42 cp -a $stuff/sshx $install/usr/bin 39.43 ln -s sshx $install/usr/bin/pppssh 39.44 ln -s sshx $install/usr/bin/sshfbvnc 39.45 @@ -77,9 +75,11 @@ 39.46 39.47 # Fix dropbear initscript perms 39.48 chown -R root:root $install 39.49 + 39.50 + ln -s daemon $install/etc/init.d/sshd 39.51 + 39.52 } 39.53 39.54 -# Rules to gen a SliTaz package suitable for Tazpkg. 39.55 genpkg_rules() { 39.56 case $PACKAGE in 39.57 dropbear)
40.1 --- a/elfkickers/receipt Sat Feb 24 10:43:01 2018 +0200 40.2 +++ b/elfkickers/receipt Sat Feb 24 16:17:33 2018 +0200 40.3 @@ -1,21 +1,17 @@ 40.4 -# SliTaz package receipt. 40.5 +# SliTaz package receipt v2. 40.6 40.7 PACKAGE="elfkickers" 40.8 VERSION="3.0" 40.9 -SOURCE="ELFkickers" 40.10 CATEGORY="system-tools" 40.11 -SHORT_DESC="Misc ELF linker format tools." 40.12 +SHORT_DESC="Misc ELF linker format tools" 40.13 MAINTAINER="pascal.bellard@slitaz.org" 40.14 LICENSE="GPL2" 40.15 -TARBALL="$SOURCE-$VERSION.tar.gz" 40.16 WEB_SITE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html" 40.17 + 40.18 +TARBALL="ELFkickers-$VERSION.tar.gz" 40.19 WGET_URL="http://www.muppetlabs.com/~breadbox/pub/software//$TARBALL" 40.20 -#http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-2.0a.tar.gz 40.21 40.22 -# Rules to configure and make the package. 40.23 -compile_rules() 40.24 -{ 40.25 - cd $src 40.26 +compile_rules() { 40.27 sed -i 's|.*asm/elf.h.*|#define ELF_DATA ELFDATA2LSB\n#define ELF_CLASS ELFCLASS32\n#define ELF_ARCH EM_386|' sstrip/sstrip.c 40.28 mkdir -p $DESTDIR/usr/bin 40.29 for i in elfls rebind elftoc sstrip ; do 40.30 @@ -25,9 +21,6 @@ 40.31 done 40.32 } 40.33 40.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 40.35 -genpkg_rules() 40.36 -{ 40.37 - cp -a $install/* $fs 40.38 +genpkg_rules() { 40.39 + copy @std 40.40 } 40.41 -
41.1 --- a/elfutils/receipt Sat Feb 24 10:43:01 2018 +0200 41.2 +++ b/elfutils/receipt Sat Feb 24 16:17:33 2018 +0200 41.3 @@ -7,27 +7,22 @@ 41.4 MAINTAINER="pascal.bellard@slitaz.org" 41.5 LICENSE="GPL2" 41.6 WEB_SITE="https://sourceware.org/elfutils/" 41.7 -HOST_ARCH="i486 arm" 41.8 41.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 41.10 WGET_URL="https://sourceware.org/elfutils/ftp/$VERSION/$TARBALL" 41.11 TARBALL_MD5="1ce77c5315d6bba7d883c3c4f0c2697e" 41.12 41.13 -BUILD_DEPENDS="gettext-tools zlib-dev bzip2-dev liblzma-dev" 41.14 +BUILD_DEPENDS="gettext-tools zlib-dev bzip2-dev xz-dev" 41.15 BUILD_DEPENDS_arm="bzip2-dev xz-dev" 41.16 SPLIT="elfutils-dev" 41.17 41.18 -# Rules to configure and make the package. 41.19 -compile_rules() 41.20 -{ 41.21 +compile_rules() { 41.22 ./configure $CONFIGURE_ARGS && make && make install 41.23 } 41.24 41.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 41.26 -genpkg_rules() 41.27 -{ 41.28 +genpkg_rules() { 41.29 case $PACKAGE in 41.30 - elfutils) copy @std ;; 41.31 - elfutils-dev) copy @dev ;; 41.32 + elfutils) copy @std;; 41.33 + *-dev) copy @dev;; 41.34 esac 41.35 }
42.1 --- a/eudev/receipt Sat Feb 24 10:43:01 2018 +0200 42.2 +++ b/eudev/receipt Sat Feb 24 16:17:33 2018 +0200 42.3 @@ -90,3 +90,4 @@ 42.4 grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x 42.5 done 42.6 } 42.7 +
43.1 --- a/expect/receipt Sat Feb 24 10:43:01 2018 +0200 43.2 +++ b/expect/receipt Sat Feb 24 16:17:33 2018 +0200 43.3 @@ -1,32 +1,25 @@ 43.4 -# SliTaz package receipt. 43.5 +# SliTaz package receipt v2. 43.6 43.7 PACKAGE="expect" 43.8 VERSION="5.45" 43.9 CATEGORY="utilities" 43.10 -SHORT_DESC="A tool for automating interactive applications." 43.11 +SHORT_DESC="A tool for automating interactive applications" 43.12 MAINTAINER="samuel_trassare@yahoo.com" 43.13 LICENSE="PublicDomain" 43.14 WEB_SITE="http://expect.sourceforge.net" 43.15 + 43.16 TARBALL="$PACKAGE$VERSION.tar.gz" 43.17 WGET_URL="http://sourceforge.net/projects/$PACKAGE/files/Expect/$VERSION/$TARBALL" 43.18 43.19 -DEPENDS="tcl" 43.20 BUILD_DEPENDS="tcl-dev" 43.21 +COOKOPTS="!skip-log-errors" # for: 43.22 +# chmod: cannot access './install-sh': No such file or directory 43.23 43.24 -# Rules to configure and make the package. 43.25 -compile_rules() 43.26 -{ 43.27 - ./configure $CONFIGURE_ARGS 2>&1 | grep -v /install-sh && 43.28 - make && 43.29 - make DESTDIR=$install install 43.30 +compile_rules() { 43.31 + ./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install 43.32 } 43.33 43.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 43.35 -genpkg_rules() 43.36 -{ 43.37 - mkdir -p $fs/usr/bin \ 43.38 - $fs/usr/lib 43.39 - 43.40 - cp -a $install/usr/bin/expect $fs/usr/bin 43.41 - cp -a $install/usr/lib/* $fs/usr/lib 43.42 +genpkg_rules() { 43.43 + copy @std 43.44 + DEPENDS="tcl" 43.45 }
44.1 --- a/fontconfig/receipt Sat Feb 24 10:43:01 2018 +0200 44.2 +++ b/fontconfig/receipt Sat Feb 24 16:17:33 2018 +0200 44.3 @@ -1,13 +1,12 @@ 44.4 # SliTaz package receipt v2. 44.5 44.6 PACKAGE="fontconfig" 44.7 -VERSION="2.12.1" 44.8 +VERSION="2.12.4" 44.9 CATEGORY="x-window" 44.10 SHORT_DESC="Font configuration utilities and library" 44.11 MAINTAINER="pankso@slitaz.org" 44.12 LICENSE="MIT" 44.13 WEB_SITE="https://www.freedesktop.org/wiki/Software/fontconfig/" 44.14 -HOST_ARCH="i486 arm" 44.15 44.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 44.17 WGET_URL="http://www.freedesktop.org/software/fontconfig/release/$TARBALL" 44.18 @@ -15,14 +14,8 @@ 44.19 BUILD_DEPENDS="libxml2-dev freetype-dev gperf" 44.20 SPLIT="fontconfig-dev" 44.21 44.22 -# Rules to configure and make the package. 44.23 -compile_rules() 44.24 -{ 44.25 - sed -e '/FC_CHAR_WIDTH/s/CHAR_WIDTH/CHARWIDTH/' \ 44.26 - -e '/FC_CHARWIDTH/a #define FC_CHAR_WIDTH FC_CHARWIDTH' \ 44.27 - -i fontconfig/fontconfig.h && 44.28 - sed 's/CHAR_WIDTH/CHARWIDTH/' -i src/fcobjs.h && 44.29 - 44.30 +compile_rules() { 44.31 + rm -f src/fcobjshash.h 44.32 44.33 ./configure \ 44.34 --sysconfdir=/etc \ 44.35 @@ -32,10 +25,9 @@ 44.36 --enable-iconv \ 44.37 --enable-libxml2 \ 44.38 --disable-docs \ 44.39 - --docdir=/usr/share/doc/fontconfig-$VERSION \ 44.40 $CONFIGURE_ARGS && 44.41 make && 44.42 - make DESTDIR=$install install 44.43 + make DESTDIR=$install install || return 1 44.44 44.45 44.46 # FIXME: Which the app uses the next? 44.47 @@ -68,11 +60,11 @@ 44.48 case $PACKAGE in 44.49 fontconfig) 44.50 copy @std 44.51 - DEPENDS="bzlib freetype liblzma liblzma libpng libxml2 zlib" 44.52 + DEPENDS="bzlib freetype liblzma liblzma libpng16 libxml2 zlib" 44.53 ;; 44.54 fontconfig-dev) 44.55 copy @dev 44.56 - DEPENDS="fontconfig freetype-dev libpng-dev libxml2-dev" 44.57 + DEPENDS="fontconfig freetype-dev libpng16-dev libxml2-dev" 44.58 ;; 44.59 esac 44.60 }
45.1 --- a/fontforge/receipt Sat Feb 24 10:43:01 2018 +0200 45.2 +++ b/fontforge/receipt Sat Feb 24 16:17:33 2018 +0200 45.3 @@ -18,9 +18,7 @@ 45.4 xorg-libSM-dev gettext" 45.5 SPLIT="fontforge-fonts fontforge-dev" 45.6 45.7 -# Rules to configure and make the package. 45.8 -compile_rules() 45.9 -{ 45.10 +compile_rules() { 45.11 rm -r $src/.git 45.12 45.13 ./configure \ 45.14 @@ -32,9 +30,7 @@ 45.15 make -C desktop DESTDIR=$install install 45.16 } 45.17 45.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 45.19 -genpkg_rules() 45.20 -{ 45.21 +genpkg_rules() { 45.22 case $PACKAGE in 45.23 fontforge) 45.24 copy @std *.mo
46.1 --- a/freetype/receipt Sat Feb 24 10:43:01 2018 +0200 46.2 +++ b/freetype/receipt Sat Feb 24 16:17:33 2018 +0200 46.3 @@ -1,26 +1,24 @@ 46.4 # SliTaz package receipt v2. 46.5 46.6 PACKAGE="freetype" 46.7 -VERSION="2.7.1" 46.8 +VERSION="2.8" 46.9 CATEGORY="x-window" 46.10 SHORT_DESC="A free, high-quality, and portable font engine" 46.11 MAINTAINER="pankso@slitaz.org" 46.12 LICENSE="FTL GPL2" 46.13 WEB_SITE="https://www.freetype.org/" 46.14 -HOST_ARCH="i486 arm" 46.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/freetype2.html" 46.16 46.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 46.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 46.19 46.20 -BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng-dev" 46.21 +BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng16-dev" 46.22 SPLIT="freetype-dev" 46.23 46.24 -# Option "--harfbuzz" used in task to install build dependency harfbuzz-dev 46.25 +# Option "--harfbuzz" used in the task to install build dependency harfbuzz-dev 46.26 [ -n "$harfbuzz" ] && BUILD_DEPENDS="$BUILD_DEPENDS harfbuzz-dev" 46.27 46.28 -# Rules to configure and make the package. 46.29 -compile_rules() 46.30 -{ 46.31 +compile_rules() { 46.32 sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg 46.33 sed -ri "s:.*(#.*SUBPIXEL_(RENDERING|HINTING 2)) .*:\1:g" \ 46.34 include/freetype/config/ftoption.h 46.35 @@ -34,17 +32,15 @@ 46.36 make install 46.37 } 46.38 46.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 46.40 -genpkg_rules() 46.41 -{ 46.42 +genpkg_rules() { 46.43 case $PACKAGE in 46.44 freetype) 46.45 copy @std 46.46 - DEPENDS="zlib libpng harfbuzz" 46.47 + DEPENDS="zlib libpng16 harfbuzz" 46.48 ;; 46.49 freetype-dev) 46.50 copy @dev 46.51 - DEPENDS="freetype bzip2-dev glib-dev harfbuzz-dev libpng-dev \ 46.52 + DEPENDS="freetype bzip2-dev glib-dev harfbuzz-dev libpng16-dev \ 46.53 pcre-dev zlib-dev" 46.54 ;; 46.55 esac
47.1 --- a/fuse2/receipt Sat Feb 24 10:43:01 2018 +0200 47.2 +++ b/fuse2/receipt Sat Feb 24 16:17:33 2018 +0200 47.3 @@ -8,7 +8,6 @@ 47.4 LICENSE="GPL2" 47.5 WEB_SITE="https://github.com/libfuse/libfuse" 47.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/fuse2.html" 47.7 -HOST_ARCH="i486 arm" 47.8 47.9 TARBALL="fuse-$VERSION.tar.gz" 47.10 WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL"
48.1 --- a/fuse3/receipt Sat Feb 24 10:43:01 2018 +0200 48.2 +++ b/fuse3/receipt Sat Feb 24 16:17:33 2018 +0200 48.3 @@ -8,7 +8,6 @@ 48.4 LICENSE="GPL2" 48.5 WEB_SITE="https://github.com/libfuse/libfuse" 48.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/fuse.html" 48.7 -HOST_ARCH="i486 arm" 48.8 48.9 TARBALL="fuse-$VERSION.tar.gz" 48.10 WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL"
49.1 --- a/gdk-pixbuf/receipt Sat Feb 24 10:43:01 2018 +0200 49.2 +++ b/gdk-pixbuf/receipt Sat Feb 24 16:17:33 2018 +0200 49.3 @@ -7,7 +7,6 @@ 49.4 MAINTAINER="slaxemulator@gmail.com" 49.5 LICENSE="GPL2" 49.6 WEB_SITE="http://www.gtk.org/" 49.7 -HOST_ARCH="i486 arm" 49.8 49.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 49.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 49.11 @@ -18,9 +17,7 @@ 49.12 xorg-libX11-dev gtk-doc" 49.13 SPLIT="gdk-pixbuf-dev" 49.14 49.15 -# Rules to configure and make the package. 49.16 -compile_rules() 49.17 -{ 49.18 +compile_rules() { 49.19 case "$ARCH" in 49.20 arm) 49.21 ARCH_ARGS="--enable-introspection=no --cache-file=arm.cache" 49.22 @@ -37,9 +34,7 @@ 49.23 touch $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache 49.24 } 49.25 49.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 49.27 -genpkg_rules() 49.28 -{ 49.29 +genpkg_rules() { 49.30 case $PACKAGE in 49.31 gdk-pixbuf) 49.32 copy @std
50.1 --- a/giflib/receipt Sat Feb 24 10:43:01 2018 +0200 50.2 +++ b/giflib/receipt Sat Feb 24 16:17:33 2018 +0200 50.3 @@ -7,25 +7,20 @@ 50.4 MAINTAINER="rcx@zoominternet.net" 50.5 LICENSE="MIT" 50.6 WEB_SITE="https://sourceforge.net/projects/giflib/" 50.7 -HOST_ARCH="i486 arm" 50.8 50.9 TARBALL="giflib-$VERSION.tar.bz2" 50.10 WGET_URL="$SF_MIRROR/giflib/$TARBALL" 50.11 50.12 SPLIT="giflib-dev" 50.13 50.14 -# Rules to configure and make the package. 50.15 -compile_rules() 50.16 -{ 50.17 +compile_rules() { 50.18 ./configure \ 50.19 --disable-static \ 50.20 $CONFIGURE_ARGS && 50.21 make && make install 50.22 } 50.23 50.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 50.25 -genpkg_rules() 50.26 -{ 50.27 +genpkg_rules() { 50.28 case $PACKAGE in 50.29 giflib) copy @std;; 50.30 *-dev) copy @dev;;
51.1 --- a/glib/receipt Sat Feb 24 10:43:01 2018 +0200 51.2 +++ b/glib/receipt Sat Feb 24 16:17:33 2018 +0200 51.3 @@ -8,7 +8,6 @@ 51.4 LICENSE="GPL2" 51.5 WEB_SITE="https://developer.gnome.org/glib/" 51.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/glib2.html" 51.7 -HOST_ARCH="i486 arm" 51.8 51.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 51.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 51.11 @@ -21,7 +20,7 @@ 51.12 compile_rules() { 51.13 fix ld 51.14 case "$ARCH" in 51.15 - i?86) 51.16 + i?86|x86_64) 51.17 ./configure \ 51.18 --sysconfdir=/etc \ 51.19 --with-pcre=system \
52.1 --- a/gnutls/receipt Sat Feb 24 10:43:01 2018 +0200 52.2 +++ b/gnutls/receipt Sat Feb 24 16:17:33 2018 +0200 52.3 @@ -7,21 +7,18 @@ 52.4 MAINTAINER="erjo@slitaz.org" 52.5 LICENSE="GPL3" 52.6 WEB_SITE="http://gnutls.org/" 52.7 -HOST_ARCH="i486 arm" 52.8 52.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 52.10 WGET_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$TARBALL" 52.11 TARBALL_MD5="0ab25eb6a1509345dd085bc21a387951" 52.12 52.13 +BUILD_DEPENDS_arm="libtasn1-dev ncurses-dev readline-dev nettle-dev \ 52.14 +libgpg-error-dev libgcrypt-dev libcrypto-dev gmp-dev lzip" 52.15 BUILD_DEPENDS="nettle-dev libtasn1-dev libunistring-dev gettext libcrypto-dev \ 52.16 libidn-dev unbound-dev p11-kit-dev" 52.17 -BUILD_DEPENDS_arm="libtasn1-dev ncurses-dev readline-dev nettle-dev \ 52.18 -libgpg-error-dev libgcrypt-dev libcrypto-dev gmp-dev lzip" 52.19 SPLIT="libgnutls gnutls-dev" 52.20 52.21 -# Rules to configure and make the package. 52.22 -compile_rules() 52.23 -{ 52.24 +compile_rules() { 52.25 # Handle cross compilation. 52.26 case "$ARCH" in 52.27 arm*) 52.28 @@ -38,9 +35,7 @@ 52.29 make -C doc/reference install-data-local 52.30 } 52.31 52.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 52.33 -genpkg_rules() 52.34 -{ 52.35 +genpkg_rules() { 52.36 case $PACKAGE in 52.37 gnutls) 52.38 copy bin/
53.1 --- a/gobject-introspection/receipt Sat Feb 24 10:43:01 2018 +0200 53.2 +++ b/gobject-introspection/receipt Sat Feb 24 16:17:33 2018 +0200 53.3 @@ -8,13 +8,12 @@ 53.4 LICENSE="LGPL2 MIT" 53.5 WEB_SITE="https://wiki.gnome.org/Projects/GObjectIntrospection" 53.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gobject-introspection.html" 53.7 -#HOST_ARCH="i486 arm" 53.8 53.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 53.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 53.11 53.12 BUILD_DEPENDS_arm="glib-dev libffi-dev cairo-dev dbus-dev" 53.13 -BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev" 53.14 +BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev openssl-dev" 53.15 SPLIT="gobject-introspection-dev" 53.16 53.17 compile_rules() {
54.1 --- a/gtk+/receipt Sat Feb 24 10:43:01 2018 +0200 54.2 +++ b/gtk+/receipt Sat Feb 24 16:17:33 2018 +0200 54.3 @@ -7,7 +7,7 @@ 54.4 MAINTAINER="pankso@slitaz.org" 54.5 LICENSE="GPL2" 54.6 WEB_SITE="https://www.gtk.org/" 54.7 -HOST_ARCH="i486 arm" 54.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtk2.html" 54.9 54.10 TARBALL="$PACKAGE-$VERSION.tar.xz" 54.11 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" 54.12 @@ -20,14 +20,11 @@ 54.13 symlinks \ 54.14 glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \ 54.15 gobject-introspection-dev gtk-doc automake gettext xorg-libXinerama-dev" 54.16 +BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \ 54.17 +gobject-introspection-dev gtk-doc gettext xorg-libXinerama-dev" 54.18 SPLIT="gtk+-demo gtk+ gtk+-dev" 54.19 54.20 -# Rules to configure and make the package. 54.21 -compile_rules() 54.22 -{ 54.23 - # http://www.linuxfromscratch.org/blfs/view/stable/x/gtk2.html 54.24 - 54.25 - # Handle cross compilation. 54.26 +compile_rules() { 54.27 case "$ARCH" in 54.28 arm*) 54.29 BUILD_DEPENDS=$BUILD_DEPENDS_arm 54.30 @@ -39,26 +36,25 @@ 54.31 ;; 54.32 esac 54.33 54.34 - . $stuff/replace-icons-paper; cd $src 54.35 +# . $stuff/replace-icons-paper; cd $src 54.36 54.37 +# find $src -type f -name 'Makefile.in' -exec sed -i 's|1.15|1.15.1|' '{}' \; 54.38 +# or 54.39 +# autoreconf -fi && # fix 'version mismatch' between 1.15 and 1.15.1 54.40 ./configure \ 54.41 - --sysconfdir=/etc \ 54.42 - --with-html-dir=/usr/share/doc \ 54.43 --enable-debug=no \ 54.44 $CONFIGURE_ARGS $ARCH_ARGS && 54.45 make $MAKEFLAGS $LIBTOOL && 54.46 - make install && 54.47 + make install || return 1 54.48 54.49 ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ 54.50 - $install/etc/gtk-2.0/gdk-pixbuf.loaders && 54.51 + $install/etc/gtk-2.0/gdk-pixbuf.loaders 54.52 54.53 - mkdir -p $install/usr/share/applications && 54.54 + mkdir -p $install/usr/share/applications 54.55 cp $stuff/*.desktop $install/usr/share/applications 54.56 } 54.57 54.58 -# Rules to gen a SliTaz package suitable for Tazpkg. 54.59 -genpkg_rules() 54.60 -{ 54.61 +genpkg_rules() { 54.62 case $PACKAGE in 54.63 gtk+-demo) 54.64 copy gtk-demo demo/ *.desktop 54.65 @@ -71,8 +67,7 @@ 54.66 ;; 54.67 gtk+) 54.68 COOKOPTS="!menus" 54.69 - copy @std 54.70 - remove_already_packed 54.71 + copy @std @rm 54.72 DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib \ 54.73 libcups libffi libgnutls libharfbuzz liblzma libpng16 libxml2 \ 54.74 pango pcre util-linux-blkid util-linux-mount util-linux-uuid \ 54.75 @@ -95,7 +90,6 @@ 54.76 esac 54.77 } 54.78 54.79 -# Pre and post install commands for Tazpkg. 54.80 post_install_gtk_() { 54.81 chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache 54.82 }
55.1 --- a/gtk+/stuff/patches/series Sat Feb 24 10:43:01 2018 +0200 55.2 +++ b/gtk+/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 55.3 @@ -1,1 +1,1 @@ 55.4 -undo_link_icons.patch 55.5 +#undo_link_icons.patch
56.1 --- a/gtk+3/receipt Sat Feb 24 10:43:01 2018 +0200 56.2 +++ b/gtk+3/receipt Sat Feb 24 16:17:33 2018 +0200 56.3 @@ -7,7 +7,7 @@ 56.4 MAINTAINER="pankso@slitaz.org" 56.5 LICENSE="LGPL2" 56.6 WEB_SITE="https://www.gtk.org/" 56.7 -#HOST_ARCH="i486 arm" 56.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html" 56.9 CROSS_BUGS="bug: /bin/bash: no: command not found" 56.10 56.11 TARBALL="gtk+-$VERSION.tar.xz" 56.12 @@ -18,14 +18,12 @@ 56.13 BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev gettext \ 56.14 xorg-libXinerama-dev xorg-libXi-dev xorg-libXrandr-dev xorg-libXcomposite-dev \ 56.15 xorg-libXdamage-dev libepoxy-dev at-spi2-atk-dev cups-dev colord-dev gtk-doc \ 56.16 -libxslt" 56.17 +libxslt gobject-introspection-dev xorg-libSM-dev" 56.18 SPLIT="gtk+3-demo gtk+3-widget-factory gtk+3-icon-browser gtk+3 gtk+3-dev" 56.19 +COOKOPTS="skip-log-errors" # Failed to open file ?./gdk.gresource.xml?: No such file or directory 56.20 56.21 -# Rules to configure and make the package. 56.22 -compile_rules() 56.23 -{ 56.24 - # http://www.linuxfromscratch.org/blfs/view/stable/x/gtk3.html 56.25 - 56.26 +compile_rules() { 56.27 + fix ld 56.28 # Handle cross compilation. 56.29 case "$ARCH" in 56.30 arm*) 56.31 @@ -53,59 +51,51 @@ 56.32 --disable-broadway-backend \ 56.33 --with-x \ 56.34 $CONFIGURE_ARGS $ARCH_ARGS && 56.35 - make $MAKEFLAGS 2>&1 | fgrep -v './gdk.gresource.xml' && # ugly fix, but alas... 56.36 - make DESTDIR=$DESTDIR install 56.37 + fix libtool && 56.38 + make $MAKEFLAGS && 56.39 + make DESTDIR=$DESTDIR install || return 1 56.40 56.41 cp -f $stuff/settings.ini $install/etc/gtk-3.0 && 56.42 find $install -name '*.desktop' | xargs sed -i '/NoDisplay/d' 56.43 } 56.44 56.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 56.46 -genpkg_rules() 56.47 -{ 56.48 +genpkg_rules() { 56.49 case $PACKAGE in 56.50 gtk+3-demo) 56.51 copy gtk3-demo* *Demo* *exampleapp* 56.52 rm -r $fs/usr/share/gtk-doc $fs/usr/share/man 56.53 CAT="development|example code and demo" 56.54 + DEPENDS="cairo gdk-pixbuf glib gtk+3 libepoxy libharfbuzz pango" 56.55 ;; 56.56 gtk+3-widget-factory) 56.57 copy gtk3-widget* 56.58 rm -r $fs/usr/share/gtk-doc $fs/usr/share/man 56.59 CAT="development|widget factory" 56.60 + DEPENDS="atk cairo gdk-pixbuf glib gtk+3" 56.61 ;; 56.62 gtk+3-icon-browser) 56.63 copy gtk3-icon-browser gtk3-icon-browser.desktop 56.64 CAT="development|icon browser" 56.65 + DEPENDS="glib gtk+3" 56.66 ;; 56.67 gtk+3) 56.68 COOKOPTS="!menus" 56.69 - copy etc/ bin/ themes/ *.so* *.xml 56.70 - remove_already_packed 56.71 - DEPENDS="at-spi2-atk at-spi2-core atk bzlib cairo colord dbus \ 56.72 - eudev fontconfig freetype gdk-pixbuf glib lcms2 libcups libepoxy \ 56.73 - libffi libgnutls libharfbuzz liblzma libpng16 libxml2 pango pcre \ 56.74 - util-linux-blkid util-linux-mount util-linux-uuid xorg-libICE \ 56.75 - xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \ 56.76 - xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \ 56.77 - xorg-libXi xorg-libXinerama xorg-libXrandr xorg-libXrender \ 56.78 - xorg-libxcb xorg-pixman zlib" 56.79 + copy etc/ bin/ themes/ *.so* *.xml @rm 56.80 + DEPENDS="at-spi2-atk atk cairo colord fontconfig gdk-pixbuf glib \ 56.81 + libcups libepoxy pango xorg-libX11 xorg-libXcomposite \ 56.82 + xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi \ 56.83 + xorg-libXinerama xorg-libXrandr" 56.84 CONFIG_FILES="/etc/gtk-3.0/settings.ini" 56.85 SUGGESTED="cups" 56.86 ;; 56.87 gtk+3-dev) 56.88 copy @dev *.its *.loc *.rng 56.89 DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \ 56.90 - at-spi2-atk-dev at-spi2-core-dev atk-dev bzip2-dev cairo-dev \ 56.91 - colord-dev cups-dev dbus-dev eudev-dev fontconfig-dev freetype-dev \ 56.92 - gdk-pixbuf-dev glib-dev gnutls-dev harfbuzz-dev lcms2-dev \ 56.93 - libepoxy-dev libffi-dev libpng16-dev libxml2-dev pango-dev \ 56.94 - pcre-dev util-linux-blkid-dev util-linux-mount-dev \ 56.95 - util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \ 56.96 - xorg-libXau-dev xorg-libXcomposite-dev xorg-libXdamage-dev \ 56.97 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \ 56.98 - xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev \ 56.99 - xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" 56.100 + at-spi2-atk-dev atk-dev cairo-dev fontconfig-dev gdk-pixbuf-dev \ 56.101 + glib-dev libepoxy-dev pango-dev xorg-libX11-dev \ 56.102 + xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \ 56.103 + xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \ 56.104 + xorg-libXrandr-dev" 56.105 ;; 56.106 esac 56.107 }
57.1 --- a/gtk-doc/receipt Sat Feb 24 10:43:01 2018 +0200 57.2 +++ b/gtk-doc/receipt Sat Feb 24 16:17:33 2018 +0200 57.3 @@ -1,36 +1,28 @@ 57.4 -# SliTaz package receipt. 57.5 +# SliTaz package receipt v2. 57.6 57.7 PACKAGE="gtk-doc" 57.8 -VERSION="1.25" 57.9 +VERSION="1.26" 57.10 CATEGORY="development" 57.11 -SHORT_DESC="Generate API documentation from comments added to C code." 57.12 +SHORT_DESC="Generate API documentation from comments added to C code" 57.13 MAINTAINER="pascal.bellard@slitaz.org" 57.14 LICENSE="GPL3" 57.15 WEB_SITE="https://www.gtk.org/gtk-doc/" 57.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gtk-doc.html" 57.17 57.18 TARBALL="$PACKAGE-$VERSION.tar.xz" 57.19 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" 57.20 57.21 -DEPENDS="docbook-xsl" 57.22 BUILD_DEPENDS="docbook-xml docbook-xsl libxslt python perl itstool gettext" 57.23 57.24 -# Rules to configure and make the package. 57.25 -compile_rules() 57.26 -{ 57.27 - ./configure \ 57.28 - --prefix=/usr \ 57.29 - --build=$HOST_SYSTEM --host=$HOST_SYSTEM && 57.30 - make && 57.31 - make DESTDIR=$DESTDIR install 57.32 +compile_rules() { 57.33 + ./configure $CONFIGURE_ARGS && make && make install 57.34 } 57.35 57.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 57.37 -genpkg_rules() 57.38 -{ 57.39 - cp -a $install/usr $fs 57.40 +genpkg_rules() { 57.41 + copy @std @dev gtk-doc/ 57.42 + DEPENDS="docbook-xsl python-six" 57.43 } 57.44 57.45 -post_install() 57.46 -{ 57.47 +post_install() { 57.48 mkdir -p "$1/usr/share/gtk-doc/html" 57.49 }
58.1 --- a/gtksourceview-dev/receipt Sat Feb 24 10:43:01 2018 +0200 58.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 58.3 @@ -1,22 +0,0 @@ 58.4 -# SliTaz package receipt. 58.5 - 58.6 -PACKAGE="gtksourceview-dev" 58.7 -VERSION="2.10.5" 58.8 -CATEGORY="development" 58.9 -SHORT_DESC="The gtksourceview library devel files." 58.10 -MAINTAINER="pankso@slitaz.org" 58.11 -LICENSE="GPL2" 58.12 -WANTED="gtksourceview" 58.13 -WEB_SITE="http://projects.gnome.org/gtksourceview/" 58.14 - 58.15 -DEPENDS="gtksourceview pkg-config" 58.16 - 58.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 58.18 -genpkg_rules() 58.19 -{ 58.20 - mkdir -p $fs/usr/lib $fs/usr/share 58.21 - cp -a $install/usr/lib/*.*a $fs/usr/lib 58.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 58.23 - cp -a $install/usr/include $fs/usr 58.24 -} 58.25 -
59.1 --- a/gtksourceview/receipt Sat Feb 24 10:43:01 2018 +0200 59.2 +++ b/gtksourceview/receipt Sat Feb 24 16:17:33 2018 +0200 59.3 @@ -1,38 +1,36 @@ 59.4 -# SliTaz package receipt. 59.5 +# SliTaz package receipt v2. 59.6 59.7 PACKAGE="gtksourceview" 59.8 VERSION="2.10.5" 59.9 CATEGORY="x-window" 59.10 -SHORT_DESC="Extends GTK+ framework for multiline text editing." 59.11 +SHORT_DESC="Extends GTK+ framework for multiline text editing" 59.12 MAINTAINER="pankso@slitaz.org" 59.13 LICENSE="GPL2" 59.14 +WEB_SITE="http://projects.gnome.org/gtksourceview/" 59.15 + 59.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 59.17 -WEB_SITE="http://projects.gnome.org/gtksourceview/" 59.18 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 59.19 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 59.20 59.21 -DEPENDS="expat gtk+ libxml2 xorg-libX11 xorg-libXau xorg-libXcomposite \ 59.22 -xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \ 59.23 -xorg-libXrandr xorg-libXrender xorg-libXdamage" 59.24 -BUILD_DEPENDS="intltool pkg-config gtk+-dev libxml2-dev expat-dev" 59.25 +BUILD_DEPENDS="intltool gtk+-dev libxml2-dev expat-dev" 59.26 +SPLIT="gtksourceview-dev" 59.27 59.28 -# Rules to configure and make the package. 59.29 -compile_rules() 59.30 -{ 59.31 - cd $src 59.32 - ./configure \ 59.33 - --prefix=/usr \ 59.34 - --infodir=/usr/share/info \ 59.35 - --mandir=/usr/share/man \ 59.36 - $CONFIGURE_ARGS && 59.37 - make && 59.38 - make DESTDIR=$DESTDIR install 59.39 +compile_rules() { 59.40 + fix ld 59.41 + ./configure $CONFIGURE_ARGS && 59.42 + fix libtool && 59.43 + make && make install 59.44 } 59.45 59.46 -# Rules to gen a SliTaz package suitable for Tazpkg. 59.47 -genpkg_rules() 59.48 -{ 59.49 - mkdir -p $fs/usr/lib $fs/usr/share 59.50 - cp -a $install/usr/lib/*.so* $fs/usr/lib 59.51 - cp -a $install/usr/share/gtksourceview* $fs/usr/share 59.52 +genpkg_rules() { 59.53 + case $PACKAGE in 59.54 + gtksourceview) 59.55 + copy @std 59.56 + DEPENDS="cairo gdk-pixbuf glib gtk+ libxml2 pango python" 59.57 + ;; 59.58 + *-dev) 59.59 + copy @dev 59.60 + DEPENDS="gtksourceview gtk+-dev libxml2-dev" 59.61 + ;; 59.62 + esac 59.63 } 59.64
60.1 --- a/harfbuzz/receipt Sat Feb 24 10:43:01 2018 +0200 60.2 +++ b/harfbuzz/receipt Sat Feb 24 16:17:33 2018 +0200 60.3 @@ -1,13 +1,13 @@ 60.4 # SliTaz package receipt v2. 60.5 60.6 PACKAGE="harfbuzz" 60.7 -VERSION="1.4.2" 60.8 +VERSION="1.4.8" 60.9 CATEGORY="system-tools" 60.10 SHORT_DESC="OpenType text shaping engine" 60.11 MAINTAINER="pankso@slitaz.org" 60.12 LICENSE="GPL2" 60.13 WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/" 60.14 -HOST_ARCH="i486 arm" 60.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/harfbuzz.html" 60.16 60.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 60.18 WGET_URL="https://www.freedesktop.org/software/harfbuzz/release/$TARBALL" 60.19 @@ -15,9 +15,7 @@ 60.20 BUILD_DEPENDS="glib-dev cairo-dev freetype-dev fontconfig-dev icu-dev" 60.21 SPLIT="libharfbuzz libharfbuzz-icu harfbuzz-icu-dev harfbuzz-dev" 60.22 60.23 -# Rules to configure and make the package. 60.24 -compile_rules() 60.25 -{ 60.26 +compile_rules() { 60.27 ./configure \ 60.28 --with-glib \ 60.29 --with-freetype \ 60.30 @@ -26,7 +24,6 @@ 60.31 make && make install 60.32 } 60.33 60.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 60.35 genpkg_rules() 60.36 { 60.37 # Note, we have two development packages:
61.1 --- a/help2man/receipt Sat Feb 24 10:43:01 2018 +0200 61.2 +++ b/help2man/receipt Sat Feb 24 16:17:33 2018 +0200 61.3 @@ -1,9 +1,9 @@ 61.4 -# SliTaz package receipt. 61.5 +# SliTaz package receipt v2. 61.6 61.7 PACKAGE="help2man" 61.8 VERSION="1.47.4" 61.9 CATEGORY="development" 61.10 -SHORT_DESC="Produces simple manual pages." 61.11 +SHORT_DESC="Produces simple manual pages" 61.12 MAINTAINER="pascal.bellard@slitaz.org" 61.13 LICENSE="GPL3" 61.14 WEB_SITE="https://www.gnu.org/software/help2man/" 61.15 @@ -11,28 +11,17 @@ 61.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 61.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 61.18 61.19 -DEPENDS="perl-locale-gettext" 61.20 BUILD_DEPENDS="perl gettext texinfo perl-locale-gettext" 61.21 61.22 -# Rules to configure and make the package. 61.23 -compile_rules() 61.24 -{ 61.25 +compile_rules() { 61.26 ./configure \ 61.27 --enable-nls \ 61.28 $CONFIGURE_ARGS && 61.29 make && make DESTDIR=$install install 61.30 - 61.31 -# ./configure --prefix=/usr --infodir=/usr/share/info \ 61.32 -# --mandir=/usr/share/man $CONFIGURE_ARGS && 61.33 -# make && 61.34 -# make DESTDIR=$DESTDIR install 61.35 } 61.36 61.37 -# Rules to gen a SliTaz package suitable for Tazpkg. 61.38 -genpkg_rules() 61.39 -{ 61.40 - mkdir -p $fs/usr 61.41 - cp -a $install/usr/bin $fs/usr 61.42 - cp -a $install/usr/lib $fs/usr 61.43 +genpkg_rules() { 61.44 + copy @std 61.45 + DEPENDS="perl-locale-gettext" 61.46 } 61.47
62.1 --- a/icu/receipt Sat Feb 24 10:43:01 2018 +0200 62.2 +++ b/icu/receipt Sat Feb 24 16:17:33 2018 +0200 62.3 @@ -1,7 +1,7 @@ 62.4 # SliTaz package receipt v2. 62.5 62.6 PACKAGE="icu" 62.7 -VERSION="60.1" 62.8 +VERSION="60.2" 62.9 CATEGORY="system-tools" 62.10 SHORT_DESC="International Components for Unicode" 62.11 MAINTAINER="pankso@slitaz.org" 62.12 @@ -29,7 +29,8 @@ 62.13 cp -r $stuff/* . 62.14 fi 62.15 62.16 - ./configure $CONFIGURE_ARGS && make && make install 62.17 + ./configure $CONFIGURE_ARGS && 62.18 + make && make install 62.19 } 62.20 62.21 genpkg_rules() {
63.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 63.2 +++ b/icu/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 63.3 @@ -0,0 +1,1 @@ 63.4 +std.patch
64.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 64.2 +++ b/icu/stuff/patches/std.patch Sat Feb 24 16:17:33 2018 +0200 64.3 @@ -0,0 +1,19 @@ 64.4 +--- a/icu4c/source/i18n/number_decimalquantity.cpp 64.5 ++++ b/icu4c/source/i18n/number_decimalquantity.cpp 64.6 +@@ -330,13 +330,13 @@ 64.7 + setBcdToZero(); 64.8 + flags = 0; 64.9 + // signbit() from <math.h> handles +0.0 vs -0.0 64.10 +- if (std::signbit(n) != 0) { 64.11 ++ if (signbit(n) != 0) { 64.12 + flags |= NEGATIVE_FLAG; 64.13 + n = -n; 64.14 + } 64.15 +- if (std::isnan(n) != 0) { 64.16 ++ if (isnan(n) != 0) { 64.17 + flags |= NAN_FLAG; 64.18 +- } else if (std::isfinite(n) == 0) { 64.19 ++ } else if (isfinite(n) == 0) { 64.20 + flags |= INFINITY_FLAG; 64.21 + } else if (n != 0) { 64.22 + _setToDoubleFast(n);
65.1 --- a/imlib2/receipt Sat Feb 24 10:43:01 2018 +0200 65.2 +++ b/imlib2/receipt Sat Feb 24 16:17:33 2018 +0200 65.3 @@ -7,7 +7,6 @@ 65.4 MAINTAINER="pankso@slitaz.org" 65.5 LICENSE="GPL LGPL2" 65.6 WEB_SITE="https://sourceforge.net/projects/enlightenment/" 65.7 -HOST_ARCH="i486 arm" 65.8 65.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 65.10 WGET_URL="$SF_MIRROR/enlightenment/$TARBALL" 65.11 @@ -19,40 +18,31 @@ 65.12 # ARM: jpeg-dev must be installed in build chroot and libjpeg.la must 65.13 # be modified manually 65.14 65.15 -# Rules to configure and make the package. 65.16 -compile_rules() 65.17 -{ 65.18 +compile_rules() { 65.19 + fix ld 65.20 ./configure \ 65.21 --disable-static \ 65.22 $CONFIGURE_ARGS && 65.23 - make && make install 65.24 + fix libtool && 65.25 + make && make install || return 1 65.26 65.27 - install -v -m755 -d $install/usr/share/doc/imlib2-$VERSION && 65.28 - install -v -m644 doc/*.gif doc/index.html \ 65.29 - $install/usr/share/doc/imlib2-$VERSION 65.30 + cook_pick_docs doc/*.gif doc/index.html 65.31 } 65.32 65.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 65.34 -genpkg_rules() 65.35 -{ 65.36 +genpkg_rules() { 65.37 case $PACKAGE in 65.38 imlib2) 65.39 copy *.so* imlib2_conv imlib2_grab imlib2_view 65.40 - DEPENDS="bzlib freetype giflib glib harfbuzz libid3tag \ 65.41 - libjpeg-turbo libpng16 libxcb pcre tiff xorg-libX11 xorg-libXau \ 65.42 - xorg-libXdmcp xorg-libXext zlib" 65.43 + DEPENDS="bzlib freetype giflib libid3tag libjpeg-turbo libpng16 \ 65.44 + tiff xorg-libX11 xorg-libXext zlib" 65.45 ;; 65.46 imlib2-test) 65.47 - copy @std 65.48 - remove_already_packed 65.49 + copy @std @rm 65.50 CAT="development|testing utilities" 65.51 + DEPENDS="imlib2 xorg-libX11" 65.52 ;; 65.53 imlib2-dev) 65.54 copy @dev 65.55 - DEPENDS="imlib2 imlib2-test bzip2-dev freetype-dev giflib-dev \ 65.56 - glib-dev harfbuzz-dev libid3tag-dev libjpeg-turbo-dev libpng16-dev \ 65.57 - libxcb-dev pcre-dev tiff-dev xorg-libX11-dev xorg-libXau-dev \ 65.58 - xorg-libXdmcp-dev xorg-libXext-dev zlib-dev" 65.59 ;; 65.60 esac 65.61 }
66.1 --- a/indent/receipt Sat Feb 24 10:43:01 2018 +0200 66.2 +++ b/indent/receipt Sat Feb 24 16:17:33 2018 +0200 66.3 @@ -1,26 +1,31 @@ 66.4 -# SliTaz package receipt. 66.5 +# SliTaz package receipt v2. 66.6 66.7 PACKAGE="indent" 66.8 -VERSION="2.2.10" 66.9 +VERSION="2.2.11" 66.10 CATEGORY="utilities" 66.11 -SHORT_DESC="A tool for formatting C code." 66.12 +SHORT_DESC="A tool for formatting C code" 66.13 MAINTAINER="lufeng369@slitaz.org" 66.14 LICENSE="GPL3" 66.15 +WEB_SITE="https://www.gnu.org/software/indent/" 66.16 + 66.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 66.18 -WEB_SITE="http://www.gnu.org/software/indent/" 66.19 -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 66.20 +#WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 66.21 +WGET_URL="http://ftp.de.debian.org/debian/pool/main/i/indent/${PACKAGE}_$VERSION.orig.tar.gz" 66.22 66.23 -# Rules to configure and make the package. 66.24 -compile_rules() 66.25 -{ 66.26 - rm -f man/indent.1 66.27 - sed -i 's|/doc/|/share&|' doc/Makefile* 66.28 - ./configure $CONFIGURE_ARGS && make -j 1 && make install 66.29 +BUILD_DEPENDS="gettext perl-texi2html" 66.30 + 66.31 +compile_rules() { 66.32 +# rm -f man/indent.1 # remove zero-size file to force rebuild it 66.33 +# sed -i 's|/doc/|/share&|' doc/Makefile* 66.34 + 66.35 + sed -i 's/-number/-number-sections/' doc/Makefile.in 66.36 + 66.37 + export CFLAGS="$CFLAGS -std=gnu90" 66.38 + ./configure $CONFIGURE_ARGS && 66.39 + make -j 1 && 66.40 + make install 66.41 } 66.42 66.43 -# Rules to gen a SliTaz package suitable for Tazpkg. 66.44 -genpkg_rules() 66.45 -{ 66.46 - mkdir -p $fs/usr/bin 66.47 - cp -a $install/usr/bin/indent $fs/usr/bin 66.48 +genpkg_rules() { 66.49 + copy @std 66.50 }
67.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 67.2 +++ b/indent/stuff/patches/indent-2.2.11-LC_ALL.patch Sat Feb 24 16:17:33 2018 +0200 67.3 @@ -0,0 +1,17 @@ 67.4 +From: Santiago Vila <sanvila@debian.org> 67.5 +Subject: setlocale using LC_ALL, not LC_MESSAGES 67.6 +Bug-Debian: http://bugs.debian.org/205692 67.7 + 67.8 +--- a/src/indent.c 67.9 ++++ b/src/indent.c 67.10 +@@ -1008,8 +1008,8 @@ 67.11 + BOOLEAN using_stdin = false; 67.12 + exit_values_ty exit_status; 67.13 + 67.14 +-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES) 67.15 +- setlocale(LC_MESSAGES, ""); 67.16 ++#if defined (HAVE_SETLOCALE) 67.17 ++ setlocale(LC_ALL, ""); 67.18 + #endif 67.19 + bindtextdomain(PACKAGE, LOCALEDIR); 67.20 + textdomain(PACKAGE);
68.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 68.2 +++ b/indent/stuff/patches/indent-2.2.11-decimal_format.patch Sat Feb 24 16:17:33 2018 +0200 68.3 @@ -0,0 +1,98 @@ 68.4 +From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001 68.5 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> 68.6 +Date: Thu, 25 Aug 2011 11:26:24 +0200 68.7 +Subject: [PATCH] Do not split decimal float suffix from constant 68.8 + 68.9 +N1312 draft of ISO/IEC WDTR24732 defines additional floating types 68.10 +with given suffixes: 68.11 + 68.12 +_Decimal32 DF, df 68.13 +_Decimal64 DD, dd 68.14 +_Decimal128 DL, dl 68.15 + 68.16 +These suffixes must stick on numeric part of the constant as classic 68.17 +float or long float does. 68.18 +--- 68.19 + regression/TEST | 3 ++- 68.20 + regression/input/float-constant-suffix.c | 13 +++++++++++++ 68.21 + regression/standard/float-constant-suffix.c | 13 +++++++++++++ 68.22 + src/lexi.c | 9 +++++++++ 68.23 + 4 files changed, 37 insertions(+), 1 deletions(-) 68.24 + create mode 100644 regression/input/float-constant-suffix.c 68.25 + create mode 100644 regression/standard/float-constant-suffix.c 68.26 + 68.27 +diff --git a/regression/TEST b/regression/TEST 68.28 +index c860ef2..1402ddf 100755 68.29 +--- a/regression/TEST 68.30 ++++ b/regression/TEST 68.31 +@@ -35,7 +35,8 @@ EXAMPLES="do.c else.c for.c func-def.c lshift.c ncs.c \ 68.32 + 68.33 + BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \ 68.34 + one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \ 68.35 +- macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c" 68.36 ++ macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \ 68.37 ++ float-constant-suffix.c" 68.38 + 68.39 + INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \ 68.40 + indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \ 68.41 +diff --git a/regression/input/float-constant-suffix.c b/regression/input/float-constant-suffix.c 68.42 +new file mode 100644 68.43 +index 0000000..58f5310 68.44 +--- /dev/null 68.45 ++++ b/regression/input/float-constant-suffix.c 68.46 +@@ -0,0 +1,13 @@ 68.47 ++float foo = 1.0F; 68.48 ++float foo = 1.0f; 68.49 ++double foo = 1.0; 68.50 ++double foo = 1.0; 68.51 ++long double foo = 1.0L; 68.52 ++long double foo = 1.0l; 68.53 ++ 68.54 ++_Decimal32 foo = 1.0DF; 68.55 ++_Decimal32 foo = 1.0df; 68.56 ++_Decimal64 foo = 1.0DD; 68.57 ++_Decimal64 foo = 1.0dd; 68.58 ++_Decimal128 foo = 1.0DL; 68.59 ++_Decimal128 foo = 1.0dl; 68.60 +diff --git a/regression/standard/float-constant-suffix.c b/regression/standard/float-constant-suffix.c 68.61 +new file mode 100644 68.62 +index 0000000..58f5310 68.63 +--- /dev/null 68.64 ++++ b/regression/standard/float-constant-suffix.c 68.65 +@@ -0,0 +1,13 @@ 68.66 ++float foo = 1.0F; 68.67 ++float foo = 1.0f; 68.68 ++double foo = 1.0; 68.69 ++double foo = 1.0; 68.70 ++long double foo = 1.0L; 68.71 ++long double foo = 1.0l; 68.72 ++ 68.73 ++_Decimal32 foo = 1.0DF; 68.74 ++_Decimal32 foo = 1.0df; 68.75 ++_Decimal64 foo = 1.0DD; 68.76 ++_Decimal64 foo = 1.0dd; 68.77 ++_Decimal128 foo = 1.0DL; 68.78 ++_Decimal128 foo = 1.0dl; 68.79 +diff --git a/src/lexi.c b/src/lexi.c 68.80 +index abc2bfa..eafb65e 100644 68.81 +--- a/src/lexi.c 68.82 ++++ b/src/lexi.c 68.83 +@@ -330,6 +330,15 @@ extern codes_ty lexi(void) 68.84 + { 68.85 + buf_ptr++; 68.86 + } 68.87 ++ else if (*buf_ptr == 'D' || *buf_ptr == 'd') 68.88 ++ { 68.89 ++ if (buf_ptr[1] == 'F' || buf_ptr[1] == 'f' || 68.90 ++ buf_ptr[1] == 'D' || buf_ptr[1] == 'd' || 68.91 ++ buf_ptr[1] == 'L' || buf_ptr[1] == 'l') 68.92 ++ { 68.93 ++ buf_ptr+=2; 68.94 ++ } 68.95 ++ } 68.96 + else 68.97 + { 68.98 + while (*buf_ptr == 'U' || *buf_ptr == 'u' || *buf_ptr == 'L' || *buf_ptr == 'l') 68.99 +-- 68.100 +1.7.6 68.101 +
69.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 69.2 +++ b/indent/stuff/patches/indent-2.2.11-segfault.patch Sat Feb 24 16:17:33 2018 +0200 69.3 @@ -0,0 +1,16 @@ 69.4 +--- a/man/texinfo2man.c 69.5 ++++ b/man/texinfo2man.c 69.6 +@@ -287,6 +287,13 @@ 69.7 + char buf[1024]; 69.8 + int line_no = 0; 69.9 + 69.10 ++ if (argc != 3) 69.11 ++ { 69.12 ++ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]); 69.13 ++ fprintf(stderr, " The man page will be written to stdout.\n"); 69.14 ++ return -1; 69.15 ++ } 69.16 ++ 69.17 + texinfoname = argv[2]; 69.18 + 69.19 + in = fopen (argv[2], "r");
70.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 70.2 +++ b/indent/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 70.3 @@ -0,0 +1,7 @@ 70.4 +# from https://aur.archlinux.org/packages/indent/ 70.5 + 70.6 +indent-2.2.11-segfault.patch 70.7 +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692 70.8 +indent-2.2.11-LC_ALL.patch 70.9 +# https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html 70.10 +indent-2.2.11-decimal_format.patch
71.1 --- a/intel-microcode/receipt Sat Feb 24 10:43:01 2018 +0200 71.2 +++ b/intel-microcode/receipt Sat Feb 24 16:17:33 2018 +0200 71.3 @@ -9,25 +9,57 @@ 71.4 WEB_SITE="https://downloadcenter.intel.com/search?keyword=processor+microcode+data+file" 71.5 # See also: https://wiki.archlinux.org/index.php/Microcode 71.6 # and https://www.archlinux.org/packages/extra/any/intel-ucode/ 71.7 +# https://www.kernel.org/doc/Documentation/x86/early-microcode.txt 71.8 +# http://linuxfromscratch.org/blfs/view/svn/postlfs/firmware.html#early-microcode 71.9 71.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 71.11 WGET_URL="https://downloadmirror.intel.com/27431/eng/microcode-$VERSION.tgz" 71.12 TARBALL_SHA1="2392dcf585a9d6313cd00d8b21cb2f54ae1d8ce3" 71.13 +SPLIT="intel-microcode-initrd" 71.14 71.15 compile_rules() { 71.16 mkdir -p $install/lib/firmware/ 71.17 cp -r $src/intel-ucode/ $install/lib/firmware/ 71.18 71.19 + gcc -Wall $CFLAGS -o intel-microcode2ucode $stuff/intel-microcode2ucode.c 71.20 + ./intel-microcode2ucode ./microcode.dat 71.21 + mkdir -p $install/boot 71.22 + mkdir -p kernel/x86/microcode 71.23 + mv microcode.bin kernel/x86/microcode/GenuineIntel.bin 71.24 + echo kernel/x86/microcode/GenuineIntel.bin \ 71.25 + | cpio -o -H newc \ 71.26 + > $install/boot/intel-ucode.img 71.27 + 71.28 install -Dm644 $stuff/LICENSE $install/usr/share/licenses/$PACKAGE/LICENSE 71.29 + 71.30 + cook_pick_docs releasenote 71.31 } 71.32 71.33 genpkg_rules() { 71.34 - copy @std 71.35 - DEPENDS="linux" 71.36 + case $PACKAGE in 71.37 + intel-microcode) 71.38 + copy lib/ LICENSE 71.39 + DEPENDS="linux" 71.40 + ;; 71.41 + intel-microcode-initrd) 71.42 + copy boot/ LICENSE 71.43 + CAT="kernel|initrd for early loading" 71.44 + DEPENDS="linux" 71.45 + ;; 71.46 + esac 71.47 } 71.48 71.49 -post_install() { 71.50 +post_install_intel_microcode() { 71.51 if [ -z "$1" -a -e /sys/devices/system/cpu/microcode/reload ]; then 71.52 echo 1 > /sys/devices/system/cpu/microcode/reload 71.53 fi 71.54 } 71.55 +post_install_intel_microcode_initrd() { 71.56 + if [ -n "$quiet" ]; then 71.57 + cat <<EOT 71.58 +In order to update the Intel CPU microcode on boot, add the file 71.59 + /boot/intel-ucode.img 71.60 +as the first initrd to your bootloader. 71.61 +EOT 71.62 + fi 71.63 +}
72.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 72.2 +++ b/intel-microcode/stuff/intel-microcode2ucode.c Sat Feb 24 16:17:33 2018 +0200 72.3 @@ -0,0 +1,156 @@ 72.4 +/* 72.5 + * Convert Intel microcode.dat into a single binary microcode.bin file 72.6 + * 72.7 + * Based on code by Kay Sievers <kay.sievers@vrfy.org> 72.8 + * Changed to create a single file by Thomas Bächler <thomas@archlinux.org> 72.9 + */ 72.10 + 72.11 + 72.12 +#ifndef _GNU_SOURCE 72.13 +# define _GNU_SOURCE 1 72.14 +#endif 72.15 + 72.16 +#include <stdio.h> 72.17 +#include <unistd.h> 72.18 +#include <stdlib.h> 72.19 +#include <string.h> 72.20 +#include <time.h> 72.21 +#include <limits.h> 72.22 +#include <stdbool.h> 72.23 +#include <inttypes.h> 72.24 +#include <fcntl.h> 72.25 +#include <errno.h> 72.26 +#include <sys/stat.h> 72.27 + 72.28 +struct microcode_header_intel { 72.29 + unsigned int hdrver; 72.30 + unsigned int rev; 72.31 + unsigned int date; 72.32 + unsigned int sig; 72.33 + unsigned int cksum; 72.34 + unsigned int ldrver; 72.35 + unsigned int pf; 72.36 + unsigned int datasize; 72.37 + unsigned int totalsize; 72.38 + unsigned int reserved[3]; 72.39 +}; 72.40 + 72.41 +union mcbuf { 72.42 + struct microcode_header_intel hdr; 72.43 + unsigned int i[0]; 72.44 + char c[0]; 72.45 +}; 72.46 + 72.47 +int main(int argc, char *argv[]) 72.48 +{ 72.49 + const char *filename = "/lib/firmware/microcode.dat"; 72.50 + FILE *f; 72.51 + char line[LINE_MAX]; 72.52 + char buf[4000000]; 72.53 + union mcbuf *mc; 72.54 + size_t bufsize, count, start; 72.55 + int rc = EXIT_SUCCESS; 72.56 + 72.57 + if (argv[1] != NULL) 72.58 + filename = argv[1]; 72.59 + 72.60 + count = 0; 72.61 + mc = (union mcbuf *) buf; 72.62 + f = fopen(filename, "re"); 72.63 + if (f == NULL) { 72.64 + printf("open %s: %m\n", filename); 72.65 + rc = EXIT_FAILURE; 72.66 + goto out; 72.67 + } 72.68 + 72.69 + while (fgets(line, sizeof(line), f) != NULL) { 72.70 + if (sscanf(line, "%x, %x, %x, %x", 72.71 + &mc->i[count], 72.72 + &mc->i[count + 1], 72.73 + &mc->i[count + 2], 72.74 + &mc->i[count + 3]) != 4) 72.75 + continue; 72.76 + count += 4; 72.77 + } 72.78 + fclose(f); 72.79 + 72.80 + bufsize = count * sizeof(int); 72.81 + printf("%s: %lu(%luk) bytes, %zu integers\n", 72.82 + filename, 72.83 + bufsize, 72.84 + bufsize / 1024, 72.85 + count); 72.86 + 72.87 + if (bufsize < sizeof(struct microcode_header_intel)) 72.88 + goto out; 72.89 + 72.90 + f = fopen("microcode.bin", "we"); 72.91 + if (f == NULL) { 72.92 + printf("open microcode.bin: %m\n"); 72.93 + rc = EXIT_FAILURE; 72.94 + goto out; 72.95 + } 72.96 + 72.97 + start = 0; 72.98 + for (;;) { 72.99 + size_t size; 72.100 + unsigned int family, model, stepping, type; 72.101 + unsigned int year, month, day; 72.102 + 72.103 + mc = (union mcbuf *) &buf[start]; 72.104 + 72.105 + if (mc->hdr.totalsize) 72.106 + size = mc->hdr.totalsize; 72.107 + else 72.108 + size = 2000 + sizeof(struct microcode_header_intel); 72.109 + 72.110 + if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) { 72.111 + printf("unknown version/format:\n"); 72.112 + rc = EXIT_FAILURE; 72.113 + break; 72.114 + } 72.115 + 72.116 + /* 72.117 + * 0- 3 stepping 72.118 + * 4- 7 model 72.119 + * 8-11 family 72.120 + * 12-13 type 72.121 + * 16-19 extended model 72.122 + * 20-27 extended family 72.123 + */ 72.124 + stepping = mc->hdr.sig & 0x0f; 72.125 + model = (mc->hdr.sig >> 4) & 0x0f; 72.126 + family = (mc->hdr.sig >> 8) & 0x0f; 72.127 + type = (mc->hdr.sig >> 12) & 0x0f; 72.128 + if (family == 0x06) 72.129 + model += ((mc->hdr.sig >> 16) & 0x0f) << 4; 72.130 + if (family == 0x0f) 72.131 + family += (mc->hdr.sig >> 20) & 0xff; 72.132 + 72.133 + year = mc->hdr.date & 0xffff; 72.134 + month = mc->hdr.date >> 24; 72.135 + day = (mc->hdr.date >> 16) & 0xff; 72.136 + 72.137 + printf("\n"); 72.138 + printf("signature: 0x%02x (stepping %d, model %d, family %d, type %d)\n", 72.139 + mc->hdr.sig, stepping, model, family, type); 72.140 + printf("flags: 0x%02x\n", mc->hdr.pf); 72.141 + printf("revision: 0x%02x\n", mc->hdr.rev); 72.142 + printf("date: %04x-%02x-%02x\n", year, month, day); 72.143 + printf("size: %zu\n", size); 72.144 + 72.145 + if (fwrite(mc, size, 1, f) != 1) { 72.146 + printf("write microcode.bin: %m\n"); 72.147 + rc = EXIT_FAILURE; 72.148 + goto out; 72.149 + } 72.150 + 72.151 + start += size; 72.152 + if (start >= bufsize) 72.153 + break; 72.154 + } 72.155 + fclose(f); 72.156 + printf("\n"); 72.157 +out: 72.158 + return rc; 72.159 +}
73.1 --- a/iptables/receipt Sat Feb 24 10:43:01 2018 +0200 73.2 +++ b/iptables/receipt Sat Feb 24 16:17:33 2018 +0200 73.3 @@ -8,28 +8,36 @@ 73.4 MAINTAINER="pankso@slitaz.org" 73.5 LICENSE="GPL2" 73.6 WEB_SITE="http://www.netfilter.org/projects/iptables/" 73.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/iptables.html" 73.8 73.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 73.10 -WGET_URL="${WEB_SITE}files/$TARBALL" 73.11 +WGET_URL="http://www.netfilter.org/projects/iptables/files/$TARBALL" 73.12 TARBALL_SHA1="b2592490ca7a6c2cd0f069e167a4337c86acdf91" 73.13 73.14 BUILD_DEPENDS="linux-module-headers libmnl-dev libnftnl-dev" 73.15 SPLIT="iptables-dev" 73.16 73.17 -# Rules to configure and make the package. 73.18 -compile_rules() 73.19 -{ 73.20 +compile_rules() { 73.21 # Set the right Kernel path to compile. 73.22 - KERNEL_PATH="/usr/src/linux" 73.23 + KERNEL_PATH="/usr/src/linux" # TODO: KERNEL_DIR? (see INSTALL) 73.24 ./configure \ 73.25 - --libexecdir=/usr/lib/iptables \ 73.26 + --sbindir=/sbin \ 73.27 + --disable-nftables \ 73.28 + --enable-libipq \ 73.29 + --with-xtlibdir=/lib/xtables \ 73.30 $CONFIGURE_ARGS && 73.31 - make && make DESTDIR=$DESTDIR install 73.32 + make && make install || return 1 73.33 + 73.34 + ln -sfv ../../sbin/xtables-multi $install/usr/bin/iptables-xml 73.35 + 73.36 + for file in ip4tc ip6tc ipq iptc xtables; do 73.37 + mv -v $install/usr/lib/lib$file.so.* $install/lib 73.38 + ln -sfv ../../lib/$(readlink $install/usr/lib/lib$file.so) \ 73.39 + $install/usr/lib/lib$file.so 73.40 + done 73.41 } 73.42 73.43 -# Rules to gen a SliTaz package suitable for Tazpkg. 73.44 -genpkg_rules() 73.45 -{ 73.46 +genpkg_rules() { 73.47 case $PACKAGE in 73.48 iptables) 73.49 copy @std
74.1 --- a/ipxe/receipt Sat Feb 24 10:43:01 2018 +0200 74.2 +++ b/ipxe/receipt Sat Feb 24 16:17:33 2018 +0200 74.3 @@ -1,9 +1,9 @@ 74.4 -# SliTaz package receipt. 74.5 +# SliTaz package receipt v2. 74.6 74.7 PACKAGE="ipxe" 74.8 VERSION="41f786c" 74.9 CATEGORY="system-tools" 74.10 -SHORT_DESC="Open source network boot firmware." 74.11 +SHORT_DESC="Open source network boot firmware" 74.12 MAINTAINER="pascal.bellard@slitaz.org" 74.13 LICENSE="GPL2 UBDL" 74.14 WEB_SITE="http://ipxe.org/" 74.15 @@ -11,14 +11,11 @@ 74.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 74.17 WGET_URL="$GITHUB/ipxe/ipxe/tarball/$VERSION" 74.18 74.19 -DEPENDS="" 74.20 -BUILD_DEPENDS="perl liblzma-dev" 74.21 +BUILD_DEPENDS="perl xz-dev" 74.22 74.23 -# Rules to configure and make the package. 74.24 -compile_rules() 74.25 -{ 74.26 +compile_rules() { 74.27 cd $src/src 74.28 - 74.29 + 74.30 # Fix https://git.ipxe.org/ipxe.git/commit/163f8acba0fbb6e3c44aec5286d3d076e1f44f22 74.31 sed -i 's/.*.section ".pages".*/.if64 ;\n&/;$a.endif' \ 74.32 arch/x86/transitions/librm.S 74.33 @@ -32,22 +29,24 @@ 74.34 -e 's|//\(#define.*REBOOT_CMD\)|\1|' config/general.h 74.35 cp $stuff/lkrnprefix.S arch/i386/prefix 74.36 74.37 - make all 74.38 + make all || return 1 74.39 separator 74.40 74.41 - make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \ 74.42 - bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \ 74.43 - bin/ipxe.kkkpxe bin/ipxe.nbi bin/ipxe.lkrn EMBED=$stuff/ipxe.cmd 74.44 -} 74.45 + make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \ 74.46 + bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe \ 74.47 + bin/ipxe.kkpxe bin/ipxe.kkkpxe bin/ipxe.nbi \ 74.48 + bin/ipxe.lkrn \ 74.49 + EMBED=$stuff/ipxe.cmd || return 1 74.50 74.51 -# Rules to gen a SliTaz package suitable for Tazpkg. 74.52 -genpkg_rules() 74.53 -{ 74.54 - mkdir $fs/boot 74.55 - cp -a $src/src/bin/ipxe.lkrn $fs/boot/ipxe 74.56 + mkdir $install/boot 74.57 + cp -a $src/src/bin/ipxe.lkrn $install/boot/ipxe 74.58 OFS=$((0x156)) 74.59 - unix2dos <<EOT | dd bs=1 of=$fs/boot/ipxe conv=notrunc \ 74.60 + unix2dos <<EOT | dd bs=1 of=$install/boot/ipxe conv=notrunc \ 74.61 seek=$OFS count=$((0x1F0-$OFS)) 74.62 $SHORT_DESC 74.63 EOT 74.64 } 74.65 + 74.66 +genpkg_rules() { 74.67 + copy @std 74.68 +}
75.1 --- a/isapnptools-dev/receipt Sat Feb 24 10:43:01 2018 +0200 75.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 75.3 @@ -1,18 +0,0 @@ 75.4 -# SliTaz package receipt. 75.5 - 75.6 -PACKAGE="isapnptools-dev" 75.7 -VERSION="1.27" 75.8 -CATEGORY="development" 75.9 -SHORT_DESC="ISA Plug-And-Play configuration devel files." 75.10 -MAINTAINER="pascal.bellard@slitaz.org" 75.11 -LICENSE="GPL2" 75.12 -WEB_SITE="http://www.roestock.demon.co.uk/isapnptools/" 75.13 - 75.14 -WANTED="isapnptools" 75.15 -DEPENDS="isapnptools" 75.16 - 75.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 75.18 -genpkg_rules() 75.19 -{ 75.20 - copy *.h *.a 75.21 -}
76.1 --- a/isapnptools/receipt Sat Feb 24 10:43:01 2018 +0200 76.2 +++ b/isapnptools/receipt Sat Feb 24 16:17:33 2018 +0200 76.3 @@ -1,9 +1,9 @@ 76.4 -# SliTaz package receipt. 76.5 +# SliTaz package receipt v2. 76.6 76.7 PACKAGE="isapnptools" 76.8 VERSION="1.27" 76.9 CATEGORY="system-tools" 76.10 -SHORT_DESC="ISA Plug-And-Play configuration." 76.11 +SHORT_DESC="ISA Plug-And-Play configuration" 76.12 MAINTAINER="pascal.bellard@slitaz.org" 76.13 LICENSE="GPL2" 76.14 WEB_SITE="http://www.roestock.demon.co.uk/isapnptools/" 76.15 @@ -12,18 +12,18 @@ 76.16 WGET_URL="ftp://metalab.unc.edu/pub/Linux/system/hardware/$TARBALL" 76.17 76.18 BUILD_DEPENDS="gfortran" 76.19 +SPLIT="isapnptools-dev" 76.20 76.21 -# Rules to configure and make the package. 76.22 -compile_rules() 76.23 -{ 76.24 +compile_rules() { 76.25 ./configure \ 76.26 --sbindir=/sbin \ 76.27 $CONFIGURE_ARGS && 76.28 make && make install 76.29 } 76.30 76.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 76.32 -genpkg_rules() 76.33 -{ 76.34 - copy sbin/ 76.35 +genpkg_rules() { 76.36 + case $PACKAGE in 76.37 + isapnptools) copy @std;; 76.38 + *-dev) copy @dev;; 76.39 + esac 76.40 }
77.1 --- a/itstool/receipt Sat Feb 24 10:43:01 2018 +0200 77.2 +++ b/itstool/receipt Sat Feb 24 16:17:33 2018 +0200 77.3 @@ -1,4 +1,4 @@ 77.4 -# SliTaz package receipt. 77.5 +# SliTaz package receipt v2. 77.6 77.7 PACKAGE="itstool" 77.8 VERSION="2.0.2" 77.9 @@ -11,17 +11,13 @@ 77.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 77.11 WGET_URL="http://files.itstool.org/itstool/$TARBALL" 77.12 77.13 -DEPENDS="libxml2-python" 77.14 BUILD_DEPENDS="libxml2-python" 77.15 77.16 -# Rules to configure and make the package. 77.17 -compile_rules() 77.18 -{ 77.19 +compile_rules() { 77.20 ./configure $CONFIGURE_ARGS && make && make install 77.21 } 77.22 77.23 -# Rules to gen a SliTaz package suitable for Tazpkg. 77.24 -genpkg_rules() 77.25 -{ 77.26 +genpkg_rules() { 77.27 copy itstool *.its 77.28 + DEPENDS="libxml2-python" 77.29 }
78.1 --- a/js/receipt Sat Feb 24 10:43:01 2018 +0200 78.2 +++ b/js/receipt Sat Feb 24 16:17:33 2018 +0200 78.3 @@ -65,3 +65,4 @@ 78.4 ;; 78.5 esac 78.6 } 78.7 +
79.1 --- a/js/stuff/patches/series Sat Feb 24 10:43:01 2018 +0200 79.2 +++ b/js/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 79.3 @@ -1,2 +1,4 @@ 79.4 # http://www.linuxfromscratch.org/patches/blfs/8.1/js38-38.2.1-upstream_fixes-2.patch 79.5 js38-38.2.1-upstream_fixes-2.patch 79.6 + 79.7 +std.patch
80.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 80.2 +++ b/js/stuff/patches/std.patch Sat Feb 24 16:17:33 2018 +0200 80.3 @@ -0,0 +1,15 @@ 80.4 +--- a/mfbt/decimal/Decimal.cpp 80.5 ++++ b/mfbt/decimal/Decimal.cpp 80.6 +@@ -686,10 +686,10 @@ 80.7 + 80.8 + Decimal Decimal::fromDouble(double doubleValue) 80.9 + { 80.10 +- if (std::isfinite(doubleValue)) 80.11 ++ if (isfinite(doubleValue)) 80.12 + return fromString(mozToString(doubleValue)); 80.13 + 80.14 +- if (std::isinf(doubleValue)) 80.15 ++ if (isinf(doubleValue)) 80.16 + return infinity(doubleValue < 0 ? Negative : Positive); 80.17 + 80.18 + return nan();
81.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 81.2 +++ b/js185/receipt Sat Feb 24 16:17:33 2018 +0200 81.3 @@ -0,0 +1,50 @@ 81.4 +# SliTaz package receipt v2. 81.5 + 81.6 +PACKAGE="js185" 81.7 +VERSION="1.0.0" 81.8 +CATEGORY="libdevel" 81.9 +SHORT_DESC="JavaScript interpreter and libraries (legacy)" 81.10 +MAINTAINER="al.bobylev@gmail.com" 81.11 +LICENSE="MPL2" 81.12 +WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5" 81.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/js38.html" 81.14 + 81.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 81.16 +WGET_URL="http://ftp.mozilla.org/pub/js/$TARBALL" 81.17 + 81.18 +BUILD_DEPENDS="perl zip nspr-dev libffi-dev" 81.19 +SPLIT="js185-dev" 81.20 + 81.21 +compile_rules() { 81.22 + cd js/src 81.23 + unset CPPFLAGS 81.24 + 81.25 + ./configure \ 81.26 + --with-system-nspr \ 81.27 + --disable-tests \ 81.28 + --enable-ctypes \ 81.29 + --enable-threadsafe \ 81.30 + --enable-system-ffi \ 81.31 + $CONFIGURE_ARGS && 81.32 + make && make install || return 1 81.33 + 81.34 + install -Dm755 shell/js -t $install/usr/bin/ 81.35 + rm $install/usr/lib/libmozjs185-1.0.a 81.36 + 81.37 + find $install -type f \ 81.38 + \( -name '*.h' -o -name '*.tbl' -o -name '*.msg' -o -name '*.a' \) \ 81.39 + -exec chmod 644 '{}' \; 81.40 +} 81.41 + 81.42 +genpkg_rules() { 81.43 + case $PACKAGE in 81.44 + js185) 81.45 + copy @std 81.46 + DEPENDS="libffi nspr" 81.47 + ;; 81.48 + js185-dev) 81.49 + copy @dev 81.50 + DEPENDS="js185 nspr-dev" 81.51 + ;; 81.52 + esac 81.53 +}
82.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 82.2 +++ b/js185/stuff/patches/allow-to-build-against-system-libffi.patch Sat Feb 24 16:17:33 2018 +0200 82.3 @@ -0,0 +1,116 @@ 82.4 +From: Mike Hommey <mh@glandium.org> 82.5 +Date: Tue, 9 Mar 2010 09:44:37 +0100 82.6 +Subject: Allow to build against system libffi 82.7 + 82.8 +https://bugzilla.mozilla.org/show_bug.cgi?id=551138 82.9 +--- 82.10 + js/src/Makefile.in | 16 ++++++++++++++-- 82.11 + js/src/config/autoconf.mk.in | 4 ++++ 82.12 + js/src/configure.in | 14 +++++++++++++- 82.13 + js/src/shell/Makefile.in | 3 +++ 82.14 + 4 files changed, 34 insertions(+), 3 deletions(-) 82.15 + 82.16 +--- a/js/src/Makefile.in 82.17 ++++ b/js/src/Makefile.in 82.18 +@@ -453,11 +453,20 @@ CPPSRCS += \ 82.19 + Library.cpp \ 82.20 + $(NULL) 82.21 + 82.22 +-LOCAL_INCLUDES = \ 82.23 +- -Ictypes/libffi/include \ 82.24 ++ifdef MOZ_NATIVE_FFI 82.25 ++LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) 82.26 ++else 82.27 ++LOCAL_INCLUDES = -Ictypes/libffi/include 82.28 ++endif 82.29 ++ 82.30 ++LOCAL_INCLUDES += \ 82.31 + -I. \ 82.32 + $(NULL) 82.33 + 82.34 ++ 82.35 ++ifdef MOZ_NATIVE_FFI 82.36 ++EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS) 82.37 ++else 82.38 + ifeq ($(OS_ARCH),OS2) 82.39 + SHARED_LIBRARY_LIBS += \ 82.40 + ctypes/libffi/.libs/ffi.a \ 82.41 +@@ -467,6 +476,7 @@ SHARED_LIBRARY_LIBS += \ 82.42 + ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \ 82.43 + $(NULL) 82.44 + endif 82.45 ++endif 82.46 + 82.47 + endif # JS_HAS_CTYPES 82.48 + 82.49 +@@ -546,6 +556,7 @@ endif 82.50 + include $(topsrcdir)/config/rules.mk 82.51 + 82.52 + ifdef JS_HAS_CTYPES 82.53 ++ifndef MOZ_NATIVE_FFI 82.54 + # Build libffi proper as part of the 'exports' target, so things get built 82.55 + # in the right order. 82.56 + export:: 82.57 +@@ -554,6 +565,7 @@ export:: 82.58 + distclean clean:: 82.59 + $(call SUBMAKE,$@,ctypes/libffi) 82.60 + endif 82.61 ++endif 82.62 + 82.63 + ifdef MOZ_SYNC_BUILD_FILES 82.64 + # Because the SpiderMonkey can be distributed and built independently 82.65 +--- a/js/src/config/autoconf.mk.in 82.66 ++++ b/js/src/config/autoconf.mk.in 82.67 +@@ -250,6 +250,10 @@ NSPR_CONFIG = @NSPR_CONFIG@ 82.68 + NSPR_CFLAGS = @NSPR_CFLAGS@ 82.69 + NSPR_LIBS = @NSPR_LIBS@ 82.70 + 82.71 ++MOZ_NATIVE_FFI = @MOZ_NATIVE_FFI@ 82.72 ++MOZ_FFI_LIBS = @MOZ_FFI_LIBS@ 82.73 ++MOZ_FFI_CFLAGS = @MOZ_FFI_CFLAGS@ 82.74 ++ 82.75 + USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@ 82.76 + 82.77 + JS_NATIVE_EDITLINE = @JS_NATIVE_EDITLINE@ 82.78 +--- a/js/src/configure.in 82.79 ++++ b/js/src/configure.in 82.80 +@@ -4591,6 +4591,18 @@ if test -n "$MOZ_NATIVE_NSPR"; then 82.81 + CFLAGS=$_SAVE_CFLAGS 82.82 + fi 82.83 + 82.84 ++dnl system libffi Support 82.85 ++dnl ======================================================== 82.86 ++MOZ_ARG_ENABLE_BOOL(system-ffi, 82.87 ++[ --enable-system-ffi Use system libffi (located with pkgconfig)], 82.88 ++ MOZ_NATIVE_FFI=1 ) 82.89 ++ 82.90 ++if test -n "$MOZ_NATIVE_FFI"; then 82.91 ++ PKG_CHECK_MODULES(MOZ_FFI, libffi) 82.92 ++fi 82.93 ++ 82.94 ++AC_SUBST(MOZ_NATIVE_FFI) 82.95 ++ 82.96 + dnl ======================================================== 82.97 + dnl = 82.98 + dnl = Application 82.99 +@@ -6074,7 +6086,7 @@ AC_MSG_RESULT(invoking make to create js 82.100 + $GMAKE js-config 82.101 + 82.102 + # Build jsctypes if it's enabled. 82.103 +-if test "$JS_HAS_CTYPES"; then 82.104 ++if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then 82.105 + # Run the libffi 'configure' script. 82.106 + ac_configure_args="--disable-shared --enable-static --disable-raw-api" 82.107 + if test "$MOZ_DEBUG"; then 82.108 +--- a/js/src/shell/Makefile.in 82.109 ++++ b/js/src/shell/Makefile.in 82.110 +@@ -53,6 +53,9 @@ CPPSRCS = \ 82.111 + DEFINES += -DEXPORT_JS_API 82.112 + 82.113 + LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) 82.114 ++ifdef MOZ_NATIVE_FFI 82.115 ++EXTRA_LIBS += $(MOZ_FFI_LIBS) 82.116 ++endif 82.117 + 82.118 + LOCAL_INCLUDES += -I$(topsrcdir) -I.. 82.119 +
83.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 83.2 +++ b/js185/stuff/patches/autoconf.patch Sat Feb 24 16:17:33 2018 +0200 83.3 @@ -0,0 +1,163 @@ 83.4 +--- a/js/src/configure 83.5 ++++ b/js/src/configure 83.6 +@@ -99,6 +99,8 @@ ac_help="$ac_help 83.7 + --with-nspr-exec-prefix=PFX 83.8 + Exec prefix where NSPR is installed" 83.9 + ac_help="$ac_help 83.10 ++ --enable-system-ffi Use system libffi (located with pkgconfig)" 83.11 ++ac_help="$ac_help 83.12 + --with-arm-kuser Use kuser helpers (Linux/ARM only -- requires kernel 2.6.13 or later)" 83.13 + ac_help="$ac_help 83.14 + --enable-ui-locale=ab-CD 83.15 +@@ -13204,19 +13206,128 @@ rm -f conftest* 83.16 + CFLAGS=$_SAVE_CFLAGS 83.17 + fi 83.18 + 83.19 ++# Check whether --enable-system-ffi or --disable-system-ffi was given. 83.20 ++if test "${enable_system_ffi+set}" = set; then 83.21 ++ enableval="$enable_system_ffi" 83.22 ++ if test "$enableval" = "yes"; then 83.23 ++ MOZ_NATIVE_FFI=1 83.24 ++ elif test "$enableval" = "no"; then 83.25 ++ : 83.26 ++ else 83.27 ++ { echo "configure: error: Option, system-ffi, does not take an argument ($enableval)." 1>&2; exit 1; } 83.28 ++ fi 83.29 ++fi 83.30 ++ 83.31 ++ 83.32 ++if test -n "$MOZ_NATIVE_FFI"; then 83.33 ++ succeeded=no 83.34 ++ 83.35 ++ if test -z "$PKG_CONFIG"; then 83.36 ++ # Extract the first word of "pkg-config", so it can be a program name with args. 83.37 ++set dummy pkg-config; ac_word=$2 83.38 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 83.39 ++echo "configure:13210: checking for $ac_word" >&5 83.40 ++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then 83.41 ++ echo $ac_n "(cached) $ac_c" 1>&6 83.42 ++else 83.43 ++ case "$PKG_CONFIG" in 83.44 ++ /*) 83.45 ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 83.46 ++ ;; 83.47 ++ ?:/*) 83.48 ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. 83.49 ++ ;; 83.50 ++ *) 83.51 ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 83.52 ++ ac_dummy="$PATH" 83.53 ++ for ac_dir in $ac_dummy; do 83.54 ++ test -z "$ac_dir" && ac_dir=. 83.55 ++ if test -f $ac_dir/$ac_word; then 83.56 ++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 83.57 ++ break 83.58 ++ fi 83.59 ++ done 83.60 ++ IFS="$ac_save_ifs" 83.61 ++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" 83.62 ++ ;; 83.63 ++esac 83.64 ++fi 83.65 ++PKG_CONFIG="$ac_cv_path_PKG_CONFIG" 83.66 ++if test -n "$PKG_CONFIG"; then 83.67 ++ echo "$ac_t""$PKG_CONFIG" 1>&6 83.68 ++else 83.69 ++ echo "$ac_t""no" 1>&6 83.70 ++fi 83.71 ++ 83.72 ++ fi 83.73 ++ 83.74 ++ if test "$PKG_CONFIG" = "no" ; then 83.75 ++ echo "*** The pkg-config script could not be found. Make sure it is" 83.76 ++ echo "*** in your path, or set the PKG_CONFIG environment variable" 83.77 ++ echo "*** to the full path to pkg-config." 83.78 ++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." 83.79 ++ else 83.80 ++ PKG_CONFIG_MIN_VERSION=0.9.0 83.81 ++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then 83.82 ++ echo $ac_n "checking for libffi""... $ac_c" 1>&6 83.83 ++echo "configure:13254: checking for libffi" >&5 83.84 ++ 83.85 ++ if $PKG_CONFIG --exists "libffi" ; then 83.86 ++ echo "$ac_t""yes" 1>&6 83.87 ++ succeeded=yes 83.88 ++ 83.89 ++ echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 83.90 ++echo "configure:13261: checking MOZ_FFI_CFLAGS" >&5 83.91 ++ MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi"` 83.92 ++ echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 83.93 ++ 83.94 ++ echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 83.95 ++echo "configure:13266: checking MOZ_FFI_LIBS" >&5 83.96 ++ ## Remove evil flags like -Wl,--export-dynamic 83.97 ++ MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi\" |sed s/-Wl,--export-dynamic//g`" 83.98 ++ echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 83.99 ++ else 83.100 ++ MOZ_FFI_CFLAGS="" 83.101 ++ MOZ_FFI_LIBS="" 83.102 ++ ## If we have a custom action on failure, don't print errors, but 83.103 ++ ## do set a variable so people can do so. 83.104 ++ MOZ_FFI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libffi"` 83.105 ++ echo $MOZ_FFI_PKG_ERRORS 83.106 ++ fi 83.107 ++ 83.108 ++ 83.109 ++ 83.110 ++ else 83.111 ++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." 83.112 ++ echo "*** See http://www.freedesktop.org/software/pkgconfig" 83.113 ++ fi 83.114 ++ fi 83.115 ++ 83.116 ++ if test $succeeded = yes; then 83.117 ++ : 83.118 ++ else 83.119 ++ if test "$COMPILE_ENVIRONMENT"; then 83.120 ++ { echo "configure: error: Library requirements (libffi) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } 83.121 ++ fi 83.122 ++ fi 83.123 ++ 83.124 ++fi 83.125 ++ 83.126 ++ 83.127 ++ 83.128 + 83.129 + # Application 83.130 + 83.131 + BUILD_STATIC_LIBS= 83.132 + ENABLE_TESTS=1 83.133 + 83.134 + MOZ_THUMB2= 83.135 + USE_ARM_KUSER= 83.136 + 83.137 + case "${target}" in 83.138 + arm-android-eabi) 83.139 + USE_ARM_KUSER=1 83.140 + MOZ_THUMB2=1 83.141 + ;; 83.142 + esac 83.143 + 83.144 +@@ -15741,9 +15851,13 @@ s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g 83.145 + s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g 83.146 + s%@NSPR_LIBS@%$NSPR_LIBS%g 83.147 + s%@NSPR_CONFIG@%$NSPR_CONFIG%g 83.148 ++s%@PKG_CONFIG@%$PKG_CONFIG%g 83.149 ++s%@MOZ_FFI_CFLAGS@%$MOZ_FFI_CFLAGS%g 83.150 ++s%@MOZ_FFI_LIBS@%$MOZ_FFI_LIBS%g 83.151 ++s%@MOZ_NATIVE_FFI@%$MOZ_NATIVE_FFI%g 83.152 + s%@MOZ_UI_LOCALE@%$MOZ_UI_LOCALE%g 83.153 + s%@MOZ_THUMB2@%$MOZ_THUMB2%g 83.154 + s%@MOZ_ARM_ARCH@%$MOZ_ARM_ARCH%g 83.155 + s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g 83.156 + s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g 83.157 + s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g 83.158 +@@ -16121,7 +16235,7 @@ echo "$ac_t""invoking make to create js- 83.159 + $GMAKE js-config 83.160 + 83.161 + # Build jsctypes if it's enabled. 83.162 +-if test "$JS_HAS_CTYPES"; then 83.163 ++if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then 83.164 + # Run the libffi 'configure' script. 83.165 + ac_configure_args="--disable-shared --enable-static --disable-raw-api" 83.166 + if test "$MOZ_DEBUG"; then
84.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 84.2 +++ b/js185/stuff/patches/destdir.patch Sat Feb 24 16:17:33 2018 +0200 84.3 @@ -0,0 +1,16 @@ 84.4 +# See discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=628723 84.5 +# Patch created by Colin Walters <walters@verbum.org> 84.6 + 84.7 +--- a/js/src/Makefile.in 84.8 ++++ b/js/src/Makefile.in 84.9 +@@ -900,8 +900,8 @@ endif 84.10 + ifeq (,$(HOST_BIN_SUFFIX)) 84.11 + mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) 84.12 + @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) 84.13 +- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) 84.14 +- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) 84.15 ++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) 84.16 ++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) 84.17 + endif 84.18 + endif 84.19 + ifneq (,$(IMPORT_LIBRARY))
85.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 85.2 +++ b/js185/stuff/patches/fix-811665.patch Sat Feb 24 16:17:33 2018 +0200 85.3 @@ -0,0 +1,153 @@ 85.4 +Description: Fix FTBFS with gcc6 85.5 + Most fixes are returning NULL instead of false and a narrowing issues. 85.6 +Author: Tobias Frost <tobi@debian.org> 85.7 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811665 85.8 +Last-Update: 2016-09-25 85.9 +--- 85.10 +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ 85.11 +--- a/js/src/ctypes/CTypes.cpp 85.12 ++++ b/js/src/ctypes/CTypes.cpp 85.13 +@@ -4753,7 +4753,7 @@ NewFunctionInfo(JSContext* cx, 85.14 + for (JSUint32 i = 0; i < argLength; ++i) { 85.15 + bool isEllipsis; 85.16 + if (!IsEllipsis(cx, argTypes[i], &isEllipsis)) 85.17 +- return false; 85.18 ++ return NULL; 85.19 + if (isEllipsis) { 85.20 + fninfo->mIsVariadic = true; 85.21 + if (i < 1) { 85.22 +--- a/js/src/jsapi.cpp 85.23 ++++ b/js/src/jsapi.cpp 85.24 +@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob 85.25 + AutoIdVector props(cx); 85.26 + JSIdArray *ida; 85.27 + if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida)) 85.28 +- return false; 85.29 ++ return NULL; 85.30 + for (size_t n = 0; n < size_t(ida->length); ++n) 85.31 + JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]); 85.32 + return ida; 85.33 +--- a/js/src/jsfun.cpp 85.34 ++++ b/js/src/jsfun.cpp 85.35 +@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje 85.36 + 85.37 + JSString *str = JS_DecompileFunction(cx, fun, indent); 85.38 + if (!str) 85.39 +- return false; 85.40 ++ return NULL; 85.41 + 85.42 + if (!indent) 85.43 + cx->compartment->toSourceCache.put(fun, str); 85.44 +@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon 85.45 + const Shape *shape = funobj->nativeLookup(id); 85.46 + if (!shape) { 85.47 + if (!ResolveInterpretedFunctionPrototype(cx, funobj)) 85.48 +- return false; 85.49 ++ return NULL; 85.50 + shape = funobj->nativeLookup(id); 85.51 + } 85.52 + JS_ASSERT(!shape->configurable()); 85.53 +--- a/js/src/jsiter.cpp 85.54 ++++ b/js/src/jsiter.cpp 85.55 +@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f 85.56 + */ 85.57 + JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0); 85.58 + if (!obj) 85.59 +- return false; 85.60 ++ return NULL; 85.61 + obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false); 85.62 + obj->setMap(cx->compartment->emptyEnumeratorShape); 85.63 + return obj; 85.64 +--- a/js/src/jsparse.cpp 85.65 ++++ b/js/src/jsparse.cpp 85.66 +@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun 85.67 + if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) { 85.68 + JS_ASSERT(pn->pn_cookie.isFree()); 85.69 + if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom)) 85.70 +- return false; 85.71 ++ return NULL; 85.72 + } 85.73 + 85.74 + pn->pn_blockid = outertc->blockid(); 85.75 +--- a/js/src/jsstr.cpp 85.76 ++++ b/js/src/jsstr.cpp 85.77 +@@ -1734,7 +1734,7 @@ class RegExpGuard 85.78 + if (flat) { 85.79 + patstr = flattenPattern(cx, fm.patstr); 85.80 + if (!patstr) 85.81 +- return false; 85.82 ++ return NULL; 85.83 + } else { 85.84 + patstr = fm.patstr; 85.85 + } 85.86 +@@ -3408,7 +3408,7 @@ js_InitStringClass(JSContext *cx, JSObje 85.87 + UndefinedValue(), NULL, NULL, 85.88 + JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0, 85.89 + NULL)) { 85.90 +- return JS_FALSE; 85.91 ++ return NULL; 85.92 + } 85.93 + 85.94 + return proto; 85.95 +--- a/js/src/jstypedarray.cpp 85.96 ++++ b/js/src/jstypedarray.cpp 85.97 +@@ -1334,7 +1334,7 @@ class TypedArrayTemplate 85.98 + if (size != 0 && count >= INT32_MAX / size) { 85.99 + JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, 85.100 + JSMSG_NEED_DIET, "size and count"); 85.101 +- return false; 85.102 ++ return NULL; 85.103 + } 85.104 + 85.105 + int32 bytelen = size * count; 85.106 +@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint 85.107 + 85.108 + default: 85.109 + JS_NOT_REACHED("shouldn't have gotten here"); 85.110 +- return false; 85.111 ++ return NULL; 85.112 + } 85.113 + } 85.114 + 85.115 +--- a/js/src/jsxml.cpp 85.116 ++++ b/js/src/jsxml.cpp 85.117 +@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS 85.118 + 85.119 + obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass); 85.120 + if (!obj) 85.121 +- return JS_FALSE; 85.122 ++ return NULL; 85.123 + JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal())); 85.124 + JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal())); 85.125 + JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared())); 85.126 +@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb 85.127 + size_t length = str->length(); 85.128 + jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar)); 85.129 + if (!chars) 85.130 +- return JS_FALSE; 85.131 ++ return NULL; 85.132 + *chars = '@'; 85.133 + const jschar *strChars = str->getChars(cx); 85.134 + if (!strChars) { 85.135 +--- a/js/src/methodjit/InvokeHelpers.cpp 85.136 ++++ b/js/src/methodjit/InvokeHelpers.cpp 85.137 +@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx) 85.138 + { 85.139 + JSStackFrame *fp = cx->fp(); 85.140 + if (fp->hasImacropc()) 85.141 +- return false; 85.142 ++ return NULL; 85.143 + 85.144 + JSScript *script = fp->script(); 85.145 + return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc); 85.146 +--- a/js/src/nanojit/NativeX64.cpp 85.147 ++++ b/js/src/nanojit/NativeX64.cpp 85.148 +@@ -1899,7 +1899,7 @@ namespace nanojit 85.149 + } 85.150 + } 85.151 + 85.152 +- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0}; 85.153 ++ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {(int64_t) 0x8000000000000000ULL,0}; 85.154 + 85.155 + void Assembler::asm_fneg(LIns *ins) { 85.156 + Register rr, ra;
86.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 86.2 +++ b/js185/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 86.3 @@ -0,0 +1,6 @@ 86.4 +# from https://www.archlinux.org/packages/community/x86_64/js185/ 86.5 + 86.6 +fix-811665.patch 86.7 +destdir.patch 86.8 +autoconf.patch 86.9 +allow-to-build-against-system-libffi.patch
87.1 --- a/krb5/receipt Sat Feb 24 10:43:01 2018 +0200 87.2 +++ b/krb5/receipt Sat Feb 24 16:17:33 2018 +0200 87.3 @@ -15,14 +15,11 @@ 87.4 SPLIT="krb5-plugins krb5-clients krb5-user libcomerr3 libkrb5 libkrb5support \ 87.5 krb5 krb5-dev" 87.6 87.7 -# Rules to configure and make the package. 87.8 -compile_rules() 87.9 -{ 87.10 - CFLAGS="-march=$ARCH -O2 -pipe -fomit-frame-pointer" 87.11 +compile_rules() { 87.12 + CFLAGS="${CFLAGS/-Os/-O2}" 87.13 CXXFLAGS="$CFLAGS" 87.14 87.15 - cd src && 87.16 - 87.17 + cd src 87.18 sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \ 87.19 -e "s@-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \ 87.20 -i configure.in && 87.21 @@ -43,39 +40,37 @@ 87.22 --enable-dns-for-realm \ 87.23 $CONFIGURE_ARGS && 87.24 make $MAKEFLAGS && 87.25 - make install && 87.26 + make install || return 1 87.27 87.28 for f in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \ 87.29 kdb5 kdb_ldap krad krb5 krb5support verto; do 87.30 find $install/usr/lib -type f -name "lib$f*.so*" -exec chmod -v 755 '{}' \; 87.31 - done && 87.32 + done 87.33 87.34 - mkdir -p $install/lib && 87.35 - mv -v $install/usr/lib/libkrb5.so.3* $install/lib && 87.36 - mv -v $install/usr/lib/libk5crypto.so.3* $install/lib && 87.37 - mv -v $install/usr/lib/libkrb5support.so.0* $install/lib && 87.38 + mkdir -p $install/lib 87.39 + mv -v $install/usr/lib/libkrb5.so.3* $install/lib 87.40 + mv -v $install/usr/lib/libk5crypto.so.3* $install/lib 87.41 + mv -v $install/usr/lib/libkrb5support.so.0* $install/lib 87.42 87.43 - ln -v -sf ../../lib/libkrb5.so.3.3 $install/usr/lib/libkrb5.so && 87.44 - ln -v -sf ../../lib/libk5crypto.so.3.1 $install/usr/lib/libk5crypto.so && 87.45 - ln -v -sf ../../lib/libkrb5support.so.0.1 $install/usr/lib/libkrb5support.so && 87.46 + ln -v -sf ../../lib/libkrb5.so.3.3 $install/usr/lib/libkrb5.so 87.47 + ln -v -sf ../../lib/libk5crypto.so.3.1 $install/usr/lib/libk5crypto.so 87.48 + ln -v -sf ../../lib/libkrb5support.so.0.1 $install/usr/lib/libkrb5support.so 87.49 87.50 - mkdir -p $install/bin && 87.51 - mv -v $install/usr/bin/ksu $install/bin && 87.52 - chmod -v 755 $install/bin/ksu && 87.53 + mkdir -p $install/bin 87.54 + mv -v $install/usr/bin/ksu $install/bin 87.55 + chmod -v 755 $install/bin/ksu 87.56 87.57 - chmod -v 755 $install/usr/lib/libcom_err.so.3.0 && 87.58 - find $install/usr/lib/krb5/plugins -name '*.so' -exec chmod 755 '{}' \; && 87.59 + chmod -v 755 $install/usr/lib/libcom_err.so.3.0 87.60 + find $install/usr/lib/krb5/plugins -name '*.so' -exec chmod 755 '{}' \; 87.61 87.62 - mkdir -p $install/etc && 87.63 - touch $install/etc/krb5.conf && 87.64 + mkdir -p $install/etc 87.65 + touch $install/etc/krb5.conf 87.66 87.67 - install -v -dm755 $install/usr/share/doc/krb5-$VERSION && 87.68 + install -v -dm755 $install/usr/share/doc/krb5-$VERSION 87.69 cp -vfr ../doc/* $install/usr/share/doc/krb5-$VERSION 87.70 } 87.71 87.72 -# Rules to gen a SliTaz package suitable for Tazpkg. 87.73 -genpkg_rules() 87.74 -{ 87.75 +genpkg_rules() { 87.76 case $PACKAGE in 87.77 krb5-plugins) 87.78 copy plugins/ 87.79 @@ -121,15 +116,14 @@ 87.80 esac 87.81 } 87.82 87.83 -# Pre and post install commands for Tazpkg. 87.84 post_install_krb5() { 87.85 [ -n "$quiet" ] || cat <<EOF 87.86 ----- 87.87 -To start krb5 server you can run: 87.88 87.89 - /etc/init.d/krb5 start 87.90 - 87.91 -Or add krb5 to RUN_DAEMONS in /etc/rcS.conf 87.92 ----- 87.93 + .---------------------------------------------. 87.94 + | To start krb5 server you can run: | 87.95 + | /etc/init.d/krb5 start | 87.96 + | | 87.97 + | Or add krb5 to RUN_DAEMONS in /etc/rcS.conf | 87.98 + '---------------------------------------------' 87.99 EOF 87.100 }
88.1 --- a/lcms2/receipt Sat Feb 24 10:43:01 2018 +0200 88.2 +++ b/lcms2/receipt Sat Feb 24 16:17:33 2018 +0200 88.3 @@ -7,6 +7,7 @@ 88.4 MAINTAINER="al.bobylev@gmail.com" 88.5 LICENSE="MIT" 88.6 WEB_SITE="http://www.littlecms.com/" 88.7 +HOST_ARCH="i486 x86_64" 88.8 88.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 88.10 WGET_URL="$SF_MIRROR/lcms/$TARBALL" 88.11 @@ -14,15 +15,11 @@ 88.12 BUILD_DEPENDS="libjpeg-turbo-dev zlib-dev tiff-dev" 88.13 SPLIT="lcms2-apps lcms2-dev" 88.14 88.15 -# Rules to configure and make the package. 88.16 -compile_rules() 88.17 -{ 88.18 +compile_rules() { 88.19 ./configure $CONFIGURE_ARGS && make && make install 88.20 } 88.21 88.22 -# Rules to gen a SliTaz package suitable for Tazpkg. 88.23 -genpkg_rules() 88.24 -{ 88.25 +genpkg_rules() { 88.26 case $PACKAGE in 88.27 lcms2) 88.28 copy *.so*
89.1 --- a/leafpad/receipt Sat Feb 24 10:43:01 2018 +0200 89.2 +++ b/leafpad/receipt Sat Feb 24 16:17:33 2018 +0200 89.3 @@ -1,33 +1,27 @@ 89.4 -# SliTaz package receipt. 89.5 +# SliTaz package receipt v2. 89.6 89.7 PACKAGE="leafpad" 89.8 VERSION="0.8.18.1" 89.9 CATEGORY="utilities" 89.10 -SHORT_DESC="GTK simple text editor." 89.11 +SHORT_DESC="Simple GTK text editor" 89.12 MAINTAINER="pankso@slitaz.org" 89.13 LICENSE="GPL2" 89.14 +WEB_SITE="http://tarot.freeshell.org/leafpad/" 89.15 + 89.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 89.17 -WEB_SITE="http://tarot.freeshell.org/leafpad/" 89.18 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL" 89.19 -TAGS="text-editor" 89.20 -HOST_ARCH="i486 arm" 89.21 + 89.22 +BUILD_DEPENDS="gtk+-dev xorg-libXrender-dev xorg-xproto intltool" 89.23 GENERIC_PIXMAPS="no" 89.24 89.25 -DEPENDS="gtk+ xorg-libXdamage" 89.26 -BUILD_DEPENDS="gtk+-dev xorg-libXrender-dev xorg-xproto intltool" 89.27 - 89.28 -# Rules to configure and make the package. 89.29 -compile_rules() 89.30 -{ 89.31 +compile_rules() { 89.32 chmod +x install-sh 89.33 - patch -p1 -i $stuff/icon.patch 89.34 89.35 ./configure $CONFIGURE_ARGS && make && make install 89.36 } 89.37 89.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 89.39 -genpkg_rules() 89.40 -{ 89.41 - mkdir -p $fs/usr 89.42 - cp -a $install/usr/bin $fs/usr 89.43 +genpkg_rules() { 89.44 + copy leafpad 89.45 + DEPENDS="gtk+ xorg-libXdamage" 89.46 + TAGS="text-editor" 89.47 }
90.1 --- a/leafpad/stuff/icon.patch Sat Feb 24 10:43:01 2018 +0200 90.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 90.3 @@ -1,39 +0,0 @@ 90.4 ---- a/data/leafpad.desktop.in 90.5 -+++ b/data/leafpad.desktop.in 90.6 -@@ -1,10 +1,9 @@ 90.7 - [Desktop Entry] 90.8 --Encoding=UTF-8 90.9 -+Type=Application 90.10 - _Name=Leafpad 90.11 - _Comment=Simple text editor 90.12 -+Terminal=false 90.13 - Exec=leafpad %f 90.14 --Icon=leafpad 90.15 -+Icon=accessories-text-editor 90.16 --Terminal=false 90.17 --Type=Application 90.18 --MimeType=text/plain 90.19 - Categories=GTK;Utility;TextEditor; 90.20 -+MimeType=text/plain; 90.21 ---- a/src/callback.c 90.22 -+++ b/src/callback.c 90.23 -@@ -336,7 +336,7 @@ 90.24 - "authors", authors, 90.25 - "artists", artists, 90.26 - "translator-credits", translator_credits, 90.27 -- "logo-icon-name", PACKAGE, 90.28 -+ "logo-icon-name", "accessories-text-editor", 90.29 - NULL); 90.30 - #else 90.31 - static GtkWidget *about = NULL; 90.32 ---- a/src/window.c 90.33 -+++ b/src/window.c 90.34 -@@ -52,7 +52,7 @@ 90.35 - gtk_window_set_default_icon(icon); 90.36 - */ 90.37 - #if GTK_CHECK_VERSION(2, 6, 0) 90.38 -- gtk_window_set_default_icon_name(PACKAGE); 90.39 -+ gtk_window_set_default_icon_name("accessories-text-editor"); 90.40 - #else 90.41 - GdkPixbuf *icon = gdk_pixbuf_new_from_file( 90.42 - ICONDIR G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
91.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 91.2 +++ b/leafpad/stuff/patches/icon.patch Sat Feb 24 16:17:33 2018 +0200 91.3 @@ -0,0 +1,39 @@ 91.4 +--- a/data/leafpad.desktop.in 91.5 ++++ b/data/leafpad.desktop.in 91.6 +@@ -1,10 +1,9 @@ 91.7 + [Desktop Entry] 91.8 +-Encoding=UTF-8 91.9 ++Type=Application 91.10 + _Name=Leafpad 91.11 + _Comment=Simple text editor 91.12 ++Terminal=false 91.13 + Exec=leafpad %f 91.14 +-Icon=leafpad 91.15 ++Icon=accessories-text-editor 91.16 +-Terminal=false 91.17 +-Type=Application 91.18 +-MimeType=text/plain 91.19 + Categories=GTK;Utility;TextEditor; 91.20 ++MimeType=text/plain; 91.21 +--- a/src/callback.c 91.22 ++++ b/src/callback.c 91.23 +@@ -336,7 +336,7 @@ 91.24 + "authors", authors, 91.25 + "artists", artists, 91.26 + "translator-credits", translator_credits, 91.27 +- "logo-icon-name", PACKAGE, 91.28 ++ "logo-icon-name", "accessories-text-editor", 91.29 + NULL); 91.30 + #else 91.31 + static GtkWidget *about = NULL; 91.32 +--- a/src/window.c 91.33 ++++ b/src/window.c 91.34 +@@ -52,7 +52,7 @@ 91.35 + gtk_window_set_default_icon(icon); 91.36 + */ 91.37 + #if GTK_CHECK_VERSION(2, 6, 0) 91.38 +- gtk_window_set_default_icon_name(PACKAGE); 91.39 ++ gtk_window_set_default_icon_name("accessories-text-editor"); 91.40 + #else 91.41 + GdkPixbuf *icon = gdk_pixbuf_new_from_file( 91.42 + ICONDIR G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
92.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 92.2 +++ b/leafpad/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 92.3 @@ -0,0 +1,1 @@ 92.4 +icon.patch
93.1 --- a/libaio/receipt Sat Feb 24 10:43:01 2018 +0200 93.2 +++ b/libaio/receipt Sat Feb 24 16:17:33 2018 +0200 93.3 @@ -14,17 +14,13 @@ 93.4 93.5 SPLIT="libaio-dev" 93.6 93.7 -# Rules to configure and make the package. 93.8 -compile_rules() 93.9 -{ 93.10 +compile_rules() { 93.11 CFLAGS="-march=${ARCH/_/-} -mtune=generic -O2 -pipe" && 93.12 make && 93.13 make prefix="$install/usr" install 93.14 } 93.15 93.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 93.17 -genpkg_rules() 93.18 -{ 93.19 +genpkg_rules() { 93.20 case $PACKAGE in 93.21 libaio) copy @std;; 93.22 *-dev) copy @dev;;
94.1 --- a/libarchive/receipt Sat Feb 24 10:43:01 2018 +0200 94.2 +++ b/libarchive/receipt Sat Feb 24 16:17:33 2018 +0200 94.3 @@ -33,8 +33,8 @@ 94.4 ;; 94.5 *-dev) 94.6 copy @dev 94.7 - DEPENDS="libarchive acl-dev attr-dev bzip2-dev libcrypto-dev \ 94.8 - libxml2-dev lz4-dev lzo-dev nettle-dev xz-dev zlib-dev" 94.9 + DEPENDS="libarchive acl-dev attr-dev bzip2-dev libxml2-dev lz4-dev \ 94.10 + lzo-dev nettle-dev openssl-dev xz-dev zlib-dev" 94.11 ;; 94.12 esac 94.13 }
95.1 --- a/libcroco/receipt Sat Feb 24 10:43:01 2018 +0200 95.2 +++ b/libcroco/receipt Sat Feb 24 16:17:33 2018 +0200 95.3 @@ -8,7 +8,6 @@ 95.4 LICENSE="LGPL2" 95.5 WEB_SITE="https://developer.gnome.org/libcroco/" 95.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libcroco.html" 95.7 -HOST_ARCH="i486 arm" 95.8 95.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 95.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
96.1 --- a/libdrm/receipt Sat Feb 24 10:43:01 2018 +0200 96.2 +++ b/libdrm/receipt Sat Feb 24 16:17:33 2018 +0200 96.3 @@ -8,7 +8,6 @@ 96.4 LICENSE="MIT" 96.5 WEB_SITE="https://dri.freedesktop.org/" 96.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libdrm.html" 96.7 -HOST_ARCH="i486 arm" 96.8 96.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 96.10 WGET_URL="https://dri.freedesktop.org/libdrm/$TARBALL"
97.1 --- a/libepoxy/receipt Sat Feb 24 10:43:01 2018 +0200 97.2 +++ b/libepoxy/receipt Sat Feb 24 16:17:33 2018 +0200 97.3 @@ -7,6 +7,7 @@ 97.4 MAINTAINER="al.bobylev@gmail.com" 97.5 LICENSE="MIT" 97.6 WEB_SITE="https://github.com/anholt/libepoxy/" 97.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libepoxy.html" 97.8 97.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 97.10 WGET_URL="https://github.com/anholt/libepoxy/releases/download/v${VERSION%.*}/$TARBALL" 97.11 @@ -14,16 +15,11 @@ 97.12 BUILD_DEPENDS="xorg-util-macros python mesa-dev" 97.13 SPLIT="libepoxy-dev" 97.14 97.15 -# Rules to configure and make the package. 97.16 -compile_rules() 97.17 -{ 97.18 - # http://www.linuxfromscratch.org/blfs/view/stable/x/libepoxy.html 97.19 +compile_rules() { 97.20 ./configure $CONFIGURE_ARGS && make && make install 97.21 } 97.22 97.23 -# Rules to gen a SliTaz package suitable for Tazpkg. 97.24 -genpkg_rules() 97.25 -{ 97.26 +genpkg_rules() { 97.27 case $PACKAGE in 97.28 libepoxy) copy @std;; 97.29 *-dev) copy @dev;;
98.1 --- a/libevdev-dev/receipt Sat Feb 24 10:43:01 2018 +0200 98.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 98.3 @@ -1,18 +0,0 @@ 98.4 -# SliTaz package receipt. 98.5 - 98.6 -PACKAGE="libevdev-dev" 98.7 -VERSION="1.5.4" 98.8 -CATEGORY="x-window" 98.9 -SHORT_DESC="Common functions for Xorg input drivers (development files)" 98.10 -MAINTAINER="al.bobylev@gmail.com" 98.11 -LICENSE="other" 98.12 -WEB_SITE="https://www.freedesktop.org/wiki/Software/libevdev/" 98.13 - 98.14 -WANTED="libevdev" 98.15 -DEPENDS="libevdev" 98.16 - 98.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 98.18 -genpkg_rules() 98.19 -{ 98.20 - copy *.h *.la *.pc 98.21 -}
99.1 --- a/libevdev/receipt Sat Feb 24 10:43:01 2018 +0200 99.2 +++ b/libevdev/receipt Sat Feb 24 16:17:33 2018 +0200 99.3 @@ -1,29 +1,30 @@ 99.4 -# SliTaz package receipt. 99.5 +# SliTaz package receipt v2. 99.6 99.7 PACKAGE="libevdev" 99.8 -VERSION="1.5.4" 99.9 +VERSION="1.5.7" 99.10 CATEGORY="x-window" 99.11 SHORT_DESC="Common functions for Xorg input drivers" 99.12 MAINTAINER="al.bobylev@gmail.com" 99.13 LICENSE="other" 99.14 WEB_SITE="https://www.freedesktop.org/wiki/Software/libevdev/" 99.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7driver.html#libevdev" 99.16 99.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 99.18 WGET_URL="http://www.freedesktop.org/software/libevdev/$TARBALL" 99.19 99.20 -BUILD_DEPENDS="check-dev doxygen python" 99.21 +BUILD_DEPENDS="check-dev python" # doxygen 99.22 +SPLIT="libevdev-dev" 99.23 99.24 -# Rules to configure and make the package. 99.25 -compile_rules() 99.26 -{ 99.27 +compile_rules() { 99.28 ./configure \ 99.29 --disable-static \ 99.30 $CONFIGURE_ARGS && 99.31 make && make install 99.32 } 99.33 99.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 99.35 -genpkg_rules() 99.36 -{ 99.37 - copy bin/ *.so* 99.38 +genpkg_rules() { 99.39 + case $PACKAGE in 99.40 + libevdev) copy @std;; 99.41 + *-dev) copy @dev;; 99.42 + esac 99.43 }
100.1 --- a/libexif/receipt Sat Feb 24 10:43:01 2018 +0200 100.2 +++ b/libexif/receipt Sat Feb 24 16:17:33 2018 +0200 100.3 @@ -7,7 +7,7 @@ 100.4 MAINTAINER="pankso@slitaz.org" 100.5 LICENSE="LGPL2.1" 100.6 WEB_SITE="http://libexif.sourceforge.net/" 100.7 -HOST_ARCH="i486 arm" 100.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libexif.html" 100.9 100.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 100.11 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 100.12 @@ -15,19 +15,15 @@ 100.13 BUILD_DEPENDS="gettext" 100.14 SPLIT="libexif-dev" 100.15 100.16 -# Rules to configure and make the package. 100.17 -compile_rules() 100.18 -{ 100.19 +compile_rules() { 100.20 ./configure \ 100.21 - --with-doc-dir=/usr/share/doc/libexif-$VERSION \ 100.22 + --with-doc-dir=/usr/share/doc/$PACKAGE-$VERSION \ 100.23 --disable-static \ 100.24 $CONFIGURE_ARGS && 100.25 make && make install 100.26 } 100.27 100.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 100.29 -genpkg_rules() 100.30 -{ 100.31 +genpkg_rules() { 100.32 case $PACKAGE in 100.33 libexif) copy @std;; 100.34 *-dev) copy @dev;;
101.1 --- a/libffi/receipt Sat Feb 24 10:43:01 2018 +0200 101.2 +++ b/libffi/receipt Sat Feb 24 16:17:33 2018 +0200 101.3 @@ -8,7 +8,6 @@ 101.4 LICENSE="MIT" 101.5 WEB_SITE="https://sourceware.org/libffi/" 101.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libffi.html" 101.7 -HOST_ARCH="i486 arm" 101.8 101.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 101.10 WGET_URL="https://sourceware.org/ftp/libffi/$TARBALL" 101.11 @@ -23,8 +22,11 @@ 101.12 -i libffi.pc.in 101.13 101.14 ./configure \ 101.15 + --libdir=/usr/lib \ 101.16 --disable-static \ 101.17 $CONFIGURE_ARGS && 101.18 +# sed -i 's|^\(toolexeclibdir = \).*|\1/usr/lib|' Makefile \ 101.19 +# $HOST_SYSTEM-gnu/Makefile && 101.20 make && make install 101.21 } 101.22
102.1 --- a/libfm-extra/receipt Sat Feb 24 10:43:01 2018 +0200 102.2 +++ b/libfm-extra/receipt Sat Feb 24 16:17:33 2018 +0200 102.3 @@ -7,6 +7,7 @@ 102.4 MAINTAINER="al.bobylev@gmail.com" 102.5 LICENSE="GPL2" 102.6 WEB_SITE="https://wiki.lxde.org/en/Libfm" 102.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/libfm-extra.html" 102.8 102.9 TARBALL="libfm-$VERSION.tar.xz" 102.10 WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL" 102.11 @@ -15,10 +16,7 @@ 102.12 SPLIT="libfm-extra-dev" 102.13 SIBLINGS="libfm" 102.14 102.15 -# Rules to configure and make the package. 102.16 -compile_rules() 102.17 -{ 102.18 - # http://www.linuxfromscratch.org/blfs/view/stable/lxde/libfm-extra.html 102.19 +compile_rules() { 102.20 ./configure \ 102.21 --sysconfdir=/etc \ 102.22 --with-extra-only \ 102.23 @@ -28,9 +26,7 @@ 102.24 make && make install 102.25 } 102.26 102.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 102.28 -genpkg_rules() 102.29 -{ 102.30 +genpkg_rules() { 102.31 case $PACKAGE in 102.32 *-extra) 102.33 copy @std 102.34 @@ -38,9 +34,7 @@ 102.35 ;; 102.36 *-dev) 102.37 copy @dev 102.38 - DEPENDS="libfm-extra glib-dev libffi-dev pcre-dev \ 102.39 - util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ 102.40 - zlib-dev" 102.41 + DEPENDS="libfm-extra glib-dev" 102.42 ;; 102.43 esac 102.44 }
103.1 --- a/libfm/receipt Sat Feb 24 10:43:01 2018 +0200 103.2 +++ b/libfm/receipt Sat Feb 24 16:17:33 2018 +0200 103.3 @@ -3,43 +3,37 @@ 103.4 PACKAGE="libfm" 103.5 VERSION="1.2.5" 103.6 CATEGORY="system-tools" 103.7 -SHORT_DESC="File management support (core library)" 103.8 +SHORT_DESC="File management support" 103.9 MAINTAINER="pankso@slitaz.org" 103.10 LICENSE="GPL2" 103.11 WEB_SITE="https://wiki.lxde.org/en/Libfm" 103.12 -HOST_ARCH="i486 arm" 103.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/libfm.html" 103.14 103.15 TARBALL="$PACKAGE-$VERSION.tar.xz" 103.16 WGET_URL="$SF_MIRROR/pcmanfm/files/$TARBALL" 103.17 103.18 -BUILD_DEPENDS="vala intltool gtk+-dev menu-cache-dev libexif-dev gtk-doc" 103.19 BUILD_DEPENDS_arm="gtk+-dev dbus-glib-dev dbus-dev startup-notification-dev \ 103.20 xorg-libxcb-dev xcb-util-dev menu-cache-dev expat-dev glib-dev \ 103.21 shared-mime-info-dev" 103.22 +BUILD_DEPENDS="vala intltool gtk+-dev menu-cache-dev libexif-dev" 103.23 SIBLINGS="libfm-extra" 103.24 SPLIT="libfm-gtk libfm-dev" 103.25 103.26 -# Rules to configure and make the package. 103.27 -compile_rules() 103.28 -{ 103.29 - # http://www.linuxfromscratch.org/blfs/view/stable/lxde/libfm.html 103.30 +compile_rules() { 103.31 ./configure \ 103.32 --sysconfdir=/etc \ 103.33 --disable-static \ 103.34 - --enable-gtk-doc \ 103.35 $CONFIGURE_ARGS && 103.36 - make && make install && 103.37 + make && make install || return 1 103.38 103.39 # remove useless file 103.40 - rm -r $install/usr/share/mime/ && 103.41 + rm -r $install/usr/share/mime/ 103.42 # remove libfm-extra package files 103.43 find $install \( -name 'libfm-extra*' -o -name 'fm-extra.h' -o \ 103.44 -name 'fm-version.h' -o -name 'fm-xml-file.h' \) -delete 103.45 } 103.46 103.47 -# Rules to gen a SliTaz package suitable for Tazpkg. 103.48 -genpkg_rules() 103.49 -{ 103.50 +genpkg_rules() { 103.51 case $PACKAGE in 103.52 libfm) 103.53 copy etc/ libfm.so* vfs*.so *.list
104.1 --- a/libgcrypt/receipt Sat Feb 24 10:43:01 2018 +0200 104.2 +++ b/libgcrypt/receipt Sat Feb 24 16:17:33 2018 +0200 104.3 @@ -8,7 +8,6 @@ 104.4 LICENSE="GPL2 LGPL2.1" 104.5 WEB_SITE="https://www.gnupg.org/related_software/libgcrypt/" 104.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgcrypt.html" 104.7 -HOST_ARCH="i486 arm" 104.8 104.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 104.10 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$TARBALL"
105.1 --- a/libglade-dev/receipt Sat Feb 24 10:43:01 2018 +0200 105.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 105.3 @@ -1,23 +0,0 @@ 105.4 -# SliTaz package receipt. 105.5 - 105.6 -PACKAGE="libglade-dev" 105.7 -VERSION="2.6.4" 105.8 -CATEGORY="development" 105.9 -SHORT_DESC="The Glade libs devel files." 105.10 -MAINTAINER="pankso@slitaz.org" 105.11 -LICENSE="LGPL2" 105.12 -WEB_SITE="https://developer.gnome.org/libglade/" 105.13 -HOST_ARCH="i486 arm" 105.14 - 105.15 -WANTED="libglade" 105.16 -DEPENDS="libglade atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \ 105.17 -gdk-pixbuf-dev glib-dev glibc-dev gtk+-dev harfbuzz-dev libffi-dev \ 105.18 -liblzma-dev libpng-dev libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev \ 105.19 -xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 105.20 -xorg-libXrender-dev zlib-dev" 105.21 - 105.22 -# Rules to gen a SliTaz package suitable for Tazpkg. 105.23 -genpkg_rules() 105.24 -{ 105.25 - copy *.h *.la *.pc *.dtd 105.26 -}
106.1 --- a/libglade/receipt Sat Feb 24 10:43:01 2018 +0200 106.2 +++ b/libglade/receipt Sat Feb 24 16:17:33 2018 +0200 106.3 @@ -1,36 +1,41 @@ 106.4 -# SliTaz package receipt. 106.5 +# SliTaz package receipt v2. 106.6 106.7 PACKAGE="libglade" 106.8 VERSION="2.6.4" 106.9 CATEGORY="x-window" 106.10 -SHORT_DESC="The Glade libs." 106.11 +SHORT_DESC="The Glade libs" 106.12 MAINTAINER="pankso@slitaz.org" 106.13 LICENSE="LGPL2" 106.14 WEB_SITE="https://developer.gnome.org/libglade/" 106.15 -HOST_ARCH="i486 arm" 106.16 106.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 106.18 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 106.19 106.20 -DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libxml2 \ 106.21 -pango" 106.22 BUILD_DEPENDS="gtk+-dev" 106.23 +SPLIT="libglade-dev" 106.24 106.25 -# Rules to configure and make the package. 106.26 -compile_rules() 106.27 -{ 106.28 +compile_rules() { 106.29 sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in || exit 1 106.30 mkdir po; touch po/POTFILES.in 106.31 106.32 + fix ld 106.33 ./configure \ 106.34 --disable-static \ 106.35 $CONFIGURE_ARGS && 106.36 + fix libtool && 106.37 make && 106.38 make install 106.39 } 106.40 106.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 106.42 -genpkg_rules() 106.43 -{ 106.44 - copy *.so* libglade-convert 106.45 +genpkg_rules() { 106.46 + case $PACKAGE in 106.47 + libglade) 106.48 + copy @std 106.49 + DEPENDS="atk gdk-pixbuf glib gtk+ libxml2 pango" 106.50 + ;; 106.51 + *-dev) 106.52 + copy @dev 106.53 + DEPENDS="libglade gtk+-dev libxml2-dev" 106.54 + ;; 106.55 + esac 106.56 }
107.1 --- a/libgpg-error/receipt Sat Feb 24 10:43:01 2018 +0200 107.2 +++ b/libgpg-error/receipt Sat Feb 24 16:17:33 2018 +0200 107.3 @@ -8,7 +8,6 @@ 107.4 LICENSE="GPL2" 107.5 WEB_SITE="https://www.gnupg.org/related_software/libgpg-error/" 107.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgpg-error.html" 107.7 -HOST_ARCH="i486 arm" 107.8 107.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 107.10 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$TARBALL"
108.1 --- a/libgudev/receipt Sat Feb 24 10:43:01 2018 +0200 108.2 +++ b/libgudev/receipt Sat Feb 24 16:17:33 2018 +0200 108.3 @@ -8,7 +8,6 @@ 108.4 LICENSE="GPL2" 108.5 WEB_SITE="https://wiki.gnome.org/Projects/libgudev" 108.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgudev.html" 108.7 -HOST_ARCH="i486 arm" 108.8 108.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 108.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/$VERSION/$TARBALL" 108.11 @@ -33,9 +32,7 @@ 108.12 ;; 108.13 *-dev) 108.14 copy @dev 108.15 - DEPENDS="libgudev eudev-dev glib-dev libffi-dev pcre-dev \ 108.16 - util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ 108.17 - zlib-dev" 108.18 + DEPENDS="libgudev glib-dev" 108.19 ;; 108.20 esac 108.21 }
109.1 --- a/libgusb/receipt Sat Feb 24 10:43:01 2018 +0200 109.2 +++ b/libgusb/receipt Sat Feb 24 16:17:33 2018 +0200 109.3 @@ -32,8 +32,7 @@ 109.4 ;; 109.5 *-dev) 109.6 copy @dev 109.7 - DEPENDS="libgusb eudev-dev glib-dev libffi-dev libusb-dev pcre-dev \ 109.8 - util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev zlib" 109.9 + DEPENDS="libgusb glib-dev libusb-dev" 109.10 ;; 109.11 esac 109.12 }
110.1 --- a/libid3tag-dev/receipt Sat Feb 24 10:43:01 2018 +0200 110.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 110.3 @@ -1,36 +0,0 @@ 110.4 -# SliTaz package receipt. 110.5 - 110.6 -PACKAGE="libid3tag-dev" 110.7 -VERSION="0.15.1b" 110.8 -CATEGORY="development" 110.9 -SHORT_DESC="ID3 tag manipulation library devel files." 110.10 -MAINTAINER="paul@slitaz.org" 110.11 -LICENSE="GPL2" 110.12 -WANTED="libid3tag" 110.13 -WEB_SITE="http://www.underbit.com/products/mad" 110.14 -HOST_ARCH="i486 arm" 110.15 - 110.16 -DEPENDS="libid3tag pkg-config" 110.17 - 110.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 110.19 -genpkg_rules() 110.20 -{ 110.21 - mkdir -p $fs/usr/lib/pkgconfig 110.22 - cp -a $install/usr/include $fs/usr 110.23 - cp -a $install/usr/lib/*.*a $fs/usr/lib 110.24 - 110.25 - # libid3tag.pc 110.26 - cat > $fs/usr/lib/pkgconfig/id3tag.pc << _EOT_ 110.27 -prefix=/usr 110.28 -exec_prefix=\${prefix}/bin 110.29 -libdir=\${prefix}/lib 110.30 -includedir=\${prefix}/include 110.31 - 110.32 -Name: id3tag 110.33 -Description: ID3 tag manipulation library 110.34 -Requires: 110.35 -Version: $VERSION 110.36 -Libs: -L\${libdir} -lid3tag -lz 110.37 -Cflags: 110.38 -_EOT_ 110.39 -}
111.1 --- a/libid3tag/receipt Sat Feb 24 10:43:01 2018 +0200 111.2 +++ b/libid3tag/receipt Sat Feb 24 16:17:33 2018 +0200 111.3 @@ -1,30 +1,39 @@ 111.4 -# SliTaz package receipt. 111.5 +# SliTaz package receipt v2. 111.6 111.7 PACKAGE="libid3tag" 111.8 VERSION="0.15.1b" 111.9 CATEGORY="multimedia" 111.10 -SHORT_DESC="ID3 tag manipulation library." 111.11 +SHORT_DESC="ID3 tag manipulation library" 111.12 MAINTAINER="paul@slitaz.org" 111.13 LICENSE="GPL2" 111.14 +WEB_SITE="http://www.underbit.com/products/mad/" 111.15 + 111.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 111.17 -WEB_SITE="http://www.underbit.com/products/mad/" 111.18 WGET_URL="http://downloads.sourceforge.net/mad/$TARBALL" 111.19 -HOST_ARCH="i486 arm" 111.20 111.21 -DEPENDS="zlib" 111.22 BUILD_DEPENDS="zlib-dev gfortran" 111.23 +SPLIT="libid3tag-dev" 111.24 111.25 -# Rules to configure and make the package. 111.26 -compile_rules() 111.27 -{ 111.28 - ./configure --prefix=/usr $CONFIGURE_ARGS && 111.29 - make && make DESTDIR=$DESTDIR install 111.30 +compile_rules() { 111.31 + ./configure \ 111.32 + --prefix=/usr \ 111.33 + $CONFIGURE_ARGS && 111.34 + make && make install || return 1 111.35 + 111.36 + # libid3tag.pc 111.37 + mkdir -p $install/usr/lib/pkgconfig/ 111.38 + sed "s|@VERSION@|$VERSION|" $stuff/id3tag.pc.in > $install/usr/lib/pkgconfig/id3tag.pc 111.39 } 111.40 111.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 111.42 -genpkg_rules() 111.43 -{ 111.44 - mkdir -p $fs/usr/lib 111.45 - cp -a $install/usr/lib/*.so* $fs/usr/lib 111.46 -} 111.47 - 111.48 +genpkg_rules() { 111.49 + case $PACKAGE in 111.50 + libid3tag) 111.51 + copy @std 111.52 + DEPENDS="zlib" 111.53 + ;; 111.54 + *-dev) 111.55 + copy @dev 111.56 + DEPENDS="libid3tag zlib-dev" 111.57 + ;; 111.58 + esac 111.59 +}
112.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 112.2 +++ b/libid3tag/stuff/id3tag.pc.in Sat Feb 24 16:17:33 2018 +0200 112.3 @@ -0,0 +1,11 @@ 112.4 +prefix=/usr 112.5 +exec_prefix=${prefix}/bin 112.6 +libdir=${prefix}/lib 112.7 +includedir=${prefix}/include 112.8 + 112.9 +Name: id3tag 112.10 +Description: ID3 tag manipulation library 112.11 +Requires: 112.12 +Version: @VERSION@ 112.13 +Libs: -L${libdir} -lid3tag -lz 112.14 +Cflags:
113.1 --- a/libidn-dev/receipt Sat Feb 24 10:43:01 2018 +0200 113.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 113.3 @@ -1,19 +0,0 @@ 113.4 -# SliTaz package receipt. 113.5 - 113.6 -PACKAGE="libidn-dev" 113.7 -VERSION="1.33" 113.8 -CATEGORY="development" 113.9 -SHORT_DESC="Encode and decode internationalized domain names, dev files." 113.10 -MAINTAINER="pascal.bellard@slitaz.org" 113.11 -LICENSE="GPL3 LGPL2.1" 113.12 -WEB_SITE="https://www.gnu.org/software/libidn/" 113.13 -HOST_ARCH="i486 arm" 113.14 - 113.15 -WANTED="libidn" 113.16 -DEPENDS="libidn" 113.17 - 113.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 113.19 -genpkg_rules() 113.20 -{ 113.21 - copy *.h *.la *.pc 113.22 -}
114.1 --- a/libidn/receipt Sat Feb 24 10:43:01 2018 +0200 114.2 +++ b/libidn/receipt Sat Feb 24 16:17:33 2018 +0200 114.3 @@ -1,30 +1,30 @@ 114.4 -# SliTaz package receipt. 114.5 +# SliTaz package receipt v2. 114.6 114.7 PACKAGE="libidn" 114.8 VERSION="1.33" 114.9 CATEGORY="system-tools" 114.10 -SHORT_DESC="Encode and decode internationalized domain names." 114.11 +SHORT_DESC="Encode and decode internationalized domain names" 114.12 MAINTAINER="pascal.bellard@slitaz.org" 114.13 LICENSE="GPL3 LGPL2.1" 114.14 WEB_SITE="https://www.gnu.org/software/libidn/" 114.15 -HOST_ARCH="i486 arm" 114.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libidn.html" 114.17 114.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 114.19 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 114.20 114.21 BUILD_DEPENDS="gettext" 114.22 +SPLIT="libidn-dev" 114.23 114.24 -# Rules to configure and make the package. 114.25 -compile_rules() 114.26 -{ 114.27 +compile_rules() { 114.28 ./configure \ 114.29 --disable-static \ 114.30 $CONFIGURE_ARGS && 114.31 make $MAKEFLAGS && make install 114.32 } 114.33 114.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 114.35 -genpkg_rules() 114.36 -{ 114.37 - copy idn *.so* 114.38 +genpkg_rules() { 114.39 + case $PACKAGE in 114.40 + libidn) copy @std;; 114.41 + *-dev) copy @dev;; 114.42 + esac 114.43 }
115.1 --- a/libidn2/receipt Sat Feb 24 10:43:01 2018 +0200 115.2 +++ b/libidn2/receipt Sat Feb 24 16:17:33 2018 +0200 115.3 @@ -14,15 +14,11 @@ 115.4 BUILD_DEPENDS="gtk-doc gettext" 115.5 SPLIT="libidn2-dev" 115.6 115.7 -# Rules to configure and make the package. 115.8 -compile_rules() 115.9 -{ 115.10 +compile_rules() { 115.11 ./configure $CONFIGURE_ARGS && make && make install 115.12 } 115.13 115.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 115.15 -genpkg_rules() 115.16 -{ 115.17 +genpkg_rules() { 115.18 case $PACKAGE in 115.19 libidn2) copy @std;; 115.20 *-dev) copy @dev;;
116.1 --- a/libinput/receipt Sat Feb 24 10:43:01 2018 +0200 116.2 +++ b/libinput/receipt Sat Feb 24 16:17:33 2018 +0200 116.3 @@ -1,23 +1,22 @@ 116.4 # SliTaz package receipt v2. 116.5 116.6 PACKAGE="libinput" 116.7 -VERSION="1.8.0" 116.8 +VERSION="1.8.1" 116.9 CATEGORY="x-window" 116.10 SHORT_DESC="Library that handles input devices for display servers" 116.11 MAINTAINER="al.bobylev@gmail.com" 116.12 LICENSE="MIT" 116.13 WEB_SITE="https://www.freedesktop.org/wiki/Software/libinput/" 116.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7driver.html#libinput" 116.15 116.16 TARBALL="$PACKAGE-$VERSION.tar.xz" 116.17 WGET_URL="http://www.freedesktop.org/software/libinput/$TARBALL" 116.18 116.19 BUILD_DEPENDS="mtdev-dev eudev-dev libevdev-dev cairo-dev gtk+3-dev check-dev" 116.20 SPLIT="libinput-debug-gui libinput libinput-dev" 116.21 -PKG_RULE="std-dev" 116.22 116.23 -# Rules to configure and make the package. 116.24 -compile_rules() 116.25 -{ 116.26 +compile_rules() { 116.27 + fix ld 116.28 ./configure \ 116.29 --disable-static \ 116.30 --disable-libwacom \ 116.31 @@ -25,30 +24,24 @@ 116.32 --disable-documentation \ 116.33 --without-libunwind \ 116.34 $CONFIGURE_ARGS && 116.35 + fix libtool && 116.36 make && make install 116.37 } 116.38 116.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 116.40 -genpkg_rules() 116.41 -{ 116.42 +genpkg_rules() { 116.43 case $PACKAGE in 116.44 *-gui) 116.45 copy libinput-debug-gui 116.46 CAT="x-window|debug GUI" 116.47 - DEPENDS="atk bzlib cairo eudev fontconfig freetype gdk-pixbuf glib \ 116.48 - gtk+3 libevdev libffi libharfbuzz libinput liblzma libpng16 \ 116.49 - libxml2 mtdev pango pcre util-linux-blkid util-linux-mount \ 116.50 - util-linux-uuid xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 116.51 - xorg-libXrender xorg-libxcb xorg-pixman zlib" 116.52 + DEPENDS="cairo eudev glib gtk+3 libevdev libinput" 116.53 ;; 116.54 libinput) 116.55 - copy @std 116.56 - remove_already_packed 116.57 + copy @std @rm 116.58 DEPENDS="eudev libevdev mtdev" 116.59 ;; 116.60 *-dev) 116.61 copy @dev 116.62 - DEPENDS="libinput eudev-dev libevdev-dev mtdev-dev" 116.63 + DEPENDS="libinput eudev-dev" 116.64 ;; 116.65 esac 116.66 }
117.1 --- a/libjpeg-turbo/receipt Sat Feb 24 10:43:01 2018 +0200 117.2 +++ b/libjpeg-turbo/receipt Sat Feb 24 16:17:33 2018 +0200 117.3 @@ -7,6 +7,7 @@ 117.4 MAINTAINER="pascal.bellard@slitaz.org" 117.5 LICENSE="MIT" 117.6 WEB_SITE="http://libjpeg-turbo.virtualgl.org/" 117.7 +HOST_ARCH="i486 x86_64" 117.8 117.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 117.10 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 117.11 @@ -14,9 +15,7 @@ 117.12 BUILD_DEPENDS="nasm" 117.13 SPLIT="jpeg-turbo libjpeg-turbo-dev" 117.14 117.15 -# Rules to configure and make the package. 117.16 -compile_rules() 117.17 -{ 117.18 +compile_rules() { 117.19 ./configure \ 117.20 --with-jpeg8 \ 117.21 --disable-static \ 117.22 @@ -25,9 +24,7 @@ 117.23 make && make install 117.24 } 117.25 117.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 117.27 -genpkg_rules() 117.28 -{ 117.29 +genpkg_rules() { 117.30 case $PACKAGE in 117.31 libjpeg-turbo) 117.32 copy *.so*
118.1 --- a/libmnl/receipt Sat Feb 24 10:43:01 2018 +0200 118.2 +++ b/libmnl/receipt Sat Feb 24 16:17:33 2018 +0200 118.3 @@ -13,15 +13,11 @@ 118.4 118.5 SPLIT="libmnl-dev" 118.6 118.7 -# Rules to configure and make the package. 118.8 -compile_rules() 118.9 -{ 118.10 +compile_rules() { 118.11 ./configure $CONFIGURE_ARGS && make && make install 118.12 } 118.13 118.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 118.15 -genpkg_rules() 118.16 -{ 118.17 +genpkg_rules() { 118.18 case $PACKAGE in 118.19 libmnl) copy @std;; 118.20 *-dev) copy @dev;;
119.1 --- a/libnftnl/receipt Sat Feb 24 10:43:01 2018 +0200 119.2 +++ b/libnftnl/receipt Sat Feb 24 16:17:33 2018 +0200 119.3 @@ -15,15 +15,11 @@ 119.4 BUILD_DEPENDS="libmnl-dev" 119.5 SPLIT="libnftnl-dev" 119.6 119.7 -# Rules to configure and make the package. 119.8 -compile_rules() 119.9 -{ 119.10 +compile_rules() { 119.11 ./configure $CONFIGURE_ARGS && make && make install 119.12 } 119.13 119.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 119.15 -genpkg_rules() 119.16 -{ 119.17 +genpkg_rules() { 119.18 case $PACKAGE in 119.19 libnftnl) 119.20 copy @std
120.1 --- a/libnl/receipt Sat Feb 24 10:43:01 2018 +0200 120.2 +++ b/libnl/receipt Sat Feb 24 16:17:33 2018 +0200 120.3 @@ -7,7 +7,6 @@ 120.4 MAINTAINER="pascal.bellard@slitaz.org" 120.5 LICENSE="LGPL2.1" 120.6 WEB_SITE="http://www.infradead.org/~tgr/libnl/" 120.7 -HOST_ARCH="i486 arm" 120.8 120.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 120.10 WGET_URL="https://github.com/thom311/libnl/releases/download/libnl${VERSION//./_}/$TARBALL" 120.11 @@ -15,9 +14,7 @@ 120.12 BUILD_DEPENDS="flex" 120.13 SPLIT="libnl-tools libnl-dev" 120.14 120.15 -# Rules to configure and make the package. 120.16 -compile_rules() 120.17 -{ 120.18 +compile_rules() { 120.19 ./configure \ 120.20 --sysconfdir=/etc \ 120.21 --disable-static \ 120.22 @@ -25,17 +22,14 @@ 120.23 make && make install 120.24 } 120.25 120.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 120.27 -genpkg_rules() 120.28 -{ 120.29 +genpkg_rules() { 120.30 case $PACKAGE in 120.31 libnl) 120.32 copy etc/ *.so* 120.33 CONFIG_FILES="/etc/libnl/classid /etc/libnl/pktloc" 120.34 ;; 120.35 libnl-tools) 120.36 - copy @std 120.37 - remove_already_packed 120.38 + copy @std @rm 120.39 CAT="network|tiny tools" 120.40 ;; 120.41 *-dev) copy @dev;;
121.1 --- a/libnotify/receipt Sat Feb 24 10:43:01 2018 +0200 121.2 +++ b/libnotify/receipt Sat Feb 24 16:17:33 2018 +0200 121.3 @@ -7,7 +7,6 @@ 121.4 MAINTAINER="fabrice.thiroux@free.fr" 121.5 LICENSE="LGPL2.1" 121.6 WEB_SITE="https://developer.gnome.org/libnotify/" 121.7 -HOST_ARCH="i486 arm" 121.8 121.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 121.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 121.11 @@ -17,9 +16,7 @@ 121.12 BUILD_DEPENDS_arm="dbus-dev gtk+-dev dbus-glib dbus-glib-dev expat-dev" 121.13 SPLIT="libnotify-dev" 121.14 121.15 -# Rules to configure and make the package. 121.16 -compile_rules() 121.17 -{ 121.18 +compile_rules() { 121.19 sed -e 's/REQ_GTK_VERSION=2.90/REQ_GTK_VERSION=2.24/' \ 121.20 -e 's/tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"/tests_modules="gtk+-2.0 >= $REQ_GTK_VERSION"/' \ 121.21 -i configure 121.22 @@ -27,9 +24,7 @@ 121.23 ./configure $CONFIGURE_ARGS && make && make install 121.24 } 121.25 121.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 121.27 -genpkg_rules() 121.28 -{ 121.29 +genpkg_rules() { 121.30 case $PACKAGE in 121.31 libnotify) 121.32 copy @std #notify-send *.so*
122.1 --- a/libpng16/receipt Sat Feb 24 10:43:01 2018 +0200 122.2 +++ b/libpng16/receipt Sat Feb 24 16:17:33 2018 +0200 122.3 @@ -7,17 +7,16 @@ 122.4 MAINTAINER="al.bobylev@gmail.com" 122.5 LICENSE="zlib/libpng" 122.6 WEB_SITE="http://www.libpng.org/pub/png/libpng.html" 122.7 -HOST_ARCH="i486 arm" 122.8 +HOST_ARCH="i486 arm x86_64" 122.9 122.10 TARBALL="libpng-$VERSION.tar.xz" 122.11 WGET_URL="$SF_MIRROR/libpng/$TARBALL" 122.12 122.13 -BUILD_DEPENDS="gawk zlib-dev" 122.14 +#BUILD_DEPENDS="gawk zlib-dev" 122.15 +BUILD_DEPENDS="zlib-dev" 122.16 SPLIT="libpng16-dev" 122.17 122.18 -# Rules to configure and make the package. 122.19 -compile_rules() 122.20 -{ 122.21 +compile_rules() { 122.22 LIBS=-lpthread \ 122.23 ./configure $CONFIGURE_ARGS && make && make install && 122.24 122.25 @@ -31,9 +30,7 @@ 122.26 cp -a png2pnm pnm2png $DESTDIR/usr/bin 122.27 } 122.28 122.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 122.30 -genpkg_rules() 122.31 -{ 122.32 +genpkg_rules() { 122.33 case $PACKAGE in 122.34 libpng16) 122.35 copy @std
123.1 --- a/librsvg/receipt Sat Feb 24 10:43:01 2018 +0200 123.2 +++ b/librsvg/receipt Sat Feb 24 16:17:33 2018 +0200 123.3 @@ -1,13 +1,13 @@ 123.4 # SliTaz package receipt v2. 123.5 123.6 PACKAGE="librsvg" 123.7 -VERSION="2.40.16" 123.8 +VERSION="2.40.18" 123.9 CATEGORY="graphics" 123.10 SHORT_DESC="Rendering SVG" 123.11 MAINTAINER="erjo@slitaz.org" 123.12 LICENSE="GPL2" 123.13 WEB_SITE="https://wiki.gnome.org/Projects/LibRsvg" 123.14 -HOST_ARCH="i486 arm" 123.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/librsvg.html" 123.16 123.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 123.18 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 123.19 @@ -16,54 +16,43 @@ 123.20 gtk-doc gobject-introspection-dev vala gtk+3-dev" 123.21 SPLIT="rsvg-convert rsvg-view librsvg-dev" 123.22 123.23 -# Rules to configure and make the package. 123.24 -compile_rules() 123.25 -{ 123.26 +compile_rules() { 123.27 + fix ld 123.28 ./configure \ 123.29 --enable-vala \ 123.30 $CONFIGURE_ARGS && 123.31 + fix libtool && 123.32 make && make install 123.33 } 123.34 123.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 123.36 -genpkg_rules() 123.37 -{ 123.38 +genpkg_rules() { 123.39 case $PACKAGE in 123.40 librsvg) 123.41 copy *.so* 123.42 CAT="graphics|library" 123.43 - DEPENDS="bzlib cairo fontconfig freetype gdk-pixbuf glib libcroco \ 123.44 - libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \ 123.45 - util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \ 123.46 - xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \ 123.47 - xorg-pixman zlib" 123.48 + DEPENDS="cairo gdk-pixbuf glib libcroco libxml2 pango" 123.49 ;; 123.50 rsvg-convert) 123.51 copy rsvg-convert 123.52 CAT="graphics|converter" 123.53 + DEPENDS="cairo glib librsvg" 123.54 ;; 123.55 rsvg-view) 123.56 copy rsvg-view* 123.57 CAT="graphics|viewer" 123.58 - DEPENDS="librsvg atk gtk+3" 123.59 + DEPENDS="cairo glib gtk+3 librsvg" 123.60 ;; 123.61 librsvg-dev) 123.62 copy @dev 123.63 DEPENDS="librsvg rsvg-convert rsvg-view \ 123.64 - bzip2-dev cairo-dev fontconfig-dev freetype-dev gdk-pixbuf-dev \ 123.65 - glib-dev harfbuzz-dev libcroco-dev libffi-dev libpng16-dev \ 123.66 - libxml2-dev pango-dev pcre-dev util-linux-blkid-dev \ 123.67 - util-linux-mount-dev util-linux-uuid-dev xorg-libX11-dev \ 123.68 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 123.69 - xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" 123.70 + cairo-dev gdk-pixbuf-dev glib-dev" 123.71 ;; 123.72 esac 123.73 } 123.74 123.75 -# Pre and post install commands for Tazpkg. 123.76 post_install_librsvg() { 123.77 [ -n "$cookmode" ] && return 0 123.78 - [ -z "$quiet" ] && echo -en "\nUpdating gdk pixbuf loaders cache file..." 123.79 + action 'Updating gdk pixbuf loaders cache file...' 123.80 chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache 123.81 status 123.82 }
124.1 --- a/libspiro/receipt Sat Feb 24 10:43:01 2018 +0200 124.2 +++ b/libspiro/receipt Sat Feb 24 16:17:33 2018 +0200 124.3 @@ -14,17 +14,13 @@ 124.4 BUILD_DEPENDS="autoconf automake libtool bash" 124.5 SPLIT="libspiro-dev" 124.6 124.7 -# Rules to configure and make the package. 124.8 -compile_rules() 124.9 -{ 124.10 +compile_rules() { 124.11 autoreconf -i 124.12 automake --foreign -Wall 124.13 ./configure $CONFIGURE_ARGS && make && make install 124.14 } 124.15 124.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 124.17 -genpkg_rules() 124.18 -{ 124.19 +genpkg_rules() { 124.20 case $PACKAGE in 124.21 libspiro) copy @std;; 124.22 *-dev) copy @dev;;
125.1 --- a/libssh2/receipt Sat Feb 24 10:43:01 2018 +0200 125.2 +++ b/libssh2/receipt Sat Feb 24 16:17:33 2018 +0200 125.3 @@ -14,23 +14,19 @@ 125.4 BUILD_DEPENDS="openssl-dev zlib-dev" 125.5 SPLIT="libssh2-dev" 125.6 125.7 -# Rules to configure and make the package. 125.8 -compile_rules() 125.9 -{ 125.10 +compile_rules() { 125.11 ./configure $CONFIGURE_ARGS && make && make install 125.12 } 125.13 125.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 125.15 -genpkg_rules() 125.16 -{ 125.17 +genpkg_rules() { 125.18 case $PACKAGE in 125.19 libssh2) 125.20 copy @std 125.21 - DEPENDS="libssl libcrypto zlib" 125.22 + DEPENDS="openssl zlib" 125.23 ;; 125.24 libssh2-dev) 125.25 copy @dev 125.26 - DEPENDS="libssh2 openssl-dev libcrypto-dev zlib-dev" 125.27 + DEPENDS="libssh2 openssl-dev zlib-dev" 125.28 ;; 125.29 esac 125.30 }
126.1 --- a/libtasn1-dev/receipt Sat Feb 24 10:43:01 2018 +0200 126.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 126.3 @@ -1,19 +0,0 @@ 126.4 -# SliTaz package receipt. 126.5 - 126.6 -PACKAGE="libtasn1-dev" 126.7 -VERSION="4.9" 126.8 -CATEGORY="development" 126.9 -SHORT_DESC="Library for ASN.1 and DER manipulation (development files)" 126.10 -MAINTAINER="pankso@slitaz.org" 126.11 -LICENSE="GPL3 LGPL2.1" 126.12 -WEB_SITE="https://www.gnu.org/software/libtasn1/" 126.13 -HOST_ARCH="i486 arm" 126.14 - 126.15 -WANTED="libtasn1" 126.16 -DEPENDS="libtasn1" 126.17 - 126.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 126.19 -genpkg_rules() 126.20 -{ 126.21 - copy *.h *.la *.pc 126.22 -}
127.1 --- a/libtasn1/receipt Sat Feb 24 10:43:01 2018 +0200 127.2 +++ b/libtasn1/receipt Sat Feb 24 16:17:33 2018 +0200 127.3 @@ -1,33 +1,34 @@ 127.4 -# SliTaz package receipt. 127.5 +# SliTaz package receipt v2. 127.6 127.7 PACKAGE="libtasn1" 127.8 -VERSION="4.9" 127.9 +VERSION="4.12" 127.10 CATEGORY="security" 127.11 SHORT_DESC="Library for ASN.1 and DER manipulation" 127.12 MAINTAINER="pankso@slitaz.org" 127.13 LICENSE="GPL3 LGPL2.1" 127.14 WEB_SITE="https://www.gnu.org/software/libtasn1/" 127.15 -HOST_ARCH="i486 arm" 127.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libtasn1.html" 127.17 127.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 127.19 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 127.20 127.21 -# Rules to configure and make the package. 127.22 -compile_rules() 127.23 -{ 127.24 +SPLIT="libtasn1-dev" 127.25 + 127.26 +compile_rules() { 127.27 # Package failed to build when optimized for size 127.28 export CFLAGS=${CFLAGS/-Os/-O2} 127.29 127.30 ./configure \ 127.31 --disable-static \ 127.32 $CONFIGURE_ARGS && 127.33 - make && make install 127.34 + make && make install || return 1 127.35 127.36 make -C doc/reference install-data-local 127.37 } 127.38 127.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 127.40 -genpkg_rules() 127.41 -{ 127.42 - copy bin/ *.so* 127.43 +genpkg_rules() { 127.44 + case $PACKAGE in 127.45 + libtasn1) copy @std;; 127.46 + *-dev) copy @dev;; 127.47 + esac 127.48 }
128.1 --- a/libuninameslist/receipt Sat Feb 24 10:43:01 2018 +0200 128.2 +++ b/libuninameslist/receipt Sat Feb 24 16:17:33 2018 +0200 128.3 @@ -14,17 +14,13 @@ 128.4 BUILD_DEPENDS="autoconf automake libtool bash" 128.5 SPLIT="libuninameslist-dev" 128.6 128.7 -# Rules to configure and make the package. 128.8 -compile_rules() 128.9 -{ 128.10 +compile_rules() { 128.11 autoreconf -i 128.12 automake 128.13 ./configure $CONFIGURE_ARGS && make && make install 128.14 } 128.15 128.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 128.17 -genpkg_rules() 128.18 -{ 128.19 +genpkg_rules() { 128.20 case $PACKAGE in 128.21 libuninameslist) copy @std;; 128.22 *-dev) copy @dev;;
129.1 --- a/libunistring/receipt Sat Feb 24 10:43:01 2018 +0200 129.2 +++ b/libunistring/receipt Sat Feb 24 16:17:33 2018 +0200 129.3 @@ -13,15 +13,11 @@ 129.4 129.5 SPLIT="libunistring-dev" 129.6 129.7 -# Rules to configure and make the package. 129.8 -compile_rules() 129.9 -{ 129.10 +compile_rules() { 129.11 ./configure $CONFIGURE_ARGS && make && make install 129.12 } 129.13 129.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 129.15 -genpkg_rules() 129.16 -{ 129.17 +genpkg_rules() { 129.18 case $PACKAGE in 129.19 libunistring) copy @std;; 129.20 *-dev) copy @dev;;
130.1 --- a/libusb-compat-dev/receipt Sat Feb 24 10:43:01 2018 +0200 130.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 130.3 @@ -1,24 +0,0 @@ 130.4 -# SliTaz package receipt. 130.5 - 130.6 -PACKAGE="libusb-compat-dev" 130.7 -VERSION="0.1.4" 130.8 -CATEGORY="development" 130.9 -SHORT_DESC="USB access library devel files." 130.10 -MAINTAINER="pankso@slitaz.org" 130.11 -LICENSE="LGPL2.1" 130.12 -WANTED="libusb-compat" 130.13 -WEB_SITE="http://libusb.sourceforge.net/" 130.14 -HOST_ARCH="i486 arm" 130.15 - 130.16 -DEPENDS="libusb-compat udev-dev" 130.17 - 130.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 130.19 -genpkg_rules() 130.20 -{ 130.21 - mkdir -p $fs/usr/lib 130.22 - cp -a $install/usr/bin $fs/usr 130.23 - cp -a $install/usr/lib/*.*a $fs/usr/lib 130.24 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 130.25 - cp -a $install/usr/include $fs/usr 130.26 -} 130.27 -
131.1 --- a/libusb-compat/receipt Sat Feb 24 10:43:01 2018 +0200 131.2 +++ b/libusb-compat/receipt Sat Feb 24 16:17:33 2018 +0200 131.3 @@ -1,34 +1,38 @@ 131.4 -# SliTaz package receipt. 131.5 +# SliTaz package receipt v2. 131.6 131.7 PACKAGE="libusb-compat" 131.8 -VERSION="0.1.4" 131.9 +VERSION="0.1.5" 131.10 CATEGORY="system-tools" 131.11 -SHORT_DESC="Compatibility layer to converts libusb 0.1 calls into 1.0 equivalents." 131.12 +SHORT_DESC="Compatibility layer to converts libusb 0.1 calls into 1.0 equivalents" 131.13 MAINTAINER="pankso@slitaz.org" 131.14 LICENSE="LGPL2.1" 131.15 +WEB_SITE="http://libusb.sourceforge.net/" 131.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libusb-compat.html" 131.17 + 131.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 131.19 -WEB_SITE="http://libusb.sourceforge.net/" 131.20 WGET_URL="$SF_MIRROR/libusb/$TARBALL" 131.21 -HOST_ARCH="i486 arm" 131.22 131.23 -DEPENDS="libusb" 131.24 -BUILD_DEPENDS="libusb-dev udev-dev" 131.25 +BUILD_DEPENDS="libusb-dev eudev-dev" 131.26 +SPLIT="libusb-compat-dev" 131.27 131.28 -# Rules to configure and make the package. 131.29 -compile_rules() 131.30 -{ 131.31 - cd $src 131.32 +compile_rules() { 131.33 ./configure \ 131.34 - --prefix=/usr \ 131.35 + --disable-static \ 131.36 $CONFIGURE_ARGS && 131.37 make && 131.38 - make DESTDIR=$DESTDIR install 131.39 + make install 131.40 } 131.41 131.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 131.43 -genpkg_rules() 131.44 -{ 131.45 - mkdir -p $fs/usr/lib 131.46 - cp -a $install/usr/lib/*.so* $fs/usr/lib 131.47 +genpkg_rules() { 131.48 + case $PACKAGE in 131.49 + libusb-compat) 131.50 + copy @std 131.51 + DEPENDS="libusb" 131.52 + ;; 131.53 + *-dev) 131.54 + copy @dev 131.55 + DEPENDS="libusb-compat eudev-dev" 131.56 + ;; 131.57 + esac 131.58 } 131.59
132.1 --- a/libusb-dev/receipt Sat Feb 24 10:43:01 2018 +0200 132.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 132.3 @@ -1,19 +0,0 @@ 132.4 -# SliTaz package receipt. 132.5 - 132.6 -PACKAGE="libusb-dev" 132.7 -VERSION="1.0.20" 132.8 -CATEGORY="development" 132.9 -SHORT_DESC="Library used by some applications for USB device access (development files)" 132.10 -MAINTAINER="pankso@slitaz.org" 132.11 -LICENSE="LGPL2.1" 132.12 -WEB_SITE="http://libusb.info/" 132.13 -HOST_ARCH="i486 arm" 132.14 - 132.15 -WANTED="libusb" 132.16 -DEPENDS="libusb eudev-dev" 132.17 - 132.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 132.19 -genpkg_rules() 132.20 -{ 132.21 - copy *.h *.la *.pc 132.22 -}
133.1 --- a/libusb/receipt Sat Feb 24 10:43:01 2018 +0200 133.2 +++ b/libusb/receipt Sat Feb 24 16:17:33 2018 +0200 133.3 @@ -1,23 +1,23 @@ 133.4 -# SliTaz package receipt. 133.5 +# SliTaz package receipt v2. 133.6 133.7 PACKAGE="libusb" 133.8 -VERSION="1.0.20" 133.9 +VERSION="1.0.21" 133.10 CATEGORY="system-tools" 133.11 SHORT_DESC="Library used by some applications for USB device access" 133.12 MAINTAINER="pankso@slitaz.org" 133.13 LICENSE="LGPL2.1" 133.14 WEB_SITE="http://libusb.info/" 133.15 -HOST_ARCH="i486 arm" 133.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libusb.html" 133.17 133.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 133.19 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 133.20 +WGET_URL="https://github.com/libusb/libusb/releases/download/v$VERSION/$TARBALL" 133.21 133.22 -DEPENDS="eudev" 133.23 BUILD_DEPENDS="eudev-dev" 133.24 +SPLIT="libusb-dev" 133.25 133.26 -# Rules to configure and make the package. 133.27 -compile_rules() 133.28 -{ 133.29 +compile_rules() { 133.30 + sed -i "s/^PROJECT_LOGO/#&/" doc/doxygen.cfg.in 133.31 + 133.32 # Results are unstable, please keep `make -j1` 133.33 ./configure \ 133.34 --disable-static \ 133.35 @@ -25,8 +25,15 @@ 133.36 make -j1 && make install 133.37 } 133.38 133.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 133.40 -genpkg_rules() 133.41 -{ 133.42 - copy *.so* 133.43 +genpkg_rules() { 133.44 + case $PACKAGE in 133.45 + libusb) 133.46 + copy *.so* 133.47 + DEPENDS="eudev" 133.48 + ;; 133.49 + *-dev) 133.50 + copy @dev 133.51 + DEPENDS="libusb eudev-dev" 133.52 + ;; 133.53 + esac 133.54 }
134.1 --- a/libva/receipt Sat Feb 24 10:43:01 2018 +0200 134.2 +++ b/libva/receipt Sat Feb 24 16:17:33 2018 +0200 134.3 @@ -16,10 +16,12 @@ 134.4 SPLIT="libva-dev" 134.5 134.6 compile_rules() { 134.7 + fix ld 134.8 ./configure \ 134.9 --sysconfdir=/etc \ 134.10 --localstatedir=/var \ 134.11 $CONFIGURE_ARGS && 134.12 + fix libtool && 134.13 make && 134.14 make install 134.15 } 134.16 @@ -28,15 +30,12 @@ 134.17 case $PACKAGE in 134.18 libva) 134.19 copy @std 134.20 - DEPENDS="libdrm mesa17 mesa17-libegl wayland xorg-libX11 \ 134.21 - xorg-libXext xorg-libXfixes" 134.22 + DEPENDS="libdrm mesa17 wayland xorg-libX11 xorg-libXext \ 134.23 + xorg-libXfixes" 134.24 ;; 134.25 *-dev) 134.26 copy @dev 134.27 - DEPENDS="libva expat-dev libdrm-dev libffi-dev mesa17-dev \ 134.28 - wayland-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdamage-dev \ 134.29 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \ 134.30 - xorg-libXxf86vm-dev xorg-libxcb-dev xorg-libxshmfence-dev" 134.31 + DEPENDS="libva wayland-dev" 134.32 ;; 134.33 esac 134.34 }
135.1 --- a/libvdpau/receipt Sat Feb 24 10:43:01 2018 +0200 135.2 +++ b/libvdpau/receipt Sat Feb 24 16:17:33 2018 +0200 135.3 @@ -37,3 +37,4 @@ 135.4 ;; 135.5 esac 135.6 } 135.7 +
136.1 --- a/libxml2/receipt Sat Feb 24 10:43:01 2018 +0200 136.2 +++ b/libxml2/receipt Sat Feb 24 16:17:33 2018 +0200 136.3 @@ -7,29 +7,26 @@ 136.4 MAINTAINER="pankso@slitaz.org" 136.5 LICENSE="MIT" 136.6 WEB_SITE="http://xmlsoft.org/" 136.7 -HOST_ARCH="i486 arm" 136.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libxml2.html" 136.9 136.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 136.11 WGET_URL="ftp://xmlsoft.org/libxml2/$TARBALL" 136.12 136.13 +BUILD_DEPENDS_arm=" " 136.14 BUILD_DEPENDS="zlib-dev xz-dev python-dev ncurses-dev readline-dev" 136.15 -BUILD_DEPENDS_arm=" " 136.16 SPLIT="libxml2-tools libxml2-python libxml2-dev" 136.17 136.18 -# When cross compiling Python is installed in chroot and is used 136.19 -# by cross tools, cook don't need to install it in /usr/cross/arm 136.20 -# Building with LZMA support is buggy and build fails 136.21 -case "$ARCH" in 136.22 - arm) ARCH_ARGS="--without-lzma" ;; 136.23 -esac 136.24 - 136.25 -# Rules to configure and make the package. 136.26 -# 136.27 # Note: libxml2 can be build using option --with-minimum 136.28 # and binaries are splited into libxml2-tools 136.29 -compile_rules() 136.30 -{ 136.31 -# autoreconf -fi 136.32 +compile_rules() { 136.33 + # When cross compiling Python is installed in chroot and is used 136.34 + # by cross tools, cook don't need to install it in /usr/cross/arm 136.35 + # Building with LZMA support is buggy and build fails 136.36 + case "$ARCH" in 136.37 + arm) ARCH_ARGS="--without-lzma" ;; 136.38 + esac 136.39 + 136.40 + # autoreconf -fi 136.41 ./configure \ 136.42 --disable-static \ 136.43 --with-html-dir=/usr/share/doc \ 136.44 @@ -42,13 +39,11 @@ 136.45 find $install -name '*.sh' -exec chmod +x \{\} \; 136.46 } 136.47 136.48 -# Rules to gen a SliTaz package suitable for Tazpkg. 136.49 -genpkg_rules() 136.50 -{ 136.51 +genpkg_rules() { 136.52 case $PACKAGE in 136.53 libxml2) 136.54 copy libxml2.so* 136.55 - DEPENDS="zlib liblzma" 136.56 + DEPENDS="liblzma zlib" 136.57 case "$ARCH" in 136.58 arm) DEPENDS="zlib" ;; 136.59 esac 136.60 @@ -56,15 +51,16 @@ 136.61 libxml2-tools) 136.62 copy xmllint xmlcatalog 136.63 CAT="system-tools|xmllint tester and xmlcatalog parser utility" 136.64 + DEPENDS="liblzma libxml2 ncurses readline zlib" 136.65 ;; 136.66 libxml2-python) 136.67 copy python2.7/; find $fs -name '*.la' -delete 136.68 CAT="development|adapter for the Python" 136.69 - DEPENDS="python libxml2 libxslt" 136.70 + DEPENDS="liblzma libxml2 python zlib libxslt" 136.71 ;; 136.72 libxml2-dev) 136.73 copy @dev *.sh 136.74 - DEPENDS="libxml2-tools pkg-config zlib-dev liblzma-dev" 136.75 + DEPENDS="xz-dev zlib-dev libxml2-tools" 136.76 ;; 136.77 esac 136.78 }
137.1 --- a/libxslt/receipt Sat Feb 24 10:43:01 2018 +0200 137.2 +++ b/libxslt/receipt Sat Feb 24 16:17:33 2018 +0200 137.3 @@ -7,42 +7,40 @@ 137.4 MAINTAINER="pankso@slitaz.org" 137.5 LICENSE="MIT" 137.6 WEB_SITE="http://www.xmlsoft.org/XSLT/" 137.7 -HOST_ARCH="i486 arm" 137.8 +LFS="" 137.9 137.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 137.11 WGET_URL="http://xmlsoft.org/sources/$TARBALL" 137.12 137.13 +BUILD_DEPENDS_arm="libgcrypt-dev libgpg-error-dev libxml2-dev" 137.14 BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev libxml2-dev zlib-dev python-dev" 137.15 -BUILD_DEPENDS_arm="libgcrypt-dev libgpg-error-dev libxml2-dev" 137.16 SPLIT="libxslt-python libxslt-dev" 137.17 +COOKOPTS="skip-log-errors" 137.18 137.19 -# Rules to configure and make the package. 137.20 -compile_rules() 137.21 -{ 137.22 +compile_rules() { 137.23 ./configure \ 137.24 --disable-static \ 137.25 $CONFIGURE_ARGS && 137.26 make && 137.27 - make install 2>&1 | grep -v 'html/index.sgml' 137.28 + make install 137.29 } 137.30 137.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 137.32 -genpkg_rules() 137.33 -{ 137.34 +genpkg_rules() { 137.35 case $PACKAGE in 137.36 libxslt) 137.37 copy xsltproc libxslt.so* libexslt.so* 137.38 - DEPENDS="libgcrypt libgpg-error libxml2 zlib" 137.39 + DEPENDS="libgcrypt libgpg-error liblzma libxml2 zlib" 137.40 ;; 137.41 libxslt-python) 137.42 copy python*/ 137.43 find $fs -name '*.la' -delete 137.44 - DEPENDS="libxslt python" 137.45 + DEPENDS="libgcrypt libgpg-error liblzma libxml2 libxslt python zlib" 137.46 CAT="development|python module" 137.47 ;; 137.48 libxslt-dev) 137.49 copy @dev xsltConf.sh 137.50 - DEPENDS="libxslt libxslt-python libgcrypt-dev libxml2-dev zlib-dev" 137.51 + DEPENDS="libxslt libxslt-python libgcrypt-dev libgpg-error-dev \ 137.52 + libxml2-dev xz-dev zlib-dev" 137.53 ;; 137.54 esac 137.55 }
138.1 --- a/llvm/receipt Sat Feb 24 10:43:01 2018 +0200 138.2 +++ b/llvm/receipt Sat Feb 24 16:17:33 2018 +0200 138.3 @@ -14,9 +14,7 @@ 138.4 BUILD_DEPENDS="cmake zlib-dev libffi-dev python" 138.5 SPLIT="llvm-dev llvm-libs" 138.6 138.7 -# Rules to configure and make the package. 138.8 -compile_rules() 138.9 -{ 138.10 +compile_rules() { 138.11 mkdir build && cd build && 138.12 CC=gcc CXX=g++ \ 138.13 cmake \ 138.14 @@ -30,22 +28,20 @@ 138.15 make install 138.16 } 138.17 138.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 138.19 -genpkg_rules() 138.20 -{ 138.21 +genpkg_rules() { 138.22 case $PACKAGE in 138.23 - llvm) 138.24 - DEPENDS="libffi gcc-lib-base llvm-libs" 138.25 - copy bin/ 138.26 - ;; 138.27 - llvm-dev) 138.28 - DEPENDS="llvm" 138.29 - copy include/ cmake/ 138.30 - ;; 138.31 - llvm-libs) 138.32 - CAT="libs|libraries" 138.33 - DEPENDS="libffi gcc-lib-base" 138.34 - copy *.so* 138.35 - ;; 138.36 + llvm) 138.37 + DEPENDS="libffi gcc-lib-base llvm-libs" 138.38 + copy bin/ 138.39 + ;; 138.40 + llvm-dev) 138.41 + DEPENDS="llvm" 138.42 + copy include/ cmake/ 138.43 + ;; 138.44 + llvm-libs) 138.45 + CAT="libs|libraries" 138.46 + DEPENDS="libffi gcc-lib-base" 138.47 + copy *.so* 138.48 + ;; 138.49 esac 138.50 }
139.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 139.2 +++ b/llvm/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 139.3 @@ -0,0 +1,1 @@ 139.4 +std.patch
140.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 140.2 +++ b/llvm/stuff/patches/std.patch Sat Feb 24 16:17:33 2018 +0200 140.3 @@ -0,0 +1,29 @@ 140.4 +${src}/lib/Support/NativeFormatting.cpp: In function 'void llvm::write_double(llvm::raw_ostream&, double, llvm::FloatStyle, llvm::Optional<long unsigned int>)': 140.5 +${src}/lib/Support/NativeFormatting.cpp:166:12: error: '__builtin_isnan' is not a member of 'std' 140.6 + if (std::isnan(N)) { 140.7 + ^ 140.8 +${src}/lib/Support/NativeFormatting.cpp:166:12: note: suggested alternative: 140.9 +<built-in>: note: '__builtin_isnan' 140.10 +${src}/lib/Support/NativeFormatting.cpp:169:19: error: '__builtin_isinf_sign' is not a member of 'std' 140.11 + } else if (std::isinf(N)) { 140.12 + ^ 140.13 +${src}/lib/Support/NativeFormatting.cpp:169:19: note: suggested alternative: 140.14 +<built-in>: note: '__builtin_isinf_sign' 140.15 +make[2]: *** [lib/Support/CMakeFiles/LLVMSupport.dir/build.make:1263: lib/Support/CMakeFiles/LLVMSupport.dir/NativeFormatting.cpp.o] Error 1 140.16 +make[1]: *** [CMakeFiles/Makefile2:545: lib/Support/CMakeFiles/LLVMSupport.dir/all] Error 2 140.17 + 140.18 +--- a/lib/Support/NativeFormatting.cpp 140.19 ++++ b/lib/Support/NativeFormatting.cpp 140.20 +@@ -163,10 +163,10 @@ 140.21 + Optional<size_t> Precision) { 140.22 + size_t Prec = Precision.getValueOr(getDefaultPrecision(Style)); 140.23 + 140.24 +- if (std::isnan(N)) { 140.25 ++ if (isnan(N)) { 140.26 + S << "nan"; 140.27 + return; 140.28 +- } else if (std::isinf(N)) { 140.29 ++ } else if (isinf(N)) { 140.30 + S << "INF"; 140.31 + return; 140.32 + }
141.1 --- a/lvm2/receipt Sat Feb 24 10:43:01 2018 +0200 141.2 +++ b/lvm2/receipt Sat Feb 24 16:17:33 2018 +0200 141.3 @@ -1,12 +1,13 @@ 141.4 # SliTaz package receipt v2. 141.5 141.6 PACKAGE="lvm2" 141.7 -VERSION="2.02.173" 141.8 +VERSION="2.02.177" 141.9 CATEGORY="system-tools" 141.10 SHORT_DESC="Linux Logical Volume Manager" 141.11 MAINTAINER="guillaume.michon@laposte.net" 141.12 LICENSE="GPL2" 141.13 WEB_SITE="http://sourceware.org/lvm2/" 141.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/lvm2.html" 141.15 141.16 TARBALL="LVM2.$VERSION.tgz" 141.17 WGET_URL="ftp://sources.redhat.com/pub/lvm2/$TARBALL" 141.18 @@ -14,11 +15,7 @@ 141.19 BUILD_DEPENDS="readline-dev eudev-dev ncurses-dev coreutils-file-format" 141.20 SPLIT="dmsetup libdevmapper libdevmapper-dev lvm2 lvm2-dev" 141.21 141.22 -# Rules to configure and make the package. 141.23 -compile_rules() 141.24 -{ 141.25 - # http://www.linuxfromscratch.org/blfs/view/stable/postlfs/lvm2.html 141.26 - 141.27 +compile_rules() { 141.28 ./configure \ 141.29 --exec-prefix= \ 141.30 --enable-applib \ 141.31 @@ -41,9 +38,7 @@ 141.32 make install 141.33 } 141.34 141.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 141.36 -genpkg_rules() 141.37 -{ 141.38 +genpkg_rules() { 141.39 case $PACKAGE in 141.40 dmsetup) 141.41 copy dmsetup dmstats 141.42 @@ -63,8 +58,7 @@ 141.43 DEPENDS="libdevmapper eudev-dev" 141.44 ;; 141.45 lvm2) 141.46 - copy @std 141.47 - remove_already_packed 141.48 + copy @std @rm 141.49 DEPENDS="eudev libdevmapper ncurses readline linux-md" 141.50 ;; 141.51 lvm2-dev)
142.1 --- a/lz4/receipt Sat Feb 24 10:43:01 2018 +0200 142.2 +++ b/lz4/receipt Sat Feb 24 16:17:33 2018 +0200 142.3 @@ -7,39 +7,37 @@ 142.4 MAINTAINER="pascal.bellard@slitaz.org" 142.5 LICENSE="BSD" 142.6 WEB_SITE="http://lz4.github.io/lz4/" 142.7 -TAGS="compression" 142.8 142.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 142.10 WGET_URL="$GITHUB/lz4/lz4/tarball/v$VERSION" 142.11 142.12 SPLIT="lz4-dev lz4-lib lz4c" 142.13 142.14 -# Rules to configure and make the package. 142.15 -compile_rules() 142.16 -{ 142.17 +compile_rules() { 142.18 + export AR="$HOST_SYSTEM-ar" 142.19 make && make PREFIX=/usr DESTDIR=$DESTDIR install 142.20 } 142.21 142.22 -# Rules to gen a SliTaz package suitable for Tazpkg. 142.23 -genpkg_rules() 142.24 -{ 142.25 +genpkg_rules() { 142.26 case $PACKAGE in 142.27 - lz4) 142.28 - copy lz4 unlz4 lz4cat 142.29 - DEPENDS=" " 142.30 - ;; 142.31 - lz4c) 142.32 - CAT="base-system|lz4c compressor" 142.33 - copy lz4c 142.34 - DEPENDS=" " 142.35 - ;; 142.36 - lz4-lib) 142.37 - CAT="base-system|lz4c compressor shared library" 142.38 - copy *.so* 142.39 - DEPENDS=" " 142.40 - ;; 142.41 - lz4-dev) 142.42 - copy @dev 142.43 - ;; 142.44 + lz4) 142.45 + copy lz4 unlz4 lz4cat 142.46 + DEPENDS=" " 142.47 + TAGS="compression" 142.48 + ;; 142.49 + lz4c) 142.50 + copy lz4c 142.51 + CAT="base-system|lz4c compressor" 142.52 + DEPENDS=" " 142.53 + TAGS="compression" 142.54 + ;; 142.55 + lz4-lib) 142.56 + copy *.so* 142.57 + CAT="base-system|lz4c compressor shared library" 142.58 + DEPENDS=" " 142.59 + ;; 142.60 + lz4-dev) 142.61 + copy @dev 142.62 + ;; 142.63 esac 142.64 }
143.1 --- a/lzma/receipt Sat Feb 24 10:43:01 2018 +0200 143.2 +++ b/lzma/receipt Sat Feb 24 16:17:33 2018 +0200 143.3 @@ -7,8 +7,6 @@ 143.4 MAINTAINER="pascal.bellard@slitaz.org" 143.5 LICENSE="LGPL2.1" 143.6 WEB_SITE="http://sourceforge.net/projects/sevenzip/" 143.7 -TAGS="compression archive" 143.8 -HOST_ARCH="i486 arm" 143.9 143.10 TARBALL="lzma$(echo $VERSION | sed 's/\.//').tar.bz2" 143.11 WGET_URL="$SF_MIRROR/sevenzip/$TARBALL" 143.12 @@ -16,9 +14,7 @@ 143.13 BUILD_DEPENDS="zlib-dev" 143.14 SPLIT="lzma lzlib lzlib-dev" 143.15 143.16 -# Rules to configure and make the package. 143.17 -compile_rules() 143.18 -{ 143.19 +compile_rules() { 143.20 if [ ! -f done.lzlib.u ]; then 143.21 patch -p0 < $stuff/lzlib.u || return 1 143.22 touch done.lzlib.u 143.23 @@ -40,30 +36,29 @@ 143.24 make -f makefile.gcc lzma 143.25 } 143.26 143.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 143.28 -genpkg_rules() 143.29 -{ 143.30 +genpkg_rules() { 143.31 case $PACKAGE in 143.32 - lzma) 143.33 - DEPENDS="lzlib zlib gcc-lib-base" 143.34 - mkdir -p $fs/usr/bin 143.35 - cp -a $src/CPP/7zip/Compress/LZMA_Alone/lzma-shared $fs/usr/bin/lzma-alone 143.36 - cp $stuff/lzma $fs/usr/bin 143.37 - chmod 755 $fs/usr/bin/lzma 143.38 - ln -s lzma $fs/usr/bin/unlzma 143.39 - ln -s lzma $fs/usr/bin/lzcat 143.40 - ;; 143.41 - lzlib-dev) 143.42 - mkdir -p $fs/usr/include 143.43 - cp -a $src/CPP/7zip/Compress/LZMA_Alone/lzlib.h $fs/usr/include 143.44 - ;; 143.45 - lzlib) 143.46 - CAT="base-system|library" 143.47 - DEPENDS="zlib gcc-lib-base" 143.48 - mkdir -p $fs/lib 143.49 - cp -a $src/CPP/7zip/Compress/LZMA_Alone/liblz.so.1.0.0 $fs/lib 143.50 - ln -s liblz.so.1.0.0 $fs/lib/liblz.so 143.51 - ln -s liblz.so.1.0.0 $fs/lib/liblz.so.1 143.52 - ;; 143.53 + lzma) 143.54 + mkdir -p $fs/usr/bin 143.55 + cp -a $src/CPP/7zip/Compress/LZMA_Alone/lzma-shared $fs/usr/bin/lzma-alone 143.56 + cp $stuff/lzma $fs/usr/bin 143.57 + chmod 755 $fs/usr/bin/lzma 143.58 + ln -s lzma $fs/usr/bin/unlzma 143.59 + ln -s lzma $fs/usr/bin/lzcat 143.60 + DEPENDS="lzlib zlib gcc-lib-base" 143.61 + TAGS="compression archive" 143.62 + ;; 143.63 + lzlib) 143.64 + mkdir -p $fs/lib 143.65 + cp -a $src/CPP/7zip/Compress/LZMA_Alone/liblz.so.1.0.0 $fs/lib 143.66 + ln -s liblz.so.1.0.0 $fs/lib/liblz.so 143.67 + ln -s liblz.so.1.0.0 $fs/lib/liblz.so.1 143.68 + CAT="base-system|library" 143.69 + DEPENDS="zlib gcc-lib-base" 143.70 + ;; 143.71 + lzlib-dev) 143.72 + mkdir -p $fs/usr/include 143.73 + cp -a $src/CPP/7zip/Compress/LZMA_Alone/lzlib.h $fs/usr/include 143.74 + ;; 143.75 esac 143.76 }
144.1 --- a/lzo/receipt Sat Feb 24 10:43:01 2018 +0200 144.2 +++ b/lzo/receipt Sat Feb 24 16:17:33 2018 +0200 144.3 @@ -7,29 +7,23 @@ 144.4 MAINTAINER="erjo@slitaz.org" 144.5 LICENSE="GPL2" 144.6 WEB_SITE="http://www.oberhumer.com/opensource/lzo/" 144.7 -HOST_ARCH="i486 arm" 144.8 144.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 144.10 WGET_URL="${WEB_SITE}download/$TARBALL" 144.11 144.12 SPLIT="lzo-dev" 144.13 144.14 -# Rules to configure and make the package. 144.15 -compile_rules() 144.16 -{ 144.17 +compile_rules() { 144.18 ./configure \ 144.19 --enable-shared \ 144.20 --disable-static \ 144.21 - --docdir=/usr/share/doc/$PACKAGE-$VERSION \ 144.22 $CONFIGURE_ARGS && 144.23 make && make install 144.24 } 144.25 144.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 144.27 -genpkg_rules() 144.28 -{ 144.29 +genpkg_rules() { 144.30 case $PACKAGE in 144.31 - lzo) copy @std;; 144.32 + lzo) copy @std;; 144.33 *-dev) copy @dev;; 144.34 esac 144.35 }
145.1 --- a/menu-cache/receipt Sat Feb 24 10:43:01 2018 +0200 145.2 +++ b/menu-cache/receipt Sat Feb 24 16:17:33 2018 +0200 145.3 @@ -8,7 +8,6 @@ 145.4 LICENSE="GPL2" 145.5 WEB_SITE="https://github.com/lxde/menu-cache" 145.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/menu-cache.html" 145.7 -HOST_ARCH="i486 arm" 145.8 145.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 145.10 WGET_URL="$SF_MIRROR/lxde/$TARBALL" 145.11 @@ -16,9 +15,7 @@ 145.12 BUILD_DEPENDS="glib-dev libfm-extra-dev gtk-doc" 145.13 SPLIT="menu-cache-dev" 145.14 145.15 -# Rules to configure and make the package. 145.16 -compile_rules() 145.17 -{ 145.18 +compile_rules() { 145.19 ./configure \ 145.20 --disable-static \ 145.21 --enable-gtk-doc \ 145.22 @@ -26,9 +23,7 @@ 145.23 make && make install 145.24 } 145.25 145.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 145.27 -genpkg_rules() 145.28 -{ 145.29 +genpkg_rules() { 145.30 case $PACKAGE in 145.31 *-cache) 145.32 copy @std 145.33 @@ -36,9 +31,7 @@ 145.34 ;; 145.35 *-dev) 145.36 copy @dev 145.37 - DEPENDS="menu-cache glib-dev libffi-dev pcre-dev \ 145.38 - util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ 145.39 - zlib-dev" 145.40 + DEPENDS="menu-cache glib-dev" 145.41 ;; 145.42 esac 145.43 TAGS="LXDE"
146.1 --- a/mercurial/receipt Sat Feb 24 10:43:01 2018 +0200 146.2 +++ b/mercurial/receipt Sat Feb 24 16:17:33 2018 +0200 146.3 @@ -1,56 +1,42 @@ 146.4 -# SliTaz package receipt. 146.5 +# SliTaz package receipt v2. 146.6 146.7 PACKAGE="mercurial" 146.8 -VERSION="3.5.1" 146.9 +VERSION="4.3.1" 146.10 CATEGORY="development" 146.11 -SHORT_DESC="Revision tools system." 146.12 +SHORT_DESC="Revision tools system" 146.13 MAINTAINER="pankso@slitaz.org" 146.14 LICENSE="GPL2" 146.15 +WEB_SITE="https://www.mercurial-scm.org/" 146.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/mercurial.html" 146.17 + 146.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 146.19 -WEB_SITE="http://mercurial.selenic.com/" 146.20 -WGET_URL="http://www.selenic.com/mercurial/release/$TARBALL" 146.21 -CONFIG_FILES="/etc/mercurial/hgweb.config" 146.22 -HOST_ARCH="i486 arm" 146.23 +WGET_URL="https://www.mercurial-scm.org/release/$TARBALL" 146.24 146.25 -DEPENDS="python patch libssl" 146.26 -BUILD_DEPENDS="python-dev patch openssl-dev" 146.27 -PROVIDE="hg" 146.28 +BUILD_DEPENDS="python-dev patch openssl-dev glib-dev gettext python-docutils" 146.29 146.30 -# Rules to configure and make the package. 146.31 -compile_rules() 146.32 -{ 146.33 - # Cross compilation hack to avoid using compiler wich build python 146.34 - # itself. 146.35 - case "$ARCH" in 146.36 - arm*) 146.37 - mv /usr/bin/i486-slitaz-linux-gcc /tmp && 146.38 - ln -s /cross/${ARCH}/tools/bin/${HOST_SYSTEM}-gcc \ 146.39 - /usr/bin/i486-slitaz-linux-gcc ;; 146.40 - esac && 146.41 - python setup.py install --root="$DESTDIR" --optimize=1 && 146.42 - mkdir -p $DESTDIR/usr/share/examples/mercurial && 146.43 - cp -a $src/hgweb.cgi $DESTDIR/usr/share/examples/mercurial && 146.44 - case "$ARCH" in 146.45 - arm*) 146.46 - rm /usr/bin/i486-slitaz-linux-gcc && 146.47 - mv /tmp/i486-slitaz-linux-gcc /usr/bin ;; 146.48 - esac 146.49 +compile_rules() { 146.50 + make build && 146.51 + make doc && 146.52 + make PREFIX=/usr install-bin install-doc || return 1 146.53 + 146.54 + install -dm0755 $install/etc/mercurial 146.55 + cat > $install/etc/mercurial/hgrc <<EOF 146.56 +[web] 146.57 +cacerts = /etc/ssl/ca-bundle.crt 146.58 +EOF 146.59 + 146.60 + # Examples 146.61 + install -Dm0755 $src/hgweb.cgi $install/usr/share/examples/mercurial/hgweb.cgi 146.62 + install -Dm0755 $stuff/hgwebdir.cgi $install/usr/share/examples/mercurial/hgwebdir.cgi 146.63 + install -Dm0644 $stuff/lighttpd-hg-vhost.conf $install/usr/share/examples/mercurial/lighttpd-hg-vhost.conf 146.64 + 146.65 + # Config file for hgweb 146.66 + install -Dm0644 $stuff/hgweb.config $install/etc/mercurial/hgweb.config 146.67 } 146.68 146.69 -# Rules to gen a SliTaz package suitable for Tazpkg. 146.70 -genpkg_rules() 146.71 -{ 146.72 - mkdir -p $fs/usr/share/examples/mercurial 146.73 - cp -a $install/usr/bin $fs/usr 146.74 - cp -a $install/usr/lib $fs/usr 146.75 - 146.76 - # Examples 146.77 - cp -a $stuff/hgwebdir.cgi $fs/usr/share/examples/mercurial 146.78 - cp -a $stuff/lighttpd-hg-vhost.conf $fs/usr/share/examples/mercurial 146.79 - 146.80 - # Config file for hgweb 146.81 - mkdir -p $fs/etc/mercurial 146.82 - cp -a $stuff/hgweb.config $fs/etc/mercurial 146.83 - 146.84 - chown -R root.root $fs 146.85 +genpkg_rules() { 146.86 + copy @std 146.87 + DEPENDS="python patch openssl cacerts" 146.88 + CONFIG_FILES="/etc/mercurial/hgweb.config" 146.89 + PROVIDE="hg" 146.90 }
147.1 --- a/mesa17/receipt Sat Feb 24 10:43:01 2018 +0200 147.2 +++ b/mesa17/receipt Sat Feb 24 16:17:33 2018 +0200 147.3 @@ -18,6 +18,7 @@ 147.4 xorg-libXdamage-dev xorg-libXfixes-dev xorg-libXxf86vm-dev expat-dev \ 147.5 elfutils-dev llvm-dev xorg-libpciaccess-dev wayland-dev libva-dev libvdpau-dev \ 147.6 wayland-protocols-dev libatomic zlib-dev" 147.7 +#BUILD_DEPENDS="${BUILD_DEPENDS/libva-dev/}" 147.8 SPLIT="mesa17-dri mesa17-libegl mesa17-libgbm mesa17-osmesa mesa17-libswrAVX \ 147.9 mesa17-libwayland-egl mesa17-libxatracker mesa17-vdpau mesa17 mesa17-dev" 147.10 147.11 @@ -27,6 +28,7 @@ 147.12 GLL_DRV="i915,nouveau,r300,r600,radeonsi,svga,swrast,swr,virgl,etnaviv,imx" 147.13 147.14 sed -i "/pthread_stubs_possible=/s/yes/no/" configure.ac 147.15 + fix ld 147.16 ./autogen.sh \ 147.17 CFLAGS='-O2' CXXFLAGS='-O2' \ 147.18 --prefix=/usr \ 147.19 @@ -40,14 +42,12 @@ 147.20 --enable-glx-tls \ 147.21 --with-platforms="drm,x11,wayland" \ 147.22 --with-gallium-drivers=$GLL_DRV && 147.23 + unset GLL_DRV && 147.24 + fix libtool && 147.25 + make && make install || return 1 147.26 147.27 - unset GLL_DRV && 147.28 - 147.29 - make && make install && 147.30 - cook_pick_docs docs/* && 147.31 - 147.32 - mkdir -p $install/etc/X11/xorg.conf.d && 147.33 - cp $stuff/90-DRI.conf $install/etc/X11/xorg.conf.d 147.34 + cook_pick_docs docs/* 147.35 + install -Dm644 $stuff/90-DRI.conf $install/etc/X11/xorg.conf.d/90-DRI.conf 147.36 } 147.37 147.38 genpkg_rules() { 147.39 @@ -57,21 +57,20 @@ 147.40 CAT="x-window|Direct Rendering Infrastructure" 147.41 DEPENDS="elfutils expat libdrm libdrm-amdgpu libdrm-etnaviv \ 147.42 libdrm-intel libdrm-nouveau libdrm-radeon llvm-libs mesa17 \ 147.43 - xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libpciaccess \ 147.44 - xorg-libxcb xorg-libxshmfence zlib" 147.45 + xorg-libX11 xorg-libxcb xorg-libxshmfence zlib" 147.46 PROVIDE="mesa-dri" 147.47 ;; 147.48 *-libegl) 147.49 copy libEGL.so* 147.50 CAT="x-window|EGL library" 147.51 - DEPENDS="expat libdrm libffi mesa17-libgbm wayland xorg-libX11 \ 147.52 - xorg-libXau xorg-libXdmcp xorg-libxcb xorg-libxshmfence" 147.53 + DEPENDS="expat libdrm mesa17-libgbm wayland xorg-libX11 \ 147.54 + xorg-libxcb xorg-libxshmfence zlib" 147.55 PROVIDE="libegl libegl-mesa mesa-libegl" 147.56 ;; 147.57 *-libgbm) 147.58 copy libgbm.so* 147.59 CAT="x-window|Graphics Buffer Manager library" 147.60 - DEPENDS="expat libdrm libffi wayland" 147.61 + DEPENDS="expat libdrm wayland" 147.62 PROVIDE="mesa-libgbm" 147.63 ;; 147.64 *-osmesa) 147.65 @@ -89,30 +88,27 @@ 147.66 *-libxatracker) 147.67 copy libxatracker.so* 147.68 CAT="x-window|Xorg Gallium3D acceleration library" 147.69 - DEPENDS="expat libdrm libdrm-intel libdrm-nouveau llvm-libs \ 147.70 - xorg-libpciaccess zlib" 147.71 + DEPENDS="expat libdrm libdrm-intel libdrm-nouveau llvm-libs zlib" 147.72 PROVIDE="mesa-libxatracker" 147.73 ;; 147.74 *-vdpau) 147.75 copy lib/vdpau/ 147.76 CAT="x-window|VDPAU drivers" 147.77 DEPENDS="elfutils expat libdrm libdrm-amdgpu libdrm-nouveau \ 147.78 - libdrm-radeon llvm-libs xorg-libX11 xorg-libXau xorg-libXdmcp \ 147.79 - xorg-libxcb xorg-libxshmfence zlib" 147.80 + libdrm-radeon llvm-libs xorg-libX11 xorg-libxcb xorg-libxshmfence \ 147.81 + zlib" 147.82 PROVIDE="mesa-vdpau" 147.83 ;; 147.84 *-libswrAVX) 147.85 copy libswrAVX*so* 147.86 CAT="x-window|Fast software rendering driver for CPU with AVX" 147.87 - DEPENDS="mesa17 llvm-libs" 147.88 + DEPENDS=" " 147.89 ;; 147.90 mesa17) 147.91 - copy @std 147.92 - remove_already_packed 147.93 + copy @std @rm 147.94 CAT="x-window|main OpenGL libraries" 147.95 - DEPENDS="expat libdrm xorg-libX11 xorg-libXau \ 147.96 - xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \ 147.97 - xorg-libXxf86vm xorg-libxcb xorg-libxshmfence zlib" 147.98 + DEPENDS="expat libdrm xorg-libX11 xorg-libXdamage xorg-libXext \ 147.99 + xorg-libXfixes xorg-libXxf86vm xorg-libxcb xorg-libxshmfence" 147.100 SUGGESTED="nvidia" 147.101 PROVIDE="libgl mesa" 147.102 CONFIG_FILES="/etc/drirc" 147.103 @@ -122,11 +118,9 @@ 147.104 DEPENDS="mesa17 mesa17-dri mesa17-libegl mesa17-libgbm \ 147.105 mesa17-osmesa mesa17-libwayland-egl mesa17-libxatracker \ 147.106 mesa17-vdpau \ 147.107 - expat-dev libdrm-dev libffi-dev llvm-dev wayland-dev \ 147.108 - xorg-libX11-dev xorg-libXau-dev xorg-libXdamage-dev \ 147.109 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXfixes-dev \ 147.110 - xorg-libXxf86vm-dev xorg-libpciaccess-dev xorg-libxcb-dev \ 147.111 - xorg-libxshmfence-dev zlib-dev" 147.112 + libdrm-dev wayland-dev xorg-libX11-dev xorg-libXdamage-dev \ 147.113 + xorg-libXext-dev xorg-libXfixes-dev xorg-libXxf86vm-dev \ 147.114 + xorg-libxcb-dev" 147.115 PROVIDE="mesa-dev" 147.116 ;; 147.117 esac
148.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 148.2 +++ b/mesa17/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 148.3 @@ -0,0 +1,1 @@ 148.4 +std.patch
149.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 149.2 +++ b/mesa17/stuff/patches/std.patch Sat Feb 24 16:17:33 2018 +0200 149.3 @@ -0,0 +1,58 @@ 149.4 +--- a/include/c99_math.h 149.5 ++++ b/include/c99_math.h 149.6 +@@ -192,19 +192,6 @@ 149.7 + */ 149.8 + #if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) 149.9 + #include <cmath> 149.10 +- 149.11 +-using std::fpclassify; 149.12 +-using std::isfinite; 149.13 +-using std::isinf; 149.14 +-using std::isnan; 149.15 +-using std::isnormal; 149.16 +-using std::signbit; 149.17 +-using std::isgreater; 149.18 +-using std::isgreaterequal; 149.19 +-using std::isless; 149.20 +-using std::islessequal; 149.21 +-using std::islessgreater; 149.22 +-using std::isunordered; 149.23 + #endif 149.24 + 149.25 + 149.26 +--- a/src/gallium/drivers/swr/rasterizer/memory/Convert.h 149.27 ++++ b/src/gallium/drivers/swr/rasterizer/memory/Convert.h 149.28 +@@ -169,13 +169,13 @@ 149.29 + mant = uf & 0x007FFFFF; 149.30 + 149.31 + // Check for out of range 149.32 +- if (std::isnan(val)) 149.33 ++ if (isnan(val)) 149.34 + { 149.35 + exp = 0x1F; 149.36 + mant = 0x200; 149.37 + sign = 1; // set the sign bit for NANs 149.38 + } 149.39 +- else if (std::isinf(val)) 149.40 ++ else if (isinf(val)) 149.41 + { 149.42 + exp = 0x1f; 149.43 + mant = 0x0; 149.44 +--- a/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp 149.45 ++++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp 149.46 +@@ -54,13 +54,13 @@ 149.47 + mant = uf & 0x007FFFFF; 149.48 + 149.49 + // Check for out of range 149.50 +- if (std::isnan(val)) 149.51 ++ if (isnan(val)) 149.52 + { 149.53 + exp = 0x1F; 149.54 + mant = 0x200; 149.55 + sign = 1; // set the sign bit for NANs 149.56 + } 149.57 +- else if (std::isinf(val)) 149.58 ++ else if (isinf(val)) 149.59 + { 149.60 + exp = 0x1f; 149.61 + mant = 0x0;
150.1 --- a/mtdev-dev/receipt Sat Feb 24 10:43:01 2018 +0200 150.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 150.3 @@ -1,19 +0,0 @@ 150.4 -# SliTaz package receipt. 150.5 - 150.6 -PACKAGE="mtdev-dev" 150.7 -VERSION="1.1.5" 150.8 -CATEGORY="development" 150.9 -SHORT_DESC="Multitouch Protocol Translation Library (development files)" 150.10 -MAINTAINER="mojo@slitaz.org" 150.11 -LICENSE="MIT" 150.12 -WEB_SITE="http://bitmath.org/code/mtdev/" 150.13 -HOST_ARCH="i486 arm" 150.14 - 150.15 -WANTED="mtdev" 150.16 -DEPENDS="mtdev" 150.17 - 150.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 150.19 -genpkg_rules() 150.20 -{ 150.21 - copy *.h *.la *.pc 150.22 -}
151.1 --- a/mtdev/receipt Sat Feb 24 10:43:01 2018 +0200 151.2 +++ b/mtdev/receipt Sat Feb 24 16:17:33 2018 +0200 151.3 @@ -1,4 +1,4 @@ 151.4 -# SliTaz package receipt. 151.5 +# SliTaz package receipt v2. 151.6 151.7 PACKAGE="mtdev" 151.8 VERSION="1.1.5" 151.9 @@ -7,22 +7,23 @@ 151.10 MAINTAINER="mojo@slitaz.org" 151.11 LICENSE="MIT" 151.12 WEB_SITE="http://bitmath.org/code/mtdev/" 151.13 -HOST_ARCH="i486 arm" 151.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/mtdev.html" 151.15 151.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 151.17 WGET_URL="$WEB_SITE$TARBALL" 151.18 151.19 -# Rules to configure and make the package. 151.20 -compile_rules() 151.21 -{ 151.22 +SPLIT="mtdev-dev" 151.23 + 151.24 +compile_rules() { 151.25 ./configure \ 151.26 --disable-static \ 151.27 $CONFIGURE_ARGS && 151.28 make && make install 151.29 } 151.30 151.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 151.32 -genpkg_rules() 151.33 -{ 151.34 - copy bin/ *.so* 151.35 +genpkg_rules() { 151.36 + case $PACKAGE in 151.37 + mtdev) copy @std;; 151.38 + *-dev) copy @dev;; 151.39 + esac 151.40 }
152.1 --- a/mysql/receipt Sat Feb 24 10:43:01 2018 +0200 152.2 +++ b/mysql/receipt Sat Feb 24 16:17:33 2018 +0200 152.3 @@ -1,7 +1,7 @@ 152.4 # SliTaz package receipt v2. 152.5 152.6 PACKAGE="mysql" 152.7 -VERSION="5.5.56" 152.8 +VERSION="5.5.59" 152.9 CATEGORY="database" 152.10 SHORT_DESC="SQL database system" 152.11 MAINTAINER="pascal.bellard@slitaz.org" 152.12 @@ -12,17 +12,16 @@ 152.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 152.14 WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${VERSION%.*}/$TARBALL" 152.15 152.16 -BUILD_DEPENDS="cmake openssl-dev zlib-dev ncurses-dev readline-dev" 152.17 -SPLIT="libmysqlclient mysql-client mysql-test mysql-dev" 152.18 +BUILD_DEPENDS="cmake zlib-dev ncurses-dev readline-dev libunistring-dev \ 152.19 +libaio-dev" 152.20 +SPLIT="libmysqlclient mysql-client mysql-test mysql-dev mysql" 152.21 152.22 -# Rules to configure and make the package. 152.23 -compile_rules() 152.24 -{ 152.25 +compile_rules() { 152.26 mkdir build; cd build 152.27 152.28 # CFLAGS/CXXFLAGS as suggested upstream 152.29 CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ 152.30 - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ 152.31 + CXXFLAGS="-fPIC ${CXXFLAGS} -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ 152.32 cmake .. \ 152.33 -DCMAKE_BUILD_TYPE=Release \ 152.34 -DCMAKE_INSTALL_PREFIX=/usr \ 152.35 @@ -44,7 +43,7 @@ 152.36 -DINSTALL_SHAREDIR=share/mysql \ 152.37 -DWITH_READLINE=ON \ 152.38 -DWITH_ZLIB=system \ 152.39 - -DWITH_SSL=system \ 152.40 + -DWITH_SSL=bundled \ 152.41 -DWITH_LIBWRAP=OFF \ 152.42 -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ 152.43 -DWITH_EXTRA_CHARSETS=complex \ 152.44 @@ -55,49 +54,33 @@ 152.45 -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ 152.46 -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ 152.47 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 && 152.48 - make && make DESTDIR=$DESTDIR install 152.49 + make && make DESTDIR=$DESTDIR install || return 1 152.50 152.51 # fix paths 152.52 mv $install/usr/mysql-test $install/usr/share/mysql-test 152.53 mv $install/usr/sql-bench $install/usr/share/sql-bench 152.54 152.55 # Configuration file 152.56 - mkdir -p $install/etc 152.57 - cp -a $stuff/etc/init.d $install/etc 152.58 - cp -a $stuff/etc/mysql $install/etc 152.59 - chown -R root:root $install/etc 152.60 + mkdir -p $install/etc 152.61 + cp -a $stuff/etc/init.d $install/etc 152.62 + cp -a $stuff/etc/mysql $install/etc 152.63 + chown -R root:root $install/etc 152.64 } 152.65 152.66 -# Rules to gen a SliTaz package suitable for Tazpkg. 152.67 -genpkg_rules() 152.68 -{ 152.69 - # client binaries (plus /usr/bin/mysql), see $src/build/client 152.70 - client="mysql_plugin mysql_upgrade mysqladmin mysqlbinlog mysqlcheck \ 152.71 - mysqldump mysqlimport mysqlshow mysqlslap mysqltest" 152.72 - 152.73 +genpkg_rules() { 152.74 case $PACKAGE in 152.75 - mysql) 152.76 - copy etc/ bin/ plugin/ /usr/share/mysql/ 152.77 - for i in $client mysql mysql_config; do 152.78 - rm $fs/usr/bin/$i 152.79 - done 152.80 - find $fs -name '*.m4' -delete 152.81 - DEPENDS="libmysqlclient mysql-client slitaz-base-files \ 152.82 - libcrypto libssl ncurses zlib" 152.83 - CONFIG_FILES="/etc/mysql" 152.84 - DATABASE_FILES="/var/lib/mysql" 152.85 - TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE" 152.86 - ;; 152.87 libmysqlclient) 152.88 copy libmysqlclient*so* 152.89 CAT="database|client libraries" 152.90 - DEPENDS="libcrypto libssl zlib" 152.91 + DEPENDS="zlib" 152.92 ;; 152.93 mysql-client) 152.94 - copy /bin/mysql $client 152.95 + # client binaries (plus /usr/bin/mysql), see $src/build/client 152.96 + copy /bin/mysql mysql_plugin mysql_upgrade mysqladmin mysqlbinlog \ 152.97 + mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqltest 152.98 CAT="database|client files" 152.99 PROVIDE="mysql_or_postgresql" 152.100 - DEPENDS="libmysqlclient libcrypto libssl ncurses zlib" 152.101 + DEPENDS="libmysqlclient ncurses zlib" 152.102 ;; 152.103 mysql-test) 152.104 copy mysql-test/ sql-bench/ db.opt 152.105 @@ -108,20 +91,25 @@ 152.106 copy @dev mysql_config 152.107 rm -r $fs/usr/share/mysql-test 152.108 ;; 152.109 + mysql) 152.110 + copy @std @rm 152.111 + DEPENDS="libmysqlclient libaio mysql-client slitaz-base-files \ 152.112 + ncurses zlib" 152.113 + CONFIG_FILES="/etc/mysql" 152.114 + DATABASE_FILES="/var/lib/mysql" 152.115 + TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE" 152.116 + ;; 152.117 esac 152.118 } 152.119 152.120 -# Pre and post install commands for Tazpkg. 152.121 -pre_install_mysql() 152.122 -{ 152.123 +pre_install_mysql() { 152.124 # Cleanup old files 152.125 rm -f "$1/usr/libexec/mysql"* 152.126 # Move old config 152.127 [ -f "$1/etc/my.cnf" ] && mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf" 152.128 } 152.129 152.130 -post_install_mysql() 152.131 -{ 152.132 +post_install_mysql() { 152.133 chmod 600 "$1/etc/mysql/my.cnf" 152.134 152.135 local user=mysql group=mysql 152.136 @@ -145,24 +133,22 @@ 152.137 chroot "$1/" mysql_install_db --user=$user --basedir=/usr 152.138 152.139 [ -n "$quiet" ] || cat <<EOF 152.140 ----- 152.141 -To start mysql server you can run: 152.142 152.143 - /etc/init.d/mysql start 152.144 - 152.145 -Or add mysql to RUN_DAEMONS in /etc/rcS.conf 152.146 ----- 152.147 + .----------------------------------------------. 152.148 + | To start mysql server you can run: | 152.149 + | /etc/init.d/mysql start | 152.150 + | | 152.151 + | Or add mysql to RUN_DAEMONS in /etc/rcS.conf | 152.152 + '----------------------------------------------' 152.153 EOF 152.154 } 152.155 152.156 -post_remove_mysql() 152.157 -{ 152.158 +post_remove_mysql() { 152.159 echo "Removing user/group mysql" 152.160 chroot "$1/" deluser mysql 152.161 } 152.162 152.163 -post_install_mysql_test() 152.164 -{ 152.165 +post_install_mysql_test() { 152.166 chmod 2777 "$1/usr/share/mysql-test" 152.167 chmod 2777 "$1/usr/share/sql-bench" 152.168 }
153.1 --- a/nano/receipt Sat Feb 24 10:43:01 2018 +0200 153.2 +++ b/nano/receipt Sat Feb 24 16:17:33 2018 +0200 153.3 @@ -1,4 +1,4 @@ 153.4 -# SliTaz package receipt. 153.5 +# SliTaz package receipt v2. 153.6 153.7 PACKAGE="nano" 153.8 VERSION="2.6.3" 153.9 @@ -7,31 +7,17 @@ 153.10 MAINTAINER="pankso@slitaz.org" 153.11 LICENSE="GPL3" 153.12 WEB_SITE="https://nano-editor.org/" 153.13 -TAGS="text-editor" 153.14 -HOST_ARCH="i486 arm" 153.15 -SUGGESTED="gpm" 153.16 153.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 153.18 WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL" 153.19 153.20 -DEPENDS="ncurses zlib" 153.21 -BUILD_DEPENDS="gettext ncurses-dev zlib-dev groff" 153.22 BUILD_DEPENDS_arm="ncurses-dev zlib-dev" 153.23 +BUILD_DEPENDS="gettext ncurses-dev zlib-dev groff libmagic-dev" 153.24 153.25 -# Handle cross compilation 153.26 -case "$ARCH" in 153.27 - arm*) BUILD_DEPENDS=$BUILD_DEPENDS_arm ;; 153.28 -esac 153.29 - 153.30 -# Rules to configure and make the package. 153.31 -compile_rules() 153.32 -{ 153.33 - while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series 153.34 - 153.35 +compile_rules() { 153.36 ./configure \ 153.37 --sysconfdir=/etc \ 153.38 --localstatedir=/var \ 153.39 - --docdir=/usr/share/doc/nano-$VERSION \ 153.40 --disable-wrapping-as-root \ 153.41 --enable-utf8 \ 153.42 $CONFIGURE_ARGS $ARCH_ARGS && 153.43 @@ -44,13 +30,14 @@ 153.44 install -v -m644 doc/texinfo/nano.html $install/usr/share/doc/nano-$VERSION 153.45 } 153.46 153.47 -# Rules to gen a SliTaz package suitable for Tazpkg. 153.48 -genpkg_rules() 153.49 -{ 153.50 +genpkg_rules() { 153.51 copy etc/ bin/ nano/ 153.52 153.53 # Shrink 153.54 for i in $fs/usr/share/nano/*.nanorc; do 153.55 sed -i '/^#/d;/^$/d' $i 153.56 done 153.57 + DEPENDS="libmagic ncurses zlib" 153.58 + TAGS="text-editor" 153.59 + SUGGESTED="gpm" 153.60 }
154.1 --- a/nasm/receipt Sat Feb 24 10:43:01 2018 +0200 154.2 +++ b/nasm/receipt Sat Feb 24 16:17:33 2018 +0200 154.3 @@ -1,28 +1,24 @@ 154.4 -# SliTaz package receipt. 154.5 +# SliTaz package receipt v2. 154.6 154.7 PACKAGE="nasm" 154.8 VERSION="2.12.02" 154.9 CATEGORY="development" 154.10 -SHORT_DESC="The netwide assembler." 154.11 +SHORT_DESC="The netwide assembler" 154.12 MAINTAINER="pascal.bellard@slitaz.org" 154.13 LICENSE="BSD" 154.14 WEB_SITE="http://www.nasm.us/" 154.15 -TAGS="assembler" 154.16 -HOST_ARCH="i486 arm" 154.17 +HOST_ARCH="i486 arm x86_64" 154.18 154.19 TARBALL="$PACKAGE-$VERSION.tar.xz" 154.20 WGET_URL="${WEB_SITE}pub/nasm/releasebuilds/$VERSION/$TARBALL" 154.21 154.22 -# Rules to configure and make the package. 154.23 -compile_rules() 154.24 -{ 154.25 +compile_rules() { 154.26 ./configure $CONFIGURE_ARGS && 154.27 make && 154.28 make INSTALLROOT=$DESTDIR install 154.29 } 154.30 154.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 154.32 -genpkg_rules() 154.33 -{ 154.34 +genpkg_rules() { 154.35 copy bin/ 154.36 + TAGS="assembler" 154.37 }
155.1 --- a/netselect/receipt Sat Feb 24 10:43:01 2018 +0200 155.2 +++ b/netselect/receipt Sat Feb 24 16:17:33 2018 +0200 155.3 @@ -20,3 +20,4 @@ 155.4 genpkg_rules() { 155.5 copy netselect 155.6 } 155.7 +
156.1 --- a/nettle-dev/receipt Sat Feb 24 10:43:01 2018 +0200 156.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 156.3 @@ -1,19 +0,0 @@ 156.4 -# SliTaz package receipt. 156.5 - 156.6 -PACKAGE="nettle-dev" 156.7 -VERSION="3.3" 156.8 -CATEGORY="development" 156.9 -SHORT_DESC="devel files for nettle" 156.10 -MAINTAINER="devl547@gmail.com" 156.11 -LICENSE="LGPL2.1" 156.12 -WEB_SITE="http://www.lysator.liu.se/~nisse/nettle/" 156.13 -HOST_ARCH="i486 arm" 156.14 - 156.15 -WANTED="nettle" 156.16 -DEPENDS="nettle gmp-dev" 156.17 - 156.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 156.19 -genpkg_rules() 156.20 -{ 156.21 - copy *.h *.pc 156.22 -}
157.1 --- a/nettle/receipt Sat Feb 24 10:43:01 2018 +0200 157.2 +++ b/nettle/receipt Sat Feb 24 16:17:33 2018 +0200 157.3 @@ -1,37 +1,40 @@ 157.4 -# SliTaz package receipt. 157.5 +# SliTaz package receipt v2. 157.6 157.7 PACKAGE="nettle" 157.8 VERSION="3.3" 157.9 CATEGORY="security" 157.10 -SHORT_DESC="Nettle is a cryptographic library that is designed to fit easily in more or less any context." 157.11 +SHORT_DESC="Nettle cryptographic library" 157.12 MAINTAINER="devl547@gmail.com" 157.13 LICENSE="LGPL2.1" 157.14 WEB_SITE="http://www.lysator.liu.se/~nisse/nettle/" 157.15 -HOST_ARCH="i486 arm" 157.16 157.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 157.18 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 157.19 157.20 -DEPENDS="gmp" 157.21 BUILD_DEPENDS="openssl-dev gmp-dev texinfo" 157.22 +SPLIT="nettle-dev" 157.23 157.24 -# Handle cross compilation. 157.25 -case "$ARCH" in 157.26 - arm) 157.27 - ARCH_ARGS="--enable-arm-neon" ;; 157.28 -esac 157.29 +compile_rules() { 157.30 + case "$ARCH" in 157.31 + arm) ARCH_ARGS='--enable-arm-neon';; 157.32 + *) ARCH_ARGS='';; 157.33 + esac 157.34 157.35 -# Rules to configure and make the package. 157.36 -compile_rules() 157.37 -{ 157.38 ./configure \ 157.39 --disable-static \ 157.40 - $CONFIGURE_ARGS ${ARCH_ARGS} && 157.41 + $CONFIGURE_ARGS $ARCH_ARGS && 157.42 make && make install 157.43 } 157.44 157.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 157.46 -genpkg_rules() 157.47 -{ 157.48 - copy @std 157.49 +genpkg_rules() { 157.50 + case $PACKAGE in 157.51 + nettle) 157.52 + copy @std 157.53 + DEPENDS="gmp" 157.54 + ;; 157.55 + *-dev) 157.56 + copy @dev 157.57 + DEPENDS="nettle gmp-dev" 157.58 + ;; 157.59 + esac 157.60 }
158.1 --- a/nspr/receipt Sat Feb 24 10:43:01 2018 +0200 158.2 +++ b/nspr/receipt Sat Feb 24 16:17:33 2018 +0200 158.3 @@ -14,24 +14,25 @@ 158.4 BUILD_DEPENDS="perl" 158.5 SPLIT="nspr-dev" 158.6 158.7 -# Rules to configure and make the package. 158.8 -compile_rules() 158.9 -{ 158.10 - cd nspr && 158.11 - sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in && 158.12 - sed -i 's#$(LIBRARY) ##' config/rules.mk && 158.13 +compile_rules() { 158.14 + cd nspr 158.15 + sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in 158.16 + sed -i 's#$(LIBRARY) ##' config/rules.mk 158.17 + 158.18 + case $ARCH in 158.19 + x86_64) ARCH_ARGS='--enable-64bit';; 158.20 + *) ARCH_ARGS='';; 158.21 + esac 158.22 158.23 ./configure \ 158.24 --with-mozilla \ 158.25 --with-pthreads \ 158.26 - $([ $(uname -m) = x86_64 ] && echo --enable-64bit) \ 158.27 + $ARCH_ARGS \ 158.28 $CONFIGURE_ARGS && 158.29 make && make install 158.30 } 158.31 158.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 158.33 -genpkg_rules() 158.34 -{ 158.35 +genpkg_rules() { 158.36 case $PACKAGE in 158.37 nspr) copy @std;; 158.38 *-dev) copy @dev;;
159.1 --- a/ntfs-3g/receipt Sat Feb 24 10:43:01 2018 +0200 159.2 +++ b/ntfs-3g/receipt Sat Feb 24 16:17:33 2018 +0200 159.3 @@ -63,3 +63,4 @@ 159.4 pre_remove_ntfs_3g() { 159.5 sed -i '/^$PACKAGE$/d' "$1/etc/filesystems" 159.6 } 159.7 +
160.1 --- a/openbox-max/receipt Sat Feb 24 10:43:01 2018 +0200 160.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 160.3 @@ -1,55 +0,0 @@ 160.4 -# SliTaz package receipt. 160.5 - 160.6 -PACKAGE="openbox-max" 160.7 -VERSION="3.6.1" 160.8 -CATEGORY="x-window" 160.9 -SHORT_DESC="Small-footprint and standard compliant Window Manager (allow icons in menus + SVG support)" 160.10 -MAINTAINER="pankso@slitaz.org" 160.11 -LICENSE="GPL2" 160.12 -WEB_SITE="http://openbox.org/" 160.13 - 160.14 -TARBALL="openbox-$VERSION.tar.gz" 160.15 -WGET_URL="http://openbox.org/dist/openbox/$TARBALL" 160.16 - 160.17 -BUILD_DEPENDS="glib-dev pango-dev \ 160.18 -gettext xorg-libXcursor-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \ 160.19 -xorg-libXinerama-dev startup-notification-dev automake libtool docbook-utils \ 160.20 -xorg-libXi-dev imlib2-dev librsvg-dev" 160.21 -SIBLINGS="openbox" 160.22 - 160.23 -# Rules to configure and make the package. 160.24 -compile_rules() 160.25 -{ 160.26 - # we need reconfiguration after patching... 160.27 - autoreconf -fi && 160.28 - 160.29 - ./configure \ 160.30 - --sysconfdir=/etc \ 160.31 - --libexecdir=/usr/lib/openbox \ 160.32 - --disable-static \ 160.33 - --docdir=/usr/share/doc/openbox-$VERSION \ 160.34 - $CONFIGURE_ARGS && 160.35 - make && 160.36 - make -j1 DESTDIR=$DESTDIR install && 160.37 - 160.38 - # Pipe menu. 160.39 - cp $stuff/open-folder-menu.sh $install/usr/lib/openbox/ 160.40 -} 160.41 - 160.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 160.43 -genpkg_rules() 160.44 -{ 160.45 - copy obxprop openbox openbox-session *.so* openbox-autostart \ 160.46 - pixmaps/ Clearlooks/ Onyx*/ xsessions/openbox.desktop open-folder-menu.sh 160.47 - # SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package 160.48 - TAGS="window-manager" 160.49 - PROVIDE="openbox openbox-imlib2" 160.50 - SUGGESTED="obconf pcmanfm hsetroot" 160.51 - DEPENDS="imlib2 librsvg pango startup-notification xorg-libSM \ 160.52 - xorg-libXcursor xorg-libXi xorg-libXinerama xorg-libXrandr slitaz-configs" 160.53 -} 160.54 - 160.55 -#pre_install() { 160.56 -# [ ! -d "$1/var/lib/tazpkg/installed/openbox" ] || 160.57 -# tazpkg -r openbox --root="$1/" 160.58 -#}
161.1 --- a/openbox-max/stuff Sat Feb 24 10:43:01 2018 +0200 161.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 161.3 @@ -1,1 +0,0 @@ 161.4 -../openbox/stuff 161.5 \ No newline at end of file
162.1 --- a/openbox/receipt Sat Feb 24 10:43:01 2018 +0200 162.2 +++ b/openbox/receipt Sat Feb 24 16:17:33 2018 +0200 162.3 @@ -7,7 +7,6 @@ 162.4 MAINTAINER="pankso@slitaz.org" 162.5 LICENSE="GPL2" 162.6 WEB_SITE="http://openbox.org/" 162.7 -HOST_ARCH="i486 arm" 162.8 162.9 TARBALL="openbox-$VERSION.tar.gz" 162.10 WGET_URL="http://openbox.org/dist/openbox/$TARBALL" 162.11 @@ -15,15 +14,16 @@ 162.12 BUILD_DEPENDS="glib-dev pango-dev \ 162.13 gettext xorg-libXcursor-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \ 162.14 xorg-libXinerama-dev startup-notification-dev automake libtool docbook-utils \ 162.15 -xorg-libXi-dev" 162.16 -BUILD_DEPENDS_arm="pango-dev glib-dev xorg-libXft-dev util-linux-uuid-dev \ 162.17 -libxml2-dev xcb-util-dev" 162.18 -SPLIT="openbox-themes openbox-python openbox-dev" 162.19 -SIBLINGS="openbox-max" 162.20 +xorg-libXi-dev xorg-xcb-util-dev imlib2-dev librsvg-dev" 162.21 +SPLIT="openbox openbox-light:light openbox-themes openbox-python openbox-dev" 162.22 162.23 -# Rules to configure and make the package. 162.24 -compile_rules() 162.25 -{ 162.26 +compile_rules() { 162.27 + case $SET in 162.28 + light) SET_ARGS='--disable-imlib2 --disable-librsvg';; 162.29 + *) SET_ARGS='';; 162.30 + esac 162.31 + 162.32 + fix ld 162.33 # openbox required reconfiguration after patching... 162.34 autoreconf -fi && 162.35 162.36 @@ -31,33 +31,42 @@ 162.37 --sysconfdir=/etc \ 162.38 --libexecdir=/usr/lib/openbox \ 162.39 --disable-static \ 162.40 - --docdir=/usr/share/doc/openbox-$VERSION \ 162.41 - $CONFIGURE_ARGS && 162.42 + $ARCH_ARGS $SET_ARGS $CONFIGURE_ARGS && 162.43 + fix libtool && 162.44 make && 162.45 make -j1 DESTDIR=$DESTDIR install && 162.46 162.47 # Pipe menu. 162.48 - cp $stuff/open-folder-menu.sh $install/usr/lib/openbox/ 162.49 + install -m755 $stuff/open-folder-menu.sh \ 162.50 + $install/usr/lib/openbox/open-folder-menu.sh 162.51 } 162.52 162.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 162.54 -genpkg_rules() 162.55 -{ 162.56 +genpkg_rules() { 162.57 case $PACKAGE in 162.58 openbox) 162.59 copy obxprop openbox openbox-session *.so* openbox-autostart \ 162.60 pixmaps/ Clearlooks/ Onyx*/ xsessions/openbox.desktop \ 162.61 open-folder-menu.sh 162.62 # SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package 162.63 + DEPENDS="cairo glib imlib2 librsvg libxml2 pango \ 162.64 + startup-notification xorg-libICE xorg-libSM xorg-libX11 \ 162.65 + xorg-libXcursor xorg-libXext xorg-libXft xorg-libXi \ 162.66 + xorg-libXinerama xorg-libXrandr slitaz-configs" 162.67 + SUGGESTED="obconf pcmanfm hsetroot" 162.68 TAGS="window-manager" 162.69 + ;; 162.70 + openbox-light) 162.71 + copy obxprop openbox openbox-session *.so* openbox-autostart \ 162.72 + pixmaps/ Clearlooks/ Onyx*/ xsessions/openbox.desktop \ 162.73 + open-folder-menu.sh 162.74 + # SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package 162.75 + CAT="x-window|without imlib2 and SVG support" 162.76 + DEPENDS="glib libxml2 pango startup-notification xorg-libICE \ 162.77 + xorg-libSM xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXft \ 162.78 + xorg-libXi xorg-libXinerama xorg-libXrandr slitaz-configs" 162.79 + PROVIDE="openbox" 162.80 SUGGESTED="obconf spacefm pcmanfm hsetroot wbar2 conky" 162.81 - DEPENDS="pango xorg-libSM xorg-libXcursor xorg-libXi \ 162.82 - xorg-libXinerama xorg-libXrandr slitaz-configs" 162.83 - # Handle SliTaz arch: /etc/slitaz/slitaz.conf 162.84 - case "$SLITAZ_ARCH" in 162.85 - i?86) DEPENDS="$DEPENDS startup-notification";; 162.86 - arm*) DEPENDS="$DEPENDS hsetroot tint2";; 162.87 - esac 162.88 + TAGS="window-manager" 162.89 ;; 162.90 openbox-python) 162.91 copy openbox-xdg-autostart 162.92 @@ -70,13 +79,9 @@ 162.93 ;; 162.94 openbox-dev) 162.95 copy @dev 162.96 - DEPENDS="openbox openbox-themes bzip2-dev \ 162.97 - fontconfig-dev freetype-dev glib-dev harfbuzz-dev libffi-dev \ 162.98 - liblzma-dev libpng16-dev libxcb-dev libxml2-dev pango-dev pcre-dev \ 162.99 - util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \ 162.100 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXft-dev \ 162.101 - xorg-libXi-dev xorg-libXinerama-dev xorg-libXrandr-dev \ 162.102 - xorg-libXrender-dev zlib-dev" 162.103 + DEPENDS="openbox openbox-themes \ 162.104 + glib-dev imlib2-dev librsvg-dev libxml2-dev pango-dev \ 162.105 + xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXft-dev" 162.106 ;; 162.107 esac 162.108 }
163.1 --- a/openjade/receipt Sat Feb 24 10:43:01 2018 +0200 163.2 +++ b/openjade/receipt Sat Feb 24 16:17:33 2018 +0200 163.3 @@ -14,9 +14,7 @@ 163.4 BUILD_DEPENDS="patch opensp-dev automake texinfo perl" 163.5 SPLIT="openjade-dev" 163.6 163.7 -# Rules to configure and make the package. 163.8 -compile_rules() 163.9 -{ 163.10 +compile_rules() { 163.11 sed -i -e '/getopts/{N;s#&G#g#;s#do .getopts.pl.;##;}' \ 163.12 -e '/use POSIX/ause Getopt::Std;' msggen.pl 163.13 163.14 @@ -43,9 +41,7 @@ 163.15 $install/usr/share/sgml/openjade-$VERSION/catalog 163.16 } 163.17 163.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 163.19 -genpkg_rules() 163.20 -{ 163.21 +genpkg_rules() { 163.22 case $PACKAGE in 163.23 openjade) copy @std; DEPENDS="sgml-common opensp";; 163.24 *-dev) copy @dev;;
164.1 --- a/openldap/receipt Sat Feb 24 10:43:01 2018 +0200 164.2 +++ b/openldap/receipt Sat Feb 24 16:17:33 2018 +0200 164.3 @@ -1,22 +1,26 @@ 164.4 # SliTaz package receipt v2. 164.5 164.6 PACKAGE="openldap" 164.7 -VERSION="2.4.44" 164.8 +VERSION="2.4.45" 164.9 CATEGORY="misc" 164.10 SHORT_DESC="LDAP database system" 164.11 MAINTAINER="pascal.bellard@slitaz.org" 164.12 LICENSE="BSD" 164.13 WEB_SITE="http://www.openldap.org/" 164.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/server/openldap.html" 164.15 164.16 TARBALL="$PACKAGE-$VERSION.tgz" 164.17 WGET_URL="http://mirror.eu.oneandone.net/software/openldap/openldap-release/$TARBALL" 164.18 164.19 -BUILD_DEPENDS="util-linux-uuid-dev openssl-dev libtool groff" 164.20 -SPLIT="libldap openldap-dev" 164.21 +BUILD_DEPENDS="automake util-linux-uuid-dev openssl-dev libtool groff" 164.22 +SPLIT="libldap openldap openldap-dev" 164.23 164.24 -# Rules to configure and make the package. 164.25 -compile_rules() 164.26 -{ 164.27 +compile_rules() { 164.28 + addgroup -g 84 -S ldap 164.29 + adduser -h /var/lib/openldap -g "OpenLDAP Daemon Owner" \ 164.30 + -u 84 -s /bin/false -S -D -G ldap ldap 164.31 + 164.32 + autoconf && 164.33 ./configure \ 164.34 --sysconfdir=/etc \ 164.35 --localstatedir=/var \ 164.36 @@ -30,39 +34,50 @@ 164.37 --disable-hdb \ 164.38 $CONFIGURE_ARGS && 164.39 sed -i 's|@VERSION_OPTION@||' $src/libraries/*/Makefile && 164.40 - make depend && make && make install 164.41 + make depend && make && make install || return 1 164.42 164.43 - mkdir -p $install/etc/init.d 164.44 - install -m0755 $stuff/etc/init.d/openldap $install/etc/init.d 164.45 + install -Dm0755 $stuff/etc/init.d/openldap $install/etc/init.d/openldap 164.46 + 164.47 + cook_pick_docs doc/drafts doc/rfc doc/guide 164.48 } 164.49 164.50 -# Rules to gen a SliTaz package suitable for Tazpkg. 164.51 -genpkg_rules() 164.52 -{ 164.53 +genpkg_rules() { 164.54 case $PACKAGE in 164.55 + libldap) 164.56 + copy *.so* 164.57 + CAT="libs|libraries" 164.58 + DEPENDS="openssl" 164.59 + ;; 164.60 openldap) 164.61 - copy @std 164.62 - find $fs -name '*.so*' -delete 164.63 - DEPENDS="libldap libcrypto libssl util-linux-uuid" 164.64 + copy @std @rm 164.65 + DEPENDS="libldap openssl util-linux-uuid" 164.66 CONFIG_FILES="/etc/openldap/" 164.67 DATABASE_FILES="/var/openldap-*" 164.68 TAZPANEL_DAEMON="man::slapd|help::/usr/libexec/slapd|edit::/etc/openldap/slapd.conf|options::LDAP_OPTIONS|web::$WEB_SITE" 164.69 ;; 164.70 - libldap) 164.71 - copy *.so* 164.72 - CAT="libs|libraries" 164.73 - DEPENDS="libcrypto libssl" 164.74 - ;; 164.75 *-dev) 164.76 copy @dev 164.77 - DEPENDS="openldap libldap libcrypto-dev openssl-dev";; 164.78 + DEPENDS="openldap libldap openssl-dev";; 164.79 esac 164.80 } 164.81 164.82 -# Pre and post install commands for Tazpkg. 164.83 -post_install_openldap() 164.84 -{ 164.85 +post_install_openldap() { 164.86 + if ! grep -q ldap "$1/etc/passwd"; then 164.87 + action "Adding user/group ldap..." 164.88 + chroot "$1/" addgroup -g 84 -S ldap 164.89 + chroot "$1/" adduser -h /var/lib/openldap -g "OpenLDAP Daemon Owner" \ 164.90 + -u 84 -s /bin/false -S -D -G ldap ldap 164.91 + status 164.92 + fi 164.93 + 164.94 chmod 700 "$1/etc/openldap" 164.95 + chroot "$1/" install -dm700 -o ldap -g ldap /var/lib/openldap 164.96 + 164.97 + chroot "$1/" install -dm700 -o ldap -g ldap /etc/openldap/slapd.d 164.98 + chroot "$1/" chmod 640 /etc/openldap/slapd.conf 164.99 + chroot "$1/" chmod 640 /etc/openldap/slapd.ldif 164.100 + chroot "$1/" chown root:ldap /etc/openldap/slapd.conf 164.101 + chroot "$1/" chown root:ldap /etc/openldap/slapd.ldif 164.102 164.103 ( cd "$1/$INSTALLED/"; grep -l /etc/openldap/slapd.conf */receipt ) | \ 164.104 while read file; do
165.1 --- a/openldap/stuff/patches/openldap-2.4.44-consolidated-2.patch Sat Feb 24 10:43:01 2018 +0200 165.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 165.3 @@ -1,371 +0,0 @@ 165.4 -Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org> 165.5 -Date: 2012-03-26 165.6 -Initial Package Version: 2.4.40 165.7 -Upstream Status: BLFS Specific 165.8 -Origin: Armin K. <krejzi at email dot com> and Debian 165.9 -Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot 165.10 - com dot br> for version 2.4.44 - 2016.02.06 165.11 - Rediffed by Pierre Labastie <pierre dot labastie at 165.12 - neuf dot fr> to add mdb backend and slapd.ldif. See 165.13 - ticket #7394 - 2016.02.24 165.14 -Description: Consolidate earlier patches to: 165.15 - 1. Update various installation options, such as ldap database path, 165.16 - configuration file options, slapd install location, etc. 165.17 - 2. Remove reference to bdb module 165.18 - 3. Enables symbol versioning in ldap libraries. Without these changes 165.19 - some applications might generate a warning about missing symbol versions. 165.20 - 165.21 -diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4 165.22 ---- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500 165.23 -+++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500 165.24 -@@ -1142,3 +1142,54 @@ 165.25 - #endif 165.26 - ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) 165.27 - ]) 165.28 -+ 165.29 -+dnl ==================================================================== 165.30 -+dnl check for symbol versioning support 165.31 -+AC_DEFUN([OL_SYMBOL_VERSIONING], 165.32 -+[AC_CACHE_CHECK([for .symver assembler directive], 165.33 -+ [ol_cv_asm_symver_directive],[ 165.34 -+cat > conftest.s <<EOF 165.35 -+${libc_cv_dot_text} 165.36 -+_sym: 165.37 -+.symver _sym,sym@VERS 165.38 -+EOF 165.39 -+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then 165.40 -+ ol_cv_asm_symver_directive=yes 165.41 -+else 165.42 -+ ol_cv_asm_symver_directive=no 165.43 -+fi 165.44 -+rm -f conftest*]) 165.45 -+AC_CACHE_CHECK([for ld --version-script], 165.46 -+ [ol_cv_ld_version_script_option],[ 165.47 -+if test $ol_cv_asm_symver_directive = yes; then 165.48 -+ cat > conftest.s <<EOF 165.49 -+${libc_cv_dot_text} 165.50 -+_sym: 165.51 -+.symver _sym,sym@VERS 165.52 -+EOF 165.53 -+ cat > conftest.map <<EOF 165.54 -+VERS_1 { 165.55 -+ global: sym; 165.56 -+}; 165.57 -+ 165.58 -+VERS_2 { 165.59 -+ global: sym; 165.60 -+} VERS_1; 165.61 -+EOF 165.62 -+ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then 165.63 -+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared 165.64 -+ -o conftest.so conftest.o 165.65 -+ -Wl,--version-script,conftest.map 165.66 -+ 1>&AS_MESSAGE_LOG_FD]); 165.67 -+ then 165.68 -+ ol_cv_ld_version_script_option=yes 165.69 -+ else 165.70 -+ ol_cv_ld_version_script_option=no 165.71 -+ fi 165.72 -+ else 165.73 -+ ol_cv_ld_version_script_option=no 165.74 -+ fi 165.75 -+else 165.76 -+ ol_cv_ld_version_script_option=no 165.77 -+fi 165.78 -+rm -f conftest*])]) 165.79 -diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk 165.80 ---- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500 165.81 -+++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500 165.82 -@@ -104,6 +104,9 @@ 165.83 - # LINK_LIBS referenced in library and module link commands. 165.84 - LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) 165.85 - 165.86 -+# option to pass to $(CC) to support library symbol versioning, if any 165.87 -+VERSION_OPTION = @VERSION_OPTION@ 165.88 -+ 165.89 - LTSTATIC = @LTSTATIC@ 165.90 - 165.91 - LTLINK = $(LIBTOOL) --mode=link \ 165.92 -@@ -113,7 +116,7 @@ 165.93 - $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c 165.94 - 165.95 - LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ 165.96 -- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) 165.97 -+ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS) 165.98 - 165.99 - LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ 165.100 - $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c 165.101 -diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in 165.102 ---- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500 165.103 -+++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500 165.104 -@@ -1916,6 +1916,13 @@ 165.105 - fi 165.106 - AC_SUBST(LTSTATIC)dnl 165.107 - 165.108 -+VERSION_OPTION="" 165.109 -+OL_SYMBOL_VERSIONING 165.110 -+if test $ol_cv_ld_version_script_option = yes ; then 165.111 -+ VERSION_OPTION="-Wl,--version-script=" 165.112 -+fi 165.113 -+AC_SUBST(VERSION_OPTION) 165.114 -+ 165.115 - dnl ---------------------------------------------------------------- 165.116 - if test $ol_enable_wrappers != no ; then 165.117 - AC_CHECK_HEADERS(tcpd.h,[ 165.118 -diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5 165.119 ---- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500 165.120 -+++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500 165.121 -@@ -135,7 +135,7 @@ 165.122 - associated indexes live. 165.123 - A separate directory must be specified for each database. 165.124 - The default is 165.125 --.BR LOCALSTATEDIR/openldap\-data . 165.126 -+.BR LOCALSTATEDIR/lib/openldap . 165.127 - .TP 165.128 - .B dirtyread 165.129 - Allow reads of modified but not yet committed data. 165.130 -diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5 165.131 ---- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500 165.132 -+++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500 165.133 -@@ -2051,7 +2051,7 @@ 165.134 - # The database directory MUST exist prior to 165.135 - # running slapd AND should only be accessible 165.136 - # by the slapd/tools. Mode 0700 recommended. 165.137 --olcDbDirectory: LOCALSTATEDIR/openldap\-data 165.138 -+olcDbDirectory: LOCALSTATEDIR/lib/openldap 165.139 - # Indices to maintain 165.140 - olcDbIndex: objectClass eq 165.141 - olcDbIndex: cn,sn,mail pres,eq,approx,sub 165.142 -diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5 165.143 ---- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500 165.144 -+++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500 165.145 -@@ -2021,7 +2021,7 @@ 165.146 - # The database directory MUST exist prior to 165.147 - # running slapd AND should only be accessible 165.148 - # by the slapd/tools. Mode 0700 recommended. 165.149 --directory LOCALSTATEDIR/openldap\-data 165.150 -+directory LOCALSTATEDIR/lib/openldap 165.151 - # Indices to maintain 165.152 - index objectClass eq 165.153 - index cn,sn,mail pres,eq,approx,sub 165.154 -diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h 165.155 ---- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500 165.156 -+++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500 165.157 -@@ -39,7 +39,7 @@ 165.158 - #define LDAP_ENV_PREFIX "LDAP" 165.159 - 165.160 - /* default ldapi:// socket */ 165.161 --#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" 165.162 -+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" 165.163 - 165.164 - /* 165.165 - * SLAPD DEFINITIONS 165.166 -@@ -47,7 +47,7 @@ 165.167 - /* location of the default slapd config file */ 165.168 - #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" 165.169 - #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" 165.170 --#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" 165.171 -+#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" 165.172 - #define SLAPD_DEFAULT_DB_MODE 0600 165.173 - #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" 165.174 - /* default max deref depth for aliases */ 165.175 -diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in 165.176 ---- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500 165.177 -+++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500 165.178 -@@ -38,6 +38,9 @@ 165.179 - XXLIBS = 165.180 - NT_LINK_LIBS = $(AC_LIBS) 165.181 - UNIX_LINK_LIBS = $(AC_LIBS) 165.182 -+ifneq (,$(VERSION_OPTION)) 165.183 -+ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map" 165.184 -+endif 165.185 - 165.186 - dtest: $(XLIBS) dtest.o 165.187 - $(LTLINK) -o $@ dtest.o $(LIBS) 165.188 -@@ -48,6 +51,6 @@ 165.189 - 165.190 - install-local: FORCE 165.191 - -$(MKDIR) $(DESTDIR)$(libdir) 165.192 -- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 165.193 -+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 165.194 - $(LTFINISH) $(DESTDIR)$(libdir) 165.195 - 165.196 -diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map 165.197 ---- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600 165.198 -+++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500 165.199 -@@ -0,0 +1,8 @@ 165.200 -+OPENLDAP_2.4_2 { 165.201 -+ global: 165.202 -+ ber_*; 165.203 -+ der_alloc; 165.204 -+ lutil_*; 165.205 -+ local: 165.206 -+ *; 165.207 -+}; 165.208 -diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in 165.209 ---- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500 165.210 -+++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500 165.211 -@@ -52,6 +52,9 @@ 165.212 - XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) 165.213 - NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 165.214 - UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 165.215 -+ifneq (,$(VERSION_OPTION)) 165.216 -+ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map 165.217 -+endif 165.218 - 165.219 - apitest: $(XLIBS) apitest.o 165.220 - $(LTLINK) -o $@ apitest.o $(LIBS) 165.221 -@@ -68,7 +71,7 @@ 165.222 - 165.223 - install-local: $(CFFILES) FORCE 165.224 - -$(MKDIR) $(DESTDIR)$(libdir) 165.225 -- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 165.226 -+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 165.227 - $(LTFINISH) $(DESTDIR)$(libdir) 165.228 - -$(MKDIR) $(DESTDIR)$(sysconfdir) 165.229 - @for i in $(CFFILES); do \ 165.230 -diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map 165.231 ---- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600 165.232 -+++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500 165.233 -@@ -0,0 +1,7 @@ 165.234 -+OPENLDAP_2.4_2 { 165.235 -+ global: 165.236 -+ ldap_*; 165.237 -+ ldif_*; 165.238 -+ local: 165.239 -+ *; 165.240 -+}; 165.241 -diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in 165.242 ---- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500 165.243 -+++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500 165.244 -@@ -61,6 +61,9 @@ 165.245 - XXXLIBS = $(LTHREAD_LIBS) 165.246 - NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 165.247 - UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) 165.248 -+ifneq (,$(VERSION_OPTION)) 165.249 -+ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map" 165.250 -+endif 165.251 - 165.252 - .links : Makefile 165.253 - @for i in $(XXSRCS); do \ 165.254 -@@ -83,6 +86,6 @@ 165.255 - 165.256 - install-local: $(CFFILES) FORCE 165.257 - -$(MKDIR) $(DESTDIR)$(libdir) 165.258 -- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 165.259 -+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 165.260 - $(LTFINISH) $(DESTDIR)$(libdir) 165.261 - 165.262 -diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in 165.263 ---- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500 165.264 -+++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500 165.265 -@@ -376,10 +376,10 @@ 165.266 - install-conf install-dbc-maybe install-schema install-tools 165.267 - 165.268 - install-slapd: FORCE 165.269 -- -$(MKDIR) $(DESTDIR)$(libexecdir) 165.270 -+ -$(MKDIR) $(DESTDIR)$(sbindir) 165.271 - -$(MKDIR) $(DESTDIR)$(localstatedir)/run 165.272 - $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ 165.273 -- slapd$(EXEEXT) $(DESTDIR)$(libexecdir) 165.274 -+ slapd$(EXEEXT) $(DESTDIR)$(sbindir) 165.275 - @for i in $(SUBDIRS); do \ 165.276 - if test -d $$i && test -f $$i/Makefile ; then \ 165.277 - echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ 165.278 -@@ -445,9 +445,9 @@ 165.279 - 165.280 - install-db-config: FORCE 165.281 - @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) 165.282 -- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data 165.283 -+ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap 165.284 - $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ 165.285 -- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example 165.286 -+ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example 165.287 - $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ 165.288 - $(DESTDIR)$(sysconfdir)/DB_CONFIG.example 165.289 - 165.290 -@@ -455,6 +455,6 @@ 165.291 - -$(MKDIR) $(DESTDIR)$(sbindir) 165.292 - for i in $(SLAPTOOLS); do \ 165.293 - $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 165.294 -- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 165.295 -+ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 165.296 - done 165.297 - 165.298 -diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf 165.299 ---- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100 165.300 -+++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100 165.301 -@@ -10,12 +10,12 @@ 165.302 - # service AND an understanding of referrals. 165.303 - #referral ldap://root.openldap.org 165.304 - 165.305 --pidfile %LOCALSTATEDIR%/run/slapd.pid 165.306 --argsfile %LOCALSTATEDIR%/run/slapd.args 165.307 -+pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid 165.308 -+argsfile %LOCALSTATEDIR%/run/openldap/slapd.args 165.309 - 165.310 - # Load dynamic backend modules: 165.311 --# modulepath %MODULEDIR% 165.312 --# moduleload back_mdb.la 165.313 -+modulepath %MODULEDIR% 165.314 -+moduleload back_mdb.la 165.315 - # moduleload back_ldap.la 165.316 - 165.317 - # Sample security restrictions 165.318 -@@ -60,6 +60,6 @@ 165.319 - # The database directory MUST exist prior to running slapd AND 165.320 - # should only be accessible by the slapd and slap tools. 165.321 - # Mode 700 recommended. 165.322 --directory %LOCALSTATEDIR%/openldap-data 165.323 -+directory %LOCALSTATEDIR%/lib/openldap 165.324 - # Indices to maintain 165.325 - index objectClass eq 165.326 -diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif 165.327 ---- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100 165.328 -+++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100 165.329 -@@ -9,8 +9,8 @@ 165.330 - # 165.331 - # Define global ACLs to disable default read access. 165.332 - # 165.333 --olcArgsFile: %LOCALSTATEDIR%/run/slapd.args 165.334 --olcPidFile: %LOCALSTATEDIR%/run/slapd.pid 165.335 -+olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args 165.336 -+olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid 165.337 - # 165.338 - # Do not enable referrals until AFTER you have a working directory 165.339 - # service AND an understanding of referrals. 165.340 -@@ -26,10 +26,11 @@ 165.341 - # 165.342 - # Load dynamic backend modules: 165.343 - # 165.344 --#dn: cn=module,cn=config 165.345 --#objectClass: olcModuleList 165.346 --#cn: module 165.347 --#olcModulepath: %MODULEDIR% 165.348 -+dn: cn=module,cn=config 165.349 -+objectClass: olcModuleList 165.350 -+cn: module 165.351 -+olcModulepath: %MODULEDIR% 165.352 -+olcModuleload: back_mdb.la 165.353 - #olcModuleload: back_bdb.la 165.354 - #olcModuleload: back_hdb.la 165.355 - #olcModuleload: back_ldap.la 165.356 -@@ -90,6 +91,6 @@ 165.357 - # The database directory MUST exist prior to running slapd AND 165.358 - # should only be accessible by the slapd and slap tools. 165.359 - # Mode 700 recommended. 165.360 --olcDbDirectory: %LOCALSTATEDIR%/openldap-data 165.361 -+olcDbDirectory: %LOCALSTATEDIR%/lib/openldap 165.362 - # Indices to maintain 165.363 - olcDbIndex: objectClass eq 165.364 -diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in 165.365 ---- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500 165.366 -+++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500 165.367 -@@ -46,6 +46,6 @@ 165.368 - install-local: FORCE 165.369 - if test "$(BUILD_MOD)" = "yes"; then \ 165.370 - $(MKDIR) $(DESTDIR)$(libdir); \ 165.371 -- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \ 165.372 -+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \ 165.373 - fi 165.374 -
166.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 166.2 +++ b/openldap/stuff/patches/openldap-2.4.45-consolidated-1.patch Sat Feb 24 16:17:33 2018 +0200 166.3 @@ -0,0 +1,371 @@ 166.4 +Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org> 166.5 +Date: 2012-03-26 166.6 +Initial Package Version: 2.4.40 166.7 +Upstream Status: BLFS Specific 166.8 +Origin: Armin K. <krejzi at email dot com> and Debian 166.9 +Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot 166.10 + com dot br> for version 2.4.44 - 2016.02.06 166.11 + Rediffed by Pierre Labastie <pierre dot labastie at 166.12 + neuf dot fr> to add mdb backend and slapd.ldif. See 166.13 + ticket #7394 - 2016.02.24 166.14 +Description: Consolidate earlier patches to: 166.15 + 1. Update various installation options, such as ldap database path, 166.16 + configuration file options, slapd install location, etc. 166.17 + 2. Remove reference to bdb module 166.18 + 3. Enables symbol versioning in ldap libraries. Without these changes 166.19 + some applications might generate a warning about missing symbol versions. 166.20 + 166.21 +diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4 166.22 +--- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500 166.23 ++++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500 166.24 +@@ -1142,3 +1142,54 @@ 166.25 + #endif 166.26 + ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) 166.27 + ]) 166.28 ++ 166.29 ++dnl ==================================================================== 166.30 ++dnl check for symbol versioning support 166.31 ++AC_DEFUN([OL_SYMBOL_VERSIONING], 166.32 ++[AC_CACHE_CHECK([for .symver assembler directive], 166.33 ++ [ol_cv_asm_symver_directive],[ 166.34 ++cat > conftest.s <<EOF 166.35 ++${libc_cv_dot_text} 166.36 ++_sym: 166.37 ++.symver _sym,sym@VERS 166.38 ++EOF 166.39 ++if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then 166.40 ++ ol_cv_asm_symver_directive=yes 166.41 ++else 166.42 ++ ol_cv_asm_symver_directive=no 166.43 ++fi 166.44 ++rm -f conftest*]) 166.45 ++AC_CACHE_CHECK([for ld --version-script], 166.46 ++ [ol_cv_ld_version_script_option],[ 166.47 ++if test $ol_cv_asm_symver_directive = yes; then 166.48 ++ cat > conftest.s <<EOF 166.49 ++${libc_cv_dot_text} 166.50 ++_sym: 166.51 ++.symver _sym,sym@VERS 166.52 ++EOF 166.53 ++ cat > conftest.map <<EOF 166.54 ++VERS_1 { 166.55 ++ global: sym; 166.56 ++}; 166.57 ++ 166.58 ++VERS_2 { 166.59 ++ global: sym; 166.60 ++} VERS_1; 166.61 ++EOF 166.62 ++ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then 166.63 ++ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared 166.64 ++ -o conftest.so conftest.o 166.65 ++ -Wl,--version-script,conftest.map 166.66 ++ 1>&AS_MESSAGE_LOG_FD]); 166.67 ++ then 166.68 ++ ol_cv_ld_version_script_option=yes 166.69 ++ else 166.70 ++ ol_cv_ld_version_script_option=no 166.71 ++ fi 166.72 ++ else 166.73 ++ ol_cv_ld_version_script_option=no 166.74 ++ fi 166.75 ++else 166.76 ++ ol_cv_ld_version_script_option=no 166.77 ++fi 166.78 ++rm -f conftest*])]) 166.79 +diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk 166.80 +--- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500 166.81 ++++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500 166.82 +@@ -104,6 +104,9 @@ 166.83 + # LINK_LIBS referenced in library and module link commands. 166.84 + LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) 166.85 + 166.86 ++# option to pass to $(CC) to support library symbol versioning, if any 166.87 ++VERSION_OPTION = @VERSION_OPTION@ 166.88 ++ 166.89 + LTSTATIC = @LTSTATIC@ 166.90 + 166.91 + LTLINK = $(LIBTOOL) --mode=link \ 166.92 +@@ -113,7 +116,7 @@ 166.93 + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c 166.94 + 166.95 + LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ 166.96 +- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) 166.97 ++ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS) 166.98 + 166.99 + LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ 166.100 + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c 166.101 +diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in 166.102 +--- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500 166.103 ++++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500 166.104 +@@ -1916,6 +1916,13 @@ 166.105 + fi 166.106 + AC_SUBST(LTSTATIC)dnl 166.107 + 166.108 ++VERSION_OPTION="" 166.109 ++OL_SYMBOL_VERSIONING 166.110 ++if test $ol_cv_ld_version_script_option = yes ; then 166.111 ++ VERSION_OPTION="-Wl,--version-script=" 166.112 ++fi 166.113 ++AC_SUBST(VERSION_OPTION) 166.114 ++ 166.115 + dnl ---------------------------------------------------------------- 166.116 + if test $ol_enable_wrappers != no ; then 166.117 + AC_CHECK_HEADERS(tcpd.h,[ 166.118 +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5 166.119 +--- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500 166.120 ++++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500 166.121 +@@ -135,7 +135,7 @@ 166.122 + associated indexes live. 166.123 + A separate directory must be specified for each database. 166.124 + The default is 166.125 +-.BR LOCALSTATEDIR/openldap\-data . 166.126 ++.BR LOCALSTATEDIR/lib/openldap . 166.127 + .TP 166.128 + .B dirtyread 166.129 + Allow reads of modified but not yet committed data. 166.130 +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5 166.131 +--- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500 166.132 ++++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500 166.133 +@@ -2051,7 +2051,7 @@ 166.134 + # The database directory MUST exist prior to 166.135 + # running slapd AND should only be accessible 166.136 + # by the slapd/tools. Mode 0700 recommended. 166.137 +-olcDbDirectory: LOCALSTATEDIR/openldap\-data 166.138 ++olcDbDirectory: LOCALSTATEDIR/lib/openldap 166.139 + # Indices to maintain 166.140 + olcDbIndex: objectClass eq 166.141 + olcDbIndex: cn,sn,mail pres,eq,approx,sub 166.142 +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5 166.143 +--- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500 166.144 ++++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500 166.145 +@@ -2021,7 +2021,7 @@ 166.146 + # The database directory MUST exist prior to 166.147 + # running slapd AND should only be accessible 166.148 + # by the slapd/tools. Mode 0700 recommended. 166.149 +-directory LOCALSTATEDIR/openldap\-data 166.150 ++directory LOCALSTATEDIR/lib/openldap 166.151 + # Indices to maintain 166.152 + index objectClass eq 166.153 + index cn,sn,mail pres,eq,approx,sub 166.154 +diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h 166.155 +--- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500 166.156 ++++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500 166.157 +@@ -39,7 +39,7 @@ 166.158 + #define LDAP_ENV_PREFIX "LDAP" 166.159 + 166.160 + /* default ldapi:// socket */ 166.161 +-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" 166.162 ++#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" 166.163 + 166.164 + /* 166.165 + * SLAPD DEFINITIONS 166.166 +@@ -47,7 +47,7 @@ 166.167 + /* location of the default slapd config file */ 166.168 + #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" 166.169 + #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" 166.170 +-#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" 166.171 ++#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" 166.172 + #define SLAPD_DEFAULT_DB_MODE 0600 166.173 + #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" 166.174 + /* default max deref depth for aliases */ 166.175 +diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in 166.176 +--- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500 166.177 ++++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500 166.178 +@@ -38,6 +38,9 @@ 166.179 + XXLIBS = 166.180 + NT_LINK_LIBS = $(AC_LIBS) 166.181 + UNIX_LINK_LIBS = $(AC_LIBS) 166.182 ++ifneq (,$(VERSION_OPTION)) 166.183 ++ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map" 166.184 ++endif 166.185 + 166.186 + dtest: $(XLIBS) dtest.o 166.187 + $(LTLINK) -o $@ dtest.o $(LIBS) 166.188 +@@ -48,6 +51,6 @@ 166.189 + 166.190 + install-local: FORCE 166.191 + -$(MKDIR) $(DESTDIR)$(libdir) 166.192 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 166.193 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 166.194 + $(LTFINISH) $(DESTDIR)$(libdir) 166.195 + 166.196 +diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map 166.197 +--- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600 166.198 ++++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500 166.199 +@@ -0,0 +1,8 @@ 166.200 ++OPENLDAP_2.4_2 { 166.201 ++ global: 166.202 ++ ber_*; 166.203 ++ der_alloc; 166.204 ++ lutil_*; 166.205 ++ local: 166.206 ++ *; 166.207 ++}; 166.208 +diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in 166.209 +--- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500 166.210 ++++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500 166.211 +@@ -52,6 +52,9 @@ 166.212 + XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) 166.213 + NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 166.214 + UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 166.215 ++ifneq (,$(VERSION_OPTION)) 166.216 ++ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map 166.217 ++endif 166.218 + 166.219 + apitest: $(XLIBS) apitest.o 166.220 + $(LTLINK) -o $@ apitest.o $(LIBS) 166.221 +@@ -68,7 +71,7 @@ 166.222 + 166.223 + install-local: $(CFFILES) FORCE 166.224 + -$(MKDIR) $(DESTDIR)$(libdir) 166.225 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 166.226 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 166.227 + $(LTFINISH) $(DESTDIR)$(libdir) 166.228 + -$(MKDIR) $(DESTDIR)$(sysconfdir) 166.229 + @for i in $(CFFILES); do \ 166.230 +diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map 166.231 +--- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600 166.232 ++++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500 166.233 +@@ -0,0 +1,7 @@ 166.234 ++OPENLDAP_2.4_2 { 166.235 ++ global: 166.236 ++ ldap_*; 166.237 ++ ldif_*; 166.238 ++ local: 166.239 ++ *; 166.240 ++}; 166.241 +diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in 166.242 +--- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500 166.243 ++++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500 166.244 +@@ -61,6 +61,9 @@ 166.245 + XXXLIBS = $(LTHREAD_LIBS) 166.246 + NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 166.247 + UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) 166.248 ++ifneq (,$(VERSION_OPTION)) 166.249 ++ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map" 166.250 ++endif 166.251 + 166.252 + .links : Makefile 166.253 + @for i in $(XXSRCS); do \ 166.254 +@@ -83,6 +86,6 @@ 166.255 + 166.256 + install-local: $(CFFILES) FORCE 166.257 + -$(MKDIR) $(DESTDIR)$(libdir) 166.258 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 166.259 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 166.260 + $(LTFINISH) $(DESTDIR)$(libdir) 166.261 + 166.262 +diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in 166.263 +--- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500 166.264 ++++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500 166.265 +@@ -376,10 +376,10 @@ 166.266 + install-conf install-dbc-maybe install-schema install-tools 166.267 + 166.268 + install-slapd: FORCE 166.269 +- -$(MKDIR) $(DESTDIR)$(libexecdir) 166.270 ++ -$(MKDIR) $(DESTDIR)$(sbindir) 166.271 + -$(MKDIR) $(DESTDIR)$(localstatedir)/run 166.272 + $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ 166.273 +- slapd$(EXEEXT) $(DESTDIR)$(libexecdir) 166.274 ++ slapd$(EXEEXT) $(DESTDIR)$(sbindir) 166.275 + @for i in $(SUBDIRS); do \ 166.276 + if test -d $$i && test -f $$i/Makefile ; then \ 166.277 + echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ 166.278 +@@ -445,9 +445,9 @@ 166.279 + 166.280 + install-db-config: FORCE 166.281 + @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) 166.282 +- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data 166.283 ++ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap 166.284 + $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ 166.285 +- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example 166.286 ++ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example 166.287 + $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ 166.288 + $(DESTDIR)$(sysconfdir)/DB_CONFIG.example 166.289 + 166.290 +@@ -455,6 +455,6 @@ 166.291 + -$(MKDIR) $(DESTDIR)$(sbindir) 166.292 + for i in $(SLAPTOOLS); do \ 166.293 + $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 166.294 +- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 166.295 ++ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 166.296 + done 166.297 + 166.298 +diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf 166.299 +--- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100 166.300 ++++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100 166.301 +@@ -10,12 +10,12 @@ 166.302 + # service AND an understanding of referrals. 166.303 + #referral ldap://root.openldap.org 166.304 + 166.305 +-pidfile %LOCALSTATEDIR%/run/slapd.pid 166.306 +-argsfile %LOCALSTATEDIR%/run/slapd.args 166.307 ++pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid 166.308 ++argsfile %LOCALSTATEDIR%/run/openldap/slapd.args 166.309 + 166.310 + # Load dynamic backend modules: 166.311 +-# modulepath %MODULEDIR% 166.312 +-# moduleload back_mdb.la 166.313 ++modulepath %MODULEDIR% 166.314 ++moduleload back_mdb.la 166.315 + # moduleload back_ldap.la 166.316 + 166.317 + # Sample security restrictions 166.318 +@@ -60,6 +60,6 @@ 166.319 + # The database directory MUST exist prior to running slapd AND 166.320 + # should only be accessible by the slapd and slap tools. 166.321 + # Mode 700 recommended. 166.322 +-directory %LOCALSTATEDIR%/openldap-data 166.323 ++directory %LOCALSTATEDIR%/lib/openldap 166.324 + # Indices to maintain 166.325 + index objectClass eq 166.326 +diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif 166.327 +--- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100 166.328 ++++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100 166.329 +@@ -9,8 +9,8 @@ 166.330 + # 166.331 + # Define global ACLs to disable default read access. 166.332 + # 166.333 +-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args 166.334 +-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid 166.335 ++olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args 166.336 ++olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid 166.337 + # 166.338 + # Do not enable referrals until AFTER you have a working directory 166.339 + # service AND an understanding of referrals. 166.340 +@@ -26,10 +26,11 @@ 166.341 + # 166.342 + # Load dynamic backend modules: 166.343 + # 166.344 +-#dn: cn=module,cn=config 166.345 +-#objectClass: olcModuleList 166.346 +-#cn: module 166.347 +-#olcModulepath: %MODULEDIR% 166.348 ++dn: cn=module,cn=config 166.349 ++objectClass: olcModuleList 166.350 ++cn: module 166.351 ++olcModulepath: %MODULEDIR% 166.352 ++olcModuleload: back_mdb.la 166.353 + #olcModuleload: back_bdb.la 166.354 + #olcModuleload: back_hdb.la 166.355 + #olcModuleload: back_ldap.la 166.356 +@@ -90,6 +91,6 @@ 166.357 + # The database directory MUST exist prior to running slapd AND 166.358 + # should only be accessible by the slapd and slap tools. 166.359 + # Mode 700 recommended. 166.360 +-olcDbDirectory: %LOCALSTATEDIR%/openldap-data 166.361 ++olcDbDirectory: %LOCALSTATEDIR%/lib/openldap 166.362 + # Indices to maintain 166.363 + olcDbIndex: objectClass eq 166.364 +diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in 166.365 +--- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500 166.366 ++++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500 166.367 +@@ -46,6 +46,6 @@ 166.368 + install-local: FORCE 166.369 + if test "$(BUILD_MOD)" = "yes"; then \ 166.370 + $(MKDIR) $(DESTDIR)$(libdir); \ 166.371 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \ 166.372 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \ 166.373 + fi 166.374 +
167.1 --- a/openldap/stuff/patches/series Sat Feb 24 10:43:01 2018 +0200 167.2 +++ b/openldap/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 167.3 @@ -1,1 +1,1 @@ 167.4 -openldap-2.4.44-consolidated-2.patch 167.5 +openldap-2.4.45-consolidated-1.patch # BLFS
168.1 --- a/opensp/receipt Sat Feb 24 10:43:01 2018 +0200 168.2 +++ b/opensp/receipt Sat Feb 24 16:17:33 2018 +0200 168.3 @@ -14,12 +14,10 @@ 168.4 BUILD_DEPENDS="perl gfortran gettext docbook-sgml" 168.5 SPLIT="opensp-dev" 168.6 168.7 -# Rules to configure and make the package. 168.8 -compile_rules() 168.9 -{ 168.10 - sed -i 's/32,/253,/' lib/Syntax.cxx && 168.11 +compile_rules() { 168.12 + sed -i 's/32,/253,/' lib/Syntax.cxx 168.13 sed -i 's/LITLEN 240 /LITLEN 8092/' \ 168.14 - unicode/gensyntax.pl unicode/unicode.syn && 168.15 + unicode/gensyntax.pl unicode/unicode.syn 168.16 168.17 ./configure \ 168.18 --disable-static \ 168.19 @@ -32,18 +30,16 @@ 168.20 make pkgdatadir=/usr/share/sgml/OpenSP-$VERSION && 168.21 make pkgdatadir=/usr/share/sgml/OpenSP-$VERSION \ 168.22 docdir=/usr/share/doc/OpenSP-$VERSION \ 168.23 - install && 168.24 + install || return 1 168.25 168.26 for i in nsgmls sgmlnorm spam spcat spent sx; do 168.27 ln -vsf o$i $install/usr/bin/$i 168.28 - done && 168.29 - ln -vsf osx $install/usr/bin/sgml2xml && 168.30 + done 168.31 + ln -vsf osx $install/usr/bin/sgml2xml 168.32 ln -vsf libosp.so $install/usr/lib/libsp.so 168.33 } 168.34 168.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 168.36 -genpkg_rules() 168.37 -{ 168.38 +genpkg_rules() { 168.39 case $PACKAGE in 168.40 opensp) copy @std;; 168.41 *-dev) copy @dev;;
169.1 --- a/openssl/receipt Sat Feb 24 10:43:01 2018 +0200 169.2 +++ b/openssl/receipt Sat Feb 24 16:17:33 2018 +0200 169.3 @@ -1,85 +1,65 @@ 169.4 # SliTaz package receipt v2. 169.5 169.6 PACKAGE="openssl" 169.7 -VERSION="1.0.2l" 169.8 +VERSION="1.1.0g" 169.9 CATEGORY="security" 169.10 SHORT_DESC="Open source Secure Sockets Layer" 169.11 MAINTAINER="pascal.bellard@slitaz.org" 169.12 LICENSE="BSD" 169.13 WEB_SITE="https://www.openssl.org/" 169.14 -TAGS="ssl security" 169.15 -HOST_ARCH="i486 arm" 169.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/openssl.html" 169.17 169.18 TARBALL="$PACKAGE-$VERSION.tar.gz" 169.19 WGET_URL="https://www.openssl.org/source/$TARBALL" 169.20 # Integrity check: https://www.openssl.org/source/ 169.21 -TARBALL_SHA256="ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c" 169.22 +TARBALL_SHA256="de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af" 169.23 169.24 +BUILD_DEPENDS_arm=" " 169.25 BUILD_DEPENDS="perl zlib-dev" 169.26 -BUILD_DEPENDS_arm=" " 169.27 -SPLIT="libcrypto libcrypto-dev libssl openssl-dev" 169.28 +SPLIT="openssl openssl-dev" 169.29 169.30 -# Rules to configure and make the package. 169.31 -compile_rules() 169.32 -{ 169.33 - # MAKEFLAGS make openssl build fail. 169.34 - unset MAKEFLAGS 169.35 +compile_rules() { 169.36 + # MAKEFLAGS make OpenSSL build fail. 169.37 + unset MAKEFLAGS MAKE_ARGS 169.38 169.39 # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be 169.40 # marked as not requiring an executable stack (compatibility improvement). 169.41 case "$ARCH" in 169.42 - arm) 169.43 - # BUG: shared libs are not built 169.44 - ./Configure --prefix=/usr --openssldir=/etc/ssl \ 169.45 - shared zlib enable-md2 -Wa,--noexecstack \ 169.46 - linux-armv4 && 169.47 - sed -i 's/\(basename .*\)`/\1 || true `/' Makefile && 169.48 - make \ 169.49 - CC=${HOST_SYSTEM}-gcc \ 169.50 - AR="${HOST_SYSTEM}-ar r" \ 169.51 - RANLIB=${HOST_SYSTEM}-ranlib ;; 169.52 - i486) 169.53 - ./config --prefix=/usr --openssldir=/etc/ssl \ 169.54 - shared zlib zlib-dynamic enable-md2 -Wa,--noexecstack && 169.55 - make depend ;; 169.56 - esac && 169.57 - # Install 169.58 - make INSTALL_PREFIX=$DESTDIR \ 169.59 - MANDIR=/usr/share/man CC=${HOST_SYSTEM}-gcc install 169.60 + arm*) ARCH_ARGS='linux-armv4' 169.61 + MAKE_ARGS="CC=$HOST_SYSTEM-gcc AR=\"$HOST_SYSTEM-ar r\" RANLIB=$HOST_SYSTEM-ranlib";; 169.62 + i?86) ARCH_ARGS='zlib-dynamic linux-elf';; 169.63 + x86_64) ARCH_ARGS='zlib-dynamic enable-ec_nistp_64_gcc_128 linux-x86_64';; 169.64 + esac 169.65 + 169.66 + ./Configure \ 169.67 + --prefix=/usr \ 169.68 + --openssldir=/etc/ssl \ 169.69 + --libdir=lib \ 169.70 + shared zlib enable-md2 no-ssl3-method $ARCH_ARGS \ 169.71 + "-Wa,--noexecstack $CPPFLAGS $CFLAGS $LDFLAGS" && 169.72 + 169.73 + make depend && 169.74 + make $MAKE_ARGS -j1 && 169.75 + make \ 169.76 + DESTDIR=$install \ 169.77 + MANDIR=/usr/share/man \ 169.78 + install_sw install_ssldirs install_man_docs 169.79 } 169.80 169.81 -testsuite() 169.82 -{ 169.83 +testsuite() { 169.84 readelf -h $install/usr/bin/openssl 169.85 } 169.86 169.87 -# Rules to gen a SliTaz package suitable for Tazpkg. 169.88 -genpkg_rules() 169.89 -{ 169.90 +genpkg_rules() { 169.91 case $PACKAGE in 169.92 openssl) 169.93 - copy etc/ bin/ engines/ 169.94 - DEPENDS="libcrypto libssl" 169.95 - ;; 169.96 - libcrypto) 169.97 - copy libcrypto*.so* 169.98 - DEPENDS=" " 169.99 - CAT="security|general purpose cryptographic library" 169.100 - ;; 169.101 - libcrypto-dev) 169.102 - copy libcrypto*.a libcrypto*.pc 169.103 - DEPENDS="pkg-config" 169.104 - CAT="development|general purpose cryptographic library, development files" 169.105 - ;; 169.106 - libssl) 169.107 - copy libssl.so* 169.108 - DEPENDS="libcrypto" 169.109 - CAT="security|OpenSSL libraries" 169.110 + copy @std 169.111 + PROVIDE="libcrypto libssl" 169.112 + TAGS="SSL security" 169.113 ;; 169.114 openssl-dev) 169.115 copy @dev 169.116 - find $fs -name 'libcrypto*' -delete 169.117 - DEPENDS="libcrypto-dev pkg-config" 169.118 + PROVIDE="libcrypto-dev" 169.119 ;; 169.120 esac 169.121 }
170.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 170.2 +++ b/openssl/stuff/patches/ca-dir.patch Sat Feb 24 16:17:33 2018 +0200 170.3 @@ -0,0 +1,31 @@ 170.4 +--- apps/CA.pl.in 2016-09-26 11:46:04.000000000 +0200 170.5 ++++ apps/CA.pl.in 2016-11-01 16:02:16.709616823 +0100 170.6 +@@ -33,7 +33,7 @@ 170.7 + my $PKCS12 = "$openssl pkcs12"; 170.8 + 170.9 + # default openssl.cnf file has setup as per the following 170.10 +-my $CATOP = "./demoCA"; 170.11 ++my $CATOP = "/etc/ssl"; 170.12 + my $CAKEY = "cakey.pem"; 170.13 + my $CAREQ = "careq.pem"; 170.14 + my $CACERT = "cacert.pem"; 170.15 +--- apps/openssl.cnf 2016-09-26 11:46:04.000000000 +0200 170.16 ++++ apps/openssl.cnf 2016-11-01 16:02:48.378503427 +0100 170.17 +@@ -39,7 +39,7 @@ 170.18 + #################################################################### 170.19 + [ CA_default ] 170.20 + 170.21 +-dir = ./demoCA # Where everything is kept 170.22 ++dir = /etc/ssl # Where everything is kept 170.23 + certs = $dir/certs # Where the issued certs are kept 170.24 + crl_dir = $dir/crl # Where the issued crl are kept 170.25 + database = $dir/index.txt # database index file. 170.26 +@@ -323,7 +323,7 @@ 170.27 + [ tsa_config1 ] 170.28 + 170.29 + # These are used by the TSA reply generation only. 170.30 +-dir = ./demoCA # TSA root directory 170.31 ++dir = /etc/ssl # TSA root directory 170.32 + serial = $dir/tsaserial # The current serial number (mandatory) 170.33 + crypto_device = builtin # OpenSSL engine to use for signing 170.34 + signer_cert = $dir/tsacert.pem # The TSA signing certificate
171.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 171.2 +++ b/openssl/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 171.3 @@ -0,0 +1,4 @@ 171.4 +# https://www.archlinux.org/packages/core/x86_64/openssl/ 171.5 + 171.6 +# set ca dir to /etc/ssl by default 171.7 +-p0|ca-dir.patch
172.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 172.2 +++ b/openssl10/receipt Sat Feb 24 16:17:33 2018 +0200 172.3 @@ -0,0 +1,83 @@ 172.4 +# SliTaz package receipt v2. 172.5 + 172.6 +PACKAGE="openssl10" 172.7 +VERSION="1.0.2n" 172.8 +CATEGORY="security" 172.9 +SHORT_DESC="Open source Secure Sockets Layer" 172.10 +MAINTAINER="pascal.bellard@slitaz.org" 172.11 +LICENSE="BSD" 172.12 +WEB_SITE="https://www.openssl.org/" 172.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/openssl10.html" 172.14 + 172.15 +TARBALL="openssl-$VERSION.tar.gz" 172.16 +WGET_URL="https://www.openssl.org/source/$TARBALL" 172.17 +# Integrity check: https://www.openssl.org/source/ 172.18 +TARBALL_SHA256="370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe" 172.19 + 172.20 +BUILD_DEPENDS_arm=" " 172.21 +BUILD_DEPENDS="perl zlib-dev" 172.22 +SPLIT="openssl10 openssl10-dev" 172.23 + 172.24 +compile_rules() { 172.25 + # MAKEFLAGS make OpenSSL build fail. 172.26 + unset MAKEFLAGS MAKE_ARGS 172.27 + 172.28 + # Add -Wa,--noexecstack here so that libcrypto's assembler modules will be 172.29 + # marked as not requiring an executable stack (compatibility improvement). 172.30 + case "$ARCH" in 172.31 + arm*) ARCH_ARGS='linux-armv4' 172.32 + MAKE_ARGS="CC=$HOST_SYSTEM-gcc AR=\"$HOST_SYSTEM-ar r\" RANLIB=$HOST_SYSTEM-ranlib";; 172.33 + i?86) ARCH_ARGS='zlib-dynamic linux-elf';; 172.34 + x86_64) ARCH_ARGS='zlib-dynamic enable-ec_nistp_64_gcc_128 linux-x86_64';; 172.35 + esac 172.36 + 172.37 + ./Configure \ 172.38 + --prefix=/usr \ 172.39 + --openssldir=/etc/ssl \ 172.40 + --libdir=lib/openssl-1.0 \ 172.41 + shared zlib enable-md2 no-ssl3-method $ARCH_ARGS \ 172.42 + "-Wa,--noexecstack $CPPFLAGS $CFLAGS $LDFLAGS" && 172.43 + 172.44 + make depend && 172.45 + make $MAKE_ARGS -j1 && 172.46 + make \ 172.47 + CC=${HOST_SYSTEM}-gcc \ 172.48 + INSTALL_PREFIX=$install \ 172.49 + install_sw || return 1 172.50 + 172.51 + mv $install/usr/bin/openssl $install/usr/bin/openssl-1.0 172.52 + 172.53 + mv $install/usr/lib/openssl-1.0/libcrypto.so.1.0.0 $install/usr/lib 172.54 + mv $install/usr/lib/openssl-1.0/libssl.so.1.0.0 $install/usr/lib 172.55 + ln -s ../libssl.so.1.0.0 $install/usr/lib/openssl-1.0 172.56 + ln -s ../libcrypto.so.1.0.0 $install/usr/lib/openssl-1.0 172.57 + 172.58 + mkdir -p $install/usr/include/openssl-1.0 172.59 + mv $install/usr/include/openssl $install/usr/include/openssl-1.0 172.60 + 172.61 + sed -i 's|/include$|/include/openssl-1.0|' \ 172.62 + $install/usr/lib/openssl-1.0/pkgconfig/*.pc 172.63 + 172.64 + rm -rf $install/etc $install/usr/bin/c_rehash 172.65 + 172.66 + # change mode 0555 -> 0755 172.67 + find $install -type f -name '*.so*' -exec chmod 0755 '{}' \; 172.68 +} 172.69 + 172.70 +testsuite() { 172.71 + readelf -h $install/usr/bin/openssl* 172.72 +} 172.73 + 172.74 +genpkg_rules() { 172.75 + case $PACKAGE in 172.76 + openssl10) 172.77 + copy @std 172.78 + CAT="security|v. 1.0" 172.79 + TAGS="SSL security" 172.80 + ;; 172.81 + openssl10-dev) 172.82 + copy @dev 172.83 + CAT="development|v. 1.0 development files" 172.84 + ;; 172.85 + esac 172.86 +}
173.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 173.2 +++ b/openssl10/stuff/patches/no-rpath.patch Sat Feb 24 16:17:33 2018 +0200 173.3 @@ -0,0 +1,11 @@ 173.4 +--- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 173.5 ++++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 173.6 +@@ -153,7 +153,7 @@ 173.7 + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ 173.8 + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" 173.9 + 173.10 +-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" 173.11 ++DO_GNU_APP=LDFLAGS="$(CFLAGS)" 173.12 + 173.13 + #This is rather special. It's a special target with which one can link 173.14 + #applications without bothering with any features that have anything to
174.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 174.2 +++ b/openssl10/stuff/patches/openssl-1.0-versioned-symbols.patch Sat Feb 24 16:17:33 2018 +0200 174.3 @@ -0,0 +1,4667 @@ 174.4 +--- 174.5 + Configure | 2 174.6 + engines/ccgost/openssl.ld | 10 174.7 + engines/openssl.ld | 10 174.8 + openssl.ld | 4620 ++++++++++++++++++++++++++++++++++++++++++++++ 174.9 + 4 files changed, 4642 insertions(+) 174.10 + 174.11 +--- a/Configure 174.12 ++++ b/Configure 174.13 +@@ -1730,6 +1730,8 @@ if ($strict_warnings) 174.14 + } 174.15 + } 174.16 + 174.17 ++$shared_ldflag .= " -Wl,--version-script=openssl.ld"; 174.18 ++ 174.19 + open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; 174.20 + unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; 174.21 + open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; 174.22 +--- /dev/null 174.23 ++++ b/engines/ccgost/openssl.ld 174.24 +@@ -0,0 +1,10 @@ 174.25 ++OPENSSL_1.0.0 { 174.26 ++ global: 174.27 ++ bind_engine; 174.28 ++ v_check; 174.29 ++ OPENSSL_init; 174.30 ++ OPENSSL_finish; 174.31 ++ local: 174.32 ++ *; 174.33 ++}; 174.34 ++ 174.35 +--- /dev/null 174.36 ++++ b/engines/openssl.ld 174.37 +@@ -0,0 +1,10 @@ 174.38 ++OPENSSL_1.0.0 { 174.39 ++ global: 174.40 ++ bind_engine; 174.41 ++ v_check; 174.42 ++ OPENSSL_init; 174.43 ++ OPENSSL_finish; 174.44 ++ local: 174.45 ++ *; 174.46 ++}; 174.47 ++ 174.48 +--- /dev/null 174.49 ++++ b/openssl.ld 174.50 +@@ -0,0 +1,4620 @@ 174.51 ++OPENSSL_1.0.0 { 174.52 ++ global: 174.53 ++ BIO_f_ssl; 174.54 ++ BIO_new_buffer_ssl_connect; 174.55 ++ BIO_new_ssl; 174.56 ++ BIO_new_ssl_connect; 174.57 ++ BIO_proxy_ssl_copy_session_id; 174.58 ++ BIO_ssl_copy_session_id; 174.59 ++ BIO_ssl_shutdown; 174.60 ++ d2i_SSL_SESSION; 174.61 ++ DTLSv1_client_method; 174.62 ++ DTLSv1_method; 174.63 ++ DTLSv1_server_method; 174.64 ++ ERR_load_SSL_strings; 174.65 ++ i2d_SSL_SESSION; 174.66 ++ kssl_build_principal_2; 174.67 ++ kssl_cget_tkt; 174.68 ++ kssl_check_authent; 174.69 ++ kssl_ctx_free; 174.70 ++ kssl_ctx_new; 174.71 ++ kssl_ctx_setkey; 174.72 ++ kssl_ctx_setprinc; 174.73 ++ kssl_ctx_setstring; 174.74 ++ kssl_ctx_show; 174.75 ++ kssl_err_set; 174.76 ++ kssl_krb5_free_data_contents; 174.77 ++ kssl_sget_tkt; 174.78 ++ kssl_skip_confound; 174.79 ++ kssl_validate_times; 174.80 ++ PEM_read_bio_SSL_SESSION; 174.81 ++ PEM_read_SSL_SESSION; 174.82 ++ PEM_write_bio_SSL_SESSION; 174.83 ++ PEM_write_SSL_SESSION; 174.84 ++ SSL_accept; 174.85 ++ SSL_add_client_CA; 174.86 ++ SSL_add_dir_cert_subjects_to_stack; 174.87 ++ SSL_add_dir_cert_subjs_to_stk; 174.88 ++ SSL_add_file_cert_subjects_to_stack; 174.89 ++ SSL_add_file_cert_subjs_to_stk; 174.90 ++ SSL_alert_desc_string; 174.91 ++ SSL_alert_desc_string_long; 174.92 ++ SSL_alert_type_string; 174.93 ++ SSL_alert_type_string_long; 174.94 ++ SSL_callback_ctrl; 174.95 ++ SSL_check_private_key; 174.96 ++ SSL_CIPHER_description; 174.97 ++ SSL_CIPHER_get_bits; 174.98 ++ SSL_CIPHER_get_name; 174.99 ++ SSL_CIPHER_get_version; 174.100 ++ SSL_clear; 174.101 ++ SSL_COMP_add_compression_method; 174.102 ++ SSL_COMP_get_compression_methods; 174.103 ++ SSL_COMP_get_compress_methods; 174.104 ++ SSL_COMP_get_name; 174.105 ++ SSL_connect; 174.106 ++ SSL_copy_session_id; 174.107 ++ SSL_ctrl; 174.108 ++ SSL_CTX_add_client_CA; 174.109 ++ SSL_CTX_add_session; 174.110 ++ SSL_CTX_callback_ctrl; 174.111 ++ SSL_CTX_check_private_key; 174.112 ++ SSL_CTX_ctrl; 174.113 ++ SSL_CTX_flush_sessions; 174.114 ++ SSL_CTX_free; 174.115 ++ SSL_CTX_get_cert_store; 174.116 ++ SSL_CTX_get_client_CA_list; 174.117 ++ SSL_CTX_get_client_cert_cb; 174.118 ++ SSL_CTX_get_ex_data; 174.119 ++ SSL_CTX_get_ex_new_index; 174.120 ++ SSL_CTX_get_info_callback; 174.121 ++ SSL_CTX_get_quiet_shutdown; 174.122 ++ SSL_CTX_get_timeout; 174.123 ++ SSL_CTX_get_verify_callback; 174.124 ++ SSL_CTX_get_verify_depth; 174.125 ++ SSL_CTX_get_verify_mode; 174.126 ++ SSL_CTX_load_verify_locations; 174.127 ++ SSL_CTX_new; 174.128 ++ SSL_CTX_remove_session; 174.129 ++ SSL_CTX_sess_get_get_cb; 174.130 ++ SSL_CTX_sess_get_new_cb; 174.131 ++ SSL_CTX_sess_get_remove_cb; 174.132 ++ SSL_CTX_sessions; 174.133 ++ SSL_CTX_sess_set_get_cb; 174.134 ++ SSL_CTX_sess_set_new_cb; 174.135 ++ SSL_CTX_sess_set_remove_cb; 174.136 ++ SSL_CTX_set1_param; 174.137 ++ SSL_CTX_set_cert_store; 174.138 ++ SSL_CTX_set_cert_verify_callback; 174.139 ++ SSL_CTX_set_cert_verify_cb; 174.140 ++ SSL_CTX_set_cipher_list; 174.141 ++ SSL_CTX_set_client_CA_list; 174.142 ++ SSL_CTX_set_client_cert_cb; 174.143 ++ SSL_CTX_set_client_cert_engine; 174.144 ++ SSL_CTX_set_cookie_generate_cb; 174.145 ++ SSL_CTX_set_cookie_verify_cb; 174.146 ++ SSL_CTX_set_default_passwd_cb; 174.147 ++ SSL_CTX_set_default_passwd_cb_userdata; 174.148 ++ SSL_CTX_set_default_verify_paths; 174.149 ++ SSL_CTX_set_def_passwd_cb_ud; 174.150 ++ SSL_CTX_set_def_verify_paths; 174.151 ++ SSL_CTX_set_ex_data; 174.152 ++ SSL_CTX_set_generate_session_id; 174.153 ++ SSL_CTX_set_info_callback; 174.154 ++ SSL_CTX_set_msg_callback; 174.155 ++ SSL_CTX_set_psk_client_callback; 174.156 ++ SSL_CTX_set_psk_server_callback; 174.157 ++ SSL_CTX_set_purpose; 174.158 ++ SSL_CTX_set_quiet_shutdown; 174.159 ++ SSL_CTX_set_session_id_context; 174.160 ++ SSL_CTX_set_ssl_version; 174.161 ++ SSL_CTX_set_timeout; 174.162 ++ SSL_CTX_set_tmp_dh_callback; 174.163 ++ SSL_CTX_set_tmp_ecdh_callback; 174.164 ++ SSL_CTX_set_tmp_rsa_callback; 174.165 ++ SSL_CTX_set_trust; 174.166 ++ SSL_CTX_set_verify; 174.167 ++ SSL_CTX_set_verify_depth; 174.168 ++ SSL_CTX_use_cert_chain_file; 174.169 ++ SSL_CTX_use_certificate; 174.170 ++ SSL_CTX_use_certificate_ASN1; 174.171 ++ SSL_CTX_use_certificate_chain_file; 174.172 ++ SSL_CTX_use_certificate_file; 174.173 ++ SSL_CTX_use_PrivateKey; 174.174 ++ SSL_CTX_use_PrivateKey_ASN1; 174.175 ++ SSL_CTX_use_PrivateKey_file; 174.176 ++ SSL_CTX_use_psk_identity_hint; 174.177 ++ SSL_CTX_use_RSAPrivateKey; 174.178 ++ SSL_CTX_use_RSAPrivateKey_ASN1; 174.179 ++ SSL_CTX_use_RSAPrivateKey_file; 174.180 ++ SSL_do_handshake; 174.181 ++ SSL_dup; 174.182 ++ SSL_dup_CA_list; 174.183 ++ SSLeay_add_ssl_algorithms; 174.184 ++ SSL_free; 174.185 ++ SSL_get1_session; 174.186 ++ SSL_get_certificate; 174.187 ++ SSL_get_cipher_list; 174.188 ++ SSL_get_ciphers; 174.189 ++ SSL_get_client_CA_list; 174.190 ++ SSL_get_current_cipher; 174.191 ++ SSL_get_current_compression; 174.192 ++ SSL_get_current_expansion; 174.193 ++ SSL_get_default_timeout; 174.194 ++ SSL_get_error; 174.195 ++ SSL_get_ex_data; 174.196 ++ SSL_get_ex_data_X509_STORE_CTX_idx; 174.197 ++ SSL_get_ex_d_X509_STORE_CTX_idx; 174.198 ++ SSL_get_ex_new_index; 174.199 ++ SSL_get_fd; 174.200 ++ SSL_get_finished; 174.201 ++ SSL_get_info_callback; 174.202 ++ SSL_get_peer_cert_chain; 174.203 ++ SSL_get_peer_certificate; 174.204 ++ SSL_get_peer_finished; 174.205 ++ SSL_get_privatekey; 174.206 ++ SSL_get_psk_identity; 174.207 ++ SSL_get_psk_identity_hint; 174.208 ++ SSL_get_quiet_shutdown; 174.209 ++ SSL_get_rbio; 174.210 ++ SSL_get_read_ahead; 174.211 ++ SSL_get_rfd; 174.212 ++ SSL_get_servername; 174.213 ++ SSL_get_servername_type; 174.214 ++ SSL_get_session; 174.215 ++ SSL_get_shared_ciphers; 174.216 ++ SSL_get_shutdown; 174.217 ++ SSL_get_SSL_CTX; 174.218 ++ SSL_get_ssl_method; 174.219 ++ SSL_get_verify_callback; 174.220 ++ SSL_get_verify_depth; 174.221 ++ SSL_get_verify_mode; 174.222 ++ SSL_get_verify_result; 174.223 ++ SSL_get_version; 174.224 ++ SSL_get_wbio; 174.225 ++ SSL_get_wfd; 174.226 ++ SSL_has_matching_session_id; 174.227 ++ SSL_library_init; 174.228 ++ SSL_load_client_CA_file; 174.229 ++ SSL_load_error_strings; 174.230 ++ SSL_new; 174.231 ++ SSL_peek; 174.232 ++ SSL_pending; 174.233 ++ SSL_read; 174.234 ++ SSL_renegotiate; 174.235 ++ SSL_renegotiate_pending; 174.236 ++ SSL_rstate_string; 174.237 ++ SSL_rstate_string_long; 174.238 ++ SSL_SESSION_cmp; 174.239 ++ SSL_SESSION_free; 174.240 ++ SSL_SESSION_get_ex_data; 174.241 ++ SSL_SESSION_get_ex_new_index; 174.242 ++ SSL_SESSION_get_id; 174.243 ++ SSL_SESSION_get_time; 174.244 ++ SSL_SESSION_get_timeout; 174.245 ++ SSL_SESSION_hash; 174.246 ++ SSL_SESSION_new; 174.247 ++ SSL_SESSION_print; 174.248 ++ SSL_SESSION_print_fp; 174.249 ++ SSL_SESSION_set_ex_data; 174.250 ++ SSL_SESSION_set_time; 174.251 ++ SSL_SESSION_set_timeout; 174.252 ++ SSL_set1_param; 174.253 ++ SSL_set_accept_state; 174.254 ++ SSL_set_bio; 174.255 ++ SSL_set_cipher_list; 174.256 ++ SSL_set_client_CA_list; 174.257 ++ SSL_set_connect_state; 174.258 ++ SSL_set_ex_data; 174.259 ++ SSL_set_fd; 174.260 ++ SSL_set_generate_session_id; 174.261 ++ SSL_set_info_callback; 174.262 ++ SSL_set_msg_callback; 174.263 ++ SSL_set_psk_client_callback; 174.264 ++ SSL_set_psk_server_callback; 174.265 ++ SSL_set_purpose; 174.266 ++ SSL_set_quiet_shutdown; 174.267 ++ SSL_set_read_ahead; 174.268 ++ SSL_set_rfd; 174.269 ++ SSL_set_session; 174.270 ++ SSL_set_session_id_context; 174.271 ++ SSL_set_session_secret_cb; 174.272 ++ SSL_set_session_ticket_ext; 174.273 ++ SSL_set_session_ticket_ext_cb; 174.274 ++ SSL_set_shutdown; 174.275 ++ SSL_set_SSL_CTX; 174.276 ++ SSL_set_ssl_method; 174.277 ++ SSL_set_tmp_dh_callback; 174.278 ++ SSL_set_tmp_ecdh_callback; 174.279 ++ SSL_set_tmp_rsa_callback; 174.280 ++ SSL_set_trust; 174.281 ++ SSL_set_verify; 174.282 ++ SSL_set_verify_depth; 174.283 ++ SSL_set_verify_result; 174.284 ++ SSL_set_wfd; 174.285 ++ SSL_shutdown; 174.286 ++ SSL_state; 174.287 ++ SSL_state_string; 174.288 ++ SSL_state_string_long; 174.289 ++ SSL_use_certificate; 174.290 ++ SSL_use_certificate_ASN1; 174.291 ++ SSL_use_certificate_file; 174.292 ++ SSL_use_PrivateKey; 174.293 ++ SSL_use_PrivateKey_ASN1; 174.294 ++ SSL_use_PrivateKey_file; 174.295 ++ SSL_use_psk_identity_hint; 174.296 ++ SSL_use_RSAPrivateKey; 174.297 ++ SSL_use_RSAPrivateKey_ASN1; 174.298 ++ SSL_use_RSAPrivateKey_file; 174.299 ++ SSLv23_client_method; 174.300 ++ SSLv23_method; 174.301 ++ SSLv23_server_method; 174.302 ++ SSLv2_client_method; 174.303 ++ SSLv2_method; 174.304 ++ SSLv2_server_method; 174.305 ++ SSLv3_client_method; 174.306 ++ SSLv3_method; 174.307 ++ SSLv3_server_method; 174.308 ++ SSL_version; 174.309 ++ SSL_want; 174.310 ++ SSL_write; 174.311 ++ TLSv1_client_method; 174.312 ++ TLSv1_method; 174.313 ++ TLSv1_server_method; 174.314 ++ 174.315 ++ 174.316 ++ SSLeay; 174.317 ++ SSLeay_version; 174.318 ++ ASN1_BIT_STRING_asn1_meth; 174.319 ++ ASN1_HEADER_free; 174.320 ++ ASN1_HEADER_new; 174.321 ++ ASN1_IA5STRING_asn1_meth; 174.322 ++ ASN1_INTEGER_get; 174.323 ++ ASN1_INTEGER_set; 174.324 ++ ASN1_INTEGER_to_BN; 174.325 ++ ASN1_OBJECT_create; 174.326 ++ ASN1_OBJECT_free; 174.327 ++ ASN1_OBJECT_new; 174.328 ++ ASN1_PRINTABLE_type; 174.329 ++ ASN1_STRING_cmp; 174.330 ++ ASN1_STRING_dup; 174.331 ++ ASN1_STRING_free; 174.332 ++ ASN1_STRING_new; 174.333 ++ ASN1_STRING_print; 174.334 ++ ASN1_STRING_set; 174.335 ++ ASN1_STRING_type_new; 174.336 ++ ASN1_TYPE_free; 174.337 ++ ASN1_TYPE_new; 174.338 ++ ASN1_UNIVERSALSTRING_to_string; 174.339 ++ ASN1_UTCTIME_check; 174.340 ++ ASN1_UTCTIME_print; 174.341 ++ ASN1_UTCTIME_set; 174.342 ++ ASN1_check_infinite_end; 174.343 ++ ASN1_d2i_bio; 174.344 ++ ASN1_d2i_fp; 174.345 ++ ASN1_digest; 174.346 ++ ASN1_dup; 174.347 ++ ASN1_get_object; 174.348 ++ ASN1_i2d_bio; 174.349 ++ ASN1_i2d_fp; 174.350 ++ ASN1_object_size; 174.351 ++ ASN1_parse; 174.352 ++ ASN1_put_object; 174.353 ++ ASN1_sign; 174.354 ++ ASN1_verify; 174.355 ++ BF_cbc_encrypt; 174.356 ++ BF_cfb64_encrypt; 174.357 ++ BF_ecb_encrypt; 174.358 ++ BF_encrypt; 174.359 ++ BF_ofb64_encrypt; 174.360 ++ BF_options; 174.361 ++ BF_set_key; 174.362 ++ BIO_CONNECT_free; 174.363 ++ BIO_CONNECT_new; 174.364 ++ BIO_accept; 174.365 ++ BIO_ctrl; 174.366 ++ BIO_int_ctrl; 174.367 ++ BIO_debug_callback; 174.368 ++ BIO_dump; 174.369 ++ BIO_dup_chain; 174.370 ++ BIO_f_base64; 174.371 ++ BIO_f_buffer; 174.372 ++ BIO_f_cipher; 174.373 ++ BIO_f_md; 174.374 ++ BIO_f_null; 174.375 ++ BIO_f_proxy_server; 174.376 ++ BIO_fd_non_fatal_error; 174.377 ++ BIO_fd_should_retry; 174.378 ++ BIO_find_type; 174.379 ++ BIO_free; 174.380 ++ BIO_free_all; 174.381 ++ BIO_get_accept_socket; 174.382 ++ BIO_get_filter_bio; 174.383 ++ BIO_get_host_ip; 174.384 ++ BIO_get_port; 174.385 ++ BIO_get_retry_BIO; 174.386 ++ BIO_get_retry_reason; 174.387 ++ BIO_gethostbyname; 174.388 ++ BIO_gets; 174.389 ++ BIO_new; 174.390 ++ BIO_new_accept; 174.391 ++ BIO_new_connect; 174.392 ++ BIO_new_fd; 174.393 ++ BIO_new_file; 174.394 ++ BIO_new_fp; 174.395 ++ BIO_new_socket; 174.396 ++ BIO_pop; 174.397 ++ BIO_printf; 174.398 ++ BIO_push; 174.399 ++ BIO_puts; 174.400 ++ BIO_read; 174.401 ++ BIO_s_accept; 174.402 ++ BIO_s_connect; 174.403 ++ BIO_s_fd; 174.404 ++ BIO_s_file; 174.405 ++ BIO_s_mem; 174.406 ++ BIO_s_null; 174.407 ++ BIO_s_proxy_client; 174.408 ++ BIO_s_socket; 174.409 ++ BIO_set; 174.410 ++ BIO_set_cipher; 174.411 ++ BIO_set_tcp_ndelay; 174.412 ++ BIO_sock_cleanup; 174.413 ++ BIO_sock_error; 174.414 ++ BIO_sock_init; 174.415 ++ BIO_sock_non_fatal_error; 174.416 ++ BIO_sock_should_retry; 174.417 ++ BIO_socket_ioctl; 174.418 ++ BIO_write; 174.419 ++ BN_CTX_free; 174.420 ++ BN_CTX_new; 174.421 ++ BN_MONT_CTX_free; 174.422 ++ BN_MONT_CTX_new; 174.423 ++ BN_MONT_CTX_set; 174.424 ++ BN_add; 174.425 ++ BN_add_word; 174.426 ++ BN_hex2bn; 174.427 ++ BN_bin2bn; 174.428 ++ BN_bn2hex; 174.429 ++ BN_bn2bin; 174.430 ++ BN_clear; 174.431 ++ BN_clear_bit; 174.432 ++ BN_clear_free; 174.433 ++ BN_cmp; 174.434 ++ BN_copy; 174.435 ++ BN_div; 174.436 ++ BN_div_word; 174.437 ++ BN_dup; 174.438 ++ BN_free; 174.439 ++ BN_from_montgomery; 174.440 ++ BN_gcd; 174.441 ++ BN_generate_prime; 174.442 ++ BN_get_word; 174.443 ++ BN_is_bit_set; 174.444 ++ BN_is_prime; 174.445 ++ BN_lshift; 174.446 ++ BN_lshift1; 174.447 ++ BN_mask_bits; 174.448 ++ BN_mod; 174.449 ++ BN_mod_exp; 174.450 ++ BN_mod_exp_mont; 174.451 ++ BN_mod_exp_simple; 174.452 ++ BN_mod_inverse; 174.453 ++ BN_mod_mul; 174.454 ++ BN_mod_mul_montgomery; 174.455 ++ BN_mod_word; 174.456 ++ BN_mul; 174.457 ++ BN_new; 174.458 ++ BN_num_bits; 174.459 ++ BN_num_bits_word; 174.460 ++ BN_options; 174.461 ++ BN_print; 174.462 ++ BN_print_fp; 174.463 ++ BN_rand; 174.464 ++ BN_reciprocal; 174.465 ++ BN_rshift; 174.466 ++ BN_rshift1; 174.467 ++ BN_set_bit; 174.468 ++ BN_set_word; 174.469 ++ BN_sqr; 174.470 ++ BN_sub; 174.471 ++ BN_to_ASN1_INTEGER; 174.472 ++ BN_ucmp; 174.473 ++ BN_value_one; 174.474 ++ BUF_MEM_free; 174.475 ++ BUF_MEM_grow; 174.476 ++ BUF_MEM_new; 174.477 ++ BUF_strdup; 174.478 ++ CONF_free; 174.479 ++ CONF_get_number; 174.480 ++ CONF_get_section; 174.481 ++ CONF_get_string; 174.482 ++ CONF_load; 174.483 ++ CRYPTO_add_lock; 174.484 ++ CRYPTO_dbg_free; 174.485 ++ CRYPTO_dbg_malloc; 174.486 ++ CRYPTO_dbg_realloc; 174.487 ++ CRYPTO_dbg_remalloc; 174.488 ++ CRYPTO_free; 174.489 ++ CRYPTO_get_add_lock_callback; 174.490 ++ CRYPTO_get_id_callback; 174.491 ++ CRYPTO_get_lock_name; 174.492 ++ CRYPTO_get_locking_callback; 174.493 ++ CRYPTO_get_mem_functions; 174.494 ++ CRYPTO_lock; 174.495 ++ CRYPTO_malloc; 174.496 ++ CRYPTO_mem_ctrl; 174.497 ++ CRYPTO_mem_leaks; 174.498 ++ CRYPTO_mem_leaks_cb; 174.499 ++ CRYPTO_mem_leaks_fp; 174.500 ++ CRYPTO_realloc; 174.501 ++ CRYPTO_remalloc; 174.502 ++ CRYPTO_set_add_lock_callback; 174.503 ++ CRYPTO_set_id_callback; 174.504 ++ CRYPTO_set_locking_callback; 174.505 ++ CRYPTO_set_mem_functions; 174.506 ++ CRYPTO_thread_id; 174.507 ++ DH_check; 174.508 ++ DH_compute_key; 174.509 ++ DH_free; 174.510 ++ DH_generate_key; 174.511 ++ DH_generate_parameters; 174.512 ++ DH_new; 174.513 ++ DH_size; 174.514 ++ DHparams_print; 174.515 ++ DHparams_print_fp; 174.516 ++ DSA_free; 174.517 ++ DSA_generate_key; 174.518 ++ DSA_generate_parameters; 174.519 ++ DSA_is_prime; 174.520 ++ DSA_new; 174.521 ++ DSA_print; 174.522 ++ DSA_print_fp; 174.523 ++ DSA_sign; 174.524 ++ DSA_sign_setup; 174.525 ++ DSA_size; 174.526 ++ DSA_verify; 174.527 ++ DSAparams_print; 174.528 ++ DSAparams_print_fp; 174.529 ++ ERR_clear_error; 174.530 ++ ERR_error_string; 174.531 ++ ERR_free_strings; 174.532 ++ ERR_func_error_string; 174.533 ++ ERR_get_err_state_table; 174.534 ++ ERR_get_error; 174.535 ++ ERR_get_error_line; 174.536 ++ ERR_get_state; 174.537 ++ ERR_get_string_table; 174.538 ++ ERR_lib_error_string; 174.539 ++ ERR_load_ASN1_strings; 174.540 ++ ERR_load_BIO_strings; 174.541 ++ ERR_load_BN_strings; 174.542 ++ ERR_load_BUF_strings; 174.543 ++ ERR_load_CONF_strings; 174.544 ++ ERR_load_DH_strings; 174.545 ++ ERR_load_DSA_strings; 174.546 ++ ERR_load_ERR_strings; 174.547 ++ ERR_load_EVP_strings; 174.548 ++ ERR_load_OBJ_strings; 174.549 ++ ERR_load_PEM_strings; 174.550 ++ ERR_load_PROXY_strings; 174.551 ++ ERR_load_RSA_strings; 174.552 ++ ERR_load_X509_strings; 174.553 ++ ERR_load_crypto_strings; 174.554 ++ ERR_load_strings; 174.555 ++ ERR_peek_error; 174.556 ++ ERR_peek_error_line; 174.557 ++ ERR_print_errors; 174.558 ++ ERR_print_errors_fp; 174.559 ++ ERR_put_error; 174.560 ++ ERR_reason_error_string; 174.561 ++ ERR_remove_state; 174.562 ++ EVP_BytesToKey; 174.563 ++ EVP_CIPHER_CTX_cleanup; 174.564 ++ EVP_CipherFinal; 174.565 ++ EVP_CipherInit; 174.566 ++ EVP_CipherUpdate; 174.567 ++ EVP_DecodeBlock; 174.568 ++ EVP_DecodeFinal; 174.569 ++ EVP_DecodeInit; 174.570 ++ EVP_DecodeUpdate; 174.571 ++ EVP_DecryptFinal; 174.572 ++ EVP_DecryptInit; 174.573 ++ EVP_DecryptUpdate; 174.574 ++ EVP_DigestFinal; 174.575 ++ EVP_DigestInit; 174.576 ++ EVP_DigestUpdate; 174.577 ++ EVP_EncodeBlock; 174.578 ++ EVP_EncodeFinal; 174.579 ++ EVP_EncodeInit; 174.580 ++ EVP_EncodeUpdate; 174.581 ++ EVP_EncryptFinal; 174.582 ++ EVP_EncryptInit; 174.583 ++ EVP_EncryptUpdate; 174.584 ++ EVP_OpenFinal; 174.585 ++ EVP_OpenInit; 174.586 ++ EVP_PKEY_assign; 174.587 ++ EVP_PKEY_copy_parameters; 174.588 ++ EVP_PKEY_free; 174.589 ++ EVP_PKEY_missing_parameters; 174.590 ++ EVP_PKEY_new; 174.591 ++ EVP_PKEY_save_parameters; 174.592 ++ EVP_PKEY_size; 174.593 ++ EVP_PKEY_type; 174.594 ++ EVP_SealFinal; 174.595 ++ EVP_SealInit; 174.596 ++ EVP_SignFinal; 174.597 ++ EVP_VerifyFinal; 174.598 ++ EVP_add_alias; 174.599 ++ EVP_add_cipher; 174.600 ++ EVP_add_digest; 174.601 ++ EVP_bf_cbc; 174.602 ++ EVP_bf_cfb64; 174.603 ++ EVP_bf_ecb; 174.604 ++ EVP_bf_ofb; 174.605 ++ EVP_cleanup; 174.606 ++ EVP_des_cbc; 174.607 ++ EVP_des_cfb64; 174.608 ++ EVP_des_ecb; 174.609 ++ EVP_des_ede; 174.610 ++ EVP_des_ede3; 174.611 ++ EVP_des_ede3_cbc; 174.612 ++ EVP_des_ede3_cfb64; 174.613 ++ EVP_des_ede3_ofb; 174.614 ++ EVP_des_ede_cbc; 174.615 ++ EVP_des_ede_cfb64; 174.616 ++ EVP_des_ede_ofb; 174.617 ++ EVP_des_ofb; 174.618 ++ EVP_desx_cbc; 174.619 ++ EVP_dss; 174.620 ++ EVP_dss1; 174.621 ++ EVP_enc_null; 174.622 ++ EVP_get_cipherbyname; 174.623 ++ EVP_get_digestbyname; 174.624 ++ EVP_get_pw_prompt; 174.625 ++ EVP_idea_cbc; 174.626 ++ EVP_idea_cfb64; 174.627 ++ EVP_idea_ecb; 174.628 ++ EVP_idea_ofb; 174.629 ++ EVP_md2; 174.630 ++ EVP_md5; 174.631 ++ EVP_md_null; 174.632 ++ EVP_rc2_cbc; 174.633 ++ EVP_rc2_cfb64; 174.634 ++ EVP_rc2_ecb; 174.635 ++ EVP_rc2_ofb; 174.636 ++ EVP_rc4; 174.637 ++ EVP_read_pw_string; 174.638 ++ EVP_set_pw_prompt; 174.639 ++ EVP_sha; 174.640 ++ EVP_sha1; 174.641 ++ MD2; 174.642 ++ MD2_Final; 174.643 ++ MD2_Init; 174.644 ++ MD2_Update; 174.645 ++ MD2_options; 174.646 ++ MD5; 174.647 ++ MD5_Final; 174.648 ++ MD5_Init; 174.649 ++ MD5_Update; 174.650 ++ MDC2; 174.651 ++ MDC2_Final; 174.652 ++ MDC2_Init; 174.653 ++ MDC2_Update; 174.654 ++ NETSCAPE_SPKAC_free; 174.655 ++ NETSCAPE_SPKAC_new; 174.656 ++ NETSCAPE_SPKI_free; 174.657 ++ NETSCAPE_SPKI_new; 174.658 ++ NETSCAPE_SPKI_sign; 174.659 ++ NETSCAPE_SPKI_verify; 174.660 ++ OBJ_add_object; 174.661 ++ OBJ_bsearch; 174.662 ++ OBJ_cleanup; 174.663 ++ OBJ_cmp; 174.664 ++ OBJ_create; 174.665 ++ OBJ_dup; 174.666 ++ OBJ_ln2nid; 174.667 ++ OBJ_new_nid; 174.668 ++ OBJ_nid2ln; 174.669 ++ OBJ_nid2obj; 174.670 ++ OBJ_nid2sn; 174.671 ++ OBJ_obj2nid; 174.672 ++ OBJ_sn2nid; 174.673 ++ OBJ_txt2nid; 174.674 ++ PEM_ASN1_read; 174.675 ++ PEM_ASN1_read_bio; 174.676 ++ PEM_ASN1_write; 174.677 ++ PEM_ASN1_write_bio; 174.678 ++ PEM_SealFinal; 174.679 ++ PEM_SealInit; 174.680 ++ PEM_SealUpdate; 174.681 ++ PEM_SignFinal; 174.682 ++ PEM_SignInit; 174.683 ++ PEM_SignUpdate; 174.684 ++ PEM_X509_INFO_read; 174.685 ++ PEM_X509_INFO_read_bio; 174.686 ++ PEM_X509_INFO_write_bio; 174.687 ++ PEM_dek_info; 174.688 ++ PEM_do_header; 174.689 ++ PEM_get_EVP_CIPHER_INFO; 174.690 ++ PEM_proc_type; 174.691 ++ PEM_read; 174.692 ++ PEM_read_DHparams; 174.693 ++ PEM_read_DSAPrivateKey; 174.694 ++ PEM_read_DSAparams; 174.695 ++ PEM_read_PKCS7; 174.696 ++ PEM_read_PrivateKey; 174.697 ++ PEM_read_RSAPrivateKey; 174.698 ++ PEM_read_X509; 174.699 ++ PEM_read_X509_CRL; 174.700 ++ PEM_read_X509_REQ; 174.701 ++ PEM_read_bio; 174.702 ++ PEM_read_bio_DHparams; 174.703 ++ PEM_read_bio_DSAPrivateKey; 174.704 ++ PEM_read_bio_DSAparams; 174.705 ++ PEM_read_bio_PKCS7; 174.706 ++ PEM_read_bio_PrivateKey; 174.707 ++ PEM_read_bio_RSAPrivateKey; 174.708 ++ PEM_read_bio_X509; 174.709 ++ PEM_read_bio_X509_CRL; 174.710 ++ PEM_read_bio_X509_REQ; 174.711 ++ PEM_write; 174.712 ++ PEM_write_DHparams; 174.713 ++ PEM_write_DSAPrivateKey; 174.714 ++ PEM_write_DSAparams; 174.715 ++ PEM_write_PKCS7; 174.716 ++ PEM_write_PrivateKey; 174.717 ++ PEM_write_RSAPrivateKey; 174.718 ++ PEM_write_X509; 174.719 ++ PEM_write_X509_CRL; 174.720 ++ PEM_write_X509_REQ; 174.721 ++ PEM_write_bio; 174.722 ++ PEM_write_bio_DHparams; 174.723 ++ PEM_write_bio_DSAPrivateKey; 174.724 ++ PEM_write_bio_DSAparams; 174.725 ++ PEM_write_bio_PKCS7; 174.726 ++ PEM_write_bio_PrivateKey; 174.727 ++ PEM_write_bio_RSAPrivateKey; 174.728 ++ PEM_write_bio_X509; 174.729 ++ PEM_write_bio_X509_CRL; 174.730 ++ PEM_write_bio_X509_REQ; 174.731 ++ PKCS7_DIGEST_free; 174.732 ++ PKCS7_DIGEST_new; 174.733 ++ PKCS7_ENCRYPT_free; 174.734 ++ PKCS7_ENCRYPT_new; 174.735 ++ PKCS7_ENC_CONTENT_free; 174.736 ++ PKCS7_ENC_CONTENT_new; 174.737 ++ PKCS7_ENVELOPE_free; 174.738 ++ PKCS7_ENVELOPE_new; 174.739 ++ PKCS7_ISSUER_AND_SERIAL_digest; 174.740 ++ PKCS7_ISSUER_AND_SERIAL_free; 174.741 ++ PKCS7_ISSUER_AND_SERIAL_new; 174.742 ++ PKCS7_RECIP_INFO_free; 174.743 ++ PKCS7_RECIP_INFO_new; 174.744 ++ PKCS7_SIGNED_free; 174.745 ++ PKCS7_SIGNED_new; 174.746 ++ PKCS7_SIGNER_INFO_free; 174.747 ++ PKCS7_SIGNER_INFO_new; 174.748 ++ PKCS7_SIGN_ENVELOPE_free; 174.749 ++ PKCS7_SIGN_ENVELOPE_new; 174.750 ++ PKCS7_dup; 174.751 ++ PKCS7_free; 174.752 ++ PKCS7_new; 174.753 ++ PROXY_ENTRY_add_noproxy; 174.754 ++ PROXY_ENTRY_clear_noproxy; 174.755 ++ PROXY_ENTRY_free; 174.756 ++ PROXY_ENTRY_get_noproxy; 174.757 ++ PROXY_ENTRY_new; 174.758 ++ PROXY_ENTRY_set_server; 174.759 ++ PROXY_add_noproxy; 174.760 ++ PROXY_add_server; 174.761 ++ PROXY_check_by_host; 174.762 ++ PROXY_check_url; 174.763 ++ PROXY_clear_noproxy; 174.764 ++ PROXY_free; 174.765 ++ PROXY_get_noproxy; 174.766 ++ PROXY_get_proxies; 174.767 ++ PROXY_get_proxy_entry; 174.768 ++ PROXY_load_conf; 174.769 ++ PROXY_new; 174.770 ++ PROXY_print; 174.771 ++ RAND_bytes; 174.772 ++ RAND_cleanup; 174.773 ++ RAND_file_name; 174.774 ++ RAND_load_file; 174.775 ++ RAND_screen; 174.776 ++ RAND_seed; 174.777 ++ RAND_write_file; 174.778 ++ RC2_cbc_encrypt; 174.779 ++ RC2_cfb64_encrypt; 174.780 ++ RC2_ecb_encrypt; 174.781 ++ RC2_encrypt; 174.782 ++ RC2_ofb64_encrypt; 174.783 ++ RC2_set_key; 174.784 ++ RC4; 174.785 ++ RC4_options; 174.786 ++ RC4_set_key; 174.787 ++ RSAPrivateKey_asn1_meth; 174.788 ++ RSAPrivateKey_dup; 174.789 ++ RSAPublicKey_dup; 174.790 ++ RSA_PKCS1_SSLeay; 174.791 ++ RSA_free; 174.792 ++ RSA_generate_key; 174.793 ++ RSA_new; 174.794 ++ RSA_new_method; 174.795 ++ RSA_print; 174.796 ++ RSA_print_fp; 174.797 ++ RSA_private_decrypt; 174.798 ++ RSA_private_encrypt; 174.799 ++ RSA_public_decrypt; 174.800 ++ RSA_public_encrypt; 174.801 ++ RSA_set_default_method; 174.802 ++ RSA_sign; 174.803 ++ RSA_sign_ASN1_OCTET_STRING; 174.804 ++ RSA_size; 174.805 ++ RSA_verify; 174.806 ++ RSA_verify_ASN1_OCTET_STRING; 174.807 ++ SHA; 174.808 ++ SHA1; 174.809 ++ SHA1_Final; 174.810 ++ SHA1_Init; 174.811 ++ SHA1_Update; 174.812 ++ SHA_Final; 174.813 ++ SHA_Init; 174.814 ++ SHA_Update; 174.815 ++ OpenSSL_add_all_algorithms; 174.816 ++ OpenSSL_add_all_ciphers; 174.817 ++ OpenSSL_add_all_digests; 174.818 ++ TXT_DB_create_index; 174.819 ++ TXT_DB_free; 174.820 ++ TXT_DB_get_by_index; 174.821 ++ TXT_DB_insert; 174.822 ++ TXT_DB_read; 174.823 ++ TXT_DB_write; 174.824 ++ X509_ALGOR_free; 174.825 ++ X509_ALGOR_new; 174.826 ++ X509_ATTRIBUTE_free; 174.827 ++ X509_ATTRIBUTE_new; 174.828 ++ X509_CINF_free; 174.829 ++ X509_CINF_new; 174.830 ++ X509_CRL_INFO_free; 174.831 ++ X509_CRL_INFO_new; 174.832 ++ X509_CRL_add_ext; 174.833 ++ X509_CRL_cmp; 174.834 ++ X509_CRL_delete_ext; 174.835 ++ X509_CRL_dup; 174.836 ++ X509_CRL_free; 174.837 ++ X509_CRL_get_ext; 174.838 ++ X509_CRL_get_ext_by_NID; 174.839 ++ X509_CRL_get_ext_by_OBJ; 174.840 ++ X509_CRL_get_ext_by_critical; 174.841 ++ X509_CRL_get_ext_count; 174.842 ++ X509_CRL_new; 174.843 ++ X509_CRL_sign; 174.844 ++ X509_CRL_verify; 174.845 ++ X509_EXTENSION_create_by_NID; 174.846 ++ X509_EXTENSION_create_by_OBJ; 174.847 ++ X509_EXTENSION_dup; 174.848 ++ X509_EXTENSION_free; 174.849 ++ X509_EXTENSION_get_critical; 174.850 ++ X509_EXTENSION_get_data; 174.851 ++ X509_EXTENSION_get_object; 174.852 ++ X509_EXTENSION_new; 174.853 ++ X509_EXTENSION_set_critical; 174.854 ++ X509_EXTENSION_set_data; 174.855 ++ X509_EXTENSION_set_object; 174.856 ++ X509_INFO_free; 174.857 ++ X509_INFO_new; 174.858 ++ X509_LOOKUP_by_alias; 174.859 ++ X509_LOOKUP_by_fingerprint; 174.860 ++ X509_LOOKUP_by_issuer_serial; 174.861 ++ X509_LOOKUP_by_subject; 174.862 ++ X509_LOOKUP_ctrl; 174.863 ++ X509_LOOKUP_file; 174.864 ++ X509_LOOKUP_free; 174.865 ++ X509_LOOKUP_hash_dir; 174.866 ++ X509_LOOKUP_init; 174.867 ++ X509_LOOKUP_new; 174.868 ++ X509_LOOKUP_shutdown; 174.869 ++ X509_NAME_ENTRY_create_by_NID; 174.870 ++ X509_NAME_ENTRY_create_by_OBJ; 174.871 ++ X509_NAME_ENTRY_dup; 174.872 ++ X509_NAME_ENTRY_free; 174.873 ++ X509_NAME_ENTRY_get_data; 174.874 ++ X509_NAME_ENTRY_get_object; 174.875 ++ X509_NAME_ENTRY_new; 174.876 ++ X509_NAME_ENTRY_set_data; 174.877 ++ X509_NAME_ENTRY_set_object; 174.878 ++ X509_NAME_add_entry; 174.879 ++ X509_NAME_cmp; 174.880 ++ X509_NAME_delete_entry; 174.881 ++ X509_NAME_digest; 174.882 ++ X509_NAME_dup; 174.883 ++ X509_NAME_entry_count; 174.884 ++ X509_NAME_free; 174.885 ++ X509_NAME_get_entry; 174.886 ++ X509_NAME_get_index_by_NID; 174.887 ++ X509_NAME_get_index_by_OBJ; 174.888 ++ X509_NAME_get_text_by_NID; 174.889 ++ X509_NAME_get_text_by_OBJ; 174.890 ++ X509_NAME_hash; 174.891 ++ X509_NAME_new; 174.892 ++ X509_NAME_oneline; 174.893 ++ X509_NAME_print; 174.894 ++ X509_NAME_set; 174.895 ++ X509_OBJECT_free_contents; 174.896 ++ X509_OBJECT_retrieve_by_subject; 174.897 ++ X509_OBJECT_up_ref_count; 174.898 ++ X509_PKEY_free; 174.899 ++ X509_PKEY_new; 174.900 ++ X509_PUBKEY_free; 174.901 ++ X509_PUBKEY_get; 174.902 ++ X509_PUBKEY_new; 174.903 ++ X509_PUBKEY_set; 174.904 ++ X509_REQ_INFO_free; 174.905 ++ X509_REQ_INFO_new; 174.906 ++ X509_REQ_dup; 174.907 ++ X509_REQ_free; 174.908 ++ X509_REQ_get_pubkey; 174.909 ++ X509_REQ_new; 174.910 ++ X509_REQ_print; 174.911 ++ X509_REQ_print_fp; 174.912 ++ X509_REQ_set_pubkey; 174.913 ++ X509_REQ_set_subject_name; 174.914 ++ X509_REQ_set_version; 174.915 ++ X509_REQ_sign; 174.916 ++ X509_REQ_to_X509; 174.917 ++ X509_REQ_verify; 174.918 ++ X509_REVOKED_add_ext; 174.919 ++ X509_REVOKED_delete_ext; 174.920 ++ X509_REVOKED_free; 174.921 ++ X509_REVOKED_get_ext; 174.922 ++ X509_REVOKED_get_ext_by_NID; 174.923 ++ X509_REVOKED_get_ext_by_OBJ; 174.924 ++ X509_REVOKED_get_ext_by_critical; 174.925 ++ X509_REVOKED_get_ext_by_critic; 174.926 ++ X509_REVOKED_get_ext_count; 174.927 ++ X509_REVOKED_new; 174.928 ++ X509_SIG_free; 174.929 ++ X509_SIG_new; 174.930 ++ X509_STORE_CTX_cleanup; 174.931 ++ X509_STORE_CTX_init; 174.932 ++ X509_STORE_add_cert; 174.933 ++ X509_STORE_add_lookup; 174.934 ++ X509_STORE_free; 174.935 ++ X509_STORE_get_by_subject; 174.936 ++ X509_STORE_load_locations; 174.937 ++ X509_STORE_new; 174.938 ++ X509_STORE_set_default_paths; 174.939 ++ X509_VAL_free; 174.940 ++ X509_VAL_new; 174.941 ++ X509_add_ext; 174.942 ++ X509_asn1_meth; 174.943 ++ X509_certificate_type; 174.944 ++ X509_check_private_key; 174.945 ++ X509_cmp_current_time; 174.946 ++ X509_delete_ext; 174.947 ++ X509_digest; 174.948 ++ X509_dup; 174.949 ++ X509_free; 174.950 ++ X509_get_default_cert_area; 174.951 ++ X509_get_default_cert_dir; 174.952 ++ X509_get_default_cert_dir_env; 174.953 ++ X509_get_default_cert_file; 174.954 ++ X509_get_default_cert_file_env; 174.955 ++ X509_get_default_private_dir; 174.956 ++ X509_get_ext; 174.957 ++ X509_get_ext_by_NID; 174.958 ++ X509_get_ext_by_OBJ; 174.959 ++ X509_get_ext_by_critical; 174.960 ++ X509_get_ext_count; 174.961 ++ X509_get_issuer_name; 174.962 ++ X509_get_pubkey; 174.963 ++ X509_get_pubkey_parameters; 174.964 ++ X509_get_serialNumber; 174.965 ++ X509_get_subject_name; 174.966 ++ X509_gmtime_adj; 174.967 ++ X509_issuer_and_serial_cmp; 174.968 ++ X509_issuer_and_serial_hash; 174.969 ++ X509_issuer_name_cmp; 174.970 ++ X509_issuer_name_hash; 174.971 ++ X509_load_cert_file; 174.972 ++ X509_new; 174.973 ++ X509_print; 174.974 ++ X509_print_fp; 174.975 ++ X509_set_issuer_name; 174.976 ++ X509_set_notAfter; 174.977 ++ X509_set_notBefore; 174.978 ++ X509_set_pubkey; 174.979 ++ X509_set_serialNumber; 174.980 ++ X509_set_subject_name; 174.981 ++ X509_set_version; 174.982 ++ X509_sign; 174.983 ++ X509_subject_name_cmp; 174.984 ++ X509_subject_name_hash; 174.985 ++ X509_to_X509_REQ; 174.986 ++ X509_verify; 174.987 ++ X509_verify_cert; 174.988 ++ X509_verify_cert_error_string; 174.989 ++ X509v3_add_ext; 174.990 ++ X509v3_add_extension; 174.991 ++ X509v3_add_netscape_extensions; 174.992 ++ X509v3_add_standard_extensions; 174.993 ++ X509v3_cleanup_extensions; 174.994 ++ X509v3_data_type_by_NID; 174.995 ++ X509v3_data_type_by_OBJ; 174.996 ++ X509v3_delete_ext; 174.997 ++ X509v3_get_ext; 174.998 ++ X509v3_get_ext_by_NID; 174.999 ++ X509v3_get_ext_by_OBJ; 174.1000 ++ X509v3_get_ext_by_critical; 174.1001 ++ X509v3_get_ext_count; 174.1002 ++ X509v3_pack_string; 174.1003 ++ X509v3_pack_type_by_NID; 174.1004 ++ X509v3_pack_type_by_OBJ; 174.1005 ++ X509v3_unpack_string; 174.1006 ++ _des_crypt; 174.1007 ++ a2d_ASN1_OBJECT; 174.1008 ++ a2i_ASN1_INTEGER; 174.1009 ++ a2i_ASN1_STRING; 174.1010 ++ asn1_Finish; 174.1011 ++ asn1_GetSequence; 174.1012 ++ bn_div_words; 174.1013 ++ bn_expand2; 174.1014 ++ bn_mul_add_words; 174.1015 ++ bn_mul_words; 174.1016 ++ BN_uadd; 174.1017 ++ BN_usub; 174.1018 ++ bn_sqr_words; 174.1019 ++ _ossl_old_crypt; 174.1020 ++ d2i_ASN1_BIT_STRING; 174.1021 ++ d2i_ASN1_BOOLEAN; 174.1022 ++ d2i_ASN1_HEADER; 174.1023 ++ d2i_ASN1_IA5STRING; 174.1024 ++ d2i_ASN1_INTEGER; 174.1025 ++ d2i_ASN1_OBJECT; 174.1026 ++ d2i_ASN1_OCTET_STRING; 174.1027 ++ d2i_ASN1_PRINTABLE; 174.1028 ++ d2i_ASN1_PRINTABLESTRING; 174.1029 ++ d2i_ASN1_SET; 174.1030 ++ d2i_ASN1_T61STRING; 174.1031 ++ d2i_ASN1_TYPE; 174.1032 ++ d2i_ASN1_UTCTIME; 174.1033 ++ d2i_ASN1_bytes; 174.1034 ++ d2i_ASN1_type_bytes; 174.1035 ++ d2i_DHparams; 174.1036 ++ d2i_DSAPrivateKey; 174.1037 ++ d2i_DSAPrivateKey_bio; 174.1038 ++ d2i_DSAPrivateKey_fp; 174.1039 ++ d2i_DSAPublicKey; 174.1040 ++ d2i_DSAparams; 174.1041 ++ d2i_NETSCAPE_SPKAC; 174.1042 ++ d2i_NETSCAPE_SPKI; 174.1043 ++ d2i_Netscape_RSA; 174.1044 ++ d2i_PKCS7; 174.1045 ++ d2i_PKCS7_DIGEST; 174.1046 ++ d2i_PKCS7_ENCRYPT; 174.1047 ++ d2i_PKCS7_ENC_CONTENT; 174.1048 ++ d2i_PKCS7_ENVELOPE; 174.1049 ++ d2i_PKCS7_ISSUER_AND_SERIAL; 174.1050 ++ d2i_PKCS7_RECIP_INFO; 174.1051 ++ d2i_PKCS7_SIGNED; 174.1052 ++ d2i_PKCS7_SIGNER_INFO; 174.1053 ++ d2i_PKCS7_SIGN_ENVELOPE; 174.1054 ++ d2i_PKCS7_bio; 174.1055 ++ d2i_PKCS7_fp; 174.1056 ++ d2i_PrivateKey; 174.1057 ++ d2i_PublicKey; 174.1058 ++ d2i_RSAPrivateKey; 174.1059 ++ d2i_RSAPrivateKey_bio; 174.1060 ++ d2i_RSAPrivateKey_fp; 174.1061 ++ d2i_RSAPublicKey; 174.1062 ++ d2i_X509; 174.1063 ++ d2i_X509_ALGOR; 174.1064 ++ d2i_X509_ATTRIBUTE; 174.1065 ++ d2i_X509_CINF; 174.1066 ++ d2i_X509_CRL; 174.1067 ++ d2i_X509_CRL_INFO; 174.1068 ++ d2i_X509_CRL_bio; 174.1069 ++ d2i_X509_CRL_fp; 174.1070 ++ d2i_X509_EXTENSION; 174.1071 ++ d2i_X509_NAME; 174.1072 ++ d2i_X509_NAME_ENTRY; 174.1073 ++ d2i_X509_PKEY; 174.1074 ++ d2i_X509_PUBKEY; 174.1075 ++ d2i_X509_REQ; 174.1076 ++ d2i_X509_REQ_INFO; 174.1077 ++ d2i_X509_REQ_bio; 174.1078 ++ d2i_X509_REQ_fp; 174.1079 ++ d2i_X509_REVOKED; 174.1080 ++ d2i_X509_SIG; 174.1081 ++ d2i_X509_VAL; 174.1082 ++ d2i_X509_bio; 174.1083 ++ d2i_X509_fp; 174.1084 ++ DES_cbc_cksum; 174.1085 ++ DES_cbc_encrypt; 174.1086 ++ DES_cblock_print_file; 174.1087 ++ DES_cfb64_encrypt; 174.1088 ++ DES_cfb_encrypt; 174.1089 ++ DES_decrypt3; 174.1090 ++ DES_ecb3_encrypt; 174.1091 ++ DES_ecb_encrypt; 174.1092 ++ DES_ede3_cbc_encrypt; 174.1093 ++ DES_ede3_cfb64_encrypt; 174.1094 ++ DES_ede3_ofb64_encrypt; 174.1095 ++ DES_enc_read; 174.1096 ++ DES_enc_write; 174.1097 ++ DES_encrypt1; 174.1098 ++ DES_encrypt2; 174.1099 ++ DES_encrypt3; 174.1100 ++ DES_fcrypt; 174.1101 ++ DES_is_weak_key; 174.1102 ++ DES_key_sched; 174.1103 ++ DES_ncbc_encrypt; 174.1104 ++ DES_ofb64_encrypt; 174.1105 ++ DES_ofb_encrypt; 174.1106 ++ DES_options; 174.1107 ++ DES_pcbc_encrypt; 174.1108 ++ DES_quad_cksum; 174.1109 ++ DES_random_key; 174.1110 ++ _ossl_old_des_random_seed; 174.1111 ++ _ossl_old_des_read_2passwords; 174.1112 ++ _ossl_old_des_read_password; 174.1113 ++ _ossl_old_des_read_pw; 174.1114 ++ _ossl_old_des_read_pw_string; 174.1115 ++ DES_set_key; 174.1116 ++ DES_set_odd_parity; 174.1117 ++ DES_string_to_2keys; 174.1118 ++ DES_string_to_key; 174.1119 ++ DES_xcbc_encrypt; 174.1120 ++ DES_xwhite_in2out; 174.1121 ++ fcrypt_body; 174.1122 ++ i2a_ASN1_INTEGER; 174.1123 ++ i2a_ASN1_OBJECT; 174.1124 ++ i2a_ASN1_STRING; 174.1125 ++ i2d_ASN1_BIT_STRING; 174.1126 ++ i2d_ASN1_BOOLEAN; 174.1127 ++ i2d_ASN1_HEADER; 174.1128 ++ i2d_ASN1_IA5STRING; 174.1129 ++ i2d_ASN1_INTEGER; 174.1130 ++ i2d_ASN1_OBJECT; 174.1131 ++ i2d_ASN1_OCTET_STRING; 174.1132 ++ i2d_ASN1_PRINTABLE; 174.1133 ++ i2d_ASN1_SET; 174.1134 ++ i2d_ASN1_TYPE; 174.1135 ++ i2d_ASN1_UTCTIME; 174.1136 ++ i2d_ASN1_bytes; 174.1137 ++ i2d_DHparams; 174.1138 ++ i2d_DSAPrivateKey; 174.1139 ++ i2d_DSAPrivateKey_bio; 174.1140 ++ i2d_DSAPrivateKey_fp; 174.1141 ++ i2d_DSAPublicKey; 174.1142 ++ i2d_DSAparams; 174.1143 ++ i2d_NETSCAPE_SPKAC; 174.1144 ++ i2d_NETSCAPE_SPKI; 174.1145 ++ i2d_Netscape_RSA; 174.1146 ++ i2d_PKCS7; 174.1147 ++ i2d_PKCS7_DIGEST; 174.1148 ++ i2d_PKCS7_ENCRYPT; 174.1149 ++ i2d_PKCS7_ENC_CONTENT; 174.1150 ++ i2d_PKCS7_ENVELOPE; 174.1151 ++ i2d_PKCS7_ISSUER_AND_SERIAL; 174.1152 ++ i2d_PKCS7_RECIP_INFO; 174.1153 ++ i2d_PKCS7_SIGNED; 174.1154 ++ i2d_PKCS7_SIGNER_INFO; 174.1155 ++ i2d_PKCS7_SIGN_ENVELOPE; 174.1156 ++ i2d_PKCS7_bio; 174.1157 ++ i2d_PKCS7_fp; 174.1158 ++ i2d_PrivateKey; 174.1159 ++ i2d_PublicKey; 174.1160 ++ i2d_RSAPrivateKey; 174.1161 ++ i2d_RSAPrivateKey_bio; 174.1162 ++ i2d_RSAPrivateKey_fp; 174.1163 ++ i2d_RSAPublicKey; 174.1164 ++ i2d_X509; 174.1165 ++ i2d_X509_ALGOR; 174.1166 ++ i2d_X509_ATTRIBUTE; 174.1167 ++ i2d_X509_CINF; 174.1168 ++ i2d_X509_CRL; 174.1169 ++ i2d_X509_CRL_INFO; 174.1170 ++ i2d_X509_CRL_bio; 174.1171 ++ i2d_X509_CRL_fp; 174.1172 ++ i2d_X509_EXTENSION; 174.1173 ++ i2d_X509_NAME; 174.1174 ++ i2d_X509_NAME_ENTRY; 174.1175 ++ i2d_X509_PKEY; 174.1176 ++ i2d_X509_PUBKEY; 174.1177 ++ i2d_X509_REQ; 174.1178 ++ i2d_X509_REQ_INFO; 174.1179 ++ i2d_X509_REQ_bio; 174.1180 ++ i2d_X509_REQ_fp; 174.1181 ++ i2d_X509_REVOKED; 174.1182 ++ i2d_X509_SIG; 174.1183 ++ i2d_X509_VAL; 174.1184 ++ i2d_X509_bio; 174.1185 ++ i2d_X509_fp; 174.1186 ++ idea_cbc_encrypt; 174.1187 ++ idea_cfb64_encrypt; 174.1188 ++ idea_ecb_encrypt; 174.1189 ++ idea_encrypt; 174.1190 ++ idea_ofb64_encrypt; 174.1191 ++ idea_options; 174.1192 ++ idea_set_decrypt_key; 174.1193 ++ idea_set_encrypt_key; 174.1194 ++ lh_delete; 174.1195 ++ lh_doall; 174.1196 ++ lh_doall_arg; 174.1197 ++ lh_free; 174.1198 ++ lh_insert; 174.1199 ++ lh_new; 174.1200 ++ lh_node_stats; 174.1201 ++ lh_node_stats_bio; 174.1202 ++ lh_node_usage_stats; 174.1203 ++ lh_node_usage_stats_bio; 174.1204 ++ lh_retrieve; 174.1205 ++ lh_stats; 174.1206 ++ lh_stats_bio; 174.1207 ++ lh_strhash; 174.1208 ++ sk_delete; 174.1209 ++ sk_delete_ptr; 174.1210 ++ sk_dup; 174.1211 ++ sk_find; 174.1212 ++ sk_free; 174.1213 ++ sk_insert; 174.1214 ++ sk_new; 174.1215 ++ sk_pop; 174.1216 ++ sk_pop_free; 174.1217 ++ sk_push; 174.1218 ++ sk_set_cmp_func; 174.1219 ++ sk_shift; 174.1220 ++ sk_unshift; 174.1221 ++ sk_zero; 174.1222 ++ BIO_f_nbio_test; 174.1223 ++ ASN1_TYPE_get; 174.1224 ++ ASN1_TYPE_set; 174.1225 ++ PKCS7_content_free; 174.1226 ++ ERR_load_PKCS7_strings; 174.1227 ++ X509_find_by_issuer_and_serial; 174.1228 ++ X509_find_by_subject; 174.1229 ++ PKCS7_ctrl; 174.1230 ++ PKCS7_set_type; 174.1231 ++ PKCS7_set_content; 174.1232 ++ PKCS7_SIGNER_INFO_set; 174.1233 ++ PKCS7_add_signer; 174.1234 ++ PKCS7_add_certificate; 174.1235 ++ PKCS7_add_crl; 174.1236 ++ PKCS7_content_new; 174.1237 ++ PKCS7_dataSign; 174.1238 ++ PKCS7_dataVerify; 174.1239 ++ PKCS7_dataInit; 174.1240 ++ PKCS7_add_signature; 174.1241 ++ PKCS7_cert_from_signer_info; 174.1242 ++ PKCS7_get_signer_info; 174.1243 ++ EVP_delete_alias; 174.1244 ++ EVP_mdc2; 174.1245 ++ PEM_read_bio_RSAPublicKey; 174.1246 ++ PEM_write_bio_RSAPublicKey; 174.1247 ++ d2i_RSAPublicKey_bio; 174.1248 ++ i2d_RSAPublicKey_bio; 174.1249 ++ PEM_read_RSAPublicKey; 174.1250 ++ PEM_write_RSAPublicKey; 174.1251 ++ d2i_RSAPublicKey_fp; 174.1252 ++ i2d_RSAPublicKey_fp; 174.1253 ++ BIO_copy_next_retry; 174.1254 ++ RSA_flags; 174.1255 ++ X509_STORE_add_crl; 174.1256 ++ X509_load_crl_file; 174.1257 ++ EVP_rc2_40_cbc; 174.1258 ++ EVP_rc4_40; 174.1259 ++ EVP_CIPHER_CTX_init; 174.1260 ++ HMAC; 174.1261 ++ HMAC_Init; 174.1262 ++ HMAC_Update; 174.1263 ++ HMAC_Final; 174.1264 ++ ERR_get_next_error_library; 174.1265 ++ EVP_PKEY_cmp_parameters; 174.1266 ++ HMAC_cleanup; 174.1267 ++ BIO_ptr_ctrl; 174.1268 ++ BIO_new_file_internal; 174.1269 ++ BIO_new_fp_internal; 174.1270 ++ BIO_s_file_internal; 174.1271 ++ BN_BLINDING_convert; 174.1272 ++ BN_BLINDING_invert; 174.1273 ++ BN_BLINDING_update; 174.1274 ++ RSA_blinding_on; 174.1275 ++ RSA_blinding_off; 174.1276 ++ i2t_ASN1_OBJECT; 174.1277 ++ BN_BLINDING_new; 174.1278 ++ BN_BLINDING_free; 174.1279 ++ EVP_cast5_cbc; 174.1280 ++ EVP_cast5_cfb64; 174.1281 ++ EVP_cast5_ecb; 174.1282 ++ EVP_cast5_ofb; 174.1283 ++ BF_decrypt; 174.1284 ++ CAST_set_key; 174.1285 ++ CAST_encrypt; 174.1286 ++ CAST_decrypt; 174.1287 ++ CAST_ecb_encrypt; 174.1288 ++ CAST_cbc_encrypt; 174.1289 ++ CAST_cfb64_encrypt; 174.1290 ++ CAST_ofb64_encrypt; 174.1291 ++ RC2_decrypt; 174.1292 ++ OBJ_create_objects; 174.1293 ++ BN_exp; 174.1294 ++ BN_mul_word; 174.1295 ++ BN_sub_word; 174.1296 ++ BN_dec2bn; 174.1297 ++ BN_bn2dec; 174.1298 ++ BIO_ghbn_ctrl; 174.1299 ++ CRYPTO_free_ex_data; 174.1300 ++ CRYPTO_get_ex_data; 174.1301 ++ CRYPTO_set_ex_data; 174.1302 ++ ERR_load_CRYPTO_strings; 174.1303 ++ ERR_load_CRYPTOlib_strings; 174.1304 ++ EVP_PKEY_bits; 174.1305 ++ MD5_Transform; 174.1306 ++ SHA1_Transform; 174.1307 ++ SHA_Transform; 174.1308 ++ X509_STORE_CTX_get_chain; 174.1309 ++ X509_STORE_CTX_get_current_cert; 174.1310 ++ X509_STORE_CTX_get_error; 174.1311 ++ X509_STORE_CTX_get_error_depth; 174.1312 ++ X509_STORE_CTX_get_ex_data; 174.1313 ++ X509_STORE_CTX_set_cert; 174.1314 ++ X509_STORE_CTX_set_chain; 174.1315 ++ X509_STORE_CTX_set_error; 174.1316 ++ X509_STORE_CTX_set_ex_data; 174.1317 ++ CRYPTO_dup_ex_data; 174.1318 ++ CRYPTO_get_new_lockid; 174.1319 ++ CRYPTO_new_ex_data; 174.1320 ++ RSA_set_ex_data; 174.1321 ++ RSA_get_ex_data; 174.1322 ++ RSA_get_ex_new_index; 174.1323 ++ RSA_padding_add_PKCS1_type_1; 174.1324 ++ RSA_padding_add_PKCS1_type_2; 174.1325 ++ RSA_padding_add_SSLv23; 174.1326 ++ RSA_padding_add_none; 174.1327 ++ RSA_padding_check_PKCS1_type_1; 174.1328 ++ RSA_padding_check_PKCS1_type_2; 174.1329 ++ RSA_padding_check_SSLv23; 174.1330 ++ RSA_padding_check_none; 174.1331 ++ bn_add_words; 174.1332 ++ d2i_Netscape_RSA_2; 174.1333 ++ CRYPTO_get_ex_new_index; 174.1334 ++ RIPEMD160_Init; 174.1335 ++ RIPEMD160_Update; 174.1336 ++ RIPEMD160_Final; 174.1337 ++ RIPEMD160; 174.1338 ++ RIPEMD160_Transform; 174.1339 ++ RC5_32_set_key; 174.1340 ++ RC5_32_ecb_encrypt; 174.1341 ++ RC5_32_encrypt; 174.1342 ++ RC5_32_decrypt; 174.1343 ++ RC5_32_cbc_encrypt; 174.1344 ++ RC5_32_cfb64_encrypt; 174.1345 ++ RC5_32_ofb64_encrypt; 174.1346 ++ BN_bn2mpi; 174.1347 ++ BN_mpi2bn; 174.1348 ++ ASN1_BIT_STRING_get_bit; 174.1349 ++ ASN1_BIT_STRING_set_bit; 174.1350 ++ BIO_get_ex_data; 174.1351 ++ BIO_get_ex_new_index; 174.1352 ++ BIO_set_ex_data; 174.1353 ++ X509v3_get_key_usage; 174.1354 ++ X509v3_set_key_usage; 174.1355 ++ a2i_X509v3_key_usage; 174.1356 ++ i2a_X509v3_key_usage; 174.1357 ++ EVP_PKEY_decrypt; 174.1358 ++ EVP_PKEY_encrypt; 174.1359 ++ PKCS7_RECIP_INFO_set; 174.1360 ++ PKCS7_add_recipient; 174.1361 ++ PKCS7_add_recipient_info; 174.1362 ++ PKCS7_set_cipher; 174.1363 ++ ASN1_TYPE_get_int_octetstring; 174.1364 ++ ASN1_TYPE_get_octetstring; 174.1365 ++ ASN1_TYPE_set_int_octetstring; 174.1366 ++ ASN1_TYPE_set_octetstring; 174.1367 ++ ASN1_UTCTIME_set_string; 174.1368 ++ ERR_add_error_data; 174.1369 ++ ERR_set_error_data; 174.1370 ++ EVP_CIPHER_asn1_to_param; 174.1371 ++ EVP_CIPHER_param_to_asn1; 174.1372 ++ EVP_CIPHER_get_asn1_iv; 174.1373 ++ EVP_CIPHER_set_asn1_iv; 174.1374 ++ EVP_rc5_32_12_16_cbc; 174.1375 ++ EVP_rc5_32_12_16_cfb64; 174.1376 ++ EVP_rc5_32_12_16_ecb; 174.1377 ++ EVP_rc5_32_12_16_ofb; 174.1378 ++ asn1_add_error; 174.1379 ++ d2i_ASN1_BMPSTRING; 174.1380 ++ i2d_ASN1_BMPSTRING; 174.1381 ++ BIO_f_ber; 174.1382 ++ BN_init; 174.1383 ++ COMP_CTX_new; 174.1384 ++ COMP_CTX_free; 174.1385 ++ COMP_CTX_compress_block; 174.1386 ++ COMP_CTX_expand_block; 174.1387 ++ X509_STORE_CTX_get_ex_new_index; 174.1388 ++ OBJ_NAME_add; 174.1389 ++ BIO_socket_nbio; 174.1390 ++ EVP_rc2_64_cbc; 174.1391 ++ OBJ_NAME_cleanup; 174.1392 ++ OBJ_NAME_get; 174.1393 ++ OBJ_NAME_init; 174.1394 ++ OBJ_NAME_new_index; 174.1395 ++ OBJ_NAME_remove; 174.1396 ++ BN_MONT_CTX_copy; 174.1397 ++ BIO_new_socks4a_connect; 174.1398 ++ BIO_s_socks4a_connect; 174.1399 ++ PROXY_set_connect_mode; 174.1400 ++ RAND_SSLeay; 174.1401 ++ RAND_set_rand_method; 174.1402 ++ RSA_memory_lock; 174.1403 ++ bn_sub_words; 174.1404 ++ bn_mul_normal; 174.1405 ++ bn_mul_comba8; 174.1406 ++ bn_mul_comba4; 174.1407 ++ bn_sqr_normal; 174.1408 ++ bn_sqr_comba8; 174.1409 ++ bn_sqr_comba4; 174.1410 ++ bn_cmp_words; 174.1411 ++ bn_mul_recursive; 174.1412 ++ bn_mul_part_recursive; 174.1413 ++ bn_sqr_recursive; 174.1414 ++ bn_mul_low_normal; 174.1415 ++ BN_RECP_CTX_init; 174.1416 ++ BN_RECP_CTX_new; 174.1417 ++ BN_RECP_CTX_free; 174.1418 ++ BN_RECP_CTX_set; 174.1419 ++ BN_mod_mul_reciprocal; 174.1420 ++ BN_mod_exp_recp; 174.1421 ++ BN_div_recp; 174.1422 ++ BN_CTX_init; 174.1423 ++ BN_MONT_CTX_init; 174.1424 ++ RAND_get_rand_method; 174.1425 ++ PKCS7_add_attribute; 174.1426 ++ PKCS7_add_signed_attribute; 174.1427 ++ PKCS7_digest_from_attributes; 174.1428 ++ PKCS7_get_attribute; 174.1429 ++ PKCS7_get_issuer_and_serial; 174.1430 ++ PKCS7_get_signed_attribute; 174.1431 ++ COMP_compress_block; 174.1432 ++ COMP_expand_block; 174.1433 ++ COMP_rle; 174.1434 ++ COMP_zlib; 174.1435 ++ ms_time_diff; 174.1436 ++ ms_time_new; 174.1437 ++ ms_time_free; 174.1438 ++ ms_time_cmp; 174.1439 ++ ms_time_get; 174.1440 ++ PKCS7_set_attributes; 174.1441 ++ PKCS7_set_signed_attributes; 174.1442 ++ X509_ATTRIBUTE_create; 174.1443 ++ X509_ATTRIBUTE_dup; 174.1444 ++ ASN1_GENERALIZEDTIME_check; 174.1445 ++ ASN1_GENERALIZEDTIME_print; 174.1446 ++ ASN1_GENERALIZEDTIME_set; 174.1447 ++ ASN1_GENERALIZEDTIME_set_string; 174.1448 ++ ASN1_TIME_print; 174.1449 ++ BASIC_CONSTRAINTS_free; 174.1450 ++ BASIC_CONSTRAINTS_new; 174.1451 ++ ERR_load_X509V3_strings; 174.1452 ++ NETSCAPE_CERT_SEQUENCE_free; 174.1453 ++ NETSCAPE_CERT_SEQUENCE_new; 174.1454 ++ OBJ_txt2obj; 174.1455 ++ PEM_read_NETSCAPE_CERT_SEQUENCE; 174.1456 ++ PEM_read_NS_CERT_SEQ; 174.1457 ++ PEM_read_bio_NETSCAPE_CERT_SEQUENCE; 174.1458 ++ PEM_read_bio_NS_CERT_SEQ; 174.1459 ++ PEM_write_NETSCAPE_CERT_SEQUENCE; 174.1460 ++ PEM_write_NS_CERT_SEQ; 174.1461 ++ PEM_write_bio_NETSCAPE_CERT_SEQUENCE; 174.1462 ++ PEM_write_bio_NS_CERT_SEQ; 174.1463 ++ X509V3_EXT_add; 174.1464 ++ X509V3_EXT_add_alias; 174.1465 ++ X509V3_EXT_add_conf; 174.1466 ++ X509V3_EXT_cleanup; 174.1467 ++ X509V3_EXT_conf; 174.1468 ++ X509V3_EXT_conf_nid; 174.1469 ++ X509V3_EXT_get; 174.1470 ++ X509V3_EXT_get_nid; 174.1471 ++ X509V3_EXT_print; 174.1472 ++ X509V3_EXT_print_fp; 174.1473 ++ X509V3_add_standard_extensions; 174.1474 ++ X509V3_add_value; 174.1475 ++ X509V3_add_value_bool; 174.1476 ++ X509V3_add_value_int; 174.1477 ++ X509V3_conf_free; 174.1478 ++ X509V3_get_value_bool; 174.1479 ++ X509V3_get_value_int; 174.1480 ++ X509V3_parse_list; 174.1481 ++ d2i_ASN1_GENERALIZEDTIME; 174.1482 ++ d2i_ASN1_TIME; 174.1483 ++ d2i_BASIC_CONSTRAINTS; 174.1484 ++ d2i_NETSCAPE_CERT_SEQUENCE; 174.1485 ++ d2i_ext_ku; 174.1486 ++ ext_ku_free; 174.1487 ++ ext_ku_new; 174.1488 ++ i2d_ASN1_GENERALIZEDTIME; 174.1489 ++ i2d_ASN1_TIME; 174.1490 ++ i2d_BASIC_CONSTRAINTS; 174.1491 ++ i2d_NETSCAPE_CERT_SEQUENCE; 174.1492 ++ i2d_ext_ku; 174.1493 ++ EVP_MD_CTX_copy; 174.1494 ++ i2d_ASN1_ENUMERATED; 174.1495 ++ d2i_ASN1_ENUMERATED; 174.1496 ++ ASN1_ENUMERATED_set; 174.1497 ++ ASN1_ENUMERATED_get; 174.1498 ++ BN_to_ASN1_ENUMERATED; 174.1499 ++ ASN1_ENUMERATED_to_BN; 174.1500 ++ i2a_ASN1_ENUMERATED; 174.1501 ++ a2i_ASN1_ENUMERATED; 174.1502 ++ i2d_GENERAL_NAME; 174.1503 ++ d2i_GENERAL_NAME; 174.1504 ++ GENERAL_NAME_new; 174.1505 ++ GENERAL_NAME_free; 174.1506 ++ GENERAL_NAMES_new; 174.1507 ++ GENERAL_NAMES_free; 174.1508 ++ d2i_GENERAL_NAMES; 174.1509 ++ i2d_GENERAL_NAMES; 174.1510 ++ i2v_GENERAL_NAMES; 174.1511 ++ i2s_ASN1_OCTET_STRING; 174.1512 ++ s2i_ASN1_OCTET_STRING; 174.1513 ++ X509V3_EXT_check_conf; 174.1514 ++ hex_to_string; 174.1515 ++ string_to_hex; 174.1516 ++ DES_ede3_cbcm_encrypt; 174.1517 ++ RSA_padding_add_PKCS1_OAEP; 174.1518 ++ RSA_padding_check_PKCS1_OAEP; 174.1519 ++ X509_CRL_print_fp; 174.1520 ++ X509_CRL_print; 174.1521 ++ i2v_GENERAL_NAME; 174.1522 ++ v2i_GENERAL_NAME; 174.1523 ++ i2d_PKEY_USAGE_PERIOD; 174.1524 ++ d2i_PKEY_USAGE_PERIOD; 174.1525 ++ PKEY_USAGE_PERIOD_new; 174.1526 ++ PKEY_USAGE_PERIOD_free; 174.1527 ++ v2i_GENERAL_NAMES; 174.1528 ++ i2s_ASN1_INTEGER; 174.1529 ++ X509V3_EXT_d2i; 174.1530 ++ name_cmp; 174.1531 ++ str_dup; 174.1532 ++ i2s_ASN1_ENUMERATED; 174.1533 ++ i2s_ASN1_ENUMERATED_TABLE; 174.1534 ++ BIO_s_log; 174.1535 ++ BIO_f_reliable; 174.1536 ++ PKCS7_dataFinal; 174.1537 ++ PKCS7_dataDecode; 174.1538 ++ X509V3_EXT_CRL_add_conf; 174.1539 ++ BN_set_params; 174.1540 ++ BN_get_params; 174.1541 ++ BIO_get_ex_num; 174.1542 ++ BIO_set_ex_free_func; 174.1543 ++ EVP_ripemd160; 174.1544 ++ ASN1_TIME_set; 174.1545 ++ i2d_AUTHORITY_KEYID; 174.1546 ++ d2i_AUTHORITY_KEYID; 174.1547 ++ AUTHORITY_KEYID_new; 174.1548 ++ AUTHORITY_KEYID_free; 174.1549 ++ ASN1_seq_unpack; 174.1550 ++ ASN1_seq_pack; 174.1551 ++ ASN1_unpack_string; 174.1552 ++ ASN1_pack_string; 174.1553 ++ PKCS12_pack_safebag; 174.1554 ++ PKCS12_MAKE_KEYBAG; 174.1555 ++ PKCS8_encrypt; 174.1556 ++ PKCS12_MAKE_SHKEYBAG; 174.1557 ++ PKCS12_pack_p7data; 174.1558 ++ PKCS12_pack_p7encdata; 174.1559 ++ PKCS12_add_localkeyid; 174.1560 ++ PKCS12_add_friendlyname_asc; 174.1561 ++ PKCS12_add_friendlyname_uni; 174.1562 ++ PKCS12_get_friendlyname; 174.1563 ++ PKCS12_pbe_crypt; 174.1564 ++ PKCS12_decrypt_d2i; 174.1565 ++ PKCS12_i2d_encrypt; 174.1566 ++ PKCS12_init; 174.1567 ++ PKCS12_key_gen_asc; 174.1568 ++ PKCS12_key_gen_uni; 174.1569 ++ PKCS12_gen_mac; 174.1570 ++ PKCS12_verify_mac; 174.1571 ++ PKCS12_set_mac; 174.1572 ++ PKCS12_setup_mac; 174.1573 ++ OPENSSL_asc2uni; 174.1574 ++ OPENSSL_uni2asc; 174.1575 ++ i2d_PKCS12_BAGS; 174.1576 ++ PKCS12_BAGS_new; 174.1577 ++ d2i_PKCS12_BAGS; 174.1578 ++ PKCS12_BAGS_free; 174.1579 ++ i2d_PKCS12; 174.1580 ++ d2i_PKCS12; 174.1581 ++ PKCS12_new; 174.1582 ++ PKCS12_free; 174.1583 ++ i2d_PKCS12_MAC_DATA; 174.1584 ++ PKCS12_MAC_DATA_new; 174.1585 ++ d2i_PKCS12_MAC_DATA; 174.1586 ++ PKCS12_MAC_DATA_free; 174.1587 ++ i2d_PKCS12_SAFEBAG; 174.1588 ++ PKCS12_SAFEBAG_new; 174.1589 ++ d2i_PKCS12_SAFEBAG; 174.1590 ++ PKCS12_SAFEBAG_free; 174.1591 ++ ERR_load_PKCS12_strings; 174.1592 ++ PKCS12_PBE_add; 174.1593 ++ PKCS8_add_keyusage; 174.1594 ++ PKCS12_get_attr_gen; 174.1595 ++ PKCS12_parse; 174.1596 ++ PKCS12_create; 174.1597 ++ i2d_PKCS12_bio; 174.1598 ++ i2d_PKCS12_fp; 174.1599 ++ d2i_PKCS12_bio; 174.1600 ++ d2i_PKCS12_fp; 174.1601 ++ i2d_PBEPARAM; 174.1602 ++ PBEPARAM_new; 174.1603 ++ d2i_PBEPARAM; 174.1604 ++ PBEPARAM_free; 174.1605 ++ i2d_PKCS8_PRIV_KEY_INFO; 174.1606 ++ PKCS8_PRIV_KEY_INFO_new; 174.1607 ++ d2i_PKCS8_PRIV_KEY_INFO; 174.1608 ++ PKCS8_PRIV_KEY_INFO_free; 174.1609 ++ EVP_PKCS82PKEY; 174.1610 ++ EVP_PKEY2PKCS8; 174.1611 ++ PKCS8_set_broken; 174.1612 ++ EVP_PBE_ALGOR_CipherInit; 174.1613 ++ EVP_PBE_alg_add; 174.1614 ++ PKCS5_pbe_set; 174.1615 ++ EVP_PBE_cleanup; 174.1616 ++ i2d_SXNET; 174.1617 ++ d2i_SXNET; 174.1618 ++ SXNET_new; 174.1619 ++ SXNET_free; 174.1620 ++ i2d_SXNETID; 174.1621 ++ d2i_SXNETID; 174.1622 ++ SXNETID_new; 174.1623 ++ SXNETID_free; 174.1624 ++ DSA_SIG_new; 174.1625 ++ DSA_SIG_free; 174.1626 ++ DSA_do_sign; 174.1627 ++ DSA_do_verify; 174.1628 ++ d2i_DSA_SIG; 174.1629 ++ i2d_DSA_SIG; 174.1630 ++ i2d_ASN1_VISIBLESTRING; 174.1631 ++ d2i_ASN1_VISIBLESTRING; 174.1632 ++ i2d_ASN1_UTF8STRING; 174.1633 ++ d2i_ASN1_UTF8STRING; 174.1634 ++ i2d_DIRECTORYSTRING; 174.1635 ++ d2i_DIRECTORYSTRING; 174.1636 ++ i2d_DISPLAYTEXT; 174.1637 ++ d2i_DISPLAYTEXT; 174.1638 ++ d2i_ASN1_SET_OF_X509; 174.1639 ++ i2d_ASN1_SET_OF_X509; 174.1640 ++ i2d_PBKDF2PARAM; 174.1641 ++ PBKDF2PARAM_new; 174.1642 ++ d2i_PBKDF2PARAM; 174.1643 ++ PBKDF2PARAM_free; 174.1644 ++ i2d_PBE2PARAM; 174.1645 ++ PBE2PARAM_new; 174.1646 ++ d2i_PBE2PARAM; 174.1647 ++ PBE2PARAM_free; 174.1648 ++ d2i_ASN1_SET_OF_GENERAL_NAME; 174.1649 ++ i2d_ASN1_SET_OF_GENERAL_NAME; 174.1650 ++ d2i_ASN1_SET_OF_SXNETID; 174.1651 ++ i2d_ASN1_SET_OF_SXNETID; 174.1652 ++ d2i_ASN1_SET_OF_POLICYQUALINFO; 174.1653 ++ i2d_ASN1_SET_OF_POLICYQUALINFO; 174.1654 ++ d2i_ASN1_SET_OF_POLICYINFO; 174.1655 ++ i2d_ASN1_SET_OF_POLICYINFO; 174.1656 ++ SXNET_add_id_asc; 174.1657 ++ SXNET_add_id_ulong; 174.1658 ++ SXNET_add_id_INTEGER; 174.1659 ++ SXNET_get_id_asc; 174.1660 ++ SXNET_get_id_ulong; 174.1661 ++ SXNET_get_id_INTEGER; 174.1662 ++ X509V3_set_conf_lhash; 174.1663 ++ i2d_CERTIFICATEPOLICIES; 174.1664 ++ CERTIFICATEPOLICIES_new; 174.1665 ++ CERTIFICATEPOLICIES_free; 174.1666 ++ d2i_CERTIFICATEPOLICIES; 174.1667 ++ i2d_POLICYINFO; 174.1668 ++ POLICYINFO_new; 174.1669 ++ d2i_POLICYINFO; 174.1670 ++ POLICYINFO_free; 174.1671 ++ i2d_POLICYQUALINFO; 174.1672 ++ POLICYQUALINFO_new; 174.1673 ++ d2i_POLICYQUALINFO; 174.1674 ++ POLICYQUALINFO_free; 174.1675 ++ i2d_USERNOTICE; 174.1676 ++ USERNOTICE_new; 174.1677 ++ d2i_USERNOTICE; 174.1678 ++ USERNOTICE_free; 174.1679 ++ i2d_NOTICEREF; 174.1680 ++ NOTICEREF_new; 174.1681 ++ d2i_NOTICEREF; 174.1682 ++ NOTICEREF_free; 174.1683 ++ X509V3_get_string; 174.1684 ++ X509V3_get_section; 174.1685 ++ X509V3_string_free; 174.1686 ++ X509V3_section_free; 174.1687 ++ X509V3_set_ctx; 174.1688 ++ s2i_ASN1_INTEGER; 174.1689 ++ CRYPTO_set_locked_mem_functions; 174.1690 ++ CRYPTO_get_locked_mem_functions; 174.1691 ++ CRYPTO_malloc_locked; 174.1692 ++ CRYPTO_free_locked; 174.1693 ++ BN_mod_exp2_mont; 174.1694 ++ ERR_get_error_line_data; 174.1695 ++ ERR_peek_error_line_data; 174.1696 ++ PKCS12_PBE_keyivgen; 174.1697 ++ X509_ALGOR_dup; 174.1698 ++ d2i_ASN1_SET_OF_DIST_POINT; 174.1699 ++ i2d_ASN1_SET_OF_DIST_POINT; 174.1700 ++ i2d_CRL_DIST_POINTS; 174.1701 ++ CRL_DIST_POINTS_new; 174.1702 ++ CRL_DIST_POINTS_free; 174.1703 ++ d2i_CRL_DIST_POINTS; 174.1704 ++ i2d_DIST_POINT; 174.1705 ++ DIST_POINT_new; 174.1706 ++ d2i_DIST_POINT; 174.1707 ++ DIST_POINT_free; 174.1708 ++ i2d_DIST_POINT_NAME; 174.1709 ++ DIST_POINT_NAME_new; 174.1710 ++ DIST_POINT_NAME_free; 174.1711 ++ d2i_DIST_POINT_NAME; 174.1712 ++ X509V3_add_value_uchar; 174.1713 ++ d2i_ASN1_SET_OF_X509_ATTRIBUTE; 174.1714 ++ i2d_ASN1_SET_OF_ASN1_TYPE; 174.1715 ++ d2i_ASN1_SET_OF_X509_EXTENSION; 174.1716 ++ d2i_ASN1_SET_OF_X509_NAME_ENTRY; 174.1717 ++ d2i_ASN1_SET_OF_ASN1_TYPE; 174.1718 ++ i2d_ASN1_SET_OF_X509_ATTRIBUTE; 174.1719 ++ i2d_ASN1_SET_OF_X509_EXTENSION; 174.1720 ++ i2d_ASN1_SET_OF_X509_NAME_ENTRY; 174.1721 ++ X509V3_EXT_i2d; 174.1722 ++ X509V3_EXT_val_prn; 174.1723 ++ X509V3_EXT_add_list; 174.1724 ++ EVP_CIPHER_type; 174.1725 ++ EVP_PBE_CipherInit; 174.1726 ++ X509V3_add_value_bool_nf; 174.1727 ++ d2i_ASN1_UINTEGER; 174.1728 ++ sk_value; 174.1729 ++ sk_num; 174.1730 ++ sk_set; 174.1731 ++ i2d_ASN1_SET_OF_X509_REVOKED; 174.1732 ++ sk_sort; 174.1733 ++ d2i_ASN1_SET_OF_X509_REVOKED; 174.1734 ++ i2d_ASN1_SET_OF_X509_ALGOR; 174.1735 ++ i2d_ASN1_SET_OF_X509_CRL; 174.1736 ++ d2i_ASN1_SET_OF_X509_ALGOR; 174.1737 ++ d2i_ASN1_SET_OF_X509_CRL; 174.1738 ++ i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO; 174.1739 ++ i2d_ASN1_SET_OF_PKCS7_RECIP_INFO; 174.1740 ++ d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO; 174.1741 ++ d2i_ASN1_SET_OF_PKCS7_RECIP_INFO; 174.1742 ++ PKCS5_PBE_add; 174.1743 ++ PEM_write_bio_PKCS8; 174.1744 ++ i2d_PKCS8_fp; 174.1745 ++ PEM_read_bio_PKCS8_PRIV_KEY_INFO; 174.1746 ++ PEM_read_bio_P8_PRIV_KEY_INFO; 174.1747 ++ d2i_PKCS8_bio; 174.1748 ++ d2i_PKCS8_PRIV_KEY_INFO_fp; 174.1749 ++ PEM_write_bio_PKCS8_PRIV_KEY_INFO; 174.1750 ++ PEM_write_bio_P8_PRIV_KEY_INFO; 174.1751 ++ PEM_read_PKCS8; 174.1752 ++ d2i_PKCS8_PRIV_KEY_INFO_bio; 174.1753 ++ d2i_PKCS8_fp; 174.1754 ++ PEM_write_PKCS8; 174.1755 ++ PEM_read_PKCS8_PRIV_KEY_INFO; 174.1756 ++ PEM_read_P8_PRIV_KEY_INFO; 174.1757 ++ PEM_read_bio_PKCS8; 174.1758 ++ PEM_write_PKCS8_PRIV_KEY_INFO; 174.1759 ++ PEM_write_P8_PRIV_KEY_INFO; 174.1760 ++ PKCS5_PBE_keyivgen; 174.1761 ++ i2d_PKCS8_bio; 174.1762 ++ i2d_PKCS8_PRIV_KEY_INFO_fp; 174.1763 ++ i2d_PKCS8_PRIV_KEY_INFO_bio; 174.1764 ++ BIO_s_bio; 174.1765 ++ PKCS5_pbe2_set; 174.1766 ++ PKCS5_PBKDF2_HMAC_SHA1; 174.1767 ++ PKCS5_v2_PBE_keyivgen; 174.1768 ++ PEM_write_bio_PKCS8PrivateKey; 174.1769 ++ PEM_write_PKCS8PrivateKey; 174.1770 ++ BIO_ctrl_get_read_request; 174.1771 ++ BIO_ctrl_pending; 174.1772 ++ BIO_ctrl_wpending; 174.1773 ++ BIO_new_bio_pair; 174.1774 ++ BIO_ctrl_get_write_guarantee; 174.1775 ++ CRYPTO_num_locks; 174.1776 ++ CONF_load_bio; 174.1777 ++ CONF_load_fp; 174.1778 ++ i2d_ASN1_SET_OF_ASN1_OBJECT; 174.1779 ++ d2i_ASN1_SET_OF_ASN1_OBJECT; 174.1780 ++ PKCS7_signatureVerify; 174.1781 ++ RSA_set_method; 174.1782 ++ RSA_get_method; 174.1783 ++ RSA_get_default_method; 174.1784 ++ RSA_check_key; 174.1785 ++ OBJ_obj2txt; 174.1786 ++ DSA_dup_DH; 174.1787 ++ X509_REQ_get_extensions; 174.1788 ++ X509_REQ_set_extension_nids; 174.1789 ++ BIO_nwrite; 174.1790 ++ X509_REQ_extension_nid; 174.1791 ++ BIO_nread; 174.1792 ++ X509_REQ_get_extension_nids; 174.1793 ++ BIO_nwrite0; 174.1794 ++ X509_REQ_add_extensions_nid; 174.1795 ++ BIO_nread0; 174.1796 ++ X509_REQ_add_extensions; 174.1797 ++ BIO_new_mem_buf; 174.1798 ++ DH_set_ex_data; 174.1799 ++ DH_set_method; 174.1800 ++ DSA_OpenSSL; 174.1801 ++ DH_get_ex_data; 174.1802 ++ DH_get_ex_new_index; 174.1803 ++ DSA_new_method; 174.1804 ++ DH_new_method; 174.1805 ++ DH_OpenSSL; 174.1806 ++ DSA_get_ex_new_index; 174.1807 ++ DH_get_default_method; 174.1808 ++ DSA_set_ex_data; 174.1809 ++ DH_set_default_method; 174.1810 ++ DSA_get_ex_data; 174.1811 ++ X509V3_EXT_REQ_add_conf; 174.1812 ++ NETSCAPE_SPKI_print; 174.1813 ++ NETSCAPE_SPKI_set_pubkey; 174.1814 ++ NETSCAPE_SPKI_b64_encode; 174.1815 ++ NETSCAPE_SPKI_get_pubkey; 174.1816 ++ NETSCAPE_SPKI_b64_decode; 174.1817 ++ UTF8_putc; 174.1818 ++ UTF8_getc; 174.1819 ++ RSA_null_method; 174.1820 ++ ASN1_tag2str; 174.1821 ++ BIO_ctrl_reset_read_request; 174.1822 ++ DISPLAYTEXT_new; 174.1823 ++ ASN1_GENERALIZEDTIME_free; 174.1824 ++ X509_REVOKED_get_ext_d2i; 174.1825 ++ X509_set_ex_data; 174.1826 ++ X509_reject_set_bit_asc; 174.1827 ++ X509_NAME_add_entry_by_txt; 174.1828 ++ X509_NAME_add_entry_by_NID; 174.1829 ++ X509_PURPOSE_get0; 174.1830 ++ PEM_read_X509_AUX; 174.1831 ++ d2i_AUTHORITY_INFO_ACCESS; 174.1832 ++ PEM_write_PUBKEY; 174.1833 ++ ACCESS_DESCRIPTION_new; 174.1834 ++ X509_CERT_AUX_free; 174.1835 ++ d2i_ACCESS_DESCRIPTION; 174.1836 ++ X509_trust_clear; 174.1837 ++ X509_TRUST_add; 174.1838 ++ ASN1_VISIBLESTRING_new; 174.1839 ++ X509_alias_set1; 174.1840 ++ ASN1_PRINTABLESTRING_free; 174.1841 ++ EVP_PKEY_get1_DSA; 174.1842 ++ ASN1_BMPSTRING_new; 174.1843 ++ ASN1_mbstring_copy; 174.1844 ++ ASN1_UTF8STRING_new; 174.1845 ++ DSA_get_default_method; 174.1846 ++ i2d_ASN1_SET_OF_ACCESS_DESCRIPTION; 174.1847 ++ ASN1_T61STRING_free; 174.1848 ++ DSA_set_method; 174.1849 ++ X509_get_ex_data; 174.1850 ++ ASN1_STRING_type; 174.1851 ++ X509_PURPOSE_get_by_sname; 174.1852 ++ ASN1_TIME_free; 174.1853 ++ ASN1_OCTET_STRING_cmp; 174.1854 ++ ASN1_BIT_STRING_new; 174.1855 ++ X509_get_ext_d2i; 174.1856 ++ PEM_read_bio_X509_AUX; 174.1857 ++ ASN1_STRING_set_default_mask_asc; 174.1858 ++ ASN1_STRING_set_def_mask_asc; 174.1859 ++ PEM_write_bio_RSA_PUBKEY; 174.1860 ++ ASN1_INTEGER_cmp; 174.1861 ++ d2i_RSA_PUBKEY_fp; 174.1862 ++ X509_trust_set_bit_asc; 174.1863 ++ PEM_write_bio_DSA_PUBKEY; 174.1864 ++ X509_STORE_CTX_free; 174.1865 ++ EVP_PKEY_set1_DSA; 174.1866 ++ i2d_DSA_PUBKEY_fp; 174.1867 ++ X509_load_cert_crl_file; 174.1868 ++ ASN1_TIME_new; 174.1869 ++ i2d_RSA_PUBKEY; 174.1870 ++ X509_STORE_CTX_purpose_inherit; 174.1871 ++ PEM_read_RSA_PUBKEY; 174.1872 ++ d2i_X509_AUX; 174.1873 ++ i2d_DSA_PUBKEY; 174.1874 ++ X509_CERT_AUX_print; 174.1875 ++ PEM_read_DSA_PUBKEY; 174.1876 ++ i2d_RSA_PUBKEY_bio; 174.1877 ++ ASN1_BIT_STRING_num_asc; 174.1878 ++ i2d_PUBKEY; 174.1879 ++ ASN1_UTCTIME_free; 174.1880 ++ DSA_set_default_method; 174.1881 ++ X509_PURPOSE_get_by_id; 174.1882 ++ ACCESS_DESCRIPTION_free; 174.1883 ++ PEM_read_bio_PUBKEY; 174.1884 ++ ASN1_STRING_set_by_NID; 174.1885 ++ X509_PURPOSE_get_id; 174.1886 ++ DISPLAYTEXT_free; 174.1887 ++ OTHERNAME_new; 174.1888 ++ X509_CERT_AUX_new; 174.1889 ++ X509_TRUST_cleanup; 174.1890 ++ X509_NAME_add_entry_by_OBJ; 174.1891 ++ X509_CRL_get_ext_d2i; 174.1892 ++ X509_PURPOSE_get0_name; 174.1893 ++ PEM_read_PUBKEY; 174.1894 ++ i2d_DSA_PUBKEY_bio; 174.1895 ++ i2d_OTHERNAME; 174.1896 ++ ASN1_OCTET_STRING_free; 174.1897 ++ ASN1_BIT_STRING_set_asc; 174.1898 ++ X509_get_ex_new_index; 174.1899 ++ ASN1_STRING_TABLE_cleanup; 174.1900 ++ X509_TRUST_get_by_id; 174.1901 ++ X509_PURPOSE_get_trust; 174.1902 ++ ASN1_STRING_length; 174.1903 ++ d2i_ASN1_SET_OF_ACCESS_DESCRIPTION; 174.1904 ++ ASN1_PRINTABLESTRING_new; 174.1905 ++ X509V3_get_d2i; 174.1906 ++ ASN1_ENUMERATED_free; 174.1907 ++ i2d_X509_CERT_AUX; 174.1908 ++ X509_STORE_CTX_set_trust; 174.1909 ++ ASN1_STRING_set_default_mask; 174.1910 ++ X509_STORE_CTX_new; 174.1911 ++ EVP_PKEY_get1_RSA; 174.1912 ++ DIRECTORYSTRING_free; 174.1913 ++ PEM_write_X509_AUX; 174.1914 ++ ASN1_OCTET_STRING_set; 174.1915 ++ d2i_DSA_PUBKEY_fp; 174.1916 ++ d2i_RSA_PUBKEY; 174.1917 ++ X509_TRUST_get0_name; 174.1918 ++ X509_TRUST_get0; 174.1919 ++ AUTHORITY_INFO_ACCESS_free; 174.1920 ++ ASN1_IA5STRING_new; 174.1921 ++ d2i_DSA_PUBKEY; 174.1922 ++ X509_check_purpose; 174.1923 ++ ASN1_ENUMERATED_new; 174.1924 ++ d2i_RSA_PUBKEY_bio; 174.1925 ++ d2i_PUBKEY; 174.1926 ++ X509_TRUST_get_trust; 174.1927 ++ X509_TRUST_get_flags; 174.1928 ++ ASN1_BMPSTRING_free; 174.1929 ++ ASN1_T61STRING_new; 174.1930 ++ ASN1_UTCTIME_new; 174.1931 ++ i2d_AUTHORITY_INFO_ACCESS; 174.1932 ++ EVP_PKEY_set1_RSA; 174.1933 ++ X509_STORE_CTX_set_purpose; 174.1934 ++ ASN1_IA5STRING_free; 174.1935 ++ PEM_write_bio_X509_AUX; 174.1936 ++ X509_PURPOSE_get_count; 174.1937 ++ CRYPTO_add_info; 174.1938 ++ X509_NAME_ENTRY_create_by_txt; 174.1939 ++ ASN1_STRING_get_default_mask; 174.1940 ++ X509_alias_get0; 174.1941 ++ ASN1_STRING_data; 174.1942 ++ i2d_ACCESS_DESCRIPTION; 174.1943 ++ X509_trust_set_bit; 174.1944 ++ ASN1_BIT_STRING_free; 174.1945 ++ PEM_read_bio_RSA_PUBKEY; 174.1946 ++ X509_add1_reject_object; 174.1947 ++ X509_check_trust; 174.1948 ++ PEM_read_bio_DSA_PUBKEY; 174.1949 ++ X509_PURPOSE_add; 174.1950 ++ ASN1_STRING_TABLE_get; 174.1951 ++ ASN1_UTF8STRING_free; 174.1952 ++ d2i_DSA_PUBKEY_bio; 174.1953 ++ PEM_write_RSA_PUBKEY; 174.1954 ++ d2i_OTHERNAME; 174.1955 ++ X509_reject_set_bit; 174.1956 ++ PEM_write_DSA_PUBKEY; 174.1957 ++ X509_PURPOSE_get0_sname; 174.1958 ++ EVP_PKEY_set1_DH; 174.1959 ++ ASN1_OCTET_STRING_dup; 174.1960 ++ ASN1_BIT_STRING_set; 174.1961 ++ X509_TRUST_get_count; 174.1962 ++ ASN1_INTEGER_free; 174.1963 ++ OTHERNAME_free; 174.1964 ++ i2d_RSA_PUBKEY_fp; 174.1965 ++ ASN1_INTEGER_dup; 174.1966 ++ d2i_X509_CERT_AUX; 174.1967 ++ PEM_write_bio_PUBKEY; 174.1968 ++ ASN1_VISIBLESTRING_free; 174.1969 ++ X509_PURPOSE_cleanup; 174.1970 ++ ASN1_mbstring_ncopy; 174.1971 ++ ASN1_GENERALIZEDTIME_new; 174.1972 ++ EVP_PKEY_get1_DH; 174.1973 ++ ASN1_OCTET_STRING_new; 174.1974 ++ ASN1_INTEGER_new; 174.1975 ++ i2d_X509_AUX; 174.1976 ++ ASN1_BIT_STRING_name_print; 174.1977 ++ X509_cmp; 174.1978 ++ ASN1_STRING_length_set; 174.1979 ++ DIRECTORYSTRING_new; 174.1980 ++ X509_add1_trust_object; 174.1981 ++ PKCS12_newpass; 174.1982 ++ SMIME_write_PKCS7; 174.1983 ++ SMIME_read_PKCS7; 174.1984 ++ DES_set_key_checked; 174.1985 ++ PKCS7_verify; 174.1986 ++ PKCS7_encrypt; 174.1987 ++ DES_set_key_unchecked; 174.1988 ++ SMIME_crlf_copy; 174.1989 ++ i2d_ASN1_PRINTABLESTRING; 174.1990 ++ PKCS7_get0_signers; 174.1991 ++ PKCS7_decrypt; 174.1992 ++ SMIME_text; 174.1993 ++ PKCS7_simple_smimecap; 174.1994 ++ PKCS7_get_smimecap; 174.1995 ++ PKCS7_sign; 174.1996 ++ PKCS7_add_attrib_smimecap; 174.1997 ++ CRYPTO_dbg_set_options; 174.1998 ++ CRYPTO_remove_all_info; 174.1999 ++ CRYPTO_get_mem_debug_functions; 174.2000 ++ CRYPTO_is_mem_check_on; 174.2001 ++ CRYPTO_set_mem_debug_functions; 174.2002 ++ CRYPTO_pop_info; 174.2003 ++ CRYPTO_push_info_; 174.2004 ++ CRYPTO_set_mem_debug_options; 174.2005 ++ PEM_write_PKCS8PrivateKey_nid; 174.2006 ++ PEM_write_bio_PKCS8PrivateKey_nid; 174.2007 ++ PEM_write_bio_PKCS8PrivKey_nid; 174.2008 ++ d2i_PKCS8PrivateKey_bio; 174.2009 ++ ASN1_NULL_free; 174.2010 ++ d2i_ASN1_NULL; 174.2011 ++ ASN1_NULL_new; 174.2012 ++ i2d_PKCS8PrivateKey_bio; 174.2013 ++ i2d_PKCS8PrivateKey_fp; 174.2014 ++ i2d_ASN1_NULL; 174.2015 ++ i2d_PKCS8PrivateKey_nid_fp; 174.2016 ++ d2i_PKCS8PrivateKey_fp; 174.2017 ++ i2d_PKCS8PrivateKey_nid_bio; 174.2018 ++ i2d_PKCS8PrivateKeyInfo_fp; 174.2019 ++ i2d_PKCS8PrivateKeyInfo_bio; 174.2020 ++ PEM_cb; 174.2021 ++ i2d_PrivateKey_fp; 174.2022 ++ d2i_PrivateKey_bio; 174.2023 ++ d2i_PrivateKey_fp; 174.2024 ++ i2d_PrivateKey_bio; 174.2025 ++ X509_reject_clear; 174.2026 ++ X509_TRUST_set_default; 174.2027 ++ d2i_AutoPrivateKey; 174.2028 ++ X509_ATTRIBUTE_get0_type; 174.2029 ++ X509_ATTRIBUTE_set1_data; 174.2030 ++ X509at_get_attr; 174.2031 ++ X509at_get_attr_count; 174.2032 ++ X509_ATTRIBUTE_create_by_NID; 174.2033 ++ X509_ATTRIBUTE_set1_object; 174.2034 ++ X509_ATTRIBUTE_count; 174.2035 ++ X509_ATTRIBUTE_create_by_OBJ; 174.2036 ++ X509_ATTRIBUTE_get0_object; 174.2037 ++ X509at_get_attr_by_NID; 174.2038 ++ X509at_add1_attr; 174.2039 ++ X509_ATTRIBUTE_get0_data; 174.2040 ++ X509at_delete_attr; 174.2041 ++ X509at_get_attr_by_OBJ; 174.2042 ++ RAND_add; 174.2043 ++ BIO_number_written; 174.2044 ++ BIO_number_read; 174.2045 ++ X509_STORE_CTX_get1_chain; 174.2046 ++ ERR_load_RAND_strings; 174.2047 ++ RAND_pseudo_bytes; 174.2048 ++ X509_REQ_get_attr_by_NID; 174.2049 ++ X509_REQ_get_attr; 174.2050 ++ X509_REQ_add1_attr_by_NID; 174.2051 ++ X509_REQ_get_attr_by_OBJ; 174.2052 ++ X509at_add1_attr_by_NID; 174.2053 ++ X509_REQ_add1_attr_by_OBJ; 174.2054 ++ X509_REQ_get_attr_count; 174.2055 ++ X509_REQ_add1_attr; 174.2056 ++ X509_REQ_delete_attr; 174.2057 ++ X509at_add1_attr_by_OBJ; 174.2058 ++ X509_REQ_add1_attr_by_txt; 174.2059 ++ X509_ATTRIBUTE_create_by_txt; 174.2060 ++ X509at_add1_attr_by_txt; 174.2061 ++ BN_pseudo_rand; 174.2062 ++ BN_is_prime_fasttest; 174.2063 ++ BN_CTX_end; 174.2064 ++ BN_CTX_start; 174.2065 ++ BN_CTX_get; 174.2066 ++ EVP_PKEY2PKCS8_broken; 174.2067 ++ ASN1_STRING_TABLE_add; 174.2068 ++ CRYPTO_dbg_get_options; 174.2069 ++ AUTHORITY_INFO_ACCESS_new; 174.2070 ++ CRYPTO_get_mem_debug_options; 174.2071 ++ DES_crypt; 174.2072 ++ PEM_write_bio_X509_REQ_NEW; 174.2073 ++ PEM_write_X509_REQ_NEW; 174.2074 ++ BIO_callback_ctrl; 174.2075 ++ RAND_egd; 174.2076 ++ RAND_status; 174.2077 ++ bn_dump1; 174.2078 ++ DES_check_key_parity; 174.2079 ++ lh_num_items; 174.2080 ++ RAND_event; 174.2081 ++ DSO_new; 174.2082 ++ DSO_new_method; 174.2083 ++ DSO_free; 174.2084 ++ DSO_flags; 174.2085 ++ DSO_up; 174.2086 ++ DSO_set_default_method; 174.2087 ++ DSO_get_default_method; 174.2088 ++ DSO_get_method; 174.2089 ++ DSO_set_method; 174.2090 ++ DSO_load; 174.2091 ++ DSO_bind_var; 174.2092 ++ DSO_METHOD_null; 174.2093 ++ DSO_METHOD_openssl; 174.2094 ++ DSO_METHOD_dlfcn; 174.2095 ++ DSO_METHOD_win32; 174.2096 ++ ERR_load_DSO_strings; 174.2097 ++ DSO_METHOD_dl; 174.2098 ++ NCONF_load; 174.2099 ++ NCONF_load_fp; 174.2100 ++ NCONF_new; 174.2101 ++ NCONF_get_string; 174.2102 ++ NCONF_free; 174.2103 ++ NCONF_get_number; 174.2104 ++ CONF_dump_fp; 174.2105 ++ NCONF_load_bio; 174.2106 ++ NCONF_dump_fp; 174.2107 ++ NCONF_get_section; 174.2108 ++ NCONF_dump_bio; 174.2109 ++ CONF_dump_bio; 174.2110 ++ NCONF_free_data; 174.2111 ++ CONF_set_default_method; 174.2112 ++ ERR_error_string_n; 174.2113 ++ BIO_snprintf; 174.2114 ++ DSO_ctrl; 174.2115 ++ i2d_ASN1_SET_OF_ASN1_INTEGER; 174.2116 ++ i2d_ASN1_SET_OF_PKCS12_SAFEBAG; 174.2117 ++ i2d_ASN1_SET_OF_PKCS7; 174.2118 ++ BIO_vfree; 174.2119 ++ d2i_ASN1_SET_OF_ASN1_INTEGER; 174.2120 ++ d2i_ASN1_SET_OF_PKCS12_SAFEBAG; 174.2121 ++ ASN1_UTCTIME_get; 174.2122 ++ X509_REQ_digest; 174.2123 ++ X509_CRL_digest; 174.2124 ++ d2i_ASN1_SET_OF_PKCS7; 174.2125 ++ EVP_CIPHER_CTX_set_key_length; 174.2126 ++ EVP_CIPHER_CTX_ctrl; 174.2127 ++ BN_mod_exp_mont_word; 174.2128 ++ RAND_egd_bytes; 174.2129 ++ X509_REQ_get1_email; 174.2130 ++ X509_get1_email; 174.2131 ++ X509_email_free; 174.2132 ++ i2d_RSA_NET; 174.2133 ++ d2i_RSA_NET_2; 174.2134 ++ d2i_RSA_NET; 174.2135 ++ DSO_bind_func; 174.2136 ++ CRYPTO_get_new_dynlockid; 174.2137 ++ sk_new_null; 174.2138 ++ CRYPTO_set_dynlock_destroy_callback; 174.2139 ++ CRYPTO_set_dynlock_destroy_cb; 174.2140 ++ CRYPTO_destroy_dynlockid; 174.2141 ++ CRYPTO_set_dynlock_size; 174.2142 ++ CRYPTO_set_dynlock_create_callback; 174.2143 ++ CRYPTO_set_dynlock_create_cb; 174.2144 ++ CRYPTO_set_dynlock_lock_callback; 174.2145 ++ CRYPTO_set_dynlock_lock_cb; 174.2146 ++ CRYPTO_get_dynlock_lock_callback; 174.2147 ++ CRYPTO_get_dynlock_lock_cb; 174.2148 ++ CRYPTO_get_dynlock_destroy_callback; 174.2149 ++ CRYPTO_get_dynlock_destroy_cb; 174.2150 ++ CRYPTO_get_dynlock_value; 174.2151 ++ CRYPTO_get_dynlock_create_callback; 174.2152 ++ CRYPTO_get_dynlock_create_cb; 174.2153 ++ c2i_ASN1_BIT_STRING; 174.2154 ++ i2c_ASN1_BIT_STRING; 174.2155 ++ RAND_poll; 174.2156 ++ c2i_ASN1_INTEGER; 174.2157 ++ i2c_ASN1_INTEGER; 174.2158 ++ BIO_dump_indent; 174.2159 ++ ASN1_parse_dump; 174.2160 ++ c2i_ASN1_OBJECT; 174.2161 ++ X509_NAME_print_ex_fp; 174.2162 ++ ASN1_STRING_print_ex_fp; 174.2163 ++ X509_NAME_print_ex; 174.2164 ++ ASN1_STRING_print_ex; 174.2165 ++ MD4; 174.2166 ++ MD4_Transform; 174.2167 ++ MD4_Final; 174.2168 ++ MD4_Update; 174.2169 ++ MD4_Init; 174.2170 ++ EVP_md4; 174.2171 ++ i2d_PUBKEY_bio; 174.2172 ++ i2d_PUBKEY_fp; 174.2173 ++ d2i_PUBKEY_bio; 174.2174 ++ ASN1_STRING_to_UTF8; 174.2175 ++ BIO_vprintf; 174.2176 ++ BIO_vsnprintf; 174.2177 ++ d2i_PUBKEY_fp; 174.2178 ++ X509_cmp_time; 174.2179 ++ X509_STORE_CTX_set_time; 174.2180 ++ X509_STORE_CTX_get1_issuer; 174.2181 ++ X509_OBJECT_retrieve_match; 174.2182 ++ X509_OBJECT_idx_by_subject; 174.2183 ++ X509_STORE_CTX_set_flags; 174.2184 ++ X509_STORE_CTX_trusted_stack; 174.2185 ++ X509_time_adj; 174.2186 ++ X509_check_issued; 174.2187 ++ ASN1_UTCTIME_cmp_time_t; 174.2188 ++ DES_set_weak_key_flag; 174.2189 ++ DES_check_key; 174.2190 ++ DES_rw_mode; 174.2191 ++ RSA_PKCS1_RSAref; 174.2192 ++ X509_keyid_set1; 174.2193 ++ BIO_next; 174.2194 ++ DSO_METHOD_vms; 174.2195 ++ BIO_f_linebuffer; 174.2196 ++ BN_bntest_rand; 174.2197 ++ OPENSSL_issetugid; 174.2198 ++ BN_rand_range; 174.2199 ++ ERR_load_ENGINE_strings; 174.2200 ++ ENGINE_set_DSA; 174.2201 ++ ENGINE_get_finish_function; 174.2202 ++ ENGINE_get_default_RSA; 174.2203 ++ ENGINE_get_BN_mod_exp; 174.2204 ++ DSA_get_default_openssl_method; 174.2205 ++ ENGINE_set_DH; 174.2206 ++ ENGINE_set_def_BN_mod_exp_crt; 174.2207 ++ ENGINE_set_default_BN_mod_exp_crt; 174.2208 ++ ENGINE_init; 174.2209 ++ DH_get_default_openssl_method; 174.2210 ++ RSA_set_default_openssl_method; 174.2211 ++ ENGINE_finish; 174.2212 ++ ENGINE_load_public_key; 174.2213 ++ ENGINE_get_DH; 174.2214 ++ ENGINE_ctrl; 174.2215 ++ ENGINE_get_init_function; 174.2216 ++ ENGINE_set_init_function; 174.2217 ++ ENGINE_set_default_DSA; 174.2218 ++ ENGINE_get_name; 174.2219 ++ ENGINE_get_last; 174.2220 ++ ENGINE_get_prev; 174.2221 ++ ENGINE_get_default_DH; 174.2222 ++ ENGINE_get_RSA; 174.2223 ++ ENGINE_set_default; 174.2224 ++ ENGINE_get_RAND; 174.2225 ++ ENGINE_get_first; 174.2226 ++ ENGINE_by_id; 174.2227 ++ ENGINE_set_finish_function; 174.2228 ++ ENGINE_get_def_BN_mod_exp_crt; 174.2229 ++ ENGINE_get_default_BN_mod_exp_crt; 174.2230 ++ RSA_get_default_openssl_method; 174.2231 ++ ENGINE_set_RSA; 174.2232 ++ ENGINE_load_private_key; 174.2233 ++ ENGINE_set_default_RAND; 174.2234 ++ ENGINE_set_BN_mod_exp; 174.2235 ++ ENGINE_remove; 174.2236 ++ ENGINE_free; 174.2237 ++ ENGINE_get_BN_mod_exp_crt; 174.2238 ++ ENGINE_get_next; 174.2239 ++ ENGINE_set_name; 174.2240 ++ ENGINE_get_default_DSA; 174.2241 ++ ENGINE_set_default_BN_mod_exp; 174.2242 ++ ENGINE_set_default_RSA; 174.2243 ++ ENGINE_get_default_RAND; 174.2244 ++ ENGINE_get_default_BN_mod_exp; 174.2245 ++ ENGINE_set_RAND; 174.2246 ++ ENGINE_set_id; 174.2247 ++ ENGINE_set_BN_mod_exp_crt; 174.2248 ++ ENGINE_set_default_DH; 174.2249 ++ ENGINE_new; 174.2250 ++ ENGINE_get_id; 174.2251 ++ DSA_set_default_openssl_method; 174.2252 ++ ENGINE_add; 174.2253 ++ DH_set_default_openssl_method; 174.2254 ++ ENGINE_get_DSA; 174.2255 ++ ENGINE_get_ctrl_function; 174.2256 ++ ENGINE_set_ctrl_function; 174.2257 ++ BN_pseudo_rand_range; 174.2258 ++ X509_STORE_CTX_set_verify_cb; 174.2259 ++ ERR_load_COMP_strings; 174.2260 ++ PKCS12_item_decrypt_d2i; 174.2261 ++ ASN1_UTF8STRING_it; 174.2262 ++ ENGINE_unregister_ciphers; 174.2263 ++ ENGINE_get_ciphers; 174.2264 ++ d2i_OCSP_BASICRESP; 174.2265 ++ KRB5_CHECKSUM_it; 174.2266 ++ EC_POINT_add; 174.2267 ++ ASN1_item_ex_i2d; 174.2268 ++ OCSP_CERTID_it; 174.2269 ++ d2i_OCSP_RESPBYTES; 174.2270 ++ X509V3_add1_i2d; 174.2271 ++ PKCS7_ENVELOPE_it; 174.2272 ++ UI_add_input_boolean; 174.2273 ++ ENGINE_unregister_RSA; 174.2274 ++ X509V3_EXT_nconf; 174.2275 ++ ASN1_GENERALSTRING_free; 174.2276 ++ d2i_OCSP_CERTSTATUS; 174.2277 ++ X509_REVOKED_set_serialNumber; 174.2278 ++ X509_print_ex; 174.2279 ++ OCSP_ONEREQ_get1_ext_d2i; 174.2280 ++ ENGINE_register_all_RAND; 174.2281 ++ ENGINE_load_dynamic; 174.2282 ++ PBKDF2PARAM_it; 174.2283 ++ EXTENDED_KEY_USAGE_new; 174.2284 ++ EC_GROUP_clear_free; 174.2285 ++ OCSP_sendreq_bio; 174.2286 ++ ASN1_item_digest; 174.2287 ++ OCSP_BASICRESP_delete_ext; 174.2288 ++ OCSP_SIGNATURE_it; 174.2289 ++ X509_CRL_it; 174.2290 ++ OCSP_BASICRESP_add_ext; 174.2291 ++ KRB5_ENCKEY_it; 174.2292 ++ UI_method_set_closer; 174.2293 ++ X509_STORE_set_purpose; 174.2294 ++ i2d_ASN1_GENERALSTRING; 174.2295 ++ OCSP_response_status; 174.2296 ++ i2d_OCSP_SERVICELOC; 174.2297 ++ ENGINE_get_digest_engine; 174.2298 ++ EC_GROUP_set_curve_GFp; 174.2299 ++ OCSP_REQUEST_get_ext_by_OBJ; 174.2300 ++ _ossl_old_des_random_key; 174.2301 ++ ASN1_T61STRING_it; 174.2302 ++ EC_GROUP_method_of; 174.2303 ++ i2d_KRB5_APREQ; 174.2304 ++ _ossl_old_des_encrypt; 174.2305 ++ ASN1_PRINTABLE_new; 174.2306 ++ HMAC_Init_ex; 174.2307 ++ d2i_KRB5_AUTHENT; 174.2308 ++ OCSP_archive_cutoff_new; 174.2309 ++ EC_POINT_set_Jprojective_coordinates_GFp; 174.2310 ++ EC_POINT_set_Jproj_coords_GFp; 174.2311 ++ _ossl_old_des_is_weak_key; 174.2312 ++ OCSP_BASICRESP_get_ext_by_OBJ; 174.2313 ++ EC_POINT_oct2point; 174.2314 ++ OCSP_SINGLERESP_get_ext_count; 174.2315 ++ UI_ctrl; 174.2316 ++ _shadow_DES_rw_mode; 174.2317 ++ asn1_do_adb; 174.2318 ++ ASN1_template_i2d; 174.2319 ++ ENGINE_register_DH; 174.2320 ++ UI_construct_prompt; 174.2321 ++ X509_STORE_set_trust; 174.2322 ++ UI_dup_input_string; 174.2323 ++ d2i_KRB5_APREQ; 174.2324 ++ EVP_MD_CTX_copy_ex; 174.2325 ++ OCSP_request_is_signed; 174.2326 ++ i2d_OCSP_REQINFO; 174.2327 ++ KRB5_ENCKEY_free; 174.2328 ++ OCSP_resp_get0; 174.2329 ++ GENERAL_NAME_it; 174.2330 ++ ASN1_GENERALIZEDTIME_it; 174.2331 ++ X509_STORE_set_flags; 174.2332 ++ EC_POINT_set_compressed_coordinates_GFp; 174.2333 ++ EC_POINT_set_compr_coords_GFp; 174.2334 ++ OCSP_response_status_str; 174.2335 ++ d2i_OCSP_REVOKEDINFO; 174.2336 ++ OCSP_basic_add1_cert; 174.2337 ++ ERR_get_implementation; 174.2338 ++ EVP_CipherFinal_ex; 174.2339 ++ OCSP_CERTSTATUS_new; 174.2340 ++ CRYPTO_cleanup_all_ex_data; 174.2341 ++ OCSP_resp_find; 174.2342 ++ BN_nnmod; 174.2343 ++ X509_CRL_sort; 174.2344 ++ X509_REVOKED_set_revocationDate; 174.2345 ++ ENGINE_register_RAND; 174.2346 ++ OCSP_SERVICELOC_new; 174.2347 ++ EC_POINT_set_affine_coordinates_GFp; 174.2348 ++ EC_POINT_set_affine_coords_GFp; 174.2349 ++ _ossl_old_des_options; 174.2350 ++ SXNET_it; 174.2351 ++ UI_dup_input_boolean; 174.2352 ++ PKCS12_add_CSPName_asc; 174.2353 ++ EC_POINT_is_at_infinity; 174.2354 ++ ENGINE_load_cryptodev; 174.2355 ++ DSO_convert_filename; 174.2356 ++ POLICYQUALINFO_it; 174.2357 ++ ENGINE_register_ciphers; 174.2358 ++ BN_mod_lshift_quick; 174.2359 ++ DSO_set_filename; 174.2360 ++ ASN1_item_free; 174.2361 ++ KRB5_TKTBODY_free; 174.2362 ++ AUTHORITY_KEYID_it; 174.2363 ++ KRB5_APREQBODY_new; 174.2364 ++ X509V3_EXT_REQ_add_nconf; 174.2365 ++ ENGINE_ctrl_cmd_string; 174.2366 ++ i2d_OCSP_RESPDATA; 174.2367 ++ EVP_MD_CTX_init; 174.2368 ++ EXTENDED_KEY_USAGE_free; 174.2369 ++ PKCS7_ATTR_SIGN_it; 174.2370 ++ UI_add_error_string; 174.2371 ++ KRB5_CHECKSUM_free; 174.2372 ++ OCSP_REQUEST_get_ext; 174.2373 ++ ENGINE_load_ubsec; 174.2374 ++ ENGINE_register_all_digests; 174.2375 ++ PKEY_USAGE_PERIOD_it; 174.2376 ++ PKCS12_unpack_authsafes; 174.2377 ++ ASN1_item_unpack; 174.2378 ++ NETSCAPE_SPKAC_it; 174.2379 ++ X509_REVOKED_it; 174.2380 ++ ASN1_STRING_encode; 174.2381 ++ EVP_aes_128_ecb; 174.2382 ++ KRB5_AUTHENT_free; 174.2383 ++ OCSP_BASICRESP_get_ext_by_critical; 174.2384 ++ OCSP_BASICRESP_get_ext_by_crit; 174.2385 ++ OCSP_cert_status_str; 174.2386 ++ d2i_OCSP_REQUEST; 174.2387 ++ UI_dup_info_string; 174.2388 ++ _ossl_old_des_xwhite_in2out; 174.2389 ++ PKCS12_it; 174.2390 ++ OCSP_SINGLERESP_get_ext_by_critical; 174.2391 ++ OCSP_SINGLERESP_get_ext_by_crit; 174.2392 ++ OCSP_CERTSTATUS_free; 174.2393 ++ _ossl_old_des_crypt; 174.2394 ++ ASN1_item_i2d; 174.2395 ++ EVP_DecryptFinal_ex; 174.2396 ++ ENGINE_load_openssl; 174.2397 ++ ENGINE_get_cmd_defns; 174.2398 ++ ENGINE_set_load_privkey_function; 174.2399 ++ ENGINE_set_load_privkey_fn; 174.2400 ++ EVP_EncryptFinal_ex; 174.2401 ++ ENGINE_set_default_digests; 174.2402 ++ X509_get0_pubkey_bitstr; 174.2403 ++ asn1_ex_i2c; 174.2404 ++ ENGINE_register_RSA; 174.2405 ++ ENGINE_unregister_DSA; 174.2406 ++ _ossl_old_des_key_sched; 174.2407 ++ X509_EXTENSION_it; 174.2408 ++ i2d_KRB5_AUTHENT; 174.2409 ++ SXNETID_it; 174.2410 ++ d2i_OCSP_SINGLERESP; 174.2411 ++ EDIPARTYNAME_new; 174.2412 ++ PKCS12_certbag2x509; 174.2413 ++ _ossl_old_des_ofb64_encrypt; 174.2414 ++ d2i_EXTENDED_KEY_USAGE; 174.2415 ++ ERR_print_errors_cb; 174.2416 ++ ENGINE_set_ciphers; 174.2417 ++ d2i_KRB5_APREQBODY; 174.2418 ++ UI_method_get_flusher; 174.2419 ++ X509_PUBKEY_it; 174.2420 ++ _ossl_old_des_enc_read; 174.2421 ++ PKCS7_ENCRYPT_it; 174.2422 ++ i2d_OCSP_RESPONSE; 174.2423 ++ EC_GROUP_get_cofactor; 174.2424 ++ PKCS12_unpack_p7data; 174.2425 ++ d2i_KRB5_AUTHDATA; 174.2426 ++ OCSP_copy_nonce; 174.2427 ++ KRB5_AUTHDATA_new; 174.2428 ++ OCSP_RESPDATA_new; 174.2429 ++ EC_GFp_mont_method; 174.2430 ++ OCSP_REVOKEDINFO_free; 174.2431 ++ UI_get_ex_data; 174.2432 ++ KRB5_APREQBODY_free; 174.2433 ++ EC_GROUP_get0_generator; 174.2434 ++ UI_get_default_method; 174.2435 ++ X509V3_set_nconf; 174.2436 ++ PKCS12_item_i2d_encrypt; 174.2437 ++ X509_add1_ext_i2d; 174.2438 ++ PKCS7_SIGNER_INFO_it; 174.2439 ++ KRB5_PRINCNAME_new; 174.2440 ++ PKCS12_SAFEBAG_it; 174.2441 ++ EC_GROUP_get_order; 174.2442 ++ d2i_OCSP_RESPID; 174.2443 ++ OCSP_request_verify; 174.2444 ++ NCONF_get_number_e; 174.2445 ++ _ossl_old_des_decrypt3; 174.2446 ++ X509_signature_print; 174.2447 ++ OCSP_SINGLERESP_free; 174.2448 ++ ENGINE_load_builtin_engines; 174.2449 ++ i2d_OCSP_ONEREQ; 174.2450 ++ OCSP_REQUEST_add_ext; 174.2451 ++ OCSP_RESPBYTES_new; 174.2452 ++ EVP_MD_CTX_create; 174.2453 ++ OCSP_resp_find_status; 174.2454 ++ X509_ALGOR_it; 174.2455 ++ ASN1_TIME_it; 174.2456 ++ OCSP_request_set1_name; 174.2457 ++ OCSP_ONEREQ_get_ext_count; 174.2458 ++ UI_get0_result; 174.2459 ++ PKCS12_AUTHSAFES_it; 174.2460 ++ EVP_aes_256_ecb; 174.2461 ++ PKCS12_pack_authsafes; 174.2462 ++ ASN1_IA5STRING_it; 174.2463 ++ UI_get_input_flags; 174.2464 ++ EC_GROUP_set_generator; 174.2465 ++ _ossl_old_des_string_to_2keys; 174.2466 ++ OCSP_CERTID_free; 174.2467 ++ X509_CERT_AUX_it; 174.2468 ++ CERTIFICATEPOLICIES_it; 174.2469 ++ _ossl_old_des_ede3_cbc_encrypt; 174.2470 ++ RAND_set_rand_engine; 174.2471 ++ DSO_get_loaded_filename; 174.2472 ++ X509_ATTRIBUTE_it; 174.2473 ++ OCSP_ONEREQ_get_ext_by_NID; 174.2474 ++ PKCS12_decrypt_skey; 174.2475 ++ KRB5_AUTHENT_it; 174.2476 ++ UI_dup_error_string; 174.2477 ++ RSAPublicKey_it; 174.2478 ++ i2d_OCSP_REQUEST; 174.2479 ++ PKCS12_x509crl2certbag; 174.2480 ++ OCSP_SERVICELOC_it; 174.2481 ++ ASN1_item_sign; 174.2482 ++ X509_CRL_set_issuer_name; 174.2483 ++ OBJ_NAME_do_all_sorted; 174.2484 ++ i2d_OCSP_BASICRESP; 174.2485 ++ i2d_OCSP_RESPBYTES; 174.2486 ++ PKCS12_unpack_p7encdata; 174.2487 ++ HMAC_CTX_init; 174.2488 ++ ENGINE_get_digest; 174.2489 ++ OCSP_RESPONSE_print; 174.2490 ++ KRB5_TKTBODY_it; 174.2491 ++ ACCESS_DESCRIPTION_it; 174.2492 ++ PKCS7_ISSUER_AND_SERIAL_it; 174.2493 ++ PBE2PARAM_it; 174.2494 ++ PKCS12_certbag2x509crl; 174.2495 ++ PKCS7_SIGNED_it; 174.2496 ++ ENGINE_get_cipher; 174.2497 ++ i2d_OCSP_CRLID; 174.2498 ++ OCSP_SINGLERESP_new; 174.2499 ++ ENGINE_cmd_is_executable; 174.2500 ++ RSA_up_ref; 174.2501 ++ ASN1_GENERALSTRING_it; 174.2502 ++ ENGINE_register_DSA; 174.2503 ++ X509V3_EXT_add_nconf_sk; 174.2504 ++ ENGINE_set_load_pubkey_function; 174.2505 ++ PKCS8_decrypt; 174.2506 ++ PEM_bytes_read_bio; 174.2507 ++ DIRECTORYSTRING_it; 174.2508 ++ d2i_OCSP_CRLID; 174.2509 ++ EC_POINT_is_on_curve; 174.2510 ++ CRYPTO_set_locked_mem_ex_functions; 174.2511 ++ CRYPTO_set_locked_mem_ex_funcs; 174.2512 ++ d2i_KRB5_CHECKSUM; 174.2513 ++ ASN1_item_dup; 174.2514 ++ X509_it; 174.2515 ++ BN_mod_add; 174.2516 ++ KRB5_AUTHDATA_free; 174.2517 ++ _ossl_old_des_cbc_cksum; 174.2518 ++ ASN1_item_verify; 174.2519 ++ CRYPTO_set_mem_ex_functions; 174.2520 ++ EC_POINT_get_Jprojective_coordinates_GFp; 174.2521 ++ EC_POINT_get_Jproj_coords_GFp; 174.2522 ++ ZLONG_it; 174.2523 ++ CRYPTO_get_locked_mem_ex_functions; 174.2524 ++ CRYPTO_get_locked_mem_ex_funcs; 174.2525 ++ ASN1_TIME_check; 174.2526 ++ UI_get0_user_data; 174.2527 ++ HMAC_CTX_cleanup; 174.2528 ++ DSA_up_ref; 174.2529 ++ _ossl_old_des_ede3_cfb64_encrypt; 174.2530 ++ _ossl_odes_ede3_cfb64_encrypt; 174.2531 ++ ASN1_BMPSTRING_it; 174.2532 ++ ASN1_tag2bit; 174.2533 ++ UI_method_set_flusher; 174.2534 ++ X509_ocspid_print; 174.2535 ++ KRB5_ENCDATA_it; 174.2536 ++ ENGINE_get_load_pubkey_function; 174.2537 ++ UI_add_user_data; 174.2538 ++ OCSP_REQUEST_delete_ext; 174.2539 ++ UI_get_method; 174.2540 ++ OCSP_ONEREQ_free; 174.2541 ++ ASN1_PRINTABLESTRING_it; 174.2542 ++ X509_CRL_set_nextUpdate; 174.2543 ++ OCSP_REQUEST_it; 174.2544 ++ OCSP_BASICRESP_it; 174.2545 ++ AES_ecb_encrypt; 174.2546 ++ BN_mod_sqr; 174.2547 ++ NETSCAPE_CERT_SEQUENCE_it; 174.2548 ++ GENERAL_NAMES_it; 174.2549 ++ AUTHORITY_INFO_ACCESS_it; 174.2550 ++ ASN1_FBOOLEAN_it; 174.2551 ++ UI_set_ex_data; 174.2552 ++ _ossl_old_des_string_to_key; 174.2553 ++ ENGINE_register_all_RSA; 174.2554 ++ d2i_KRB5_PRINCNAME; 174.2555 ++ OCSP_RESPBYTES_it; 174.2556 ++ X509_CINF_it; 174.2557 ++ ENGINE_unregister_digests; 174.2558 ++ d2i_EDIPARTYNAME; 174.2559 ++ d2i_OCSP_SERVICELOC; 174.2560 ++ ENGINE_get_digests; 174.2561 ++ _ossl_old_des_set_odd_parity; 174.2562 ++ OCSP_RESPDATA_free; 174.2563 ++ d2i_KRB5_TICKET; 174.2564 ++ OTHERNAME_it; 174.2565 ++ EVP_MD_CTX_cleanup; 174.2566 ++ d2i_ASN1_GENERALSTRING; 174.2567 ++ X509_CRL_set_version; 174.2568 ++ BN_mod_sub; 174.2569 ++ OCSP_SINGLERESP_get_ext_by_NID; 174.2570 ++ ENGINE_get_ex_new_index; 174.2571 ++ OCSP_REQUEST_free; 174.2572 ++ OCSP_REQUEST_add1_ext_i2d; 174.2573 ++ X509_VAL_it; 174.2574 ++ EC_POINTs_make_affine; 174.2575 ++ EC_POINT_mul; 174.2576 ++ X509V3_EXT_add_nconf; 174.2577 ++ X509_TRUST_set; 174.2578 ++ X509_CRL_add1_ext_i2d; 174.2579 ++ _ossl_old_des_fcrypt; 174.2580 ++ DISPLAYTEXT_it; 174.2581 ++ X509_CRL_set_lastUpdate; 174.2582 ++ OCSP_BASICRESP_free; 174.2583 ++ OCSP_BASICRESP_add1_ext_i2d; 174.2584 ++ d2i_KRB5_AUTHENTBODY; 174.2585 ++ CRYPTO_set_ex_data_implementation; 174.2586 ++ CRYPTO_set_ex_data_impl; 174.2587 ++ KRB5_ENCDATA_new; 174.2588 ++ DSO_up_ref; 174.2589 ++ OCSP_crl_reason_str; 174.2590 ++ UI_get0_result_string; 174.2591 ++ ASN1_GENERALSTRING_new; 174.2592 ++ X509_SIG_it; 174.2593 ++ ERR_set_implementation; 174.2594 ++ ERR_load_EC_strings; 174.2595 ++ UI_get0_action_string; 174.2596 ++ OCSP_ONEREQ_get_ext; 174.2597 ++ EC_POINT_method_of; 174.2598 ++ i2d_KRB5_APREQBODY; 174.2599 ++ _ossl_old_des_ecb3_encrypt; 174.2600 ++ CRYPTO_get_mem_ex_functions; 174.2601 ++ ENGINE_get_ex_data; 174.2602 ++ UI_destroy_method; 174.2603 ++ ASN1_item_i2d_bio; 174.2604 ++ OCSP_ONEREQ_get_ext_by_OBJ; 174.2605 ++ ASN1_primitive_new; 174.2606 ++ ASN1_PRINTABLE_it; 174.2607 ++ EVP_aes_192_ecb; 174.2608 ++ OCSP_SIGNATURE_new; 174.2609 ++ LONG_it; 174.2610 ++ ASN1_VISIBLESTRING_it; 174.2611 ++ OCSP_SINGLERESP_add1_ext_i2d; 174.2612 ++ d2i_OCSP_CERTID; 174.2613 ++ ASN1_item_d2i_fp; 174.2614 ++ CRL_DIST_POINTS_it; 174.2615 ++ GENERAL_NAME_print; 174.2616 ++ OCSP_SINGLERESP_delete_ext; 174.2617 ++ PKCS12_SAFEBAGS_it; 174.2618 ++ d2i_OCSP_SIGNATURE; 174.2619 ++ OCSP_request_add1_nonce; 174.2620 ++ ENGINE_set_cmd_defns; 174.2621 ++ OCSP_SERVICELOC_free; 174.2622 ++ EC_GROUP_free; 174.2623 ++ ASN1_BIT_STRING_it; 174.2624 ++ X509_REQ_it; 174.2625 ++ _ossl_old_des_cbc_encrypt; 174.2626 ++ ERR_unload_strings; 174.2627 ++ PKCS7_SIGN_ENVELOPE_it; 174.2628 ++ EDIPARTYNAME_free; 174.2629 ++ OCSP_REQINFO_free; 174.2630 ++ EC_GROUP_new_curve_GFp; 174.2631 ++ OCSP_REQUEST_get1_ext_d2i; 174.2632 ++ PKCS12_item_pack_safebag; 174.2633 ++ asn1_ex_c2i; 174.2634 ++ ENGINE_register_digests; 174.2635 ++ i2d_OCSP_REVOKEDINFO; 174.2636 ++ asn1_enc_restore; 174.2637 ++ UI_free; 174.2638 ++ UI_new_method; 174.2639 ++ EVP_EncryptInit_ex; 174.2640 ++ X509_pubkey_digest; 174.2641 ++ EC_POINT_invert; 174.2642 ++ OCSP_basic_sign; 174.2643 ++ i2d_OCSP_RESPID; 174.2644 ++ OCSP_check_nonce; 174.2645 ++ ENGINE_ctrl_cmd; 174.2646 ++ d2i_KRB5_ENCKEY; 174.2647 ++ OCSP_parse_url; 174.2648 ++ OCSP_SINGLERESP_get_ext; 174.2649 ++ OCSP_CRLID_free; 174.2650 ++ OCSP_BASICRESP_get1_ext_d2i; 174.2651 ++ RSAPrivateKey_it; 174.2652 ++ ENGINE_register_all_DH; 174.2653 ++ i2d_EDIPARTYNAME; 174.2654 ++ EC_POINT_get_affine_coordinates_GFp; 174.2655 ++ EC_POINT_get_affine_coords_GFp; 174.2656 ++ OCSP_CRLID_new; 174.2657 ++ ENGINE_get_flags; 174.2658 ++ OCSP_ONEREQ_it; 174.2659 ++ UI_process; 174.2660 ++ ASN1_INTEGER_it; 174.2661 ++ EVP_CipherInit_ex; 174.2662 ++ UI_get_string_type; 174.2663 ++ ENGINE_unregister_DH; 174.2664 ++ ENGINE_register_all_DSA; 174.2665 ++ OCSP_ONEREQ_get_ext_by_critical; 174.2666 ++ bn_dup_expand; 174.2667 ++ OCSP_cert_id_new; 174.2668 ++ BASIC_CONSTRAINTS_it; 174.2669 ++ BN_mod_add_quick; 174.2670 ++ EC_POINT_new; 174.2671 ++ EVP_MD_CTX_destroy; 174.2672 ++ OCSP_RESPBYTES_free; 174.2673 ++ EVP_aes_128_cbc; 174.2674 ++ OCSP_SINGLERESP_get1_ext_d2i; 174.2675 ++ EC_POINT_free; 174.2676 ++ DH_up_ref; 174.2677 ++ X509_NAME_ENTRY_it; 174.2678 ++ UI_get_ex_new_index; 174.2679 ++ BN_mod_sub_quick; 174.2680 ++ OCSP_ONEREQ_add_ext; 174.2681 ++ OCSP_request_sign; 174.2682 ++ EVP_DigestFinal_ex; 174.2683 ++ ENGINE_set_digests; 174.2684 ++ OCSP_id_issuer_cmp; 174.2685 ++ OBJ_NAME_do_all; 174.2686 ++ EC_POINTs_mul; 174.2687 ++ ENGINE_register_complete; 174.2688 ++ X509V3_EXT_nconf_nid; 174.2689 ++ ASN1_SEQUENCE_it; 174.2690 ++ UI_set_default_method; 174.2691 ++ RAND_query_egd_bytes; 174.2692 ++ UI_method_get_writer; 174.2693 ++ UI_OpenSSL; 174.2694 ++ PEM_def_callback; 174.2695 ++ ENGINE_cleanup; 174.2696 ++ DIST_POINT_it; 174.2697 ++ OCSP_SINGLERESP_it; 174.2698 ++ d2i_KRB5_TKTBODY; 174.2699 ++ EC_POINT_cmp; 174.2700 ++ OCSP_REVOKEDINFO_new; 174.2701 ++ i2d_OCSP_CERTSTATUS; 174.2702 ++ OCSP_basic_add1_nonce; 174.2703 ++ ASN1_item_ex_d2i; 174.2704 ++ BN_mod_lshift1_quick; 174.2705 ++ UI_set_method; 174.2706 ++ OCSP_id_get0_info; 174.2707 ++ BN_mod_sqrt; 174.2708 ++ EC_GROUP_copy; 174.2709 ++ KRB5_ENCDATA_free; 174.2710 ++ _ossl_old_des_cfb_encrypt; 174.2711 ++ OCSP_SINGLERESP_get_ext_by_OBJ; 174.2712 ++ OCSP_cert_to_id; 174.2713 ++ OCSP_RESPID_new; 174.2714 ++ OCSP_RESPDATA_it; 174.2715 ++ d2i_OCSP_RESPDATA; 174.2716 ++ ENGINE_register_all_complete; 174.2717 ++ OCSP_check_validity; 174.2718 ++ PKCS12_BAGS_it; 174.2719 ++ OCSP_url_svcloc_new; 174.2720 ++ ASN1_template_free; 174.2721 ++ OCSP_SINGLERESP_add_ext; 174.2722 ++ KRB5_AUTHENTBODY_it; 174.2723 ++ X509_supported_extension; 174.2724 ++ i2d_KRB5_AUTHDATA; 174.2725 ++ UI_method_get_opener; 174.2726 ++ ENGINE_set_ex_data; 174.2727 ++ OCSP_REQUEST_print; 174.2728 ++ CBIGNUM_it; 174.2729 ++ KRB5_TICKET_new; 174.2730 ++ KRB5_APREQ_new; 174.2731 ++ EC_GROUP_get_curve_GFp; 174.2732 ++ KRB5_ENCKEY_new; 174.2733 ++ ASN1_template_d2i; 174.2734 ++ _ossl_old_des_quad_cksum; 174.2735 ++ OCSP_single_get0_status; 174.2736 ++ BN_swap; 174.2737 ++ POLICYINFO_it; 174.2738 ++ ENGINE_set_destroy_function; 174.2739 ++ asn1_enc_free; 174.2740 ++ OCSP_RESPID_it; 174.2741 ++ EC_GROUP_new; 174.2742 ++ EVP_aes_256_cbc; 174.2743 ++ i2d_KRB5_PRINCNAME; 174.2744 ++ _ossl_old_des_encrypt2; 174.2745 ++ _ossl_old_des_encrypt3; 174.2746 ++ PKCS8_PRIV_KEY_INFO_it; 174.2747 ++ OCSP_REQINFO_it; 174.2748 ++ PBEPARAM_it; 174.2749 ++ KRB5_AUTHENTBODY_new; 174.2750 ++ X509_CRL_add0_revoked; 174.2751 ++ EDIPARTYNAME_it; 174.2752 ++ NETSCAPE_SPKI_it; 174.2753 ++ UI_get0_test_string; 174.2754 ++ ENGINE_get_cipher_engine; 174.2755 ++ ENGINE_register_all_ciphers; 174.2756 ++ EC_POINT_copy; 174.2757 ++ BN_kronecker; 174.2758 ++ _ossl_old_des_ede3_ofb64_encrypt; 174.2759 ++ _ossl_odes_ede3_ofb64_encrypt; 174.2760 ++ UI_method_get_reader; 174.2761 ++ OCSP_BASICRESP_get_ext_count; 174.2762 ++ ASN1_ENUMERATED_it; 174.2763 ++ UI_set_result; 174.2764 ++ i2d_KRB5_TICKET; 174.2765 ++ X509_print_ex_fp; 174.2766 ++ EVP_CIPHER_CTX_set_padding; 174.2767 ++ d2i_OCSP_RESPONSE; 174.2768 ++ ASN1_UTCTIME_it; 174.2769 ++ _ossl_old_des_enc_write; 174.2770 ++ OCSP_RESPONSE_new; 174.2771 ++ AES_set_encrypt_key; 174.2772 ++ OCSP_resp_count; 174.2773 ++ KRB5_CHECKSUM_new; 174.2774 ++ ENGINE_load_cswift; 174.2775 ++ OCSP_onereq_get0_id; 174.2776 ++ ENGINE_set_default_ciphers; 174.2777 ++ NOTICEREF_it; 174.2778 ++ X509V3_EXT_CRL_add_nconf; 174.2779 ++ OCSP_REVOKEDINFO_it; 174.2780 ++ AES_encrypt; 174.2781 ++ OCSP_REQUEST_new; 174.2782 ++ ASN1_ANY_it; 174.2783 ++ CRYPTO_ex_data_new_class; 174.2784 ++ _ossl_old_des_ncbc_encrypt; 174.2785 ++ i2d_KRB5_TKTBODY; 174.2786 ++ EC_POINT_clear_free; 174.2787 ++ AES_decrypt; 174.2788 ++ asn1_enc_init; 174.2789 ++ UI_get_result_maxsize; 174.2790 ++ OCSP_CERTID_new; 174.2791 ++ ENGINE_unregister_RAND; 174.2792 ++ UI_method_get_closer; 174.2793 ++ d2i_KRB5_ENCDATA; 174.2794 ++ OCSP_request_onereq_count; 174.2795 ++ OCSP_basic_verify; 174.2796 ++ KRB5_AUTHENTBODY_free; 174.2797 ++ ASN1_item_d2i; 174.2798 ++ ASN1_primitive_free; 174.2799 ++ i2d_EXTENDED_KEY_USAGE; 174.2800 ++ i2d_OCSP_SIGNATURE; 174.2801 ++ asn1_enc_save; 174.2802 ++ ENGINE_load_nuron; 174.2803 ++ _ossl_old_des_pcbc_encrypt; 174.2804 ++ PKCS12_MAC_DATA_it; 174.2805 ++ OCSP_accept_responses_new; 174.2806 ++ asn1_do_lock; 174.2807 ++ PKCS7_ATTR_VERIFY_it; 174.2808 ++ KRB5_APREQBODY_it; 174.2809 ++ i2d_OCSP_SINGLERESP; 174.2810 ++ ASN1_item_ex_new; 174.2811 ++ UI_add_verify_string; 174.2812 ++ _ossl_old_des_set_key; 174.2813 ++ KRB5_PRINCNAME_it; 174.2814 ++ EVP_DecryptInit_ex; 174.2815 ++ i2d_OCSP_CERTID; 174.2816 ++ ASN1_item_d2i_bio; 174.2817 ++ EC_POINT_dbl; 174.2818 ++ asn1_get_choice_selector; 174.2819 ++ i2d_KRB5_CHECKSUM; 174.2820 ++ ENGINE_set_table_flags; 174.2821 ++ AES_options; 174.2822 ++ ENGINE_load_chil; 174.2823 ++ OCSP_id_cmp; 174.2824 ++ OCSP_BASICRESP_new; 174.2825 ++ OCSP_REQUEST_get_ext_by_NID; 174.2826 ++ KRB5_APREQ_it; 174.2827 ++ ENGINE_get_destroy_function; 174.2828 ++ CONF_set_nconf; 174.2829 ++ ASN1_PRINTABLE_free; 174.2830 ++ OCSP_BASICRESP_get_ext_by_NID; 174.2831 ++ DIST_POINT_NAME_it; 174.2832 ++ X509V3_extensions_print; 174.2833 ++ _ossl_old_des_cfb64_encrypt; 174.2834 ++ X509_REVOKED_add1_ext_i2d; 174.2835 ++ _ossl_old_des_ofb_encrypt; 174.2836 ++ KRB5_TKTBODY_new; 174.2837 ++ ASN1_OCTET_STRING_it; 174.2838 ++ ERR_load_UI_strings; 174.2839 ++ i2d_KRB5_ENCKEY; 174.2840 ++ ASN1_template_new; 174.2841 ++ OCSP_SIGNATURE_free; 174.2842 ++ ASN1_item_i2d_fp; 174.2843 ++ KRB5_PRINCNAME_free; 174.2844 ++ PKCS7_RECIP_INFO_it; 174.2845 ++ EXTENDED_KEY_USAGE_it; 174.2846 ++ EC_GFp_simple_method; 174.2847 ++ EC_GROUP_precompute_mult; 174.2848 ++ OCSP_request_onereq_get0; 174.2849 ++ UI_method_set_writer; 174.2850 ++ KRB5_AUTHENT_new; 174.2851 ++ X509_CRL_INFO_it; 174.2852 ++ DSO_set_name_converter; 174.2853 ++ AES_set_decrypt_key; 174.2854 ++ PKCS7_DIGEST_it; 174.2855 ++ PKCS12_x5092certbag; 174.2856 ++ EVP_DigestInit_ex; 174.2857 ++ i2a_ACCESS_DESCRIPTION; 174.2858 ++ OCSP_RESPONSE_it; 174.2859 ++ PKCS7_ENC_CONTENT_it; 174.2860 ++ OCSP_request_add0_id; 174.2861 ++ EC_POINT_make_affine; 174.2862 ++ DSO_get_filename; 174.2863 ++ OCSP_CERTSTATUS_it; 174.2864 ++ OCSP_request_add1_cert; 174.2865 ++ UI_get0_output_string; 174.2866 ++ UI_dup_verify_string; 174.2867 ++ BN_mod_lshift; 174.2868 ++ KRB5_AUTHDATA_it; 174.2869 ++ asn1_set_choice_selector; 174.2870 ++ OCSP_basic_add1_status; 174.2871 ++ OCSP_RESPID_free; 174.2872 ++ asn1_get_field_ptr; 174.2873 ++ UI_add_input_string; 174.2874 ++ OCSP_CRLID_it; 174.2875 ++ i2d_KRB5_AUTHENTBODY; 174.2876 ++ OCSP_REQUEST_get_ext_count; 174.2877 ++ ENGINE_load_atalla; 174.2878 ++ X509_NAME_it; 174.2879 ++ USERNOTICE_it; 174.2880 ++ OCSP_REQINFO_new; 174.2881 ++ OCSP_BASICRESP_get_ext; 174.2882 ++ CRYPTO_get_ex_data_implementation; 174.2883 ++ CRYPTO_get_ex_data_impl; 174.2884 ++ ASN1_item_pack; 174.2885 ++ i2d_KRB5_ENCDATA; 174.2886 ++ X509_PURPOSE_set; 174.2887 ++ X509_REQ_INFO_it; 174.2888 ++ UI_method_set_opener; 174.2889 ++ ASN1_item_ex_free; 174.2890 ++ ASN1_BOOLEAN_it; 174.2891 ++ ENGINE_get_table_flags; 174.2892 ++ UI_create_method; 174.2893 ++ OCSP_ONEREQ_add1_ext_i2d; 174.2894 ++ _shadow_DES_check_key; 174.2895 ++ d2i_OCSP_REQINFO; 174.2896 ++ UI_add_info_string; 174.2897 ++ UI_get_result_minsize; 174.2898 ++ ASN1_NULL_it; 174.2899 ++ BN_mod_lshift1; 174.2900 ++ d2i_OCSP_ONEREQ; 174.2901 ++ OCSP_ONEREQ_new; 174.2902 ++ KRB5_TICKET_it; 174.2903 ++ EVP_aes_192_cbc; 174.2904 ++ KRB5_TICKET_free; 174.2905 ++ UI_new; 174.2906 ++ OCSP_response_create; 174.2907 ++ _ossl_old_des_xcbc_encrypt; 174.2908 ++ PKCS7_it; 174.2909 ++ OCSP_REQUEST_get_ext_by_critical; 174.2910 ++ OCSP_REQUEST_get_ext_by_crit; 174.2911 ++ ENGINE_set_flags; 174.2912 ++ _ossl_old_des_ecb_encrypt; 174.2913 ++ OCSP_response_get1_basic; 174.2914 ++ EVP_Digest; 174.2915 ++ OCSP_ONEREQ_delete_ext; 174.2916 ++ ASN1_TBOOLEAN_it; 174.2917 ++ ASN1_item_new; 174.2918 ++ ASN1_TIME_to_generalizedtime; 174.2919 ++ BIGNUM_it; 174.2920 ++ AES_cbc_encrypt; 174.2921 ++ ENGINE_get_load_privkey_function; 174.2922 ++ ENGINE_get_load_privkey_fn; 174.2923 ++ OCSP_RESPONSE_free; 174.2924 ++ UI_method_set_reader; 174.2925 ++ i2d_ASN1_T61STRING; 174.2926 ++ EC_POINT_set_to_infinity; 174.2927 ++ ERR_load_OCSP_strings; 174.2928 ++ EC_POINT_point2oct; 174.2929 ++ KRB5_APREQ_free; 174.2930 ++ ASN1_OBJECT_it; 174.2931 ++ OCSP_crlID_new; 174.2932 ++ OCSP_crlID2_new; 174.2933 ++ CONF_modules_load_file; 174.2934 ++ CONF_imodule_set_usr_data; 174.2935 ++ ENGINE_set_default_string; 174.2936 ++ CONF_module_get_usr_data; 174.2937 ++ ASN1_add_oid_module; 174.2938 ++ CONF_modules_finish; 174.2939 ++ OPENSSL_config; 174.2940 ++ CONF_modules_unload; 174.2941 ++ CONF_imodule_get_value; 174.2942 ++ CONF_module_set_usr_data; 174.2943 ++ CONF_parse_list; 174.2944 ++ CONF_module_add; 174.2945 ++ CONF_get1_default_config_file; 174.2946 ++ CONF_imodule_get_flags; 174.2947 ++ CONF_imodule_get_module; 174.2948 ++ CONF_modules_load; 174.2949 ++ CONF_imodule_get_name; 174.2950 ++ ERR_peek_top_error; 174.2951 ++ CONF_imodule_get_usr_data; 174.2952 ++ CONF_imodule_set_flags; 174.2953 ++ ENGINE_add_conf_module; 174.2954 ++ ERR_peek_last_error_line; 174.2955 ++ ERR_peek_last_error_line_data; 174.2956 ++ ERR_peek_last_error; 174.2957 ++ DES_read_2passwords; 174.2958 ++ DES_read_password; 174.2959 ++ UI_UTIL_read_pw; 174.2960 ++ UI_UTIL_read_pw_string; 174.2961 ++ ENGINE_load_aep; 174.2962 ++ ENGINE_load_sureware; 174.2963 ++ OPENSSL_add_all_algorithms_noconf; 174.2964 ++ OPENSSL_add_all_algo_noconf; 174.2965 ++ OPENSSL_add_all_algorithms_conf; 174.2966 ++ OPENSSL_add_all_algo_conf; 174.2967 ++ OPENSSL_load_builtin_modules; 174.2968 ++ AES_ofb128_encrypt; 174.2969 ++ AES_ctr128_encrypt; 174.2970 ++ AES_cfb128_encrypt; 174.2971 ++ ENGINE_load_4758cca; 174.2972 ++ _ossl_096_des_random_seed; 174.2973 ++ EVP_aes_256_ofb; 174.2974 ++ EVP_aes_192_ofb; 174.2975 ++ EVP_aes_128_cfb128; 174.2976 ++ EVP_aes_256_cfb128; 174.2977 ++ EVP_aes_128_ofb; 174.2978 ++ EVP_aes_192_cfb128; 174.2979 ++ CONF_modules_free; 174.2980 ++ NCONF_default; 174.2981 ++ OPENSSL_no_config; 174.2982 ++ NCONF_WIN32; 174.2983 ++ ASN1_UNIVERSALSTRING_new; 174.2984 ++ EVP_des_ede_ecb; 174.2985 ++ i2d_ASN1_UNIVERSALSTRING; 174.2986 ++ ASN1_UNIVERSALSTRING_free; 174.2987 ++ ASN1_UNIVERSALSTRING_it; 174.2988 ++ d2i_ASN1_UNIVERSALSTRING; 174.2989 ++ EVP_des_ede3_ecb; 174.2990 ++ X509_REQ_print_ex; 174.2991 ++ ENGINE_up_ref; 174.2992 ++ BUF_MEM_grow_clean; 174.2993 ++ CRYPTO_realloc_clean; 174.2994 ++ BUF_strlcat; 174.2995 ++ BIO_indent; 174.2996 ++ BUF_strlcpy; 174.2997 ++ OpenSSLDie; 174.2998 ++ OPENSSL_cleanse; 174.2999 ++ ENGINE_setup_bsd_cryptodev; 174.3000 ++ ERR_release_err_state_table; 174.3001 ++ EVP_aes_128_cfb8; 174.3002 ++ FIPS_corrupt_rsa; 174.3003 ++ FIPS_selftest_des; 174.3004 ++ EVP_aes_128_cfb1; 174.3005 ++ EVP_aes_192_cfb8; 174.3006 ++ FIPS_mode_set; 174.3007 ++ FIPS_selftest_dsa; 174.3008 ++ EVP_aes_256_cfb8; 174.3009 ++ FIPS_allow_md5; 174.3010 ++ DES_ede3_cfb_encrypt; 174.3011 ++ EVP_des_ede3_cfb8; 174.3012 ++ FIPS_rand_seeded; 174.3013 ++ AES_cfbr_encrypt_block; 174.3014 ++ AES_cfb8_encrypt; 174.3015 ++ FIPS_rand_seed; 174.3016 ++ FIPS_corrupt_des; 174.3017 ++ EVP_aes_192_cfb1; 174.3018 ++ FIPS_selftest_aes; 174.3019 ++ FIPS_set_prng_key; 174.3020 ++ EVP_des_cfb8; 174.3021 ++ FIPS_corrupt_dsa; 174.3022 ++ FIPS_test_mode; 174.3023 ++ FIPS_rand_method; 174.3024 ++ EVP_aes_256_cfb1; 174.3025 ++ ERR_load_FIPS_strings; 174.3026 ++ FIPS_corrupt_aes; 174.3027 ++ FIPS_selftest_sha1; 174.3028 ++ FIPS_selftest_rsa; 174.3029 ++ FIPS_corrupt_sha1; 174.3030 ++ EVP_des_cfb1; 174.3031 ++ FIPS_dsa_check; 174.3032 ++ AES_cfb1_encrypt; 174.3033 ++ EVP_des_ede3_cfb1; 174.3034 ++ FIPS_rand_check; 174.3035 ++ FIPS_md5_allowed; 174.3036 ++ FIPS_mode; 174.3037 ++ FIPS_selftest_failed; 174.3038 ++ sk_is_sorted; 174.3039 ++ X509_check_ca; 174.3040 ++ HMAC_CTX_set_flags; 174.3041 ++ d2i_PROXY_CERT_INFO_EXTENSION; 174.3042 ++ PROXY_POLICY_it; 174.3043 ++ i2d_PROXY_POLICY; 174.3044 ++ i2d_PROXY_CERT_INFO_EXTENSION; 174.3045 ++ d2i_PROXY_POLICY; 174.3046 ++ PROXY_CERT_INFO_EXTENSION_new; 174.3047 ++ PROXY_CERT_INFO_EXTENSION_free; 174.3048 ++ PROXY_CERT_INFO_EXTENSION_it; 174.3049 ++ PROXY_POLICY_free; 174.3050 ++ PROXY_POLICY_new; 174.3051 ++ BN_MONT_CTX_set_locked; 174.3052 ++ FIPS_selftest_rng; 174.3053 ++ EVP_sha384; 174.3054 ++ EVP_sha512; 174.3055 ++ EVP_sha224; 174.3056 ++ EVP_sha256; 174.3057 ++ FIPS_selftest_hmac; 174.3058 ++ FIPS_corrupt_rng; 174.3059 ++ BN_mod_exp_mont_consttime; 174.3060 ++ RSA_X931_hash_id; 174.3061 ++ RSA_padding_check_X931; 174.3062 ++ RSA_verify_PKCS1_PSS; 174.3063 ++ RSA_padding_add_X931; 174.3064 ++ RSA_padding_add_PKCS1_PSS; 174.3065 ++ PKCS1_MGF1; 174.3066 ++ BN_X931_generate_Xpq; 174.3067 ++ RSA_X931_generate_key; 174.3068 ++ BN_X931_derive_prime; 174.3069 ++ BN_X931_generate_prime; 174.3070 ++ RSA_X931_derive; 174.3071 ++ BIO_new_dgram; 174.3072 ++ BN_get0_nist_prime_384; 174.3073 ++ ERR_set_mark; 174.3074 ++ X509_STORE_CTX_set0_crls; 174.3075 ++ ENGINE_set_STORE; 174.3076 ++ ENGINE_register_ECDSA; 174.3077 ++ STORE_meth_set_list_start_fn; 174.3078 ++ STORE_method_set_list_start_function; 174.3079 ++ BN_BLINDING_invert_ex; 174.3080 ++ NAME_CONSTRAINTS_free; 174.3081 ++ STORE_ATTR_INFO_set_number; 174.3082 ++ BN_BLINDING_get_thread_id; 174.3083 ++ X509_STORE_CTX_set0_param; 174.3084 ++ POLICY_MAPPING_it; 174.3085 ++ STORE_parse_attrs_start; 174.3086 ++ POLICY_CONSTRAINTS_free; 174.3087 ++ EVP_PKEY_add1_attr_by_NID; 174.3088 ++ BN_nist_mod_192; 174.3089 ++ EC_GROUP_get_trinomial_basis; 174.3090 ++ STORE_set_method; 174.3091 ++ GENERAL_SUBTREE_free; 174.3092 ++ NAME_CONSTRAINTS_it; 174.3093 ++ ECDH_get_default_method; 174.3094 ++ PKCS12_add_safe; 174.3095 ++ EC_KEY_new_by_curve_name; 174.3096 ++ STORE_meth_get_update_store_fn; 174.3097 ++ STORE_method_get_update_store_function; 174.3098 ++ ENGINE_register_ECDH; 174.3099 ++ SHA512_Update; 174.3100 ++ i2d_ECPrivateKey; 174.3101 ++ BN_get0_nist_prime_192; 174.3102 ++ STORE_modify_certificate; 174.3103 ++ EC_POINT_set_affine_coordinates_GF2m; 174.3104 ++ EC_POINT_set_affine_coords_GF2m; 174.3105 ++ BN_GF2m_mod_exp_arr; 174.3106 ++ STORE_ATTR_INFO_modify_number; 174.3107 ++ X509_keyid_get0; 174.3108 ++ ENGINE_load_gmp; 174.3109 ++ pitem_new; 174.3110 ++ BN_GF2m_mod_mul_arr; 174.3111 ++ STORE_list_public_key_endp; 174.3112 ++ o2i_ECPublicKey; 174.3113 ++ EC_KEY_copy; 174.3114 ++ BIO_dump_fp; 174.3115 ++ X509_policy_node_get0_parent; 174.3116 ++ EC_GROUP_check_discriminant; 174.3117 ++ i2o_ECPublicKey; 174.3118 ++ EC_KEY_precompute_mult; 174.3119 ++ a2i_IPADDRESS; 174.3120 ++ STORE_meth_set_initialise_fn; 174.3121 ++ STORE_method_set_initialise_function; 174.3122 ++ X509_STORE_CTX_set_depth; 174.3123 ++ X509_VERIFY_PARAM_inherit; 174.3124 ++ EC_POINT_point2bn; 174.3125 ++ STORE_ATTR_INFO_set_dn; 174.3126 ++ X509_policy_tree_get0_policies; 174.3127 ++ EC_GROUP_new_curve_GF2m; 174.3128 ++ STORE_destroy_method; 174.3129 ++ ENGINE_unregister_STORE; 174.3130 ++ EVP_PKEY_get1_EC_KEY; 174.3131 ++ STORE_ATTR_INFO_get0_number; 174.3132 ++ ENGINE_get_default_ECDH; 174.3133 ++ EC_KEY_get_conv_form; 174.3134 ++ ASN1_OCTET_STRING_NDEF_it; 174.3135 ++ STORE_delete_public_key; 174.3136 ++ STORE_get_public_key; 174.3137 ++ STORE_modify_arbitrary; 174.3138 ++ ENGINE_get_static_state; 174.3139 ++ pqueue_iterator; 174.3140 ++ ECDSA_SIG_new; 174.3141 ++ OPENSSL_DIR_end; 174.3142 ++ BN_GF2m_mod_sqr; 174.3143 ++ EC_POINT_bn2point; 174.3144 ++ X509_VERIFY_PARAM_set_depth; 174.3145 ++ EC_KEY_set_asn1_flag; 174.3146 ++ STORE_get_method; 174.3147 ++ EC_KEY_get_key_method_data; 174.3148 ++ ECDSA_sign_ex; 174.3149 ++ STORE_parse_attrs_end; 174.3150 ++ EC_GROUP_get_point_conversion_form; 174.3151 ++ EC_GROUP_get_point_conv_form; 174.3152 ++ STORE_method_set_store_function; 174.3153 ++ STORE_ATTR_INFO_in; 174.3154 ++ PEM_read_bio_ECPKParameters; 174.3155 ++ EC_GROUP_get_pentanomial_basis; 174.3156 ++ EVP_PKEY_add1_attr_by_txt; 174.3157 ++ BN_BLINDING_set_flags; 174.3158 ++ X509_VERIFY_PARAM_set1_policies; 174.3159 ++ X509_VERIFY_PARAM_set1_name; 174.3160 ++ X509_VERIFY_PARAM_set_purpose; 174.3161 ++ STORE_get_number; 174.3162 ++ ECDSA_sign_setup; 174.3163 ++ BN_GF2m_mod_solve_quad_arr; 174.3164 ++ EC_KEY_up_ref; 174.3165 ++ POLICY_MAPPING_free; 174.3166 ++ BN_GF2m_mod_div; 174.3167 ++ X509_VERIFY_PARAM_set_flags; 174.3168 ++ EC_KEY_free; 174.3169 ++ STORE_meth_set_list_next_fn; 174.3170 ++ STORE_method_set_list_next_function; 174.3171 ++ PEM_write_bio_ECPrivateKey; 174.3172 ++ d2i_EC_PUBKEY; 174.3173 ++ STORE_meth_get_generate_fn; 174.3174 ++ STORE_method_get_generate_function; 174.3175 ++ STORE_meth_set_list_end_fn; 174.3176 ++ STORE_method_set_list_end_function; 174.3177 ++ pqueue_print; 174.3178 ++ EC_GROUP_have_precompute_mult; 174.3179 ++ EC_KEY_print_fp; 174.3180 ++ BN_GF2m_mod_arr; 174.3181 ++ PEM_write_bio_X509_CERT_PAIR; 174.3182 ++ EVP_PKEY_cmp; 174.3183 ++ X509_policy_level_node_count; 174.3184 ++ STORE_new_engine; 174.3185 ++ STORE_list_public_key_start; 174.3186 ++ X509_VERIFY_PARAM_new; 174.3187 ++ ECDH_get_ex_data; 174.3188 ++ EVP_PKEY_get_attr; 174.3189 ++ ECDSA_do_sign; 174.3190 ++ ENGINE_unregister_ECDH; 174.3191 ++ ECDH_OpenSSL; 174.3192 ++ EC_KEY_set_conv_form; 174.3193 ++ EC_POINT_dup; 174.3194 ++ GENERAL_SUBTREE_new; 174.3195 ++ STORE_list_crl_endp; 174.3196 ++ EC_get_builtin_curves; 174.3197 ++ X509_policy_node_get0_qualifiers; 174.3198 ++ X509_pcy_node_get0_qualifiers; 174.3199 ++ STORE_list_crl_end; 174.3200 ++ EVP_PKEY_set1_EC_KEY; 174.3201 ++ BN_GF2m_mod_sqrt_arr; 174.3202 ++ i2d_ECPrivateKey_bio; 174.3203 ++ ECPKParameters_print_fp; 174.3204 ++ pqueue_find; 174.3205 ++ ECDSA_SIG_free; 174.3206 ++ PEM_write_bio_ECPKParameters; 174.3207 ++ STORE_method_set_ctrl_function; 174.3208 ++ STORE_list_public_key_end; 174.3209 ++ EC_KEY_set_private_key; 174.3210 ++ pqueue_peek; 174.3211 ++ STORE_get_arbitrary; 174.3212 ++ STORE_store_crl; 174.3213 ++ X509_policy_node_get0_policy; 174.3214 ++ PKCS12_add_safes; 174.3215 ++ BN_BLINDING_convert_ex; 174.3216 ++ X509_policy_tree_free; 174.3217 ++ OPENSSL_ia32cap_loc; 174.3218 ++ BN_GF2m_poly2arr; 174.3219 ++ STORE_ctrl; 174.3220 ++ STORE_ATTR_INFO_compare; 174.3221 ++ BN_get0_nist_prime_224; 174.3222 ++ i2d_ECParameters; 174.3223 ++ i2d_ECPKParameters; 174.3224 ++ BN_GENCB_call; 174.3225 ++ d2i_ECPKParameters; 174.3226 ++ STORE_meth_set_generate_fn; 174.3227 ++ STORE_method_set_generate_function; 174.3228 ++ ENGINE_set_ECDH; 174.3229 ++ NAME_CONSTRAINTS_new; 174.3230 ++ SHA256_Init; 174.3231 ++ EC_KEY_get0_public_key; 174.3232 ++ PEM_write_bio_EC_PUBKEY; 174.3233 ++ STORE_ATTR_INFO_set_cstr; 174.3234 ++ STORE_list_crl_next; 174.3235 ++ STORE_ATTR_INFO_in_range; 174.3236 ++ ECParameters_print; 174.3237 ++ STORE_meth_set_delete_fn; 174.3238 ++ STORE_method_set_delete_function; 174.3239 ++ STORE_list_certificate_next; 174.3240 ++ ASN1_generate_nconf; 174.3241 ++ BUF_memdup; 174.3242 ++ BN_GF2m_mod_mul; 174.3243 ++ STORE_meth_get_list_next_fn; 174.3244 ++ STORE_method_get_list_next_function; 174.3245 ++ STORE_ATTR_INFO_get0_dn; 174.3246 ++ STORE_list_private_key_next; 174.3247 ++ EC_GROUP_set_seed; 174.3248 ++ X509_VERIFY_PARAM_set_trust; 174.3249 ++ STORE_ATTR_INFO_free; 174.3250 ++ STORE_get_private_key; 174.3251 ++ EVP_PKEY_get_attr_count; 174.3252 ++ STORE_ATTR_INFO_new; 174.3253 ++ EC_GROUP_get_curve_GF2m; 174.3254 ++ STORE_meth_set_revoke_fn; 174.3255 ++ STORE_method_set_revoke_function; 174.3256 ++ STORE_store_number; 174.3257 ++ BN_is_prime_ex; 174.3258 ++ STORE_revoke_public_key; 174.3259 ++ X509_STORE_CTX_get0_param; 174.3260 ++ STORE_delete_arbitrary; 174.3261 ++ PEM_read_X509_CERT_PAIR; 174.3262 ++ X509_STORE_set_depth; 174.3263 ++ ECDSA_get_ex_data; 174.3264 ++ SHA224; 174.3265 ++ BIO_dump_indent_fp; 174.3266 ++ EC_KEY_set_group; 174.3267 ++ BUF_strndup; 174.3268 ++ STORE_list_certificate_start; 174.3269 ++ BN_GF2m_mod; 174.3270 ++ X509_REQ_check_private_key; 174.3271 ++ EC_GROUP_get_seed_len; 174.3272 ++ ERR_load_STORE_strings; 174.3273 ++ PEM_read_bio_EC_PUBKEY; 174.3274 ++ STORE_list_private_key_end; 174.3275 ++ i2d_EC_PUBKEY; 174.3276 ++ ECDSA_get_default_method; 174.3277 ++ ASN1_put_eoc; 174.3278 ++ X509_STORE_CTX_get_explicit_policy; 174.3279 ++ X509_STORE_CTX_get_expl_policy; 174.3280 ++ X509_VERIFY_PARAM_table_cleanup; 174.3281 ++ STORE_modify_private_key; 174.3282 ++ X509_VERIFY_PARAM_free; 174.3283 ++ EC_METHOD_get_field_type; 174.3284 ++ EC_GFp_nist_method; 174.3285 ++ STORE_meth_set_modify_fn; 174.3286 ++ STORE_method_set_modify_function; 174.3287 ++ STORE_parse_attrs_next; 174.3288 ++ ENGINE_load_padlock; 174.3289 ++ EC_GROUP_set_curve_name; 174.3290 ++ X509_CERT_PAIR_it; 174.3291 ++ STORE_meth_get_revoke_fn; 174.3292 ++ STORE_method_get_revoke_function; 174.3293 ++ STORE_method_set_get_function; 174.3294 ++ STORE_modify_number; 174.3295 ++ STORE_method_get_store_function; 174.3296 ++ STORE_store_private_key; 174.3297 ++ BN_GF2m_mod_sqr_arr; 174.3298 ++ RSA_setup_blinding; 174.3299 ++ BIO_s_datagram; 174.3300 ++ STORE_Memory; 174.3301 ++ sk_find_ex; 174.3302 ++ EC_GROUP_set_curve_GF2m; 174.3303 ++ ENGINE_set_default_ECDSA; 174.3304 ++ POLICY_CONSTRAINTS_new; 174.3305 ++ BN_GF2m_mod_sqrt; 174.3306 ++ ECDH_set_default_method; 174.3307 ++ EC_KEY_generate_key; 174.3308 ++ SHA384_Update; 174.3309 ++ BN_GF2m_arr2poly; 174.3310 ++ STORE_method_get_get_function; 174.3311 ++ STORE_meth_set_cleanup_fn; 174.3312 ++ STORE_method_set_cleanup_function; 174.3313 ++ EC_GROUP_check; 174.3314 ++ d2i_ECPrivateKey_bio; 174.3315 ++ EC_KEY_insert_key_method_data; 174.3316 ++ STORE_meth_get_lock_store_fn; 174.3317 ++ STORE_method_get_lock_store_function; 174.3318 ++ X509_VERIFY_PARAM_get_depth; 174.3319 ++ SHA224_Final; 174.3320 ++ STORE_meth_set_update_store_fn; 174.3321 ++ STORE_method_set_update_store_function; 174.3322 ++ SHA224_Update; 174.3323 ++ d2i_ECPrivateKey; 174.3324 ++ ASN1_item_ndef_i2d; 174.3325 ++ STORE_delete_private_key; 174.3326 ++ ERR_pop_to_mark; 174.3327 ++ ENGINE_register_all_STORE; 174.3328 ++ X509_policy_level_get0_node; 174.3329 ++ i2d_PKCS7_NDEF; 174.3330 ++ EC_GROUP_get_degree; 174.3331 ++ ASN1_generate_v3; 174.3332 ++ STORE_ATTR_INFO_modify_cstr; 174.3333 ++ X509_policy_tree_level_count; 174.3334 ++ BN_GF2m_add; 174.3335 ++ EC_KEY_get0_group; 174.3336 ++ STORE_generate_crl; 174.3337 ++ STORE_store_public_key; 174.3338 ++ X509_CERT_PAIR_free; 174.3339 ++ STORE_revoke_private_key; 174.3340 ++ BN_nist_mod_224; 174.3341 ++ SHA512_Final; 174.3342 ++ STORE_ATTR_INFO_modify_dn; 174.3343 ++ STORE_meth_get_initialise_fn; 174.3344 ++ STORE_method_get_initialise_function; 174.3345 ++ STORE_delete_number; 174.3346 ++ i2d_EC_PUBKEY_bio; 174.3347 ++ BIO_dgram_non_fatal_error; 174.3348 ++ EC_GROUP_get_asn1_flag; 174.3349 ++ STORE_ATTR_INFO_in_ex; 174.3350 ++ STORE_list_crl_start; 174.3351 ++ ECDH_get_ex_new_index; 174.3352 ++ STORE_meth_get_modify_fn; 174.3353 ++ STORE_method_get_modify_function; 174.3354 ++ v2i_ASN1_BIT_STRING; 174.3355 ++ STORE_store_certificate; 174.3356 ++ OBJ_bsearch_ex; 174.3357 ++ X509_STORE_CTX_set_default; 174.3358 ++ STORE_ATTR_INFO_set_sha1str; 174.3359 ++ BN_GF2m_mod_inv; 174.3360 ++ BN_GF2m_mod_exp; 174.3361 ++ STORE_modify_public_key; 174.3362 ++ STORE_meth_get_list_start_fn; 174.3363 ++ STORE_method_get_list_start_function; 174.3364 ++ EC_GROUP_get0_seed; 174.3365 ++ STORE_store_arbitrary; 174.3366 ++ STORE_meth_set_unlock_store_fn; 174.3367 ++ STORE_method_set_unlock_store_function; 174.3368 ++ BN_GF2m_mod_div_arr; 174.3369 ++ ENGINE_set_ECDSA; 174.3370 ++ STORE_create_method; 174.3371 ++ ECPKParameters_print; 174.3372 ++ EC_KEY_get0_private_key; 174.3373 ++ PEM_write_EC_PUBKEY; 174.3374 ++ X509_VERIFY_PARAM_set1; 174.3375 ++ ECDH_set_method; 174.3376 ++ v2i_GENERAL_NAME_ex; 174.3377 ++ ECDH_set_ex_data; 174.3378 ++ STORE_generate_key; 174.3379 ++ BN_nist_mod_521; 174.3380 ++ X509_policy_tree_get0_level; 174.3381 ++ EC_GROUP_set_point_conversion_form; 174.3382 ++ EC_GROUP_set_point_conv_form; 174.3383 ++ PEM_read_EC_PUBKEY; 174.3384 ++ i2d_ECDSA_SIG; 174.3385 ++ ECDSA_OpenSSL; 174.3386 ++ STORE_delete_crl; 174.3387 ++ EC_KEY_get_enc_flags; 174.3388 ++ ASN1_const_check_infinite_end; 174.3389 ++ EVP_PKEY_delete_attr; 174.3390 ++ ECDSA_set_default_method; 174.3391 ++ EC_POINT_set_compressed_coordinates_GF2m; 174.3392 ++ EC_POINT_set_compr_coords_GF2m; 174.3393 ++ EC_GROUP_cmp; 174.3394 ++ STORE_revoke_certificate; 174.3395 ++ BN_get0_nist_prime_256; 174.3396 ++ STORE_meth_get_delete_fn; 174.3397 ++ STORE_method_get_delete_function; 174.3398 ++ SHA224_Init; 174.3399 ++ PEM_read_ECPrivateKey; 174.3400 ++ SHA512_Init; 174.3401 ++ STORE_parse_attrs_endp; 174.3402 ++ BN_set_negative; 174.3403 ++ ERR_load_ECDSA_strings; 174.3404 ++ EC_GROUP_get_basis_type; 174.3405 ++ STORE_list_public_key_next; 174.3406 ++ i2v_ASN1_BIT_STRING; 174.3407 ++ STORE_OBJECT_free; 174.3408 ++ BN_nist_mod_384; 174.3409 ++ i2d_X509_CERT_PAIR; 174.3410 ++ PEM_write_ECPKParameters; 174.3411 ++ ECDH_compute_key; 174.3412 ++ STORE_ATTR_INFO_get0_sha1str; 174.3413 ++ ENGINE_register_all_ECDH; 174.3414 ++ pqueue_pop; 174.3415 ++ STORE_ATTR_INFO_get0_cstr; 174.3416 ++ POLICY_CONSTRAINTS_it; 174.3417 ++ STORE_get_ex_new_index; 174.3418 ++ EVP_PKEY_get_attr_by_OBJ; 174.3419 ++ X509_VERIFY_PARAM_add0_policy; 174.3420 ++ BN_GF2m_mod_solve_quad; 174.3421 ++ SHA256; 174.3422 ++ i2d_ECPrivateKey_fp; 174.3423 ++ X509_policy_tree_get0_user_policies; 174.3424 ++ X509_pcy_tree_get0_usr_policies; 174.3425 ++ OPENSSL_DIR_read; 174.3426 ++ ENGINE_register_all_ECDSA; 174.3427 ++ X509_VERIFY_PARAM_lookup; 174.3428 ++ EC_POINT_get_affine_coordinates_GF2m; 174.3429 ++ EC_POINT_get_affine_coords_GF2m; 174.3430 ++ EC_GROUP_dup; 174.3431 ++ ENGINE_get_default_ECDSA; 174.3432 ++ EC_KEY_new; 174.3433 ++ SHA256_Transform; 174.3434 ++ EC_KEY_set_enc_flags; 174.3435 ++ ECDSA_verify; 174.3436 ++ EC_POINT_point2hex; 174.3437 ++ ENGINE_get_STORE; 174.3438 ++ SHA512; 174.3439 ++ STORE_get_certificate; 174.3440 ++ ECDSA_do_sign_ex; 174.3441 ++ ECDSA_do_verify; 174.3442 ++ d2i_ECPrivateKey_fp; 174.3443 ++ STORE_delete_certificate; 174.3444 ++ SHA512_Transform; 174.3445 ++ X509_STORE_set1_param; 174.3446 ++ STORE_method_get_ctrl_function; 174.3447 ++ STORE_free; 174.3448 ++ PEM_write_ECPrivateKey; 174.3449 ++ STORE_meth_get_unlock_store_fn; 174.3450 ++ STORE_method_get_unlock_store_function; 174.3451 ++ STORE_get_ex_data; 174.3452 ++ EC_KEY_set_public_key; 174.3453 ++ PEM_read_ECPKParameters; 174.3454 ++ X509_CERT_PAIR_new; 174.3455 ++ ENGINE_register_STORE; 174.3456 ++ RSA_generate_key_ex; 174.3457 ++ DSA_generate_parameters_ex; 174.3458 ++ ECParameters_print_fp; 174.3459 ++ X509V3_NAME_from_section; 174.3460 ++ EVP_PKEY_add1_attr; 174.3461 ++ STORE_modify_crl; 174.3462 ++ STORE_list_private_key_start; 174.3463 ++ POLICY_MAPPINGS_it; 174.3464 ++ GENERAL_SUBTREE_it; 174.3465 ++ EC_GROUP_get_curve_name; 174.3466 ++ PEM_write_X509_CERT_PAIR; 174.3467 ++ BIO_dump_indent_cb; 174.3468 ++ d2i_X509_CERT_PAIR; 174.3469 ++ STORE_list_private_key_endp; 174.3470 ++ asn1_const_Finish; 174.3471 ++ i2d_EC_PUBKEY_fp; 174.3472 ++ BN_nist_mod_256; 174.3473 ++ X509_VERIFY_PARAM_add0_table; 174.3474 ++ pqueue_free; 174.3475 ++ BN_BLINDING_create_param; 174.3476 ++ ECDSA_size; 174.3477 ++ d2i_EC_PUBKEY_bio; 174.3478 ++ BN_get0_nist_prime_521; 174.3479 ++ STORE_ATTR_INFO_modify_sha1str; 174.3480 ++ BN_generate_prime_ex; 174.3481 ++ EC_GROUP_new_by_curve_name; 174.3482 ++ SHA256_Final; 174.3483 ++ DH_generate_parameters_ex; 174.3484 ++ PEM_read_bio_ECPrivateKey; 174.3485 ++ STORE_meth_get_cleanup_fn; 174.3486 ++ STORE_method_get_cleanup_function; 174.3487 ++ ENGINE_get_ECDH; 174.3488 ++ d2i_ECDSA_SIG; 174.3489 ++ BN_is_prime_fasttest_ex; 174.3490 ++ ECDSA_sign; 174.3491 ++ X509_policy_check; 174.3492 ++ EVP_PKEY_get_attr_by_NID; 174.3493 ++ STORE_set_ex_data; 174.3494 ++ ENGINE_get_ECDSA; 174.3495 ++ EVP_ecdsa; 174.3496 ++ BN_BLINDING_get_flags; 174.3497 ++ PKCS12_add_cert; 174.3498 ++ STORE_OBJECT_new; 174.3499 ++ ERR_load_ECDH_strings; 174.3500 ++ EC_KEY_dup; 174.3501 ++ EVP_CIPHER_CTX_rand_key; 174.3502 ++ ECDSA_set_method; 174.3503 ++ a2i_IPADDRESS_NC; 174.3504 ++ d2i_ECParameters; 174.3505 ++ STORE_list_certificate_end; 174.3506 ++ STORE_get_crl; 174.3507 ++ X509_POLICY_NODE_print; 174.3508 ++ SHA384_Init; 174.3509 ++ EC_GF2m_simple_method; 174.3510 ++ ECDSA_set_ex_data; 174.3511 ++ SHA384_Final; 174.3512 ++ PKCS7_set_digest; 174.3513 ++ EC_KEY_print; 174.3514 ++ STORE_meth_set_lock_store_fn; 174.3515 ++ STORE_method_set_lock_store_function; 174.3516 ++ ECDSA_get_ex_new_index; 174.3517 ++ SHA384; 174.3518 ++ POLICY_MAPPING_new; 174.3519 ++ STORE_list_certificate_endp; 174.3520 ++ X509_STORE_CTX_get0_policy_tree; 174.3521 ++ EC_GROUP_set_asn1_flag; 174.3522 ++ EC_KEY_check_key; 174.3523 ++ d2i_EC_PUBKEY_fp; 174.3524 ++ PKCS7_set0_type_other; 174.3525 ++ PEM_read_bio_X509_CERT_PAIR; 174.3526 ++ pqueue_next; 174.3527 ++ STORE_meth_get_list_end_fn; 174.3528 ++ STORE_method_get_list_end_function; 174.3529 ++ EVP_PKEY_add1_attr_by_OBJ; 174.3530 ++ X509_VERIFY_PARAM_set_time; 174.3531 ++ pqueue_new; 174.3532 ++ ENGINE_set_default_ECDH; 174.3533 ++ STORE_new_method; 174.3534 ++ PKCS12_add_key; 174.3535 ++ DSO_merge; 174.3536 ++ EC_POINT_hex2point; 174.3537 ++ BIO_dump_cb; 174.3538 ++ SHA256_Update; 174.3539 ++ pqueue_insert; 174.3540 ++ pitem_free; 174.3541 ++ BN_GF2m_mod_inv_arr; 174.3542 ++ ENGINE_unregister_ECDSA; 174.3543 ++ BN_BLINDING_set_thread_id; 174.3544 ++ get_rfc3526_prime_8192; 174.3545 ++ X509_VERIFY_PARAM_clear_flags; 174.3546 ++ get_rfc2409_prime_1024; 174.3547 ++ DH_check_pub_key; 174.3548 ++ get_rfc3526_prime_2048; 174.3549 ++ get_rfc3526_prime_6144; 174.3550 ++ get_rfc3526_prime_1536; 174.3551 ++ get_rfc3526_prime_3072; 174.3552 ++ get_rfc3526_prime_4096; 174.3553 ++ get_rfc2409_prime_768; 174.3554 ++ X509_VERIFY_PARAM_get_flags; 174.3555 ++ EVP_CIPHER_CTX_new; 174.3556 ++ EVP_CIPHER_CTX_free; 174.3557 ++ Camellia_cbc_encrypt; 174.3558 ++ Camellia_cfb128_encrypt; 174.3559 ++ Camellia_cfb1_encrypt; 174.3560 ++ Camellia_cfb8_encrypt; 174.3561 ++ Camellia_ctr128_encrypt; 174.3562 ++ Camellia_cfbr_encrypt_block; 174.3563 ++ Camellia_decrypt; 174.3564 ++ Camellia_ecb_encrypt; 174.3565 ++ Camellia_encrypt; 174.3566 ++ Camellia_ofb128_encrypt; 174.3567 ++ Camellia_set_key; 174.3568 ++ EVP_camellia_128_cbc; 174.3569 ++ EVP_camellia_128_cfb128; 174.3570 ++ EVP_camellia_128_cfb1; 174.3571 ++ EVP_camellia_128_cfb8; 174.3572 ++ EVP_camellia_128_ecb; 174.3573 ++ EVP_camellia_128_ofb; 174.3574 ++ EVP_camellia_192_cbc; 174.3575 ++ EVP_camellia_192_cfb128; 174.3576 ++ EVP_camellia_192_cfb1; 174.3577 ++ EVP_camellia_192_cfb8; 174.3578 ++ EVP_camellia_192_ecb; 174.3579 ++ EVP_camellia_192_ofb; 174.3580 ++ EVP_camellia_256_cbc; 174.3581 ++ EVP_camellia_256_cfb128; 174.3582 ++ EVP_camellia_256_cfb1; 174.3583 ++ EVP_camellia_256_cfb8; 174.3584 ++ EVP_camellia_256_ecb; 174.3585 ++ EVP_camellia_256_ofb; 174.3586 ++ a2i_ipadd; 174.3587 ++ ASIdentifiers_free; 174.3588 ++ i2d_ASIdOrRange; 174.3589 ++ EVP_CIPHER_block_size; 174.3590 ++ v3_asid_is_canonical; 174.3591 ++ IPAddressChoice_free; 174.3592 ++ EVP_CIPHER_CTX_set_app_data; 174.3593 ++ BIO_set_callback_arg; 174.3594 ++ v3_addr_add_prefix; 174.3595 ++ IPAddressOrRange_it; 174.3596 ++ BIO_set_flags; 174.3597 ++ ASIdentifiers_it; 174.3598 ++ v3_addr_get_range; 174.3599 ++ BIO_method_type; 174.3600 ++ v3_addr_inherits; 174.3601 ++ IPAddressChoice_it; 174.3602 ++ AES_ige_encrypt; 174.3603 ++ v3_addr_add_range; 174.3604 ++ EVP_CIPHER_CTX_nid; 174.3605 ++ d2i_ASRange; 174.3606 ++ v3_addr_add_inherit; 174.3607 ++ v3_asid_add_id_or_range; 174.3608 ++ v3_addr_validate_resource_set; 174.3609 ++ EVP_CIPHER_iv_length; 174.3610 ++ EVP_MD_type; 174.3611 ++ v3_asid_canonize; 174.3612 ++ IPAddressRange_free; 174.3613 ++ v3_asid_add_inherit; 174.3614 ++ EVP_CIPHER_CTX_key_length; 174.3615 ++ IPAddressRange_new; 174.3616 ++ ASIdOrRange_new; 174.3617 ++ EVP_MD_size; 174.3618 ++ EVP_MD_CTX_test_flags; 174.3619 ++ BIO_clear_flags; 174.3620 ++ i2d_ASRange; 174.3621 ++ IPAddressRange_it; 174.3622 ++ IPAddressChoice_new; 174.3623 ++ ASIdentifierChoice_new; 174.3624 ++ ASRange_free; 174.3625 ++ EVP_MD_pkey_type; 174.3626 ++ EVP_MD_CTX_clear_flags; 174.3627 ++ IPAddressFamily_free; 174.3628 ++ i2d_IPAddressFamily; 174.3629 ++ IPAddressOrRange_new; 174.3630 ++ EVP_CIPHER_flags; 174.3631 ++ v3_asid_validate_resource_set; 174.3632 ++ d2i_IPAddressRange; 174.3633 ++ AES_bi_ige_encrypt; 174.3634 ++ BIO_get_callback; 174.3635 ++ IPAddressOrRange_free; 174.3636 ++ v3_addr_subset; 174.3637 ++ d2i_IPAddressFamily; 174.3638 ++ v3_asid_subset; 174.3639 ++ BIO_test_flags; 174.3640 ++ i2d_ASIdentifierChoice; 174.3641 ++ ASRange_it; 174.3642 ++ d2i_ASIdentifiers; 174.3643 ++ ASRange_new; 174.3644 ++ d2i_IPAddressChoice; 174.3645 ++ v3_addr_get_afi; 174.3646 ++ EVP_CIPHER_key_length; 174.3647 ++ EVP_Cipher; 174.3648 ++ i2d_IPAddressOrRange; 174.3649 ++ ASIdOrRange_it; 174.3650 ++ EVP_CIPHER_nid; 174.3651 ++ i2d_IPAddressChoice; 174.3652 ++ EVP_CIPHER_CTX_block_size; 174.3653 ++ ASIdentifiers_new; 174.3654 ++ v3_addr_validate_path; 174.3655 ++ IPAddressFamily_new; 174.3656 ++ EVP_MD_CTX_set_flags; 174.3657 ++ v3_addr_is_canonical; 174.3658 ++ i2d_IPAddressRange; 174.3659 ++ IPAddressFamily_it; 174.3660 ++ v3_asid_inherits; 174.3661 ++ EVP_CIPHER_CTX_cipher; 174.3662 ++ EVP_CIPHER_CTX_get_app_data; 174.3663 ++ EVP_MD_block_size; 174.3664 ++ EVP_CIPHER_CTX_flags; 174.3665 ++ v3_asid_validate_path; 174.3666 ++ d2i_IPAddressOrRange; 174.3667 ++ v3_addr_canonize; 174.3668 ++ ASIdentifierChoice_it; 174.3669 ++ EVP_MD_CTX_md; 174.3670 ++ d2i_ASIdentifierChoice; 174.3671 ++ BIO_method_name; 174.3672 ++ EVP_CIPHER_CTX_iv_length; 174.3673 ++ ASIdOrRange_free; 174.3674 ++ ASIdentifierChoice_free; 174.3675 ++ BIO_get_callback_arg; 174.3676 ++ BIO_set_callback; 174.3677 ++ d2i_ASIdOrRange; 174.3678 ++ i2d_ASIdentifiers; 174.3679 ++ SEED_decrypt; 174.3680 ++ SEED_encrypt; 174.3681 ++ SEED_cbc_encrypt; 174.3682 ++ EVP_seed_ofb; 174.3683 ++ SEED_cfb128_encrypt; 174.3684 ++ SEED_ofb128_encrypt; 174.3685 ++ EVP_seed_cbc; 174.3686 ++ SEED_ecb_encrypt; 174.3687 ++ EVP_seed_ecb; 174.3688 ++ SEED_set_key; 174.3689 ++ EVP_seed_cfb128; 174.3690 ++ X509_EXTENSIONS_it; 174.3691 ++ X509_get1_ocsp; 174.3692 ++ OCSP_REQ_CTX_free; 174.3693 ++ i2d_X509_EXTENSIONS; 174.3694 ++ OCSP_sendreq_nbio; 174.3695 ++ OCSP_sendreq_new; 174.3696 ++ d2i_X509_EXTENSIONS; 174.3697 ++ X509_ALGORS_it; 174.3698 ++ X509_ALGOR_get0; 174.3699 ++ X509_ALGOR_set0; 174.3700 ++ AES_unwrap_key; 174.3701 ++ AES_wrap_key; 174.3702 ++ X509at_get0_data_by_OBJ; 174.3703 ++ ASN1_TYPE_set1; 174.3704 ++ ASN1_STRING_set0; 174.3705 ++ i2d_X509_ALGORS; 174.3706 ++ BIO_f_zlib; 174.3707 ++ COMP_zlib_cleanup; 174.3708 ++ d2i_X509_ALGORS; 174.3709 ++ CMS_ReceiptRequest_free; 174.3710 ++ PEM_write_CMS; 174.3711 ++ CMS_add0_CertificateChoices; 174.3712 ++ CMS_unsigned_add1_attr_by_OBJ; 174.3713 ++ ERR_load_CMS_strings; 174.3714 ++ CMS_sign_receipt; 174.3715 ++ i2d_CMS_ContentInfo; 174.3716 ++ CMS_signed_delete_attr; 174.3717 ++ d2i_CMS_bio; 174.3718 ++ CMS_unsigned_get_attr_by_NID; 174.3719 ++ CMS_verify; 174.3720 ++ SMIME_read_CMS; 174.3721 ++ CMS_decrypt_set1_key; 174.3722 ++ CMS_SignerInfo_get0_algs; 174.3723 ++ CMS_add1_cert; 174.3724 ++ CMS_set_detached; 174.3725 ++ CMS_encrypt; 174.3726 ++ CMS_EnvelopedData_create; 174.3727 ++ CMS_uncompress; 174.3728 ++ CMS_add0_crl; 174.3729 ++ CMS_SignerInfo_verify_content; 174.3730 ++ CMS_unsigned_get0_data_by_OBJ; 174.3731 ++ PEM_write_bio_CMS; 174.3732 ++ CMS_unsigned_get_attr; 174.3733 ++ CMS_RecipientInfo_ktri_cert_cmp; 174.3734 ++ CMS_RecipientInfo_ktri_get0_algs; 174.3735 ++ CMS_RecipInfo_ktri_get0_algs; 174.3736 ++ CMS_ContentInfo_free; 174.3737 ++ CMS_final; 174.3738 ++ CMS_add_simple_smimecap; 174.3739 ++ CMS_SignerInfo_verify; 174.3740 ++ CMS_data; 174.3741 ++ CMS_ContentInfo_it; 174.3742 ++ d2i_CMS_ReceiptRequest; 174.3743 ++ CMS_compress; 174.3744 ++ CMS_digest_create; 174.3745 ++ CMS_SignerInfo_cert_cmp; 174.3746 ++ CMS_SignerInfo_sign; 174.3747 ++ CMS_data_create; 174.3748 ++ i2d_CMS_bio; 174.3749 ++ CMS_EncryptedData_set1_key; 174.3750 ++ CMS_decrypt; 174.3751 ++ int_smime_write_ASN1; 174.3752 ++ CMS_unsigned_delete_attr; 174.3753 ++ CMS_unsigned_get_attr_count; 174.3754 ++ CMS_add_smimecap; 174.3755 ++ PEM_read_CMS; 174.3756 ++ CMS_signed_get_attr_by_OBJ; 174.3757 ++ d2i_CMS_ContentInfo; 174.3758 ++ CMS_add_standard_smimecap; 174.3759 ++ CMS_ContentInfo_new; 174.3760 ++ CMS_RecipientInfo_type; 174.3761 ++ CMS_get0_type; 174.3762 ++ CMS_is_detached; 174.3763 ++ CMS_sign; 174.3764 ++ CMS_signed_add1_attr; 174.3765 ++ CMS_unsigned_get_attr_by_OBJ; 174.3766 ++ SMIME_write_CMS; 174.3767 ++ CMS_EncryptedData_decrypt; 174.3768 ++ CMS_get0_RecipientInfos; 174.3769 ++ CMS_add0_RevocationInfoChoice; 174.3770 ++ CMS_decrypt_set1_pkey; 174.3771 ++ CMS_SignerInfo_set1_signer_cert; 174.3772 ++ CMS_get0_signers; 174.3773 ++ CMS_ReceiptRequest_get0_values; 174.3774 ++ CMS_signed_get0_data_by_OBJ; 174.3775 ++ CMS_get0_SignerInfos; 174.3776 ++ CMS_add0_cert; 174.3777 ++ CMS_EncryptedData_encrypt; 174.3778 ++ CMS_digest_verify; 174.3779 ++ CMS_set1_signers_certs; 174.3780 ++ CMS_signed_get_attr; 174.3781 ++ CMS_RecipientInfo_set0_key; 174.3782 ++ CMS_SignedData_init; 174.3783 ++ CMS_RecipientInfo_kekri_get0_id; 174.3784 ++ CMS_verify_receipt; 174.3785 ++ CMS_ReceiptRequest_it; 174.3786 ++ PEM_read_bio_CMS; 174.3787 ++ CMS_get1_crls; 174.3788 ++ CMS_add0_recipient_key; 174.3789 ++ SMIME_read_ASN1; 174.3790 ++ CMS_ReceiptRequest_new; 174.3791 ++ CMS_get0_content; 174.3792 ++ CMS_get1_ReceiptRequest; 174.3793 ++ CMS_signed_add1_attr_by_OBJ; 174.3794 ++ CMS_RecipientInfo_kekri_id_cmp; 174.3795 ++ CMS_add1_ReceiptRequest; 174.3796 ++ CMS_SignerInfo_get0_signer_id; 174.3797 ++ CMS_unsigned_add1_attr_by_NID; 174.3798 ++ CMS_unsigned_add1_attr; 174.3799 ++ CMS_signed_get_attr_by_NID; 174.3800 ++ CMS_get1_certs; 174.3801 ++ CMS_signed_add1_attr_by_NID; 174.3802 ++ CMS_unsigned_add1_attr_by_txt; 174.3803 ++ CMS_dataFinal; 174.3804 ++ CMS_RecipientInfo_ktri_get0_signer_id; 174.3805 ++ CMS_RecipInfo_ktri_get0_sigr_id; 174.3806 ++ i2d_CMS_ReceiptRequest; 174.3807 ++ CMS_add1_recipient_cert; 174.3808 ++ CMS_dataInit; 174.3809 ++ CMS_signed_add1_attr_by_txt; 174.3810 ++ CMS_RecipientInfo_decrypt; 174.3811 ++ CMS_signed_get_attr_count; 174.3812 ++ CMS_get0_eContentType; 174.3813 ++ CMS_set1_eContentType; 174.3814 ++ CMS_ReceiptRequest_create0; 174.3815 ++ CMS_add1_signer; 174.3816 ++ CMS_RecipientInfo_set0_pkey; 174.3817 ++ ENGINE_set_load_ssl_client_cert_function; 174.3818 ++ ENGINE_set_ld_ssl_clnt_cert_fn; 174.3819 ++ ENGINE_get_ssl_client_cert_function; 174.3820 ++ ENGINE_get_ssl_client_cert_fn; 174.3821 ++ ENGINE_load_ssl_client_cert; 174.3822 ++ ENGINE_load_capi; 174.3823 ++ OPENSSL_isservice; 174.3824 ++ FIPS_dsa_sig_decode; 174.3825 ++ EVP_CIPHER_CTX_clear_flags; 174.3826 ++ FIPS_rand_status; 174.3827 ++ FIPS_rand_set_key; 174.3828 ++ CRYPTO_set_mem_info_functions; 174.3829 ++ RSA_X931_generate_key_ex; 174.3830 ++ int_ERR_set_state_func; 174.3831 ++ int_EVP_MD_set_engine_callbacks; 174.3832 ++ int_CRYPTO_set_do_dynlock_callback; 174.3833 ++ FIPS_rng_stick; 174.3834 ++ EVP_CIPHER_CTX_set_flags; 174.3835 ++ BN_X931_generate_prime_ex; 174.3836 ++ FIPS_selftest_check; 174.3837 ++ FIPS_rand_set_dt; 174.3838 ++ CRYPTO_dbg_pop_info; 174.3839 ++ FIPS_dsa_free; 174.3840 ++ RSA_X931_derive_ex; 174.3841 ++ FIPS_rsa_new; 174.3842 ++ FIPS_rand_bytes; 174.3843 ++ fips_cipher_test; 174.3844 ++ EVP_CIPHER_CTX_test_flags; 174.3845 ++ CRYPTO_malloc_debug_init; 174.3846 ++ CRYPTO_dbg_push_info; 174.3847 ++ FIPS_corrupt_rsa_keygen; 174.3848 ++ FIPS_dh_new; 174.3849 ++ FIPS_corrupt_dsa_keygen; 174.3850 ++ FIPS_dh_free; 174.3851 ++ fips_pkey_signature_test; 174.3852 ++ EVP_add_alg_module; 174.3853 ++ int_RAND_init_engine_callbacks; 174.3854 ++ int_EVP_CIPHER_set_engine_callbacks; 174.3855 ++ int_EVP_MD_init_engine_callbacks; 174.3856 ++ FIPS_rand_test_mode; 174.3857 ++ FIPS_rand_reset; 174.3858 ++ FIPS_dsa_new; 174.3859 ++ int_RAND_set_callbacks; 174.3860 ++ BN_X931_derive_prime_ex; 174.3861 ++ int_ERR_lib_init; 174.3862 ++ int_EVP_CIPHER_init_engine_callbacks; 174.3863 ++ FIPS_rsa_free; 174.3864 ++ FIPS_dsa_sig_encode; 174.3865 ++ CRYPTO_dbg_remove_all_info; 174.3866 ++ OPENSSL_init; 174.3867 ++ CRYPTO_strdup; 174.3868 ++ JPAKE_STEP3A_process; 174.3869 ++ JPAKE_STEP1_release; 174.3870 ++ JPAKE_get_shared_key; 174.3871 ++ JPAKE_STEP3B_init; 174.3872 ++ JPAKE_STEP1_generate; 174.3873 ++ JPAKE_STEP1_init; 174.3874 ++ JPAKE_STEP3B_process; 174.3875 ++ JPAKE_STEP2_generate; 174.3876 ++ JPAKE_CTX_new; 174.3877 ++ JPAKE_CTX_free; 174.3878 ++ JPAKE_STEP3B_release; 174.3879 ++ JPAKE_STEP3A_release; 174.3880 ++ JPAKE_STEP2_process; 174.3881 ++ JPAKE_STEP3B_generate; 174.3882 ++ JPAKE_STEP1_process; 174.3883 ++ JPAKE_STEP3A_generate; 174.3884 ++ JPAKE_STEP2_release; 174.3885 ++ JPAKE_STEP3A_init; 174.3886 ++ ERR_load_JPAKE_strings; 174.3887 ++ JPAKE_STEP2_init; 174.3888 ++ pqueue_size; 174.3889 ++ i2d_TS_ACCURACY; 174.3890 ++ i2d_TS_MSG_IMPRINT_fp; 174.3891 ++ i2d_TS_MSG_IMPRINT; 174.3892 ++ EVP_PKEY_print_public; 174.3893 ++ EVP_PKEY_CTX_new; 174.3894 ++ i2d_TS_TST_INFO; 174.3895 ++ EVP_PKEY_asn1_find; 174.3896 ++ DSO_METHOD_beos; 174.3897 ++ TS_CONF_load_cert; 174.3898 ++ TS_REQ_get_ext; 174.3899 ++ EVP_PKEY_sign_init; 174.3900 ++ ASN1_item_print; 174.3901 ++ TS_TST_INFO_set_nonce; 174.3902 ++ TS_RESP_dup; 174.3903 ++ ENGINE_register_pkey_meths; 174.3904 ++ EVP_PKEY_asn1_add0; 174.3905 ++ PKCS7_add0_attrib_signing_time; 174.3906 ++ i2d_TS_TST_INFO_fp; 174.3907 ++ BIO_asn1_get_prefix; 174.3908 ++ TS_TST_INFO_set_time; 174.3909 ++ EVP_PKEY_meth_set_decrypt; 174.3910 ++ EVP_PKEY_set_type_str; 174.3911 ++ EVP_PKEY_CTX_get_keygen_info; 174.3912 ++ TS_REQ_set_policy_id; 174.3913 ++ d2i_TS_RESP_fp; 174.3914 ++ ENGINE_get_pkey_asn1_meth_engine; 174.3915 ++ ENGINE_get_pkey_asn1_meth_eng; 174.3916 ++ WHIRLPOOL_Init; 174.3917 ++ TS_RESP_set_status_info; 174.3918 ++ EVP_PKEY_keygen; 174.3919 ++ EVP_DigestSignInit; 174.3920 ++ TS_ACCURACY_set_millis; 174.3921 ++ TS_REQ_dup; 174.3922 ++ GENERAL_NAME_dup; 174.3923 ++ ASN1_SEQUENCE_ANY_it; 174.3924 ++ WHIRLPOOL; 174.3925 ++ X509_STORE_get1_crls; 174.3926 ++ ENGINE_get_pkey_asn1_meth; 174.3927 ++ EVP_PKEY_asn1_new; 174.3928 ++ BIO_new_NDEF; 174.3929 ++ ENGINE_get_pkey_meth; 174.3930 ++ TS_MSG_IMPRINT_set_algo; 174.3931 ++ i2d_TS_TST_INFO_bio; 174.3932 ++ TS_TST_INFO_set_ordering; 174.3933 ++ TS_TST_INFO_get_ext_by_OBJ; 174.3934 ++ CRYPTO_THREADID_set_pointer; 174.3935 ++ TS_CONF_get_tsa_section; 174.3936 ++ SMIME_write_ASN1; 174.3937 ++ TS_RESP_CTX_set_signer_key; 174.3938 ++ EVP_PKEY_encrypt_old; 174.3939 ++ EVP_PKEY_encrypt_init; 174.3940 ++ CRYPTO_THREADID_cpy; 174.3941 ++ ASN1_PCTX_get_cert_flags; 174.3942 ++ i2d_ESS_SIGNING_CERT; 174.3943 ++ TS_CONF_load_key; 174.3944 ++ i2d_ASN1_SEQUENCE_ANY; 174.3945 ++ d2i_TS_MSG_IMPRINT_bio; 174.3946 ++ EVP_PKEY_asn1_set_public; 174.3947 ++ b2i_PublicKey_bio; 174.3948 ++ BIO_asn1_set_prefix; 174.3949 ++ EVP_PKEY_new_mac_key; 174.3950 ++ BIO_new_CMS; 174.3951 ++ CRYPTO_THREADID_cmp; 174.3952 ++ TS_REQ_ext_free; 174.3953 ++ EVP_PKEY_asn1_set_free; 174.3954 ++ EVP_PKEY_get0_asn1; 174.3955 ++ d2i_NETSCAPE_X509; 174.3956 ++ EVP_PKEY_verify_recover_init; 174.3957 ++ EVP_PKEY_CTX_set_data; 174.3958 ++ EVP_PKEY_keygen_init; 174.3959 ++ TS_RESP_CTX_set_status_info; 174.3960 ++ TS_MSG_IMPRINT_get_algo; 174.3961 ++ TS_REQ_print_bio; 174.3962 ++ EVP_PKEY_CTX_ctrl_str; 174.3963 ++ EVP_PKEY_get_default_digest_nid; 174.3964 ++ PEM_write_bio_PKCS7_stream; 174.3965 ++ TS_MSG_IMPRINT_print_bio; 174.3966 ++ BN_asc2bn; 174.3967 ++ TS_REQ_get_policy_id; 174.3968 ++ ENGINE_set_default_pkey_asn1_meths; 174.3969 ++ ENGINE_set_def_pkey_asn1_meths; 174.3970 ++ d2i_TS_ACCURACY; 174.3971 ++ DSO_global_lookup; 174.3972 ++ TS_CONF_set_tsa_name; 174.3973 ++ i2d_ASN1_SET_ANY; 174.3974 ++ ENGINE_load_gost; 174.3975 ++ WHIRLPOOL_BitUpdate; 174.3976 ++ ASN1_PCTX_get_flags; 174.3977 ++ TS_TST_INFO_get_ext_by_NID; 174.3978 ++ TS_RESP_new; 174.3979 ++ ESS_CERT_ID_dup; 174.3980 ++ TS_STATUS_INFO_dup; 174.3981 ++ TS_REQ_delete_ext; 174.3982 ++ EVP_DigestVerifyFinal; 174.3983 ++ EVP_PKEY_print_params; 174.3984 ++ i2d_CMS_bio_stream; 174.3985 ++ TS_REQ_get_msg_imprint; 174.3986 ++ OBJ_find_sigid_by_algs; 174.3987 ++ TS_TST_INFO_get_serial; 174.3988 ++ TS_REQ_get_nonce; 174.3989 ++ X509_PUBKEY_set0_param; 174.3990 ++ EVP_PKEY_CTX_set0_keygen_info; 174.3991 ++ DIST_POINT_set_dpname; 174.3992 ++ i2d_ISSUING_DIST_POINT; 174.3993 ++ ASN1_SET_ANY_it; 174.3994 ++ EVP_PKEY_CTX_get_data; 174.3995 ++ TS_STATUS_INFO_print_bio; 174.3996 ++ EVP_PKEY_derive_init; 174.3997 ++ d2i_TS_TST_INFO; 174.3998 ++ EVP_PKEY_asn1_add_alias; 174.3999 ++ d2i_TS_RESP_bio; 174.4000 ++ OTHERNAME_cmp; 174.4001 ++ GENERAL_NAME_set0_value; 174.4002 ++ PKCS7_RECIP_INFO_get0_alg; 174.4003 ++ TS_RESP_CTX_new; 174.4004 ++ TS_RESP_set_tst_info; 174.4005 ++ PKCS7_final; 174.4006 ++ EVP_PKEY_base_id; 174.4007 ++ TS_RESP_CTX_set_signer_cert; 174.4008 ++ TS_REQ_set_msg_imprint; 174.4009 ++ EVP_PKEY_CTX_ctrl; 174.4010 ++ TS_CONF_set_digests; 174.4011 ++ d2i_TS_MSG_IMPRINT; 174.4012 ++ EVP_PKEY_meth_set_ctrl; 174.4013 ++ TS_REQ_get_ext_by_NID; 174.4014 ++ PKCS5_pbe_set0_algor; 174.4015 ++ BN_BLINDING_thread_id; 174.4016 ++ TS_ACCURACY_new; 174.4017 ++ X509_CRL_METHOD_free; 174.4018 ++ ASN1_PCTX_get_nm_flags; 174.4019 ++ EVP_PKEY_meth_set_sign; 174.4020 ++ CRYPTO_THREADID_current; 174.4021 ++ EVP_PKEY_decrypt_init; 174.4022 ++ NETSCAPE_X509_free; 174.4023 ++ i2b_PVK_bio; 174.4024 ++ EVP_PKEY_print_private; 174.4025 ++ GENERAL_NAME_get0_value; 174.4026 ++ b2i_PVK_bio; 174.4027 ++ ASN1_UTCTIME_adj; 174.4028 ++ TS_TST_INFO_new; 174.4029 ++ EVP_MD_do_all_sorted; 174.4030 ++ TS_CONF_set_default_engine; 174.4031 ++ TS_ACCURACY_set_seconds; 174.4032 ++ TS_TST_INFO_get_time; 174.4033 ++ PKCS8_pkey_get0; 174.4034 ++ EVP_PKEY_asn1_get0; 174.4035 ++ OBJ_add_sigid; 174.4036 ++ PKCS7_SIGNER_INFO_sign; 174.4037 ++ EVP_PKEY_paramgen_init; 174.4038 ++ EVP_PKEY_sign; 174.4039 ++ OBJ_sigid_free; 174.4040 ++ EVP_PKEY_meth_set_init; 174.4041 ++ d2i_ESS_ISSUER_SERIAL; 174.4042 ++ ISSUING_DIST_POINT_new; 174.4043 ++ ASN1_TIME_adj; 174.4044 ++ TS_OBJ_print_bio; 174.4045 ++ EVP_PKEY_meth_set_verify_recover; 174.4046 ++ EVP_PKEY_meth_set_vrfy_recover; 174.4047 ++ TS_RESP_get_status_info; 174.4048 ++ CMS_stream; 174.4049 ++ EVP_PKEY_CTX_set_cb; 174.4050 ++ PKCS7_to_TS_TST_INFO; 174.4051 ++ ASN1_PCTX_get_oid_flags; 174.4052 ++ TS_TST_INFO_add_ext; 174.4053 ++ EVP_PKEY_meth_set_derive; 174.4054 ++ i2d_TS_RESP_fp; 174.4055 ++ i2d_TS_MSG_IMPRINT_bio; 174.4056 ++ TS_RESP_CTX_set_accuracy; 174.4057 ++ TS_REQ_set_nonce; 174.4058 ++ ESS_CERT_ID_new; 174.4059 ++ ENGINE_pkey_asn1_find_str; 174.4060 ++ TS_REQ_get_ext_count; 174.4061 ++ BUF_reverse; 174.4062 ++ TS_TST_INFO_print_bio; 174.4063 ++ d2i_ISSUING_DIST_POINT; 174.4064 ++ ENGINE_get_pkey_meths; 174.4065 ++ i2b_PrivateKey_bio; 174.4066 ++ i2d_TS_RESP; 174.4067 ++ b2i_PublicKey; 174.4068 ++ TS_VERIFY_CTX_cleanup; 174.4069 ++ TS_STATUS_INFO_free; 174.4070 ++ TS_RESP_verify_token; 174.4071 ++ OBJ_bsearch_ex_; 174.4072 ++ ASN1_bn_print; 174.4073 ++ EVP_PKEY_asn1_get_count; 174.4074 ++ ENGINE_register_pkey_asn1_meths; 174.4075 ++ ASN1_PCTX_set_nm_flags; 174.4076 ++ EVP_DigestVerifyInit; 174.4077 ++ ENGINE_set_default_pkey_meths; 174.4078 ++ TS_TST_INFO_get_policy_id; 174.4079 ++ TS_REQ_get_cert_req; 174.4080 ++ X509_CRL_set_meth_data; 174.4081 ++ PKCS8_pkey_set0; 174.4082 ++ ASN1_STRING_copy; 174.4083 ++ d2i_TS_TST_INFO_fp; 174.4084 ++ X509_CRL_match; 174.4085 ++ EVP_PKEY_asn1_set_private; 174.4086 ++ TS_TST_INFO_get_ext_d2i; 174.4087 ++ TS_RESP_CTX_add_policy; 174.4088 ++ d2i_TS_RESP; 174.4089 ++ TS_CONF_load_certs; 174.4090 ++ TS_TST_INFO_get_msg_imprint; 174.4091 ++ ERR_load_TS_strings; 174.4092 ++ TS_TST_INFO_get_version; 174.4093 ++ EVP_PKEY_CTX_dup; 174.4094 ++ EVP_PKEY_meth_set_verify; 174.4095 ++ i2b_PublicKey_bio; 174.4096 ++ TS_CONF_set_certs; 174.4097 ++ EVP_PKEY_asn1_get0_info; 174.4098 ++ TS_VERIFY_CTX_free; 174.4099 ++ TS_REQ_get_ext_by_critical; 174.4100 ++ TS_RESP_CTX_set_serial_cb; 174.4101 ++ X509_CRL_get_meth_data; 174.4102 ++ TS_RESP_CTX_set_time_cb; 174.4103 ++ TS_MSG_IMPRINT_get_msg; 174.4104 ++ TS_TST_INFO_ext_free; 174.4105 ++ TS_REQ_get_version; 174.4106 ++ TS_REQ_add_ext; 174.4107 ++ EVP_PKEY_CTX_set_app_data; 174.4108 ++ OBJ_bsearch_; 174.4109 ++ EVP_PKEY_meth_set_verifyctx; 174.4110 ++ i2d_PKCS7_bio_stream; 174.4111 ++ CRYPTO_THREADID_set_numeric; 174.4112 ++ PKCS7_sign_add_signer; 174.4113 ++ d2i_TS_TST_INFO_bio; 174.4114 ++ TS_TST_INFO_get_ordering; 174.4115 ++ TS_RESP_print_bio; 174.4116 ++ TS_TST_INFO_get_exts; 174.4117 ++ HMAC_CTX_copy; 174.4118 ++ PKCS5_pbe2_set_iv; 174.4119 ++ ENGINE_get_pkey_asn1_meths; 174.4120 ++ b2i_PrivateKey; 174.4121 ++ EVP_PKEY_CTX_get_app_data; 174.4122 ++ TS_REQ_set_cert_req; 174.4123 ++ CRYPTO_THREADID_set_callback; 174.4124 ++ TS_CONF_set_serial; 174.4125 ++ TS_TST_INFO_free; 174.4126 ++ d2i_TS_REQ_fp; 174.4127 ++ TS_RESP_verify_response; 174.4128 ++ i2d_ESS_ISSUER_SERIAL; 174.4129 ++ TS_ACCURACY_get_seconds; 174.4130 ++ EVP_CIPHER_do_all; 174.4131 ++ b2i_PrivateKey_bio; 174.4132 ++ OCSP_CERTID_dup; 174.4133 ++ X509_PUBKEY_get0_param; 174.4134 ++ TS_MSG_IMPRINT_dup; 174.4135 ++ PKCS7_print_ctx; 174.4136 ++ i2d_TS_REQ_bio; 174.4137 ++ EVP_whirlpool; 174.4138 ++ EVP_PKEY_asn1_set_param; 174.4139 ++ EVP_PKEY_meth_set_encrypt; 174.4140 ++ ASN1_PCTX_set_flags; 174.4141 ++ i2d_ESS_CERT_ID; 174.4142 ++ TS_VERIFY_CTX_new; 174.4143 ++ TS_RESP_CTX_set_extension_cb; 174.4144 ++ ENGINE_register_all_pkey_meths; 174.4145 ++ TS_RESP_CTX_set_status_info_cond; 174.4146 ++ TS_RESP_CTX_set_stat_info_cond; 174.4147 ++ EVP_PKEY_verify; 174.4148 ++ WHIRLPOOL_Final; 174.4149 ++ X509_CRL_METHOD_new; 174.4150 ++ EVP_DigestSignFinal; 174.4151 ++ TS_RESP_CTX_set_def_policy; 174.4152 ++ NETSCAPE_X509_it; 174.4153 ++ TS_RESP_create_response; 174.4154 ++ PKCS7_SIGNER_INFO_get0_algs; 174.4155 ++ TS_TST_INFO_get_nonce; 174.4156 ++ EVP_PKEY_decrypt_old; 174.4157 ++ TS_TST_INFO_set_policy_id; 174.4158 ++ TS_CONF_set_ess_cert_id_chain; 174.4159 ++ EVP_PKEY_CTX_get0_pkey; 174.4160 ++ d2i_TS_REQ; 174.4161 ++ EVP_PKEY_asn1_find_str; 174.4162 ++ BIO_f_asn1; 174.4163 ++ ESS_SIGNING_CERT_new; 174.4164 ++ EVP_PBE_find; 174.4165 ++ X509_CRL_get0_by_cert; 174.4166 ++ EVP_PKEY_derive; 174.4167 ++ i2d_TS_REQ; 174.4168 ++ TS_TST_INFO_delete_ext; 174.4169 ++ ESS_ISSUER_SERIAL_free; 174.4170 ++ ASN1_PCTX_set_str_flags; 174.4171 ++ ENGINE_get_pkey_asn1_meth_str; 174.4172 ++ TS_CONF_set_signer_key; 174.4173 ++ TS_ACCURACY_get_millis; 174.4174 ++ TS_RESP_get_token; 174.4175 ++ TS_ACCURACY_dup; 174.4176 ++ ENGINE_register_all_pkey_asn1_meths; 174.4177 ++ ENGINE_reg_all_pkey_asn1_meths; 174.4178 ++ X509_CRL_set_default_method; 174.4179 ++ CRYPTO_THREADID_hash; 174.4180 ++ CMS_ContentInfo_print_ctx; 174.4181 ++ TS_RESP_free; 174.4182 ++ ISSUING_DIST_POINT_free; 174.4183 ++ ESS_ISSUER_SERIAL_new; 174.4184 ++ CMS_add1_crl; 174.4185 ++ PKCS7_add1_attrib_digest; 174.4186 ++ TS_RESP_CTX_add_md; 174.4187 ++ TS_TST_INFO_dup; 174.4188 ++ ENGINE_set_pkey_asn1_meths; 174.4189 ++ PEM_write_bio_Parameters; 174.4190 ++ TS_TST_INFO_get_accuracy; 174.4191 ++ X509_CRL_get0_by_serial; 174.4192 ++ TS_TST_INFO_set_version; 174.4193 ++ TS_RESP_CTX_get_tst_info; 174.4194 ++ TS_RESP_verify_signature; 174.4195 ++ CRYPTO_THREADID_get_callback; 174.4196 ++ TS_TST_INFO_get_tsa; 174.4197 ++ TS_STATUS_INFO_new; 174.4198 ++ EVP_PKEY_CTX_get_cb; 174.4199 ++ TS_REQ_get_ext_d2i; 174.4200 ++ GENERAL_NAME_set0_othername; 174.4201 ++ TS_TST_INFO_get_ext_count; 174.4202 ++ TS_RESP_CTX_get_request; 174.4203 ++ i2d_NETSCAPE_X509; 174.4204 ++ ENGINE_get_pkey_meth_engine; 174.4205 ++ EVP_PKEY_meth_set_signctx; 174.4206 ++ EVP_PKEY_asn1_copy; 174.4207 ++ ASN1_TYPE_cmp; 174.4208 ++ EVP_CIPHER_do_all_sorted; 174.4209 ++ EVP_PKEY_CTX_free; 174.4210 ++ ISSUING_DIST_POINT_it; 174.4211 ++ d2i_TS_MSG_IMPRINT_fp; 174.4212 ++ X509_STORE_get1_certs; 174.4213 ++ EVP_PKEY_CTX_get_operation; 174.4214 ++ d2i_ESS_SIGNING_CERT; 174.4215 ++ TS_CONF_set_ordering; 174.4216 ++ EVP_PBE_alg_add_type; 174.4217 ++ TS_REQ_set_version; 174.4218 ++ EVP_PKEY_get0; 174.4219 ++ BIO_asn1_set_suffix; 174.4220 ++ i2d_TS_STATUS_INFO; 174.4221 ++ EVP_MD_do_all; 174.4222 ++ TS_TST_INFO_set_accuracy; 174.4223 ++ PKCS7_add_attrib_content_type; 174.4224 ++ ERR_remove_thread_state; 174.4225 ++ EVP_PKEY_meth_add0; 174.4226 ++ TS_TST_INFO_set_tsa; 174.4227 ++ EVP_PKEY_meth_new; 174.4228 ++ WHIRLPOOL_Update; 174.4229 ++ TS_CONF_set_accuracy; 174.4230 ++ ASN1_PCTX_set_oid_flags; 174.4231 ++ ESS_SIGNING_CERT_dup; 174.4232 ++ d2i_TS_REQ_bio; 174.4233 ++ X509_time_adj_ex; 174.4234 ++ TS_RESP_CTX_add_flags; 174.4235 ++ d2i_TS_STATUS_INFO; 174.4236 ++ TS_MSG_IMPRINT_set_msg; 174.4237 ++ BIO_asn1_get_suffix; 174.4238 ++ TS_REQ_free; 174.4239 ++ EVP_PKEY_meth_free; 174.4240 ++ TS_REQ_get_exts; 174.4241 ++ TS_RESP_CTX_set_clock_precision_digits; 174.4242 ++ TS_RESP_CTX_set_clk_prec_digits; 174.4243 ++ TS_RESP_CTX_add_failure_info; 174.4244 ++ i2d_TS_RESP_bio; 174.4245 ++ EVP_PKEY_CTX_get0_peerkey; 174.4246 ++ PEM_write_bio_CMS_stream; 174.4247 ++ TS_REQ_new; 174.4248 ++ TS_MSG_IMPRINT_new; 174.4249 ++ EVP_PKEY_meth_find; 174.4250 ++ EVP_PKEY_id; 174.4251 ++ TS_TST_INFO_set_serial; 174.4252 ++ a2i_GENERAL_NAME; 174.4253 ++ TS_CONF_set_crypto_device; 174.4254 ++ EVP_PKEY_verify_init; 174.4255 ++ TS_CONF_set_policies; 174.4256 ++ ASN1_PCTX_new; 174.4257 ++ ESS_CERT_ID_free; 174.4258 ++ ENGINE_unregister_pkey_meths; 174.4259 ++ TS_MSG_IMPRINT_free; 174.4260 ++ TS_VERIFY_CTX_init; 174.4261 ++ PKCS7_stream; 174.4262 ++ TS_RESP_CTX_set_certs; 174.4263 ++ TS_CONF_set_def_policy; 174.4264 ++ ASN1_GENERALIZEDTIME_adj; 174.4265 ++ NETSCAPE_X509_new; 174.4266 ++ TS_ACCURACY_free; 174.4267 ++ TS_RESP_get_tst_info; 174.4268 ++ EVP_PKEY_derive_set_peer; 174.4269 ++ PEM_read_bio_Parameters; 174.4270 ++ TS_CONF_set_clock_precision_digits; 174.4271 ++ TS_CONF_set_clk_prec_digits; 174.4272 ++ ESS_ISSUER_SERIAL_dup; 174.4273 ++ TS_ACCURACY_get_micros; 174.4274 ++ ASN1_PCTX_get_str_flags; 174.4275 ++ NAME_CONSTRAINTS_check; 174.4276 ++ ASN1_BIT_STRING_check; 174.4277 ++ X509_check_akid; 174.4278 ++ ENGINE_unregister_pkey_asn1_meths; 174.4279 ++ ENGINE_unreg_pkey_asn1_meths; 174.4280 ++ ASN1_PCTX_free; 174.4281 ++ PEM_write_bio_ASN1_stream; 174.4282 ++ i2d_ASN1_bio_stream; 174.4283 ++ TS_X509_ALGOR_print_bio; 174.4284 ++ EVP_PKEY_meth_set_cleanup; 174.4285 ++ EVP_PKEY_asn1_free; 174.4286 ++ ESS_SIGNING_CERT_free; 174.4287 ++ TS_TST_INFO_set_msg_imprint; 174.4288 ++ GENERAL_NAME_cmp; 174.4289 ++ d2i_ASN1_SET_ANY; 174.4290 ++ ENGINE_set_pkey_meths; 174.4291 ++ i2d_TS_REQ_fp; 174.4292 ++ d2i_ASN1_SEQUENCE_ANY; 174.4293 ++ GENERAL_NAME_get0_otherName; 174.4294 ++ d2i_ESS_CERT_ID; 174.4295 ++ OBJ_find_sigid_algs; 174.4296 ++ EVP_PKEY_meth_set_keygen; 174.4297 ++ PKCS5_PBKDF2_HMAC; 174.4298 ++ EVP_PKEY_paramgen; 174.4299 ++ EVP_PKEY_meth_set_paramgen; 174.4300 ++ BIO_new_PKCS7; 174.4301 ++ EVP_PKEY_verify_recover; 174.4302 ++ TS_ext_print_bio; 174.4303 ++ TS_ASN1_INTEGER_print_bio; 174.4304 ++ check_defer; 174.4305 ++ DSO_pathbyaddr; 174.4306 ++ EVP_PKEY_set_type; 174.4307 ++ TS_ACCURACY_set_micros; 174.4308 ++ TS_REQ_to_TS_VERIFY_CTX; 174.4309 ++ EVP_PKEY_meth_set_copy; 174.4310 ++ ASN1_PCTX_set_cert_flags; 174.4311 ++ TS_TST_INFO_get_ext; 174.4312 ++ EVP_PKEY_asn1_set_ctrl; 174.4313 ++ TS_TST_INFO_get_ext_by_critical; 174.4314 ++ EVP_PKEY_CTX_new_id; 174.4315 ++ TS_REQ_get_ext_by_OBJ; 174.4316 ++ TS_CONF_set_signer_cert; 174.4317 ++ X509_NAME_hash_old; 174.4318 ++ ASN1_TIME_set_string; 174.4319 ++ EVP_MD_flags; 174.4320 ++ TS_RESP_CTX_free; 174.4321 ++ DSAparams_dup; 174.4322 ++ DHparams_dup; 174.4323 ++ OCSP_REQ_CTX_add1_header; 174.4324 ++ OCSP_REQ_CTX_set1_req; 174.4325 ++ X509_STORE_set_verify_cb; 174.4326 ++ X509_STORE_CTX_get0_current_crl; 174.4327 ++ X509_STORE_CTX_get0_parent_ctx; 174.4328 ++ X509_STORE_CTX_get0_current_issuer; 174.4329 ++ X509_STORE_CTX_get0_cur_issuer; 174.4330 ++ X509_issuer_name_hash_old; 174.4331 ++ X509_subject_name_hash_old; 174.4332 ++ EVP_CIPHER_CTX_copy; 174.4333 ++ UI_method_get_prompt_constructor; 174.4334 ++ UI_method_get_prompt_constructr; 174.4335 ++ UI_method_set_prompt_constructor; 174.4336 ++ UI_method_set_prompt_constructr; 174.4337 ++ EVP_read_pw_string_min; 174.4338 ++ CRYPTO_cts128_encrypt; 174.4339 ++ CRYPTO_cts128_decrypt_block; 174.4340 ++ CRYPTO_cfb128_1_encrypt; 174.4341 ++ CRYPTO_cbc128_encrypt; 174.4342 ++ CRYPTO_ctr128_encrypt; 174.4343 ++ CRYPTO_ofb128_encrypt; 174.4344 ++ CRYPTO_cts128_decrypt; 174.4345 ++ CRYPTO_cts128_encrypt_block; 174.4346 ++ CRYPTO_cbc128_decrypt; 174.4347 ++ CRYPTO_cfb128_encrypt; 174.4348 ++ CRYPTO_cfb128_8_encrypt; 174.4349 ++ 174.4350 ++ local: 174.4351 ++ *; 174.4352 ++}; 174.4353 ++ 174.4354 ++ 174.4355 ++OPENSSL_1.0.1 { 174.4356 ++ global: 174.4357 ++ SSL_renegotiate_abbreviated; 174.4358 ++ TLSv1_1_method; 174.4359 ++ TLSv1_1_client_method; 174.4360 ++ TLSv1_1_server_method; 174.4361 ++ SSL_CTX_set_srp_client_pwd_callback; 174.4362 ++ SSL_CTX_set_srp_client_pwd_cb; 174.4363 ++ SSL_get_srp_g; 174.4364 ++ SSL_CTX_set_srp_username_callback; 174.4365 ++ SSL_CTX_set_srp_un_cb; 174.4366 ++ SSL_get_srp_userinfo; 174.4367 ++ SSL_set_srp_server_param; 174.4368 ++ SSL_set_srp_server_param_pw; 174.4369 ++ SSL_get_srp_N; 174.4370 ++ SSL_get_srp_username; 174.4371 ++ SSL_CTX_set_srp_password; 174.4372 ++ SSL_CTX_set_srp_strength; 174.4373 ++ SSL_CTX_set_srp_verify_param_callback; 174.4374 ++ SSL_CTX_set_srp_vfy_param_cb; 174.4375 ++ SSL_CTX_set_srp_cb_arg; 174.4376 ++ SSL_CTX_set_srp_username; 174.4377 ++ SSL_CTX_SRP_CTX_init; 174.4378 ++ SSL_SRP_CTX_init; 174.4379 ++ SRP_Calc_A_param; 174.4380 ++ SRP_generate_server_master_secret; 174.4381 ++ SRP_gen_server_master_secret; 174.4382 ++ SSL_CTX_SRP_CTX_free; 174.4383 ++ SRP_generate_client_master_secret; 174.4384 ++ SRP_gen_client_master_secret; 174.4385 ++ SSL_srp_server_param_with_username; 174.4386 ++ SSL_srp_server_param_with_un; 174.4387 ++ SSL_SRP_CTX_free; 174.4388 ++ SSL_set_debug; 174.4389 ++ SSL_SESSION_get0_peer; 174.4390 ++ TLSv1_2_client_method; 174.4391 ++ SSL_SESSION_set1_id_context; 174.4392 ++ TLSv1_2_server_method; 174.4393 ++ SSL_cache_hit; 174.4394 ++ SSL_get0_kssl_ctx; 174.4395 ++ SSL_set0_kssl_ctx; 174.4396 ++ SSL_set_state; 174.4397 ++ SSL_CIPHER_get_id; 174.4398 ++ TLSv1_2_method; 174.4399 ++ kssl_ctx_get0_client_princ; 174.4400 ++ SSL_export_keying_material; 174.4401 ++ SSL_set_tlsext_use_srtp; 174.4402 ++ SSL_CTX_set_next_protos_advertised_cb; 174.4403 ++ SSL_CTX_set_next_protos_adv_cb; 174.4404 ++ SSL_get0_next_proto_negotiated; 174.4405 ++ SSL_get_selected_srtp_profile; 174.4406 ++ SSL_CTX_set_tlsext_use_srtp; 174.4407 ++ SSL_select_next_proto; 174.4408 ++ SSL_get_srtp_profiles; 174.4409 ++ SSL_CTX_set_next_proto_select_cb; 174.4410 ++ SSL_CTX_set_next_proto_sel_cb; 174.4411 ++ SSL_SESSION_get_compress_id; 174.4412 ++ 174.4413 ++ SRP_VBASE_get_by_user; 174.4414 ++ SRP_Calc_server_key; 174.4415 ++ SRP_create_verifier; 174.4416 ++ SRP_create_verifier_BN; 174.4417 ++ SRP_Calc_u; 174.4418 ++ SRP_VBASE_free; 174.4419 ++ SRP_Calc_client_key; 174.4420 ++ SRP_get_default_gN; 174.4421 ++ SRP_Calc_x; 174.4422 ++ SRP_Calc_B; 174.4423 ++ SRP_VBASE_new; 174.4424 ++ SRP_check_known_gN_param; 174.4425 ++ SRP_Calc_A; 174.4426 ++ SRP_Verify_A_mod_N; 174.4427 ++ SRP_VBASE_init; 174.4428 ++ SRP_Verify_B_mod_N; 174.4429 ++ EC_KEY_set_public_key_affine_coordinates; 174.4430 ++ EC_KEY_set_pub_key_aff_coords; 174.4431 ++ EVP_aes_192_ctr; 174.4432 ++ EVP_PKEY_meth_get0_info; 174.4433 ++ EVP_PKEY_meth_copy; 174.4434 ++ ERR_add_error_vdata; 174.4435 ++ EVP_aes_128_ctr; 174.4436 ++ EVP_aes_256_ctr; 174.4437 ++ EC_GFp_nistp224_method; 174.4438 ++ EC_KEY_get_flags; 174.4439 ++ RSA_padding_add_PKCS1_PSS_mgf1; 174.4440 ++ EVP_aes_128_xts; 174.4441 ++ EVP_aes_256_xts; 174.4442 ++ EVP_aes_128_gcm; 174.4443 ++ EC_KEY_clear_flags; 174.4444 ++ EC_KEY_set_flags; 174.4445 ++ EVP_aes_256_ccm; 174.4446 ++ RSA_verify_PKCS1_PSS_mgf1; 174.4447 ++ EVP_aes_128_ccm; 174.4448 ++ EVP_aes_192_gcm; 174.4449 ++ X509_ALGOR_set_md; 174.4450 ++ RAND_init_fips; 174.4451 ++ EVP_aes_256_gcm; 174.4452 ++ EVP_aes_192_ccm; 174.4453 ++ CMAC_CTX_copy; 174.4454 ++ CMAC_CTX_free; 174.4455 ++ CMAC_CTX_get0_cipher_ctx; 174.4456 ++ CMAC_CTX_cleanup; 174.4457 ++ CMAC_Init; 174.4458 ++ CMAC_Update; 174.4459 ++ CMAC_resume; 174.4460 ++ CMAC_CTX_new; 174.4461 ++ CMAC_Final; 174.4462 ++ CRYPTO_ctr128_encrypt_ctr32; 174.4463 ++ CRYPTO_gcm128_release; 174.4464 ++ CRYPTO_ccm128_decrypt_ccm64; 174.4465 ++ CRYPTO_ccm128_encrypt; 174.4466 ++ CRYPTO_gcm128_encrypt; 174.4467 ++ CRYPTO_xts128_encrypt; 174.4468 ++ EVP_rc4_hmac_md5; 174.4469 ++ CRYPTO_nistcts128_decrypt_block; 174.4470 ++ CRYPTO_gcm128_setiv; 174.4471 ++ CRYPTO_nistcts128_encrypt; 174.4472 ++ EVP_aes_128_cbc_hmac_sha1; 174.4473 ++ CRYPTO_gcm128_tag; 174.4474 ++ CRYPTO_ccm128_encrypt_ccm64; 174.4475 ++ ENGINE_load_rdrand; 174.4476 ++ CRYPTO_ccm128_setiv; 174.4477 ++ CRYPTO_nistcts128_encrypt_block; 174.4478 ++ CRYPTO_gcm128_aad; 174.4479 ++ CRYPTO_ccm128_init; 174.4480 ++ CRYPTO_nistcts128_decrypt; 174.4481 ++ CRYPTO_gcm128_new; 174.4482 ++ CRYPTO_ccm128_tag; 174.4483 ++ CRYPTO_ccm128_decrypt; 174.4484 ++ CRYPTO_ccm128_aad; 174.4485 ++ CRYPTO_gcm128_init; 174.4486 ++ CRYPTO_gcm128_decrypt; 174.4487 ++ ENGINE_load_rsax; 174.4488 ++ CRYPTO_gcm128_decrypt_ctr32; 174.4489 ++ CRYPTO_gcm128_encrypt_ctr32; 174.4490 ++ CRYPTO_gcm128_finish; 174.4491 ++ EVP_aes_256_cbc_hmac_sha1; 174.4492 ++ PKCS5_pbkdf2_set; 174.4493 ++ CMS_add0_recipient_password; 174.4494 ++ CMS_decrypt_set1_password; 174.4495 ++ CMS_RecipientInfo_set0_password; 174.4496 ++ RAND_set_fips_drbg_type; 174.4497 ++ X509_REQ_sign_ctx; 174.4498 ++ RSA_PSS_PARAMS_new; 174.4499 ++ X509_CRL_sign_ctx; 174.4500 ++ X509_signature_dump; 174.4501 ++ d2i_RSA_PSS_PARAMS; 174.4502 ++ RSA_PSS_PARAMS_it; 174.4503 ++ RSA_PSS_PARAMS_free; 174.4504 ++ X509_sign_ctx; 174.4505 ++ i2d_RSA_PSS_PARAMS; 174.4506 ++ ASN1_item_sign_ctx; 174.4507 ++ EC_GFp_nistp521_method; 174.4508 ++ EC_GFp_nistp256_method; 174.4509 ++ OPENSSL_stderr; 174.4510 ++ OPENSSL_cpuid_setup; 174.4511 ++ OPENSSL_showfatal; 174.4512 ++ BIO_new_dgram_sctp; 174.4513 ++ BIO_dgram_sctp_msg_waiting; 174.4514 ++ BIO_dgram_sctp_wait_for_dry; 174.4515 ++ BIO_s_datagram_sctp; 174.4516 ++ BIO_dgram_is_sctp; 174.4517 ++ BIO_dgram_sctp_notification_cb; 174.4518 ++} OPENSSL_1.0.0; 174.4519 ++ 174.4520 ++OPENSSL_1.0.1d { 174.4521 ++ global: 174.4522 ++ CRYPTO_memcmp; 174.4523 ++} OPENSSL_1.0.1; 174.4524 ++ 174.4525 ++OPENSSL_1.0.1s { 174.4526 ++ global: 174.4527 ++ SRP_VBASE_get1_by_user; 174.4528 ++ SRP_user_pwd_free; 174.4529 ++} OPENSSL_1.0.1d; 174.4530 ++ 174.4531 ++OPENSSL_1.0.2 { 174.4532 ++ global: 174.4533 ++ SSL_CTX_set_alpn_protos; 174.4534 ++ SSL_set_alpn_protos; 174.4535 ++ SSL_CTX_set_alpn_select_cb; 174.4536 ++ SSL_get0_alpn_selected; 174.4537 ++ SSL_CTX_set_custom_cli_ext; 174.4538 ++ SSL_CTX_set_custom_srv_ext; 174.4539 ++ SSL_CTX_set_srv_supp_data; 174.4540 ++ SSL_CTX_set_cli_supp_data; 174.4541 ++ SSL_set_cert_cb; 174.4542 ++ SSL_CTX_use_serverinfo; 174.4543 ++ SSL_CTX_use_serverinfo_file; 174.4544 ++ SSL_CTX_set_cert_cb; 174.4545 ++ SSL_CTX_get0_param; 174.4546 ++ SSL_get0_param; 174.4547 ++ SSL_certs_clear; 174.4548 ++ DTLSv1_2_method; 174.4549 ++ DTLSv1_2_server_method; 174.4550 ++ DTLSv1_2_client_method; 174.4551 ++ DTLS_method; 174.4552 ++ DTLS_server_method; 174.4553 ++ DTLS_client_method; 174.4554 ++ SSL_CTX_get_ssl_method; 174.4555 ++ SSL_CTX_get0_certificate; 174.4556 ++ SSL_CTX_get0_privatekey; 174.4557 ++ SSL_COMP_set0_compression_methods; 174.4558 ++ SSL_COMP_free_compression_methods; 174.4559 ++ SSL_CIPHER_find; 174.4560 ++ SSL_is_server; 174.4561 ++ SSL_CONF_CTX_new; 174.4562 ++ SSL_CONF_CTX_finish; 174.4563 ++ SSL_CONF_CTX_free; 174.4564 ++ SSL_CONF_CTX_set_flags; 174.4565 ++ SSL_CONF_CTX_clear_flags; 174.4566 ++ SSL_CONF_CTX_set1_prefix; 174.4567 ++ SSL_CONF_CTX_set_ssl; 174.4568 ++ SSL_CONF_CTX_set_ssl_ctx; 174.4569 ++ SSL_CONF_cmd; 174.4570 ++ SSL_CONF_cmd_argv; 174.4571 ++ SSL_CONF_cmd_value_type; 174.4572 ++ SSL_trace; 174.4573 ++ SSL_CIPHER_standard_name; 174.4574 ++ SSL_get_tlsa_record_byname; 174.4575 ++ ASN1_TIME_diff; 174.4576 ++ BIO_hex_string; 174.4577 ++ CMS_RecipientInfo_get0_pkey_ctx; 174.4578 ++ CMS_RecipientInfo_encrypt; 174.4579 ++ CMS_SignerInfo_get0_pkey_ctx; 174.4580 ++ CMS_SignerInfo_get0_md_ctx; 174.4581 ++ CMS_SignerInfo_get0_signature; 174.4582 ++ CMS_RecipientInfo_kari_get0_alg; 174.4583 ++ CMS_RecipientInfo_kari_get0_reks; 174.4584 ++ CMS_RecipientInfo_kari_get0_orig_id; 174.4585 ++ CMS_RecipientInfo_kari_orig_id_cmp; 174.4586 ++ CMS_RecipientEncryptedKey_get0_id; 174.4587 ++ CMS_RecipientEncryptedKey_cert_cmp; 174.4588 ++ CMS_RecipientInfo_kari_set0_pkey; 174.4589 ++ CMS_RecipientInfo_kari_get0_ctx; 174.4590 ++ CMS_RecipientInfo_kari_decrypt; 174.4591 ++ CMS_SharedInfo_encode; 174.4592 ++ DH_compute_key_padded; 174.4593 ++ d2i_DHxparams; 174.4594 ++ i2d_DHxparams; 174.4595 ++ DH_get_1024_160; 174.4596 ++ DH_get_2048_224; 174.4597 ++ DH_get_2048_256; 174.4598 ++ DH_KDF_X9_42; 174.4599 ++ ECDH_KDF_X9_62; 174.4600 ++ ECDSA_METHOD_new; 174.4601 ++ ECDSA_METHOD_free; 174.4602 ++ ECDSA_METHOD_set_app_data; 174.4603 ++ ECDSA_METHOD_get_app_data; 174.4604 ++ ECDSA_METHOD_set_sign; 174.4605 ++ ECDSA_METHOD_set_sign_setup; 174.4606 ++ ECDSA_METHOD_set_verify; 174.4607 ++ ECDSA_METHOD_set_flags; 174.4608 ++ ECDSA_METHOD_set_name; 174.4609 ++ EVP_des_ede3_wrap; 174.4610 ++ EVP_aes_128_wrap; 174.4611 ++ EVP_aes_192_wrap; 174.4612 ++ EVP_aes_256_wrap; 174.4613 ++ EVP_aes_128_cbc_hmac_sha256; 174.4614 ++ EVP_aes_256_cbc_hmac_sha256; 174.4615 ++ CRYPTO_128_wrap; 174.4616 ++ CRYPTO_128_unwrap; 174.4617 ++ OCSP_REQ_CTX_nbio; 174.4618 ++ OCSP_REQ_CTX_new; 174.4619 ++ OCSP_set_max_response_length; 174.4620 ++ OCSP_REQ_CTX_i2d; 174.4621 ++ OCSP_REQ_CTX_nbio_d2i; 174.4622 ++ OCSP_REQ_CTX_get0_mem_bio; 174.4623 ++ OCSP_REQ_CTX_http; 174.4624 ++ RSA_padding_add_PKCS1_OAEP_mgf1; 174.4625 ++ RSA_padding_check_PKCS1_OAEP_mgf1; 174.4626 ++ RSA_OAEP_PARAMS_free; 174.4627 ++ RSA_OAEP_PARAMS_it; 174.4628 ++ RSA_OAEP_PARAMS_new; 174.4629 ++ SSL_get_sigalgs; 174.4630 ++ SSL_get_shared_sigalgs; 174.4631 ++ SSL_check_chain; 174.4632 ++ X509_chain_up_ref; 174.4633 ++ X509_http_nbio; 174.4634 ++ X509_CRL_http_nbio; 174.4635 ++ X509_REVOKED_dup; 174.4636 ++ i2d_re_X509_tbs; 174.4637 ++ X509_get0_signature; 174.4638 ++ X509_get_signature_nid; 174.4639 ++ X509_CRL_diff; 174.4640 ++ X509_chain_check_suiteb; 174.4641 ++ X509_CRL_check_suiteb; 174.4642 ++ X509_check_host; 174.4643 ++ X509_check_email; 174.4644 ++ X509_check_ip; 174.4645 ++ X509_check_ip_asc; 174.4646 ++ X509_STORE_set_lookup_crls_cb; 174.4647 ++ X509_STORE_CTX_get0_store; 174.4648 ++ X509_VERIFY_PARAM_set1_host; 174.4649 ++ X509_VERIFY_PARAM_add1_host; 174.4650 ++ X509_VERIFY_PARAM_set_hostflags; 174.4651 ++ X509_VERIFY_PARAM_get0_peername; 174.4652 ++ X509_VERIFY_PARAM_set1_email; 174.4653 ++ X509_VERIFY_PARAM_set1_ip; 174.4654 ++ X509_VERIFY_PARAM_set1_ip_asc; 174.4655 ++ X509_VERIFY_PARAM_get0_name; 174.4656 ++ X509_VERIFY_PARAM_get_count; 174.4657 ++ X509_VERIFY_PARAM_get0; 174.4658 ++ X509V3_EXT_free; 174.4659 ++ EC_GROUP_get_mont_data; 174.4660 ++ EC_curve_nid2nist; 174.4661 ++ EC_curve_nist2nid; 174.4662 ++ PEM_write_bio_DHxparams; 174.4663 ++ PEM_write_DHxparams; 174.4664 ++ SSL_CTX_add_client_custom_ext; 174.4665 ++ SSL_CTX_add_server_custom_ext; 174.4666 ++ SSL_extension_supported; 174.4667 ++ BUF_strnlen; 174.4668 ++ sk_deep_copy; 174.4669 ++ SSL_test_functions; 174.4670 ++} OPENSSL_1.0.1d;
175.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 175.2 +++ b/openssl10/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 175.3 @@ -0,0 +1,10 @@ 175.4 +# https://www.archlinux.org/packages/core/x86_64/openssl-1.0/ 175.5 + 175.6 +# remove rpath: http://bugs.archlinux.org/task/14367 175.7 +-p0|no-rpath.patch 175.8 + 175.9 +# disable a test that fails when ssl3 is disabled 175.10 +-p1|ssl3-test-failure.patch 175.11 + 175.12 +# add symbol versioning to prevent conflicts with openssl 1.1 symbols (Debian) 175.13 +-p1|openssl-1.0-versioned-symbols.patch
176.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 176.2 +++ b/openssl10/stuff/patches/ssl3-test-failure.patch Sat Feb 24 16:17:33 2018 +0200 176.3 @@ -0,0 +1,26 @@ 176.4 +From: Kurt Roeckx <kurt@roeckx.be> 176.5 +Date: Sun, 6 Sep 2015 16:04:11 +0200 176.6 +Subject: Disable SSLv3 test in test suite 176.7 + 176.8 +When testing SSLv3 the test program returns 0 for skip. The test for weak DH 176.9 +expects a failure, but gets success. 176.10 + 176.11 +It should probably be changed to return something other than 0 for a skipped 176.12 +test. 176.13 +--- 176.14 + test/testssl | 2 +- 176.15 + 1 file changed, 1 insertion(+), 1 deletion(-) 176.16 + 176.17 +diff --git a/test/testssl b/test/testssl 176.18 +index 747e4ba..1e4370b 100644 176.19 +--- a/test/testssl 176.20 ++++ b/test/testssl 176.21 +@@ -160,7 +160,7 @@ test_cipher() { 176.22 + } 176.23 + 176.24 + echo "Testing ciphersuites" 176.25 +-for protocol in TLSv1.2 SSLv3; do 176.26 ++for protocol in TLSv1.2; do 176.27 + echo "Testing ciphersuites for $protocol" 176.28 + for cipher in `../util/shlib_wrap.sh ../apps/openssl ciphers "RSA+$protocol" | tr ':' ' '`; do 176.29 + test_cipher $cipher $protocol
177.1 --- a/openssl11/receipt Sat Feb 24 10:43:01 2018 +0200 177.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 177.3 @@ -1,56 +0,0 @@ 177.4 -# SliTaz package receipt v2. 177.5 - 177.6 -PACKAGE="openssl11" 177.7 -VERSION="1.1.0f" # current stable 177.8 -CATEGORY="security" 177.9 -SHORT_DESC="Open source Secure Sockets Layer" 177.10 -MAINTAINER="al.bobylev@gmail.com" 177.11 -LICENSE="BSD" 177.12 -WEB_SITE="https://www.openssl.org/" 177.13 - 177.14 -TARBALL="openssl-$VERSION.tar.gz" 177.15 -WGET_URL="https://www.openssl.org/source/$TARBALL" 177.16 -# Integrity check: https://www.openssl.org/source/ 177.17 -TARBALL_SHA256="12f746f3f2493b2f39da7ecf63d7ee19c6ac9ec6a4fcd8c229da8a522cb12765" 177.18 -TARBALL_SHA1="9e3e02bc8b4965477a7a1d33be1249299a9deb15" 177.19 - 177.20 -BUILD_DEPENDS="perl zlib-dev" 177.21 -SPLIT="libssl11 openssl11 openssl11-dev" 177.22 - 177.23 -compile_rules() { 177.24 - ./config \ 177.25 - --prefix=/usr \ 177.26 - --libdir=lib \ 177.27 - --openssldir=/etc/ssl \ 177.28 - -Wa,--noexecstack \ 177.29 - shared zlib-dynamic && 177.30 - make && 177.31 - make \ 177.32 - DESTDIR=$install \ 177.33 - MANDIR=/usr/share/man \ 177.34 - MANSUFFIX=ssl \ 177.35 - install_sw install_ssldirs install_man_docs 177.36 -} 177.37 - 177.38 -testsuite() { 177.39 - readelf -h $install/usr/bin/openssl 177.40 -} 177.41 - 177.42 -genpkg_rules() { 177.43 - case $PACKAGE in 177.44 - libssl11) 177.45 - copy libssl.so* libcrypto*.so* 177.46 - CAT="security|OpenSSL libraries" 177.47 - PROVIDE="libcrypto11" 177.48 - ;; 177.49 - openssl11) 177.50 - copy @std @rm 177.51 - DEPENDS="libcrypto11 libssl11" 177.52 - ;; 177.53 - openssl11-dev) 177.54 - copy @dev 177.55 - PROVIDE="libcrypto11-dev" 177.56 - ;; 177.57 - esac 177.58 - TAGS="ssl security" 177.59 -}
178.1 --- a/optipng/receipt Sat Feb 24 10:43:01 2018 +0200 178.2 +++ b/optipng/receipt Sat Feb 24 16:17:33 2018 +0200 178.3 @@ -13,39 +13,36 @@ 178.4 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 178.5 178.6 BUILD_DEPENDS="libpng16-dev zlib-dev" 178.7 -SPLIT="optipng-static" 178.8 +SPLIT="optipng optipng-static:static" 178.9 178.10 -# Rules to configure and make the package. 178.11 -compile_rules() 178.12 -{ 178.13 +compile_rules() { 178.14 sed -i 's|prefix)/man|prefix)/share/man|' configure 178.15 178.16 - # make statically linked binary 178.17 - LDFLAGS='-static' \ 178.18 - ./configure \ 178.19 - -prefix=/usr \ 178.20 - -bindir=/usr/sbin \ 178.21 - -with-system-libpng && 178.22 - make && make install && 178.23 + case "$SET" in 178.24 + static) 178.25 + LDFLAGS='-static' \ 178.26 + ./configure \ 178.27 + -prefix=/usr \ 178.28 + -with-system-libpng 178.29 + ;; 178.30 + *) 178.31 + ./configure \ 178.32 + -prefix=/usr \ 178.33 + -with-system-libpng 178.34 + ;; 178.35 + esac && 178.36 178.37 - # make dynamically linked binary 178.38 - make clean && 178.39 - ./configure \ 178.40 - -prefix=/usr \ 178.41 - -with-system-libpng && 178.42 make && make install 178.43 } 178.44 178.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 178.46 -genpkg_rules() 178.47 -{ 178.48 +genpkg_rules() { 178.49 case $PACKAGE in 178.50 optipng) 178.51 - copy bin/optipng 178.52 + copy @std 178.53 DEPENDS="libpng16 zlib" 178.54 ;; 178.55 optipng-static) 178.56 - copy sbin/optipng 178.57 + copy @std 178.58 CAT="graphics|static binary" 178.59 PROVIDE="optipng" 178.60 DEPENDS=" "
179.1 --- a/p11-kit/receipt Sat Feb 24 10:43:01 2018 +0200 179.2 +++ b/p11-kit/receipt Sat Feb 24 16:17:33 2018 +0200 179.3 @@ -41,3 +41,4 @@ 179.4 ;; 179.5 esac 179.6 } 179.7 +
180.1 --- a/p7zip-full/receipt Sat Feb 24 10:43:01 2018 +0200 180.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 180.3 @@ -1,32 +0,0 @@ 180.4 -# SliTaz package receipt. 180.5 - 180.6 -PACKAGE="p7zip-full" 180.7 -SOURCE="p7zip" 180.8 -VERSION="16.02" 180.9 -CATEGORY="utilities" 180.10 -SHORT_DESC="A file archiver with a high compression ratio (full version with restricted codecs)" 180.11 -MAINTAINER="milka@konstelacioj.info" 180.12 -LICENSE="LGPL2.1" 180.13 -TARBALL="${SOURCE}_${VERSION}_src_all.tar.bz2" 180.14 -WEB_SITE="http://p7zip.sourceforge.net/" 180.15 -WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" 180.16 - 180.17 -# Rules to configure and make the package. 180.18 -compile_rules() 180.19 -{ 180.20 - sed -i 's|HOME)/man|HOME)/share/man|' makefile 180.21 - make all3 180.22 - make DEST_HOME=$DESTDIR/usr install 180.23 -} 180.24 - 180.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 180.26 -genpkg_rules() 180.27 -{ 180.28 - mkdir -p $fs/usr 180.29 - cp -a $install/usr/bin $fs/usr 180.30 - cp -a $install/usr/lib $fs/usr 180.31 - 180.32 - # Fix pathname in 7z scripts 180.33 - sed -i -e "s#.*$install#\"#" $fs/usr/bin/7z \ 180.34 - $fs/usr/bin/7za $fs/usr/bin/7zr 180.35 -}
181.1 --- a/p7zip/receipt Sat Feb 24 10:43:01 2018 +0200 181.2 +++ b/p7zip/receipt Sat Feb 24 16:17:33 2018 +0200 181.3 @@ -1,24 +1,56 @@ 181.4 -# SliTaz package receipt. 181.5 +# SliTaz package receipt v2. 181.6 181.7 PACKAGE="p7zip" 181.8 VERSION="16.02" 181.9 CATEGORY="utilities" 181.10 -SHORT_DESC="A file archiver with a high compression ratio (supports only 7z archives)" 181.11 +SHORT_DESC="File archiver with high compression ratio" 181.12 MAINTAINER="milka@konstelacioj.info" 181.13 LICENSE="LGPL2.1" 181.14 +#WEB_SITE="http://p7zip.sourceforge.net/" 181.15 +WEB_SITE="https://sourceforge.net/projects/sevenzip/" 181.16 + 181.17 TARBALL="${PACKAGE}_${VERSION}_src_all.tar.bz2" 181.18 -WEB_SITE="http://p7zip.sourceforge.net/" 181.19 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 181.20 181.21 -# Rules to configure and make the package. 181.22 -compile_rules() 181.23 -{ 181.24 - make 7zr 181.25 +BUILD_DEPENDS="yasm" 181.26 +SPLIT="p7zip p7zip-full" 181.27 + 181.28 +compile_rules() { 181.29 + case $ARCH in 181.30 + arm) cp makefile.linux_cross_arm makefile.machine;; 181.31 + i?86) cp makefile.linux_x86_asm_gcc_4.X makefile.machine;; 181.32 + x86_64) cp makefile.linux_amd64_asm makefile.machine;; 181.33 + esac 181.34 + sed -i 's|HOME)/man|HOME)/share/man|' makefile.common 181.35 + 181.36 + make all3 OPTFLAGS="$CFLAGS" && 181.37 + make install \ 181.38 + DEST_DIR="$install" \ 181.39 + DEST_HOME=/usr \ 181.40 + DEST_SHARE_DOC=/usr/share/doc/p7zip-$VERSION \ 181.41 + DEST_MAN=/usr/share/man || return 1 181.42 + 181.43 +# # Remove documentation for the GUI file manager 181.44 +# rm -r "$install/usr/share/doc/p7zip/DOC/MANUAL/fm" 181.45 + 181.46 +# install -d $install/usr/share/licenses/p7zip 181.47 +# ln -s -t $install/usr/share/licenses/p7zip/ \ 181.48 +# /usr/share/doc/p7zip/DOC/License.txt \ 181.49 +# /usr/share/doc/p7zip/DOC/unRarLicense.txt 181.50 + 181.51 } 181.52 181.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 181.54 -genpkg_rules() 181.55 -{ 181.56 - mkdir -p $fs/usr 181.57 - cp -a $src/bin $fs/usr 181.58 +genpkg_rules() { 181.59 + case $PACKAGE in 181.60 + p7zip) 181.61 + copy 7zr 181.62 + CAT="utilities|supports only 7z archives" 181.63 + DEPENDS="gcc-lib-base glibc-base" 181.64 + ;; 181.65 + p7zip-full) 181.66 + copy @std @rm 181.67 + CAT="utilities|full version with restricted codecs" 181.68 + DEPENDS="p7zip" 181.69 + ;; 181.70 + esac 181.71 }
182.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 182.2 +++ b/p7zip/stuff/patches/CVE-2016-9296.patch Sat Feb 24 16:17:33 2018 +0200 182.3 @@ -0,0 +1,12 @@ 182.4 +--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig 2016-11-21 01:42:29.460901230 +0000 182.5 ++++ ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +0000 182.6 +@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS 182.7 + if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) 182.8 + ThrowIncorrect(); 182.9 + } 182.10 +- HeadersSize += folders.PackPositions[folders.NumPackStreams]; 182.11 ++ if (folders.PackPositions) 182.12 ++ HeadersSize += folders.PackPositions[folders.NumPackStreams]; 182.13 + return S_OK; 182.14 + } 182.15 +
183.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 183.2 +++ b/p7zip/stuff/patches/CVE-2017-17969.patch Sat Feb 24 16:17:33 2018 +0200 183.3 @@ -0,0 +1,26 @@ 183.4 +From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org> 183.5 +Date: Sun, 28 Jan 2018 21:19:50 +0100 183.6 +Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta 183.7 + 183.8 +--- 183.9 + CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- 183.10 + 1 file changed, 6 insertions(+), 1 deletion(-) 183.11 + 183.12 +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp 183.13 +index 80b7e67..4acdce5 100644 183.14 +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp 183.15 ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp 183.16 +@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * 183.17 + { 183.18 + _stack[i++] = _suffixes[cur]; 183.19 + cur = _parents[cur]; 183.20 +- } 183.21 ++ if (i >= kNumItems) 183.22 ++ break; 183.23 ++ } 183.24 ++ 183.25 ++ if (i >= kNumItems) 183.26 ++ break; 183.27 + 183.28 + _stack[i++] = (Byte)cur; 183.29 + lastChar2 = (Byte)cur;
184.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 184.2 +++ b/p7zip/stuff/patches/CVE-2018-5996.patch Sat Feb 24 16:17:33 2018 +0200 184.3 @@ -0,0 +1,221 @@ 184.4 +From: Robert Luberda <robert@debian.org> 184.5 +Date: Sun, 28 Jan 2018 23:47:40 +0100 184.6 +Subject: CVE-2018-5996 184.7 + 184.8 +Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by 184.9 +applying a few changes from 7Zip 18.00-beta. 184.10 + 184.11 +Bug-Debian: https://bugs.debian.org/#888314 184.12 +--- 184.13 + CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++---- 184.14 + CPP/7zip/Compress/Rar1Decoder.h | 1 + 184.15 + CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++- 184.16 + CPP/7zip/Compress/Rar2Decoder.h | 1 + 184.17 + CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++--- 184.18 + CPP/7zip/Compress/Rar3Decoder.h | 2 ++ 184.19 + 6 files changed, 42 insertions(+), 8 deletions(-) 184.20 + 184.21 +diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp 184.22 +index 1aaedcc..68030c7 100644 184.23 +--- a/CPP/7zip/Compress/Rar1Decoder.cpp 184.24 ++++ b/CPP/7zip/Compress/Rar1Decoder.cpp 184.25 +@@ -29,7 +29,7 @@ public: 184.26 + }; 184.27 + */ 184.28 + 184.29 +-CDecoder::CDecoder(): m_IsSolid(false) { } 184.30 ++CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { } 184.31 + 184.32 + void CDecoder::InitStructures() 184.33 + { 184.34 +@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * 184.35 + InitData(); 184.36 + if (!m_IsSolid) 184.37 + { 184.38 ++ _errorMode = false; 184.39 + InitStructures(); 184.40 + InitHuff(); 184.41 + } 184.42 ++ 184.43 ++ if (_errorMode) 184.44 ++ return S_FALSE; 184.45 ++ 184.46 + if (m_UnpackSize > 0) 184.47 + { 184.48 + GetFlagsBuf(); 184.49 +@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream 184.50 + const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) 184.51 + { 184.52 + try { return CodeReal(inStream, outStream, inSize, outSize, progress); } 184.53 +- catch(const CInBufferException &e) { return e.ErrorCode; } 184.54 +- catch(const CLzOutWindowException &e) { return e.ErrorCode; } 184.55 +- catch(...) { return S_FALSE; } 184.56 ++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } 184.57 ++ catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; } 184.58 ++ catch(...) { _errorMode = true; return S_FALSE; } 184.59 + } 184.60 + 184.61 + STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) 184.62 +diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h 184.63 +index 630f089..01b606b 100644 184.64 +--- a/CPP/7zip/Compress/Rar1Decoder.h 184.65 ++++ b/CPP/7zip/Compress/Rar1Decoder.h 184.66 +@@ -39,6 +39,7 @@ public: 184.67 + 184.68 + Int64 m_UnpackSize; 184.69 + bool m_IsSolid; 184.70 ++ bool _errorMode; 184.71 + 184.72 + UInt32 ReadBits(int numBits); 184.73 + HRESULT CopyBlock(UInt32 distance, UInt32 len); 184.74 +diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp 184.75 +index b3f2b4b..0580c8d 100644 184.76 +--- a/CPP/7zip/Compress/Rar2Decoder.cpp 184.77 ++++ b/CPP/7zip/Compress/Rar2Decoder.cpp 184.78 +@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; 184.79 + static const UInt32 kWindowReservSize = (1 << 22) + 256; 184.80 + 184.81 + CDecoder::CDecoder(): 184.82 +- m_IsSolid(false) 184.83 ++ m_IsSolid(false), 184.84 ++ m_TablesOK(false) 184.85 + { 184.86 + } 184.87 + 184.88 +@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB 184.89 + 184.90 + bool CDecoder::ReadTables(void) 184.91 + { 184.92 ++ m_TablesOK = false; 184.93 ++ 184.94 + Byte levelLevels[kLevelTableSize]; 184.95 + Byte newLevels[kMaxTableSize]; 184.96 + m_AudioMode = (ReadBits(1) == 1); 184.97 +@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void) 184.98 + } 184.99 + 184.100 + memcpy(m_LastLevels, newLevels, kMaxTableSize); 184.101 ++ m_TablesOK = true; 184.102 ++ 184.103 + return true; 184.104 + } 184.105 + 184.106 +@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * 184.107 + return S_FALSE; 184.108 + } 184.109 + 184.110 ++ if (!m_TablesOK) 184.111 ++ return S_FALSE; 184.112 ++ 184.113 + UInt64 startPos = m_OutWindowStream.GetProcessedSize(); 184.114 + while (pos < unPackSize) 184.115 + { 184.116 +diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h 184.117 +index 3a0535c..0e9005f 100644 184.118 +--- a/CPP/7zip/Compress/Rar2Decoder.h 184.119 ++++ b/CPP/7zip/Compress/Rar2Decoder.h 184.120 +@@ -139,6 +139,7 @@ class CDecoder : 184.121 + 184.122 + UInt64 m_PackSize; 184.123 + bool m_IsSolid; 184.124 ++ bool m_TablesOK; 184.125 + 184.126 + void InitStructures(); 184.127 + UInt32 ReadBits(unsigned numBits); 184.128 +diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp 184.129 +index 3bf2513..6cb8a6a 100644 184.130 +--- a/CPP/7zip/Compress/Rar3Decoder.cpp 184.131 ++++ b/CPP/7zip/Compress/Rar3Decoder.cpp 184.132 +@@ -92,7 +92,8 @@ CDecoder::CDecoder(): 184.133 + _writtenFileSize(0), 184.134 + _vmData(0), 184.135 + _vmCode(0), 184.136 +- m_IsSolid(false) 184.137 ++ m_IsSolid(false), 184.138 ++ _errorMode(false) 184.139 + { 184.140 + Ppmd7_Construct(&_ppmd); 184.141 + } 184.142 +@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) 184.143 + return InitPPM(); 184.144 + } 184.145 + 184.146 ++ TablesRead = false; 184.147 ++ TablesOK = false; 184.148 ++ 184.149 + _lzMode = true; 184.150 + PrevAlignBits = 0; 184.151 + PrevAlignCount = 0; 184.152 +@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) 184.153 + } 184.154 + } 184.155 + } 184.156 ++ if (InputEofError()) 184.157 ++ return S_FALSE; 184.158 ++ 184.159 + TablesRead = true; 184.160 + 184.161 + // original code has check here: 184.162 +@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing) 184.163 + RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); 184.164 + 184.165 + memcpy(m_LastLevels, newLevels, kTablesSizesSum); 184.166 ++ 184.167 ++ TablesOK = true; 184.168 ++ 184.169 + return S_OK; 184.170 + } 184.171 + 184.172 +@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) 184.173 + PpmEscChar = 2; 184.174 + PpmError = true; 184.175 + InitFilters(); 184.176 ++ _errorMode = false; 184.177 + } 184.178 ++ 184.179 ++ if (_errorMode) 184.180 ++ return S_FALSE; 184.181 ++ 184.182 + if (!m_IsSolid || !TablesRead) 184.183 + { 184.184 + bool keepDecompressing; 184.185 +@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) 184.186 + bool keepDecompressing; 184.187 + if (_lzMode) 184.188 + { 184.189 ++ if (!TablesOK) 184.190 ++ return S_FALSE; 184.191 + RINOK(DecodeLZ(keepDecompressing)) 184.192 + } 184.193 + else 184.194 +@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream 184.195 + _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1; 184.196 + return CodeReal(progress); 184.197 + } 184.198 +- catch(const CInBufferException &e) { return e.ErrorCode; } 184.199 +- catch(...) { return S_FALSE; } 184.200 ++ catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; } 184.201 ++ catch(...) { _errorMode = true; return S_FALSE; } 184.202 + // CNewException is possible here. But probably CNewException is caused 184.203 + // by error in data stream. 184.204 + } 184.205 +diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h 184.206 +index c130cec..2f72d7d 100644 184.207 +--- a/CPP/7zip/Compress/Rar3Decoder.h 184.208 ++++ b/CPP/7zip/Compress/Rar3Decoder.h 184.209 +@@ -192,6 +192,7 @@ class CDecoder: 184.210 + UInt32 _lastFilter; 184.211 + 184.212 + bool m_IsSolid; 184.213 ++ bool _errorMode; 184.214 + 184.215 + bool _lzMode; 184.216 + bool _unsupportedFilter; 184.217 +@@ -200,6 +201,7 @@ class CDecoder: 184.218 + UInt32 PrevAlignCount; 184.219 + 184.220 + bool TablesRead; 184.221 ++ bool TablesOK; 184.222 + 184.223 + CPpmd7 _ppmd; 184.224 + int PpmEscChar;
185.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 185.2 +++ b/p7zip/stuff/patches/series Sat Feb 24 16:17:33 2018 +0200 185.3 @@ -0,0 +1,8 @@ 185.4 +# from https://www.archlinux.org/packages/extra/x86_64/p7zip/ 185.5 + 185.6 +# https://sourceforge.net/p/p7zip/bugs/185/ 185.7 +CVE-2016-9296.patch 185.8 +# https://sourceforge.net/p/p7zip/bugs/204/ 185.9 +CVE-2017-17969.patch 185.10 +# Patch from Debian which hopefully fixes CVE-2018-5996 185.11 +CVE-2018-5996.patch
186.1 --- a/pam/receipt Sat Feb 24 10:43:01 2018 +0200 186.2 +++ b/pam/receipt Sat Feb 24 16:17:33 2018 +0200 186.3 @@ -7,17 +7,15 @@ 186.4 MAINTAINER="pascal.bellard@slitaz.org" 186.5 LICENSE="BSD GPL2" 186.6 WEB_SITE="http://www.linux-pam.org/" 186.7 -HOST_ARCH="i486 arm" 186.8 +HOST_ARCH="i486 arm x86_64" 186.9 186.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 186.11 WGET_URL="http://www.linux-pam.org/library/Linux-PAM-$VERSION.tar.bz2" 186.12 186.13 -BUILD_DEPENDS="db-dev gettext" 186.14 +BUILD_DEPENDS="db-dev" # gettext" 186.15 SPLIT="pam-dev" 186.16 186.17 -# Rules to configure and make the package. 186.18 -compile_rules() 186.19 -{ 186.20 +compile_rules() { 186.21 ./configure \ 186.22 --sysconfdir=/etc \ 186.23 --libdir=/usr/lib \ 186.24 @@ -39,9 +37,7 @@ 186.25 done 186.26 } 186.27 186.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 186.29 -genpkg_rules() 186.30 -{ 186.31 +genpkg_rules() { 186.32 case $PACKAGE in 186.33 pam) copy @std; DEPENDS="libdb";; 186.34 *-dev) copy @dev; DEPENDS="pam db-dev";;
187.1 --- a/pango/receipt Sat Feb 24 10:43:01 2018 +0200 187.2 +++ b/pango/receipt Sat Feb 24 16:17:33 2018 +0200 187.3 @@ -7,19 +7,15 @@ 187.4 MAINTAINER="pankso@slitaz.org" 187.5 LICENSE="GPL2" 187.6 WEB_SITE="http://www.pango.org/" 187.7 -HOST_ARCH="i486 arm" 187.8 187.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 187.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 187.11 187.12 +BUILD_DEPENDS_arm="cairo-dev libxml2-dev xorg-libXft-dev" 187.13 BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev gobject-introspection-dev" 187.14 -BUILD_DEPENDS_arm="cairo-dev libxml2-dev xorg-libXft-dev" 187.15 SPLIT="pango-dev" 187.16 187.17 -# Rules to configure and make the package. 187.18 -compile_rules() 187.19 -{ 187.20 - # Handle cross compilation 187.21 +compile_rules() { 187.22 case "$ARCH" in 187.23 arm*) 187.24 export LIBTOOL=${HOST_SYSTEM}-libtool 187.25 @@ -32,9 +28,7 @@ 187.26 make && make install 187.27 } 187.28 187.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 187.30 -genpkg_rules() 187.31 -{ 187.32 +genpkg_rules() { 187.33 case $PACKAGE in 187.34 pango) 187.35 copy bin/ *.so*
188.1 --- a/paper-icon-theme/receipt Sat Feb 24 10:43:01 2018 +0200 188.2 +++ b/paper-icon-theme/receipt Sat Feb 24 16:17:33 2018 +0200 188.3 @@ -14,9 +14,7 @@ 188.4 188.5 BUILD_DEPENDS="automake" # svgcleaner" 188.6 188.7 -# Rules to configure and make the package. 188.8 -compile_rules() 188.9 -{ 188.10 +compile_rules() { 188.11 ./autogen.sh && 188.12 sed -i 's|-Rv|-R|' Makefile && 188.13 make && make install 188.14 @@ -41,9 +39,7 @@ 188.15 # done 188.16 } 188.17 188.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 188.19 -genpkg_rules() 188.20 -{ 188.21 +genpkg_rules() { 188.22 cp -a $install/* $fs 188.23 DEPENDS="librsvg" 188.24 }
189.1 --- a/patchelf/receipt Sat Feb 24 10:43:01 2018 +0200 189.2 +++ b/patchelf/receipt Sat Feb 24 16:17:33 2018 +0200 189.3 @@ -1,29 +1,26 @@ 189.4 -# SliTaz package receipt. 189.5 +# SliTaz package receipt v2. 189.6 189.7 PACKAGE="patchelf" 189.8 -VERSION="0.8" 189.9 +VERSION="0.9" 189.10 CATEGORY="development" 189.11 -SHORT_DESC="Modify the dynamic linker and RPATH of ELF executables." 189.12 +SHORT_DESC="Modify the dynamic linker and RPATH of ELF executables" 189.13 MAINTAINER="pascal.bellard@slitaz.org" 189.14 LICENSE="GPL3" 189.15 +WEB_SITE="https://nixos.org/patchelf.html" 189.16 + 189.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 189.18 -WEB_SITE="http://nixos.org/patchelf.html" 189.19 -WGET_URL="http://nixos.org/releases/$PACKAGE/$PACKAGE-$VERSION/$TARBALL" 189.20 +WGET_URL="https://nixos.org/releases/patchelf/patchelf-$VERSION/$TARBALL" 189.21 189.22 -DEPENDS="gcc-lib-base" 189.23 - 189.24 -# Rules to configure and make the package. 189.25 -compile_rules() 189.26 -{ 189.27 - ./configure --prefix=/usr --mandir=/usr/share/man \ 189.28 +# --prefix=/usr \ 189.29 +# --mandir=/usr/share/man \ 189.30 +compile_rules() { 189.31 + ./configure \ 189.32 $CONFIGURE_ARGS && 189.33 make && 189.34 - make DESTDIR=$DESTDIR install 189.35 + make install 189.36 } 189.37 189.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 189.39 -genpkg_rules() 189.40 -{ 189.41 - mkdir -p $fs/usr 189.42 - cp -a $install/usr/bin $fs/usr 189.43 +genpkg_rules() { 189.44 + copy @std 189.45 + DEPENDS="gcc-lib-base" 189.46 }
190.1 --- a/pciids/receipt Sat Feb 24 10:43:01 2018 +0200 190.2 +++ b/pciids/receipt Sat Feb 24 16:17:33 2018 +0200 190.3 @@ -1,22 +1,20 @@ 190.4 # SliTaz package receipt v2. 190.5 190.6 PACKAGE="pciids" 190.7 -VERSION="171021" 190.8 -COMMIT="5a521cc" 190.9 +VERSION="20180208" 190.10 +COMMIT="5526e26" 190.11 CATEGORY="misc" 190.12 SHORT_DESC="List of PCI ID's" 190.13 MAINTAINER="slaxemulator@gmail.com" 190.14 LICENSE="BSD GPL2" 190.15 WEB_SITE="http://pci-ids.ucw.cz/" 190.16 -HOST_ARCH="i486 arm" 190.17 190.18 TARBALL="$PACKAGE-$COMMIT.tar.gz" 190.19 WGET_URL="$GITHUB/pciutils/pciids/tarball/$COMMIT" 190.20 190.21 compile_rules() { 190.22 - mkdir -p $install/usr/share/misc 190.23 gzip -1 pci.ids 190.24 - cp pci.ids.gz $install/usr/share/misc 190.25 + install -Dm644 pci.ids.gz $install/usr/share/misc/pci.ids.gz 190.26 } 190.27 190.28 genpkg_rules() {
191.1 --- a/pcmanfm/receipt Sat Feb 24 10:43:01 2018 +0200 191.2 +++ b/pcmanfm/receipt Sat Feb 24 16:17:33 2018 +0200 191.3 @@ -7,7 +7,7 @@ 191.4 MAINTAINER="pankso@slitaz.org" 191.5 LICENSE="GPL2" 191.6 WEB_SITE="https://wiki.lxde.org/en/PCManFM" 191.7 -HOST_ARCH="i486 arm" 191.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/pcmanfm.html" 191.9 191.10 TARBALL="$PACKAGE-$VERSION.tar.xz" 191.11 #WGET_URL="$SF_MIRROR/$PACKAGE/files/$TARBALL" 191.12 @@ -18,36 +18,30 @@ 191.13 libtool" 191.14 BUILD_DEPENDS="intltool xorg-libX11-dev pango-dev libfm-dev gtk+-dev automake" 191.15 191.16 -# Rules to configure and make the package. 191.17 -compile_rules() 191.18 -{ 191.19 - # http://www.linuxfromscratch.org/blfs/view/stable/lxde/pcmanfm.html 191.20 - 191.21 +compile_rules() { 191.22 # tarball from git.lxde.org requires this step 191.23 [ -e "$src/configure" ] || ./autogen.sh 191.24 191.25 ./configure \ 191.26 --sysconfdir=/etc \ 191.27 $CONFIGURE_ARGS && 191.28 - make && make install && 191.29 + make && make install || return 1 191.30 191.31 - mkdir -p $install/etc/xdg/pcmanfm/ && 191.32 + mkdir -p $install/etc/xdg/pcmanfm/ 191.33 # default settings 191.34 - cp -r $stuff/default/ $install/etc/xdg/pcmanfm/ && 191.35 + cp -r $stuff/default/ $install/etc/xdg/pcmanfm/ 191.36 # XDG autostart desktop file (lxsession will use it automatically) 191.37 - cp -r $stuff/autostart/ $install/etc/xdg/ && 191.38 + cp -r $stuff/autostart/ $install/etc/xdg/ 191.39 # add custom actions 191.40 - mkdir -p $install/usr/share/file-manager && 191.41 - cp -r $stuff/actions/ $install/usr/share/file-manager && 191.42 + mkdir -p $install/usr/share/file-manager 191.43 + cp -r $stuff/actions/ $install/usr/share/file-manager 191.44 install -m755 $stuff/gvfs-mount-archive.sh $install/usr/bin 191.45 191.46 # avoid warning about missed modules dir 191.47 mkdir -p $install/usr/lib/pcmanfm 191.48 } 191.49 191.50 -# Rules to gen a SliTaz package suitable for Tazpkg. 191.51 -genpkg_rules() 191.52 -{ 191.53 +genpkg_rules() { 191.54 copy @std 191.55 DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libfm \ 191.56 libfm-gtk pango xorg-libX11"
192.1 --- a/pcmciautils/receipt Sat Feb 24 10:43:01 2018 +0200 192.2 +++ b/pcmciautils/receipt Sat Feb 24 16:17:33 2018 +0200 192.3 @@ -14,18 +14,14 @@ 192.4 192.5 BUILD_DEPENDS="sysfsutils-dev" 192.6 192.7 -# Rules to configure and make the package. 192.8 -compile_rules() 192.9 -{ 192.10 +compile_rules() { 192.11 sed -i 's|/lib/udev|/usr/lib/udev|g; s|/sbin|/usr/bin|g' Makefile 192.12 192.13 make && 192.14 make DESTDIR=$install install 192.15 } 192.16 192.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 192.18 -genpkg_rules() 192.19 -{ 192.20 +genpkg_rules() { 192.21 copy @std 192.22 DEPENDS="sysfsutils eudev" 192.23 }
193.1 --- a/pcre/receipt Sat Feb 24 10:43:01 2018 +0200 193.2 +++ b/pcre/receipt Sat Feb 24 16:17:33 2018 +0200 193.3 @@ -7,7 +7,7 @@ 193.4 MAINTAINER="pankso@slitaz.org" 193.5 LICENSE="BSD" 193.6 WEB_SITE="http://www.pcre.org/" 193.7 -HOST_ARCH="i486 arm" 193.8 +HOST_ARCH="i486 arm x86_64" 193.9 193.10 TARBALL="$PACKAGE-$VERSION.tar.bz2" 193.11 WGET_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$TARBALL" 193.12 @@ -15,9 +15,7 @@ 193.13 BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev valgrind-dev" 193.14 SPLIT="pcre-apps pcre-dev" 193.15 193.16 -# Rules to configure and make the package. 193.17 -compile_rules() 193.18 -{ 193.19 +compile_rules() { 193.20 # http://www.linuxfromscratch.org/blfs/view/stable/general/pcre.html 193.21 ./configure \ 193.22 --docdir=/usr/share/doc/pcre-$VERSION \ 193.23 @@ -39,17 +37,14 @@ 193.24 $install/usr/lib/libpcre.so 193.25 } 193.26 193.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 193.28 -genpkg_rules() 193.29 -{ 193.30 +genpkg_rules() { 193.31 case $PACKAGE in 193.32 pcre) 193.33 copy *.so* 193.34 CAT="system-tools|library" 193.35 ;; 193.36 *-apps) 193.37 - copy @std 193.38 - remove_already_packed 193.39 + copy @std @rm 193.40 DEPENDS="pcre bzlib ncurses readline zlib" 193.41 CAT="development|applications" 193.42 ;;
194.1 --- a/perl-encode-locale/receipt Sat Feb 24 10:43:01 2018 +0200 194.2 +++ b/perl-encode-locale/receipt Sat Feb 24 16:17:33 2018 +0200 194.3 @@ -1,4 +1,4 @@ 194.4 -# SliTaz package receipt. 194.5 +# SliTaz package receipt v2. 194.6 194.7 PACKAGE="perl-encode-locale" 194.8 VERSION="1.05" 194.9 @@ -11,20 +11,16 @@ 194.10 TARBALL="Encode-Locale-$VERSION.tar.gz" 194.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 194.12 194.13 -DEPENDS="perl" 194.14 BUILD_DEPENDS="perl" 194.15 194.16 -# Rules to configure and make the package. 194.17 -compile_rules() 194.18 -{ 194.19 +compile_rules() { 194.20 perl Makefile.PL && 194.21 make && make DESTDIR=$install install && 194.22 194.23 chmod -R u+w $install 194.24 } 194.25 194.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 194.27 -genpkg_rules() 194.28 -{ 194.29 +genpkg_rules() { 194.30 copy @std 194.31 + DEPENDS="perl" 194.32 }
195.1 --- a/perl-file-listing/receipt Sat Feb 24 10:43:01 2018 +0200 195.2 +++ b/perl-file-listing/receipt Sat Feb 24 16:17:33 2018 +0200 195.3 @@ -1,4 +1,4 @@ 195.4 -# SliTaz package receipt. 195.5 +# SliTaz package receipt v2. 195.6 195.7 PACKAGE="perl-file-listing" 195.8 VERSION="6.04" 195.9 @@ -11,20 +11,16 @@ 195.10 TARBALL="File-Listing-$VERSION.tar.gz" 195.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 195.12 195.13 -DEPENDS="perl-http-date" 195.14 -BUILD_DEPENDS="$DEPENDS" 195.15 +BUILD_DEPENDS="perl-http-date" 195.16 195.17 -# Rules to configure and make the package. 195.18 -compile_rules() 195.19 -{ 195.20 +compile_rules() { 195.21 perl Makefile.PL && 195.22 make && make DESTDIR=$install install && 195.23 195.24 chmod -R u+w $install 195.25 } 195.26 195.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 195.28 -genpkg_rules() 195.29 -{ 195.30 +genpkg_rules() { 195.31 copy @std 195.32 + DEPENDS="$BUILD_DEPENDS" 195.33 }
196.1 --- a/perl-html-parser/receipt Sat Feb 24 10:43:01 2018 +0200 196.2 +++ b/perl-html-parser/receipt Sat Feb 24 16:17:33 2018 +0200 196.3 @@ -1,4 +1,4 @@ 196.4 -# SliTaz package receipt. 196.5 +# SliTaz package receipt v2. 196.6 196.7 PACKAGE="perl-html-parser" 196.8 VERSION="3.72" 196.9 @@ -11,20 +11,16 @@ 196.10 TARBALL="HTML-Parser-$VERSION.tar.gz" 196.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 196.12 196.13 -DEPENDS="perl-html-tagset" 196.14 -BUILD_DEPENDS="$DEPENDS perl-dev" 196.15 +BUILD_DEPENDS="perl-dev perl-html-tagset" 196.16 196.17 -# Rules to configure and make the package. 196.18 -compile_rules() 196.19 -{ 196.20 +compile_rules() { 196.21 perl Makefile.PL && 196.22 make && make DESTDIR=$install install && 196.23 196.24 chmod -R u+w $install 196.25 } 196.26 196.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 196.28 -genpkg_rules() 196.29 -{ 196.30 +genpkg_rules() { 196.31 copy @std 196.32 + DEPENDS="perl-html-tagset" 196.33 }
197.1 --- a/perl-html-tagset/receipt Sat Feb 24 10:43:01 2018 +0200 197.2 +++ b/perl-html-tagset/receipt Sat Feb 24 16:17:33 2018 +0200 197.3 @@ -1,4 +1,4 @@ 197.4 -# SliTaz package receipt. 197.5 +# SliTaz package receipt v2. 197.6 197.7 PACKAGE="perl-html-tagset" 197.8 VERSION="3.20" 197.9 @@ -11,20 +11,16 @@ 197.10 TARBALL="HTML-Tagset-$VERSION.tar.gz" 197.11 WGET_URL="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/$TARBALL" 197.12 197.13 -DEPENDS="perl" 197.14 BUILD_DEPENDS="perl" 197.15 197.16 -# Rules to configure and make the package. 197.17 -compile_rules() 197.18 -{ 197.19 +compile_rules() { 197.20 perl Makefile.PL && 197.21 make && make DESTDIR=$install install && 197.22 197.23 chmod -R u+w $install 197.24 } 197.25 197.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 197.27 -genpkg_rules() 197.28 -{ 197.29 +genpkg_rules() { 197.30 copy @std 197.31 + DEPENDS="perl" 197.32 }
198.1 --- a/perl-http-cookies/receipt Sat Feb 24 10:43:01 2018 +0200 198.2 +++ b/perl-http-cookies/receipt Sat Feb 24 16:17:33 2018 +0200 198.3 @@ -1,4 +1,4 @@ 198.4 -# SliTaz package receipt. 198.5 +# SliTaz package receipt v2. 198.6 198.7 PACKAGE="perl-http-cookies" 198.8 VERSION="6.03" 198.9 @@ -11,20 +11,16 @@ 198.10 TARBALL="HTTP-Cookies-$VERSION.tar.gz" 198.11 WGET_URL="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/$TARBALL" 198.12 198.13 -DEPENDS="perl-http-date perl-http-message" 198.14 -BUILD_DEPENDS="$DEPENDS" 198.15 +BUILD_DEPENDS="perl-http-date perl-http-message" 198.16 198.17 -# Rules to configure and make the package. 198.18 -compile_rules() 198.19 -{ 198.20 +compile_rules() { 198.21 perl Makefile.PL && 198.22 make && make DESTDIR=$install install && 198.23 198.24 chmod -R u+w $install 198.25 } 198.26 198.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 198.28 -genpkg_rules() 198.29 -{ 198.30 +genpkg_rules() { 198.31 copy @std 198.32 + DEPENDS="$BUILD_DEPENDS" 198.33 }
199.1 --- a/perl-http-daemon/receipt Sat Feb 24 10:43:01 2018 +0200 199.2 +++ b/perl-http-daemon/receipt Sat Feb 24 16:17:33 2018 +0200 199.3 @@ -1,4 +1,4 @@ 199.4 -# SliTaz package receipt. 199.5 +# SliTaz package receipt v2. 199.6 199.7 PACKAGE="perl-http-daemon" 199.8 VERSION="6.01" 199.9 @@ -11,20 +11,16 @@ 199.10 TARBALL="HTTP-Daemon-$VERSION.tar.gz" 199.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 199.12 199.13 -DEPENDS="perl-http-date perl-http-message perl-lwp-mediatypes" 199.14 -BUILD_DEPENDS="$DEPENDS" 199.15 +BUILD_DEPENDS="perl-http-date perl-http-message perl-lwp-mediatypes" 199.16 199.17 -# Rules to configure and make the package. 199.18 -compile_rules() 199.19 -{ 199.20 +compile_rules() { 199.21 perl Makefile.PL && 199.22 make && make DESTDIR=$install install && 199.23 199.24 chmod -R u+w $install 199.25 } 199.26 199.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 199.28 -genpkg_rules() 199.29 -{ 199.30 +genpkg_rules() { 199.31 copy @std 199.32 + DEPENDS="$BUILD_DEPENDS" 199.33 }
200.1 --- a/perl-http-date/receipt Sat Feb 24 10:43:01 2018 +0200 200.2 +++ b/perl-http-date/receipt Sat Feb 24 16:17:33 2018 +0200 200.3 @@ -1,4 +1,4 @@ 200.4 -# SliTaz package receipt. 200.5 +# SliTaz package receipt v2. 200.6 200.7 PACKAGE="perl-http-date" 200.8 VERSION="6.02" 200.9 @@ -11,20 +11,16 @@ 200.10 TARBALL="HTTP-Date-$VERSION.tar.gz" 200.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 200.12 200.13 -DEPENDS="perl" 200.14 BUILD_DEPENDS="perl" 200.15 200.16 -# Rules to configure and make the package. 200.17 -compile_rules() 200.18 -{ 200.19 +compile_rules() { 200.20 perl Makefile.PL && 200.21 make && make DESTDIR=$install install && 200.22 200.23 chmod -R u+w $install 200.24 } 200.25 200.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 200.27 -genpkg_rules() 200.28 -{ 200.29 +genpkg_rules() { 200.30 copy @std 200.31 + DEPENDS="perl" 200.32 }
201.1 --- a/perl-http-message/receipt Sat Feb 24 10:43:01 2018 +0200 201.2 +++ b/perl-http-message/receipt Sat Feb 24 16:17:33 2018 +0200 201.3 @@ -1,4 +1,4 @@ 201.4 -# SliTaz package receipt. 201.5 +# SliTaz package receipt v2. 201.6 201.7 PACKAGE="perl-http-message" 201.8 VERSION="6.11" 201.9 @@ -11,21 +11,17 @@ 201.10 TARBALL="HTTP-Message-$VERSION.tar.gz" 201.11 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL" 201.12 201.13 -DEPENDS="perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes \ 201.14 -perl-uri" 201.15 -BUILD_DEPENDS="$DEPENDS" 201.16 +BUILD_DEPENDS="perl-encode-locale perl-http-date perl-io-html \ 201.17 +perl-lwp-mediatypes perl-uri" 201.18 201.19 -# Rules to configure and make the package. 201.20 -compile_rules() 201.21 -{ 201.22 +compile_rules() { 201.23 perl Makefile.PL && 201.24 make && make DESTDIR=$install install && 201.25 201.26 chmod -R u+w $install 201.27 } 201.28 201.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 201.30 -genpkg_rules() 201.31 -{ 201.32 +genpkg_rules() { 201.33 copy @std 201.34 + DEPENDS="$BUILD_DEPENDS" 201.35 }
202.1 --- a/perl-http-negotiate/receipt Sat Feb 24 10:43:01 2018 +0200 202.2 +++ b/perl-http-negotiate/receipt Sat Feb 24 16:17:33 2018 +0200 202.3 @@ -1,4 +1,4 @@ 202.4 -# SliTaz package receipt. 202.5 +# SliTaz package receipt v2. 202.6 202.7 PACKAGE="perl-http-negotiate" 202.8 VERSION="6.01" 202.9 @@ -11,20 +11,16 @@ 202.10 TARBALL="HTTP-Negotiate-$VERSION.tar.gz" 202.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 202.12 202.13 -DEPENDS="perl-http-message" 202.14 -BUILD_DEPENDS="$DEPENDS" 202.15 +BUILD_DEPENDS="perl-http-message" 202.16 202.17 -# Rules to configure and make the package. 202.18 -compile_rules() 202.19 -{ 202.20 +compile_rules() { 202.21 perl Makefile.PL && 202.22 make && make DESTDIR=$install install && 202.23 202.24 chmod -R u+w $install 202.25 } 202.26 202.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 202.28 -genpkg_rules() 202.29 -{ 202.30 +genpkg_rules() { 202.31 copy @std 202.32 + DEPENDS="$BUILD_DEPENDS" 202.33 }
203.1 --- a/perl-io-html/receipt Sat Feb 24 10:43:01 2018 +0200 203.2 +++ b/perl-io-html/receipt Sat Feb 24 16:17:33 2018 +0200 203.3 @@ -1,4 +1,4 @@ 203.4 -# SliTaz package receipt. 203.5 +# SliTaz package receipt v2. 203.6 203.7 PACKAGE="perl-io-html" 203.8 VERSION="1.001" 203.9 @@ -11,20 +11,16 @@ 203.10 TARBALL="IO-HTML-$VERSION.tar.gz" 203.11 WGET_URL="https://cpan.metacpan.org/authors/id/C/CJ/CJM/$TARBALL" 203.12 203.13 -DEPENDS="perl" 203.14 BUILD_DEPENDS="perl" 203.15 203.16 -# Rules to configure and make the package. 203.17 -compile_rules() 203.18 -{ 203.19 +compile_rules() { 203.20 perl Makefile.PL && 203.21 make && make DESTDIR=$install install && 203.22 203.23 chmod -R u+w $install 203.24 } 203.25 203.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 203.27 -genpkg_rules() 203.28 -{ 203.29 +genpkg_rules() { 203.30 copy @std 203.31 + DEPENDS="perl" 203.32 }
204.1 --- a/perl-libwww-perl/receipt Sat Feb 24 10:43:01 2018 +0200 204.2 +++ b/perl-libwww-perl/receipt Sat Feb 24 16:17:33 2018 +0200 204.3 @@ -1,4 +1,4 @@ 204.4 -# SliTaz package receipt. 204.5 +# SliTaz package receipt v2. 204.6 204.7 PACKAGE="perl-libwww-perl" 204.8 VERSION="6.26" 204.9 @@ -11,23 +11,19 @@ 204.10 TARBALL="libwww-perl-$VERSION.tar.gz" 204.11 WGET_URL="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/$TARBALL" 204.12 204.13 -DEPENDS="perl-encode-locale perl-file-listing perl-html-parser \ 204.14 +BUILD_DEPENDS="perl-encode-locale perl-file-listing perl-html-parser \ 204.15 perl-http-cookies perl-http-daemon perl-http-date perl-http-negotiate \ 204.16 perl-http-message perl-lwp-mediatypes perl-net-http perl-try-tiny perl-uri \ 204.17 perl-www-robotrules perl-test-fatal perl-test-requiresinternet" 204.18 -BUILD_DEPENDS="$DEPENDS" 204.19 204.20 -# Rules to configure and make the package. 204.21 -compile_rules() 204.22 -{ 204.23 +compile_rules() { 204.24 perl Makefile.PL && 204.25 make && make DESTDIR=$install install && 204.26 204.27 chmod -R u+w $install 204.28 } 204.29 204.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 204.31 -genpkg_rules() 204.32 -{ 204.33 +genpkg_rules() { 204.34 copy @std 204.35 + DEPENDS="$BUILD_DEPENDS" 204.36 }
205.1 --- a/perl-locale-gettext/receipt Sat Feb 24 10:43:01 2018 +0200 205.2 +++ b/perl-locale-gettext/receipt Sat Feb 24 16:17:33 2018 +0200 205.3 @@ -1,4 +1,4 @@ 205.4 -# SliTaz package receipt. 205.5 +# SliTaz package receipt v2. 205.6 205.7 PACKAGE="perl-locale-gettext" 205.8 VERSION="1.07" 205.9 @@ -11,20 +11,16 @@ 205.10 TARBALL="gettext-$VERSION.tar.gz" 205.11 WGET_URL="https://cpan.metacpan.org/authors/id/P/PV/PVANDRY/$TARBALL" 205.12 205.13 -DEPENDS="perl gettext-base" 205.14 -BUILD_DEPENDS="$DEPENDS perl-dev" 205.15 +BUILD_DEPENDS="perl-dev gettext-base" 205.16 205.17 -# Rules to configure and make the package. 205.18 -compile_rules() 205.19 -{ 205.20 +compile_rules() { 205.21 perl Makefile.PL && 205.22 make && make DESTDIR=$install install && 205.23 205.24 chmod -R u+w $install 205.25 } 205.26 205.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 205.28 -genpkg_rules() 205.29 -{ 205.30 +genpkg_rules() { 205.31 copy @std 205.32 + DEPENDS="perl gettext-base" 205.33 }
206.1 --- a/perl-lwp-mediatypes/receipt Sat Feb 24 10:43:01 2018 +0200 206.2 +++ b/perl-lwp-mediatypes/receipt Sat Feb 24 16:17:33 2018 +0200 206.3 @@ -1,4 +1,4 @@ 206.4 -# SliTaz package receipt. 206.5 +# SliTaz package receipt v2. 206.6 206.7 PACKAGE="perl-lwp-mediatypes" 206.8 VERSION="6.02" 206.9 @@ -11,20 +11,16 @@ 206.10 TARBALL="LWP-MediaTypes-$VERSION.tar.gz" 206.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 206.12 206.13 -DEPENDS="perl" 206.14 BUILD_DEPENDS="perl" 206.15 206.16 -# Rules to configure and make the package. 206.17 -compile_rules() 206.18 -{ 206.19 +compile_rules() { 206.20 perl Makefile.PL && 206.21 make && make DESTDIR=$install install && 206.22 206.23 chmod -R u+w $install 206.24 } 206.25 206.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 206.27 -genpkg_rules() 206.28 -{ 206.29 +genpkg_rules() { 206.30 copy @std 206.31 + DEPENDS="perl" 206.32 }
207.1 --- a/perl-net-http/receipt Sat Feb 24 10:43:01 2018 +0200 207.2 +++ b/perl-net-http/receipt Sat Feb 24 16:17:33 2018 +0200 207.3 @@ -1,4 +1,4 @@ 207.4 -# SliTaz package receipt. 207.5 +# SliTaz package receipt v2. 207.6 207.7 PACKAGE="perl-net-http" 207.8 VERSION="6.14" 207.9 @@ -11,20 +11,16 @@ 207.10 TARBALL="Net-HTTP-$VERSION.tar.gz" 207.11 WGET_URL="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/$TARBALL" 207.12 207.13 -DEPENDS="perl-uri" 207.14 -BUILD_DEPENDS="$DEPENDS" 207.15 +BUILD_DEPENDS="perl-uri" 207.16 207.17 -# Rules to configure and make the package. 207.18 -compile_rules() 207.19 -{ 207.20 +compile_rules() { 207.21 perl Makefile.PL && 207.22 make && make DESTDIR=$install install && 207.23 207.24 chmod -R u+w $install 207.25 } 207.26 207.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 207.28 -genpkg_rules() 207.29 -{ 207.30 +genpkg_rules() { 207.31 copy @std 207.32 + DEPENDS="perl-uri" 207.33 }
208.1 --- a/perl-sgmlspm/receipt Sat Feb 24 10:43:01 2018 +0200 208.2 +++ b/perl-sgmlspm/receipt Sat Feb 24 16:17:33 2018 +0200 208.3 @@ -1,4 +1,4 @@ 208.4 -# SliTaz package receipt. 208.5 +# SliTaz package receipt v2. 208.6 208.7 PACKAGE="perl-sgmlspm" 208.8 VERSION="1.1" 208.9 @@ -12,23 +12,19 @@ 208.10 TARBALL="SGMLSpm-$VERSION.tar.gz" 208.11 WGET_URL="http://anduin.linuxfromscratch.org/BLFS/perl-modules/$TARBALL" 208.12 208.13 -DEPENDS="perl" 208.14 BUILD_DEPENDS="perl" 208.15 208.16 -# Rules to configure and make the package. 208.17 -compile_rules() 208.18 -{ 208.19 +compile_rules() { 208.20 chmod 644 MYMETA.yml 208.21 208.22 perl Makefile.PL && 208.23 - make && make DESTDIR=$install install && 208.24 + make && make DESTDIR=$install install || return 1 208.25 208.26 ln -sv sgmlspl.pl $install/usr/bin/sgmlspl 208.27 chmod -R u+w $install 208.28 } 208.29 208.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 208.31 -genpkg_rules() 208.32 -{ 208.33 +genpkg_rules() { 208.34 copy @std 208.35 + DEPENDS="perl" 208.36 }
209.1 --- a/perl-test-fatal/receipt Sat Feb 24 10:43:01 2018 +0200 209.2 +++ b/perl-test-fatal/receipt Sat Feb 24 16:17:33 2018 +0200 209.3 @@ -1,4 +1,4 @@ 209.4 -# SliTaz package receipt. 209.5 +# SliTaz package receipt v2. 209.6 209.7 PACKAGE="perl-test-fatal" 209.8 VERSION="0.014" 209.9 @@ -12,20 +12,16 @@ 209.10 TARBALL="Test-Fatal-$VERSION.tar.gz" 209.11 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL" 209.12 209.13 -DEPENDS="perl-try-tiny" 209.14 -BUILD_DEPENDS="$DEPENDS" 209.15 +BUILD_DEPENDS="perl-try-tiny" 209.16 209.17 -# Rules to configure and make the package. 209.18 -compile_rules() 209.19 -{ 209.20 +compile_rules() { 209.21 perl Makefile.PL && 209.22 make && make DESTDIR=$install install && 209.23 209.24 chmod -R u+w $install 209.25 } 209.26 209.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 209.28 -genpkg_rules() 209.29 -{ 209.30 +genpkg_rules() { 209.31 copy @std 209.32 + DEPENDS="perl-try-tiny" 209.33 }
210.1 --- a/perl-test-pod/receipt Sat Feb 24 10:43:01 2018 +0200 210.2 +++ b/perl-test-pod/receipt Sat Feb 24 16:17:33 2018 +0200 210.3 @@ -1,4 +1,4 @@ 210.4 -# SliTaz package receipt. 210.5 +# SliTaz package receipt v2. 210.6 210.7 PACKAGE="perl-test-pod" 210.8 VERSION="1.51" 210.9 @@ -11,20 +11,16 @@ 210.10 TARBALL="Test-Pod-$VERSION.tar.gz" 210.11 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL" 210.12 210.13 -DEPENDS="perl" 210.14 BUILD_DEPENDS="perl" 210.15 210.16 -# Rules to configure and make the package. 210.17 -compile_rules() 210.18 -{ 210.19 +compile_rules() { 210.20 perl Makefile.PL && 210.21 make && make DESTDIR=$install install && 210.22 210.23 chmod -R u+w $install 210.24 } 210.25 210.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 210.27 -genpkg_rules() 210.28 -{ 210.29 +genpkg_rules() { 210.30 copy @std 210.31 + DEPENDS="perl" 210.32 }
211.1 --- a/perl-test-requiresinternet/receipt Sat Feb 24 10:43:01 2018 +0200 211.2 +++ b/perl-test-requiresinternet/receipt Sat Feb 24 16:17:33 2018 +0200 211.3 @@ -1,4 +1,4 @@ 211.4 -# SliTaz package receipt. 211.5 +# SliTaz package receipt v2. 211.6 211.7 PACKAGE="perl-test-requiresinternet" 211.8 VERSION="0.05" 211.9 @@ -11,20 +11,16 @@ 211.10 TARBALL="Test-RequiresInternet-$VERSION.tar.gz" 211.11 WGET_URL="https://cpan.metacpan.org/authors/id/M/MA/MALLEN/$TARBALL" 211.12 211.13 -DEPENDS="perl" 211.14 BUILD_DEPENDS="perl" 211.15 211.16 -# Rules to configure and make the package. 211.17 -compile_rules() 211.18 -{ 211.19 +compile_rules() { 211.20 perl Makefile.PL && 211.21 make && make DESTDIR=$install install && 211.22 211.23 chmod -R u+w $install 211.24 } 211.25 211.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 211.27 -genpkg_rules() 211.28 -{ 211.29 +genpkg_rules() { 211.30 copy @std 211.31 + DEPENDS="perl" 211.32 }
212.1 --- a/perl-texi2html/receipt Sat Feb 24 10:43:01 2018 +0200 212.2 +++ b/perl-texi2html/receipt Sat Feb 24 16:17:33 2018 +0200 212.3 @@ -1,7 +1,6 @@ 212.4 -# SliTaz package receipt. 212.5 +# SliTaz package receipt v2. 212.6 212.7 PACKAGE="perl-texi2html" 212.8 -SOURCE="texi2html" 212.9 VERSION="1.82" 212.10 CATEGORY="utilities" 212.11 SHORT_DESC="Converts texinfo documents to HTML" 212.12 @@ -9,22 +8,18 @@ 212.13 LICENSE="GPL2" 212.14 WEB_SITE="http://www.nongnu.org/texi2html/" 212.15 212.16 -TARBALL="$SOURCE-$VERSION.tar.bz2" 212.17 -WGET_URL="http://download.savannah.gnu.org/releases/$SOURCE/$TARBALL" 212.18 +TARBALL="texi2html-$VERSION.tar.bz2" 212.19 +WGET_URL="http://download.savannah.gnu.org/releases/texi2html/$TARBALL" 212.20 212.21 -DEPENDS="perl" 212.22 BUILD_DEPENDS="perl" 212.23 212.24 -# Rules to configure and make the package. 212.25 -compile_rules() 212.26 -{ 212.27 - ./configure $CONFIGURE_ARGS && make && make install 212.28 +compile_rules() { 212.29 + ./configure $CONFIGURE_ARGS && make && make install || return 1 212.30 212.31 sed -i 's|bin/env perl|bin/perl|' $install/usr/bin/texi2html 212.32 } 212.33 212.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 212.35 -genpkg_rules() 212.36 -{ 212.37 +genpkg_rules() { 212.38 copy @std 212.39 + DEPENDS="perl" 212.40 }
213.1 --- a/perl-try-tiny/receipt Sat Feb 24 10:43:01 2018 +0200 213.2 +++ b/perl-try-tiny/receipt Sat Feb 24 16:17:33 2018 +0200 213.3 @@ -1,4 +1,4 @@ 213.4 -# SliTaz package receipt. 213.5 +# SliTaz package receipt v2. 213.6 213.7 PACKAGE="perl-try-tiny" 213.8 VERSION="0.28" 213.9 @@ -11,20 +11,16 @@ 213.10 TARBALL="Try-Tiny-$VERSION.tar.gz" 213.11 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL" 213.12 213.13 -DEPENDS="perl" 213.14 BUILD_DEPENDS="perl" 213.15 213.16 -# Rules to configure and make the package. 213.17 -compile_rules() 213.18 -{ 213.19 +compile_rules() { 213.20 perl Makefile.PL && 213.21 make && make DESTDIR=$install install && 213.22 213.23 chmod -R u+w $install 213.24 } 213.25 213.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 213.27 -genpkg_rules() 213.28 -{ 213.29 +genpkg_rules() { 213.30 copy @std 213.31 + DEPENDS="perl" 213.32 }
214.1 --- a/perl-uri/receipt Sat Feb 24 10:43:01 2018 +0200 214.2 +++ b/perl-uri/receipt Sat Feb 24 16:17:33 2018 +0200 214.3 @@ -1,4 +1,4 @@ 214.4 -# SliTaz package receipt. 214.5 +# SliTaz package receipt v2. 214.6 214.7 PACKAGE="perl-uri" 214.8 VERSION="1.71" 214.9 @@ -11,20 +11,16 @@ 214.10 TARBALL="URI-$VERSION.tar.gz" 214.11 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL" 214.12 214.13 -DEPENDS="perl" 214.14 BUILD_DEPENDS="perl" 214.15 214.16 -# Rules to configure and make the package. 214.17 -compile_rules() 214.18 -{ 214.19 +compile_rules() { 214.20 perl Makefile.PL && 214.21 make && make DESTDIR=$install install && 214.22 214.23 chmod -R u+w $install 214.24 } 214.25 214.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 214.27 -genpkg_rules() 214.28 -{ 214.29 +genpkg_rules() { 214.30 copy @std 214.31 + DEPENDS="perl" 214.32 }
215.1 --- a/perl-www-robotrules/receipt Sat Feb 24 10:43:01 2018 +0200 215.2 +++ b/perl-www-robotrules/receipt Sat Feb 24 16:17:33 2018 +0200 215.3 @@ -1,4 +1,4 @@ 215.4 -# SliTaz package receipt. 215.5 +# SliTaz package receipt v2. 215.6 215.7 PACKAGE="perl-www-robotrules" 215.8 VERSION="6.02" 215.9 @@ -11,20 +11,16 @@ 215.10 TARBALL="WWW-RobotRules-$VERSION.tar.gz" 215.11 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL" 215.12 215.13 -DEPENDS="perl-uri" 215.14 -BUILD_DEPENDS="$DEPENDS" 215.15 +BUILD_DEPENDS="perl-uri" 215.16 215.17 -# Rules to configure and make the package. 215.18 -compile_rules() 215.19 -{ 215.20 +compile_rules() { 215.21 perl Makefile.PL && 215.22 make && make DESTDIR=$install install && 215.23 215.24 chmod -R u+w $install 215.25 } 215.26 215.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 215.28 -genpkg_rules() 215.29 -{ 215.30 +genpkg_rules() { 215.31 copy @std 215.32 + DEPENDS="perl-uri" 215.33 }
216.1 --- a/perl-yaml-syck/receipt Sat Feb 24 10:43:01 2018 +0200 216.2 +++ b/perl-yaml-syck/receipt Sat Feb 24 16:17:33 2018 +0200 216.3 @@ -1,4 +1,4 @@ 216.4 -# SliTaz package receipt. 216.5 +# SliTaz package receipt v2. 216.6 216.7 PACKAGE="perl-yaml-syck" 216.8 VERSION="1.30" 216.9 @@ -11,20 +11,16 @@ 216.10 TARBALL="YAML-Syck-$VERSION.tar.gz" 216.11 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$TARBALL" 216.12 216.13 -DEPENDS="perl" 216.14 BUILD_DEPENDS="perl-dev" 216.15 216.16 -# Rules to configure and make the package. 216.17 -compile_rules() 216.18 -{ 216.19 +compile_rules() { 216.20 perl Makefile.PL -y && 216.21 make && make DESTDIR=$install install && 216.22 216.23 chmod -R u+w $install 216.24 } 216.25 216.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 216.27 -genpkg_rules() 216.28 -{ 216.29 +genpkg_rules() { 216.30 copy @std 216.31 + DEPENDS="perl" 216.32 }
217.1 --- a/perl/receipt Sat Feb 24 10:43:01 2018 +0200 217.2 +++ b/perl/receipt Sat Feb 24 16:17:33 2018 +0200 217.3 @@ -35,10 +35,6 @@ 217.4 } 217.5 217.6 compile_rules() { 217.7 - # something like here: https://forums.gentoo.org/viewtopic-p-8155614.html#8155614 217.8 - [ -e /usr/include/xlocale.h ] && 217.9 - mv /usr/include/xlocale.h /usr/include/xlocale.h.old 217.10 - 217.11 case $SET in 217.12 micro) 217.13 patch -p1 -i $stuff/microperl.patch
218.1 --- a/pngquant/receipt Sat Feb 24 10:43:01 2018 +0200 218.2 +++ b/pngquant/receipt Sat Feb 24 16:17:33 2018 +0200 218.3 @@ -7,6 +7,7 @@ 218.4 MAINTAINER="al.bobylev@gmail.com" 218.5 LICENSE="GPL3" 218.6 WEB_SITE="https://pngquant.org/" 218.7 +HOST_ARCH="i486 x86_64" 218.8 218.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 218.10 WGET_URL="$GITHUB/pornel/pngquant/tarball/$VERSION" 218.11 @@ -15,40 +16,39 @@ 218.12 EXTRA_WGET_URL="$GITHUB/ImageOptim/libimagequant/tarball/$VERSION" 218.13 218.14 BUILD_DEPENDS="lcms2-dev libpng16-dev zlib-dev" 218.15 -SPLIT="pngquant-static" 218.16 +SPLIT="pngquant pngquant-static:static" 218.17 218.18 -# Rules to configure and make the package. 218.19 -compile_rules() 218.20 -{ 218.21 +compile_rules() { 218.22 if [ ! -e "$SRC/$EXTRA_TARBALL" ]; then 218.23 wget -O $SRC/$EXTRA_TARBALL $EXTRA_WGET_URL 218.24 fi 218.25 tar -xf $SRC/$EXTRA_TARBALL -C $src 218.26 mv $src/ImageOptim-*/* $src/lib/ 218.27 218.28 - # make statically linked binary 218.29 - ./configure \ 218.30 - LDFLAGS='-static -pthread' \ 218.31 - --prefix=/usr \ 218.32 - --with-openmp=static && 218.33 - make && make BINPREFIX=$install/usr/sbin install && 218.34 + case $SET in 218.35 + static) 218.36 + ./configure \ 218.37 + --prefix=/usr \ 218.38 + LDFLAGS='-static -pthread' \ 218.39 + --with-openmp=static 218.40 + ;; 218.41 + *) 218.42 + ./configure \ 218.43 + --prefix=/usr 218.44 + ;; 218.45 + esac && 218.46 218.47 - # make dynamically linked binary 218.48 - ./configure \ 218.49 - --prefix=/usr && 218.50 make && make install 218.51 } 218.52 218.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 218.54 -genpkg_rules() 218.55 -{ 218.56 +genpkg_rules() { 218.57 case $PACKAGE in 218.58 pngquant) 218.59 - copy bin/pngquant 218.60 + copy pngquant 218.61 DEPENDS="lcms2 libpng16 zlib" 218.62 ;; 218.63 pngquant-static) 218.64 - copy sbin/pngquant 218.65 + copy pngquant 218.66 CAT="graphics|static binary" 218.67 PROVIDE="pngquant" 218.68 DEPENDS=" "
219.1 --- a/polkit/receipt Sat Feb 24 10:43:01 2018 +0200 219.2 +++ b/polkit/receipt Sat Feb 24 16:17:33 2018 +0200 219.3 @@ -7,72 +7,68 @@ 219.4 MAINTAINER="slaxemulator@gmail.com" 219.5 LICENSE="LGPL2" 219.6 WEB_SITE="https://www.freedesktop.org/wiki/Software/polkit/" 219.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/polkit.html" 219.8 CROSS="error: cannot check for file existence when cross compiling" 219.9 219.10 -TARBALL="polkit-$VERSION.tar.gz" 219.11 +TARBALL="$PACKAGE-$VERSION.tar.gz" 219.12 WGET_URL="http://www.freedesktop.org/software/polkit/releases/$TARBALL" 219.13 219.14 -BUILD_DEPENDS="glib-dev js-dev expat-dev intltool pam-dev \ 219.15 +JS='js185' 219.16 +BUILD_DEPENDS="glib-dev $JS-dev expat-dev intltool pam-dev \ 219.17 gobject-introspection-dev gtk-doc" 219.18 -SPLIT="polkit polkit-pam polkit-dev polkit-pam-dev" 219.19 +SPLIT="polkit polkit-dev polkit-pam:pam polkit-pam-dev:pam" 219.20 219.21 -# Rules to configure and make the package. 219.22 -compile_rules() 219.23 -{ 219.24 - addgroup -g 27 polkitd 219.25 - adduser -g "PolicyKit Daemon Owner" -h /etc/polkit-1 -u 27 \ 219.26 - -G polkitd -s /bin/false -D polkitd 219.27 +compile_rules() { 219.28 + if ! grep -q polkitd "/etc/passwd"; then 219.29 + addgroup -g 27 polkitd 219.30 + adduser -g "PolicyKit Daemon Owner" -h /etc/polkit-1 -u 27 \ 219.31 + -G polkitd -s /bin/false -D polkitd 219.32 + fi 219.33 219.34 - cp -a $src $src-pam 219.35 + case "$SET" in 219.36 + '') SET_ARGS='--with-authfw=shadow';; 219.37 + pam) SET_ARGS='--with-authfw=pam';; 219.38 + esac 219.39 + 219.40 ./configure \ 219.41 --sysconfdir=/etc \ 219.42 --localstatedir=/var \ 219.43 --enable-libsystemd-login=no \ 219.44 - --with-authfw=shadow \ 219.45 + $SET_ARGS \ 219.46 $CONFIGURE_ARGS && 219.47 make && make install || return 1 219.48 219.49 - cd $src-pam 219.50 - ./configure \ 219.51 - --sysconfdir=/etc \ 219.52 - --localstatedir=/var \ 219.53 - --enable-libsystemd-login=no \ 219.54 - --with-authfw=pam \ 219.55 - $CONFIGURE_ARGS && 219.56 - make && make DESTDIR=$DESTDIR-pam install || return 1 219.57 + case "$SET" in 219.58 + pam) install -Dm644 $stuff/polkit-1 $install/etc/pam.d/polkit-1;; 219.59 + esac 219.60 219.61 - mkdir -p $install-pam/etc/pam.d 219.62 - cp $stuff/polkit-1 $install-pam/etc/pam.d 219.63 - for inst in $install $install-pam ; do 219.64 - # for access file in web interface, will be changed back in post-install to 700 219.65 - chmod 755 "$inst/etc/polkit-1/rules.d/" 219.66 + # for access file in web interface, will be changed back in post-install to 700 219.67 + chmod 755 "$install/etc/polkit-1/rules.d/" 219.68 219.69 - cp $stuff/*.rules $inst/etc/polkit-1/rules.d/ 219.70 - done 219.71 + cp $stuff/*.rules $install/etc/polkit-1/rules.d/ 219.72 } 219.73 219.74 -# Rules to gen a SliTaz package suitable for Tazpkg. 219.75 -genpkg_rules() 219.76 -{ 219.77 +genpkg_rules() { 219.78 case $PACKAGE in 219.79 polkit) 219.80 copy @std 219.81 - DEPENDS="expat glib js" 219.82 - ;; 219.83 - polkit-pam) 219.84 - install=$install-pam copy @std 219.85 - CAT="base-system|using PAM" 219.86 - DEPENDS="expat glib js pam" 219.87 - PROVIDE="polkit:pam" 219.88 + DEPENDS="expat glib $JS" 219.89 ;; 219.90 polkit-dev) 219.91 copy @dev 219.92 - DEPENDS="polkit expat-dev glib-dev js-dev" 219.93 + DEPENDS="polkit expat-dev glib-dev $JS-dev" 219.94 + ;; 219.95 + 219.96 + polkit-pam) 219.97 + copy @std 219.98 + CAT="base-system|using PAM" 219.99 + DEPENDS="expat glib $JS pam" 219.100 + PROVIDE="polkit:pam" 219.101 ;; 219.102 polkit-pam-dev) 219.103 - install=$install-pam copy @dev 219.104 + copy @dev 219.105 CAT="development|development files, using PAM" 219.106 - DEPENDS="polkit expat-dev glib-dev js-dev pam-dev" 219.107 + DEPENDS="polkit expat-dev glib-dev $JS-dev pam-dev" 219.108 PROVIDE="polkit-dev:pam" 219.109 ;; 219.110 esac
220.1 --- a/popt/receipt Sat Feb 24 10:43:01 2018 +0200 220.2 +++ b/popt/receipt Sat Feb 24 16:17:33 2018 +0200 220.3 @@ -7,7 +7,6 @@ 220.4 MAINTAINER="pankso@slitaz.org" 220.5 LICENSE="MIT" 220.6 WEB_SITE="http://directory.fsf.org/wiki/Popt" 220.7 -HOST_ARCH="i486 arm" 220.8 220.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 220.10 WGET_URL="http://rpm5.org/files/popt/$TARBALL" 220.11 @@ -15,20 +14,16 @@ 220.12 BUILD_DEPENDS="gettext" 220.13 SPLIT="popt-dev" 220.14 220.15 -# Rules to configure and make the package. 220.16 -compile_rules() 220.17 -{ 220.18 +compile_rules() { 220.19 ./configure \ 220.20 --disable-static \ 220.21 $CONFIGURE_ARGS && 220.22 make && make install 220.23 } 220.24 220.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 220.26 -genpkg_rules() 220.27 -{ 220.28 +genpkg_rules() { 220.29 case $PACKAGE in 220.30 - popt) copy @std;; 220.31 + popt) copy @std;; 220.32 *-dev) copy @dev;; 220.33 esac 220.34 }
221.1 --- a/posixovl/receipt Sat Feb 24 10:43:01 2018 +0200 221.2 +++ b/posixovl/receipt Sat Feb 24 16:17:33 2018 +0200 221.3 @@ -1,4 +1,4 @@ 221.4 -# SliTaz package receipt. 221.5 +# SliTaz package receipt v2. 221.6 221.7 PACKAGE="posixovl" 221.8 VERSION="1.2" 221.9 @@ -7,17 +7,13 @@ 221.10 MAINTAINER="pascal.bellard@slitaz.org" 221.11 LICENSE="GPL2" 221.12 WEB_SITE="https://sourceforge.net/projects/posixovl/" 221.13 -TAGS="filesystem" 221.14 221.15 TARBALL="$PACKAGE-$VERSION.tar.xz" 221.16 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 221.17 221.18 -DEPENDS="fuse" 221.19 -BUILD_DEPENDS="autoconf automake fuse-dev attr-dev" 221.20 +BUILD_DEPENDS="autoconf automake fuse2-dev attr-dev" 221.21 221.22 -# Rules to configure and make the package. 221.23 -compile_rules() 221.24 -{ 221.25 +compile_rules() { 221.26 mv $PACKAGE $src 2>/dev/null 221.27 cd $src 221.28 grep -q 'else if (!S_ISREG' posixovl.c || 221.29 @@ -28,8 +24,8 @@ 221.30 ./configure $CONFIGURE_ARGS && make && make install 221.31 } 221.32 221.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 221.34 -genpkg_rules() 221.35 -{ 221.36 +genpkg_rules() { 221.37 copy sbin/ 221.38 + DEPENDS="fuse2" 221.39 + TAGS="filesystem" 221.40 }
222.1 --- a/postgresql/receipt Sat Feb 24 10:43:01 2018 +0200 222.2 +++ b/postgresql/receipt Sat Feb 24 16:17:33 2018 +0200 222.3 @@ -16,9 +16,7 @@ 222.4 BUILD_DEPENDS="readline-dev zlib-dev perl-dev python-dev" 222.5 SPLIT="libpostgresqlclient postgresql-client postgresql-dev postgresql-doc" 222.6 222.7 -# Rules to configure and make the package. 222.8 -compile_rules() 222.9 -{ 222.10 +compile_rules() { 222.11 sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h && 222.12 222.13 ./configure \ 222.14 @@ -32,9 +30,7 @@ 222.15 make -C doc/src/sgml DESTDIR=$DESTDIR install-html 222.16 } 222.17 222.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 222.19 -genpkg_rules() 222.20 -{ 222.21 +genpkg_rules() { 222.22 case $PACKAGE in 222.23 postgresql) 222.24 copy bin/ postgresql/ *.so* 222.25 @@ -105,8 +101,7 @@ 222.26 EOF 222.27 } 222.28 222.29 -post_remove_postgresql() 222.30 -{ 222.31 +post_remove_postgresql() { 222.32 # when both user and group have the same id# and name 222.33 # both group and user will get removed with either delusr/delgroup 222.34 chroot "$1/" deluser postgres
223.1 --- a/ppp/receipt Sat Feb 24 10:43:01 2018 +0200 223.2 +++ b/ppp/receipt Sat Feb 24 16:17:33 2018 +0200 223.3 @@ -7,21 +7,16 @@ 223.4 MAINTAINER="pankso@slitaz.org" 223.5 LICENSE="BSD GPL" 223.6 WEB_SITE="http://ppp.samba.org/" 223.7 -CONFIG_FILES="/etc/ppp/options /etc/ppp/*secrets" 223.8 -HOST_ARCH="i486 arm" 223.9 -SUGGESTED="tazpanel" 223.10 223.11 TARBALL="$PACKAGE-$VERSION.tar.gz" 223.12 WGET_URL="$GITHUB/paulusmack/ppp/tarball/ppp-$VERSION" 223.13 + 223.14 BUILD_DEPENDS="pam-dev" 223.15 SPLIT="ppp ppp-pam ppp-dev" 223.16 223.17 -# Rules to configure and make the package. 223.18 -compile_rules() 223.19 -{ 223.20 +compile_rules() { 223.21 case "$ARCH" in 223.22 - arm*) 223.23 - export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH 223.24 + arm*) export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH;; 223.25 esac 223.26 223.27 cp -a $src $src-pam 223.28 @@ -36,39 +31,39 @@ 223.29 make DESTDIR=$DESTDIR-pam/usr install 223.30 } 223.31 223.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 223.33 -genpkg_rules() 223.34 -{ 223.35 +genpkg_rules() { 223.36 case $PACKAGE in 223.37 - ppp|ppp-pam) 223.38 - if [ $PACKAGE == 'ppp-pam' ]; then 223.39 - DEPENDS="pam" 223.40 - PROVIDE="ppp:pam" 223.41 - CAT="network|with PAM support" 223.42 - install=$install-pam 223.43 - fi 223.44 - mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN 223.45 - cp -a $install/usr/sbin $fs/usr 223.46 - [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 223.47 - cp -a $stuff/ppp.cgi $fs/var/www/tazpanel 223.48 - ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp 223.49 - ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp 223.50 + ppp|ppp-pam) 223.51 + if [ $PACKAGE == 'ppp-pam' ]; then 223.52 + DEPENDS="pam" 223.53 + PROVIDE="ppp:pam" 223.54 + CAT="network|with PAM support" 223.55 + install=$install-pam 223.56 + fi 223.57 + SUGGESTED="tazpanel" 223.58 + CONFIG_FILES="/etc/ppp/options /etc/ppp/*secrets" 223.59 + mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN 223.60 + cp -a $install/usr/sbin $fs/usr 223.61 + [ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr 223.62 + cp -a $stuff/ppp.cgi $fs/var/www/tazpanel 223.63 + ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp 223.64 + ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp 223.65 223.66 - # Config files. 223.67 - mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d 223.68 - cp $stuff/README.scripts $fs/etc/ppp 223.69 - cp -a $src/etc.ppp/* $fs/etc/ppp 223.70 + # Config files. 223.71 + mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d 223.72 + cp $stuff/README.scripts $fs/etc/ppp 223.73 + cp -a $src/etc.ppp/* $fs/etc/ppp 223.74 223.75 - # PPP scripts. 223.76 - cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts 223.77 - cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts 223.78 - sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \ 223.79 - $fs/etc/ppp/scripts/ppp-on 223.80 + # PPP scripts. 223.81 + cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts 223.82 + cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts 223.83 + sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \ 223.84 + $fs/etc/ppp/scripts/ppp-on 223.85 223.86 - cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts 223.87 - cp -a $src/scripts/callback $fs/etc/ppp/scripts 223.88 - cp -a $src/scripts/redialer $fs/etc/ppp/scripts 223.89 - cat >> $fs/etc/ppp/ip-up <<EOT 223.90 + cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts 223.91 + cp -a $src/scripts/callback $fs/etc/ppp/scripts 223.92 + cp -a $src/scripts/redialer $fs/etc/ppp/scripts 223.93 + cat >> $fs/etc/ppp/ip-up <<EOT 223.94 #!/bin/sh 223.95 223.96 if [ -x /etc/ppp/ip-up.d/\$6 ]; then 223.97 @@ -87,7 +82,7 @@ 223.98 fi 223.99 fi 223.100 EOT 223.101 - cat >> $fs/etc/ppp/ip-down <<EOT 223.102 + cat >> $fs/etc/ppp/ip-down <<EOT 223.103 #!/bin/sh 223.104 223.105 if [ -x /etc/ppp/ip-down.d/\$6 ]; then 223.106 @@ -101,21 +96,21 @@ 223.107 fi 223.108 fi 223.109 EOT 223.110 - # cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up 223.111 - # cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/ip-down 223.112 - chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down 223.113 + # cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up 223.114 + # cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/ip-down 223.115 + chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down 223.116 223.117 - # insert #!/bin/sh on top line in ip* scripts 223.118 - sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null 223.119 - # add empty peers dir 223.120 - mkdir -p $fs/etc/ppp/peers 223.121 - # hide login/pass from regular users 223.122 - chmod go-rwx $fs/etc/ppp/*secrets 223.123 - chmod go-rwx $fs/etc/ppp/options 223.124 - chmod 711 $fs/etc/ppp/scripts/* 223.125 - ;; 223.126 - ppp-dev) 223.127 - copy include/ 223.128 - ;; 223.129 + # insert #!/bin/sh on top line in ip* scripts 223.130 + sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null 223.131 + # add empty peers dir 223.132 + mkdir -p $fs/etc/ppp/peers 223.133 + # hide login/pass from regular users 223.134 + chmod go-rwx $fs/etc/ppp/*secrets 223.135 + chmod go-rwx $fs/etc/ppp/options 223.136 + chmod 711 $fs/etc/ppp/scripts/* 223.137 + ;; 223.138 + ppp-dev) 223.139 + copy include/ 223.140 + ;; 223.141 esac 223.142 }
224.1 --- a/pycairo/receipt Sat Feb 24 10:43:01 2018 +0200 224.2 +++ b/pycairo/receipt Sat Feb 24 16:17:33 2018 +0200 224.3 @@ -31,3 +31,4 @@ 224.4 ;; 224.5 esac 224.6 } 224.7 +
225.1 --- a/pygobject/receipt Sat Feb 24 10:43:01 2018 +0200 225.2 +++ b/pygobject/receipt Sat Feb 24 16:17:33 2018 +0200 225.3 @@ -15,16 +15,14 @@ 225.4 cairo-dev libffi-dev util-linux-mount-dev" 225.5 SPLIT="pygobject-dev" 225.6 225.7 -# Rules to configure and make the package. 225.8 -compile_rules() 225.9 -{ 225.10 - ./configure --disable-introspection $CONFIGURE_ARGS && 225.11 +compile_rules() { 225.12 + ./configure \ 225.13 + --disable-introspection \ 225.14 + $CONFIGURE_ARGS && 225.15 make && make install 225.16 } 225.17 225.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 225.19 -genpkg_rules() 225.20 -{ 225.21 +genpkg_rules() { 225.22 case $PACKAGE in 225.23 pygobject) 225.24 copy @std
226.1 --- a/pygtk/receipt Sat Feb 24 10:43:01 2018 +0200 226.2 +++ b/pygtk/receipt Sat Feb 24 16:17:33 2018 +0200 226.3 @@ -15,27 +15,24 @@ 226.4 libglade-dev libxml2-dev libffi-dev python-numpy" 226.5 SPLIT="pygtk-dev" 226.6 226.7 -# Rules to configure and make the package. 226.8 -compile_rules() 226.9 -{ 226.10 - ./configure --disable-docs $CONFIGURE_ARGS && 226.11 +compile_rules() { 226.12 + fix ld 226.13 + ./configure \ 226.14 + --disable-docs \ 226.15 + $CONFIGURE_ARGS && 226.16 + fix libtool && 226.17 make $MAKEFLAGS && make install 226.18 } 226.19 226.20 -# Rules to gen a SliTaz package suitable for Tazpkg. 226.21 -genpkg_rules() 226.22 -{ 226.23 +genpkg_rules() { 226.24 case $PACKAGE in 226.25 pygtk) 226.26 copy @std 226.27 - DEPENDS="python pycairo pygobject expat gtk+ libglade libxml2 \ 226.28 - xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \ 226.29 - xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \ 226.30 - xorg-libXrandr xorg-libXrender xorg-libXdamage libffi python-numpy" 226.31 + DEPENDS="atk cairo gdk-pixbuf glib gtk+ libglade pango python" 226.32 ;; 226.33 *-dev) 226.34 copy @dev 226.35 - DEPENDS="pygtk gtk+-dev pygobject-dev pycairo-dev" 226.36 + DEPENDS="pygtk gtk+-dev pygobject-dev" 226.37 ;; 226.38 esac 226.39 }
227.1 --- a/pygtksourceview-dev/receipt Sat Feb 24 10:43:01 2018 +0200 227.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 227.3 @@ -1,19 +0,0 @@ 227.4 -# SliTaz package receipt. 227.5 - 227.6 -PACKAGE="pygtksourceview-dev" 227.7 -VERSION="2.10.1" 227.8 -CATEGORY="development" 227.9 -SHORT_DESC="Devel files for PyGtkSourceView" 227.10 -MAINTAINER="al.bobylev@gmail.com" 227.11 -LICENSE="GPL2" 227.12 -WEB_SITE="http://projects.gnome.org/gtksourceview/pygtksourceview.html" 227.13 -WANTED="pygtksourceview" 227.14 - 227.15 -DEPENDS="pkg-config" 227.16 - 227.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 227.18 -genpkg_rules() 227.19 -{ 227.20 - cp -a $install/* $fs 227.21 - rm -f $fs/usr/lib/python2.7/site-packages/*.so 227.22 -}
228.1 --- a/pygtksourceview/receipt Sat Feb 24 10:43:01 2018 +0200 228.2 +++ b/pygtksourceview/receipt Sat Feb 24 16:17:33 2018 +0200 228.3 @@ -1,4 +1,4 @@ 228.4 -# SliTaz package receipt. 228.5 +# SliTaz package receipt v2. 228.6 228.7 PACKAGE="pygtksourceview" 228.8 VERSION="2.10.1" 228.9 @@ -7,25 +7,33 @@ 228.10 MAINTAINER="al.bobylev@gmail.com" 228.11 LICENSE="GPL2" 228.12 WEB_SITE="http://projects.gnome.org/gtksourceview/pygtksourceview.html" 228.13 + 228.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 228.15 WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 228.16 228.17 -DEPENDS="python pygtk gtksourceview pygobject" 228.18 BUILD_DEPENDS="python-dev pygtk-dev gtksourceview-dev pygobject-dev pkg-config \ 228.19 libxml2-dev" 228.20 +SPLIT="pygtksourceview-dev" 228.21 228.22 -# Rules to configure and make the package. 228.23 -compile_rules() 228.24 -{ 228.25 +compile_rules() { 228.26 CFLAGS="$CFLAGS $(pkg-config --cflags pygtk-2.0 gtksourceview-2.0)" 228.27 - ./configure $CONFIGURE_ARGS --disable-docs && 228.28 + fix ld 228.29 + ./configure \ 228.30 + --disable-docs \ 228.31 + $CONFIGURE_ARGS && 228.32 + fix libtool && 228.33 make && make install 228.34 } 228.35 228.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 228.37 -genpkg_rules() 228.38 -{ 228.39 - LIBDIR="usr/lib/python2.7/site-packages" 228.40 - mkdir -p $fs/$LIBDIR 228.41 - cp -a $install/$LIBDIR/gtksourceview2.so $fs/$LIBDIR 228.42 +genpkg_rules() { 228.43 + case $PACKAGE in 228.44 + pygtksourceview) 228.45 + copy @std 228.46 + DEPENDS="gdk-pixbuf glib gtk+ gtksourceview python pygtk pygobject" 228.47 + ;; 228.48 + *-dev) 228.49 + copy @dev 228.50 + DEPENDS="pkg-config" 228.51 + ;; 228.52 + esac 228.53 }
229.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 229.2 +++ b/python-alabaster/receipt Sat Feb 24 16:17:33 2018 +0200 229.3 @@ -0,0 +1,20 @@ 229.4 +# SliTaz package receipt v2. 229.5 + 229.6 +PACKAGE="python-alabaster" 229.7 +VERSION="0.7.10" 229.8 +CATEGORY="python" 229.9 +SHORT_DESC="A configurable sidebar-enabled Sphinx theme" 229.10 +MAINTAINER="al.bobylev@gmail.com" 229.11 +LICENSE="BSD" 229.12 +WEB_SITE="https://pypi.python.org/pypi/alabaster" 229.13 + 229.14 +BUILD_DEPENDS="python-pip" 229.15 + 229.16 +compile_rules() { 229.17 + pip install --no-compile --root=$DESTDIR alabaster 229.18 +} 229.19 + 229.20 +genpkg_rules() { 229.21 + copy @std 229.22 + DEPENDS="python" 229.23 +}
230.1 --- a/python-babel/receipt Sat Feb 24 10:43:01 2018 +0200 230.2 +++ b/python-babel/receipt Sat Feb 24 16:17:33 2018 +0200 230.3 @@ -1,24 +1,20 @@ 230.4 # SliTaz package receipt v2. 230.5 230.6 PACKAGE="python-babel" 230.7 -VERSION="2.4.0" 230.8 -CATEGORY="development" 230.9 +VERSION="2.5.3" 230.10 +CATEGORY="python" 230.11 SHORT_DESC="A collection of tools for internationalizing Python applications" 230.12 MAINTAINER="pascal.bellard@slitaz.org" 230.13 LICENSE="BSD" 230.14 WEB_SITE="https://pypi.python.org/pypi/Babel" 230.15 230.16 -BUILD_DEPENDS="python-pytz" 230.17 +BUILD_DEPENDS="python-pytz python-pip" 230.18 230.19 -# Rules to configure and make the package. 230.20 -compile_rules() 230.21 -{ 230.22 +compile_rules() { 230.23 pip install --no-compile --root=$DESTDIR Babel 230.24 } 230.25 230.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 230.27 -genpkg_rules() 230.28 -{ 230.29 +genpkg_rules() { 230.30 copy @std 230.31 DEPENDS="python-pytz" 230.32 }
231.1 --- a/python-certifi/receipt Sat Feb 24 10:43:01 2018 +0200 231.2 +++ b/python-certifi/receipt Sat Feb 24 16:17:33 2018 +0200 231.3 @@ -1,24 +1,20 @@ 231.4 # SliTaz package receipt v2. 231.5 231.6 PACKAGE="python-certifi" 231.7 -VERSION="2017.4.17" 231.8 +VERSION="2018.1.18" 231.9 CATEGORY="network" 231.10 SHORT_DESC="Python package for providing Mozilla's CA Bundle" 231.11 MAINTAINER="al.bobylev@gmail.com" 231.12 LICENSE="ISC" 231.13 WEB_SITE="https://pypi.python.org/pypi/certifi" 231.14 231.15 -BUILD_DEPENDS="python" 231.16 +BUILD_DEPENDS="python-pip" 231.17 231.18 -# Rules to configure and make the package. 231.19 -compile_rules() 231.20 -{ 231.21 +compile_rules() { 231.22 pip install --no-compile --root=$DESTDIR certifi 231.23 } 231.24 231.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 231.26 -genpkg_rules() 231.27 -{ 231.28 +genpkg_rules() { 231.29 copy @std 231.30 DEPENDS="python" 231.31 }
232.1 --- a/python-chardet/receipt Sat Feb 24 10:43:01 2018 +0200 232.2 +++ b/python-chardet/receipt Sat Feb 24 16:17:33 2018 +0200 232.3 @@ -8,17 +8,13 @@ 232.4 LICENSE="LGPL2.1" 232.5 WEB_SITE="https://pypi.python.org/pypi/chardet" 232.6 232.7 -BUILD_DEPENDS="python" 232.8 - 232.9 -# Rules to configure and make the package. 232.10 +BUILD_DEPENDS="python-pip" 232.11 232.12 compile_rules() { 232.13 pip install --no-compile --root=$DESTDIR chardet 232.14 } 232.15 232.16 -# Rules to gen a SliTaz package suitable for Tazpkg. 232.17 -genpkg_rules() 232.18 -{ 232.19 +genpkg_rules() { 232.20 copy @std 232.21 DEPENDS="python" 232.22 }
233.1 --- a/python-docutils/receipt Sat Feb 24 10:43:01 2018 +0200 233.2 +++ b/python-docutils/receipt Sat Feb 24 16:17:33 2018 +0200 233.3 @@ -1,34 +1,21 @@ 233.4 -# SliTaz package receipt. 233.5 +# SliTaz package receipt v2. 233.6 233.7 PACKAGE="python-docutils" 233.8 -SOURCE="docutils" 233.9 -VERSION="0.11" 233.10 -CATEGORY="development" 233.11 -SHORT_DESC="Text processing system." 233.12 +VERSION="0.14" 233.13 +CATEGORY="python" 233.14 +SHORT_DESC="Text processing system" 233.15 MAINTAINER="claudinei@slitaz.org" 233.16 LICENSE="PublicDomain GPL3 BSD" 233.17 -TARBALL="$SOURCE-$VERSION.tar.gz" 233.18 WEB_SITE="http://docutils.sourceforge.net" 233.19 -WGET_URL="http://switch.dl.sourceforge.net/project/$SOURCE/$SOURCE/$VERSION/$TARBALL" 233.20 -DEPENDS="python" 233.21 -BUILD_DEPENDS="python python-dev" 233.22 -SUGGESTED="python-pil" 233.23 233.24 -# Rules to configure and make the package. 233.25 -compile_rules() 233.26 -{ 233.27 - python setup.py install --root=$DESTDIR 233.28 +BUILD_DEPENDS="python-pip" 233.29 + 233.30 +compile_rules() { 233.31 + pip install --no-compile --root=$DESTDIR docutils 233.32 } 233.33 233.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 233.35 -genpkg_rules() 233.36 -{ 233.37 - cp -a $install/usr $fs 233.38 +genpkg_rules() { 233.39 + copy @std 233.40 + DEPENDS="python" 233.41 + SUGGESTED="python-pil" 233.42 } 233.43 - 233.44 -# Remove old package. 233.45 -post_install() 233.46 -{ 233.47 - [ ! -d "$1/var/lib/tazpkg/installed/docutils" ] || 233.48 - rm -rf "$1/var/lib/tazpkg/installed/docutils" 233.49 -}
234.1 --- a/python-idna/receipt Sat Feb 24 10:43:01 2018 +0200 234.2 +++ b/python-idna/receipt Sat Feb 24 16:17:33 2018 +0200 234.3 @@ -1,24 +1,20 @@ 234.4 # SliTaz package receipt v2. 234.5 234.6 PACKAGE="python-idna" 234.7 -VERSION="2.5" 234.8 +VERSION="2.6" 234.9 CATEGORY="network" 234.10 SHORT_DESC="Internationalized Domain Names in Applications" 234.11 MAINTAINER="al.bobylev@gmail.com" 234.12 LICENSE="BSD" 234.13 WEB_SITE="https://pypi.python.org/pypi/idna" 234.14 234.15 -BUILD_DEPENDS="python" 234.16 +BUILD_DEPENDS="python-pip" 234.17 234.18 -# Rules to configure and make the package. 234.19 -compile_rules() 234.20 -{ 234.21 +compile_rules() { 234.22 pip install --no-compile --root=$DESTDIR idna 234.23 } 234.24 234.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 234.26 -genpkg_rules() 234.27 -{ 234.28 +genpkg_rules() { 234.29 copy @std 234.30 DEPENDS="python" 234.31 }
235.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 235.2 +++ b/python-imagesize/receipt Sat Feb 24 16:17:33 2018 +0200 235.3 @@ -0,0 +1,20 @@ 235.4 +# SliTaz package receipt v2. 235.5 + 235.6 +PACKAGE="python-imagesize" 235.7 +VERSION="0.7.1" 235.8 +CATEGORY="python" 235.9 +SHORT_DESC="Getting image size from png/jpeg/jpeg2000/gif file" 235.10 +MAINTAINER="al.bobylev@gmail.com" 235.11 +LICENSE="MIT" 235.12 +WEB_SITE="https://pypi.python.org/pypi/imagesize" 235.13 + 235.14 +BUILD_DEPENDS="python-pip" 235.15 + 235.16 +compile_rules() { 235.17 + pip install --no-compile --root=$DESTDIR imagesize 235.18 +} 235.19 + 235.20 +genpkg_rules() { 235.21 + copy @std 235.22 + DEPENDS="python" 235.23 +}
236.1 --- a/python-jinja2/receipt Sat Feb 24 10:43:01 2018 +0200 236.2 +++ b/python-jinja2/receipt Sat Feb 24 16:17:33 2018 +0200 236.3 @@ -1,34 +1,20 @@ 236.4 -# SliTaz package receipt. 236.5 +# SliTaz package receipt v2. 236.6 236.7 PACKAGE="python-jinja2" 236.8 -SOURCE="Jinja2" 236.9 -VERSION="2.7" 236.10 -CATEGORY="development" 236.11 -SHORT_DESC="Stand-alone template engine." 236.12 +VERSION="2.10" 236.13 +CATEGORY="python" 236.14 +SHORT_DESC="Stand-alone template engine" 236.15 MAINTAINER="claudinei@slitaz.org" 236.16 LICENSE="BSD" 236.17 -TARBALL="$SOURCE-$VERSION.tar.gz" 236.18 WEB_SITE="http://jinja.pocoo.org" 236.19 -WGET_URL="https://pypi.python.org/packages/source/J/$SOURCE/$TARBALL" 236.20 236.21 -DEPENDS="python python-markupsafe" 236.22 -BUILD_DEPENDS="setuptools wget" 236.23 +BUILD_DEPENDS="python-pip python-markupsafe" 236.24 236.25 -# Rules to configure and make the package. 236.26 -compile_rules() 236.27 -{ 236.28 - python setup.py install --root=$DESTDIR 236.29 +compile_rules() { 236.30 + pip install --no-compile --root=$DESTDIR Jinja2 236.31 } 236.32 236.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 236.34 -genpkg_rules() 236.35 -{ 236.36 - cp -a $install/usr $fs/usr 236.37 +genpkg_rules() { 236.38 + copy @std 236.39 + DEPENDS="python python-markupsafe" 236.40 } 236.41 - 236.42 -# Remove old package. 236.43 -post_install() 236.44 -{ 236.45 - [ ! -d "$1/var/lib/tazpkg/installed/jinja2" ] || 236.46 - rm -rf "$1/var/lib/tazpkg/installed/jinja2" 236.47 -}
237.1 --- a/python-llfuse/receipt Sat Feb 24 10:43:01 2018 +0200 237.2 +++ b/python-llfuse/receipt Sat Feb 24 16:17:33 2018 +0200 237.3 @@ -2,29 +2,24 @@ 237.4 237.5 PACKAGE="python-llfuse" 237.6 SOURCE="llfuse" 237.7 -VERSION="0.38" 237.8 +VERSION="1.3.2" 237.9 CATEGORY="development" 237.10 -SHORT_DESC="Python bindings for the low level FUSE API." 237.11 +SHORT_DESC="Python bindings for the low level FUSE API" 237.12 MAINTAINER="pascal.bellard@slitaz.org" 237.13 LICENSE="LGPL2" 237.14 -TARBALL="$SOURCE-$VERSION.tar.bz2" 237.15 -WEB_SITE="http://code.google.com/p/$PACKAGE/" 237.16 -WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL" 237.17 +WEB_SITE="https://github.com/python-llfuse/python-llfuse" 237.18 237.19 -DEPENDS="fuse" 237.20 -BUILD_DEPENDS="python-dev fuse-dev attr-dev python-distribute" 237.21 +TARBALL="llfuse-$VERSION.tar.bz2" 237.22 +WGET_URL="https://bitbucket.org/nikratio/python-llfuse/downloads/$TARBALL" 237.23 237.24 -# Rules to configure and make the package. 237.25 -compile_rules() 237.26 -{ 237.27 - cd $src 237.28 +BUILD_DEPENDS="python-dev setuptools fuse2-dev attr-dev" 237.29 + 237.30 +compile_rules() { 237.31 python setup.py build && 237.32 - python setup.py test && 237.33 python setup.py install --root=$DESTDIR 237.34 } 237.35 237.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 237.37 -genpkg_rules() 237.38 -{ 237.39 - cp -a $install/usr $fs 237.40 +genpkg_rules() { 237.41 + copy @std 237.42 + DEPENDS="fuse2 python" 237.43 }
238.1 --- a/python-markupsafe/receipt Sat Feb 24 10:43:01 2018 +0200 238.2 +++ b/python-markupsafe/receipt Sat Feb 24 16:17:33 2018 +0200 238.3 @@ -1,27 +1,20 @@ 238.4 +# SliTaz package receipt v2. 238.5 + 238.6 PACKAGE="python-markupsafe" 238.7 -VERSION="0.12" 238.8 -CATEGORY="development" 238.9 -SHORT_DESC="Implements a XML/HTML/XHTML Markup safe string for Python." 238.10 +VERSION="1.0" 238.11 +CATEGORY="python" 238.12 +SHORT_DESC="Implements a XML/HTML/XHTML Markup safe string for Python" 238.13 MAINTAINER="pascal.bellard@slitaz.org" 238.14 LICENSE="BSD" 238.15 -SOURCE="MarkupSafe" 238.16 -TARBALL="$SOURCE-$VERSION.tar.gz" 238.17 WEB_SITE="http://pypi.python.org/pypi/MarkupSafe" 238.18 -WGET_URL="http://pypi.python.org/packages/source/${SOURCE:0:1}/$SOURCE/$TARBALL" 238.19 238.20 -DEPENDS="python" 238.21 -BUILD_DEPENDS="python python-dev setuptools" 238.22 +BUILD_DEPENDS="python-pip setuptools" 238.23 238.24 -# Rules to configure and make the package. 238.25 -compile_rules() 238.26 -{ 238.27 - python setup.py build && 238.28 - python setup.py install --root=$DESTDIR 238.29 +compile_rules() { 238.30 + pip install --no-compile --root=$DESTDIR MarkupSafe 238.31 } 238.32 238.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 238.34 -genpkg_rules() 238.35 -{ 238.36 - mkdir -p $fs 238.37 - cp -a $install/usr $fs 238.38 +genpkg_rules() { 238.39 + copy @std 238.40 + DEPENDS="python" 238.41 }
239.1 --- a/python-numpy/receipt Sat Feb 24 10:43:01 2018 +0200 239.2 +++ b/python-numpy/receipt Sat Feb 24 16:17:33 2018 +0200 239.3 @@ -1,31 +1,20 @@ 239.4 -# SliTaz package receipt. 239.5 +# SliTaz package receipt v2. 239.6 239.7 PACKAGE="python-numpy" 239.8 -SOURCE="numpy" 239.9 -VERSION="1.10.1" 239.10 +VERSION="1.14.0" 239.11 CATEGORY="development" 239.12 -SHORT_DESC="Scientific computing library for the Python" 239.13 +SHORT_DESC="NumPy: array processing for numbers, strings, records, and objects" 239.14 MAINTAINER="pascal.bellard@slitaz.org" 239.15 LICENSE="BSD" 239.16 -WEB_SITE="http://numpy.scipy.org/" 239.17 +WEB_SITE="http://www.numpy.org/" 239.18 239.19 -TARBALL="$SOURCE-$VERSION.tar.gz" 239.20 -WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" 239.21 +BUILD_DEPENDS="python-pip" 239.22 239.23 -DEPENDS="python" 239.24 -BUILD_DEPENDS="python python-dev" 239.25 - 239.26 -# Rules to configure and make the package. 239.27 -compile_rules() 239.28 -{ 239.29 - { 239.30 - python setup.py build && 239.31 - python setup.py install --root=$DESTDIR 239.32 - } 2>&1 | grep -Ev '(conftest.c:|configtest.c:)' 239.33 +compile_rules() { 239.34 + pip install --no-compile --root=$DESTDIR numpy 239.35 } 239.36 239.37 -# Rules to gen a SliTaz package suitable for Tazpkg. 239.38 -genpkg_rules() 239.39 -{ 239.40 +genpkg_rules() { 239.41 copy @std @dev 239.42 + DEPENDS="python" 239.43 }
240.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 240.2 +++ b/python-packaging/receipt Sat Feb 24 16:17:33 2018 +0200 240.3 @@ -0,0 +1,20 @@ 240.4 +# SliTaz package receipt v2. 240.5 + 240.6 +PACKAGE="python-packaging" 240.7 +VERSION="16.8" 240.8 +CATEGORY="python" 240.9 +SHORT_DESC="Core utilities for Python packages" 240.10 +MAINTAINER="al.bobylev@gmail.com" 240.11 +LICENSE="BSD" 240.12 +WEB_SITE="https://pypi.python.org/pypi/packaging" 240.13 + 240.14 +BUILD_DEPENDS="python-pip python-six python-pyparsing" 240.15 + 240.16 +compile_rules() { 240.17 + pip install --no-compile --root=$DESTDIR packaging 240.18 +} 240.19 + 240.20 +genpkg_rules() { 240.21 + copy @std 240.22 + DEPENDS="python" 240.23 +}
241.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 241.2 +++ b/python-pip/receipt Sat Feb 24 16:17:33 2018 +0200 241.3 @@ -0,0 +1,24 @@ 241.4 +# SliTaz package receipt v2. 241.5 + 241.6 +PACKAGE="python-pip" 241.7 +VERSION="9.0.1" 241.8 +CATEGORY="python" 241.9 +SHORT_DESC="The PyPA recommended tool for installing Python packages" 241.10 +MAINTAINER="al.bobylev@gmail.com" 241.11 +LICENSE="MIT" 241.12 +WEB_SITE="https://pip.pypa.io/" 241.13 + 241.14 +TARBALL="pip-$VERSION.tar.gz" 241.15 +WGET_URL="https://pypi.org/packages/source/p/pip/$TARBALL" 241.16 + 241.17 +BUILD_DEPENDS="python setuptools" 241.18 + 241.19 +compile_rules() { 241.20 + python setup.py build && 241.21 + python setup.py install --prefix=/usr --root=$DESTDIR 241.22 +} 241.23 + 241.24 +genpkg_rules() { 241.25 + copy @std 241.26 + DEPENDS="python" 241.27 +}
242.1 --- a/python-pygments/receipt Sat Feb 24 10:43:01 2018 +0200 242.2 +++ b/python-pygments/receipt Sat Feb 24 16:17:33 2018 +0200 242.3 @@ -8,17 +8,13 @@ 242.4 LICENSE="BSD" 242.5 WEB_SITE="https://pypi.python.org/pypi/Pygments" 242.6 242.7 -BUILD_DEPENDS="python" 242.8 +BUILD_DEPENDS="python-pip" 242.9 242.10 -# Rules to configure and make the package. 242.11 -compile_rules() 242.12 -{ 242.13 +compile_rules() { 242.14 pip install --no-compile --root=$DESTDIR Pygments 242.15 } 242.16 242.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 242.18 -genpkg_rules() 242.19 -{ 242.20 +genpkg_rules() { 242.21 copy @std 242.22 DEPENDS="python" 242.23 }
243.1 --- a/python-pyparsing/receipt Sat Feb 24 10:43:01 2018 +0200 243.2 +++ b/python-pyparsing/receipt Sat Feb 24 16:17:33 2018 +0200 243.3 @@ -1,29 +1,20 @@ 243.4 -# SliTaz package receipt. 243.5 +# SliTaz package receipt v2. 243.6 243.7 PACKAGE="python-pyparsing" 243.8 -SOURCE="pyparsing" 243.9 -VERSION="2.0.3" 243.10 +VERSION="2.2.0" 243.11 CATEGORY="development" 243.12 SHORT_DESC="Python parsing module" 243.13 MAINTAINER="pascal.bellard@slitaz.org" 243.14 LICENSE="MIT" 243.15 -WEB_SITE="http://pyparsing.wikispaces.com/" 243.16 -TARBALL="$SOURCE-$VERSION.tar.gz" 243.17 -WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" 243.18 +WEB_SITE="https://pypi.python.org/pypi/pyparsing" 243.19 243.20 -DEPENDS="python" 243.21 -BUILD_DEPENDS="python" 243.22 +BUILD_DEPENDS="python-pip" 243.23 243.24 -# Rules to configure and make the package. 243.25 -compile_rules() 243.26 -{ 243.27 - python setup.py build 243.28 - python setup.py install --root=$DESTDIR 243.29 +compile_rules() { 243.30 + pip install --no-compile --root=$DESTDIR pyparsing 243.31 } 243.32 243.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 243.34 -genpkg_rules() 243.35 -{ 243.36 - cp -a $install/usr $fs 243.37 +genpkg_rules() { 243.38 + copy @std 243.39 + DEPENDS="python" 243.40 } 243.41 -
244.1 --- a/python-pytz/receipt Sat Feb 24 10:43:01 2018 +0200 244.2 +++ b/python-pytz/receipt Sat Feb 24 16:17:33 2018 +0200 244.3 @@ -1,24 +1,20 @@ 244.4 # SliTaz package receipt. 244.5 244.6 PACKAGE="python-pytz" 244.7 -VERSION="2017.2" 244.8 +VERSION="2018.3" 244.9 CATEGORY="development" 244.10 SHORT_DESC="World Timezone Definitions for Python" 244.11 MAINTAINER="pascal.bellard@slitaz.org" 244.12 LICENSE="MIT" 244.13 WEB_SITE="https://pypi.python.org/pypi/pytz" 244.14 244.15 -BUILD_DEPENDS="python" 244.16 +BUILD_DEPENDS="python-pip" 244.17 244.18 -# Rules to configure and make the package. 244.19 -compile_rules() 244.20 -{ 244.21 +compile_rules() { 244.22 pip install --no-compile --root=$DESTDIR pytz 244.23 } 244.24 244.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 244.26 -genpkg_rules() 244.27 -{ 244.28 +genpkg_rules() { 244.29 copy @std 244.30 DEPENDS="python" 244.31 }
245.1 --- a/python-requests/receipt Sat Feb 24 10:43:01 2018 +0200 245.2 +++ b/python-requests/receipt Sat Feb 24 16:17:33 2018 +0200 245.3 @@ -1,24 +1,21 @@ 245.4 # SliTaz package receipt v2. 245.5 245.6 PACKAGE="python-requests" 245.7 -VERSION="2.17.3" 245.8 +VERSION="2.18.4" 245.9 CATEGORY="network" 245.10 SHORT_DESC="Python HTTP Requests for Humans" 245.11 MAINTAINER="al.bobylev@gmail.com" 245.12 LICENSE="Apache" 245.13 WEB_SITE="https://pypi.python.org/pypi/requests" 245.14 245.15 -BUILD_DEPENDS="python-urllib3 python-idna python-certifi python-chardet" 245.16 +BUILD_DEPENDS="python-pip python-urllib3 python-idna python-certifi \ 245.17 +python-chardet" 245.18 245.19 -# Rules to configure and make the package. 245.20 -compile_rules() 245.21 -{ 245.22 +compile_rules() { 245.23 pip install --no-compile --root=$DESTDIR requests 245.24 } 245.25 245.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 245.27 -genpkg_rules() 245.28 -{ 245.29 +genpkg_rules() { 245.30 copy @std 245.31 DEPENDS="$BUILD_DEPENDS" 245.32 }
246.1 --- a/python-six/receipt Sat Feb 24 10:43:01 2018 +0200 246.2 +++ b/python-six/receipt Sat Feb 24 16:17:33 2018 +0200 246.3 @@ -1,25 +1,20 @@ 246.4 # SliTaz package receipt v2. 246.5 246.6 PACKAGE="python-six" 246.7 -VERSION="1.10.0" 246.8 -CATEGORY="development" 246.9 +VERSION="1.11.0" 246.10 +CATEGORY="python" 246.11 SHORT_DESC="Six is a Python 2 and 3 compatibility library" 246.12 MAINTAINER="claudinei@slitaz.org" 246.13 LICENSE="MIT" 246.14 WEB_SITE="https://pypi.python.org/pypi/six" 246.15 -HOST_ARCH="i486 arm" 246.16 246.17 -BUILD_DEPENDS="python" 246.18 +BUILD_DEPENDS="python-pip" 246.19 246.20 -# Rules to configure and make the package. 246.21 -compile_rules() 246.22 -{ 246.23 +compile_rules() { 246.24 pip install --no-compile --root=$DESTDIR six 246.25 } 246.26 246.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 246.28 -genpkg_rules() 246.29 -{ 246.30 +genpkg_rules() { 246.31 copy @std 246.32 DEPENDS="python" 246.33 }
247.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 247.2 +++ b/python-snowballstemmer/receipt Sat Feb 24 16:17:33 2018 +0200 247.3 @@ -0,0 +1,20 @@ 247.4 +# SliTaz package receipt v2. 247.5 + 247.6 +PACKAGE="python-snowballstemmer" 247.7 +VERSION="1.2.1" 247.8 +CATEGORY="python" 247.9 +SHORT_DESC="16 stemmer algorithms generated from Snowball algorithms" 247.10 +MAINTAINER="al.bobylev@gmail.com" 247.11 +LICENSE="BSD" 247.12 +WEB_SITE="https://pypi.python.org/pypi/snowballstemmer" 247.13 + 247.14 +BUILD_DEPENDS="python-pip" 247.15 + 247.16 +compile_rules() { 247.17 + pip install --no-compile --root=$DESTDIR snowballstemmer 247.18 +} 247.19 + 247.20 +genpkg_rules() { 247.21 + copy @std 247.22 + DEPENDS="python" 247.23 +}
248.1 --- a/python-sphinx/receipt Sat Feb 24 10:43:01 2018 +0200 248.2 +++ b/python-sphinx/receipt Sat Feb 24 16:17:33 2018 +0200 248.3 @@ -1,36 +1,25 @@ 248.4 -# SliTaz package receipt. 248.5 +# SliTaz package receipt v2. 248.6 248.7 PACKAGE="python-sphinx" 248.8 -SOURCE="Sphinx" 248.9 -VERSION="0.6.3" 248.10 -CATEGORY="utilities" 248.11 -SHORT_DESC="Documentation Tool." 248.12 +VERSION="1.7.0" 248.13 +CATEGORY="python" 248.14 +SHORT_DESC="Documentation Tool" 248.15 MAINTAINER="claudinei@slitaz.org" 248.16 LICENSE="BSD" 248.17 -TARBALL="$SOURCE-$VERSION.tar.gz" 248.18 WEB_SITE="http://sphinx.pocoo.org" 248.19 -WGET_URL="http://pypi.python.org/packages/source/S/$SOURCE/$TARBALL" 248.20 248.21 -DEPENDS="python python-docutils python-jinja2 python-pygments setuptools" 248.22 -BUILD_DEPENDS="$DEPENDS python-dev" 248.23 +BUILD_DEPENDS="python-pip python-docutils python-jinja2 python-packaging \ 248.24 +python-imagesize python-six python-alabaster python-snowballstemmer \ 248.25 +python-pygments python-sphinxcontrib-websupport python-typing python-babel \ 248.26 +python-requests setuptools python-markupsafe python-pyparsing python-pytz \ 248.27 +python-idna python-urllib3 python-certifi python-chardet" 248.28 +COOKOPTS="!pngquant" # error: Wrote palette index exceeding num_palette (libpng failed) 248.29 248.30 -# Rules to configure and make the package. 248.31 -compile_rules() 248.32 -{ 248.33 - python setup.py build && 248.34 - python setup.py install --root=$DESTDIR 248.35 +compile_rules() { 248.36 + pip install --no-compile --root=$DESTDIR Sphinx 248.37 } 248.38 248.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 248.40 -genpkg_rules() 248.41 -{ 248.42 - mkdir -p $fs/usr 248.43 - cp -a $install/usr $fs 248.44 +genpkg_rules() { 248.45 + copy @std @dev 248.46 + DEPENDS="${BUILD_DEPENDS/python-pip /}" 248.47 } 248.48 - 248.49 -# Remove old package. 248.50 -post_install() 248.51 -{ 248.52 - [ ! -d "$1/var/lib/tazpkg/installed/sphinx" ] || 248.53 - rm -rf "$1/var/lib/tazpkg/installed/sphinx" 248.54 -}
249.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 249.2 +++ b/python-sphinxcontrib-websupport/receipt Sat Feb 24 16:17:33 2018 +0200 249.3 @@ -0,0 +1,20 @@ 249.4 +# SliTaz package receipt v2. 249.5 + 249.6 +PACKAGE="python-sphinxcontrib-websupport" 249.7 +VERSION="1.0.1" 249.8 +CATEGORY="python" 249.9 +SHORT_DESC="Sphinx API for Web Apps" 249.10 +MAINTAINER="al.bobylev@gmail.com" 249.11 +LICENSE="BSD" 249.12 +WEB_SITE="https://pypi.python.org/pypi/sphinxcontrib-websupport" 249.13 + 249.14 +BUILD_DEPENDS="python-pip" 249.15 + 249.16 +compile_rules() { 249.17 + pip install --no-compile --root=$DESTDIR sphinxcontrib-websupport 249.18 +} 249.19 + 249.20 +genpkg_rules() { 249.21 + copy @std 249.22 + DEPENDS="python" 249.23 +}
250.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 250.2 +++ b/python-typing/receipt Sat Feb 24 16:17:33 2018 +0200 250.3 @@ -0,0 +1,20 @@ 250.4 +# SliTaz package receipt v2. 250.5 + 250.6 +PACKAGE="python-typing" 250.7 +VERSION="3.6.4" 250.8 +CATEGORY="python" 250.9 +SHORT_DESC="Type Hints for Python" 250.10 +MAINTAINER="al.bobylev@gmail.com" 250.11 +LICENSE="PSF" 250.12 +WEB_SITE="https://pypi.python.org/pypi/typing" 250.13 + 250.14 +BUILD_DEPENDS="python-pip" 250.15 + 250.16 +compile_rules() { 250.17 + pip install --no-compile --root=$DESTDIR typing 250.18 +} 250.19 + 250.20 +genpkg_rules() { 250.21 + copy @std 250.22 + DEPENDS="python" 250.23 +}
251.1 --- a/python-urllib3/receipt Sat Feb 24 10:43:01 2018 +0200 251.2 +++ b/python-urllib3/receipt Sat Feb 24 16:17:33 2018 +0200 251.3 @@ -1,24 +1,20 @@ 251.4 # SliTaz package receipt v2. 251.5 251.6 PACKAGE="python-urllib3" 251.7 -VERSION="1.21.1" 251.8 +VERSION="1.22" 251.9 CATEGORY="network" 251.10 SHORT_DESC="HTTP library with thread-safe connection pooling, file post, and more" 251.11 MAINTAINER="al.bobylev@gmail.com" 251.12 LICENSE="MIT" 251.13 WEB_SITE="https://pypi.python.org/pypi/urllib3" 251.14 251.15 -BUILD_DEPENDS="python" 251.16 +BUILD_DEPENDS="python-pip" 251.17 251.18 -# Rules to configure and make the package. 251.19 -compile_rules() 251.20 -{ 251.21 +compile_rules() { 251.22 pip install --no-compile --root=$DESTDIR urllib3 251.23 } 251.24 251.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 251.26 -genpkg_rules() 251.27 -{ 251.28 +genpkg_rules() { 251.29 copy @std 251.30 DEPENDS="python" 251.31 }
252.1 --- a/python/receipt Sat Feb 24 10:43:01 2018 +0200 252.2 +++ b/python/receipt Sat Feb 24 16:17:33 2018 +0200 252.3 @@ -7,8 +7,7 @@ 252.4 MAINTAINER="pankso@slitaz.org" 252.5 LICENSE="PSL" 252.6 WEB_SITE="https://www.python.org/" 252.7 -HOST_ARCH="i486 arm" 252.8 -COOKOPTS="!menus !zip" 252.9 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/python2.html" 252.10 252.11 TARBALL="$PACKAGE-$VERSION.tar.xz" 252.12 WGET_URL="https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.xz" 252.13 @@ -16,10 +15,9 @@ 252.14 BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite3-dev zlib-dev \ 252.15 ncurses-dev tcl-dev tk-dev db-dev gdbm-dev libffi-dev expat-dev" 252.16 SPLIT="python-idle python-tcltk python python-dev" 252.17 +COOKOPTS="!menus !zip" 252.18 252.19 -# Rules to configure and make the package. 252.20 -compile_rules() 252.21 -{ 252.22 +compile_rules() { 252.23 # Temporary workaround for FS#22322 252.24 # See http://bugs.python.org/issue10835 for upstream report 252.25 sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c 252.26 @@ -33,7 +31,7 @@ 252.27 unset CFLAGS CXXFLAGS 252.28 cp -f $CONFIG_SITE . 252.29 CONFIG_SITE="$(pwd)/cook.site" 252.30 - cat >> $CONFIG_SITE << EOT 252.31 + cat >> $CONFIG_SITE <<EOT 252.32 ac_cv_have_long_long_format=yes 252.33 EOT 252.34 ./configure CC=gcc \ 252.35 @@ -49,7 +47,7 @@ 252.36 . /etc/slitaz/cook.conf 252.37 cp -f $CONFIG_SITE . 252.38 CONFIG_SITE="$(pwd)/cook.site" 252.39 - cat >> $CONFIG_SITE << EOT 252.40 + cat >> $CONFIG_SITE <<EOT 252.41 ac_cv_have_long_long_format=yes 252.42 ac_cv_buggy_getaddrinfo=no 252.43 ac_cv_file__dev_ptmx=yes 252.44 @@ -69,7 +67,7 @@ 252.45 BUILDARCH=${BUILD_SYSTEM} || exit 1 252.46 make DESTDIR=$DESTDIR install || exit 1 252.47 ;; 252.48 - i?86) 252.49 + i?86|x86_64) 252.50 ./configure \ 252.51 --prefix=/usr \ 252.52 --enable-shared \ 252.53 @@ -85,9 +83,7 @@ 252.54 esac 252.55 } 252.56 252.57 -# Rules to gen a SliTaz package suitable for Tazpkg. 252.58 -genpkg_rules() 252.59 -{ 252.60 +genpkg_rules() { 252.61 case $PACKAGE in 252.62 *-idle) 252.63 copy idle idlelib/ python-idle.desktop 252.64 @@ -100,15 +96,13 @@ 252.65 DEPENDS="python tcl tk xorg-libX11" 252.66 ;; 252.67 python) 252.68 - # pyconfig.h needed for mercurial to work now 252.69 - copy @std pyconfig.h 252.70 - remove_already_packed 252.71 - DEPENDS="bzlib expat gdbm libcrypto libffi libsqlite3 libssl \ 252.72 - ncurses ncurses-libpanel readline zlib" 252.73 + # Now pyconfig.h is required for Mercurial. 252.74 + copy @std pyconfig.h @rm 252.75 + DEPENDS="bzlib expat gdbm libffi libsqlite3 ncurses \ 252.76 + ncurses-libpanel openssl readline zlib" 252.77 ;; 252.78 *-dev) 252.79 - copy @dev 252.80 - remove_already_packed 252.81 + copy @dev @rm 252.82 ;; 252.83 esac 252.84 }
253.1 --- a/rp-pppoe/receipt Sat Feb 24 10:43:01 2018 +0200 253.2 +++ b/rp-pppoe/receipt Sat Feb 24 16:17:33 2018 +0200 253.3 @@ -1,4 +1,4 @@ 253.4 -# SliTaz package receipt. 253.5 +# SliTaz package receipt v2. 253.6 253.7 PACKAGE="rp-pppoe" 253.8 VERSION="3.12" 253.9 @@ -7,23 +7,19 @@ 253.10 MAINTAINER="pankso@slitaz.org" 253.11 LICENSE="GPL2" 253.12 WEB_SITE="https://www.roaringpenguin.com/products/pppoe" 253.13 -TAGS="network PPPoE" 253.14 -HOST_ARCH="i486" 253.15 +HOST_ARCH="i486 x86_64" 253.16 253.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 253.18 WGET_URL="https://www.roaringpenguin.com/files/download/$TARBALL" 253.19 253.20 BUILD_DEPENDS="ppp" 253.21 253.22 -# Rules to configure and make the package. 253.23 -compile_rules() 253.24 -{ 253.25 +compile_rules() { 253.26 cd $src/src 253.27 ./configure $CONFIGURE_ARGS && make && make install 253.28 } 253.29 253.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 253.31 -genpkg_rules() 253.32 -{ 253.33 +genpkg_rules() { 253.34 copy etc/ sbin/ 253.35 + TAGS="network PPPoE" 253.36 }
254.1 --- a/rust/receipt Sat Feb 24 10:43:01 2018 +0200 254.2 +++ b/rust/receipt Sat Feb 24 16:17:33 2018 +0200 254.3 @@ -1,19 +1,25 @@ 254.4 # SliTaz package receipt v2. 254.5 254.6 PACKAGE="rust" 254.7 -VERSION="1.20.0" 254.8 +VERSION="1.23.0" 254.9 CATEGORY="development" 254.10 SHORT_DESC="The Rust programming language" 254.11 MAINTAINER="al.bobylev@gmail.com" 254.12 LICENSE="MIT Apache BSD" 254.13 WEB_SITE="https://www.rust-lang.org/" 254.14 +HOST_ARCH="i486 x86_64" 254.15 254.16 -TARBALL="rust-$VERSION-i686-unknown-linux-gnu.tar.gz" 254.17 +TARBALL="rust-$VERSION-${ARCH/i486/i686}-unknown-linux-gnu.tar.gz" 254.18 WGET_URL="https://static.rust-lang.org/dist/$TARBALL" 254.19 254.20 -# Rules to configure and make the package. 254.21 -compile_rules() 254.22 -{ 254.23 +# Available targets we interest in: https://forge.rust-lang.org/platform-support.html 254.24 +# i686-unknown-linux-gnu | 32-bit Linux 254.25 +# x86_64-unknown-linux-gnu | 64-bit Linux 254.26 +# arm-unknown-linux-gnueabi | ARMv6 Linux 254.27 +# arm-unknown-linux-gnueabihf | ARMv6 Linux, hardfloat 254.28 +# armv7-unknown-linux-gnueabihf | ARMv7 Linux 254.29 + 254.30 +compile_rules() { 254.31 ./install.sh \ 254.32 --prefix=$install/usr \ 254.33 --sysconfdir=$install/etc \ 254.34 @@ -21,8 +27,6 @@ 254.35 --without=rust-docs 254.36 } 254.37 254.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 254.39 -genpkg_rules() 254.40 -{ 254.41 +genpkg_rules() { 254.42 copy @std 254.43 }
255.1 --- a/scons/receipt Sat Feb 24 10:43:01 2018 +0200 255.2 +++ b/scons/receipt Sat Feb 24 16:17:33 2018 +0200 255.3 @@ -1,21 +1,19 @@ 255.4 -# SliTaz package receipt. 255.5 +# SliTaz package receipt v2. 255.6 255.7 PACKAGE="scons" 255.8 VERSION="2.3.4" 255.9 CATEGORY="development" 255.10 -SHORT_DESC="SCons is an Open Source software construction tool." 255.11 +SHORT_DESC="SCons is an Open Source software construction tool" 255.12 MAINTAINER="chadi.elahmad@gmail.com" 255.13 LICENSE="MIT" 255.14 +WEB_SITE="http://www.scons.org/" 255.15 + 255.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 255.17 -WEB_SITE="http://www.scons.org/" 255.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 255.19 255.20 -DEPENDS="python" 255.21 BUILD_DEPENDS="python python-dev" 255.22 255.23 -# Rules to configure and make the package. 255.24 -compile_rules() 255.25 -{ 255.26 +compile_rules() { 255.27 mkdir -p $DESTDIR/usr/share 255.28 python setup.py install \ 255.29 --standard-lib \ 255.30 @@ -23,10 +21,7 @@ 255.31 mv $DESTDIR/usr/man $DESTDIR/usr/share 255.32 } 255.33 255.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 255.35 -genpkg_rules() 255.36 -{ 255.37 - mkdir -p $fs/usr 255.38 - cp -a $install/usr/bin $fs/usr 255.39 - cp -a $install/usr/lib $fs/usr 255.40 +genpkg_rules() { 255.41 + copy @std 255.42 + DEPENDS="python" 255.43 }
256.1 --- a/serf/receipt Sat Feb 24 10:43:01 2018 +0200 256.2 +++ b/serf/receipt Sat Feb 24 16:17:33 2018 +0200 256.3 @@ -38,3 +38,4 @@ 256.4 ;; 256.5 esac 256.6 } 256.7 +
257.1 --- a/setuptools/receipt Sat Feb 24 10:43:01 2018 +0200 257.2 +++ b/setuptools/receipt Sat Feb 24 16:17:33 2018 +0200 257.3 @@ -1,27 +1,23 @@ 257.4 -# SliTaz package receipt. 257.5 +# SliTaz package receipt v2. 257.6 257.7 PACKAGE="setuptools" 257.8 VERSION="4.0.1" 257.9 -CATEGORY="misc" 257.10 -SHORT_DESC="Python package installation tool." 257.11 +CATEGORY="python" 257.12 +SHORT_DESC="Python package installation tool" 257.13 MAINTAINER="pascal.bellard@slitaz.org" 257.14 LICENSE="PSL" 257.15 +WEB_SITE="http://pypi.python.org/pypi/setuptools" 257.16 + 257.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 257.18 -WEB_SITE="http://pypi.python.org/pypi/setuptools" 257.19 WGET_URL="https://bitbucket.org/pypa/setuptools/get/$VERSION.tar.bz2" 257.20 -HOST_ARCH="i486 arm" 257.21 257.22 -DEPENDS="python" 257.23 -BUILD_DEPENDS="python wget" 257.24 +BUILD_DEPENDS="python" 257.25 257.26 -# Rules to configure and make the package. 257.27 -compile_rules() 257.28 -{ 257.29 +compile_rules() { 257.30 python setup.py install --no-compile --root=$install 257.31 } 257.32 257.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 257.34 -genpkg_rules() 257.35 -{ 257.36 - cp -a $install/* $fs 257.37 +genpkg_rules() { 257.38 + copy @std 257.39 + DEPENDS="python" 257.40 }
258.1 --- a/sgml-common/receipt Sat Feb 24 10:43:01 2018 +0200 258.2 +++ b/sgml-common/receipt Sat Feb 24 16:17:33 2018 +0200 258.3 @@ -13,9 +13,7 @@ 258.4 258.5 BUILD_DEPENDS="automake" 258.6 258.7 -# Rules to configure and make the package. 258.8 -compile_rules() 258.9 -{ 258.10 +compile_rules() { 258.11 autoreconf -fi && 258.12 258.13 ./configure \ 258.14 @@ -25,9 +23,7 @@ 258.15 make docdir=/usr/share/doc install 258.16 } 258.17 258.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 258.19 -genpkg_rules() 258.20 -{ 258.21 +genpkg_rules() { 258.22 copy @std 258.23 CONFIG_FILES="/etc/sgml/sgml.conf" 258.24 }
259.1 --- a/shared-mime-info/receipt Sat Feb 24 10:43:01 2018 +0200 259.2 +++ b/shared-mime-info/receipt Sat Feb 24 16:17:33 2018 +0200 259.3 @@ -7,18 +7,15 @@ 259.4 MAINTAINER="pankso@slitaz.org" 259.5 LICENSE="GPL2" 259.6 WEB_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/" 259.7 -HOST_ARCH="i486 arm" 259.8 259.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 259.10 WGET_URL="http://freedesktop.org/~hadess/$TARBALL" 259.11 259.12 +BUILD_DEPENDS_arm="glib-dev libxml2-dev" 259.13 BUILD_DEPENDS="intltool" 259.14 -BUILD_DEPENDS_arm="glib-dev libxml2-dev" 259.15 SPLIT="shared-mime-info-dev" 259.16 259.17 -# Rules to configure and make the package. 259.18 -compile_rules() 259.19 -{ 259.20 +compile_rules() { 259.21 # Remove unsupported locales 259.22 for i in $(grep '^-[a-z]' $stuff/patches/slitaz-locales.patch); do 259.23 rm $src/po/${i#-}.po 259.24 @@ -36,9 +33,7 @@ 259.25 sed -i 's|^ *||' "$install/usr/share/mime/packages/freedesktop.org.xml" 259.26 } 259.27 259.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 259.29 -genpkg_rules() 259.30 -{ 259.31 +genpkg_rules() { 259.32 case $PACKAGE in 259.33 shared-mime-info) 259.34 copy bin/ packages/
260.1 --- a/slim/receipt Sat Feb 24 10:43:01 2018 +0200 260.2 +++ b/slim/receipt Sat Feb 24 16:17:33 2018 +0200 260.3 @@ -7,7 +7,6 @@ 260.4 MAINTAINER="pankso@slitaz.org" 260.5 LICENSE="GPL2" 260.6 WEB_SITE="https://sourceforge.net/projects/slim.berlios/" 260.7 -HOST_ARCH="i486 arm" 260.8 COOKOPTS="!pngquant op8" 260.9 260.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 260.11 @@ -23,12 +22,12 @@ 260.12 compile_rules() { 260.13 # Handle cross compilation 260.14 case "$ARCH" in 260.15 - i?86) 260.16 - INCL=/usr/include 260.17 - LIBS=/usr/lib ;; 260.18 arm*) 260.19 INCL=/cross/$ARCH/sysroot/usr/include 260.20 LIBS=/cross/$ARCH/sysroot/usr/lib ;; 260.21 + i?86|x86_64) 260.22 + INCL=/usr/include 260.23 + LIBS=/usr/lib ;; 260.24 esac 260.25 260.26 case "$SET" in 260.27 @@ -59,7 +58,6 @@ 260.28 chown -R root:root $install 260.29 } 260.30 260.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 260.32 genpkg_rules() { 260.33 case $PACKAGE in 260.34 slim-theme-default)
261.1 --- a/slitaz-base-files/receipt Sat Feb 24 10:43:01 2018 +0200 261.2 +++ b/slitaz-base-files/receipt Sat Feb 24 16:17:33 2018 +0200 261.3 @@ -1,22 +1,19 @@ 261.4 # SliTaz package receipt v2. 261.5 261.6 PACKAGE="slitaz-base-files" 261.7 -VERSION="333" 261.8 +VERSION="336" 261.9 CATEGORY="base-system" 261.10 SHORT_DESC="Linux tree and the necessary files for the base system" 261.11 MAINTAINER="pankso@slitaz.org" 261.12 LICENSE="BSD GPL3" 261.13 WEB_SITE="http://www.slitaz.org/" 261.14 -HOST_ARCH="i486 arm" 261.15 261.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 261.17 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2" 261.18 261.19 BUILD_DEPENDS="gettext" 261.20 261.21 -# Rules to configure and make the package. 261.22 -compile_rules() 261.23 -{ 261.24 +compile_rules() { 261.25 make DESTDIR=$install install 261.26 261.27 for i in /bin /dev /home /media/cdrom /media/flash /media/usbdisk /mnt \ 261.28 @@ -53,9 +50,7 @@ 261.29 chmod 0750 $install/root 261.30 } 261.31 261.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 261.33 -genpkg_rules() 261.34 -{ 261.35 +genpkg_rules() { 261.36 cp -a $install/* $fs 261.37 DEPENDS="gettext-base" 261.38 CONFIG_FILES="/etc/adduser.conf /etc/daemons.conf /etc/fstab /etc/group \
262.1 --- a/slitaz-i18n/receipt Sat Feb 24 10:43:01 2018 +0200 262.2 +++ b/slitaz-i18n/receipt Sat Feb 24 16:17:33 2018 +0200 262.3 @@ -1,13 +1,12 @@ 262.4 # SliTaz package receipt v2. 262.5 262.6 PACKAGE="slitaz-i18n" 262.7 -VERSION="6.0" 262.8 +VERSION="180123" 262.9 CATEGORY="meta" 262.10 SHORT_DESC="SliTaz internationalization" 262.11 MAINTAINER="devel@slitaz.org" 262.12 LICENSE="GPL3" 262.13 WEB_SITE="http://www.slitaz.org/" 262.14 -HOST_ARCH="i486 arm" 262.15 262.16 BUILD_DEPENDS_arm=" " 262.17 SPLIT="\
263.1 --- a/slitaz-toolchain/receipt Sat Feb 24 10:43:01 2018 +0200 263.2 +++ b/slitaz-toolchain/receipt Sat Feb 24 16:17:33 2018 +0200 263.3 @@ -1,7 +1,7 @@ 263.4 # SliTaz package receipt v2. 263.5 263.6 PACKAGE="slitaz-toolchain" 263.7 -VERSION="6.0" 263.8 +VERSION="20180210" 263.9 CATEGORY="meta" 263.10 SHORT_DESC="SliTaz meta package to rebuild or install current toolchain" 263.11 MAINTAINER="pankso@slitaz.org" 263.12 @@ -21,48 +21,8 @@ 263.13 263.14 ver() { grep ^VERSION $WOK/$1/receipt | cut -d '"' -f2; } 263.15 263.16 -# Rules to configure and make the package. 263.17 -compile_rules() 263.18 -{ 263.19 - [ -x /usr/bin/cook ] || return 0 263.20 - 263.21 - tmplog=$LOGS/$PACKAGE.tmplog 263.22 - 263.23 - cat > $tmplog <<EOT 263.24 -Cook: $PACKAGE $VERSION 263.25 -$(separator) 263.26 -Cook toolchain : started $(date '+%F %R') 263.27 -Architecture : $ARCH 263.28 -Build system : $BUILD_SYSTEM 263.29 -Host system : $HOST_SYSTEM 263.30 -$(separator -) 263.31 -EOT 263.32 - 263.33 - echo "cook: Binutils first pass : $(date '+%F %R')" >> $tmplog 263.34 - cook binutils 263.35 - echo "cook: GCC first pass : $(date '+%F %R')" >> $tmplog 263.36 - cook gcc --first-pass 263.37 - echo "cook: Linux API headers : $(date '+%F %R')" >> $tmplog 263.38 - cook linux-api-headers 263.39 - echo "cook: Glibc : $(date '+%F %R')" >> $tmplog 263.40 - cook glibc 263.41 - echo "cook: Binutils final : $(date '+%F %R')" >> $tmplog 263.42 - cook binutils 263.43 - echo "cook: GCC final : $(date '+%F %R')" >> $tmplog 263.44 - cook gcc 263.45 - 263.46 - cat >> $tmplog <<EOT 263.47 -$(separator) 263.48 - 263.49 -GCC compiler information 263.50 -$(separator) 263.51 -$(gcc -v 2>&1 | sed 's|--|\n --|g') 263.52 -$(separator) 263.53 - 263.54 -EOT 263.55 - 263.56 - # All packages cooked got ther own log so we don't keep them. 263.57 - mv -f $tmplog $LOGS/$PACKAGE.log 263.58 +compile_rules() { 263.59 + echo 'Please use `cooker task up-toolchain`.' 263.60 263.61 mkdir -p $install/usr/share/doc/slitaz 263.62 cat > $install/usr/share/doc/slitaz/toolchain.txt <<EOT 263.63 @@ -77,7 +37,7 @@ 263.64 Packages: 263.65 263.66 * Binutils $(ver binutils) 263.67 - * Linux API headers $(ver linux-api-headers) 263.68 + * Linux $(ver linux) 263.69 * GCC $(ver gcc) 263.70 * Glibc $(ver glibc) 263.71 263.72 @@ -88,9 +48,7 @@ 263.73 EOT 263.74 } 263.75 263.76 -# Rules to gen a SliTaz package suitable for Tazpkg. 263.77 -genpkg_rules() 263.78 -{ 263.79 +genpkg_rules() { 263.80 copy @std 263.81 DEPENDS="binutils linux-api-headers glibc-dev gcc make elfkickers" 263.82 }
264.1 --- a/sqlite3/receipt Sat Feb 24 10:43:01 2018 +0200 264.2 +++ b/sqlite3/receipt Sat Feb 24 16:17:33 2018 +0200 264.3 @@ -8,7 +8,6 @@ 264.4 MAINTAINER="pankso@slitaz.org" 264.5 LICENSE="PublicDomain" 264.6 WEB_SITE="https://www.sqlite.org/" 264.7 -HOST_ARCH="i486 arm" 264.8 264.9 TARBALL="sqlite-$VERSION.zip" 264.10 WGET_URL="https://www.sqlite.org/2017/sqlite-src-$version.zip"
265.1 --- a/startup-notification/receipt Sat Feb 24 10:43:01 2018 +0200 265.2 +++ b/startup-notification/receipt Sat Feb 24 16:17:33 2018 +0200 265.3 @@ -7,38 +7,33 @@ 265.4 MAINTAINER="erjo@slitaz.org" 265.5 LICENSE="LGPL2" 265.6 WEB_SITE="https://www.freedesktop.org/wiki/Software/startup-notification/" 265.7 -HOST_ARCH="i486 arm" 265.8 265.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 265.10 WGET_URL="http://www.freedesktop.org/software/startup-notification/releases/$TARBALL" 265.11 265.12 -BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev libxcb-dev xcb-util-dev" 265.13 +BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libxcb-dev \ 265.14 +xorg-xcb-util-dev" 265.15 SPLIT="startup-notification-dev" 265.16 265.17 -# Rules to configure and make the package. 265.18 -compile_rules() 265.19 -{ 265.20 +compile_rules() { 265.21 + fix ld 265.22 ./configure \ 265.23 --disable-static \ 265.24 $CONFIGURE_ARGS && 265.25 - make && make install && 265.26 + fix libtool && 265.27 + make && make install || return 1 265.28 265.29 - install -v -m644 -D doc/startup-notification.txt \ 265.30 - $install/usr/share/doc/startup-notification-$VERSION/startup-notification.txt 265.31 + cook_pick_docs doc/startup-notification.txt 265.32 } 265.33 265.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 265.35 -genpkg_rules() 265.36 -{ 265.37 +genpkg_rules() { 265.38 case $PACKAGE in 265.39 startup-notification) 265.40 copy @std 265.41 - DEPENDS="libxcb xcb-util xorg-libX11" 265.42 + DEPENDS="xorg-libX11 xorg-libxcb xorg-xcb-util" 265.43 ;; 265.44 *-dev) 265.45 copy @dev 265.46 - DEPENDS="startup-notification glibc-dev libxcb-dev xcb-util-dev \ 265.47 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev" 265.48 ;; 265.49 esac 265.50 }
266.1 --- a/subversion/receipt Sat Feb 24 10:43:01 2018 +0200 266.2 +++ b/subversion/receipt Sat Feb 24 16:17:33 2018 +0200 266.3 @@ -47,3 +47,4 @@ 266.4 ;; 266.5 esac 266.6 } 266.7 +
267.1 --- a/svgcleaner/receipt Sat Feb 24 10:43:01 2018 +0200 267.2 +++ b/svgcleaner/receipt Sat Feb 24 16:17:33 2018 +0200 267.3 @@ -1,8 +1,8 @@ 267.4 # SliTaz package receipt v2. 267.5 267.6 PACKAGE="svgcleaner" 267.7 -VERSION="0.9.1" 267.8 -#COMMIT="0ba759e" 267.9 +VERSION="0.9.3" 267.10 +#COMMIT="9acf547" 267.11 CATEGORY="graphics" 267.12 SHORT_DESC="Clean up SVG files from the unnecessary data" 267.13 MAINTAINER="al.bobylev@gmail.com"
268.1 --- a/symlinks/receipt Sat Feb 24 10:43:01 2018 +0200 268.2 +++ b/symlinks/receipt Sat Feb 24 16:17:33 2018 +0200 268.3 @@ -1,4 +1,4 @@ 268.4 -# SliTaz package receipt. 268.5 +# SliTaz package receipt v2. 268.6 268.7 PACKAGE="symlinks" 268.8 VERSION="1.4.3" 268.9 @@ -7,21 +7,16 @@ 268.10 MAINTAINER="al.bobylev@gmail.com" 268.11 LICENSE="MIT" 268.12 WEB_SITE="https://github.com/brandt/symlinks" 268.13 + 268.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 268.15 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz" 268.16 268.17 -DEPENDS="glibc-base" 268.18 -BUILD_DEPENDS="wget cacerts" 268.19 - 268.20 -# Rules to configure and make the package. 268.21 -compile_rules() 268.22 -{ 268.23 +compile_rules() { 268.24 make 268.25 + install -Dm755 $src/symlinks $install/usr/bin/symlinks 268.26 } 268.27 268.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 268.29 -genpkg_rules() 268.30 -{ 268.31 - mkdir -p $fs/usr/bin 268.32 - cp -a $src/symlinks $fs/usr/bin 268.33 +genpkg_rules() { 268.34 + copy @std 268.35 + DEPENDS="glibc-base" 268.36 }
269.1 --- a/sysfsutils/receipt Sat Feb 24 10:43:01 2018 +0200 269.2 +++ b/sysfsutils/receipt Sat Feb 24 16:17:33 2018 +0200 269.3 @@ -29,3 +29,4 @@ 269.4 ;; 269.5 esac 269.6 } 269.7 +
270.1 --- a/tazlito/receipt Sat Feb 24 10:43:01 2018 +0200 270.2 +++ b/tazlito/receipt Sat Feb 24 16:17:33 2018 +0200 270.3 @@ -1,7 +1,7 @@ 270.4 # SliTaz package receipt v2. 270.5 270.6 PACKAGE="tazlito" 270.7 -VERSION="465" 270.8 +VERSION="483" 270.9 CATEGORY="base-system" 270.10 SHORT_DESC="SliTaz Live Tool" 270.11 MAINTAINER="pascal.bellard@slitaz.org" 270.12 @@ -13,16 +13,12 @@ 270.13 270.14 BUILD_DEPENDS="gettext" 270.15 270.16 -# Rules to configure and make the package. 270.17 -compile_rules() 270.18 -{ 270.19 +compile_rules() { 270.20 sed -i "s/^VERSION=.*/VERSION=$VERSION/" tazlito 270.21 make DESTDIR=$DESTDIR VERSION=$VERSION install 270.22 } 270.23 270.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 270.25 -genpkg_rules() 270.26 -{ 270.27 +genpkg_rules() { 270.28 mkdir -p $fs 270.29 cp -a $install/* $fs 270.30 chown -R root.root $fs
271.1 --- a/tazpkg/receipt Sat Feb 24 10:43:01 2018 +0200 271.2 +++ b/tazpkg/receipt Sat Feb 24 16:17:33 2018 +0200 271.3 @@ -1,7 +1,7 @@ 271.4 # SliTaz package receipt v2. 271.5 271.6 PACKAGE="tazpkg" 271.7 -VERSION="957" 271.8 +VERSION="962" 271.9 CATEGORY="base-system" 271.10 SHORT_DESC="SliTaz packages manager" 271.11 MAINTAINER="pankso@slitaz.org" 271.12 @@ -11,7 +11,7 @@ 271.13 TARBALL="$PACKAGE-$VERSION.tar.bz2" 271.14 WGET_URL="http://hg.slitaz.org/tazpkg/archive/$VERSION.tar.bz2" 271.15 271.16 -BUILD_DEPENDS_arm="" 271.17 +BUILD_DEPENDS_arm=" " 271.18 BUILD_DEPENDS="gettext tidy-html5 libnotify-dev" 271.19 271.20 compile_rules() {
272.1 --- a/tcl/receipt Sat Feb 24 10:43:01 2018 +0200 272.2 +++ b/tcl/receipt Sat Feb 24 16:17:33 2018 +0200 272.3 @@ -15,43 +15,43 @@ 272.4 BUILD_DEPENDS="zlib-dev" 272.5 SPLIT="tcl-dev" 272.6 272.7 -# Rules to configure and make the package. 272.8 compile_rules() { 272.9 - export SRCDIR=$(pwd) && 272.10 + case "$ARCH" in 272.11 + x86_64) ARCH_ARGS='--enable-64bit';; 272.12 + *) ARCH_ARGS='';; 272.13 + esac 272.14 272.15 - cd unix && 272.16 + cd unix 272.17 272.18 ./configure \ 272.19 --prefix=/usr \ 272.20 --mandir=/usr/share/man \ 272.21 - $([ $(uname -m) = x86_64 ] && echo --enable-64bit) && 272.22 - make && 272.23 + $ARCH_ARGS && 272.24 + make || return 1 272.25 272.26 - sed -e "s|$SRCDIR/unix|/usr/lib|" \ 272.27 - -e "s|$SRCDIR|/usr/include|" \ 272.28 - -i tclConfig.sh && 272.29 + sed -e "s|$src/unix|/usr/lib|" \ 272.30 + -e "s|$src|/usr/include|" \ 272.31 + -i tclConfig.sh 272.32 272.33 - sed -e "s|$SRCDIR/unix/pkgs/tdbc1.0.5|/usr/lib/tdbc1.0.5|" \ 272.34 - -e "s|$SRCDIR/pkgs/tdbc1.0.5/generic|/usr/include|" \ 272.35 - -e "s|$SRCDIR/pkgs/tdbc1.0.5/library|/usr/lib/tcl8.6|" \ 272.36 - -e "s|$SRCDIR/pkgs/tdbc1.0.5|/usr/include|" \ 272.37 - -i pkgs/tdbc1.0.5/tdbcConfig.sh && 272.38 + sed -e "s|$src/unix/pkgs/tdbc1.0.5|/usr/lib/tdbc1.0.5|" \ 272.39 + -e "s|$src/pkgs/tdbc1.0.5/generic|/usr/include|" \ 272.40 + -e "s|$src/pkgs/tdbc1.0.5/library|/usr/lib/tcl8.6|" \ 272.41 + -e "s|$src/pkgs/tdbc1.0.5|/usr/include|" \ 272.42 + -i pkgs/tdbc1.0.5/tdbcConfig.sh 272.43 272.44 - sed -e "s|$SRCDIR/unix/pkgs/itcl4.1.0|/usr/lib/itcl4.1.0|" \ 272.45 - -e "s|$SRCDIR/pkgs/itcl4.1.0/generic|/usr/include|" \ 272.46 - -e "s|$SRCDIR/pkgs/itcl4.1.0|/usr/include|" \ 272.47 - -i pkgs/itcl4.1.0/itclConfig.sh && 272.48 - 272.49 - unset SRCDIR 272.50 + sed -e "s|$src/unix/pkgs/itcl4.1.0|/usr/lib/itcl4.1.0|" \ 272.51 + -e "s|$src/pkgs/itcl4.1.0/generic|/usr/include|" \ 272.52 + -e "s|$src/pkgs/itcl4.1.0|/usr/include|" \ 272.53 + -i pkgs/itcl4.1.0/itclConfig.sh 272.54 272.55 make install && 272.56 - make install-private-headers && 272.57 - ln -v -sf tclsh${VERSION:0:3} $install/usr/bin/tclsh && 272.58 - chmod -v 755 $install/usr/lib/libtcl${VERSION:0:3}.so && 272.59 - find $install -name '*.sh' -exec chmod -v 755 '{}' \; 272.60 + make install-private-headers || return 1 272.61 + 272.62 + ln -v -sf tclsh${VERSION:0:3} $install/usr/bin/tclsh 272.63 + chmod 755 $install/usr/lib/libtcl${VERSION:0:3}.so 272.64 + find $install -name '*.sh' -exec chmod 755 '{}' \; 272.65 } 272.66 272.67 -# Rules to gen a SliTaz package suitable for Tazpkg. 272.68 genpkg_rules() { 272.69 case $PACKAGE in 272.70 tcl)
273.1 --- a/tidy-html5/receipt Sat Feb 24 10:43:01 2018 +0200 273.2 +++ b/tidy-html5/receipt Sat Feb 24 16:17:33 2018 +0200 273.3 @@ -1,4 +1,4 @@ 273.4 -# SliTaz package receipt. 273.5 +# SliTaz package receipt v2. 273.6 273.7 PACKAGE="tidy-html5" 273.8 VERSION="5.1.25" 273.9 @@ -7,23 +7,18 @@ 273.10 MAINTAINER="al.bobylev@gmail.com" 273.11 LICENSE="MIT" 273.12 WEB_SITE="http://www.htacg.org/tidy-html5/" 273.13 + 273.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 273.15 WGET_URL="https://github.com/htacg/tidy-html5/archive/$VERSION.tar.gz" 273.16 273.17 -DEPENDS="" 273.18 BUILD_DEPENDS="cmake libxslt" 273.19 273.20 -# Rules to configure and make the package. 273.21 -compile_rules() 273.22 -{ 273.23 +compile_rules() { 273.24 cd build/cmake 273.25 cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release && 273.26 make && make install 273.27 } 273.28 273.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 273.30 -genpkg_rules() 273.31 -{ 273.32 - mkdir -p $fs/usr 273.33 - cp -a $install/usr/bin $fs/usr 273.34 +genpkg_rules() { 273.35 + copy @std 273.36 }
274.1 --- a/tiff/receipt Sat Feb 24 10:43:01 2018 +0200 274.2 +++ b/tiff/receipt Sat Feb 24 16:17:33 2018 +0200 274.3 @@ -7,7 +7,7 @@ 274.4 MAINTAINER="pankso@slitaz.org" 274.5 LICENSE="MIT" 274.6 WEB_SITE="http://www.libtiff.org/" 274.7 -HOST_ARCH="i486 arm" 274.8 +HOST_ARCH="i486 arm x86_64" 274.9 274.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 274.11 WGET_URL="http://download.osgeo.org/libtiff/$TARBALL"
275.1 --- a/tk/receipt Sat Feb 24 10:43:01 2018 +0200 275.2 +++ b/tk/receipt Sat Feb 24 16:17:33 2018 +0200 275.3 @@ -15,25 +15,29 @@ 275.4 BUILD_DEPENDS="tcl-dev xorg-libX11-dev" 275.5 SPLIT="tk-dev" 275.6 275.7 -# Rules to configure and make the package. 275.8 compile_rules() { 275.9 - cd unix && 275.10 + case $ARCH in 275.11 + x86_64) ARCH_ARGS='--enable-64bit';; 275.12 + *) ARCH_ARGS='';; 275.13 + esac 275.14 + 275.15 + cd unix 275.16 ./configure \ 275.17 --prefix=/usr \ 275.18 --mandir=/usr/share/man \ 275.19 - $([ $(uname -m) = x86_64 ] && echo --enable-64bit) && 275.20 + $ARCH_ARGS && 275.21 make && 275.22 sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \ 275.23 -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ 275.24 -i tkConfig.sh && 275.25 make install && 275.26 - make install-private-headers && 275.27 - ln -v -sf wish${VERSION:0:3} $install/usr/bin/wish && 275.28 - chmod -v 755 $install/usr/lib/libtk${VERSION:0:3}.so && 275.29 + make install-private-headers || return 1 275.30 + 275.31 + ln -v -sf wish${VERSION:0:3} $install/usr/bin/wish 275.32 + chmod -v 755 $install/usr/lib/libtk${VERSION:0:3}.so 275.33 find $install -name '*.sh' -exec chmod -v 755 '{}' \; 275.34 } 275.35 275.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 275.37 genpkg_rules() { 275.38 case $PACKAGE in 275.39 tk)
276.1 --- a/tslib-dev/receipt Sat Feb 24 10:43:01 2018 +0200 276.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 276.3 @@ -1,19 +0,0 @@ 276.4 -# SliTaz package receipt. 276.5 - 276.6 -PACKAGE="tslib-dev" 276.7 -VERSION="1.0" 276.8 -CATEGORY="development" 276.9 -SHORT_DESC="Abstraction layer for touchscreen panel events, development files." 276.10 -MAINTAINER="pascal.bellard@slitaz.org" 276.11 -LICENSE="LGPL2" 276.12 -WEB_SITE="https://sourceforge.net/projects/tslib.berlios/" 276.13 -HOST_ARCH="i486 arm" 276.14 - 276.15 -WANTED="tslib" 276.16 -DEPENDS="tslib" 276.17 - 276.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 276.19 -genpkg_rules() 276.20 -{ 276.21 - copy *.h *.la *.pc 276.22 -}
277.1 --- a/tslib/receipt Sat Feb 24 10:43:01 2018 +0200 277.2 +++ b/tslib/receipt Sat Feb 24 16:17:33 2018 +0200 277.3 @@ -1,37 +1,39 @@ 277.4 -# SliTaz package receipt. 277.5 +# SliTaz package receipt v2. 277.6 277.7 PACKAGE="tslib" 277.8 VERSION="1.0" 277.9 CATEGORY="x-window" 277.10 -SHORT_DESC="Abstraction layer for touchscreen panel events." 277.11 +SHORT_DESC="Abstraction layer for touchscreen panel events" 277.12 MAINTAINER="pascal.bellard@slitaz.org" 277.13 LICENSE="LGPL2" 277.14 WEB_SITE="https://sourceforge.net/projects/tslib.berlios/" 277.15 -HOST_ARCH="i486 arm" 277.16 -CONFIG_FILES="/etc/ts.conf" 277.17 277.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 277.19 WGET_URL="$SF_MIRROR/tslib.berlios/$TARBALL" 277.20 277.21 BUILD_DEPENDS="libtool automake autoconf" 277.22 +SPLIT="tslib-dev" 277.23 277.24 -# Handle cross compilation 277.25 -case "$ARCH" in 277.26 - arm*) export ac_cv_func_malloc_0_nonnull=yes ;; 277.27 -esac 277.28 +compile_rules() { 277.29 + case "$ARCH" in 277.30 + arm*) export ac_cv_func_malloc_0_nonnull=yes ;; 277.31 + esac 277.32 277.33 -# Rules to configure and make the package. 277.34 -compile_rules() 277.35 -{ 277.36 - ./autogen.sh 277.37 + ./autogen.sh && 277.38 ./configure \ 277.39 --sysconfdir=/etc \ 277.40 $CONFIGURE_ARGS && 277.41 make && make install 277.42 } 277.43 277.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 277.45 -genpkg_rules() 277.46 -{ 277.47 - copy etc/ bin/ *.so* 277.48 +genpkg_rules() { 277.49 + case $PACKAGE in 277.50 + tslib) 277.51 + copy @std 277.52 + CONFIG_FILES="/etc/ts.conf" 277.53 + ;; 277.54 + *-dev) 277.55 + copy @dev 277.56 + ;; 277.57 + esac 277.58 }
278.1 --- a/ttf-dejavu/receipt Sat Feb 24 10:43:01 2018 +0200 278.2 +++ b/ttf-dejavu/receipt Sat Feb 24 16:17:33 2018 +0200 278.3 @@ -7,7 +7,6 @@ 278.4 MAINTAINER="al.bobylev@gmail.com" 278.5 LICENSE="other" 278.6 WEB_SITE="https://dejavu-fonts.github.io/" 278.7 -HOST_ARCH="i486 arm" 278.8 278.9 TARBALL="dejavu-fonts-ttf-$VERSION.tar.bz2" 278.10 WGET_URL="$SF_MIRROR/dejavu/$TARBALL" 278.11 @@ -15,9 +14,7 @@ 278.12 BUILD_DEPENDS="shared-mime-info fontforge" 278.13 SPLIT="ttf-dejavu-extra" 278.14 278.15 -# Rules to configure and make the package. 278.16 -compile_rules() 278.17 -{ 278.18 +compile_rules() { 278.19 # Install/repack fonts 278.20 278.21 f=$install/usr/share/fonts/truetype/ttf-dejavu 278.22 @@ -67,9 +64,7 @@ 278.23 done 278.24 } 278.25 278.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 278.27 -genpkg_rules() 278.28 -{ 278.29 +genpkg_rules() { 278.30 case $PACKAGE in 278.31 ttf-dejavu) 278.32 copy DejaVuSans.ttf DejaVuSans-Bold.ttf DejaVuSansMono.ttf \ 278.33 @@ -77,8 +72,7 @@ 278.34 TAGS="font" 278.35 ;; 278.36 ttf-dejavu-extra) 278.37 - copy @std 278.38 - remove_already_packed 278.39 + copy @std @rm 278.40 CAT="fonts|extra font styles" 278.41 TAGS="font" 278.42 ;;
279.1 --- a/tzdata/receipt Sat Feb 24 10:43:01 2018 +0200 279.2 +++ b/tzdata/receipt Sat Feb 24 16:17:33 2018 +0200 279.3 @@ -1,22 +1,19 @@ 279.4 # SliTaz package receipt v2. 279.5 279.6 PACKAGE="tzdata" 279.7 -VERSION="2017c" 279.8 +VERSION="2018c" 279.9 CATEGORY="base-system" 279.10 SHORT_DESC="Time Zone Database" 279.11 MAINTAINER="al.bobylev@gmail.com" 279.12 LICENSE="PublicDomain" 279.13 WEB_SITE="https://www.iana.org/time-zones" 279.14 -HOST_ARCH="i486 arm" 279.15 279.16 TARBALL="$PACKAGE$VERSION.tar.gz" 279.17 WGET_URL="ftp://ftp.iana.org/tz/releases/$TARBALL" 279.18 279.19 BUILD_DEPENDS="glibc-dev" 279.20 279.21 -# Rules to configure and make the package. 279.22 -compile_rules() 279.23 -{ 279.24 +compile_rules() { 279.25 ZONEINFO=$install/usr/share/zoneinfo 279.26 mkdir -p $ZONEINFO/posix $ZONEINFO/right 279.27 279.28 @@ -32,9 +29,7 @@ 279.29 cook_pick_docs CONTRIBUTING LICENSE NEWS README theory.html 279.30 } 279.31 279.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 279.33 -genpkg_rules() 279.34 -{ 279.35 +genpkg_rules() { 279.36 copy @std 279.37 279.38 . $WOK/slitaz-i18n/stuff/locale-pack.conf
280.1 --- a/unbound/receipt Sat Feb 24 10:43:01 2018 +0200 280.2 +++ b/unbound/receipt Sat Feb 24 16:17:33 2018 +0200 280.3 @@ -54,3 +54,4 @@ 280.4 chroot "$1/" unbound-anchor -a /var/lib/unbound/root.key 280.5 : 280.6 } 280.7 +
281.1 --- a/unixODBC/receipt Sat Feb 24 10:43:01 2018 +0200 281.2 +++ b/unixODBC/receipt Sat Feb 24 16:17:33 2018 +0200 281.3 @@ -9,7 +9,6 @@ 281.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 281.5 WEB_SITE="http://www.unixodbc.org/" 281.6 WGET_URL="ftp://ftp.unixodbc.org/pub/unixODBC/$TARBALL" 281.7 -HOST_ARCH="i486 arm" 281.8 281.9 BUILD_DEPENDS="readline-dev" 281.10 SPLIT="unixODBC libunixODBC unixODBC-dev"
282.1 --- a/vala/receipt Sat Feb 24 10:43:01 2018 +0200 282.2 +++ b/vala/receipt Sat Feb 24 16:17:33 2018 +0200 282.3 @@ -8,7 +8,6 @@ 282.4 LICENSE="LGPL2.1" 282.5 WEB_SITE="https://wiki.gnome.org/Projects/Vala" 282.6 LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/vala.html" 282.7 -HOST_ARCH="i486 arm" 282.8 282.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 282.10 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
283.1 --- a/valgrind-dev/receipt Sat Feb 24 10:43:01 2018 +0200 283.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 283.3 @@ -1,21 +0,0 @@ 283.4 -# SliTaz package receipt. 283.5 - 283.6 -PACKAGE="valgrind-dev" 283.7 -VERSION="3.12.0" 283.8 -CATEGORY="development" 283.9 -SHORT_DESC="Valgrind devel files." 283.10 -MAINTAINER="paul@slitaz.org" 283.11 -LICENSE="GPL2" 283.12 -WEB_SITE="http://valgrind.org/" 283.13 -WANTED="valgrind" 283.14 - 283.15 -DEPENDS="valgrind pkg-config" 283.16 - 283.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 283.18 -genpkg_rules() 283.19 -{ 283.20 - mkdir -p $fs/usr/lib/valgrind 283.21 - cp -a $install/usr/include $fs/usr 283.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 283.23 - cp -a $install/usr/lib/valgrind/*.*a $fs/usr/lib/valgrind 283.24 -}
284.1 --- a/valgrind/receipt Sat Feb 24 10:43:01 2018 +0200 284.2 +++ b/valgrind/receipt Sat Feb 24 16:17:33 2018 +0200 284.3 @@ -1,38 +1,32 @@ 284.4 -# SliTaz package receipt. 284.5 +# SliTaz package receipt v2. 284.6 284.7 PACKAGE="valgrind" 284.8 VERSION="3.12.0" 284.9 CATEGORY="development" 284.10 -SHORT_DESC="Memory debugger and profiler." 284.11 +SHORT_DESC="Memory debugger and profiler" 284.12 MAINTAINER="paul@slitaz.org" 284.13 LICENSE="GPL2" 284.14 -SUGGESTED="perl" 284.15 +WEB_SITE="http://valgrind.org/" 284.16 + 284.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 284.18 -WEB_SITE="http://valgrind.org/" 284.19 WGET_URL="http://valgrind.org/downloads/$TARBALL" 284.20 -TAGS="profiler" 284.21 284.22 -DEPENDS="" 284.23 BUILD_DEPENDS="sed autoconf" 284.24 +SPLIT="valgrind-dev" 284.25 284.26 -# Rules to configure and make the package. 284.27 -compile_rules() 284.28 -{ 284.29 - autoconf 284.30 - ./configure \ 284.31 - --prefix=/usr \ 284.32 - --infodir=/usr/share/info \ 284.33 - --mandir=/usr/share/man \ 284.34 - $CONFIGURE_ARGS && 284.35 - make && make DESTDIR=$DESTDIR install 284.36 +compile_rules() { 284.37 + autoconf && 284.38 + 284.39 + ./configure $CONFIGURE_ARGS && make && make install 284.40 } 284.41 284.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 284.43 -genpkg_rules() 284.44 -{ 284.45 - mkdir -p $fs/usr/lib/valgrind 284.46 - cp -a $install/usr/bin $fs/usr 284.47 - cp -a $install/usr/lib/valgrind/* $fs/usr/lib/valgrind 284.48 - # remove static libraries 284.49 - rm $fs/usr/lib/valgrind/*.*a 284.50 +genpkg_rules() { 284.51 + case $PACKAGE in 284.52 + valgrind) 284.53 + copy @std 284.54 + SUGGESTED="perl" 284.55 + TAGS="profiler" 284.56 + ;; 284.57 + *-dev) copy @dev;; 284.58 + esac 284.59 }
285.1 --- a/wayland-protocols/receipt Sat Feb 24 10:43:01 2018 +0200 285.2 +++ b/wayland-protocols/receipt Sat Feb 24 16:17:33 2018 +0200 285.3 @@ -25,3 +25,4 @@ 285.4 *-dev) copy @dev;; 285.5 esac 285.6 } 285.7 +
286.1 --- a/wayland/receipt Sat Feb 24 10:43:01 2018 +0200 286.2 +++ b/wayland/receipt Sat Feb 24 16:17:33 2018 +0200 286.3 @@ -35,3 +35,4 @@ 286.4 ;; 286.5 esac 286.6 } 286.7 +
287.1 --- a/wpa_supplicant/receipt Sat Feb 24 10:43:01 2018 +0200 287.2 +++ b/wpa_supplicant/receipt Sat Feb 24 16:17:33 2018 +0200 287.3 @@ -7,7 +7,7 @@ 287.4 MAINTAINER="0dddba11@googlemail.com" 287.5 LICENSE="GPL2" 287.6 WEB_SITE="http://w1.fi/wpa_supplicant/" 287.7 -HOST_ARCH="i486 arm" 287.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/wpa_supplicant.html" 287.9 287.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 287.11 WGET_URL="http://w1.fi/releases/$TARBALL" 287.12 @@ -15,10 +15,7 @@ 287.13 BUILD_DEPENDS_arm="openssl-dev libcrypto-dev libnl-dev" 287.14 BUILD_DEPENDS="libnl-dev dbus-dev openssl-dev readline-dev" 287.15 287.16 -# Rules to configure and make the package. 287.17 compile_rules() { 287.18 - # http://www.linuxfromscratch.org/blfs/view/stable/basicnet/wpa_supplicant.html 287.19 - 287.20 cd $src/wpa_supplicant 287.21 cp -a defconfig .config 287.22 287.23 @@ -36,7 +33,14 @@ 287.24 EOT 287.25 # Don't use DBUS on ARM arch 287.26 case "$ARCH" in 287.27 - i?86) 287.28 + arm) 287.29 + cat >> .config <<EOT 287.30 +CFLAGS += -I${sysroot}/usr/include/libnl3 287.31 +CFLAGS += -I${sysroot}/usr/include/openssl 287.32 +LIBS += -L${sysroot}/usr/lib 287.33 +EOT 287.34 + ;; 287.35 + i?86|x86_64) 287.36 cat >> .config <<EOT 287.37 CFLAGS += -I/usr/include/libnl3 287.38 CONFIG_CTRL_IFACE_DBUS=y 287.39 @@ -44,13 +48,6 @@ 287.40 CONFIG_CTRL_IFACE_DBUS_INTRO=y 287.41 EOT 287.42 ;; 287.43 - arm) 287.44 - cat >> .config <<EOT 287.45 -CFLAGS += -I${sysroot}/usr/include/libnl3 287.46 -CFLAGS += -I${sysroot}/usr/include/openssl 287.47 -LIBS += -L${sysroot}/usr/lib 287.48 -EOT 287.49 - ;; 287.50 esac 287.51 make BINDIR=/sbin LIBDIR=/lib || exit 1 287.52 287.53 @@ -80,7 +77,6 @@ 287.54 chown -R root:root $install/etc 287.55 } 287.56 287.57 -# Rules to gen a SliTaz package suitable for Tazpkg. 287.58 genpkg_rules() { 287.59 copy @std 287.60 DEPENDS="dbus libcrypto libnl libssl ncurses readline" 287.61 @@ -91,7 +87,6 @@ 287.62 esac 287.63 } 287.64 287.65 -# Pre and post install commands for Tazpkg. 287.66 post_install() { 287.67 grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> "$1/etc/daemons.conf" <<"EOT" 287.68
288.1 --- a/xmlstarlet/receipt Sat Feb 24 10:43:01 2018 +0200 288.2 +++ b/xmlstarlet/receipt Sat Feb 24 16:17:33 2018 +0200 288.3 @@ -1,4 +1,4 @@ 288.4 -# SliTaz package receipt. 288.5 +# SliTaz package receipt v2. 288.6 288.7 PACKAGE="xmlstarlet" 288.8 VERSION="1.6.1" 288.9 @@ -7,22 +7,22 @@ 288.10 MAINTAINER="al.bobylev@gmail.com" 288.11 LICENSE="MIT" 288.12 WEB_SITE="http://xmlstar.sourceforge.net/" 288.13 + 288.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 288.15 WGET_URL="$SF_MIRROR/xmlstar/$TARBALL" 288.16 288.17 -DEPENDS="libxml2 libxslt zlib" 288.18 BUILD_DEPENDS="libxslt-dev" 288.19 288.20 -# Rules to configure and make the package. 288.21 -compile_rules() 288.22 -{ 288.23 - ./configure $CONFIGURE_ARGS && make && make install 288.24 +compile_rules() { 288.25 + ./configure \ 288.26 + --with-libxml-include-prefix=/usr/include/libxml2/ \ 288.27 + $CONFIGURE_ARGS && 288.28 + make && make install || return 1 288.29 288.30 mv $install/usr/bin/xml $install/usr/bin/xmlstarlet 288.31 } 288.32 288.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 288.34 -genpkg_rules() 288.35 -{ 288.36 +genpkg_rules() { 288.37 copy xmlstarlet 288.38 + DEPENDS="libxml2 libxslt zlib" 288.39 }
289.1 --- a/xmlto/receipt Sat Feb 24 10:43:01 2018 +0200 289.2 +++ b/xmlto/receipt Sat Feb 24 16:17:33 2018 +0200 289.3 @@ -1,4 +1,4 @@ 289.4 -# SliTaz package receipt. 289.5 +# SliTaz package receipt v2. 289.6 289.7 PACKAGE="xmlto" 289.8 VERSION="0.0.28" 289.9 @@ -7,16 +7,14 @@ 289.10 SHORT_DESC="Tool for converting XML files to various formats" 289.11 MAINTAINER="yuripourre@gmail.com" 289.12 WEB_SITE="http://cyberelk.net/tim/software/xmlto/" 289.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/pst/xmlto.html" 289.14 289.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 289.16 -WGET_URL="https://fedorahosted.org/releases/x/m/$PACKAGE/$TARBALL" 289.17 +WGET_URL="https://releases.pagure.org/xmlto/$TARBALL" 289.18 289.19 -DEPENDS="libxslt perl-yaml-syck perl-test-pod bash" 289.20 BUILD_DEPENDS="docbook-xsl util-linux-getopt flex" 289.21 289.22 -# Rules to configure and make the package. 289.23 -compile_rules() 289.24 -{ 289.25 +compile_rules() { 289.26 ./configure $CONFIGURE_ARGS && 289.27 make && 289.28 make DESTDIR=$DESTDIR install 289.29 @@ -27,9 +25,7 @@ 289.30 done 289.31 } 289.32 289.33 -genpkg_rules() 289.34 -{ 289.35 - mkdir -p $fs/usr/share/xmlto 289.36 - cp -a $install/usr/bin $fs/usr 289.37 - cp -a $install/usr/share/xmlto/format $fs/usr/share/xmlto 289.38 +genpkg_rules() { 289.39 + copy @std 289.40 + DEPENDS="libxslt perl-yaml-syck perl-test-pod bash" 289.41 }
290.1 --- a/xorg-bigreqsproto/receipt Sat Feb 24 10:43:01 2018 +0200 290.2 +++ b/xorg-bigreqsproto/receipt Sat Feb 24 16:17:33 2018 +0200 290.3 @@ -7,17 +7,14 @@ 290.4 MAINTAINER="pankso@slitaz.org" 290.5 LICENSE="MIT" 290.6 WEB_SITE="https://www.x.org/wiki/" 290.7 -HOST_ARCH="i486 arm" 290.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 290.9 290.10 TARBALL="bigreqsproto-$VERSION.tar.bz2" 290.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 290.12 290.13 BUILD_DEPENDS="xorg-util-macros" 290.14 -PKG_RULE="dev" 290.15 290.16 -# Rules to configure and make the package. 290.17 -compile_rules() 290.18 -{ 290.19 +compile_rules() { 290.20 ./configure \ 290.21 --sysconfdir=/etc \ 290.22 --localstatedir=/var \ 290.23 @@ -26,9 +23,7 @@ 290.24 make install 290.25 } 290.26 290.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 290.28 -genpkg_rules() 290.29 -{ 290.30 +genpkg_rules() { 290.31 copy @dev 290.32 DEPENDS="xorg-util-macros" 290.33 }
291.1 --- a/xorg-compositeproto/receipt Sat Feb 24 10:43:01 2018 +0200 291.2 +++ b/xorg-compositeproto/receipt Sat Feb 24 16:17:33 2018 +0200 291.3 @@ -7,28 +7,23 @@ 291.4 MAINTAINER="pankso@slitaz.org" 291.5 LICENSE="MIT" 291.6 WEB_SITE="https://www.x.org/wiki/" 291.7 -HOST_ARCH="i486 arm" 291.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 291.9 291.10 TARBALL="compositeproto-$VERSION.tar.bz2" 291.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 291.12 291.13 BUILD_DEPENDS="xorg-util-macros" 291.14 -PKG_RULE="dev" 291.15 291.16 -# Rules to configure and make the package. 291.17 -compile_rules() 291.18 -{ 291.19 +compile_rules() { 291.20 ./configure \ 291.21 --sysconfdir=/etc \ 291.22 --localstatedir=/var \ 291.23 - $CONFIGURE_ARGS && 291.24 + $CONFIGURE_ARGS && 291.25 make && 291.26 make install 291.27 } 291.28 291.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 291.30 -genpkg_rules() 291.31 -{ 291.32 +genpkg_rules() { 291.33 copy @dev 291.34 DEPENDS="xorg-fixesproto" 291.35 }
292.1 --- a/xorg-damageproto/receipt Sat Feb 24 10:43:01 2018 +0200 292.2 +++ b/xorg-damageproto/receipt Sat Feb 24 16:17:33 2018 +0200 292.3 @@ -7,28 +7,23 @@ 292.4 MAINTAINER="pankso@slitaz.org" 292.5 LICENSE="MIT" 292.6 WEB_SITE="https://www.x.org/wiki/" 292.7 -HOST_ARCH="i486 arm" 292.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 292.9 292.10 TARBALL="damageproto-$VERSION.tar.bz2" 292.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 292.12 292.13 BUILD_DEPENDS="xorg-util-macros" 292.14 -PKG_RULE="dev" 292.15 292.16 -# Rules to configure and make the package. 292.17 -compile_rules() 292.18 -{ 292.19 +compile_rules() { 292.20 ./configure \ 292.21 --sysconfdir=/etc \ 292.22 --localstatedir=/var \ 292.23 - $CONFIGURE_ARGS && 292.24 + $CONFIGURE_ARGS && 292.25 make && 292.26 make install 292.27 } 292.28 292.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 292.30 -genpkg_rules() 292.31 -{ 292.32 +genpkg_rules() { 292.33 copy @dev 292.34 DEPENDS="xorg-fixesproto" 292.35 }
293.1 --- a/xorg-dmxproto/receipt Sat Feb 24 10:43:01 2018 +0200 293.2 +++ b/xorg-dmxproto/receipt Sat Feb 24 16:17:33 2018 +0200 293.3 @@ -7,27 +7,23 @@ 293.4 MAINTAINER="pankso@slitaz.org" 293.5 LICENSE="MIT" 293.6 WEB_SITE="https://www.x.org/wiki/" 293.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 293.8 293.9 TARBALL="dmxproto-$VERSION.tar.bz2" 293.10 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 293.11 293.12 BUILD_DEPENDS="xorg-util-macros" 293.13 -PKG_RULE="dev" 293.14 293.15 -# Rules to configure and make the package. 293.16 -compile_rules() 293.17 -{ 293.18 +compile_rules() { 293.19 ./configure \ 293.20 --sysconfdir=/etc \ 293.21 --localstatedir=/var \ 293.22 - $CONFIGURE_ARGS && 293.23 + $CONFIGURE_ARGS && 293.24 make && 293.25 make install 293.26 } 293.27 293.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 293.29 -genpkg_rules() 293.30 -{ 293.31 +genpkg_rules() { 293.32 copy @dev 293.33 DEPENDS="xorg-util-macros" 293.34 }
294.1 --- a/xorg-dri2proto/receipt Sat Feb 24 10:43:01 2018 +0200 294.2 +++ b/xorg-dri2proto/receipt Sat Feb 24 16:17:33 2018 +0200 294.3 @@ -7,27 +7,23 @@ 294.4 MAINTAINER="pankso@slitaz.org" 294.5 LICENSE="MIT" 294.6 WEB_SITE="https://www.x.org/wiki/" 294.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 294.8 294.9 TARBALL="dri2proto-$VERSION.tar.bz2" 294.10 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 294.11 294.12 BUILD_DEPENDS="xorg-util-macros" 294.13 -PKG_RULE="dev" 294.14 294.15 -# Rules to configure and make the package. 294.16 -compile_rules() 294.17 -{ 294.18 +compile_rules() { 294.19 ./configure \ 294.20 --sysconfdir=/etc \ 294.21 --localstatedir=/var \ 294.22 - $CONFIGURE_ARGS && 294.23 + $CONFIGURE_ARGS && 294.24 make && 294.25 make install 294.26 } 294.27 294.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 294.29 -genpkg_rules() 294.30 -{ 294.31 +genpkg_rules() { 294.32 copy @dev 294.33 DEPENDS="xorg-util-macros" 294.34 }
295.1 --- a/xorg-dri3proto/receipt Sat Feb 24 10:43:01 2018 +0200 295.2 +++ b/xorg-dri3proto/receipt Sat Feb 24 16:17:33 2018 +0200 295.3 @@ -7,27 +7,23 @@ 295.4 MAINTAINER="pascal.bellard@slitaz.org" 295.5 LICENSE="MIT" 295.6 WEB_SITE="https://www.x.org/wiki/" 295.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 295.8 295.9 TARBALL="dri3proto-$VERSION.tar.bz2" 295.10 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 295.11 295.12 BUILD_DEPENDS="xorg-util-macros" 295.13 -PKG_RULE="dev" 295.14 295.15 -# Rules to configure and make the package. 295.16 -compile_rules() 295.17 -{ 295.18 +compile_rules() { 295.19 ./configure \ 295.20 --sysconfdir=/etc \ 295.21 --localstatedir=/var \ 295.22 - $CONFIGURE_ARGS && 295.23 + $CONFIGURE_ARGS && 295.24 make && 295.25 make install 295.26 } 295.27 295.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 295.29 -genpkg_rules() 295.30 -{ 295.31 +genpkg_rules() { 295.32 copy @dev 295.33 DEPENDS="xorg-util-macros" 295.34 }
296.1 --- a/xorg-encodings/receipt Sat Feb 24 10:43:01 2018 +0200 296.2 +++ b/xorg-encodings/receipt Sat Feb 24 16:17:33 2018 +0200 296.3 @@ -7,16 +7,14 @@ 296.4 MAINTAINER="al.bobylev@gmail.com" 296.5 LICENSE="PublicDomain" 296.6 WEB_SITE="https://www.x.org/wiki/" 296.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 296.8 296.9 TARBALL="encodings-$VERSION.tar.bz2" 296.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 296.11 296.12 BUILD_DEPENDS="xorg-util-macros xorg-mkfontscale xorg-font-util-dev" 296.13 -PKG_RULE="std" 296.14 296.15 -# Rules to configure and make the package. 296.16 -compile_rules() 296.17 -{ 296.18 +compile_rules() { 296.19 ./configure \ 296.20 --sysconfdir=/etc \ 296.21 --localstatedir=/var \ 296.22 @@ -25,8 +23,6 @@ 296.23 make install 296.24 } 296.25 296.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 296.27 -genpkg_rules() 296.28 -{ 296.29 +genpkg_rules() { 296.30 copy @std 296.31 }
297.1 --- a/xorg-fixesproto/receipt Sat Feb 24 10:43:01 2018 +0200 297.2 +++ b/xorg-fixesproto/receipt Sat Feb 24 16:17:33 2018 +0200 297.3 @@ -7,17 +7,14 @@ 297.4 MAINTAINER="pankso@slitaz.org" 297.5 LICENSE="MIT" 297.6 WEB_SITE="https://www.x.org/wiki/" 297.7 -HOST_ARCH="i486 arm" 297.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 297.9 297.10 TARBALL="fixesproto-$VERSION.tar.bz2" 297.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 297.12 297.13 BUILD_DEPENDS="xorg-util-macros" 297.14 -PKG_RULE="dev" 297.15 297.16 -# Rules to configure and make the package. 297.17 -compile_rules() 297.18 -{ 297.19 +compile_rules() { 297.20 ./configure \ 297.21 --sysconfdir=/etc \ 297.22 --localstatedir=/var \ 297.23 @@ -26,9 +23,7 @@ 297.24 make install 297.25 } 297.26 297.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 297.28 -genpkg_rules() 297.29 -{ 297.30 +genpkg_rules() { 297.31 copy @dev 297.32 DEPENDS="xorg-xextproto xorg-xproto" 297.33 }
298.1 --- a/xorg-font-adobe-utopia-type1/receipt Sat Feb 24 10:43:01 2018 +0200 298.2 +++ b/xorg-font-adobe-utopia-type1/receipt Sat Feb 24 16:17:33 2018 +0200 298.3 @@ -7,16 +7,14 @@ 298.4 MAINTAINER="al.bobylev@gmail.com" 298.5 LICENSE="other" 298.6 WEB_SITE="https://www.x.org/wiki/" 298.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 298.8 298.9 TARBALL="font-adobe-utopia-type1-$VERSION.tar.bz2" 298.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 298.11 298.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir" 298.13 -PKG_RULE="std" 298.14 298.15 -# Rules to configure and make the package. 298.16 -compile_rules() 298.17 -{ 298.18 +compile_rules() { 298.19 ./configure \ 298.20 --sysconfdir=/etc \ 298.21 --localstatedir=/var \ 298.22 @@ -25,9 +23,7 @@ 298.23 make install 298.24 } 298.25 298.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 298.27 -genpkg_rules() 298.28 -{ 298.29 +genpkg_rules() { 298.30 copy @std 298.31 TAGS="font" 298.32 }
299.1 --- a/xorg-font-alias/receipt Sat Feb 24 10:43:01 2018 +0200 299.2 +++ b/xorg-font-alias/receipt Sat Feb 24 16:17:33 2018 +0200 299.3 @@ -7,16 +7,14 @@ 299.4 MAINTAINER="al.bobylev@gmail.com" 299.5 LICENSE="other" 299.6 WEB_SITE="https://www.x.org/wiki/" 299.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 299.8 299.9 TARBALL="font-alias-$VERSION.tar.bz2" 299.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 299.11 299.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev" 299.13 -PKG_RULE="std" 299.14 299.15 -# Rules to configure and make the package. 299.16 -compile_rules() 299.17 -{ 299.18 +compile_rules() { 299.19 ./configure \ 299.20 --sysconfdir=/etc \ 299.21 --localstatedir=/var \ 299.22 @@ -25,8 +23,6 @@ 299.23 make install 299.24 } 299.25 299.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 299.27 -genpkg_rules() 299.28 -{ 299.29 +genpkg_rules() { 299.30 copy @std 299.31 }
300.1 --- a/xorg-font-bh-ttf/receipt Sat Feb 24 10:43:01 2018 +0200 300.2 +++ b/xorg-font-bh-ttf/receipt Sat Feb 24 16:17:33 2018 +0200 300.3 @@ -7,17 +7,15 @@ 300.4 MAINTAINER="al.bobylev@gmail.com" 300.5 LICENSE="MIT" 300.6 WEB_SITE="https://www.x.org/wiki/" 300.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 300.8 300.9 TARBALL="font-bh-ttf-$VERSION.tar.bz2" 300.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 300.11 300.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir \ 300.13 fontconfig-dev" 300.14 -PKG_RULE="std" 300.15 300.16 -# Rules to configure and make the package. 300.17 -compile_rules() 300.18 -{ 300.19 +compile_rules() { 300.20 ./configure \ 300.21 --sysconfdir=/etc \ 300.22 --localstatedir=/var \ 300.23 @@ -26,9 +24,7 @@ 300.24 make install 300.25 } 300.26 300.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 300.28 -genpkg_rules() 300.29 -{ 300.30 +genpkg_rules() { 300.31 copy @std 300.32 TAGS="font" 300.33 }
301.1 --- a/xorg-font-bh-type1/receipt Sat Feb 24 10:43:01 2018 +0200 301.2 +++ b/xorg-font-bh-type1/receipt Sat Feb 24 16:17:33 2018 +0200 301.3 @@ -7,16 +7,14 @@ 301.4 MAINTAINER="al.bobylev@gmail.com" 301.5 LICENSE="MIT" 301.6 WEB_SITE="https://www.x.org/wiki/" 301.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 301.8 301.9 TARBALL="font-bh-type1-$VERSION.tar.bz2" 301.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 301.11 301.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir" 301.13 -PKG_RULE="std" 301.14 301.15 -# Rules to configure and make the package. 301.16 -compile_rules() 301.17 -{ 301.18 +compile_rules() { 301.19 ./configure \ 301.20 --sysconfdir=/etc \ 301.21 --localstatedir=/var \ 301.22 @@ -25,9 +23,7 @@ 301.23 make install 301.24 } 301.25 301.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 301.27 -genpkg_rules() 301.28 -{ 301.29 +genpkg_rules() { 301.30 copy @std 301.31 TAGS="font" 301.32 }
302.1 --- a/xorg-font-ibm-type1/receipt Sat Feb 24 10:43:01 2018 +0200 302.2 +++ b/xorg-font-ibm-type1/receipt Sat Feb 24 16:17:33 2018 +0200 302.3 @@ -7,16 +7,14 @@ 302.4 MAINTAINER="al.bobylev@gmail.com" 302.5 LICENSE="MIT" 302.6 WEB_SITE="https://www.x.org/wiki/" 302.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 302.8 302.9 TARBALL="font-ibm-type1-$VERSION.tar.bz2" 302.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 302.11 302.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir" 302.13 -PKG_RULE="std" 302.14 302.15 -# Rules to configure and make the package. 302.16 -compile_rules() 302.17 -{ 302.18 +compile_rules() { 302.19 ./configure \ 302.20 --sysconfdir=/etc \ 302.21 --localstatedir=/var \ 302.22 @@ -25,9 +23,7 @@ 302.23 make install 302.24 } 302.25 302.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 302.27 -genpkg_rules() 302.28 -{ 302.29 +genpkg_rules() { 302.30 copy @std 302.31 TAGS="font" 302.32 }
303.1 --- a/xorg-font-misc-ethiopic/receipt Sat Feb 24 10:43:01 2018 +0200 303.2 +++ b/xorg-font-misc-ethiopic/receipt Sat Feb 24 16:17:33 2018 +0200 303.3 @@ -7,16 +7,14 @@ 303.4 MAINTAINER="al.bobylev@gmail.com" 303.5 LICENSE="MIT" 303.6 WEB_SITE="https://www.x.org/wiki/" 303.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 303.8 303.9 TARBALL="font-misc-ethiopic-$VERSION.tar.bz2" 303.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 303.11 303.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir" 303.13 -PKG_RULE="std" 303.14 303.15 -# Rules to configure and make the package. 303.16 -compile_rules() 303.17 -{ 303.18 +compile_rules() { 303.19 ./configure \ 303.20 --sysconfdir=/etc \ 303.21 --localstatedir=/var \ 303.22 @@ -25,9 +23,7 @@ 303.23 make install 303.24 } 303.25 303.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 303.27 -genpkg_rules() 303.28 -{ 303.29 +genpkg_rules() { 303.30 copy @std 303.31 TAGS="font" 303.32 }
304.1 --- a/xorg-font-util/receipt Sat Feb 24 10:43:01 2018 +0200 304.2 +++ b/xorg-font-util/receipt Sat Feb 24 16:17:33 2018 +0200 304.3 @@ -7,18 +7,15 @@ 304.4 MAINTAINER="al.bobylev@gmail.com" 304.5 LICENSE="MIT" 304.6 WEB_SITE="https://www.x.org/wiki/" 304.7 -HOST_ARCH="i486 arm" 304.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 304.9 304.10 TARBALL="font-util-$VERSION.tar.bz2" 304.11 WGET_URL="$XORG_MIRROR/font/$TARBALL" 304.12 304.13 BUILD_DEPENDS="xorg-util-macros" 304.14 SPLIT="xorg-font-util-dev" 304.15 -PKG_RULE="std-dev" 304.16 304.17 -# Rules to configure and make the package. 304.18 -compile_rules() 304.19 -{ 304.20 +compile_rules() { 304.21 ./configure \ 304.22 --sysconfdir=/etc \ 304.23 --localstatedir=/var \ 304.24 @@ -27,9 +24,7 @@ 304.25 make install 304.26 } 304.27 304.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 304.29 -genpkg_rules() 304.30 -{ 304.31 +genpkg_rules() { 304.32 case $PACKAGE in 304.33 *-font-util) copy @std;; 304.34 *-dev) copy @dev;;
305.1 --- a/xorg-font-xfree86-type1/receipt Sat Feb 24 10:43:01 2018 +0200 305.2 +++ b/xorg-font-xfree86-type1/receipt Sat Feb 24 16:17:33 2018 +0200 305.3 @@ -7,16 +7,14 @@ 305.4 MAINTAINER="al.bobylev@gmail.com" 305.5 LICENSE="MIT" 305.6 WEB_SITE="https://www.x.org/wiki/" 305.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html" 305.8 305.9 TARBALL="font-xfree86-type1-$VERSION.tar.bz2" 305.10 WGET_URL="$XORG_MIRROR/font/$TARBALL" 305.11 305.12 BUILD_DEPENDS="xorg-util-macros xorg-font-util-dev xorg-mkfontdir" 305.13 -PKG_RULE="std" 305.14 305.15 -# Rules to configure and make the package. 305.16 -compile_rules() 305.17 -{ 305.18 +compile_rules() { 305.19 ./configure \ 305.20 --sysconfdir=/etc \ 305.21 --localstatedir=/var \ 305.22 @@ -25,9 +23,7 @@ 305.23 make install 305.24 } 305.25 305.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 305.27 -genpkg_rules() 305.28 -{ 305.29 +genpkg_rules() { 305.30 copy @std 305.31 TAGS="font" 305.32 }
306.1 --- a/xorg-fontcacheproto/receipt Sat Feb 24 10:43:01 2018 +0200 306.2 +++ b/xorg-fontcacheproto/receipt Sat Feb 24 16:17:33 2018 +0200 306.3 @@ -12,22 +12,18 @@ 306.4 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 306.5 306.6 BUILD_DEPENDS="xorg-util-macros" 306.7 -PKG_RULE="dev" 306.8 306.9 -# Rules to configure and make the package. 306.10 -compile_rules() 306.11 -{ 306.12 +compile_rules() { 306.13 + fix ld 306.14 ./configure \ 306.15 --sysconfdir=/etc \ 306.16 --localstatedir=/var \ 306.17 $CONFIGURE_ARGS && 306.18 + fix libtool && 306.19 make && 306.20 make install 306.21 } 306.22 306.23 -# Rules to gen a SliTaz package suitable for Tazpkg. 306.24 -genpkg_rules() 306.25 -{ 306.26 +genpkg_rules() { 306.27 copy @dev 306.28 - DEPENDS="xorg-util-macros xorg-libX11-dev" 306.29 }
307.1 --- a/xorg-fontsproto/receipt Sat Feb 24 10:43:01 2018 +0200 307.2 +++ b/xorg-fontsproto/receipt Sat Feb 24 16:17:33 2018 +0200 307.3 @@ -7,17 +7,14 @@ 307.4 MAINTAINER="pankso@slitaz.org" 307.5 LICENSE="MIT" 307.6 WEB_SITE="https://www.x.org/wiki/" 307.7 -HOST_ARCH="i486 arm" 307.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 307.9 307.10 TARBALL="fontsproto-$VERSION.tar.bz2" 307.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 307.12 307.13 BUILD_DEPENDS="xorg-util-macros" 307.14 -PKG_RULE="dev" 307.15 307.16 -# Rules to configure and make the package. 307.17 -compile_rules() 307.18 -{ 307.19 +compile_rules() { 307.20 ./configure \ 307.21 --sysconfdir=/etc \ 307.22 --localstatedir=/var \ 307.23 @@ -26,9 +23,7 @@ 307.24 make install 307.25 } 307.26 307.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 307.28 -genpkg_rules() 307.29 -{ 307.30 +genpkg_rules() { 307.31 copy @dev 307.32 DEPENDS="xorg-xproto" 307.33 }
308.1 --- a/xorg-glproto/receipt Sat Feb 24 10:43:01 2018 +0200 308.2 +++ b/xorg-glproto/receipt Sat Feb 24 16:17:33 2018 +0200 308.3 @@ -7,17 +7,14 @@ 308.4 MAINTAINER="pankso@slitaz.org" 308.5 LICENSE="MIT" 308.6 WEB_SITE="https://www.x.org/wiki/" 308.7 -HOST_ARCH="i486 arm" 308.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 308.9 308.10 TARBALL="glproto-$VERSION.tar.bz2" 308.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 308.12 308.13 BUILD_DEPENDS="xorg-util-macros" 308.14 -PKG_RULE="dev" 308.15 308.16 -# Rules to configure and make the package. 308.17 -compile_rules() 308.18 -{ 308.19 +compile_rules() { 308.20 ./configure \ 308.21 --sysconfdir=/etc \ 308.22 --localstatedir=/var \ 308.23 @@ -26,9 +23,7 @@ 308.24 make install 308.25 } 308.26 308.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 308.28 -genpkg_rules() 308.29 -{ 308.30 +genpkg_rules() { 308.31 copy @dev 308.32 DEPENDS="xorg-xproto" 308.33 }
309.1 --- a/xorg-iceauth/receipt Sat Feb 24 10:43:01 2018 +0200 309.2 +++ b/xorg-iceauth/receipt Sat Feb 24 16:17:33 2018 +0200 309.3 @@ -7,27 +7,25 @@ 309.4 MAINTAINER="erjo@slitaz.org" 309.5 LICENSE="MIT" 309.6 WEB_SITE="https://www.x.org/wiki/" 309.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 309.8 309.9 TARBALL="iceauth-$VERSION.tar.bz2" 309.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 309.11 309.12 BUILD_DEPENDS="xorg-libICE-dev" 309.13 -PKG_RULE="std" 309.14 309.15 -# Rules to configure and make the package. 309.16 -compile_rules() 309.17 -{ 309.18 +compile_rules() { 309.19 + fix ld 309.20 ./configure \ 309.21 --sysconfdir=/etc \ 309.22 --localstatedir=/var \ 309.23 $CONFIGURE_ARGS && 309.24 + fix libtool && 309.25 make && 309.26 make install 309.27 } 309.28 309.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 309.30 -genpkg_rules() 309.31 -{ 309.32 +genpkg_rules() { 309.33 copy @std 309.34 DEPENDS="xorg-libICE" 309.35 }
310.1 --- a/xorg-inputproto/receipt Sat Feb 24 10:43:01 2018 +0200 310.2 +++ b/xorg-inputproto/receipt Sat Feb 24 16:17:33 2018 +0200 310.3 @@ -7,17 +7,14 @@ 310.4 MAINTAINER="pankso@slitaz.org" 310.5 LICENSE="MIT" 310.6 WEB_SITE="https://www.x.org/wiki/" 310.7 -HOST_ARCH="i486 arm" 310.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 310.9 310.10 TARBALL="inputproto-$VERSION.tar.bz2" 310.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 310.12 310.13 BUILD_DEPENDS="xorg-util-macros" 310.14 -PKG_RULE="dev" 310.15 310.16 -# Rules to configure and make the package. 310.17 -compile_rules() 310.18 -{ 310.19 +compile_rules() { 310.20 ./configure \ 310.21 --sysconfdir=/etc \ 310.22 --localstatedir=/var \ 310.23 @@ -26,9 +23,7 @@ 310.24 make install 310.25 } 310.26 310.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 310.28 -genpkg_rules() 310.29 -{ 310.30 +genpkg_rules() { 310.31 copy @dev 310.32 DEPENDS="xorg-xproto" 310.33 }
311.1 --- a/xorg-kbproto/receipt Sat Feb 24 10:43:01 2018 +0200 311.2 +++ b/xorg-kbproto/receipt Sat Feb 24 16:17:33 2018 +0200 311.3 @@ -7,17 +7,14 @@ 311.4 MAINTAINER="pankso@slitaz.org" 311.5 LICENSE="MIT" 311.6 WEB_SITE="https://www.x.org/wiki/" 311.7 -HOST_ARCH="i486 arm" 311.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 311.9 311.10 TARBALL="kbproto-$VERSION.tar.bz2" 311.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 311.12 311.13 BUILD_DEPENDS="xorg-util-macros" 311.14 -PKG_RULE="dev" 311.15 311.16 -# Rules to configure and make the package. 311.17 -compile_rules() 311.18 -{ 311.19 +compile_rules() { 311.20 ./configure \ 311.21 --sysconfdir=/etc \ 311.22 --localstatedir=/var \ 311.23 @@ -26,9 +23,7 @@ 311.24 make install 311.25 } 311.26 311.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 311.28 -genpkg_rules() 311.29 -{ 311.30 +genpkg_rules() { 311.31 copy @dev 311.32 DEPENDS="xorg-util-macros" 311.33 }
312.1 --- a/xorg-libFS/receipt Sat Feb 24 10:43:01 2018 +0200 312.2 +++ b/xorg-libFS/receipt Sat Feb 24 16:17:33 2018 +0200 312.3 @@ -7,17 +7,15 @@ 312.4 MAINTAINER="pascal.bellard@slitaz.org" 312.5 LICENSE="MIT" 312.6 WEB_SITE="https://www.x.org/wiki/" 312.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 312.8 312.9 TARBALL="libFS-$VERSION.tar.bz2" 312.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 312.11 312.12 BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-fontsproto xorg-xtrans" 312.13 SPLIT="xorg-libFS-dev" 312.14 -PKG_RULE="std-dev" 312.15 312.16 -# Rules to configure and make the package. 312.17 -compile_rules() 312.18 -{ 312.19 +compile_rules() { 312.20 ./configure \ 312.21 --sysconfdir=/etc \ 312.22 --localstatedir=/var \ 312.23 @@ -26,9 +24,7 @@ 312.24 make install 312.25 } 312.26 312.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 312.28 -genpkg_rules() 312.29 -{ 312.30 +genpkg_rules() { 312.31 case $PACKAGE in 312.32 *-libFS) 312.33 copy @std
313.1 --- a/xorg-libICE/receipt Sat Feb 24 10:43:01 2018 +0200 313.2 +++ b/xorg-libICE/receipt Sat Feb 24 16:17:33 2018 +0200 313.3 @@ -7,31 +7,28 @@ 313.4 MAINTAINER="pankso@slitaz.org" 313.5 LICENSE="MIT" 313.6 WEB_SITE="https://www.x.org/wiki/" 313.7 -HOST_ARCH="i486 arm" 313.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 313.9 313.10 TARBALL="libICE-$VERSION.tar.bz2" 313.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 313.12 313.13 BUILD_DEPENDS="xorg-xproto xorg-xtrans" 313.14 SPLIT="xorg-libICE-dev" 313.15 -PKG_RULE="std-dev" 313.16 313.17 -# Rules to configure and make the package. 313.18 -compile_rules() 313.19 -{ 313.20 +compile_rules() { 313.21 touch /root/missing /missing 313.22 313.23 + fix ld 313.24 ./configure \ 313.25 --sysconfdir=/etc \ 313.26 --localstatedir=/var \ 313.27 $CONFIGURE_ARGS && 313.28 + fix libtool && 313.29 make && 313.30 make install 313.31 } 313.32 313.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 313.34 -genpkg_rules() 313.35 -{ 313.36 +genpkg_rules() { 313.37 case $PACKAGE in 313.38 *-libICE) 313.39 copy @std
314.1 --- a/xorg-libSM/receipt Sat Feb 24 10:43:01 2018 +0200 314.2 +++ b/xorg-libSM/receipt Sat Feb 24 16:17:33 2018 +0200 314.3 @@ -7,29 +7,26 @@ 314.4 MAINTAINER="pankso@slitaz.org" 314.5 LICENSE="MIT" 314.6 WEB_SITE="https://www.x.org/wiki/" 314.7 -HOST_ARCH="i486 arm" 314.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 314.9 314.10 TARBALL="libSM-$VERSION.tar.bz2" 314.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 314.12 314.13 BUILD_DEPENDS="xorg-libICE-dev xorg-xtrans util-linux-uuid-dev" 314.14 SPLIT="xorg-libSM-dev" 314.15 -PKG_RULE="std-dev" 314.16 314.17 -# Rules to configure and make the package. 314.18 -compile_rules() 314.19 -{ 314.20 +compile_rules() { 314.21 + fix ld 314.22 ./configure \ 314.23 --sysconfdir=/etc \ 314.24 --localstatedir=/var \ 314.25 $CONFIGURE_ARGS && 314.26 + fix libtool && 314.27 make && 314.28 make install 314.29 } 314.30 314.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 314.32 -genpkg_rules() 314.33 -{ 314.34 +genpkg_rules() { 314.35 case $PACKAGE in 314.36 *-libSM) 314.37 copy @std 314.38 @@ -37,7 +34,8 @@ 314.39 ;; 314.40 *-dev) 314.41 copy @dev 314.42 - DEPENDS="xorg-libSM util-linux-uuid-dev xorg-libICE-dev xorg-xproto" 314.43 + DEPENDS="xorg-libSM \ 314.44 + xorg-libICE-dev xorg-xproto" 314.45 ;; 314.46 esac 314.47 }
315.1 --- a/xorg-libX11/receipt Sat Feb 24 10:43:01 2018 +0200 315.2 +++ b/xorg-libX11/receipt Sat Feb 24 16:17:33 2018 +0200 315.3 @@ -1,29 +1,28 @@ 315.4 - # SliTaz package receipt v2. 315.5 +# SliTaz package receipt v2. 315.6 315.7 PACKAGE="xorg-libX11" 315.8 -VERSION="1.6.3" 315.9 +VERSION="1.6.5" 315.10 CATEGORY="x-window" 315.11 SHORT_DESC="X11 Client library" 315.12 MAINTAINER="pankso@slitaz.org" 315.13 LICENSE="MIT" 315.14 WEB_SITE="https://www.x.org/wiki/" 315.15 -HOST_ARCH="i486 arm" 315.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 315.17 315.18 TARBALL="libX11-$VERSION.tar.bz2" 315.19 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 315.20 315.21 -BUILD_DEPENDS="xorg-xtrans libxcb-dev xorg-kbproto xorg-xf86bigfontproto \ 315.22 +BUILD_DEPENDS="xorg-xtrans xorg-libxcb-dev xorg-kbproto xorg-xf86bigfontproto \ 315.23 xorg-inputproto xorg-xextproto xorg-libXau-dev xorg-libXdmcp-dev perl" 315.24 SPLIT="xorg-libX11-dev" 315.25 -PKG_RULE="std-dev" 315.26 315.27 -# Rules to configure and make the package. 315.28 -compile_rules() 315.29 -{ 315.30 +compile_rules() { 315.31 + fix ld 315.32 ./configure \ 315.33 --sysconfdir=/etc \ 315.34 --localstatedir=/var \ 315.35 $CONFIGURE_ARGS && 315.36 + fix libtool && 315.37 make && 315.38 make install 315.39 315.40 @@ -33,21 +32,18 @@ 315.41 done 315.42 } 315.43 315.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 315.45 -genpkg_rules() 315.46 -{ 315.47 +genpkg_rules() { 315.48 case $PACKAGE in 315.49 *-libX11) 315.50 copy *.so* XErrorDB Xcms.txt compose.dir locale.alias locale.dir \ 315.51 C/ en_US.UTF-8/ 315.52 # split -> locale-* packages 315.53 - DEPENDS="xorg-libxcb xorg-libXau xorg-libXdmcp" 315.54 + DEPENDS="xorg-libxcb" 315.55 ;; 315.56 *-dev) 315.57 copy @dev 315.58 - DEPENDS="xorg-libX11 xorg-xtrans xorg-libxcb-dev xorg-kbproto \ 315.59 - xorg-inputproto xorg-xextproto xorg-xproto xorg-libXau-dev \ 315.60 - xorg-libXdmcp-dev" 315.61 + DEPENDS="xorg-libX11 \ 315.62 + xorg-kbproto xorg-libxcb-dev xorg-xproto" 315.63 ;; 315.64 esac 315.65 }
316.1 --- a/xorg-libXScrnSaver/receipt Sat Feb 24 10:43:01 2018 +0200 316.2 +++ b/xorg-libXScrnSaver/receipt Sat Feb 24 16:17:33 2018 +0200 316.3 @@ -7,40 +7,36 @@ 316.4 MAINTAINER="al.bobylev@gmail.com" 316.5 LICENSE="MIT" 316.6 WEB_SITE="https://www.x.org/wiki/" 316.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 316.8 316.9 TARBALL="libXScrnSaver-$VERSION.tar.bz2" 316.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 316.11 316.12 BUILD_DEPENDS="xorg-libXext-dev xorg-scrnsaverproto" 316.13 SPLIT="xorg-libXScrnSaver-dev" 316.14 -PKG_RULE="std-dev" 316.15 316.16 -# Rules to configure and make the package. 316.17 -compile_rules() 316.18 -{ 316.19 +compile_rules() { 316.20 + fix ld 316.21 ./configure \ 316.22 --sysconfdir=/etc \ 316.23 --localstatedir=/var \ 316.24 $CONFIGURE_ARGS && 316.25 + fix libtool && 316.26 make && 316.27 make install 316.28 } 316.29 316.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 316.31 -genpkg_rules() 316.32 -{ 316.33 +genpkg_rules() { 316.34 case $PACKAGE in 316.35 *-libXScrnSaver) 316.36 copy @std 316.37 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 316.38 - xorg-libXext" 316.39 + DEPENDS="xorg-libX11 xorg-libXext" 316.40 PROVIDE="xorg-libXss" 316.41 ;; 316.42 *-dev) 316.43 copy @dev 316.44 - DEPENDS="xorg-libXScrnSaver xorg-libxcb-dev xorg-libX11-dev \ 316.45 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 316.46 - xorg-scrnsaverproto" 316.47 + DEPENDS="xorg-libXScrnSaver \ 316.48 + xorg-libX11-dev xorg-libXext-dev xorg-scrnsaverproto" 316.49 PROVIDE="xorg-libXss-dev" 316.50 ;; 316.51 esac
317.1 --- a/xorg-libXau/receipt Sat Feb 24 10:43:01 2018 +0200 317.2 +++ b/xorg-libXau/receipt Sat Feb 24 16:17:33 2018 +0200 317.3 @@ -7,29 +7,26 @@ 317.4 MAINTAINER="pankso@slitaz.org" 317.5 LICENSE="MIT" 317.6 WEB_SITE="https://www.x.org/wiki/" 317.7 -HOST_ARCH="i486 arm" 317.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libXau.html" 317.9 317.10 TARBALL="libXau-$VERSION.tar.bz2" 317.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 317.12 317.13 BUILD_DEPENDS="xorg-xproto" 317.14 SPLIT="xorg-libXau-dev" 317.15 -PKG_RULE="std-dev" 317.16 317.17 -# Rules to configure and make the package. 317.18 -compile_rules() 317.19 -{ 317.20 +compile_rules() { 317.21 + fix ld 317.22 ./configure \ 317.23 --sysconfdir=/etc \ 317.24 --localstatedir=/var \ 317.25 $CONFIGURE_ARGS && 317.26 + fix libtool && 317.27 make && 317.28 make install 317.29 } 317.30 317.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 317.32 -genpkg_rules() 317.33 -{ 317.34 +genpkg_rules() { 317.35 case $PACKAGE in 317.36 *-libXau) 317.37 copy @std
318.1 --- a/xorg-libXaw/receipt Sat Feb 24 10:43:01 2018 +0200 318.2 +++ b/xorg-libXaw/receipt Sat Feb 24 16:17:33 2018 +0200 318.3 @@ -7,42 +7,37 @@ 318.4 MAINTAINER="pankso@slitaz.org" 318.5 LICENSE="MIT" 318.6 WEB_SITE="https://www.x.org/wiki/" 318.7 -HOST_ARCH="i486 arm" 318.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 318.9 318.10 TARBALL="libXaw-$VERSION.tar.bz2" 318.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 318.12 318.13 BUILD_DEPENDS="xorg-libXmu-dev xorg-libXpm-dev util-linux-uuid-dev" 318.14 SPLIT="xorg-libXaw-dev" 318.15 -PKG_RULE="std-dev" 318.16 318.17 -# Rules to configure and make the package. 318.18 -compile_rules() 318.19 -{ 318.20 +compile_rules() { 318.21 + fix ld 318.22 ./configure \ 318.23 --sysconfdir=/etc \ 318.24 --localstatedir=/var \ 318.25 --disable-xaw6 \ 318.26 $CONFIGURE_ARGS && 318.27 + fix libtool && 318.28 make && 318.29 make install 318.30 } 318.31 318.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 318.33 -genpkg_rules() 318.34 -{ 318.35 +genpkg_rules() { 318.36 case $PACKAGE in 318.37 *-libXaw) 318.38 copy @std 318.39 - DEPENDS="xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \ 318.40 - xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXmu \ 318.41 - xorg-libXpm xorg-libXt" 318.42 + DEPENDS="xorg-libX11 xorg-libXext xorg-libXmu xorg-libXpm \ 318.43 + xorg-libXt" 318.44 ;; 318.45 *-dev) 318.46 copy @dev 318.47 - DEPENDS="xorg-libXaw xorg-libxcb-dev util-linux-uuid-dev \ 318.48 - xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 318.49 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXmu-dev xorg-libXpm-dev \ 318.50 + DEPENDS="xorg-libXaw \ 318.51 + xorg-libX11-dev xorg-libXext-dev xorg-libXmu-dev xorg-libXpm-dev \ 318.52 xorg-libXt-dev xorg-xproto" 318.53 ;; 318.54 esac
319.1 --- a/xorg-libXaw3d/receipt Sat Feb 24 10:43:01 2018 +0200 319.2 +++ b/xorg-libXaw3d/receipt Sat Feb 24 16:17:33 2018 +0200 319.3 @@ -7,41 +7,34 @@ 319.4 MAINTAINER="pascal.bellard@slitaz.org" 319.5 LICENSE="MIT" 319.6 WEB_SITE="https://www.x.org/wiki/" 319.7 -HOST_ARCH="i486 arm" 319.8 319.9 TARBALL="libXaw3d-$VERSION.tar.bz2" 319.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 319.11 319.12 BUILD_DEPENDS="xorg-libXmu-dev util-linux-uuid-dev" 319.13 SPLIT="xorg-libXaw3d-dev" 319.14 -PKG_RULE="std-dev" 319.15 319.16 -# Rules to configure and make the package. 319.17 -compile_rules() 319.18 -{ 319.19 +compile_rules() { 319.20 + fix ld 319.21 ./configure \ 319.22 --sysconfdir=/etc \ 319.23 --localstatedir=/var \ 319.24 $CONFIGURE_ARGS && 319.25 + fix libtool && 319.26 make && 319.27 make install 319.28 } 319.29 319.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 319.31 -genpkg_rules() 319.32 -{ 319.33 +genpkg_rules() { 319.34 case $PACKAGE in 319.35 *-libXaw3d) 319.36 copy @std 319.37 - DEPENDS="xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \ 319.38 - xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXmu \ 319.39 - xorg-libXt" 319.40 + DEPENDS="xorg-libX11 xorg-libXext xorg-libXmu xorg-libXt" 319.41 ;; 319.42 *-dev) 319.43 copy @dev 319.44 - DEPENDS="xorg-libXaw3d xorg-libxcb-dev util-linux-uuid-dev \ 319.45 - xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 319.46 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXmu-dev xorg-libXt-dev \ 319.47 + DEPENDS="xorg-libXaw3d \ 319.48 + xorg-libX11-dev xorg-libXext-dev xorg-libXmu-dev xorg-libXt-dev \ 319.49 xorg-xproto" 319.50 ;; 319.51 esac
320.1 --- a/xorg-libXcomposite/receipt Sat Feb 24 10:43:01 2018 +0200 320.2 +++ b/xorg-libXcomposite/receipt Sat Feb 24 16:17:33 2018 +0200 320.3 @@ -7,39 +7,35 @@ 320.4 MAINTAINER="pankso@slitaz.org" 320.5 LICENSE="MIT" 320.6 WEB_SITE="https://www.x.org/wiki/" 320.7 -HOST_ARCH="i486 arm" 320.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 320.9 320.10 TARBALL="libXcomposite-$VERSION.tar.bz2" 320.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 320.12 320.13 BUILD_DEPENDS="xorg-compositeproto xorg-libXfixes-dev" 320.14 SPLIT="xorg-libXcomposite-dev" 320.15 -PKG_RULE="std-dev" 320.16 320.17 -# Rules to configure and make the package. 320.18 -compile_rules() 320.19 -{ 320.20 +compile_rules() { 320.21 + fix ld 320.22 ./configure \ 320.23 --sysconfdir=/etc \ 320.24 --localstatedir=/var \ 320.25 $CONFIGURE_ARGS && 320.26 + fix libtool && 320.27 make && 320.28 make install 320.29 } 320.30 320.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 320.32 -genpkg_rules() 320.33 -{ 320.34 +genpkg_rules() { 320.35 case $PACKAGE in 320.36 *-libXcomposite) 320.37 copy @std 320.38 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp" 320.39 + DEPENDS="xorg-libX11" 320.40 ;; 320.41 *-dev) 320.42 copy @dev 320.43 - DEPENDS="xorg-libXcomposite xorg-libxcb-dev xorg-compositeproto \ 320.44 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \ 320.45 - xorg-libXfixes-dev xorg-xproto" 320.46 + DEPENDS="xorg-libXcomposite \ 320.47 + xorg-compositeproto xorg-libX11-dev xorg-libXfixes-dev xorg-xproto" 320.48 ;; 320.49 esac 320.50 }
321.1 --- a/xorg-libXcursor/receipt Sat Feb 24 10:43:01 2018 +0200 321.2 +++ b/xorg-libXcursor/receipt Sat Feb 24 16:17:33 2018 +0200 321.3 @@ -7,40 +7,35 @@ 321.4 MAINTAINER="pankso@slitaz.org" 321.5 LICENSE="MIT" 321.6 WEB_SITE="https://www.x.org/wiki/" 321.7 -HOST_ARCH="i486 arm" 321.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 321.9 321.10 TARBALL="libXcursor-$VERSION.tar.bz2" 321.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 321.12 321.13 BUILD_DEPENDS="xorg-libXrender-dev xorg-libXfixes-dev" 321.14 SPLIT="xorg-libXcursor-dev" 321.15 -PKG_RULE="std-dev" 321.16 321.17 -# Rules to configure and make the package. 321.18 -compile_rules() 321.19 -{ 321.20 +compile_rules() { 321.21 + fix ld 321.22 ./configure \ 321.23 --sysconfdir=/etc \ 321.24 --localstatedir=/var \ 321.25 $CONFIGURE_ARGS && 321.26 + fix libtool && 321.27 make && 321.28 make install 321.29 } 321.30 321.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 321.32 -genpkg_rules() 321.33 -{ 321.34 +genpkg_rules() { 321.35 case $PACKAGE in 321.36 *-libXcursor) 321.37 copy @std 321.38 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 321.39 - xorg-libXfixes xorg-libXrender" 321.40 + DEPENDS="xorg-libX11 xorg-libXfixes xorg-libXrender" 321.41 ;; 321.42 *-dev) 321.43 copy @dev 321.44 - DEPENDS="xorg-libXcursor xorg-libxcb-dev xorg-libX11-dev \ 321.45 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXfixes-dev \ 321.46 - xorg-libXrender-dev xorg-xproto" 321.47 + DEPENDS="xorg-libXcursor \ 321.48 + xorg-libX11-dev xorg-libXfixes-dev xorg-libXrender-dev xorg-xproto" 321.49 ;; 321.50 esac 321.51 }
322.1 --- a/xorg-libXdamage/receipt Sat Feb 24 10:43:01 2018 +0200 322.2 +++ b/xorg-libXdamage/receipt Sat Feb 24 16:17:33 2018 +0200 322.3 @@ -7,40 +7,35 @@ 322.4 MAINTAINER="pankso@slitaz.org" 322.5 LICENSE="MIT" 322.6 WEB_SITE="https://www.x.org/wiki/" 322.7 -HOST_ARCH="i486 arm" 322.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 322.9 322.10 TARBALL="libXdamage-$VERSION.tar.bz2" 322.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 322.12 322.13 BUILD_DEPENDS="xorg-damageproto xorg-libXfixes-dev" 322.14 SPLIT="xorg-libXdamage-dev" 322.15 -PKG_RULE="std-dev" 322.16 322.17 -# Rules to configure and make the package. 322.18 -compile_rules() 322.19 -{ 322.20 +compile_rules() { 322.21 + fix ld 322.22 ./configure \ 322.23 --sysconfdir=/etc \ 322.24 --localstatedir=/var \ 322.25 $CONFIGURE_ARGS && 322.26 + fix libtool && 322.27 make && 322.28 make install 322.29 } 322.30 322.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 322.32 -genpkg_rules() 322.33 -{ 322.34 +genpkg_rules() { 322.35 case $PACKAGE in 322.36 *-libXdamage) 322.37 copy @std 322.38 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 322.39 - xorg-libXfixes" 322.40 + DEPENDS="xorg-libX11" 322.41 ;; 322.42 *-dev) 322.43 copy @dev 322.44 - DEPENDS="xorg-libXdamage xorg-libxcb-dev xorg-damageproto \ 322.45 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \ 322.46 - xorg-libXfixes-dev xorg-xproto" 322.47 + DEPENDS="xorg-libXdamage \ 322.48 + xorg-damageproto xorg-libX11-dev xorg-libXfixes-dev xorg-xproto" 322.49 ;; 322.50 esac 322.51 }
323.1 --- a/xorg-libXdmcp/receipt Sat Feb 24 10:43:01 2018 +0200 323.2 +++ b/xorg-libXdmcp/receipt Sat Feb 24 16:17:33 2018 +0200 323.3 @@ -7,29 +7,26 @@ 323.4 MAINTAINER="pankso@slitaz.org" 323.5 LICENSE="MIT" 323.6 WEB_SITE="https://www.x.org/wiki/" 323.7 -HOST_ARCH="i486 arm" 323.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libXdmcp.html" 323.9 323.10 TARBALL="libXdmcp-$VERSION.tar.bz2" 323.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 323.12 323.13 BUILD_DEPENDS="xorg-xproto" 323.14 SPLIT="xorg-libXdmcp-dev" 323.15 -PKG_RULE="std-dev" 323.16 323.17 -# Rules to configure and make the package. 323.18 -compile_rules() 323.19 -{ 323.20 +compile_rules() { 323.21 + fix ld 323.22 ./configure \ 323.23 --sysconfdir=/etc \ 323.24 --localstatedir=/var \ 323.25 $CONFIGURE_ARGS && 323.26 + fix libtool && 323.27 make && 323.28 make install 323.29 } 323.30 323.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 323.32 -genpkg_rules() 323.33 -{ 323.34 +genpkg_rules() { 323.35 case $PACKAGE in 323.36 *-libXdmcp) 323.37 copy @std
324.1 --- a/xorg-libXext/receipt Sat Feb 24 10:43:01 2018 +0200 324.2 +++ b/xorg-libXext/receipt Sat Feb 24 16:17:33 2018 +0200 324.3 @@ -7,38 +7,35 @@ 324.4 MAINTAINER="pankso@slitaz.org" 324.5 LICENSE="MIT" 324.6 WEB_SITE="https://www.x.org/wiki/" 324.7 -HOST_ARCH="i486 arm" 324.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 324.9 324.10 TARBALL="libXext-$VERSION.tar.bz2" 324.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 324.12 324.13 -BUILD_DEPENDS="xorg-libX11-dev" 324.14 +BUILD_DEPENDS="xorg-libX11-dev xorg-xextproto" 324.15 SPLIT="xorg-libXext-dev" 324.16 -PKG_RULE="std-dev" 324.17 324.18 -# Rules to configure and make the package. 324.19 -compile_rules() 324.20 -{ 324.21 +compile_rules() { 324.22 + fix ld 324.23 ./configure \ 324.24 --sysconfdir=/etc \ 324.25 --localstatedir=/var \ 324.26 $CONFIGURE_ARGS && 324.27 + fix libtool && 324.28 make && 324.29 make install 324.30 } 324.31 324.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 324.33 -genpkg_rules() 324.34 -{ 324.35 +genpkg_rules() { 324.36 case $PACKAGE in 324.37 *-libXext) 324.38 copy @std 324.39 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp" 324.40 + DEPENDS="xorg-libX11" 324.41 ;; 324.42 *-dev) 324.43 copy @dev 324.44 - DEPENDS="xorg-libXext xorg-libxcb-dev xorg-libX11-dev \ 324.45 - xorg-libXau-dev xorg-libXdmcp-dev xorg-xextproto" 324.46 + DEPENDS="xorg-libXext \ 324.47 + xorg-libX11-dev xorg-xextproto" 324.48 ;; 324.49 esac 324.50 }
325.1 --- a/xorg-libXfixes/receipt Sat Feb 24 10:43:01 2018 +0200 325.2 +++ b/xorg-libXfixes/receipt Sat Feb 24 16:17:33 2018 +0200 325.3 @@ -1,44 +1,41 @@ 325.4 # SliTaz package receipt v2. 325.5 325.6 PACKAGE="xorg-libXfixes" 325.7 -VERSION="5.0.2" 325.8 +VERSION="5.0.3" 325.9 CATEGORY="x-window" 325.10 SHORT_DESC="X-Fixes extension" 325.11 MAINTAINER="pankso@slitaz.org" 325.12 LICENSE="MIT" 325.13 WEB_SITE="https://www.x.org/wiki/" 325.14 -HOST_ARCH="i486 arm" 325.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 325.16 325.17 TARBALL="libXfixes-$VERSION.tar.bz2" 325.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 325.19 325.20 BUILD_DEPENDS="xorg-fixesproto xorg-libX11-dev" 325.21 SPLIT="xorg-libXfixes-dev" 325.22 -PKG_RULE="std-dev" 325.23 325.24 -# Rules to configure and make the package. 325.25 -compile_rules() 325.26 -{ 325.27 +compile_rules() { 325.28 + fix ld 325.29 ./configure \ 325.30 --sysconfdir=/etc \ 325.31 --localstatedir=/var \ 325.32 $CONFIGURE_ARGS && 325.33 + fix libtool && 325.34 make && 325.35 make install 325.36 } 325.37 325.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 325.39 -genpkg_rules() 325.40 -{ 325.41 +genpkg_rules() { 325.42 case $PACKAGE in 325.43 *-libXfixes) 325.44 copy @std 325.45 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp" 325.46 + DEPENDS="xorg-libX11" 325.47 ;; 325.48 *-dev) 325.49 copy @dev 325.50 - DEPENDS="xorg-libXfixes xorg-libxcb-dev xorg-fixesproto \ 325.51 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-xproto" 325.52 + DEPENDS="xorg-libXfixes \ 325.53 + xorg-fixesproto xorg-libX11-dev xorg-xproto" 325.54 ;; 325.55 esac 325.56 }
326.1 --- a/xorg-libXfont2/receipt Sat Feb 24 10:43:01 2018 +0200 326.2 +++ b/xorg-libXfont2/receipt Sat Feb 24 16:17:33 2018 +0200 326.3 @@ -7,7 +7,7 @@ 326.4 MAINTAINER="al.bobylev@gmail.com" 326.5 LICENSE="MIT" 326.6 WEB_SITE="https://www.x.org/wiki/" 326.7 -HOST_ARCH="i486 arm" 326.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 326.9 326.10 TARBALL="libXfont2-$VERSION.tar.bz2" 326.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 326.12 @@ -15,22 +15,19 @@ 326.13 BUILD_DEPENDS="xorg-util-macros freetype-dev xorg-xproto xorg-xtrans \ 326.14 xorg-fontsproto xorg-libfontenc-dev" 326.15 SPLIT="xorg-libXfont2-dev" 326.16 -PKG_RULE="std-dev" 326.17 326.18 -# Rules to configure and make the package. 326.19 -compile_rules() 326.20 -{ 326.21 +compile_rules() { 326.22 + fix ld 326.23 ./configure \ 326.24 --sysconfdir=/etc \ 326.25 --localstatedir=/var \ 326.26 $CONFIGURE_ARGS && 326.27 + fix libtool && 326.28 make && 326.29 make install 326.30 } 326.31 326.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 326.33 -genpkg_rules() 326.34 -{ 326.35 +genpkg_rules() { 326.36 case $PACKAGE in 326.37 *-libXfont2) 326.38 copy @std 326.39 @@ -38,9 +35,9 @@ 326.40 ;; 326.41 *-dev) 326.42 copy @dev 326.43 - DEPENDS="xorg-libXfont2 bzip2-dev freetype-dev glib-dev \ 326.44 - harfbuzz-dev libpng16-dev pcre-dev xorg-fontsproto \ 326.45 - xorg-libfontenc-dev xorg-xproto zlib" 326.46 + DEPENDS="xorg-libXfont2 \ 326.47 + freetype-dev xorg-fontsproto xorg-libfontenc-dev xorg-xproto \ 326.48 + zlib-dev" 326.49 ;; 326.50 esac 326.51 }
327.1 --- a/xorg-libXfontcache/receipt Sat Feb 24 10:43:01 2018 +0200 327.2 +++ b/xorg-libXfontcache/receipt Sat Feb 24 16:17:33 2018 +0200 327.3 @@ -14,22 +14,19 @@ 327.4 BUILD_DEPENDS="gfortran xorg-libX11-dev xorg-libXext-dev xorg-xextproto \ 327.5 xorg-fontcacheproto" 327.6 SPLIT="xorg-libXfontcache-dev" 327.7 -PKG_RULE="std-dev" 327.8 327.9 -# Rules to configure and make the package. 327.10 -compile_rules() 327.11 -{ 327.12 +compile_rules() { 327.13 + fix ld 327.14 ./configure \ 327.15 --sysconfdir=/etc \ 327.16 --localstatedir=/var \ 327.17 $CONFIGURE_ARGS && 327.18 + fix libtool && 327.19 make && 327.20 make install 327.21 } 327.22 327.23 -# Rules to gen a SliTaz package suitable for Tazpkg. 327.24 -genpkg_rules() 327.25 -{ 327.26 +genpkg_rules() { 327.27 case $PACKAGE in 327.28 *-libXfontcache) 327.29 copy @std 327.30 @@ -37,8 +34,8 @@ 327.31 ;; 327.32 *-dev) 327.33 copy @dev 327.34 - DEPENDS="xorg-libXfontcache xorg-libxcb-dev xorg-fontcacheproto \ 327.35 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev" 327.36 + DEPENDS="xorg-libXfontcache \ 327.37 + xorg-fontcacheproto xorg-libX11-dev xorg-libXext-dev" 327.38 ;; 327.39 esac 327.40 }
328.1 --- a/xorg-libXft/receipt Sat Feb 24 10:43:01 2018 +0200 328.2 +++ b/xorg-libXft/receipt Sat Feb 24 16:17:33 2018 +0200 328.3 @@ -7,42 +7,35 @@ 328.4 MAINTAINER="pankso@slitaz.org" 328.5 LICENSE="MIT" 328.6 WEB_SITE="https://www.x.org/wiki/" 328.7 -HOST_ARCH="i486 arm" 328.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 328.9 328.10 TARBALL="libXft-$VERSION.tar.bz2" 328.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 328.12 328.13 BUILD_DEPENDS="xorg-libXrender-dev freetype-dev fontconfig-dev libxml2-dev" 328.14 SPLIT="xorg-libXft-dev" 328.15 -PKG_RULE="std-dev" 328.16 328.17 -# Rules to configure and make the package. 328.18 -compile_rules() 328.19 -{ 328.20 +compile_rules() { 328.21 + fix ld 328.22 ./configure \ 328.23 --sysconfdir=/etc \ 328.24 --localstatedir=/var \ 328.25 $CONFIGURE_ARGS && 328.26 + fix libtool && 328.27 make && 328.28 make install 328.29 } 328.30 328.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 328.32 -genpkg_rules() 328.33 -{ 328.34 +genpkg_rules() { 328.35 case $PACKAGE in 328.36 *-libXft) 328.37 copy @std 328.38 - DEPENDS="bzlib fontconfig freetype glib libharfbuzz liblzma \ 328.39 - libpng16 xorg-libxcb libxml2 pcre xorg-libX11 xorg-libXau \ 328.40 - xorg-libXdmcp xorg-libXrender zlib" 328.41 + DEPENDS="fontconfig freetype xorg-libX11 xorg-libXrender" 328.42 ;; 328.43 *-dev) 328.44 copy @dev 328.45 - DEPENDS="xorg-libXft bzip2-dev fontconfig-dev freetype-dev \ 328.46 - glib-dev harfbuzz-dev libpng16-dev xorg-libxcb-dev libxml2-dev \ 328.47 - pcre-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \ 328.48 - xorg-libXrender-dev xorg-xproto xz-dev zlib-dev" 328.49 + DEPENDS="xorg-libXft \ 328.50 + fontconfig-dev freetype-dev xorg-libXrender-dev xorg-xproto" 328.51 ;; 328.52 esac 328.53 }
329.1 --- a/xorg-libXi/receipt Sat Feb 24 10:43:01 2018 +0200 329.2 +++ b/xorg-libXi/receipt Sat Feb 24 16:17:33 2018 +0200 329.3 @@ -1,46 +1,41 @@ 329.4 # SliTaz package receipt v2. 329.5 329.6 PACKAGE="xorg-libXi" 329.7 -VERSION="1.7.6" 329.8 +VERSION="1.7.9" 329.9 CATEGORY="x-window" 329.10 SHORT_DESC="X Input Extension library" 329.11 MAINTAINER="pankso@slitaz.org" 329.12 LICENSE="MIT" 329.13 WEB_SITE="https://www.x.org/wiki/" 329.14 -HOST_ARCH="i486 arm" 329.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 329.16 329.17 TARBALL="libXi-$VERSION.tar.bz2" 329.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 329.19 329.20 -BUILD_DEPENDS="xorg-libXext-dev xorg-libXfixes-dev" 329.21 +BUILD_DEPENDS="xorg-libXext-dev xorg-libXfixes-dev xorg-inputproto" 329.22 SPLIT="xorg-libXi-dev" 329.23 -PKG_RULE="std-dev" 329.24 329.25 -# Rules to configure and make the package. 329.26 -compile_rules() 329.27 -{ 329.28 +compile_rules() { 329.29 + fix ld 329.30 ./configure \ 329.31 --sysconfdir=/etc \ 329.32 --localstatedir=/var \ 329.33 $CONFIGURE_ARGS && 329.34 + fix libtool && 329.35 make && 329.36 make install 329.37 } 329.38 329.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 329.40 -genpkg_rules() 329.41 -{ 329.42 +genpkg_rules() { 329.43 case $PACKAGE in 329.44 *-libXi) 329.45 copy @std 329.46 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 329.47 - xorg-libXext" 329.48 + DEPENDS="xorg-libX11 xorg-libXext" 329.49 ;; 329.50 *-dev) 329.51 copy @dev 329.52 - DEPENDS="xorg-libXi xorg-libxcb-dev xorg-inputproto \ 329.53 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 329.54 - xorg-libXfixes-dev" 329.55 + DEPENDS="xorg-libXi \ 329.56 + xorg-inputproto xorg-libX11-dev xorg-libXext-dev xorg-libXfixes-dev" 329.57 ;; 329.58 esac 329.59 }
330.1 --- a/xorg-libXinerama/receipt Sat Feb 24 10:43:01 2018 +0200 330.2 +++ b/xorg-libXinerama/receipt Sat Feb 24 16:17:33 2018 +0200 330.3 @@ -7,40 +7,35 @@ 330.4 MAINTAINER="pankso@slitaz.org" 330.5 LICENSE="MIT" 330.6 WEB_SITE="https://www.x.org/wiki/" 330.7 -HOST_ARCH="i486 arm" 330.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 330.9 330.10 TARBALL="libXinerama-$VERSION.tar.bz2" 330.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 330.12 330.13 BUILD_DEPENDS="xorg-libXext-dev xorg-xineramaproto" 330.14 SPLIT="xorg-libXinerama-dev" 330.15 -PKG_RULE="std-dev" 330.16 330.17 -# Rules to configure and make the package. 330.18 -compile_rules() 330.19 -{ 330.20 +compile_rules() { 330.21 + fix ld 330.22 ./configure \ 330.23 --sysconfdir=/etc \ 330.24 --localstatedir=/var \ 330.25 $CONFIGURE_ARGS && 330.26 + fix libtool && 330.27 make && 330.28 make install 330.29 } 330.30 330.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 330.32 -genpkg_rules() 330.33 -{ 330.34 +genpkg_rules() { 330.35 case $PACKAGE in 330.36 *-libXinerama) 330.37 copy @std 330.38 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 330.39 - xorg-libXext" 330.40 + DEPENDS="xorg-libX11 xorg-libXext" 330.41 ;; 330.42 *-dev) 330.43 copy @dev 330.44 - DEPENDS="xorg-libXinerama xorg-libxcb-dev xorg-libX11-dev \ 330.45 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 330.46 - xorg-xineramaproto" 330.47 + DEPENDS="xorg-libXinerama \ 330.48 + xorg-libX11-dev xorg-libXext-dev xorg-xineramaproto" 330.49 ;; 330.50 esac 330.51 }
331.1 --- a/xorg-libXmu/receipt Sat Feb 24 10:43:01 2018 +0200 331.2 +++ b/xorg-libXmu/receipt Sat Feb 24 16:17:33 2018 +0200 331.3 @@ -7,40 +7,35 @@ 331.4 MAINTAINER="pankso@slitaz.org" 331.5 LICENSE="MIT" 331.6 WEB_SITE="https://www.x.org/wiki/" 331.7 -HOST_ARCH="i486 arm" 331.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 331.9 331.10 TARBALL="libXmu-$VERSION.tar.bz2" 331.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 331.12 331.13 BUILD_DEPENDS="xorg-libXext-dev xorg-libXt-dev util-linux-uuid-dev" 331.14 SPLIT="xorg-libXmu-dev" 331.15 -PKG_RULE="std-dev" 331.16 331.17 -# Rules to configure and make the package. 331.18 -compile_rules() 331.19 -{ 331.20 +compile_rules() { 331.21 + fix ld 331.22 ./configure \ 331.23 --sysconfdir=/etc \ 331.24 --localstatedir=/var \ 331.25 $CONFIGURE_ARGS && 331.26 + fix libtool && 331.27 make && 331.28 make install 331.29 } 331.30 331.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 331.32 -genpkg_rules() 331.33 -{ 331.34 +genpkg_rules() { 331.35 case $PACKAGE in 331.36 *-libXmu) 331.37 copy @std 331.38 - DEPENDS="xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \ 331.39 - xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXt" 331.40 + DEPENDS="xorg-libX11 xorg-libXext xorg-libXt" 331.41 ;; 331.42 *-dev) 331.43 copy @dev 331.44 - DEPENDS="xorg-libXmu xorg-libxcb-dev util-linux-uuid-dev \ 331.45 - xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 331.46 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libXt-dev xorg-xproto" 331.47 + DEPENDS="xorg-libXmu \ 331.48 + xorg-libX11-dev xorg-libXext-dev xorg-libXt-dev xorg-xproto" 331.49 ;; 331.50 esac 331.51 }
332.1 --- a/xorg-libXpm/receipt Sat Feb 24 10:43:01 2018 +0200 332.2 +++ b/xorg-libXpm/receipt Sat Feb 24 16:17:33 2018 +0200 332.3 @@ -1,13 +1,13 @@ 332.4 # SliTaz package receipt v2. 332.5 332.6 PACKAGE="xorg-libXpm" 332.7 -VERSION="3.5.11" 332.8 +VERSION="3.5.12" 332.9 CATEGORY="x-window" 332.10 SHORT_DESC="XPM format pixmap library" 332.11 MAINTAINER="pankso@slitaz.org" 332.12 LICENSE="MIT" 332.13 WEB_SITE="https://www.x.org/wiki/" 332.14 -HOST_ARCH="i486 arm" 332.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 332.16 332.17 TARBALL="libXpm-$VERSION.tar.bz2" 332.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 332.19 @@ -15,11 +15,8 @@ 332.20 BUILD_DEPENDS="xorg-libXt-dev xorg-libXext-dev xorg-libSM-dev \ 332.21 util-linux-uuid-dev gettext" 332.22 SPLIT="xorg-libXpm-util xorg-libXpm-dev" 332.23 -PKG_RULE="lib-bin-dev" 332.24 332.25 -# Rules to configure and make the package. 332.26 -compile_rules() 332.27 -{ 332.28 +compile_rules() { 332.29 case "$ARCH" in 332.30 arm*) # ARM Hack 332.31 for la in libICE.la libSM.la libuuid.la; do 332.32 @@ -30,33 +27,31 @@ 332.33 done ;; 332.34 esac 332.35 332.36 + fix ld 332.37 ./configure \ 332.38 --sysconfdir=/etc \ 332.39 --localstatedir=/var \ 332.40 $CONFIGURE_ARGS && 332.41 + fix libtool && 332.42 make && 332.43 make install 332.44 } 332.45 332.46 -# Rules to gen a SliTaz package suitable for Tazpkg. 332.47 -genpkg_rules() 332.48 -{ 332.49 +genpkg_rules() { 332.50 case $PACKAGE in 332.51 *-libXpm) 332.52 copy *.so* 332.53 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp" 332.54 + DEPENDS="xorg-libX11" 332.55 ;; 332.56 *-util) 332.57 copy bin/ 332.58 CAT="x-window|utilities" 332.59 - DEPENDS="xorg-libXpm xorg-libxcb util-linux-uuid xorg-libICE \ 332.60 - xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 332.61 - xorg-libXt" 332.62 + DEPENDS="xorg-libX11 xorg-libXext xorg-libXpm xorg-libXt" 332.63 ;; 332.64 *-dev) 332.65 copy @dev 332.66 - DEPENDS="xorg-libXpm xorg-libXpm-util xorg-libxcb-dev \ 332.67 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev" 332.68 + DEPENDS="xorg-libXpm xorg-libXpm-util \ 332.69 + xorg-libX11-dev" 332.70 ;; 332.71 esac 332.72 }
333.1 --- a/xorg-libXrandr/receipt Sat Feb 24 10:43:01 2018 +0200 333.2 +++ b/xorg-libXrandr/receipt Sat Feb 24 16:17:33 2018 +0200 333.3 @@ -1,46 +1,42 @@ 333.4 # SliTaz package receipt v2. 333.5 333.6 PACKAGE="xorg-libXrandr" 333.7 -VERSION="1.5.0" 333.8 +VERSION="1.5.1" 333.9 CATEGORY="x-window" 333.10 SHORT_DESC="Xrandr extension library" 333.11 MAINTAINER="pankso@slitaz.org" 333.12 LICENSE="MIT" 333.13 WEB_SITE="https://www.x.org/wiki/libraries/libxrandr/" 333.14 -HOST_ARCH="i486 arm" 333.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 333.16 333.17 TARBALL="libXrandr-$VERSION.tar.bz2" 333.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 333.19 333.20 BUILD_DEPENDS="xorg-randrproto xorg-libXext-dev xorg-libXrender-dev" 333.21 SPLIT="xorg-libXrandr-dev" 333.22 -PKG_RULE="std-dev" 333.23 333.24 -# Rules to configure and make the package. 333.25 -compile_rules() 333.26 -{ 333.27 +compile_rules() { 333.28 + fix ld 333.29 ./configure \ 333.30 --sysconfdir=/etc \ 333.31 --localstatedir=/var \ 333.32 $CONFIGURE_ARGS && 333.33 + fix libtool && 333.34 make && 333.35 make install 333.36 } 333.37 333.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 333.39 -genpkg_rules() 333.40 -{ 333.41 +genpkg_rules() { 333.42 case $PACKAGE in 333.43 *-libXrandr) 333.44 copy @std 333.45 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 333.46 - xorg-libXext xorg-libXrender" 333.47 + DEPENDS="xorg-libX11 xorg-libXext xorg-libXrender" 333.48 ;; 333.49 *-dev) 333.50 copy @dev 333.51 - DEPENDS="xorg-libXrandr xorg-libxcb-dev xorg-libX11-dev \ 333.52 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 333.53 - xorg-libXrender-dev xorg-randrproto xorg-xproto" 333.54 + DEPENDS="xorg-libXrandr \ 333.55 + xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev \ 333.56 + xorg-randrproto xorg-xproto" 333.57 ;; 333.58 esac 333.59 }
334.1 --- a/xorg-libXrender/receipt Sat Feb 24 10:43:01 2018 +0200 334.2 +++ b/xorg-libXrender/receipt Sat Feb 24 16:17:33 2018 +0200 334.3 @@ -1,44 +1,41 @@ 334.4 # SliTaz package receipt v2. 334.5 334.6 PACKAGE="xorg-libXrender" 334.7 -VERSION="0.9.9" 334.8 +VERSION="0.9.10" 334.9 CATEGORY="x-window" 334.10 SHORT_DESC="RENDER extension library" 334.11 MAINTAINER="pankso@slitaz.org" 334.12 LICENSE="MIT" 334.13 WEB_SITE="https://www.x.org/wiki/" 334.14 -HOST_ARCH="i486 arm" 334.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 334.16 334.17 TARBALL="libXrender-$VERSION.tar.bz2" 334.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 334.19 334.20 BUILD_DEPENDS="xorg-libX11-dev xorg-renderproto" 334.21 SPLIT="xorg-libXrender-dev" 334.22 -PKG_RULE="std-dev" 334.23 334.24 -# Rules to configure and make the package. 334.25 -compile_rules() 334.26 -{ 334.27 +compile_rules() { 334.28 + fix ld 334.29 ./configure \ 334.30 --sysconfdir=/etc \ 334.31 --localstatedir=/var \ 334.32 $CONFIGURE_ARGS && 334.33 + fix libtool && 334.34 make && 334.35 make install 334.36 } 334.37 334.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 334.39 -genpkg_rules() 334.40 -{ 334.41 +genpkg_rules() { 334.42 case $PACKAGE in 334.43 *-libXrender) 334.44 copy @std 334.45 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp" 334.46 + DEPENDS="xorg-libX11" 334.47 ;; 334.48 *-dev) 334.49 copy @dev 334.50 - DEPENDS="xorg-libXrender xorg-libxcb-dev xorg-libX11-dev \ 334.51 - xorg-libXau-dev xorg-libXdmcp-dev xorg-renderproto xorg-xproto" 334.52 + DEPENDS="xorg-libXrender \ 334.53 + xorg-libX11-dev xorg-renderproto xorg-xproto" 334.54 ;; 334.55 esac 334.56 }
335.1 --- a/xorg-libXres/receipt Sat Feb 24 10:43:01 2018 +0200 335.2 +++ b/xorg-libXres/receipt Sat Feb 24 16:17:33 2018 +0200 335.3 @@ -7,6 +7,7 @@ 335.4 MAINTAINER="pascal.bellard@slitaz.org" 335.5 LICENSE="MIT" 335.6 WEB_SITE="https://www.x.org/wiki/" 335.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 335.8 335.9 TARBALL="libXres-$VERSION.tar.bz2" 335.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 335.11 @@ -14,31 +15,27 @@ 335.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXext-dev \ 335.13 xorg-resourceproto" 335.14 SPLIT="xorg-libXres-dev" 335.15 -PKG_RULE="std-dev" 335.16 335.17 -# Rules to configure and make the package. 335.18 -compile_rules() 335.19 -{ 335.20 +compile_rules() { 335.21 + fix ld 335.22 ./configure \ 335.23 --sysconfdir=/etc \ 335.24 --localstatedir=/var \ 335.25 $CONFIGURE_ARGS && 335.26 + fix libtool && 335.27 make && make install 335.28 } 335.29 335.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 335.31 -genpkg_rules() 335.32 -{ 335.33 +genpkg_rules() { 335.34 case $PACKAGE in 335.35 *-libXres) 335.36 copy @std 335.37 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 335.38 - xorg-libXext" 335.39 + DEPENDS="xorg-libX11 xorg-libXext" 335.40 ;; 335.41 *-dev) 335.42 copy @dev 335.43 - DEPENDS="xorg-libXres xorg-libxcb-dev xorg-libX11-dev \ 335.44 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-xproto" 335.45 + DEPENDS="xorg-libXres \ 335.46 + xorg-libX11-dev xorg-libXext-dev xorg-xproto" 335.47 ;; 335.48 esac 335.49 }
336.1 --- a/xorg-libXt/receipt Sat Feb 24 10:43:01 2018 +0200 336.2 +++ b/xorg-libXt/receipt Sat Feb 24 16:17:33 2018 +0200 336.3 @@ -7,46 +7,41 @@ 336.4 MAINTAINER="pankso@slitaz.org" 336.5 LICENSE="MIT" 336.6 WEB_SITE="https://www.x.org/wiki/" 336.7 -HOST_ARCH="i486 arm" 336.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 336.9 336.10 TARBALL="libXt-$VERSION.tar.bz2" 336.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 336.12 336.13 BUILD_DEPENDS="xorg-libSM-dev xorg-libX11-dev glib-dev util-linux-uuid-dev" 336.14 SPLIT="xorg-libXt-dev" 336.15 -PKG_RULE="std-dev" 336.16 336.17 -# Rules to configure and make the package. 336.18 -compile_rules() 336.19 -{ 336.20 +compile_rules() { 336.21 # Handle cross compilation. 336.22 case "$ARCH" in 336.23 arm) unset CFLAGS ;; 336.24 esac 336.25 336.26 + fix ld 336.27 ./configure \ 336.28 --sysconfdir=/etc \ 336.29 --localstatedir=/var \ 336.30 --with-appdefaultdir=/etc/X11/app-defaults \ 336.31 $CONFIGURE_ARGS && 336.32 + fix libtool && 336.33 make && 336.34 make install 336.35 } 336.36 336.37 -# Rules to gen a SliTaz package suitable for Tazpkg. 336.38 -genpkg_rules() 336.39 -{ 336.40 +genpkg_rules() { 336.41 case $PACKAGE in 336.42 *-libXt) 336.43 copy @std 336.44 - DEPENDS="xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \ 336.45 - xorg-libX11 xorg-libXau xorg-libXdmcp" 336.46 + DEPENDS="xorg-libICE xorg-libSM xorg-libX11" 336.47 ;; 336.48 *-dev) 336.49 copy @dev 336.50 - DEPENDS="xorg-libXt xorg-libxcb-dev util-linux-uuid-dev \ 336.51 - xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 336.52 - xorg-libXdmcp-dev xorg-xproto" 336.53 + DEPENDS="xorg-libXt \ 336.54 + xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-xproto" 336.55 ;; 336.56 esac 336.57 }
337.1 --- a/xorg-libXtst/receipt Sat Feb 24 10:43:01 2018 +0200 337.2 +++ b/xorg-libXtst/receipt Sat Feb 24 16:17:33 2018 +0200 337.3 @@ -1,46 +1,42 @@ 337.4 # SliTaz package receipt v2. 337.5 337.6 PACKAGE="xorg-libXtst" 337.7 -VERSION="1.2.2" 337.8 +VERSION="1.2.3" 337.9 CATEGORY="x-window" 337.10 SHORT_DESC="Xorg server module" 337.11 MAINTAINER="pankso@slitaz.org" 337.12 LICENSE="MIT" 337.13 WEB_SITE="https://www.x.org/wiki/" 337.14 -HOST_ARCH="i486 arm" 337.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 337.16 337.17 TARBALL="libXtst-$VERSION.tar.bz2" 337.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 337.19 337.20 BUILD_DEPENDS="xorg-recordproto xorg-libXext-dev xorg-libXi-dev" 337.21 SPLIT="xorg-libXtst-dev" 337.22 -PKG_RULE="std-dev" 337.23 337.24 -# Rules to configure and make the package. 337.25 -compile_rules() 337.26 -{ 337.27 +compile_rules() { 337.28 + fix ld 337.29 ./configure \ 337.30 --sysconfdir=/etc \ 337.31 --localstatedir=/var \ 337.32 $CONFIGURE_ARGS 337.33 + fix libtool && 337.34 make && 337.35 make install 337.36 } 337.37 337.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 337.39 -genpkg_rules() 337.40 -{ 337.41 +genpkg_rules() { 337.42 case $PACKAGE in 337.43 *-libXtst) 337.44 copy @std 337.45 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 337.46 - xorg-libXext xorg-libXi" 337.47 + DEPENDS="xorg-libX11 xorg-libXext" 337.48 ;; 337.49 *-dev) 337.50 copy @dev 337.51 - DEPENDS="xorg-libXtst xorg-libxcb-dev xorg-libX11-dev \ 337.52 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXi-dev \ 337.53 - xorg-recordproto xorg-xextproto" 337.54 + DEPENDS="xorg-libXtst \ 337.55 + xorg-libX11-dev xorg-libXext-dev xorg-libXi-dev xorg-recordproto \ 337.56 + xorg-xextproto" 337.57 ;; 337.58 esac 337.59 }
338.1 --- a/xorg-libXv/receipt Sat Feb 24 10:43:01 2018 +0200 338.2 +++ b/xorg-libXv/receipt Sat Feb 24 16:17:33 2018 +0200 338.3 @@ -1,46 +1,41 @@ 338.4 # SliTaz package receipt v2. 338.5 338.6 PACKAGE="xorg-libXv" 338.7 -VERSION="1.0.10" 338.8 +VERSION="1.0.11" 338.9 CATEGORY="x-window" 338.10 SHORT_DESC="Xvideo extension library" 338.11 MAINTAINER="pankso@slitaz.org" 338.12 LICENSE="MIT" 338.13 WEB_SITE="https://www.x.org/wiki/" 338.14 -HOST_ARCH="i486 arm" 338.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 338.16 338.17 TARBALL="libXv-$VERSION.tar.bz2" 338.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 338.19 338.20 BUILD_DEPENDS="xorg-libXext-dev xorg-videoproto" 338.21 SPLIT="xorg-libXv-dev" 338.22 -PKG_RULE="std-dev" 338.23 338.24 -# Rules to configure and make the package. 338.25 -compile_rules() 338.26 -{ 338.27 +compile_rules() { 338.28 + fix ld 338.29 ./configure \ 338.30 --sysconfdir=/etc \ 338.31 --localstatedir=/var \ 338.32 $CONFIGURE_ARGS && 338.33 + fix libtool && 338.34 make && 338.35 make install 338.36 } 338.37 338.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 338.39 -genpkg_rules() 338.40 -{ 338.41 +genpkg_rules() { 338.42 case $PACKAGE in 338.43 *-libXv) 338.44 copy @std 338.45 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 338.46 - xorg-libXext" 338.47 + DEPENDS="xorg-libX11 xorg-libXext" 338.48 ;; 338.49 *-dev) 338.50 copy @dev 338.51 - DEPENDS="xorg-libXv xorg-libxcb-dev xorg-libX11-dev \ 338.52 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-videoproto \ 338.53 - xorg-xproto" 338.54 + DEPENDS="xorg-libXv \ 338.55 + xorg-libX11-dev xorg-libXext-dev xorg-videoproto xorg-xproto" 338.56 ;; 338.57 esac 338.58 }
339.1 --- a/xorg-libXvMC/receipt Sat Feb 24 10:43:01 2018 +0200 339.2 +++ b/xorg-libXvMC/receipt Sat Feb 24 16:17:33 2018 +0200 339.3 @@ -1,46 +1,42 @@ 339.4 # SliTaz package receipt v2. 339.5 339.6 PACKAGE="xorg-libXvMC" 339.7 -VERSION="1.0.9" 339.8 +VERSION="1.0.10" 339.9 CATEGORY="x-window" 339.10 SHORT_DESC="Xorg server module" 339.11 MAINTAINER="pankso@slitaz.org" 339.12 LICENSE="MIT" 339.13 WEB_SITE="https://www.x.org/wiki/" 339.14 -HOST_ARCH="i486 arm" 339.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 339.16 339.17 TARBALL="libXvMC-$VERSION.tar.bz2" 339.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 339.19 339.20 BUILD_DEPENDS="xorg-libXv-dev" 339.21 SPLIT="xorg-libXvMC-dev" 339.22 -PKG_RULE="std-dev" 339.23 339.24 -# Rules to configure and make the package. 339.25 -compile_rules() 339.26 -{ 339.27 +compile_rules() { 339.28 + fix ld 339.29 ./configure \ 339.30 --sysconfdir=/etc \ 339.31 --localstatedir=/var \ 339.32 $CONFIGURE_ARGS && 339.33 + fix libtool && 339.34 make && 339.35 make install 339.36 } 339.37 339.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 339.39 -genpkg_rules() 339.40 -{ 339.41 +genpkg_rules() { 339.42 case $PACKAGE in 339.43 *-libXvMC) 339.44 copy @std 339.45 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 339.46 - xorg-libXext xorg-libXv" 339.47 + DEPENDS="xorg-libX11 xorg-libXext" 339.48 ;; 339.49 *-dev) 339.50 copy @dev 339.51 - DEPENDS="xorg-libXvMC xorg-libxcb-dev xorg-libX11-dev \ 339.52 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXv-dev \ 339.53 - xorg-videoproto xorg-xproto" 339.54 + DEPENDS="xorg-libXvMC \ 339.55 + xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev xorg-videoproto \ 339.56 + xorg-xproto" 339.57 ;; 339.58 esac 339.59 }
340.1 --- a/xorg-libXxf86dga/receipt Sat Feb 24 10:43:01 2018 +0200 340.2 +++ b/xorg-libXxf86dga/receipt Sat Feb 24 16:17:33 2018 +0200 340.3 @@ -7,6 +7,7 @@ 340.4 MAINTAINER="pascal.bellard@slitaz.org" 340.5 LICENSE="MIT" 340.6 WEB_SITE="https://www.x.org/wiki/" 340.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 340.8 340.9 TARBALL="libXxf86dga-$VERSION.tar.bz2" 340.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 340.11 @@ -14,33 +15,28 @@ 340.12 BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libX11-dev xorg-xextproto \ 340.13 xorg-libXext-dev xorg-xf86dgaproto" 340.14 SPLIT="xorg-libXxf86dga-dev" 340.15 -PKG_RULE="std-dev" 340.16 340.17 -# Rules to configure and make the package. 340.18 -compile_rules() 340.19 -{ 340.20 +compile_rules() { 340.21 + fix ld 340.22 ./configure \ 340.23 --sysconfdir=/etc \ 340.24 --localstatedir=/var \ 340.25 $CONFIGURE_ARGS && 340.26 + fix libtool && 340.27 make && 340.28 make install 340.29 } 340.30 340.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 340.32 -genpkg_rules() 340.33 -{ 340.34 +genpkg_rules() { 340.35 case $PACKAGE in 340.36 *-libXxf86dga) 340.37 copy @std 340.38 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 340.39 - xorg-libXext" 340.40 + DEPENDS="xorg-libX11 xorg-libXext" 340.41 ;; 340.42 *-dev) 340.43 copy @dev 340.44 - DEPENDS="xorg-libXxf86dga xorg-libxcb-dev xorg-libX11-dev \ 340.45 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 340.46 - xorg-xf86dgaproto" 340.47 + DEPENDS="xorg-libXxf86dga \ 340.48 + xorg-libX11-dev xorg-libXext-dev xorg-xf86dgaproto" 340.49 ;; 340.50 esac 340.51 }
341.1 --- a/xorg-libXxf86misc/receipt Sat Feb 24 10:43:01 2018 +0200 341.2 +++ b/xorg-libXxf86misc/receipt Sat Feb 24 16:17:33 2018 +0200 341.3 @@ -14,33 +14,28 @@ 341.4 BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libX11-dev xorg-xextproto \ 341.5 xorg-libXext-dev xorg-xf86miscproto" 341.6 SPLIT="xorg-libXxf86misc-dev" 341.7 -PKG_RULE="std-dev" 341.8 341.9 -# Rules to configure and make the package. 341.10 -compile_rules() 341.11 -{ 341.12 +compile_rules() { 341.13 + fix ld 341.14 ./configure \ 341.15 --sysconfdir=/etc \ 341.16 --localstatedir=/var \ 341.17 $CONFIGURE_ARGS && 341.18 + fix libtool && 341.19 make && 341.20 make install 341.21 } 341.22 341.23 -# Rules to gen a SliTaz package suitable for Tazpkg. 341.24 -genpkg_rules() 341.25 -{ 341.26 +genpkg_rules() { 341.27 case $PACKAGE in 341.28 *-libXxf86misc) 341.29 copy @std 341.30 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 341.31 - xorg-libXext" 341.32 + DEPENDS="xorg-libX11 xorg-libXext" 341.33 ;; 341.34 *-dev) 341.35 copy @dev 341.36 - DEPENDS="xorg-libXxf86misc xorg-libxcb-dev xorg-libX11-dev \ 341.37 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 341.38 - xorg-xf86miscproto" 341.39 + DEPENDS="xorg-libXxf86misc \ 341.40 + xorg-libX11-dev xorg-libXext-dev xorg-xf86miscproto" 341.41 ;; 341.42 esac 341.43 }
342.1 --- a/xorg-libXxf86vm/receipt Sat Feb 24 10:43:01 2018 +0200 342.2 +++ b/xorg-libXxf86vm/receipt Sat Feb 24 16:17:33 2018 +0200 342.3 @@ -7,40 +7,35 @@ 342.4 MAINTAINER="pankso@slitaz.org" 342.5 LICENSE="MIT" 342.6 WEB_SITE="https://www.x.org/wiki/" 342.7 -HOST_ARCH="i486 arm" 342.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 342.9 342.10 TARBALL="libXxf86vm-$VERSION.tar.bz2" 342.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 342.12 342.13 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-xf86vidmodeproto" 342.14 SPLIT="xorg-libXxf86vm-dev" 342.15 -PKG_RULE="std-dev" 342.16 342.17 -# Rules to configure and make the package. 342.18 -compile_rules() 342.19 -{ 342.20 +compile_rules() { 342.21 + fix ld 342.22 ./configure \ 342.23 --sysconfdir=/etc \ 342.24 --localstatedir=/var \ 342.25 $CONFIGURE_ARGS && 342.26 + fix libtool && 342.27 make && 342.28 make install 342.29 } 342.30 342.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 342.32 -genpkg_rules() 342.33 -{ 342.34 +genpkg_rules() { 342.35 case $PACKAGE in 342.36 *-libXxf86vm) 342.37 copy @std 342.38 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp \ 342.39 - xorg-libXext" 342.40 + DEPENDS="xorg-libX11 xorg-libXext" 342.41 ;; 342.42 *-dev) 342.43 copy @dev 342.44 - DEPENDS="xorg-libXxf86vm xorg-libxcb-dev xorg-libX11-dev \ 342.45 - xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 342.46 - xorg-xf86vidmodeproto" 342.47 + DEPENDS="xorg-libXxf86vm \ 342.48 + xorg-libX11-dev xorg-libXext-dev xorg-xf86vidmodeproto" 342.49 ;; 342.50 esac 342.51 }
343.1 --- a/xorg-libdmx/receipt Sat Feb 24 10:43:01 2018 +0200 343.2 +++ b/xorg-libdmx/receipt Sat Feb 24 16:17:33 2018 +0200 343.3 @@ -7,38 +7,35 @@ 343.4 MAINTAINER="pankso@slitaz.org" 343.5 LICENSE="MIT" 343.6 WEB_SITE="https://www.x.org/wiki" 343.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 343.8 343.9 TARBALL="libdmx-$VERSION.tar.bz2" 343.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 343.11 343.12 BUILD_DEPENDS="xorg-dmxproto xorg-libX11-dev xorg-libXext-dev xorg-xextproto" 343.13 SPLIT="xorg-libdmx-dev" 343.14 -PKG_RULE="std-dev" 343.15 343.16 -# Rules to configure and make the package. 343.17 -compile_rules() 343.18 -{ 343.19 +compile_rules() { 343.20 + fix ld 343.21 ./configure \ 343.22 --sysconfdir=/etc \ 343.23 --localstatedir=/var \ 343.24 --disable-static \ 343.25 $CONFIGURE_ARGS && 343.26 + fix libtool && 343.27 make && make install 343.28 } 343.29 343.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 343.31 -genpkg_rules() 343.32 -{ 343.33 +genpkg_rules() { 343.34 case $PACKAGE in 343.35 *-libdmx) 343.36 copy @std 343.37 - DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 343.38 - xorg-libxcb" 343.39 + DEPENDS="xorg-libX11 xorg-libXext" 343.40 ;; 343.41 *-dev) 343.42 copy @dev 343.43 - DEPENDS="xorg-libdmx xorg-dmxproto xorg-libX11-dev xorg-libXau-dev \ 343.44 - xorg-libXdmcp-dev xorg-libXext-dev xorg-libxcb-dev" 343.45 + DEPENDS="xorg-libdmx \ 343.46 + xorg-dmxproto xorg-libX11-dev xorg-libXext-dev" 343.47 ;; 343.48 esac 343.49 }
344.1 --- a/xorg-libfontenc/receipt Sat Feb 24 10:43:01 2018 +0200 344.2 +++ b/xorg-libfontenc/receipt Sat Feb 24 16:17:33 2018 +0200 344.3 @@ -7,29 +7,26 @@ 344.4 MAINTAINER="pankso@slitaz.org" 344.5 LICENSE="MIT" 344.6 WEB_SITE="https://www.x.org/wiki/" 344.7 -HOST_ARCH="i486 arm" 344.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 344.9 344.10 TARBALL="libfontenc-$VERSION.tar.bz2" 344.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 344.12 344.13 BUILD_DEPENDS="zlib-dev xorg-xproto xorg-font-util-dev" 344.14 SPLIT="xorg-libfontenc-dev" 344.15 -PKG_RULE="std-dev" 344.16 344.17 -# Rules to configure and make the package. 344.18 -compile_rules() 344.19 -{ 344.20 +compile_rules() { 344.21 + fix ld 344.22 ./configure \ 344.23 --sysconfdir=/etc \ 344.24 --localstatedir=/var \ 344.25 $CONFIGURE_ARGS && 344.26 + fix libtool && 344.27 make && 344.28 make install 344.29 } 344.30 344.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 344.32 -genpkg_rules() 344.33 -{ 344.34 +genpkg_rules() { 344.35 case $PACKAGE in 344.36 *-libfontenc) 344.37 copy @std 344.38 @@ -37,7 +34,6 @@ 344.39 ;; 344.40 *-dev) 344.41 copy @dev 344.42 - DEPENDS="xorg-libfontenc zlib-dev" 344.43 ;; 344.44 esac 344.45 }
345.1 --- a/xorg-libpciaccess/receipt Sat Feb 24 10:43:01 2018 +0200 345.2 +++ b/xorg-libpciaccess/receipt Sat Feb 24 16:17:33 2018 +0200 345.3 @@ -1,24 +1,21 @@ 345.4 # SliTaz package receipt v2. 345.5 345.6 PACKAGE="xorg-libpciaccess" 345.7 -VERSION="0.13.4" 345.8 +VERSION="0.13.5" 345.9 CATEGORY="x-window" 345.10 SHORT_DESC="Xorg server module" 345.11 MAINTAINER="pankso@slitaz.org" 345.12 LICENSE="MIT" 345.13 WEB_SITE="https://www.x.org/wiki/" 345.14 -HOST_ARCH="i486 arm" 345.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 345.16 345.17 TARBALL="libpciaccess-$VERSION.tar.bz2" 345.18 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 345.19 345.20 BUILD_DEPENDS="xorg-util-macros" 345.21 SPLIT="xorg-libpciaccess-dev" 345.22 -PKG_RULE="std-dev" 345.23 345.24 -# Rules to configure and make the package. 345.25 -compile_rules() 345.26 -{ 345.27 +compile_rules() { 345.28 ./configure \ 345.29 --sysconfdir=/etc \ 345.30 --localstatedir=/var \ 345.31 @@ -27,15 +24,9 @@ 345.32 make install 345.33 } 345.34 345.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 345.36 -genpkg_rules() 345.37 -{ 345.38 +genpkg_rules() { 345.39 case $PACKAGE in 345.40 - *-libpciaccess) 345.41 - copy @std 345.42 - ;; 345.43 - *-dev) 345.44 - copy @dev 345.45 - ;; 345.46 + *-libpciaccess) copy @std;; 345.47 + *-dev) copy @dev;; 345.48 esac 345.49 }
346.1 --- a/xorg-libxcb/receipt Sat Feb 24 10:43:01 2018 +0200 346.2 +++ b/xorg-libxcb/receipt Sat Feb 24 16:17:33 2018 +0200 346.3 @@ -7,7 +7,7 @@ 346.4 MAINTAINER="pankso@slitaz.org" 346.5 LICENSE="MIT" 346.6 WEB_SITE="https://xcb.freedesktop.org/" 346.7 -HOST_ARCH="i486 arm" 346.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libxcb.html" 346.9 346.10 TARBALL="libxcb-$VERSION.tar.bz2" 346.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 346.12 @@ -15,7 +15,6 @@ 346.13 BUILD_DEPENDS="libxslt-dev xorg-xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \ 346.14 autoconf automake libtool" 346.15 SPLIT="xorg-libxcb-dev" 346.16 -PKG_RULE="std-dev" 346.17 346.18 # Handle SliTaz arch 346.19 case "$SLITAZ_ARCH" in 346.20 @@ -30,26 +29,24 @@ 346.21 ;; 346.22 esac 346.23 346.24 -# Rules to configure and make the package. 346.25 -compile_rules() 346.26 -{ 346.27 +compile_rules() { 346.28 # Package "libpthread-stubs" no more needed: 346.29 # our platform already supply all the necessary pthread stubs. 346.30 sed -i "s|pthread-stubs||" $src/configure.ac 346.31 346.32 + fix ld 346.33 autoreconf -fi && 346.34 ./configure \ 346.35 --enable-xinput \ 346.36 --enable-xprint \ 346.37 --docdir='${datadir}'/doc/$PACKAGE-$VERSION \ 346.38 $CONFIGURE_ARGS && 346.39 + fix libtool && 346.40 make && 346.41 make DESTDIR=$DESTDIR install 346.42 } 346.43 346.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 346.45 -genpkg_rules() 346.46 -{ 346.47 +genpkg_rules() { 346.48 case $PACKAGE in 346.49 *-libxcb) 346.50 copy @std
347.1 --- a/xorg-libxkbfile/receipt Sat Feb 24 10:43:01 2018 +0200 347.2 +++ b/xorg-libxkbfile/receipt Sat Feb 24 16:17:33 2018 +0200 347.3 @@ -7,7 +7,7 @@ 347.4 MAINTAINER="pankso@slitaz.org" 347.5 LICENSE="MIT" 347.6 WEB_SITE="https://www.x.org/wiki/" 347.7 -HOST_ARCH="i486 arm" 347.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 347.9 347.10 TARBALL="libxkbfile-$VERSION.tar.bz2" 347.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 347.12 @@ -15,29 +15,27 @@ 347.13 BUILD_DEPENDS="xorg-libX11-dev libxcb-dev xorg-libXau-dev xorg-libXdmcp-dev" 347.14 SPLIT="xorg-libxkbfile-dev" 347.15 347.16 -# Rules to configure and make the package. 347.17 -compile_rules() 347.18 -{ 347.19 +compile_rules() { 347.20 + fix ld 347.21 ./configure \ 347.22 --sysconfdir=/etc \ 347.23 --localstatedir=/var \ 347.24 $CONFIGURE_ARGS && 347.25 + fix libtool && 347.26 make && 347.27 make install 347.28 } 347.29 347.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 347.31 -genpkg_rules() 347.32 -{ 347.33 +genpkg_rules() { 347.34 case $PACKAGE in 347.35 *-libxkbfile) 347.36 copy @std 347.37 - DEPENDS="xorg-libxcb xorg-libX11 xorg-libXau xorg-libXdmcp" 347.38 + DEPENDS="xorg-libX11" 347.39 ;; 347.40 *-dev) 347.41 copy @dev 347.42 - DEPENDS="xorg-libxkbfile xorg-libxcb-dev xorg-kbproto \ 347.43 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev" 347.44 + DEPENDS="xorg-libxkbfile \ 347.45 + xorg-kbproto xorg-libX11-dev" 347.46 ;; 347.47 esac 347.48 }
348.1 --- a/xorg-libxshmfence/receipt Sat Feb 24 10:43:01 2018 +0200 348.2 +++ b/xorg-libxshmfence/receipt Sat Feb 24 16:17:33 2018 +0200 348.3 @@ -7,18 +7,15 @@ 348.4 MAINTAINER="al.bobylev@gmail.com" 348.5 LICENSE="MIT" 348.6 WEB_SITE="https://www.x.org/wiki/" 348.7 -HOST_ARCH="i486 arm" 348.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 348.9 348.10 TARBALL="libxshmfence-$VERSION.tar.bz2" 348.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 348.12 348.13 BUILD_DEPENDS="xorg-xproto" 348.14 SPLIT="xorg-libxshmfence-dev" 348.15 -PKG_RULE="std-dev" 348.16 348.17 -# Rules to configure and make the package. 348.18 -compile_rules() 348.19 -{ 348.20 +compile_rules() { 348.21 ./configure \ 348.22 --sysconfdir=/etc \ 348.23 --localstatedir=/var \ 348.24 @@ -27,9 +24,7 @@ 348.25 make install 348.26 } 348.27 348.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 348.29 -genpkg_rules() 348.30 -{ 348.31 +genpkg_rules() { 348.32 case $PACKAGE in 348.33 *-libxshmfence) copy @std;; 348.34 *-dev) copy @dev;;
349.1 --- a/xorg-luit/receipt Sat Feb 24 10:43:01 2018 +0200 349.2 +++ b/xorg-luit/receipt Sat Feb 24 16:17:33 2018 +0200 349.3 @@ -7,16 +7,14 @@ 349.4 MAINTAINER="al.bobylev@gmail.com" 349.5 LICENSE="MIT" 349.6 WEB_SITE="https://www.x.org/wiki/" 349.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 349.8 349.9 TARBALL="luit-$VERSION.tar.bz2" 349.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 349.11 349.12 BUILD_DEPENDS="xorg-util-macros xorg-libfontenc-dev xorg-libX11-dev" 349.13 -PKG_RULE="std" 349.14 349.15 -# Rules to configure and make the package. 349.16 -compile_rules() 349.17 -{ 349.18 +compile_rules() { 349.19 line1="#ifdef _XOPEN_SOURCE" 349.20 line2="# undef _XOPEN_SOURCE" 349.21 line3="# define _XOPEN_SOURCE 600" 349.22 @@ -24,17 +22,17 @@ 349.23 sed -i -e "s@#ifdef HAVE_CONFIG_H@$line1\n$line2\n$line3\n$line4\n\n&@" sys.c 349.24 unset line1 line2 line3 line4 349.25 349.26 + fix ld 349.27 ./configure \ 349.28 --sysconfdir=/etc \ 349.29 --localstatedir=/var \ 349.30 $CONFIGURE_ARGS && 349.31 + fix libtool && 349.32 make && 349.33 make install 349.34 } 349.35 349.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 349.37 -genpkg_rules() 349.38 -{ 349.39 +genpkg_rules() { 349.40 copy @std 349.41 DEPENDS="xorg-libfontenc" 349.42 }
350.1 --- a/xorg-mkfontdir/receipt Sat Feb 24 10:43:01 2018 +0200 350.2 +++ b/xorg-mkfontdir/receipt Sat Feb 24 16:17:33 2018 +0200 350.3 @@ -7,28 +7,26 @@ 350.4 MAINTAINER="pascal.bellard@slitaz.org" 350.5 LICENSE="MIT" 350.6 WEB_SITE="https://www.x.org/wiki/" 350.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 350.8 350.9 TARBALL="mkfontdir-$VERSION.tar.bz2" 350.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 350.11 350.12 BUILD_DEPENDS="xorg-util-macros" 350.13 -PKG_RULE="std" 350.14 350.15 -# Rules to configure and make the package. 350.16 -compile_rules() 350.17 -{ 350.18 +compile_rules() { 350.19 + fix ld 350.20 ./configure \ 350.21 --sysconfdir=/etc \ 350.22 --localstatedir=/var \ 350.23 $CONFIGURE_ARGS && 350.24 + fix libtool && 350.25 make && 350.26 make install 350.27 } 350.28 350.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 350.30 -genpkg_rules() 350.31 -{ 350.32 +genpkg_rules() { 350.33 copy @std 350.34 - DEPENDS="xorg-mkfontscale" 350.35 + DEPENDS=" xorg-mkfontscale" 350.36 TAGS="utility xorg fonts" 350.37 }
351.1 --- a/xorg-mkfontscale/receipt Sat Feb 24 10:43:01 2018 +0200 351.2 +++ b/xorg-mkfontscale/receipt Sat Feb 24 16:17:33 2018 +0200 351.3 @@ -7,27 +7,25 @@ 351.4 MAINTAINER="pascal.bellard@slitaz.org" 351.5 LICENSE="MIT" 351.6 WEB_SITE="https://www.x.org/wiki/" 351.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 351.8 351.9 TARBALL="mkfontscale-$VERSION.tar.bz2" 351.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 351.11 351.12 BUILD_DEPENDS="xorg-util-macros xorg-libfontenc-dev freetype-dev xorg-xproto" 351.13 -PKG_RULE="std" 351.14 351.15 -# Rules to configure and make the package. 351.16 -compile_rules() 351.17 -{ 351.18 +compile_rules() { 351.19 + fix ld 351.20 ./configure \ 351.21 --sysconfdir=/etc \ 351.22 --localstatedir=/var \ 351.23 $CONFIGURE_ARGS && 351.24 + fix libtool && 351.25 make && 351.26 make install 351.27 } 351.28 351.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 351.30 -genpkg_rules() 351.31 -{ 351.32 +genpkg_rules() { 351.33 copy @std 351.34 DEPENDS="freetype xorg-libfontenc zlib" 351.35 TAGS="utility xorg fonts"
352.1 --- a/xorg-pixman/receipt Sat Feb 24 10:43:01 2018 +0200 352.2 +++ b/xorg-pixman/receipt Sat Feb 24 16:17:33 2018 +0200 352.3 @@ -7,7 +7,6 @@ 352.4 MAINTAINER="pankso@slitaz.org" 352.5 LICENSE="MIT" 352.6 WEB_SITE="https://www.cairographics.org/" 352.7 -HOST_ARCH="i486 arm" 352.8 352.9 TARBALL="pixman-$VERSION.tar.bz2" 352.10 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 352.11 @@ -16,9 +15,7 @@ 352.12 SPLIT="xorg-pixman-dev" 352.13 PKG_RULE="std-dev" 352.14 352.15 -# Rules to configure and make the package. 352.16 -compile_rules() 352.17 -{ 352.18 +compile_rules() { 352.19 ./configure \ 352.20 --sysconfdir=/etc \ 352.21 --localstatedir=/var \ 352.22 @@ -27,9 +24,7 @@ 352.23 make install 352.24 } 352.25 352.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 352.27 -genpkg_rules() 352.28 -{ 352.29 +genpkg_rules() { 352.30 case $PACKAGE in 352.31 *-pixman) 352.32 copy @std
353.1 --- a/xorg-presentproto/receipt Sat Feb 24 10:43:01 2018 +0200 353.2 +++ b/xorg-presentproto/receipt Sat Feb 24 16:17:33 2018 +0200 353.3 @@ -1,22 +1,20 @@ 353.4 # SliTaz package receipt v2. 353.5 353.6 PACKAGE="xorg-presentproto" 353.7 -VERSION="1.0" 353.8 +VERSION="1.1" 353.9 CATEGORY="development" 353.10 SHORT_DESC="Present extension headers" 353.11 MAINTAINER="pascal.bellard@slitaz.org" 353.12 LICENSE="MIT" 353.13 WEB_SITE="https://www.x.org/wiki/" 353.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 353.15 353.16 TARBALL="presentproto-$VERSION.tar.bz2" 353.17 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 353.18 353.19 BUILD_DEPENDS="xorg-util-macros" 353.20 -PKG_RULE="dev" 353.21 353.22 -# Rules to configure and make the package. 353.23 -compile_rules() 353.24 -{ 353.25 +compile_rules() { 353.26 ./configure \ 353.27 --sysconfdir=/etc \ 353.28 --localstatedir=/var \ 353.29 @@ -25,9 +23,7 @@ 353.30 make install 353.31 } 353.32 353.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 353.34 -genpkg_rules() 353.35 -{ 353.36 +genpkg_rules() { 353.37 copy @dev 353.38 DEPENDS="xorg-util-macros" 353.39 }
354.1 --- a/xorg-randrproto/receipt Sat Feb 24 10:43:01 2018 +0200 354.2 +++ b/xorg-randrproto/receipt Sat Feb 24 16:17:33 2018 +0200 354.3 @@ -7,17 +7,14 @@ 354.4 MAINTAINER="pankso@slitaz.org" 354.5 LICENSE="MIT" 354.6 WEB_SITE="https://www.x.org/wiki/" 354.7 -HOST_ARCH="i486 arm" 354.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 354.9 354.10 TARBALL="randrproto-$VERSION.tar.bz2" 354.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 354.12 354.13 BUILD_DEPENDS="xorg-util-macros" 354.14 -PKG_RULE="dev" 354.15 354.16 -# Rules to configure and make the package. 354.17 -compile_rules() 354.18 -{ 354.19 +compile_rules() { 354.20 ./configure \ 354.21 --sysconfdir=/etc \ 354.22 --localstatedir=/var \ 354.23 @@ -26,9 +23,7 @@ 354.24 make install 354.25 } 354.26 354.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 354.28 -genpkg_rules() 354.29 -{ 354.30 +genpkg_rules() { 354.31 copy @dev 354.32 DEPENDS="xorg-renderproto" 354.33 }
355.1 --- a/xorg-recordproto/receipt Sat Feb 24 10:43:01 2018 +0200 355.2 +++ b/xorg-recordproto/receipt Sat Feb 24 16:17:33 2018 +0200 355.3 @@ -7,17 +7,14 @@ 355.4 MAINTAINER="pankso@slitaz.org" 355.5 LICENSE="MIT" 355.6 WEB_SITE="https://www.x.org/wiki/" 355.7 -HOST_ARCH="i486 arm" 355.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 355.9 355.10 TARBALL="recordproto-$VERSION.tar.bz2" 355.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 355.12 355.13 BUILD_DEPENDS="xorg-util-macros" 355.14 -PKG_RULE="dev" 355.15 355.16 -# Rules to configure and make the package. 355.17 -compile_rules() 355.18 -{ 355.19 +compile_rules() { 355.20 ./configure \ 355.21 --sysconfdir=/etc \ 355.22 --localstatedir=/var \ 355.23 @@ -26,9 +23,7 @@ 355.24 make install 355.25 } 355.26 355.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 355.28 -genpkg_rules() 355.29 -{ 355.30 +genpkg_rules() { 355.31 copy @dev 355.32 DEPENDS="xorg-util-macros" 355.33 }
356.1 --- a/xorg-renderproto/receipt Sat Feb 24 10:43:01 2018 +0200 356.2 +++ b/xorg-renderproto/receipt Sat Feb 24 16:17:33 2018 +0200 356.3 @@ -7,17 +7,14 @@ 356.4 MAINTAINER="pankso@slitaz.org" 356.5 LICENSE="MIT" 356.6 WEB_SITE="https://www.x.org/wiki/" 356.7 -HOST_ARCH="i486 arm" 356.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 356.9 356.10 TARBALL="renderproto-$VERSION.tar.bz2" 356.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 356.12 356.13 BUILD_DEPENDS="xorg-util-macros" 356.14 -PKG_RULE="dev" 356.15 356.16 -# Rules to configure and make the package. 356.17 -compile_rules() 356.18 -{ 356.19 +compile_rules() { 356.20 ./configure \ 356.21 --sysconfdir=/etc \ 356.22 --localstatedir=/var \ 356.23 @@ -26,9 +23,7 @@ 356.24 make install 356.25 } 356.26 356.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 356.28 -genpkg_rules() 356.29 -{ 356.30 +genpkg_rules() { 356.31 copy @dev 356.32 DEPENDS="xorg-xproto" 356.33 }
357.1 --- a/xorg-resourceproto/receipt Sat Feb 24 10:43:01 2018 +0200 357.2 +++ b/xorg-resourceproto/receipt Sat Feb 24 16:17:33 2018 +0200 357.3 @@ -7,17 +7,14 @@ 357.4 MAINTAINER="pankso@slitaz.org" 357.5 LICENSE="MIT" 357.6 WEB_SITE="https://www.x.org/wiki/" 357.7 -HOST_ARCH="i486 arm" 357.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 357.9 357.10 TARBALL="resourceproto-$VERSION.tar.bz2" 357.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 357.12 357.13 BUILD_DEPENDS="xorg-util-macros" 357.14 -PKG_RULE="dev" 357.15 357.16 -# Rules to configure and make the package. 357.17 -compile_rules() 357.18 -{ 357.19 +compile_rules() { 357.20 ./configure \ 357.21 --sysconfdir=/etc \ 357.22 --localstatedir=/var \ 357.23 @@ -26,9 +23,7 @@ 357.24 make install 357.25 } 357.26 357.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 357.28 -genpkg_rules() 357.29 -{ 357.30 +genpkg_rules() { 357.31 copy @dev 357.32 DEPENDS="xorg-util-macros" 357.33 }
358.1 --- a/xorg-scrnsaverproto/receipt Sat Feb 24 10:43:01 2018 +0200 358.2 +++ b/xorg-scrnsaverproto/receipt Sat Feb 24 16:17:33 2018 +0200 358.3 @@ -7,17 +7,14 @@ 358.4 MAINTAINER="pankso@slitaz.org" 358.5 LICENSE="other" 358.6 WEB_SITE="https://www.x.org/wiki/" 358.7 -HOST_ARCH="i486 arm" 358.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 358.9 358.10 TARBALL="scrnsaverproto-$VERSION.tar.bz2" 358.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 358.12 358.13 BUILD_DEPENDS="xorg-util-macros" 358.14 -PKG_RULE="dev" 358.15 358.16 -# Rules to configure and make the package. 358.17 -compile_rules() 358.18 -{ 358.19 +compile_rules() { 358.20 ./configure \ 358.21 --sysconfdir=/etc \ 358.22 --localstatedir=/var \ 358.23 @@ -26,9 +23,7 @@ 358.24 make install 358.25 } 358.26 358.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 358.28 -genpkg_rules() 358.29 -{ 358.30 +genpkg_rules() { 358.31 copy @dev 358.32 DEPENDS="xorg-util-macros" 358.33 }
359.1 --- a/xorg-server/receipt Sat Feb 24 10:43:01 2018 +0200 359.2 +++ b/xorg-server/receipt Sat Feb 24 16:17:33 2018 +0200 359.3 @@ -7,13 +7,14 @@ 359.4 MAINTAINER="pankso@slitaz.org" 359.5 LICENSE="MIT" 359.6 WEB_SITE="https://www.x.org/wiki/" 359.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xorg-server.html" 359.8 359.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 359.10 WGET_URL="$XORG_MIRROR/xserver/$TARBALL" 359.11 359.12 BUILD_DEPENDS="patch xorg-util-macros xorg-pixman-dev eudev-dev dbus-dev \ 359.13 xorg-dri2proto xorg-dri3proto xorg-libxshmfence-dev libdrm-dev xorg-libX11-dev \ 359.14 -xorg-glproto mesa-dev xorg-libXdmcp-dev libgcrypt-dev xorg-xcmiscproto \ 359.15 +xorg-glproto mesa17-dev xorg-libXdmcp-dev libgcrypt-dev xorg-xcmiscproto \ 359.16 xorg-bigreqsproto xorg-randrproto xorg-renderproto xorg-fontsproto \ 359.17 xorg-videoproto xorg-compositeproto xorg-recordproto xorg-scrnsaverproto \ 359.18 xorg-resourceproto xorg-xf86driproto xorg-presentproto xorg-xineramaproto \ 359.19 @@ -24,14 +25,14 @@ 359.20 xorg-libXfixes-dev xorg-libXi-dev xorg-dmxproto xorg-libXau-dev \ 359.21 xorg-libXdmcp-dev libepoxy-dev tslib-dev xorg-xcb-util-renderutil-dev \ 359.22 xorg-xcb-util-dev xorg-xcb-util-image-dev xorg-xcb-util-wm-dev \ 359.23 -xorg-xcb-util-keysyms-dev expat-dev" 359.24 +xorg-xcb-util-keysyms-dev expat-dev xorg-xtrans" 359.25 SPLIT="xorg-server-Xdmx xorg-server-Xephyr xorg-server-Xfbdev \ 359.26 xorg-server-Xnest xorg-server-Xvfb xorg-server-module-glamor xorg-server-dev \ 359.27 xorg-server" 359.28 +COOKOPTS="skip-log-errors" 359.29 359.30 -# Rules to configure and make the package. 359.31 -compile_rules() 359.32 -{ 359.33 +compile_rules() { 359.34 + fix ld 359.35 ./configure \ 359.36 --sysconfdir=/etc \ 359.37 --localstatedir=/var \ 359.38 @@ -57,99 +58,75 @@ 359.39 --with-vendor-web="http://www.slitaz.org/" \ 359.40 --with-builder-addr="devel@slitaz.org" \ 359.41 $CONFIGURE_ARGS && 359.42 + fix libtool && 359.43 make && make DESTDIR=$install install && 359.44 359.45 mkdir -pv $install/etc/X11/xorg.conf.d 359.46 } 359.47 359.48 -# Rules to gen a SliTaz package suitable for Tazpkg. 359.49 -genpkg_rules() 359.50 -{ 359.51 +genpkg_rules() { 359.52 case $PACKAGE in 359.53 *-Xdmx) 359.54 copy Xdmx 359.55 # chmod 4711 $fs/usr/bin/Xdmx 359.56 CAT="x-window|DMX X server" 359.57 - DEPENDS="bzlib freetype glib libgcrypt libgpg-error libharfbuzz \ 359.58 - libpng16 pcre xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 359.59 - xorg-libXfixes xorg-libXfont2 xorg-libXi xorg-libXmu \ 359.60 - xorg-libXrender xorg-libfontenc xorg-libxcb xorg-libxshmfence \ 359.61 - xorg-pixman zlib" 359.62 + DEPENDS="libgcrypt xorg-libX11 xorg-libXau xorg-libXdmcp \ 359.63 + xorg-libXext xorg-libXfixes xorg-libXfont2 xorg-libXi xorg-libXmu \ 359.64 + xorg-libXrender xorg-pixman" 359.65 ;; 359.66 *-Xephyr) 359.67 copy Xephyr 359.68 # chmod 4711 $fs/usr/bin/Xephyr 359.69 CAT="x-window|Xephyr X server" 359.70 - DEPENDS="bzlib eudev expat freetype glib libdrm libepoxy libgcrypt \ 359.71 - libgpg-error libharfbuzz libpng16 mesa pcre tslib xorg-libX11 \ 359.72 - xorg-libXau xorg-libXdamage xorg-libXdmcp xorg-libXext \ 359.73 - xorg-libXfixes xorg-libXfont2 xorg-libXxf86vm xorg-libfontenc \ 359.74 - xorg-libxcb xorg-libxshmfence xorg-pixman xorg-xcb-util \ 359.75 - xorg-xcb-util-image xorg-xcb-util-keysyms xorg-xcb-util-renderutil \ 359.76 - xorg-xcb-util-wm zlib" 359.77 + DEPENDS="eudev libepoxy libgcrypt mesa17 xorg-libX11 xorg-libXau \ 359.78 + xorg-libXdmcp xorg-libXfont2 xorg-libxcb xorg-libxshmfence \ 359.79 + xorg-pixman xorg-xcb-util xorg-xcb-util-image \ 359.80 + xorg-xcb-util-keysyms xorg-xcb-util-renderutil xorg-xcb-util-wm" 359.81 ;; 359.82 *-Xfbdev) 359.83 copy Xfbdev 359.84 # chmod 4711 $fs/usr/bin/Xfbdev 359.85 CAT="x-window|Xfbdev framebuffer X server" 359.86 - DEPENDS="bzlib eudev expat freetype glib libdrm libgcrypt \ 359.87 - libgpg-error libharfbuzz libpng16 mesa pcre tslib xorg-libX11 \ 359.88 - xorg-libXau xorg-libXdamage xorg-libXdmcp xorg-libXext \ 359.89 - xorg-libXfixes xorg-libXfont2 xorg-libXxf86vm xorg-libfontenc \ 359.90 - xorg-libxcb xorg-libxshmfence xorg-pixman zlib" 359.91 + DEPENDS="eudev libgcrypt tslib xorg-libXau xorg-libXdmcp \ 359.92 + xorg-libXfont2 xorg-pixman" 359.93 ;; 359.94 *-Xnest) 359.95 copy Xnest 359.96 # chmod 4711 $fs/usr/bin/Xnest 359.97 CAT="x-window|Xnest X server" 359.98 - DEPENDS="bzlib expat freetype glib libdrm libgcrypt libgpg-error \ 359.99 - libharfbuzz libpng16 mesa pcre xorg-libX11 xorg-libXau \ 359.100 - xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \ 359.101 - xorg-libXfont2 xorg-libXxf86vm xorg-libfontenc xorg-libxcb \ 359.102 - xorg-libxshmfence xorg-pixman zlib" 359.103 + DEPENDS="libgcrypt xorg-libX11 xorg-libXau xorg-libXdmcp \ 359.104 + xorg-libXext xorg-libXfont2 xorg-pixman" 359.105 ;; 359.106 *-Xvfb) 359.107 copy Xvfb 359.108 # chmod 4711 $fs/usr/bin/Xvfb 359.109 CAT="x-window|Xvfb X server" 359.110 - DEPENDS="bzlib expat freetype glib libdrm libgcrypt libgpg-error \ 359.111 - libharfbuzz libpng16 mesa pcre xorg-libX11 xorg-libXau \ 359.112 - xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \ 359.113 - xorg-libXfont2 xorg-libXxf86vm xorg-libfontenc xorg-libxcb \ 359.114 - xorg-libxshmfence xorg-pixman zlib" 359.115 + DEPENDS="libgcrypt mesa17 xorg-libXau xorg-libXdmcp xorg-libXfont2 \ 359.116 + xorg-pixman" 359.117 ;; 359.118 *-module-glamor) 359.119 copy libglamoregl.so libglx.so 359.120 CAT="x-window|Glamor DIX (Device Independent X) module" 359.121 - DEPENDS="expat libdrm libepoxy mesa xorg-libX11 xorg-libXau \ 359.122 - xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \ 359.123 - xorg-libXxf86vm xorg-libxcb xorg-libxshmfence" 359.124 + DEPENDS="libdrm libepoxy mesa17 mesa17-libgbm" 359.125 ;; 359.126 *-dev) 359.127 copy @dev protocol.txt 359.128 DEPENDS="xorg-server xorg-server-Xdmx xorg-server-Xephyr \ 359.129 xorg-server-Xfbdev xorg-server-Xnest xorg-server-Xvfb \ 359.130 xorg-server-module-glamor \ 359.131 - eudev-dev expat-dev libdrm-dev libepoxy-dev mesa-dev \ 359.132 - xorg-dri2proto xorg-dri3proto xorg-fontsproto xorg-glproto \ 359.133 - xorg-inputproto xorg-kbproto xorg-libX11-dev xorg-libXau-dev \ 359.134 - xorg-libXdamage-dev xorg-libXdmcp-dev xorg-libXext-dev \ 359.135 - xorg-libXfixes-dev xorg-libXxf86vm-dev xorg-libpciaccess-dev \ 359.136 - xorg-libxcb-dev xorg-libxshmfence-dev xorg-pixman-dev \ 359.137 - xorg-presentproto xorg-randrproto xorg-renderproto \ 359.138 + mesa17-dev xorg-dri2proto xorg-dri3proto xorg-fontsproto \ 359.139 + xorg-glproto xorg-inputproto xorg-kbproto xorg-libpciaccess-dev \ 359.140 + xorg-pixman-dev xorg-presentproto xorg-randrproto xorg-renderproto \ 359.141 xorg-resourceproto xorg-scrnsaverproto xorg-videoproto \ 359.142 xorg-xextproto xorg-xf86driproto xorg-xineramaproto xorg-xproto" 359.143 ;; 359.144 *-server) 359.145 - copy @std var/log/ xorg.conf.d/ 359.146 - remove_already_packed 359.147 + copy @std var/log/ xorg.conf.d/ @rm 359.148 CAT="x-window|core X server" 359.149 - DEPENDS="bzlib eudev freetype glib libdrm libgcrypt libgpg-error \ 359.150 - libharfbuzz libpng16 pcre util-linux-uuid xorg-libICE xorg-libSM \ 359.151 - xorg-libX11 xorg-libXau xorg-libXaw xorg-libXdmcp xorg-libXext \ 359.152 - xorg-libXfont2 xorg-libXmu xorg-libXpm xorg-libXt xorg-libdmx \ 359.153 - xorg-libfontenc xorg-libpciaccess xorg-libxcb xorg-libxshmfence \ 359.154 - xorg-pixman zlib xorg-xkeyboard-config xorg-xkbcomp" 359.155 + DEPENDS="eudev libdrm libgcrypt xorg-libX11 xorg-libXau \ 359.156 + xorg-libXaw xorg-libXdmcp xorg-libXfont2 xorg-libXt xorg-libdmx \ 359.157 + xorg-libpciaccess xorg-libxshmfence xorg-pixman \ 359.158 + xorg-xkeyboard-config xorg-xkbcomp" 359.159 SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa" 359.160 ;; 359.161 esac
360.1 --- a/xorg-sessreg/receipt Sat Feb 24 10:43:01 2018 +0200 360.2 +++ b/xorg-sessreg/receipt Sat Feb 24 16:17:33 2018 +0200 360.3 @@ -1,22 +1,20 @@ 360.4 # SliTaz package receipt v2. 360.5 360.6 PACKAGE="xorg-sessreg" 360.7 -VERSION="1.1.0" 360.8 +VERSION="1.1.1" 360.9 CATEGORY="x-window" 360.10 SHORT_DESC="Register X sessions in system utmp/utmpx databases" 360.11 MAINTAINER="al.bobylev@gmail.com" 360.12 LICENSE="MIT" 360.13 WEB_SITE="https://www.x.org/wiki/" 360.14 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 360.15 360.16 TARBALL="sessreg-$VERSION.tar.bz2" 360.17 WGET_URL="$XORG_MIRROR/app/$TARBALL" 360.18 360.19 BUILD_DEPENDS="xorg-util-macros xorg-xproto" 360.20 -PKG_RULE="std" 360.21 360.22 -# Rules to configure and make the package. 360.23 -compile_rules() 360.24 -{ 360.25 +compile_rules() { 360.26 sed -e 's/\$(CPP) \$(DEFS)/$(CPP) -P $(DEFS)/' -i man/Makefile.in 360.27 360.28 ./configure \ 360.29 @@ -27,8 +25,6 @@ 360.30 make install 360.31 } 360.32 360.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 360.34 -genpkg_rules() 360.35 -{ 360.36 +genpkg_rules() { 360.37 copy @std 360.38 }
361.1 --- a/xorg-setxkbmap/receipt Sat Feb 24 10:43:01 2018 +0200 361.2 +++ b/xorg-setxkbmap/receipt Sat Feb 24 16:17:33 2018 +0200 361.3 @@ -7,28 +7,25 @@ 361.4 MAINTAINER="pascal.bellard@slitaz.org" 361.5 LICENSE="MIT" 361.6 WEB_SITE="https://www.x.org/wiki/" 361.7 -HOST_ARCH="i486 arm" 361.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 361.9 361.10 TARBALL="setxkbmap-$VERSION.tar.bz2" 361.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 361.12 361.13 BUILD_DEPENDS="xorg-util-macros xorg-libxkbfile-dev xorg-libX11-dev" 361.14 -PKG_RULE="std" 361.15 361.16 -# Rules to configure and make the package. 361.17 -compile_rules() 361.18 -{ 361.19 +compile_rules() { 361.20 + fix ld 361.21 ./configure \ 361.22 --sysconfdir=/etc \ 361.23 --localstatedir=/var \ 361.24 $CONFIGURE_ARGS && 361.25 + fix libtool && 361.26 make && 361.27 make install 361.28 } 361.29 361.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 361.31 -genpkg_rules() 361.32 -{ 361.33 +genpkg_rules() { 361.34 copy @std 361.35 DEPENDS="xorg-libX11 xorg-libxkbfile" # xorg-xkeyboard-config? 361.36 }
362.1 --- a/xorg-smproxy/receipt Sat Feb 24 10:43:01 2018 +0200 362.2 +++ b/xorg-smproxy/receipt Sat Feb 24 16:17:33 2018 +0200 362.3 @@ -7,28 +7,26 @@ 362.4 MAINTAINER="al.bobylev@gmail.com" 362.5 LICENSE="MIT" 362.6 WEB_SITE="https://www.x.org/wiki/" 362.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 362.8 362.9 TARBALL="smproxy-$VERSION.tar.bz2" 362.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 362.11 362.12 BUILD_DEPENDS="xorg-util-macros xorg-libSM-dev xorg-libICE-dev xorg-libXt-dev \ 362.13 xorg-libXmu-dev" 362.14 -PKG_RULE="std" 362.15 362.16 -# Rules to configure and make the package. 362.17 -compile_rules() 362.18 -{ 362.19 +compile_rules() { 362.20 + fix ld 362.21 ./configure \ 362.22 --sysconfdir=/etc \ 362.23 --localstatedir=/var \ 362.24 $CONFIGURE_ARGS && 362.25 + fix libtool && 362.26 make && 362.27 make install 362.28 } 362.29 362.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 362.31 -genpkg_rules() 362.32 -{ 362.33 +genpkg_rules() { 362.34 copy @std 362.35 DEPENDS="xorg-libICE xorg-libSM xorg-libX11 xorg-libXmu xorg-libXt" 362.36 }
363.1 --- a/xorg-util-macros/receipt Sat Feb 24 10:43:01 2018 +0200 363.2 +++ b/xorg-util-macros/receipt Sat Feb 24 16:17:33 2018 +0200 363.3 @@ -1,22 +1,18 @@ 363.4 # SliTaz package receipt v2. 363.5 363.6 PACKAGE="xorg-util-macros" 363.7 -VERSION="1.19.0" 363.8 +VERSION="1.19.1" 363.9 CATEGORY="development" 363.10 SHORT_DESC="Autoconf macros used in X modular configure.ac files" 363.11 MAINTAINER="gokhlayeh@slitaz.org" 363.12 LICENSE="MIT" 363.13 WEB_SITE="https://www.x.org/wiki/" 363.14 -HOST_ARCH="i486 arm x86_64" 363.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/util-macros.html" 363.16 363.17 TARBALL="util-macros-$VERSION.tar.bz2" 363.18 WGET_URL="$XORG_MIRROR/util/$TARBALL" 363.19 363.20 -PKG_RULE="dev" 363.21 - 363.22 -# Rules to configure and make the package. 363.23 -compile_rules() 363.24 -{ 363.25 +compile_rules() { 363.26 ./configure \ 363.27 --sysconfdir=/etc \ 363.28 --localstatedir=/var \ 363.29 @@ -25,9 +21,7 @@ 363.30 make install 363.31 } 363.32 363.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 363.34 -genpkg_rules() 363.35 -{ 363.36 +genpkg_rules() { 363.37 copy @dev 363.38 DEPENDS="m4" 363.39 }
364.1 --- a/xorg-videoproto/receipt Sat Feb 24 10:43:01 2018 +0200 364.2 +++ b/xorg-videoproto/receipt Sat Feb 24 16:17:33 2018 +0200 364.3 @@ -7,17 +7,14 @@ 364.4 MAINTAINER="pankso@slitaz.org" 364.5 LICENSE="MIT" 364.6 WEB_SITE="https://www.x.org/wiki/" 364.7 -HOST_ARCH="i486 arm" 364.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 364.9 364.10 TARBALL="videoproto-$VERSION.tar.bz2" 364.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 364.12 364.13 BUILD_DEPENDS="xorg-util-macros" 364.14 -PKG_RULE="dev" 364.15 364.16 -# Rules to configure and make the package. 364.17 -compile_rules() 364.18 -{ 364.19 +compile_rules() { 364.20 ./configure \ 364.21 --sysconfdir=/etc \ 364.22 --localstatedir=/var \ 364.23 @@ -26,9 +23,7 @@ 364.24 make install 364.25 } 364.26 364.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 364.28 -genpkg_rules() 364.29 -{ 364.30 +genpkg_rules() { 364.31 copy @dev 364.32 DEPENDS="xorg-libX11-dev xorg-xproto" 364.33 }
365.1 --- a/xorg-x11perf/receipt Sat Feb 24 10:43:01 2018 +0200 365.2 +++ b/xorg-x11perf/receipt Sat Feb 24 16:17:33 2018 +0200 365.3 @@ -7,28 +7,26 @@ 365.4 MAINTAINER="paul@slitaz.org" 365.5 LICENSE="MIT" 365.6 WEB_SITE="https://www.x.org/wiki/" 365.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 365.8 365.9 TARBALL="x11perf-$VERSION.tar.bz2" 365.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 365.11 365.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXmu-dev xorg-xproto \ 365.13 xorg-libXrender-dev xorg-libXft-dev" 365.14 -PKG_RULE="std" 365.15 365.16 -# Rules to configure and make the package. 365.17 -compile_rules() 365.18 -{ 365.19 +compile_rules() { 365.20 + fix ld 365.21 ./configure \ 365.22 --sysconfdir=/etc \ 365.23 --localstatedir=/var \ 365.24 $CONFIGURE_ARGS && 365.25 + fix libtool && 365.26 make && 365.27 make install 365.28 } 365.29 365.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 365.31 -genpkg_rules() 365.32 -{ 365.33 +genpkg_rules() { 365.34 copy @std 365.35 DEPENDS="xorg-libX11 xorg-libXext xorg-libXft xorg-libXmu xorg-libXrender" 365.36 }
366.1 --- a/xorg-xauth/receipt Sat Feb 24 10:43:01 2018 +0200 366.2 +++ b/xorg-xauth/receipt Sat Feb 24 16:17:33 2018 +0200 366.3 @@ -1,35 +1,32 @@ 366.4 # SliTaz package receipt v2. 366.5 366.6 PACKAGE="xorg-xauth" 366.7 -VERSION="1.0.9" 366.8 +VERSION="1.0.10" 366.9 CATEGORY="x-window" 366.10 SHORT_DESC="X authority file utility" 366.11 MAINTAINER="pankso@slitaz.org" 366.12 LICENSE="MIT" 366.13 WEB_SITE="https://www.x.org/wiki/" 366.14 -HOST_ARCH="i486 arm" 366.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 366.16 366.17 TARBALL="xauth-$VERSION.tar.bz2" 366.18 WGET_URL="$XORG_MIRROR/app/$TARBALL" 366.19 366.20 +BUILD_DEPENDS_arm="xorg-xproto xorg-libXau-dev" 366.21 BUILD_DEPENDS="xorg-libXmu-dev" 366.22 -BUILD_DEPENDS_arm="xorg-xproto xorg-libXau-dev" 366.23 -PKG_RULE="std" 366.24 366.25 -# Rules to configure and make the package. 366.26 -compile_rules() 366.27 -{ 366.28 +compile_rules() { 366.29 + fix ld 366.30 ./configure \ 366.31 --sysconfdir=/etc \ 366.32 --localstatedir=/var \ 366.33 $CONFIGURE_ARGS && 366.34 + fix libtool && 366.35 make && 366.36 make install 366.37 } 366.38 366.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 366.40 -genpkg_rules() 366.41 -{ 366.42 +genpkg_rules() { 366.43 copy @std 366.44 # mkdir -p $fs/usr/X11R6 366.45 # ln -s ../bin $fs/usr/X11R6/bin
367.1 --- a/xorg-xbacklight/receipt Sat Feb 24 10:43:01 2018 +0200 367.2 +++ b/xorg-xbacklight/receipt Sat Feb 24 16:17:33 2018 +0200 367.3 @@ -7,28 +7,26 @@ 367.4 MAINTAINER="jozee@slitaz.org" 367.5 LICENSE="MIT" 367.6 WEB_SITE="https://www.x.org/wiki/" 367.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 367.8 367.9 TARBALL="xbacklight-$VERSION.tar.bz2" 367.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 367.11 367.12 BUILD_DEPENDS="xorg-util-macros xorg-libxcb-dev xorg-xcb-util-dev \ 367.13 xorg-libXrandr-dev" 367.14 -PKG_RULE="std" 367.15 367.16 -# Rules to configure and make the package. 367.17 -compile_rules() 367.18 -{ 367.19 +compile_rules() { 367.20 + fix ld 367.21 ./configure \ 367.22 --sysconfdir=/etc \ 367.23 --localstatedir=/var \ 367.24 $CONFIGURE_ARGS && 367.25 + fix libtool && 367.26 make && 367.27 make install 367.28 } 367.29 367.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 367.31 -genpkg_rules() 367.32 -{ 367.33 +genpkg_rules() { 367.34 copy @std 367.35 DEPENDS="xorg-libxcb xorg-xcb-util" 367.36 TAGS="utility xorg power backlight"
368.1 --- a/xorg-xbitmaps/receipt Sat Feb 24 10:43:01 2018 +0200 368.2 +++ b/xorg-xbitmaps/receipt Sat Feb 24 16:17:33 2018 +0200 368.3 @@ -7,17 +7,14 @@ 368.4 MAINTAINER="pankso@slitaz.org" 368.5 LICENSE="MIT" 368.6 WEB_SITE="https://www.x.org/wiki/" 368.7 -HOST_ARCH="i486 arm" 368.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xbitmaps.html" 368.9 368.10 TARBALL="xbitmaps-$VERSION.tar.bz2" 368.11 WGET_URL="$XORG_MIRROR/data/$TARBALL" 368.12 368.13 BUILD_DEPENDS="xorg-util-macros" 368.14 -PKG_RULE="dev" 368.15 368.16 -# Rules to configure and make the package. 368.17 -compile_rules() 368.18 -{ 368.19 +compile_rules() { 368.20 ./configure \ 368.21 --sysconfdir=/etc \ 368.22 --localstatedir=/var \ 368.23 @@ -26,9 +23,7 @@ 368.24 make install 368.25 } 368.26 368.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 368.28 -genpkg_rules() 368.29 -{ 368.30 +genpkg_rules() { 368.31 copy @dev 368.32 DEPENDS="xorg-util-macros" 368.33 }
369.1 --- a/xorg-xcb-proto/receipt Sat Feb 24 10:43:01 2018 +0200 369.2 +++ b/xorg-xcb-proto/receipt Sat Feb 24 16:17:33 2018 +0200 369.3 @@ -7,18 +7,15 @@ 369.4 MAINTAINER="mallory@sweetpeople.org" 369.5 LICENSE="MIT" 369.6 WEB_SITE="https://xcb.freedesktop.org/" 369.7 -HOST_ARCH="i486 arm" 369.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-proto.html" 369.9 369.10 TARBALL="xcb-proto-$VERSION.tar.bz2" 369.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 369.12 369.13 BUILD_DEPENDS="patch python-dev libxml2-tools" 369.14 BUILD_DEPENDS_arm=" " 369.15 -PKG_RULE="std+dev" 369.16 369.17 -# Rules to configure and make the package. 369.18 -compile_rules() 369.19 -{ 369.20 +compile_rules() { 369.21 ./configure \ 369.22 --sysconfdir=/etc \ 369.23 --localstatedir=/var \ 369.24 @@ -27,9 +24,7 @@ 369.25 make install 369.26 } 369.27 369.28 -# Rules to gen a SliTaz package suitable for Tazpkg. 369.29 -genpkg_rules() 369.30 -{ 369.31 +genpkg_rules() { 369.32 copy @std @dev 369.33 DEPENDS="python" 369.34 PROVIDE="xcb-proto"
370.1 --- a/xorg-xcb-util-cursor/receipt Sat Feb 24 10:43:01 2018 +0200 370.2 +++ b/xorg-xcb-util-cursor/receipt Sat Feb 24 16:17:33 2018 +0200 370.3 @@ -7,7 +7,7 @@ 370.4 MAINTAINER="al.bobylev@gmail.com" 370.5 LICENSE="MIT" 370.6 WEB_SITE="https://xcb.freedesktop.org/" 370.7 -HOST_ARCH="i486 arm" 370.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-cursor.html" 370.9 370.10 TARBALL="xcb-util-cursor-$VERSION.tar.bz2" 370.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 370.12 @@ -15,22 +15,19 @@ 370.13 BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-xcb-util-renderutil-dev \ 370.14 xorg-xcb-util-image-dev" 370.15 SPLIT="xorg-xcb-util-cursor-dev" 370.16 -PKG_RULE="std-dev" 370.17 370.18 -# Rules to configure and make the package. 370.19 -compile_rules() 370.20 -{ 370.21 +compile_rules() { 370.22 + fix ld 370.23 ./configure \ 370.24 --sysconfdir=/etc \ 370.25 --localstatedir=/var \ 370.26 $CONFIGURE_ARGS && 370.27 + fix libtool && 370.28 make && 370.29 make install 370.30 } 370.31 370.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 370.33 -genpkg_rules() 370.34 -{ 370.35 +genpkg_rules() { 370.36 case $PACKAGE in 370.37 *-xcb-util-cursor) 370.38 copy @std 370.39 @@ -39,9 +36,8 @@ 370.40 ;; 370.41 *-dev) 370.42 copy @dev 370.43 - DEPENDS="xorg-xcb-util-cursor xorg-libXau-dev xorg-libXdmcp-dev \ 370.44 - xorg-libxcb-dev xorg-xcb-util-dev xorg-xcb-util-image-dev \ 370.45 - xorg-xcb-util-renderutil-dev" 370.46 + DEPENDS="xorg-xcb-util-cursor \ 370.47 + xorg-libxcb-dev xorg-xcb-util-image-dev xorg-xcb-util-renderutil-dev" 370.48 PROVIDE="xcb-util-cursor-dev" 370.49 ;; 370.50 esac
371.1 --- a/xorg-xcb-util-image/receipt Sat Feb 24 10:43:01 2018 +0200 371.2 +++ b/xorg-xcb-util-image/receipt Sat Feb 24 16:17:33 2018 +0200 371.3 @@ -8,28 +8,26 @@ 371.4 MAINTAINER="slaxemulator@gmail.com" 371.5 LICENSE="MIT" 371.6 WEB_SITE="https://xcb.freedesktop.org/" 371.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-image.html" 371.8 371.9 TARBALL="xcb-util-image-$VERSION.tar.bz2" 371.10 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 371.11 371.12 BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-util-macros" 371.13 SPLIT="xorg-xcb-util-image-dev" 371.14 -PKG_RULE="std-dev" 371.15 371.16 -# Rules to configure and make the package. 371.17 -compile_rules() 371.18 -{ 371.19 +compile_rules() { 371.20 + fix ld 371.21 ./configure \ 371.22 --sysconfdir=/etc \ 371.23 --localstatedir=/var \ 371.24 $CONFIGURE_ARGS && 371.25 + fix libtool && 371.26 make && 371.27 make install 371.28 } 371.29 371.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 371.31 -genpkg_rules() 371.32 -{ 371.33 +genpkg_rules() { 371.34 case $PACKAGE in 371.35 *-image) 371.36 copy @std 371.37 @@ -38,8 +36,7 @@ 371.38 ;; 371.39 *-dev) 371.40 copy @dev 371.41 - DEPENDS="xorg-xcb-util-image xorg-libXau-dev xorg-libXdmcp-dev \ 371.42 - xorg-libxcb-dev xorg-xcb-util-dev" 371.43 + DEPENDS="xorg-xcb-util-image xorg-libxcb-dev" 371.44 PROVIDE="xcb-util-image-dev" 371.45 ;; 371.46 esac
372.1 --- a/xorg-xcb-util-keysyms/receipt Sat Feb 24 10:43:01 2018 +0200 372.2 +++ b/xorg-xcb-util-keysyms/receipt Sat Feb 24 16:17:33 2018 +0200 372.3 @@ -7,29 +7,26 @@ 372.4 MAINTAINER="slaxemulator@gmail.com" 372.5 LICENSE="GPL" 372.6 WEB_SITE="https://xcb.freedesktop.org/" 372.7 -HOST_ARCH="i486 arm" 372.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-keysyms.html" 372.9 372.10 TARBALL="xcb-util-keysyms-$VERSION.tar.bz2" 372.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 372.12 372.13 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros" 372.14 SPLIT="xorg-xcb-util-keysyms-dev" 372.15 -PKG_RULE="std-dev" 372.16 372.17 -# Rules to configure and make the package. 372.18 -compile_rules() 372.19 -{ 372.20 +compile_rules() { 372.21 + fix ld 372.22 ./configure \ 372.23 --sysconfdir=/etc \ 372.24 --localstatedir=/var \ 372.25 $CONFIGURE_ARGS && 372.26 + fix libtool && 372.27 make && 372.28 make install 372.29 } 372.30 372.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 372.32 -genpkg_rules() 372.33 -{ 372.34 +genpkg_rules() { 372.35 case $PACKAGE in 372.36 *-keysyms) 372.37 copy @std 372.38 @@ -38,8 +35,7 @@ 372.39 ;; 372.40 *-dev) 372.41 copy @dev 372.42 - DEPENDS="xorg-xcb-util-keysyms xorg-libXau-dev xorg-libXdmcp-dev \ 372.43 - xorg-libxcb-dev" 372.44 + DEPENDS="xorg-xcb-util-keysyms xorg-libxcb-dev" 372.45 PROVIDE="xcb-util-keysyms-dev" 372.46 ;; 372.47 esac
373.1 --- a/xorg-xcb-util-renderutil/receipt Sat Feb 24 10:43:01 2018 +0200 373.2 +++ b/xorg-xcb-util-renderutil/receipt Sat Feb 24 16:17:33 2018 +0200 373.3 @@ -7,29 +7,26 @@ 373.4 MAINTAINER="al.bobylev@gmail.com" 373.5 LICENSE="MIT" 373.6 WEB_SITE="https://xcb.freedesktop.org/" 373.7 -HOST_ARCH="i486 arm" 373.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-renderutil.html" 373.9 373.10 TARBALL="xcb-util-renderutil-$VERSION.tar.bz2" 373.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 373.12 373.13 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros" 373.14 SPLIT="xorg-xcb-util-renderutil-dev" 373.15 -PKG_RULE="std-dev" 373.16 373.17 -# Rules to configure and make the package. 373.18 -compile_rules() 373.19 -{ 373.20 +compile_rules() { 373.21 + fix ld 373.22 ./configure \ 373.23 --sysconfdir=/etc \ 373.24 --localstatedir=/var \ 373.25 $CONFIGURE_ARGS && 373.26 + fix libtool && 373.27 make && 373.28 make install 373.29 } 373.30 373.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 373.32 -genpkg_rules() 373.33 -{ 373.34 +genpkg_rules() { 373.35 case $PACKAGE in 373.36 *-renderutil) 373.37 copy @std 373.38 @@ -38,8 +35,7 @@ 373.39 ;; 373.40 *-dev) 373.41 copy @dev 373.42 - DEPENDS="xorg-xcb-util-renderutil xorg-libXau-dev \ 373.43 - xorg-libXdmcp-dev xorg-libxcb-dev" 373.44 + DEPENDS="xorg-xcb-util-renderutil xorg-libxcb-dev" 373.45 PROVIDE="xcb-util-renderutil-dev" 373.46 ;; 373.47 esac
374.1 --- a/xorg-xcb-util-wm/receipt Sat Feb 24 10:43:01 2018 +0200 374.2 +++ b/xorg-xcb-util-wm/receipt Sat Feb 24 16:17:33 2018 +0200 374.3 @@ -8,29 +8,26 @@ 374.4 MAINTAINER="slaxemulator@gmail.com" 374.5 LICENSE="MIT" 374.6 WEB_SITE="https://xcb.freedesktop.org/" 374.7 -HOST_ARCH="i486 arm" 374.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-wm.html" 374.9 374.10 TARBALL="xcb-util-wm-$VERSION.tar.bz2" 374.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 374.12 374.13 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros" 374.14 SPLIT="xorg-xcb-util-wm-dev" 374.15 -PKG_RULE="std-dev" 374.16 374.17 -# Rules to configure and make the package. 374.18 -compile_rules() 374.19 -{ 374.20 +compile_rules() { 374.21 + fix ld 374.22 ./configure \ 374.23 --sysconfdir=/etc \ 374.24 --localstatedir=/var \ 374.25 $CONFIGURE_ARGS && 374.26 + fix libtool && 374.27 make && 374.28 make install 374.29 } 374.30 374.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 374.32 -genpkg_rules() 374.33 -{ 374.34 +genpkg_rules() { 374.35 case $PACKAGE in 374.36 *-wm) 374.37 copy @std 374.38 @@ -39,8 +36,7 @@ 374.39 ;; 374.40 *-dev) 374.41 copy @dev 374.42 - DEPENDS="xorg-xcb-util-wm xorg-libXau-dev xorg-libXdmcp-dev \ 374.43 - xorg-libxcb-dev" 374.44 + DEPENDS="xorg-xcb-util-wm xorg-libxcb-dev" 374.45 PROVIDE="xcb-util-wm-dev" 374.46 ;; 374.47 esac
375.1 --- a/xorg-xcb-util/receipt Sat Feb 24 10:43:01 2018 +0200 375.2 +++ b/xorg-xcb-util/receipt Sat Feb 24 16:17:33 2018 +0200 375.3 @@ -7,7 +7,7 @@ 375.4 MAINTAINER="mallory@sweetpeople.org" 375.5 LICENSE="MIT" 375.6 WEB_SITE="https://xcb.freedesktop.org/" 375.7 -HOST_ARCH="i486 arm" 375.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util.html" 375.9 375.10 TARBALL="xcb-util-$VERSION.tar.bz2" 375.11 WGET_URL="$XORG_MIRROR/xcb/$TARBALL" 375.12 @@ -15,11 +15,8 @@ 375.13 BUILD_DEPENDS="xorg-libxcb-dev gperf" 375.14 BUILD_DEPENDS_arm="xorg-libxcb-dev xorg-libXdmcp-dev" 375.15 SPLIT="xorg-xcb-util-dev" 375.16 -PKG_RULE="std-dev" 375.17 375.18 -# Rules to configure and make the package. 375.19 -compile_rules() 375.20 -{ 375.21 +compile_rules() { 375.22 ./configure \ 375.23 --sysconfdir=/etc \ 375.24 --localstatedir=/var \ 375.25 @@ -28,9 +25,7 @@ 375.26 make install 375.27 } 375.28 375.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 375.30 -genpkg_rules() 375.31 -{ 375.32 +genpkg_rules() { 375.33 case $PACKAGE in 375.34 *-util) 375.35 copy @std 375.36 @@ -39,8 +34,7 @@ 375.37 ;; 375.38 *-dev) 375.39 copy @dev 375.40 - DEPENDS="xorg-xcb-util xorg-libXau-dev xorg-libXdmcp-dev \ 375.41 - xorg-libxcb-dev" 375.42 + DEPENDS="xorg-xcb-util xorg-libxcb-dev" 375.43 PROVIDE="xcb-util-dev" 375.44 ;; 375.45 esac
376.1 --- a/xorg-xcmiscproto/receipt Sat Feb 24 10:43:01 2018 +0200 376.2 +++ b/xorg-xcmiscproto/receipt Sat Feb 24 16:17:33 2018 +0200 376.3 @@ -7,17 +7,14 @@ 376.4 MAINTAINER="pankso@slitaz.org" 376.5 LICENSE="MIT" 376.6 WEB_SITE="https://www.x.org/wiki/" 376.7 -HOST_ARCH="i486 arm" 376.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 376.9 376.10 TARBALL="xcmiscproto-$VERSION.tar.bz2" 376.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 376.12 376.13 BUILD_DEPENDS="xorg-util-macros" 376.14 -PKG_RULE="dev" 376.15 376.16 -# Rules to configure and make the package. 376.17 -compile_rules() 376.18 -{ 376.19 +compile_rules() { 376.20 ./configure \ 376.21 --sysconfdir=/etc \ 376.22 --localstatedir=/var \ 376.23 @@ -26,9 +23,7 @@ 376.24 make install 376.25 } 376.26 376.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 376.28 -genpkg_rules() 376.29 -{ 376.30 +genpkg_rules() { 376.31 copy @dev 376.32 DEPENDS="xorg-util-macros" 376.33 }
377.1 --- a/xorg-xcmsdb/receipt Sat Feb 24 10:43:01 2018 +0200 377.2 +++ b/xorg-xcmsdb/receipt Sat Feb 24 16:17:33 2018 +0200 377.3 @@ -7,27 +7,25 @@ 377.4 MAINTAINER="al.bobylev@gmail.com" 377.5 LICENSE="MIT" 377.6 WEB_SITE="https://www.x.org/wiki/" 377.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 377.8 377.9 TARBALL="xcmsdb-$VERSION.tar.bz2" 377.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 377.11 377.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev" 377.13 -PKG_RULE="std" 377.14 377.15 -# Rules to configure and make the package. 377.16 -compile_rules() 377.17 -{ 377.18 +compile_rules() { 377.19 + fix ld 377.20 ./configure \ 377.21 --sysconfdir=/etc \ 377.22 --localstatedir=/var \ 377.23 $CONFIGURE_ARGS && 377.24 + fix libtool && 377.25 make && 377.26 make install 377.27 } 377.28 377.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 377.30 -genpkg_rules() 377.31 -{ 377.32 +genpkg_rules() { 377.33 copy @std 377.34 DEPENDS="xorg-libX11" 377.35 }
378.1 --- a/xorg-xcursor-themes/receipt Sat Feb 24 10:43:01 2018 +0200 378.2 +++ b/xorg-xcursor-themes/receipt Sat Feb 24 16:17:33 2018 +0200 378.3 @@ -7,16 +7,14 @@ 378.4 MAINTAINER="al.bobylev@gmail.com" 378.5 LICENSE="MIT" 378.6 WEB_SITE="https://www.x.org/wiki/" 378.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcursor-themes.html" 378.8 378.9 TARBALL="xcursor-themes-$VERSION.tar.bz2" 378.10 WGET_URL="$XORG_MIRROR/data/$TARBALL" 378.11 378.12 BUILD_DEPENDS="xorg-util-macros xorg-xcursorgen xorg-libXcursor-dev" 378.13 -PKG_RULE="std" 378.14 378.15 -# Rules to configure and make the package. 378.16 -compile_rules() 378.17 -{ 378.18 +compile_rules() { 378.19 ./configure \ 378.20 --sysconfdir=/etc \ 378.21 --localstatedir=/var \ 378.22 @@ -25,8 +23,6 @@ 378.23 make install 378.24 } 378.25 378.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 378.27 -genpkg_rules() 378.28 -{ 378.29 +genpkg_rules() { 378.30 copy @std 378.31 }
379.1 --- a/xorg-xcursorgen/receipt Sat Feb 24 10:43:01 2018 +0200 379.2 +++ b/xorg-xcursorgen/receipt Sat Feb 24 16:17:33 2018 +0200 379.3 @@ -7,29 +7,26 @@ 379.4 MAINTAINER="pankso@slitaz.org" 379.5 LICENSE="MIT" 379.6 WEB_SITE="https://www.x.org/wiki/" 379.7 -HOST_ARCH="i486 arm" 379.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 379.9 379.10 TARBALL="xcursorgen-$VERSION.tar.bz2" 379.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 379.12 379.13 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXcursor-dev \ 379.14 libpng16-dev" 379.15 -PKG_RULE="std" 379.16 379.17 -# Rules to configure and make the package. 379.18 -compile_rules() 379.19 -{ 379.20 +compile_rules() { 379.21 + fix ld 379.22 ./configure \ 379.23 --sysconfdir=/etc \ 379.24 --localstatedir=/var \ 379.25 $CONFIGURE_ARGS && 379.26 + fix libtool && 379.27 make && 379.28 make install 379.29 } 379.30 379.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 379.32 -genpkg_rules() 379.33 -{ 379.34 +genpkg_rules() { 379.35 copy @std 379.36 DEPENDS="libpng16 xorg-libX11 xorg-libXcursor" 379.37 }
380.1 --- a/xorg-xdpyinfo/receipt Sat Feb 24 10:43:01 2018 +0200 380.2 +++ b/xorg-xdpyinfo/receipt Sat Feb 24 16:17:33 2018 +0200 380.3 @@ -7,6 +7,7 @@ 380.4 MAINTAINER="jozee@slitaz.org" 380.5 LICENSE="MIT" 380.6 WEB_SITE="https://www.x.org/wiki/" 380.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 380.8 380.9 TARBALL="xdpyinfo-$VERSION.tar.bz2" 380.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 380.11 @@ -15,22 +16,19 @@ 380.12 xorg-libXtst-dev xorg-libxcb-dev xorg-xproto xorg-libXxf86vm-dev \ 380.13 xorg-libXxf86dga-dev xorg-libXrender-dev xorg-libXcomposite-dev \ 380.14 xorg-libXinerama-dev xorg-libdmx-dev xorg-libXxf86misc-dev" 380.15 -PKG_RULE="std" 380.16 380.17 -# Rules to configure and make the package. 380.18 -compile_rules() 380.19 -{ 380.20 +compile_rules() { 380.21 + fix ld 380.22 ./configure \ 380.23 --sysconfdir=/etc \ 380.24 --localstatedir=/var \ 380.25 $CONFIGURE_ARGS && 380.26 + fix libtool && 380.27 make && 380.28 make install 380.29 } 380.30 380.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 380.32 -genpkg_rules() 380.33 -{ 380.34 +genpkg_rules() { 380.35 copy @std 380.36 DEPENDS="xorg-libX11 xorg-libXcomposite xorg-libXext xorg-libXi \ 380.37 xorg-libXinerama xorg-libXrender xorg-libXtst xorg-libXxf86dga \
381.1 --- a/xorg-xdriinfo/receipt Sat Feb 24 10:43:01 2018 +0200 381.2 +++ b/xorg-xdriinfo/receipt Sat Feb 24 16:17:33 2018 +0200 381.3 @@ -7,28 +7,26 @@ 381.4 MAINTAINER="pankso@slitaz.org" 381.5 LICENSE="MIT" 381.6 WEB_SITE="https://www.x.org/wiki/" 381.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 381.8 381.9 TARBALL="xdriinfo-$VERSION.tar.bz2" 381.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 381.11 381.12 -BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-glproto mesa-dev" 381.13 -PKG_RULE="std" 381.14 +BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-glproto mesa17-dev" 381.15 381.16 -# Rules to configure and make the package. 381.17 -compile_rules() 381.18 -{ 381.19 +compile_rules() { 381.20 + fix ld 381.21 ./configure \ 381.22 --sysconfdir=/etc \ 381.23 --localstatedir=/var \ 381.24 $CONFIGURE_ARGS && 381.25 + fix libtool && 381.26 make && 381.27 make install 381.28 } 381.29 381.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 381.31 -genpkg_rules() 381.32 -{ 381.33 +genpkg_rules() { 381.34 copy @std 381.35 - DEPENDS="mesa xorg-libX11" 381.36 + DEPENDS="mesa17 xorg-libX11" 381.37 SUGGESTED="nvidia" 381.38 }
382.1 --- a/xorg-xev/receipt Sat Feb 24 10:43:01 2018 +0200 382.2 +++ b/xorg-xev/receipt Sat Feb 24 16:17:33 2018 +0200 382.3 @@ -7,27 +7,25 @@ 382.4 MAINTAINER="jozee@slitaz.org" 382.5 LICENSE="MIT" 382.6 WEB_SITE="https://www.x.org/wiki/" 382.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 382.8 382.9 TARBALL="xev-$VERSION.tar.bz2" 382.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 382.11 382.12 BUILD_DEPENDS="xorg-libX11-dev xorg-libXrandr-dev" 382.13 -PKG_RULE="std" 382.14 382.15 -# Rules to configure and make the package. 382.16 -compile_rules() 382.17 -{ 382.18 +compile_rules() { 382.19 + fix ld 382.20 ./configure \ 382.21 --sysconfdir=/etc \ 382.22 --localstatedir=/var \ 382.23 $CONFIGURE_ARGS && 382.24 + fix libtool && 382.25 make && 382.26 make install 382.27 } 382.28 382.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 382.30 -genpkg_rules() 382.31 -{ 382.32 +genpkg_rules() { 382.33 copy @std 382.34 DEPENDS="xorg-libX11 xorg-libXrandr" 382.35 TAGS="utility xorg debug"
383.1 --- a/xorg-xextproto/receipt Sat Feb 24 10:43:01 2018 +0200 383.2 +++ b/xorg-xextproto/receipt Sat Feb 24 16:17:33 2018 +0200 383.3 @@ -7,17 +7,14 @@ 383.4 MAINTAINER="pankso@slitaz.org" 383.5 LICENSE="MIT" 383.6 WEB_SITE="https://www.x.org/wiki/" 383.7 -HOST_ARCH="i486 arm" 383.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 383.9 383.10 TARBALL="xextproto-$VERSION.tar.bz2" 383.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 383.12 383.13 BUILD_DEPENDS="xorg-util-macros coreutils-file-special" # for mkdir 383.14 -PKG_RULE="dev" 383.15 383.16 -# Rules to configure and make the package. 383.17 -compile_rules() 383.18 -{ 383.19 +compile_rules() { 383.20 ./configure \ 383.21 --sysconfdir=/etc \ 383.22 --localstatedir=/var \ 383.23 @@ -26,9 +23,7 @@ 383.24 make install 383.25 } 383.26 383.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 383.28 -genpkg_rules() 383.29 -{ 383.30 +genpkg_rules() { 383.31 copy @dev 383.32 DEPENDS="xorg-util-macros" 383.33 }
384.1 --- a/xorg-xf86-input-evdev/receipt Sat Feb 24 10:43:01 2018 +0200 384.2 +++ b/xorg-xf86-input-evdev/receipt Sat Feb 24 16:17:33 2018 +0200 384.3 @@ -1,38 +1,35 @@ 384.4 # SliTaz package receipt v2. 384.5 384.6 PACKAGE="xorg-xf86-input-evdev" 384.7 -VERSION="2.10.3" 384.8 +VERSION="2.10.5" 384.9 CATEGORY="x-window" 384.10 SHORT_DESC="Generic Linux input driver" 384.11 MAINTAINER="pankso@slitaz.org" 384.12 LICENSE="MIT" 384.13 WEB_SITE="https://www.x.org/wiki/" 384.14 -HOST_ARCH="i486 arm" 384.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7driver.html#xorg-evdev-driver" 384.16 384.17 TARBALL="xf86-input-evdev-$VERSION.tar.bz2" 384.18 WGET_URL="$XORG_MIRROR/driver/$TARBALL" 384.19 384.20 +# ARM use build system xorg-server-dev or manually install it in sysroot 384.21 +BUILD_DEPENDS_arm="udev-dev" 384.22 BUILD_DEPENDS="xorg-util-macros xorg-server-dev xorg-xproto xorg-inputproto \ 384.23 xorg-dri3proto eudev-dev libevdev-dev mtdev-dev" 384.24 -# ARM use build system xorg-server-dev or manually install it in sysroot 384.25 -BUILD_DEPENDS_arm="udev-dev" 384.26 SPLIT="xorg-xf86-input-evdev-dev" 384.27 -PKG_RULE="std-dev" 384.28 384.29 -# Rules to configure and make the package. 384.30 -compile_rules() 384.31 -{ 384.32 +compile_rules() { 384.33 + fix ld 384.34 ./configure \ 384.35 --sysconfdir=/etc \ 384.36 --localstatedir=/var \ 384.37 $CONFIGURE_ARGS && 384.38 + fix libtool && 384.39 make && 384.40 make install 384.41 } 384.42 384.43 -# Rules to gen a SliTaz package suitable for Tazpkg. 384.44 -genpkg_rules() 384.45 -{ 384.46 +genpkg_rules() { 384.47 case $PACKAGE in 384.48 *-evdev) 384.49 copy @std 384.50 @@ -40,7 +37,6 @@ 384.51 ;; 384.52 *-dev) 384.53 copy @dev 384.54 - DEPENDS="xorg-xf86-input-evdev eudev-dev libevdev-dev mtdev-dev" 384.55 ;; 384.56 esac 384.57 }
385.1 --- a/xorg-xf86-input-synaptics/receipt Sat Feb 24 10:43:01 2018 +0200 385.2 +++ b/xorg-xf86-input-synaptics/receipt Sat Feb 24 16:17:33 2018 +0200 385.3 @@ -16,29 +16,25 @@ 385.4 SPLIT="xorg-xf86-input-synaptics-dev" 385.5 PKG_RULE="std-dev" 385.6 385.7 -# Rules to configure and make the package. 385.8 -compile_rules() 385.9 -{ 385.10 +compile_rules() { 385.11 + fix ld 385.12 ./configure \ 385.13 --sysconfdir=/etc \ 385.14 --localstatedir=/var \ 385.15 $CONFIGURE_ARGS && 385.16 + fix libtool && 385.17 make && 385.18 make install 385.19 } 385.20 385.21 -# Rules to gen a SliTaz package suitable for Tazpkg. 385.22 -genpkg_rules() 385.23 -{ 385.24 +genpkg_rules() { 385.25 case $PACKAGE in 385.26 *-synaptics) 385.27 copy @std 385.28 - DEPENDS="libevdev xorg-libX11 xorg-libXau xorg-libXdmcp \ 385.29 - xorg-libXext xorg-libXi xorg-libXtst xorg-libxcb" 385.30 + DEPENDS="libevdev xorg-libX11 xorg-libXi xorg-libXtst" 385.31 ;; 385.32 *-dev) 385.33 copy @dev 385.34 - DEPENDS="xorg-xf86-input-synaptics libevdev-dev" 385.35 ;; 385.36 esac 385.37 }
386.1 --- a/xorg-xf86-video-fbdev/receipt Sat Feb 24 10:43:01 2018 +0200 386.2 +++ b/xorg-xf86-video-fbdev/receipt Sat Feb 24 16:17:33 2018 +0200 386.3 @@ -7,32 +7,29 @@ 386.4 MAINTAINER="pankso@slitaz.org" 386.5 LICENSE="MIT" 386.6 WEB_SITE="https://www.x.org/wiki/fbdev/" 386.7 -HOST_ARCH="i486 arm" 386.8 386.9 TARBALL="xf86-video-fbdev-$VERSION.tar.bz2" 386.10 WGET_URL="$XORG_MIRROR/driver/$TARBALL" 386.11 386.12 +# ARM use build system xorg-server-dev or manually install it in sysroot 386.13 +BUILD_DEPENDS_arm=" " 386.14 BUILD_DEPENDS="xorg-util-macros xorg-server-dev xorg-libXrandr-dev \ 386.15 xorg-libXrender-dev xorg-libXv-dev xorg-xproto xorg-fontsproto" 386.16 -# ARM use build system xorg-server-dev or manually install it in sysroot 386.17 -BUILD_DEPENDS_arm=" " 386.18 SPLIT="xorg-xf86-video-fbdev-dev" 386.19 PKG_RULE="std-dev" 386.20 386.21 -# Rules to configure and make the package. 386.22 -compile_rules() 386.23 -{ 386.24 +compile_rules() { 386.25 + fix ld 386.26 ./configure \ 386.27 --sysconfdir=/etc \ 386.28 --localstatedir=/var \ 386.29 $CONFIGURE_ARGS && 386.30 + fix libtool && 386.31 make && 386.32 make install 386.33 } 386.34 386.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 386.36 -genpkg_rules() 386.37 -{ 386.38 +genpkg_rules() { 386.39 case $PACKAGE in 386.40 *-fbdev) 386.41 copy @std
387.1 --- a/xorg-xf86-video-vesa/receipt Sat Feb 24 10:43:01 2018 +0200 387.2 +++ b/xorg-xf86-video-vesa/receipt Sat Feb 24 16:17:33 2018 +0200 387.3 @@ -15,20 +15,18 @@ 387.4 SPLIT="xorg-xf86-video-vesa-dev" 387.5 PKG_RULE="std-dev" 387.6 387.7 -# Rules to configure and make the package. 387.8 -compile_rules() 387.9 -{ 387.10 +compile_rules() { 387.11 + fix ld 387.12 ./configure \ 387.13 --sysconfdir=/etc \ 387.14 --localstatedir=/var \ 387.15 $CONFIGURE_ARGS && 387.16 + fix libtool && 387.17 make && 387.18 make install 387.19 } 387.20 387.21 -# Rules to gen a SliTaz package suitable for Tazpkg. 387.22 -genpkg_rules() 387.23 -{ 387.24 +genpkg_rules() { 387.25 case $PACKAGE in 387.26 *-vesa) 387.27 copy @std
388.1 --- a/xorg-xf86bigfontproto/receipt Sat Feb 24 10:43:01 2018 +0200 388.2 +++ b/xorg-xf86bigfontproto/receipt Sat Feb 24 16:17:33 2018 +0200 388.3 @@ -7,17 +7,14 @@ 388.4 MAINTAINER="pankso@slitaz.org" 388.5 LICENSE="MIT" 388.6 WEB_SITE="https://www.x.org/wiki/" 388.7 -HOST_ARCH="i486 arm" 388.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 388.9 388.10 TARBALL="xf86bigfontproto-$VERSION.tar.bz2" 388.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 388.12 388.13 BUILD_DEPENDS="xorg-util-macros" 388.14 -PKG_RULE="dev" 388.15 388.16 -# Rules to configure and make the package. 388.17 -compile_rules() 388.18 -{ 388.19 +compile_rules() { 388.20 ./configure \ 388.21 --sysconfdir=/etc \ 388.22 --localstatedir=/var \ 388.23 @@ -26,9 +23,7 @@ 388.24 make install 388.25 } 388.26 388.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 388.28 -genpkg_rules() 388.29 -{ 388.30 +genpkg_rules() { 388.31 copy @dev 388.32 DEPENDS="xorg-util-macros" 388.33 }
389.1 --- a/xorg-xf86dgaproto/receipt Sat Feb 24 10:43:01 2018 +0200 389.2 +++ b/xorg-xf86dgaproto/receipt Sat Feb 24 16:17:33 2018 +0200 389.3 @@ -7,17 +7,14 @@ 389.4 MAINTAINER="pankso@slitaz.org" 389.5 LICENSE="MIT" 389.6 WEB_SITE="https://www.x.org/wiki/" 389.7 -HOST_ARCH="i486 arm" 389.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 389.9 389.10 TARBALL="xf86dgaproto-$VERSION.tar.bz2" 389.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 389.12 389.13 BUILD_DEPENDS="xorg-util-macros" 389.14 -PKG_RULE="dev" 389.15 389.16 -# Rules to configure and make the package. 389.17 -compile_rules() 389.18 -{ 389.19 +compile_rules() { 389.20 ./configure \ 389.21 --sysconfdir=/etc \ 389.22 --localstatedir=/var \ 389.23 @@ -26,9 +23,7 @@ 389.24 make install 389.25 } 389.26 389.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 389.28 -genpkg_rules() 389.29 -{ 389.30 +genpkg_rules() { 389.31 copy @dev 389.32 DEPENDS="xorg-util-macros" 389.33 }
390.1 --- a/xorg-xf86driproto/receipt Sat Feb 24 10:43:01 2018 +0200 390.2 +++ b/xorg-xf86driproto/receipt Sat Feb 24 16:17:33 2018 +0200 390.3 @@ -7,16 +7,14 @@ 390.4 MAINTAINER="pankso@slitaz.org" 390.5 LICENSE="MIT" 390.6 WEB_SITE="https://www.x.org/wiki/" 390.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 390.8 390.9 TARBALL="xf86driproto-$VERSION.tar.bz2" 390.10 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 390.11 390.12 BUILD_DEPENDS="xorg-util-macros" 390.13 -PKG_RULE="dev" 390.14 390.15 -# Rules to configure and make the package. 390.16 -compile_rules() 390.17 -{ 390.18 +compile_rules() { 390.19 ./configure \ 390.20 --sysconfdir=/etc \ 390.21 --localstatedir=/var \ 390.22 @@ -25,9 +23,7 @@ 390.23 make install 390.24 } 390.25 390.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 390.27 -genpkg_rules() 390.28 -{ 390.29 +genpkg_rules() { 390.30 copy @dev 390.31 DEPENDS="xorg-util-macros" 390.32 }
391.1 --- a/xorg-xf86miscproto/receipt Sat Feb 24 10:43:01 2018 +0200 391.2 +++ b/xorg-xf86miscproto/receipt Sat Feb 24 16:17:33 2018 +0200 391.3 @@ -12,11 +12,8 @@ 391.4 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 391.5 391.6 BUILD_DEPENDS="xorg-util-macros" 391.7 -PKG_RULE="dev" 391.8 391.9 -# Rules to configure and make the package. 391.10 -compile_rules() 391.11 -{ 391.12 +compile_rules() { 391.13 ./configure \ 391.14 --sysconfdir=/etc \ 391.15 --localstatedir=/var \ 391.16 @@ -25,8 +22,6 @@ 391.17 make install 391.18 } 391.19 391.20 -# Rules to gen a SliTaz package suitable for Tazpkg. 391.21 -genpkg_rules() 391.22 -{ 391.23 +genpkg_rules() { 391.24 copy @dev 391.25 }
392.1 --- a/xorg-xf86vidmodeproto/receipt Sat Feb 24 10:43:01 2018 +0200 392.2 +++ b/xorg-xf86vidmodeproto/receipt Sat Feb 24 16:17:33 2018 +0200 392.3 @@ -7,17 +7,14 @@ 392.4 MAINTAINER="pankso@slitaz.org" 392.5 LICENSE="MIT" 392.6 WEB_SITE="https://www.x.org/wiki/" 392.7 -HOST_ARCH="i486 arm" 392.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 392.9 392.10 TARBALL="xf86vidmodeproto-$VERSION.tar.bz2" 392.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 392.12 392.13 BUILD_DEPENDS="xorg-util-macros" 392.14 -PKG_RULE="dev" 392.15 392.16 -# Rules to configure and make the package. 392.17 -compile_rules() 392.18 -{ 392.19 +compile_rules() { 392.20 ./configure \ 392.21 --sysconfdir=/etc \ 392.22 --localstatedir=/var \ 392.23 @@ -26,9 +23,7 @@ 392.24 make install 392.25 } 392.26 392.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 392.28 -genpkg_rules() 392.29 -{ 392.30 +genpkg_rules() { 392.31 copy @dev 392.32 DEPENDS="xorg-xproto" 392.33 }
393.1 --- a/xorg-xgamma/receipt Sat Feb 24 10:43:01 2018 +0200 393.2 +++ b/xorg-xgamma/receipt Sat Feb 24 16:17:33 2018 +0200 393.3 @@ -7,27 +7,25 @@ 393.4 MAINTAINER="al.bobylev@gmail.com" 393.5 LICENSE="MIT" 393.6 WEB_SITE="https://www.x.org/wiki/" 393.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 393.8 393.9 TARBALL="xgamma-$VERSION.tar.bz2" 393.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 393.11 393.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXxf86vm-dev xorg-xproto" 393.13 -PKG_RULE="std" 393.14 393.15 -# Rules to configure and make the package. 393.16 -compile_rules() 393.17 -{ 393.18 +compile_rules() { 393.19 + fix ld 393.20 ./configure \ 393.21 --sysconfdir=/etc \ 393.22 --localstatedir=/var \ 393.23 $CONFIGURE_ARGS && 393.24 + fix libtool && 393.25 make && 393.26 make install 393.27 } 393.28 393.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 393.30 -genpkg_rules() 393.31 -{ 393.32 +genpkg_rules() { 393.33 copy @std 393.34 DEPENDS="xorg-libX11 xorg-libXxf86vm" 393.35 }
394.1 --- a/xorg-xhost/receipt Sat Feb 24 10:43:01 2018 +0200 394.2 +++ b/xorg-xhost/receipt Sat Feb 24 16:17:33 2018 +0200 394.3 @@ -7,27 +7,25 @@ 394.4 MAINTAINER="pascal.bellard@slitaz.org" 394.5 LICENSE="MIT" 394.6 WEB_SITE="https://www.x.org/wiki/" 394.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 394.8 394.9 TARBALL="xhost-$VERSION.tar.bz2" 394.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 394.11 394.12 BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libX11-dev xorg-libXmu-dev" 394.13 -PKG_RULE="std" 394.14 394.15 -# Rules to configure and make the package. 394.16 -compile_rules() 394.17 -{ 394.18 +compile_rules() { 394.19 + fix ld 394.20 ./configure \ 394.21 --sysconfdir=/etc \ 394.22 --localstatedir=/var \ 394.23 $CONFIGURE_ARGS && 394.24 + fix libtool && 394.25 make && 394.26 make install 394.27 } 394.28 394.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 394.30 -genpkg_rules() 394.31 -{ 394.32 +genpkg_rules() { 394.33 copy @std 394.34 DEPENDS="xorg-libX11 xorg-libXmu" 394.35 }
395.1 --- a/xorg-xineramaproto/receipt Sat Feb 24 10:43:01 2018 +0200 395.2 +++ b/xorg-xineramaproto/receipt Sat Feb 24 16:17:33 2018 +0200 395.3 @@ -7,17 +7,14 @@ 395.4 MAINTAINER="pankso@slitaz.org" 395.5 LICENSE="MIT" 395.6 WEB_SITE="https://www.x.org/wiki/" 395.7 -HOST_ARCH="i486 arm" 395.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 395.9 395.10 TARBALL="xineramaproto-$VERSION.tar.bz2" 395.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 395.12 395.13 BUILD_DEPENDS="xorg-util-macros" 395.14 -PKG_RULE="dev" 395.15 395.16 -# Rules to configure and make the package. 395.17 -compile_rules() 395.18 -{ 395.19 +compile_rules() { 395.20 ./configure \ 395.21 --sysconfdir=/etc \ 395.22 --localstatedir=/var \ 395.23 @@ -26,9 +23,7 @@ 395.24 make install 395.25 } 395.26 395.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 395.28 -genpkg_rules() 395.29 -{ 395.30 +genpkg_rules() { 395.31 copy @dev 395.32 DEPENDS="xorg-util-macros" 395.33 }
396.1 --- a/xorg-xinput/receipt Sat Feb 24 10:43:01 2018 +0200 396.2 +++ b/xorg-xinput/receipt Sat Feb 24 16:17:33 2018 +0200 396.3 @@ -7,30 +7,26 @@ 396.4 MAINTAINER="pankso@slitaz.org" 396.5 LICENSE="MIT" 396.6 WEB_SITE="https://www.x.org/wiki/" 396.7 -HOST_ARCH="i486 arm" 396.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 396.9 396.10 TARBALL="xinput-$VERSION.tar.bz2" 396.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 396.12 396.13 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXext-dev \ 396.14 xorg-libXi-dev xorg-inputproto xorg-libXrandr-dev xorg-libXinerama-dev" 396.15 -PKG_RULE="std" 396.16 396.17 -# Rules to configure and make the package. 396.18 -compile_rules() 396.19 -{ 396.20 +compile_rules() { 396.21 + fix ld 396.22 ./configure \ 396.23 --sysconfdir=/etc \ 396.24 --localstatedir=/var \ 396.25 $CONFIGURE_ARGS && 396.26 + fix libtool && 396.27 make && 396.28 make install 396.29 } 396.30 396.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 396.32 -genpkg_rules() 396.33 -{ 396.34 +genpkg_rules() { 396.35 copy @std 396.36 - DEPENDS="xorg-libX11 xorg-libXext xorg-libXi xorg-libXinerama \ 396.37 - xorg-libXrandr" 396.38 + DEPENDS="xorg-libX11 xorg-libXi xorg-libXinerama xorg-libXrandr" 396.39 }
397.1 --- a/xorg-xkbcomp/receipt Sat Feb 24 10:43:01 2018 +0200 397.2 +++ b/xorg-xkbcomp/receipt Sat Feb 24 16:17:33 2018 +0200 397.3 @@ -7,29 +7,26 @@ 397.4 MAINTAINER="pankso@slitaz.org" 397.5 LICENSE="MIT" 397.6 WEB_SITE="https://www.x.org/wiki/" 397.7 -HOST_ARCH="i486 arm" 397.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 397.9 397.10 TARBALL="xkbcomp-$VERSION.tar.bz2" 397.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 397.12 397.13 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libxkbfile-dev xorg-xproto" 397.14 SPLIT="xorg-xkbcomp-dev" 397.15 -PKG_RULE="std-dev" 397.16 397.17 -# Rules to configure and make the package. 397.18 -compile_rules() 397.19 -{ 397.20 +compile_rules() { 397.21 + fix ld 397.22 ./configure \ 397.23 --sysconfdir=/etc \ 397.24 --localstatedir=/var \ 397.25 $CONFIGURE_ARGS && 397.26 + fix libtool && 397.27 make && 397.28 make install 397.29 } 397.30 397.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 397.32 -genpkg_rules() 397.33 -{ 397.34 +genpkg_rules() { 397.35 case $PACKAGE in 397.36 *-xkbcomp) 397.37 copy @std 397.38 @@ -37,8 +34,8 @@ 397.39 ;; 397.40 *-dev) 397.41 copy @dev 397.42 - DEPENDS="xorg-xkbcomp xorg-libX11-dev xorg-libxkbfile-dev \ 397.43 - xorg-xproto" 397.44 + DEPENDS="xorg-xkbcomp \ 397.45 + xorg-libX11-dev xorg-libxkbfile-dev xorg-xproto" 397.46 ;; 397.47 esac 397.48 }
398.1 --- a/xorg-xkbevd/receipt Sat Feb 24 10:43:01 2018 +0200 398.2 +++ b/xorg-xkbevd/receipt Sat Feb 24 16:17:33 2018 +0200 398.3 @@ -7,27 +7,25 @@ 398.4 MAINTAINER="al.bobylev@gmail.com" 398.5 LICENSE="MIT" 398.6 WEB_SITE="https://www.x.org/wiki/" 398.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 398.8 398.9 TARBALL="xkbevd-$VERSION.tar.bz2" 398.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 398.11 398.12 BUILD_DEPENDS="xorg-util-macros xorg-libxkbfile-dev xorg-libX11-dev" 398.13 -PKG_RULE="std" 398.14 398.15 -# Rules to configure and make the package. 398.16 -compile_rules() 398.17 -{ 398.18 +compile_rules() { 398.19 + fix ld 398.20 ./configure \ 398.21 --sysconfdir=/etc \ 398.22 --localstatedir=/var \ 398.23 $CONFIGURE_ARGS && 398.24 + fix libtool && 398.25 make && 398.26 make install 398.27 } 398.28 398.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 398.30 -genpkg_rules() 398.31 -{ 398.32 +genpkg_rules() { 398.33 copy @std 398.34 DEPENDS="xorg-libX11 xorg-libxkbfile" 398.35 }
399.1 --- a/xorg-xkbutils/receipt Sat Feb 24 10:43:01 2018 +0200 399.2 +++ b/xorg-xkbutils/receipt Sat Feb 24 16:17:33 2018 +0200 399.3 @@ -7,28 +7,26 @@ 399.4 MAINTAINER="pankso@slitaz.org" 399.5 LICENSE="MIT" 399.6 WEB_SITE="https://www.x.org/wiki/" 399.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 399.8 399.9 TARBALL="xkbutils-$VERSION.tar.bz2" 399.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 399.11 399.12 BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libXaw-dev xorg-libXt-dev \ 399.13 -xorg-libX11-dev" 399.14 -PKG_RULE="std" 399.15 +xorg-libX11-dev xorg-inputproto" 399.16 399.17 -# Rules to configure and make the package. 399.18 -compile_rules() 399.19 -{ 399.20 +compile_rules() { 399.21 + fix ld 399.22 ./configure \ 399.23 --sysconfdir=/etc \ 399.24 --localstatedir=/var \ 399.25 $CONFIGURE_ARGS && 399.26 + fix libtool && 399.27 make && 399.28 make install 399.29 } 399.30 399.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 399.32 -genpkg_rules() 399.33 -{ 399.34 +genpkg_rules() { 399.35 copy @std 399.36 DEPENDS="xorg-libX11 xorg-libXaw xorg-libXt" 399.37 }
400.1 --- a/xorg-xkeyboard-config/receipt Sat Feb 24 10:43:01 2018 +0200 400.2 +++ b/xorg-xkeyboard-config/receipt Sat Feb 24 16:17:33 2018 +0200 400.3 @@ -7,19 +7,16 @@ 400.4 MAINTAINER="pankso@slitaz.org" 400.5 LICENSE="MIT" 400.6 WEB_SITE="https://www.x.org/wiki/" 400.7 -HOST_ARCH="i486 arm" 400.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xkeyboard-config.html" 400.9 400.10 TARBALL="xkeyboard-config-$VERSION.tar.bz2" 400.11 WGET_URL="$XORG_MIRROR/data/xkeyboard-config/$TARBALL" 400.12 400.13 +BUILD_DEPENDS_arm="xorg-xproto xorg-libX11-dev" 400.14 BUILD_DEPENDS="libxslt xorg-xproto xorg-libX11-dev intltool" 400.15 -BUILD_DEPENDS_arm="xorg-xproto xorg-libX11-dev" 400.16 SPLIT="xorg-xkeyboard-config-dev" 400.17 -PKG_RULE="std-dev" 400.18 400.19 -# Rules to configure and make the package. 400.20 -compile_rules() 400.21 -{ 400.22 +compile_rules() { 400.23 ./configure \ 400.24 --sysconfdir=/etc \ 400.25 --localstatedir=/var \ 400.26 @@ -30,9 +27,7 @@ 400.27 make install 400.28 } 400.29 400.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 400.31 -genpkg_rules() 400.32 -{ 400.33 +genpkg_rules() { 400.34 case $PACKAGE in 400.35 *-config) copy @std;; 400.36 *-dev) copy @dev;;
401.1 --- a/xorg-xkill/receipt Sat Feb 24 10:43:01 2018 +0200 401.2 +++ b/xorg-xkill/receipt Sat Feb 24 16:17:33 2018 +0200 401.3 @@ -7,28 +7,25 @@ 401.4 MAINTAINER="mallory@sweetpeople.org" 401.5 LICENSE="MIT" 401.6 WEB_SITE="https://www.x.org/wiki/" 401.7 -HOST_ARCH="i486 arm" 401.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 401.9 401.10 TARBALL="xkill-$VERSION.tar.bz2" 401.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 401.12 401.13 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXmu-dev xorg-xproto" 401.14 -PKG_RULE="std" 401.15 401.16 -# Rules to configure and make the package. 401.17 -compile_rules() 401.18 -{ 401.19 +compile_rules() { 401.20 + fix ld 401.21 ./configure \ 401.22 --sysconfdir=/etc \ 401.23 --localstatedir=/var \ 401.24 $CONFIGURE_ARGS && 401.25 + fix libtool && 401.26 make && 401.27 make install 401.28 } 401.29 401.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 401.31 -genpkg_rules() 401.32 -{ 401.33 +genpkg_rules() { 401.34 copy @std 401.35 DEPENDS="xorg-libX11 xorg-libXmu" 401.36 }
402.1 --- a/xorg-xlsatoms/receipt Sat Feb 24 10:43:01 2018 +0200 402.2 +++ b/xorg-xlsatoms/receipt Sat Feb 24 16:17:33 2018 +0200 402.3 @@ -7,27 +7,25 @@ 402.4 MAINTAINER="al.bobylev@gmail.com" 402.5 LICENSE="MIT" 402.6 WEB_SITE="https://www.x.org/wiki/" 402.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 402.8 402.9 TARBALL="xlsatoms-$VERSION.tar.bz2" 402.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 402.11 402.12 BUILD_DEPENDS="xorg-util-macros xorg-libxcb-dev" 402.13 -PKG_RULE="std" 402.14 402.15 -# Rules to configure and make the package. 402.16 -compile_rules() 402.17 -{ 402.18 +compile_rules() { 402.19 + fix ld 402.20 ./configure \ 402.21 --sysconfdir=/etc \ 402.22 --localstatedir=/var \ 402.23 $CONFIGURE_ARGS && 402.24 + fix libtool && 402.25 make && 402.26 make install 402.27 } 402.28 402.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 402.30 -genpkg_rules() 402.31 -{ 402.32 +genpkg_rules() { 402.33 copy @std 402.34 DEPENDS="xorg-libxcb" 402.35 }
403.1 --- a/xorg-xlsclients/receipt Sat Feb 24 10:43:01 2018 +0200 403.2 +++ b/xorg-xlsclients/receipt Sat Feb 24 16:17:33 2018 +0200 403.3 @@ -7,29 +7,27 @@ 403.4 MAINTAINER="al.bobylev@gmail.com" 403.5 LICENSE="MIT" 403.6 WEB_SITE="https://www.x.org/wiki/" 403.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 403.8 403.9 TARBALL="xlsclients-$VERSION.tar.bz2" 403.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 403.11 403.12 BUILD_DEPENDS="xorg-util-macros xorg-libxcb-dev" 403.13 -PKG_RULE="std" 403.14 403.15 -# Rules to configure and make the package. 403.16 -compile_rules() 403.17 -{ 403.18 +compile_rules() { 403.19 touch /root/missing /missing 403.20 403.21 + fix ld 403.22 ./configure \ 403.23 --sysconfdir=/etc \ 403.24 --localstatedir=/var \ 403.25 $CONFIGURE_ARGS && 403.26 + fix libtool && 403.27 make && 403.28 make install 403.29 } 403.30 403.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 403.32 -genpkg_rules() 403.33 -{ 403.34 +genpkg_rules() { 403.35 copy @std 403.36 DEPENDS="xorg-libxcb" 403.37 }
404.1 --- a/xorg-xmessage/receipt Sat Feb 24 10:43:01 2018 +0200 404.2 +++ b/xorg-xmessage/receipt Sat Feb 24 16:17:33 2018 +0200 404.3 @@ -7,28 +7,25 @@ 404.4 MAINTAINER="slaxemulator@gmail.com" 404.5 LICENSE="MIT" 404.6 WEB_SITE="https://www.x.org/wiki/" 404.7 -HOST_ARCH="i486 arm" 404.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 404.9 404.10 TARBALL="xmessage-$VERSION.tar.bz2" 404.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 404.12 404.13 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev" 404.14 -PKG_RULE="std" 404.15 404.16 -# Rules to configure and make the package. 404.17 -compile_rules() 404.18 -{ 404.19 +compile_rules() { 404.20 + fix ld 404.21 ./configure \ 404.22 --sysconfdir=/etc \ 404.23 --localstatedir=/var \ 404.24 $CONFIGURE_ARGS && 404.25 + fix libtool && 404.26 make && 404.27 make install 404.28 } 404.29 404.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 404.31 -genpkg_rules() 404.32 -{ 404.33 +genpkg_rules() { 404.34 copy @std 404.35 DEPENDS="xorg-libX11 xorg-libXaw xorg-libXt" 404.36 CONFIG_FILES="/etc/X11/app-defaults/Xmessage \
405.1 --- a/xorg-xmodmap/receipt Sat Feb 24 10:43:01 2018 +0200 405.2 +++ b/xorg-xmodmap/receipt Sat Feb 24 16:17:33 2018 +0200 405.3 @@ -7,27 +7,25 @@ 405.4 MAINTAINER="pankso@slitaz.org" 405.5 LICENSE="MIT" 405.6 WEB_SITE="https://www.x.org/wiki/" 405.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 405.8 405.9 TARBALL="xmodmap-$VERSION.tar.bz2" 405.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 405.11 405.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto" 405.13 -PKG_RULE="std" 405.14 405.15 -# Rules to configure and make the package. 405.16 -compile_rules() 405.17 -{ 405.18 +compile_rules() { 405.19 + fix ld 405.20 ./configure \ 405.21 --sysconfdir=/etc \ 405.22 --localstatedir=/var \ 405.23 $CONFIGURE_ARGS && 405.24 + fix libtool && 405.25 make && 405.26 make install 405.27 } 405.28 405.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 405.30 -genpkg_rules() 405.31 -{ 405.32 +genpkg_rules() { 405.33 copy @std 405.34 DEPENDS="xorg-libX11" 405.35 }
406.1 --- a/xorg-xpr/receipt Sat Feb 24 10:43:01 2018 +0200 406.2 +++ b/xorg-xpr/receipt Sat Feb 24 16:17:33 2018 +0200 406.3 @@ -7,27 +7,25 @@ 406.4 MAINTAINER="al.bobylev@gmail.com" 406.5 LICENSE="MIT" 406.6 WEB_SITE="https://www.x.org/wiki/" 406.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 406.8 406.9 TARBALL="xpr-$VERSION.tar.bz2" 406.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 406.11 406.12 BUILD_DEPENDS="xorg-util-macros xorg-libXmu-dev xorg-libX11-dev xorg-xproto" 406.13 -PKG_RULE="std" 406.14 406.15 -# Rules to configure and make the package. 406.16 -compile_rules() 406.17 -{ 406.18 +compile_rules() { 406.19 + fix ld 406.20 ./configure \ 406.21 --sysconfdir=/etc \ 406.22 --localstatedir=/var \ 406.23 $CONFIGURE_ARGS && 406.24 + fix libtool && 406.25 make && 406.26 make install 406.27 } 406.28 406.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 406.30 -genpkg_rules() 406.31 -{ 406.32 +genpkg_rules() { 406.33 copy @std 406.34 DEPENDS="xorg-libX11 xorg-libXmu" 406.35 }
407.1 --- a/xorg-xprop/receipt Sat Feb 24 10:43:01 2018 +0200 407.2 +++ b/xorg-xprop/receipt Sat Feb 24 16:17:33 2018 +0200 407.3 @@ -7,28 +7,25 @@ 407.4 MAINTAINER="pankso@slitaz.org" 407.5 LICENSE="MIT" 407.6 WEB_SITE="https://www.x.org/wiki/" 407.7 -HOST_ARCH="i486 arm" 407.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 407.9 407.10 TARBALL="xprop-$VERSION.tar.bz2" 407.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 407.12 407.13 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto" 407.14 -PKG_RULE="std" 407.15 407.16 -# Rules to configure and make the package. 407.17 -compile_rules() 407.18 -{ 407.19 +compile_rules() { 407.20 + fix ld 407.21 ./configure \ 407.22 --sysconfdir=/etc \ 407.23 --localstatedir=/var \ 407.24 $CONFIGURE_ARGS && 407.25 + fix libtool && 407.26 make && 407.27 make install 407.28 } 407.29 407.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 407.31 -genpkg_rules() 407.32 -{ 407.33 +genpkg_rules() { 407.34 copy @std 407.35 DEPENDS="xorg-libX11" 407.36 }
408.1 --- a/xorg-xproto/receipt Sat Feb 24 10:43:01 2018 +0200 408.2 +++ b/xorg-xproto/receipt Sat Feb 24 16:17:33 2018 +0200 408.3 @@ -7,17 +7,14 @@ 408.4 MAINTAINER="pankso@slitaz.org" 408.5 LICENSE="MIT" 408.6 WEB_SITE="https://www.x.org/wiki/" 408.7 -HOST_ARCH="i486 arm" 408.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7proto.html" 408.9 408.10 TARBALL="xproto-$VERSION.tar.bz2" 408.11 WGET_URL="$XORG_MIRROR/proto/$TARBALL" 408.12 408.13 BUILD_DEPENDS="xorg-util-macros" 408.14 -PKG_RULE="dev" 408.15 408.16 -# Rules to configure and make the package. 408.17 -compile_rules() 408.18 -{ 408.19 +compile_rules() { 408.20 ./configure \ 408.21 --sysconfdir=/etc \ 408.22 --localstatedir=/var \ 408.23 @@ -26,9 +23,7 @@ 408.24 make MKDIRPROG="mkdir -p" install 408.25 } 408.26 408.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 408.28 -genpkg_rules() 408.29 -{ 408.30 +genpkg_rules() { 408.31 copy @dev 408.32 DEPENDS="xorg-util-macros" 408.33 }
409.1 --- a/xorg-xrandr/receipt Sat Feb 24 10:43:01 2018 +0200 409.2 +++ b/xorg-xrandr/receipt Sat Feb 24 16:17:33 2018 +0200 409.3 @@ -7,29 +7,26 @@ 409.4 MAINTAINER="pankso@slitaz.org" 409.5 LICENSE="MIT" 409.6 WEB_SITE="https://www.x.org/wiki/" 409.7 -HOST_ARCH="i486 arm" 409.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 409.9 409.10 TARBALL="xrandr-$VERSION.tar.bz2" 409.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 409.12 409.13 BUILD_DEPENDS="xorg-util-macros xorg-libXrandr-dev xorg-libXrender-dev \ 409.14 xorg-libX11-dev xorg-xproto" 409.15 -PKG_RULE="std" 409.16 409.17 -# Rules to configure and make the package. 409.18 -compile_rules() 409.19 -{ 409.20 +compile_rules() { 409.21 + fix ld 409.22 ./configure \ 409.23 --sysconfdir=/etc \ 409.24 --localstatedir=/var \ 409.25 $CONFIGURE_ARGS && 409.26 + fix libtool && 409.27 make && 409.28 make install 409.29 } 409.30 409.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 409.32 -genpkg_rules() 409.33 -{ 409.34 +genpkg_rules() { 409.35 copy @std 409.36 - DEPENDS="xorg-libX11 xorg-libXrandr xorg-libXrender" 409.37 + DEPENDS="xorg-libX11 xorg-libXrandr" 409.38 }
410.1 --- a/xorg-xrdb/receipt Sat Feb 24 10:43:01 2018 +0200 410.2 +++ b/xorg-xrdb/receipt Sat Feb 24 16:17:33 2018 +0200 410.3 @@ -7,29 +7,27 @@ 410.4 MAINTAINER="rocky@slitaz.org" 410.5 LICENSE="MIT" 410.6 WEB_SITE="https://www.x.org/wiki/" 410.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 410.8 410.9 TARBALL="xrdb-$VERSION.tar.bz2" 410.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 410.11 410.12 BUILD_DEPENDS="xorg-util-macros xorg-libXmu-dev xorg-libX11-dev xorg-xproto" 410.13 -PKG_RULE="std" 410.14 410.15 -# Rules to configure and make the package. 410.16 -compile_rules() 410.17 -{ 410.18 +compile_rules() { 410.19 touch /root/missing /missing 410.20 410.21 + fix ld 410.22 ./configure \ 410.23 --sysconfdir=/etc \ 410.24 --localstatedir=/var \ 410.25 $CONFIGURE_ARGS && 410.26 + fix libtool && 410.27 make && 410.28 make install 410.29 } 410.30 410.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 410.32 -genpkg_rules() 410.33 -{ 410.34 +genpkg_rules() { 410.35 copy @std 410.36 DEPENDS="xorg-libX11 xorg-libXmu" 410.37 }
411.1 --- a/xorg-xrefresh/receipt Sat Feb 24 10:43:01 2018 +0200 411.2 +++ b/xorg-xrefresh/receipt Sat Feb 24 16:17:33 2018 +0200 411.3 @@ -7,27 +7,25 @@ 411.4 MAINTAINER="al.bobylev@gmail.com" 411.5 LICENSE="MIT" 411.6 WEB_SITE="https://www.x.org/wiki/" 411.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 411.8 411.9 TARBALL="xrefresh-$VERSION.tar.bz2" 411.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 411.11 411.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto" 411.13 -PKG_RULE="std" 411.14 411.15 -# Rules to configure and make the package. 411.16 -compile_rules() 411.17 -{ 411.18 +compile_rules() { 411.19 + fix ld 411.20 ./configure \ 411.21 --sysconfdir=/etc \ 411.22 --localstatedir=/var \ 411.23 $CONFIGURE_ARGS && 411.24 + fix libtool && 411.25 make && 411.26 make install 411.27 } 411.28 411.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 411.30 -genpkg_rules() 411.31 -{ 411.32 +genpkg_rules() { 411.33 copy @std 411.34 DEPENDS="xorg-libX11" 411.35 }
412.1 --- a/xorg-xset/receipt Sat Feb 24 10:43:01 2018 +0200 412.2 +++ b/xorg-xset/receipt Sat Feb 24 16:17:33 2018 +0200 412.3 @@ -7,33 +7,31 @@ 412.4 MAINTAINER="paul@slitaz.org" 412.5 LICENSE="MIT" 412.6 WEB_SITE="https://www.x.org/wiki/" 412.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 412.8 412.9 TARBALL="xset-$VERSION.tar.bz2" 412.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 412.11 412.12 BUILD_DEPENDS="xorg-util-macros xorg-xproto xorg-libXmu-dev \ 412.13 xorg-libXxf86misc-dev xorg-libXfontcache-dev" 412.14 -PKG_RULE="std" 412.15 412.16 -# Rules to configure and make the package. 412.17 -compile_rules() 412.18 -{ 412.19 +compile_rules() { 412.20 touch /root/missing /missing 412.21 412.22 + fix ld 412.23 ./configure \ 412.24 --sysconfdir=/etc \ 412.25 --localstatedir=/var \ 412.26 $CONFIGURE_ARGS && 412.27 + fix libtool && 412.28 make && 412.29 - make install 412.30 + make install || return 1 412.31 412.32 cp -a $stuff/*.sh $install/usr/bin/ 412.33 chown -R root:root $install 412.34 } 412.35 412.36 -# Rules to gen a SliTaz package suitable for Tazpkg. 412.37 -genpkg_rules() 412.38 -{ 412.39 +genpkg_rules() { 412.40 copy @std 412.41 DEPENDS="xorg-libX11 xorg-libXext xorg-libXfontcache xorg-libXmu \ 412.42 xorg-libXxf86misc"
413.1 --- a/xorg-xsetroot/receipt Sat Feb 24 10:43:01 2018 +0200 413.2 +++ b/xorg-xsetroot/receipt Sat Feb 24 16:17:33 2018 +0200 413.3 @@ -7,29 +7,26 @@ 413.4 MAINTAINER="pankso@slitaz.org" 413.5 LICENSE="MIT" 413.6 WEB_SITE="https://www.x.org/wiki/" 413.7 -HOST_ARCH="i486 arm" 413.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 413.9 413.10 TARBALL="xsetroot-$VERSION.tar.bz2" 413.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 413.12 413.13 BUILD_DEPENDS="xorg-util-macros xorg-libXmu-dev xorg-libX11-dev \ 413.14 xorg-xbitmaps xorg-libXcursor-dev xorg-xproto" 413.15 -PKG_RULE="std" 413.16 413.17 -# Rules to configure and make the package. 413.18 -compile_rules() 413.19 -{ 413.20 +compile_rules() { 413.21 + fix ld 413.22 ./configure \ 413.23 --sysconfdir=/etc \ 413.24 --localstatedir=/var \ 413.25 $CONFIGURE_ARGS && 413.26 + fix libtool && 413.27 make && 413.28 make install 413.29 } 413.30 413.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 413.32 -genpkg_rules() 413.33 -{ 413.34 +genpkg_rules() { 413.35 copy @std 413.36 DEPENDS="xorg-libX11 xorg-libXcursor xorg-libXmu" 413.37 }
414.1 --- a/xorg-xtrans/receipt Sat Feb 24 10:43:01 2018 +0200 414.2 +++ b/xorg-xtrans/receipt Sat Feb 24 16:17:33 2018 +0200 414.3 @@ -7,17 +7,14 @@ 414.4 MAINTAINER="pankso@slitaz.org" 414.5 LICENSE="other" 414.6 WEB_SITE="https://www.x.org/wiki/" 414.7 -HOST_ARCH="i486 arm" 414.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html" 414.9 414.10 TARBALL="xtrans-$VERSION.tar.bz2" 414.11 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 414.12 414.13 BUILD_DEPENDS="xorg-util-macros" 414.14 -PKG_RULE="dev" 414.15 414.16 -# Rules to configure and make the package. 414.17 -compile_rules() 414.18 -{ 414.19 +compile_rules() { 414.20 ./configure \ 414.21 --sysconfdir=/etc \ 414.22 --localstatedir=/var \ 414.23 @@ -26,9 +23,7 @@ 414.24 make install 414.25 } 414.26 414.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 414.28 -genpkg_rules() 414.29 -{ 414.30 +genpkg_rules() { 414.31 copy @dev 414.32 DEPENDS="xorg-xproto" 414.33 }
415.1 --- a/xorg-xvinfo/receipt Sat Feb 24 10:43:01 2018 +0200 415.2 +++ b/xorg-xvinfo/receipt Sat Feb 24 16:17:33 2018 +0200 415.3 @@ -7,27 +7,25 @@ 415.4 MAINTAINER="al.bobylev@gmail.com" 415.5 LICENSE="MIT" 415.6 WEB_SITE="https://www.x.org/wiki/" 415.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 415.8 415.9 TARBALL="xvinfo-$VERSION.tar.bz2" 415.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 415.11 415.12 BUILD_DEPENDS="xorg-util-macros xorg-libXv-dev xorg-libX11-dev xorg-xproto" 415.13 -PKG_RULE="std" 415.14 415.15 -# Rules to configure and make the package. 415.16 -compile_rules() 415.17 -{ 415.18 +compile_rules() { 415.19 + fix ld 415.20 ./configure \ 415.21 --sysconfdir=/etc \ 415.22 --localstatedir=/var \ 415.23 $CONFIGURE_ARGS && 415.24 + fix libtool && 415.25 make && 415.26 make install 415.27 } 415.28 415.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 415.30 -genpkg_rules() 415.31 -{ 415.32 +genpkg_rules() { 415.33 copy @std 415.34 DEPENDS="xorg-libX11 xorg-libXv" 415.35 }
416.1 --- a/xorg-xwd/receipt Sat Feb 24 10:43:01 2018 +0200 416.2 +++ b/xorg-xwd/receipt Sat Feb 24 16:17:33 2018 +0200 416.3 @@ -7,27 +7,25 @@ 416.4 MAINTAINER="al.bobylev@gmail.com" 416.5 LICENSE="MIT" 416.6 WEB_SITE="https://www.x.org/wiki/" 416.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 416.8 416.9 TARBALL="xwd-$VERSION.tar.bz2" 416.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 416.11 416.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto xorg-libxkbfile-dev" 416.13 -PKG_RULE="std" 416.14 416.15 -# Rules to configure and make the package. 416.16 -compile_rules() 416.17 -{ 416.18 +compile_rules() { 416.19 + fix ld 416.20 ./configure \ 416.21 --sysconfdir=/etc \ 416.22 --localstatedir=/var \ 416.23 $CONFIGURE_ARGS && 416.24 + fix libtool && 416.25 make && 416.26 make install 416.27 } 416.28 416.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 416.30 -genpkg_rules() 416.31 -{ 416.32 +genpkg_rules() { 416.33 copy @std 416.34 DEPENDS="xorg-libX11 xorg-libxkbfile" 416.35 }
417.1 --- a/xorg-xwininfo/receipt Sat Feb 24 10:43:01 2018 +0200 417.2 +++ b/xorg-xwininfo/receipt Sat Feb 24 16:17:33 2018 +0200 417.3 @@ -7,28 +7,25 @@ 417.4 MAINTAINER="jozee@slitaz.org" 417.5 LICENSE="MIT" 417.6 WEB_SITE="https://www.x.org/wiki/" 417.7 -HOST_ARCH="i486 arm" 417.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 417.9 417.10 TARBALL="xwininfo-$VERSION.tar.bz2" 417.11 WGET_URL="$XORG_MIRROR/app/$TARBALL" 417.12 417.13 BUILD_DEPENDS="xorg-util-macros xorg-libxcb-dev xorg-libX11-dev" 417.14 -PKG_RULE="std" 417.15 417.16 -# Rules to configure and make the package. 417.17 -compile_rules() 417.18 -{ 417.19 +compile_rules() { 417.20 + fix ld 417.21 ./configure \ 417.22 --sysconfdir=/etc \ 417.23 --localstatedir=/var \ 417.24 $CONFIGURE_ARGS && 417.25 + fix libtool && 417.26 make && 417.27 make install 417.28 } 417.29 417.30 -# Rules to gen a SliTaz package suitable for Tazpkg. 417.31 -genpkg_rules() 417.32 -{ 417.33 +genpkg_rules() { 417.34 copy @std 417.35 DEPENDS="xorg-libxcb" 417.36 TAGS="util xorg windows"
418.1 --- a/xorg-xwud/receipt Sat Feb 24 10:43:01 2018 +0200 418.2 +++ b/xorg-xwud/receipt Sat Feb 24 16:17:33 2018 +0200 418.3 @@ -7,27 +7,25 @@ 418.4 MAINTAINER="al.bobylev@gmail.com" 418.5 LICENSE="MIT" 418.6 WEB_SITE="https://www.x.org/wiki/" 418.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html" 418.8 418.9 TARBALL="xwud-$VERSION.tar.bz2" 418.10 WGET_URL="$XORG_MIRROR/app/$TARBALL" 418.11 418.12 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xproto" 418.13 -PKG_RULE="std" 418.14 418.15 -# Rules to configure and make the package. 418.16 -compile_rules() 418.17 -{ 418.18 +compile_rules() { 418.19 + fix ld 418.20 ./configure \ 418.21 --sysconfdir=/etc \ 418.22 --localstatedir=/var \ 418.23 $CONFIGURE_ARGS && 418.24 + fix libtool && 418.25 make && 418.26 make install 418.27 } 418.28 418.29 -# Rules to gen a SliTaz package suitable for Tazpkg. 418.30 -genpkg_rules() 418.31 -{ 418.32 +genpkg_rules() { 418.33 copy @std 418.34 DEPENDS="xorg-libX11" 418.35 }
419.1 --- a/xterm/receipt Sat Feb 24 10:43:01 2018 +0200 419.2 +++ b/xterm/receipt Sat Feb 24 16:17:33 2018 +0200 419.3 @@ -7,7 +7,6 @@ 419.4 MAINTAINER="pankso@slitaz.org" 419.5 LICENSE="MIT" 419.6 WEB_SITE="http://invisible-island.net/xterm/" 419.7 -HOST_ARCH="i486 arm" 419.8 COOKOPTS="!pixmaps" 419.9 419.10 TARBALL="$PACKAGE-$VERSION.tgz" 419.11 @@ -17,9 +16,7 @@ 419.12 xorg-libXaw3d-dev xorg-libXcursor-dev freetype-dev expat-dev fontconfig-dev \ 419.13 xorg-libXft-dev xorg-libXt-dev" 419.14 419.15 -# Rules to configure and make the package. 419.16 -compile_rules() 419.17 -{ 419.18 +compile_rules() { 419.19 export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" 419.20 ./configure \ 419.21 --prefix=/usr \ 419.22 @@ -69,9 +66,7 @@ 419.23 readelf -h $install/usr/bin/xterm 419.24 } 419.25 419.26 -# Rules to gen a SliTaz package suitable for Tazpkg. 419.27 -genpkg_rules() 419.28 -{ 419.29 +genpkg_rules() { 419.30 copy xterm resize XTerm XTerm-color *.png 419.31 TAGS="terminal" 419.32 DEPENDS="fontconfig ncurses xorg-libICE xorg-libX11 xorg-libXaw3d \
420.1 --- a/yasm/receipt Sat Feb 24 10:43:01 2018 +0200 420.2 +++ b/yasm/receipt Sat Feb 24 16:17:33 2018 +0200 420.3 @@ -7,24 +7,23 @@ 420.4 MAINTAINER="jozee@slitaz.org" 420.5 LICENSE="BSD GPL2 LGPL2" 420.6 WEB_SITE="http://yasm.tortall.net/" 420.7 -HOST_ARCH="i486 arm" 420.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/yasm.html" 420.9 420.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 420.11 WGET_URL="http://www.tortall.net/projects/yasm/releases/$TARBALL" 420.12 420.13 SPLIT="yasm-dev" 420.14 420.15 -# Rules to configure and make the package. 420.16 -compile_rules() 420.17 -{ 420.18 +compile_rules() { 420.19 + # prevent compiling vsyasm and ytasm that are only of use on MS Windows 420.20 + sed -i 's#) ytasm.*#)#' Makefile.in 420.21 + 420.22 ./configure $CONFIGURE_ARGS && make && make install 420.23 } 420.24 420.25 -# Rules to gen a SliTaz package suitable for Tazpkg. 420.26 -genpkg_rules() 420.27 -{ 420.28 +genpkg_rules() { 420.29 case $PACKAGE in 420.30 - yasm) copy @std ;; 420.31 - yasm-dev) copy @dev ;; 420.32 + yasm) copy @std;; 420.33 + *-dev) copy @dev;; 420.34 esac 420.35 }
421.1 --- a/zip/receipt Sat Feb 24 10:43:01 2018 +0200 421.2 +++ b/zip/receipt Sat Feb 24 16:17:33 2018 +0200 421.3 @@ -13,9 +13,7 @@ 421.4 421.5 BUILD_DEPENDS="bzip2-dev" 421.6 421.7 -# Rules to configure and make the package. 421.8 -compile_rules() 421.9 -{ 421.10 +compile_rules() { 421.11 sed -i "s|/usr/local|$install/usr|; 421.12 s|\$(prefix)/man|\$(prefix)/share/man|" unix/Makefile 421.13 421.14 @@ -23,9 +21,7 @@ 421.15 make -f unix/Makefile install 421.16 } 421.17 421.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 421.19 -genpkg_rules() 421.20 -{ 421.21 +genpkg_rules() { 421.22 copy @std 421.23 DEPENDS="bzlib" 421.24 TAGS="archive compression"