wok-next rev 21064
Up: cookutils (1113), iproute2 (4.19.0), libcap (2.26), meson (0.48.2), perl (5.28.1), procps-ng (3.3.15), psmisc (23.2), python3 (3.7.1), readline (7.0p5), util-linux (2.33); fix: grub2, gzip, m4
line diff
1.1 --- a/cookutils/receipt Wed Dec 05 13:28:22 2018 +0200 1.2 +++ b/cookutils/receipt Wed Dec 05 18:07:35 2018 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="cookutils" 1.7 -VERSION="1101" 1.8 +VERSION="1113" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="SliTaz packages builder new generation" 1.11 MAINTAINER="devel@slitaz.org"
2.1 --- a/grub2/receipt Wed Dec 05 13:28:22 2018 +0200 2.2 +++ b/grub2/receipt Wed Dec 05 18:07:35 2018 +0200 2.3 @@ -32,7 +32,9 @@ 2.4 case $SET in 2.5 '') 2.6 #chmod +x install-sh 2.7 - ./configure $CONFIGURE_ARGS && 2.8 + ./configure \ 2.9 + --disable-werror \ 2.10 + $CONFIGURE_ARGS && 2.11 make $MAKEFLAGS && 2.12 make DESTDIR=$install install || return 1 2.13 2.14 @@ -41,10 +43,12 @@ 2.15 ;; 2.16 efi) 2.17 case $ARCH in 2.18 - i?86) bootimg=bootia32.efi 2.19 - EFI_ARCH=i386;; 2.20 - x86_64) bootimg=bootx64.efi 2.21 - EFI_ARCH=x86_64;; 2.22 + i?86) 2.23 + bootimg=bootia32.efi 2.24 + EFI_ARCH=i386;; 2.25 + x86_64) 2.26 + bootimg=bootx64.efi 2.27 + EFI_ARCH=x86_64;; 2.28 esac 2.29 export EFI_ARCH 2.30 ./configure \ 2.31 @@ -88,8 +92,8 @@ 2.32 grub2-efi-modules) 2.33 DEPENDS="grub2-efi" 2.34 case $ARCH in 2.35 - i?86) efi_path=boot/efi/grub/i386-efi;; 2.36 - x86_64) efi_path=boot/efi/grub/x86_64-efi;; 2.37 + i?86) efi_path=boot/efi/grub/i386-efi;; 2.38 + x86_64) efi_path=boot/efi/grub/x86_64-efi;; 2.39 esac 2.40 mkdir -p $fs/$efi_path 2.41 cp $src/grub-core/*.mod $src/grub-core/*.lst $fs/$efi_path
3.1 --- a/gzip/receipt Wed Dec 05 13:28:22 2018 +0200 3.2 +++ b/gzip/receipt Wed Dec 05 18:07:35 2018 +0200 3.3 @@ -15,7 +15,19 @@ 3.4 BUILD_DEPENDS="glibc-dev" 3.5 SPLIT="$PACKAGE-full" 3.6 3.7 +COPY_std="gzip gunzip zgrep" 3.8 +COPY_full="bin/ @rm" 3.9 + 3.10 +DEPENDS_full="gzip" 3.11 + 3.12 +TAGS_std="LFS" 3.13 +CAT_full="system-tools|full set" 3.14 + 3.15 compile_rules() { 3.16 + # fixes for glibc-2.28 3.17 + sed -i 's|IO_ftrylockfile|IO_EOF_SEEN|' lib/*.c 3.18 + echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h 3.19 + 3.20 ./configure $CONFIGURE_ARGS && 3.21 make && 3.22 make install || return 1 3.23 @@ -24,20 +36,6 @@ 3.24 mv -v $install/usr/bin/gzip $install/bin 3.25 } 3.26 3.27 -genpkg_rules() { 3.28 - case $PACKAGE in 3.29 - gzip) 3.30 - copy gzip gunzip zgrep 3.31 - TAGS="LFS" 3.32 - ;; 3.33 - gzip-full) 3.34 - copy bin/ @rm 3.35 - CAT="system-tools|full set" 3.36 - DEPENDS="gzip" 3.37 - ;; 3.38 - esac 3.39 -} 3.40 - 3.41 # Removing Busybox gunzip applet 3.42 # as we have /usr/bin/gunzip in this package 3.43 pre_install_gzip() {
4.1 --- a/iana-etc/receipt Wed Dec 05 13:28:22 2018 +0200 4.2 +++ b/iana-etc/receipt Wed Dec 05 18:07:35 2018 +0200 4.3 @@ -8,18 +8,15 @@ 4.4 LICENSE="OSL3" 4.5 WEB_SITE="http://freshmeat.sourceforge.net/projects/iana-etc" 4.6 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/iana-etc.html" 4.7 +HOST_ARCH="any" 4.8 4.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.10 WGET_URL="http://anduin.linuxfromscratch.org/LFS/$TARBALL" 4.11 4.12 BUILD_DEPENDS="gawk" 4.13 +TAGS_std="LFS" 4.14 4.15 compile_rules() { 4.16 make && 4.17 make DESTDIR=$install install 4.18 } 4.19 - 4.20 -genpkg_rules() { 4.21 - copy @std 4.22 - TAGS="LFS" 4.23 -}
5.1 --- a/iproute2/receipt Wed Dec 05 13:28:22 2018 +0200 5.2 +++ b/iproute2/receipt Wed Dec 05 18:07:35 2018 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt v2. 5.5 5.6 PACKAGE="iproute2" 5.7 -VERSION="4.17.0" 5.8 +VERSION="4.19.0" 5.9 CATEGORY="network" 5.10 SHORT_DESC="Utilites for networking and traffic control" 5.11 MAINTAINER="allan316@gmail.com" 5.12 @@ -13,6 +13,10 @@ 5.13 WGET_URL="https://www.kernel.org/pub/linux/utils/net/$PACKAGE/$TARBALL" 5.14 5.15 BUILD_DEPENDS="bison flex iptables-dev db-dev libmnl-dev elfutils-dev" 5.16 +SPLIT="$PACKAGE-dev" 5.17 + 5.18 +DEPENDS_std="iptables db" 5.19 +TAGS_std="LFS network route" 5.20 5.21 compile_rules() { 5.22 ./configure \ 5.23 @@ -25,9 +29,3 @@ 5.24 DESTDIR=$install \ 5.25 install 5.26 } 5.27 - 5.28 -genpkg_rules() { 5.29 - copy @std 5.30 - TAGS="LFS network route" 5.31 - DEPENDS="iptables db" 5.32 -}
6.1 --- a/libcap/receipt Wed Dec 05 13:28:22 2018 +0200 6.2 +++ b/libcap/receipt Wed Dec 05 18:07:35 2018 +0200 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt v2. 6.5 6.6 PACKAGE="libcap" 6.7 -VERSION="2.25" 6.8 +VERSION="2.26" 6.9 CATEGORY="system-tools" 6.10 SHORT_DESC="Support for getting/setting POSIX.1e capabilities" 6.11 MAINTAINER="devel@slitaz.org"
7.1 --- a/m4/receipt Wed Dec 05 13:28:22 2018 +0200 7.2 +++ b/m4/receipt Wed Dec 05 18:07:35 2018 +0200 7.3 @@ -12,14 +12,15 @@ 7.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 7.5 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 7.6 7.7 +DEPENDS_std="glibc-base" 7.8 +TAGS_std="LFS" 7.9 + 7.10 compile_rules() { 7.11 + # fixes for glibc-2.28: 7.12 + sed -i 's|IO_ftrylockfile|IO_EOF_SEEN|' lib/*.c 7.13 + echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h 7.14 + 7.15 ./configure $CONFIGURE_ARGS && 7.16 make && 7.17 make install 7.18 } 7.19 - 7.20 -genpkg_rules() { 7.21 - copy @std 7.22 - DEPENDS="glibc-base" 7.23 - TAGS="LFS" 7.24 -}
8.1 --- a/man-pages/receipt Wed Dec 05 13:28:22 2018 +0200 8.2 +++ b/man-pages/receipt Wed Dec 05 18:07:35 2018 +0200 8.3 @@ -8,15 +8,14 @@ 8.4 LICENSE="unknown" 8.5 WEB_SITE="https://www.kernel.org/doc/man-pages/" 8.6 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/man-pages.html" 8.7 +HOST_ARCH="any" 8.8 8.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 8.10 WGET_URL="https://www.kernel.org/pub/linux/docs/man-pages/$TARBALL" 8.11 8.12 +COPY_std="man/" 8.13 +TAGS_std="LFS" 8.14 + 8.15 compile_rules() { 8.16 make DESTDIR=$install install 8.17 } 8.18 - 8.19 -genpkg_rules() { 8.20 - copy man/ 8.21 - TAGS="LFS" 8.22 -}
9.1 --- a/meson/receipt Wed Dec 05 13:28:22 2018 +0200 9.2 +++ b/meson/receipt Wed Dec 05 18:07:35 2018 +0200 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt v2. 9.5 9.6 PACKAGE="meson" 9.7 -VERSION="0.48.1" 9.8 +VERSION="0.48.2" 9.9 CATEGORY="development" 9.10 SHORT_DESC="A high performance build system" 9.11 MAINTAINER="al.bobylev@gmail.com" 9.12 @@ -14,15 +14,12 @@ 9.13 WGET_URL="https://github.com/mesonbuild/meson/releases/download/$VERSION/$TARBALL" 9.14 9.15 BUILD_DEPENDS="python3" 9.16 +DEPENDS_std="python3" 9.17 + 9.18 +TAGS_std="LFS" 9.19 9.20 compile_rules() { 9.21 python3 -B setup.py install --root=$install || return 1 9.22 9.23 install -m755 $stuff/meson-wrapper $install/usr/bin/ 9.24 } 9.25 - 9.26 -genpkg_rules() { 9.27 - copy @std 9.28 - DEPENDS="python3" 9.29 - TAGS="LFS" 9.30 -}
10.1 --- a/ncurses/receipt Wed Dec 05 13:28:22 2018 +0200 10.2 +++ b/ncurses/receipt Wed Dec 05 18:07:35 2018 +0200 10.3 @@ -49,7 +49,7 @@ 10.4 ln -sf libncurses.so $install/usr/lib/libcurses.so 10.5 10.6 mkdir -p $install/usr/share/doc/ncurses-$VERSION 10.7 - cp -a doc/* $install/usr/share/doc/ncurses-$VERSION 10.8 + cp -r doc/* $install/usr/share/doc/ncurses-$VERSION 10.9 10.10 # Fix F-keys in the terminal 10.11 for i in xterm xterm-256color; do
11.1 --- a/perl/receipt Wed Dec 05 13:28:22 2018 +0200 11.2 +++ b/perl/receipt Wed Dec 05 18:07:35 2018 +0200 11.3 @@ -1,7 +1,7 @@ 11.4 # SliTaz package receipt v2. 11.5 11.6 PACKAGE="perl" 11.7 -VERSION="5.28.0" 11.8 +VERSION="5.28.1" 11.9 CATEGORY="development" 11.10 SHORT_DESC="Perl interpreter and modules" 11.11 MAINTAINER="devel@slitaz.org" 11.12 @@ -19,7 +19,7 @@ 11.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 11.14 WGET_URL="http://www.cpan.org/src/5.0/$TARBALL" 11.15 # Integrity check: http://www.cpan.org/src/5.0/ 11.16 -TARBALL_SHA256="059b3cb69970d8c8c5964caced0335b4af34ac990c8e61f7e3f90cd1c2d11e49" 11.17 +TARBALL_SHA256="fea7162d4cca940a387f0587b93f6737d884bf74d8a9d7cfd978bc12cd0b202d" 11.18 11.19 COOKOPTS="!perlz" 11.20 BUILD_DEPENDS="zlib-dev bzip2-dev less gdbm-dev" 11.21 @@ -37,7 +37,9 @@ 11.22 -Duseshrplib \ 11.23 -Dusethreads && 11.24 make && 11.25 - make install 11.26 + make install || return 1 11.27 + 11.28 + find $install -type f -exec chmod u+w '{}' \; # 444->644, 555->755 11.29 } 11.30 11.31 genpkg_rules() {
12.1 --- a/procps-ng/receipt Wed Dec 05 13:28:22 2018 +0200 12.2 +++ b/procps-ng/receipt Wed Dec 05 18:07:35 2018 +0200 12.3 @@ -1,7 +1,7 @@ 12.4 # SliTaz package receipt v2. 12.5 12.6 PACKAGE="procps-ng" 12.7 -VERSION="3.3.12" 12.8 +VERSION="3.3.15" 12.9 CATEGORY="base-system" 12.10 SHORT_DESC="Programs for monitoring processes" 12.11 MAINTAINER="al.bobylev@gmail.com" 12.12 @@ -15,6 +15,9 @@ 12.13 BUILD_DEPENDS="gettext-dev ncurses-dev" 12.14 SPLIT="$PACKAGE-dev" 12.15 12.16 +DEPENDS_std="gettext-base ncurses" 12.17 +TAGS_std="LFS" 12.18 + 12.19 compile_rules() { 12.20 ./configure \ 12.21 --exec-prefix= \ 12.22 @@ -31,14 +34,3 @@ 12.23 ln -sf ../../lib/$(readlink $install/usr/lib/libprocps.so) \ 12.24 $install/usr/lib/libprocps.so 12.25 } 12.26 - 12.27 -genpkg_rules() { 12.28 - case $PACKAGE in 12.29 - procps-ng) 12.30 - copy @std 12.31 - DEPENDS="gettext-base ncurses" 12.32 - TAGS="LFS" 12.33 - ;; 12.34 - *-dev) copy @dev;; 12.35 - esac 12.36 -}
13.1 --- a/psmisc/receipt Wed Dec 05 13:28:22 2018 +0200 13.2 +++ b/psmisc/receipt Wed Dec 05 18:07:35 2018 +0200 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt v2. 13.5 13.6 PACKAGE="psmisc" 13.7 -VERSION="23.1" 13.8 +VERSION="23.2" 13.9 CATEGORY="system-tools" 13.10 SHORT_DESC="PSmisc - Small utilities that use the /proc filesystem" 13.11 MAINTAINER="al.bobylev@gmail.com" 13.12 @@ -14,6 +14,9 @@ 13.13 13.14 BUILD_DEPENDS="gettext-dev ncurses-dev" 13.15 13.16 +DEPENDS_std="ncurses" 13.17 +TAGS_std="LFS" 13.18 + 13.19 compile_rules() { 13.20 ./configure $CONFIGURE_ARGS && 13.21 make && 13.22 @@ -23,9 +26,3 @@ 13.23 mv $install/usr/bin/fuser $install/bin 13.24 mv $install/usr/bin/killall $install/bin 13.25 } 13.26 - 13.27 -genpkg_rules() { 13.28 - copy @std 13.29 - DEPENDS="ncurses" 13.30 - TAGS="LFS" 13.31 -}
14.1 --- a/python3/receipt Wed Dec 05 13:28:22 2018 +0200 14.2 +++ b/python3/receipt Wed Dec 05 18:07:35 2018 +0200 14.3 @@ -1,7 +1,7 @@ 14.4 # SliTaz package receipt v2. 14.5 14.6 PACKAGE="python3" 14.7 -VERSION="3.6.4" 14.8 +VERSION="3.7.1" 14.9 CATEGORY="development" 14.10 SHORT_DESC="The Python 3 programming language" 14.11 MAINTAINER="pascal.bellard@slitaz.org" 14.12 @@ -17,6 +17,17 @@ 14.13 SPLIT="$PACKAGE-dev" 14.14 COOKOPTS="!zip" 14.15 14.16 +COPY_std="@std pyconfig.h" 14.17 +COPY_dev="@dev @rm" 14.18 + 14.19 +DEPENDS_std="python3-setuptools python3-pip bzlib expat gdbm liblzma \ 14.20 +libsqlite3 ncurses ncurses-libpanel openssl readline tcl tk xorg-libX11 zlib" 14.21 + 14.22 +PROVIDE_std="py3k" 14.23 +PROVIDE_dev="py3k-dev" 14.24 + 14.25 +TAGS_std="LFS" 14.26 + 14.27 compile_rules() { 14.28 mkdir -p $install/usr/lib/pkgconfig 14.29 14.30 @@ -32,20 +43,3 @@ 14.31 chmod 755 $install/usr/lib/libpython${VERSION%.*}m.so 14.32 chmod 755 $install/usr/lib/libpython${VERSION%%.*}.so 14.33 } 14.34 - 14.35 -genpkg_rules() { 14.36 - case $PACKAGE in 14.37 - python3) 14.38 - copy @std pyconfig.h 14.39 - DEPENDS="python3-setuptools python3-pip \ 14.40 - bzlib expat gdbm liblzma libsqlite3 ncurses \ 14.41 - ncurses-libpanel openssl readline tcl tk xorg-libX11 zlib" 14.42 - PROVIDE="py3k" 14.43 - TAGS="LFS" 14.44 - ;; 14.45 - *-dev) 14.46 - copy @dev @rm 14.47 - PROVIDE="py3k-dev" 14.48 - ;; 14.49 - esac 14.50 -}
15.1 --- a/readline/receipt Wed Dec 05 13:28:22 2018 +0200 15.2 +++ b/readline/receipt Wed Dec 05 18:07:35 2018 +0200 15.3 @@ -1,7 +1,7 @@ 15.4 # SliTaz package receipt v2. 15.5 15.6 PACKAGE="readline" 15.7 -VERSION="7.0" 15.8 +VERSION="7.0p5" 15.9 CATEGORY="system-tools" 15.10 SHORT_DESC="GNU readline" 15.11 MAINTAINER="devel@slitaz.org" 15.12 @@ -9,12 +9,15 @@ 15.13 WEB_SITE="https://www.gnu.org/software/readline/" 15.14 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/readline.html" 15.15 15.16 -TARBALL="$PACKAGE-$VERSION.tar.gz" 15.17 +TARBALL="$PACKAGE-${VERSION%p*}.tar.gz" 15.18 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 15.19 15.20 BUILD_DEPENDS="ncurses-dev flex" 15.21 SPLIT="$PACKAGE-dev" 15.22 15.23 +DEPENDS_std="ncurses" 15.24 +TAGS_std="LFS" 15.25 + 15.26 compile_rules() { 15.27 sed -i '/MV.*old/d' Makefile.in 15.28 sed -i '/{OLDSUFF}/c:' support/shlib-install 15.29 @@ -38,14 +41,3 @@ 15.30 # install the documentation 15.31 cook_pick_docs doc/*.pdf doc/*.html 15.32 } 15.33 - 15.34 -genpkg_rules() { 15.35 - case $PACKAGE in 15.36 - readline) 15.37 - copy @std 15.38 - DEPENDS="ncurses" 15.39 - TAGS="LFS" 15.40 - ;; 15.41 - *-dev) copy @dev;; 15.42 - esac 15.43 -}
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/readline/stuff/patches/readline70-001.patch Wed Dec 05 18:07:35 2018 +0200 16.3 @@ -0,0 +1,57 @@ 16.4 + READLINE PATCH REPORT 16.5 + ===================== 16.6 + 16.7 +Readline-Release: 7.0 16.8 +Patch-ID: readline70-001 16.9 + 16.10 +Bug-Reported-by: Sean Zha <freeman_cha@hotmail.com> 16.11 +Bug-Reference-ID: <BN3PR01MB13657D9303EB94BF6E54216E8CCA0@BN3PR01MB1365.prod.exchangelabs.com> 16.12 +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html 16.13 + 16.14 +Bug-Description: 16.15 + 16.16 +Readline-7.0 changed the way the history list is initially allocated to reduce 16.17 +the number of reallocations and copies. Users who set the readline 16.18 +history-size variable to a very large number to essentially unlimit the size 16.19 +of the history list will get memory allocation errors 16.20 + 16.21 +Patch (apply with `patch -p0'): 16.22 + 16.23 +*** ../readline-7.0/history.c 2015-12-28 13:50:31.000000000 -0500 16.24 +--- history.c 2016-09-30 14:28:40.000000000 -0400 16.25 +*************** 16.26 +*** 58,61 **** 16.27 +--- 58,63 ---- 16.28 + #define DEFAULT_HISTORY_INITIAL_SIZE 502 16.29 + 16.30 ++ #define MAX_HISTORY_INITIAL_SIZE 8192 16.31 ++ 16.32 + /* The number of slots to increase the_history by. */ 16.33 + #define DEFAULT_HISTORY_GROW_SIZE 50 16.34 +*************** 16.35 +*** 308,312 **** 16.36 + { 16.37 + if (history_stifled && history_max_entries > 0) 16.38 +! history_size = history_max_entries + 2; 16.39 + else 16.40 + history_size = DEFAULT_HISTORY_INITIAL_SIZE; 16.41 +--- 310,316 ---- 16.42 + { 16.43 + if (history_stifled && history_max_entries > 0) 16.44 +! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE) 16.45 +! ? MAX_HISTORY_INITIAL_SIZE 16.46 +! : history_max_entries + 2; 16.47 + else 16.48 + history_size = DEFAULT_HISTORY_INITIAL_SIZE; 16.49 + 16.50 +*** ../readline-7.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 16.51 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 16.52 +*************** 16.53 +*** 1,3 **** 16.54 + # Do not edit -- exists only for use by patch 16.55 + 16.56 +! 0 16.57 +--- 1,3 ---- 16.58 + # Do not edit -- exists only for use by patch 16.59 + 16.60 +! 1
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/readline/stuff/patches/readline70-002.patch Wed Dec 05 18:07:35 2018 +0200 17.3 @@ -0,0 +1,103 @@ 17.4 + READLINE PATCH REPORT 17.5 + ===================== 17.6 + 17.7 +Readline-Release: 7.0 17.8 +Patch-ID: readline70-002 17.9 + 17.10 +Bug-Reported-by: Hong Cho <hong.cho@citrix.com> 17.11 +Bug-Reference-ID: <c30b5fe62b2543af8297e47ca487c29c@SJCPEX02CL02.citrite.net> 17.12 +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2016-12/msg00002.html 17.13 + 17.14 +Bug-Description: 17.15 + 17.16 +There is a race condition in add_history() that can be triggered by a fatal 17.17 +signal arriving between the time the history length is updated and the time 17.18 +the history list update is completed. A later attempt to reference an 17.19 +invalid history entry can cause a crash. 17.20 + 17.21 +Patch (apply with `patch -p0'): 17.22 + 17.23 +*** ../readline-7.0-patched/history.c 2016-11-11 13:42:49.000000000 -0500 17.24 +--- history.c 2016-12-05 10:37:51.000000000 -0500 17.25 +*************** 17.26 +*** 280,283 **** 17.27 +--- 280,284 ---- 17.28 + { 17.29 + HIST_ENTRY *temp; 17.30 ++ int new_length; 17.31 + 17.32 + if (history_stifled && (history_length == history_max_entries)) 17.33 +*************** 17.34 +*** 296,306 **** 17.35 + /* Copy the rest of the entries, moving down one slot. Copy includes 17.36 + trailing NULL. */ 17.37 +- #if 0 17.38 +- for (i = 0; i < history_length; i++) 17.39 +- the_history[i] = the_history[i + 1]; 17.40 +- #else 17.41 + memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); 17.42 +- #endif 17.43 + 17.44 + history_base++; 17.45 + } 17.46 +--- 297,303 ---- 17.47 + /* Copy the rest of the entries, moving down one slot. Copy includes 17.48 + trailing NULL. */ 17.49 + memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); 17.50 + 17.51 ++ new_length = history_length; 17.52 + history_base++; 17.53 + } 17.54 +*************** 17.55 +*** 316,320 **** 17.56 + history_size = DEFAULT_HISTORY_INITIAL_SIZE; 17.57 + the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); 17.58 +! history_length = 1; 17.59 + } 17.60 + else 17.61 +--- 313,317 ---- 17.62 + history_size = DEFAULT_HISTORY_INITIAL_SIZE; 17.63 + the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); 17.64 +! new_length = 1; 17.65 + } 17.66 + else 17.67 +*************** 17.68 +*** 326,330 **** 17.69 + xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); 17.70 + } 17.71 +! history_length++; 17.72 + } 17.73 + } 17.74 +--- 323,327 ---- 17.75 + xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); 17.76 + } 17.77 +! new_length = history_length + 1; 17.78 + } 17.79 + } 17.80 +*************** 17.81 +*** 332,337 **** 17.82 + temp = alloc_history_entry ((char *)string, hist_inittime ()); 17.83 + 17.84 +! the_history[history_length] = (HIST_ENTRY *)NULL; 17.85 +! the_history[history_length - 1] = temp; 17.86 + } 17.87 + 17.88 +--- 329,335 ---- 17.89 + temp = alloc_history_entry ((char *)string, hist_inittime ()); 17.90 + 17.91 +! the_history[new_length] = (HIST_ENTRY *)NULL; 17.92 +! the_history[new_length - 1] = temp; 17.93 +! history_length = new_length; 17.94 + } 17.95 + 17.96 +*** ../readline-7.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 17.97 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 17.98 +*************** 17.99 +*** 1,3 **** 17.100 + # Do not edit -- exists only for use by patch 17.101 + 17.102 +! 1 17.103 +--- 1,3 ---- 17.104 + # Do not edit -- exists only for use by patch 17.105 + 17.106 +! 2
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/readline/stuff/patches/readline70-003.patch Wed Dec 05 18:07:35 2018 +0200 18.3 @@ -0,0 +1,40 @@ 18.4 + READLINE PATCH REPORT 18.5 + ===================== 18.6 + 18.7 +Readline-Release: 7.0 18.8 +Patch-ID: readline70-003 18.9 + 18.10 +Bug-Reported-by: Frédéric Brière <fbriere@fbriere.net> 18.11 +Bug-Reference-ID: <20170120180724.7ydq7fb2hsp366dj@fabul.fbriere.net> 18.12 +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2017-01/msg00002.html 18.13 + 18.14 +Bug-Description: 18.15 + 18.16 +Readline-7.0 uses pselect(2) to allow readline to handle signals that do not 18.17 +interrupt read(2), such as SIGALRM, before reading another character. The 18.18 +signal mask used in the pselect call did not take into account signals the 18.19 +calling application blocked before calling readline(). 18.20 + 18.21 +Patch (apply with `patch -p0'): 18.22 + 18.23 +*** ../readline-7.0-patched/input.c 2016-08-30 10:21:47.000000000 -0400 18.24 +--- input.c 2017-01-23 10:21:56.000000000 -0500 18.25 +*************** 18.26 +*** 514,517 **** 18.27 +--- 514,518 ---- 18.28 + #if defined (HAVE_PSELECT) 18.29 + sigemptyset (&empty_set); 18.30 ++ sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &empty_set); 18.31 + FD_ZERO (&readfds); 18.32 + FD_SET (fileno (stream), &readfds); 18.33 +*** ../readline-7.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 18.34 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 18.35 +*************** 18.36 +*** 1,3 **** 18.37 + # Do not edit -- exists only for use by patch 18.38 + 18.39 +! 2 18.40 +--- 1,3 ---- 18.41 + # Do not edit -- exists only for use by patch 18.42 + 18.43 +! 3
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/readline/stuff/patches/readline70-004.patch Wed Dec 05 18:07:35 2018 +0200 19.3 @@ -0,0 +1,47 @@ 19.4 + READLINE PATCH REPORT 19.5 + ===================== 19.6 + 19.7 +Readline-Release: 7.0 19.8 +Patch-ID: readline70-004 19.9 + 19.10 +Bug-Reported-by: Kieran Grant <kieran.thehacker.grant@gmail.com> 19.11 +Bug-Reference-ID: <ec9071ae-efb1-9e09-5d03-e905daf2835c@gmail.com> 19.12 +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-02/msg00002.html 19.13 + 19.14 +Bug-Description: 19.15 + 19.16 +With certain values for PS1, especially those that wrap onto three or more 19.17 +lines, readline will miscalculate the number of invisible characters, 19.18 +leading to crashes and core dumps. 19.19 + 19.20 +Patch (apply with `patch -p0'): 19.21 + 19.22 +*** ../readline-7.0.3/display.c 2016-07-28 14:49:33.000000000 -0400 19.23 +--- display.c 2018-02-03 19:19:35.000000000 -0500 19.24 +*************** 19.25 +*** 772,776 **** 19.26 + wadjust = (newlines == 0) 19.27 + ? prompt_invis_chars_first_line 19.28 +! : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); 19.29 + 19.30 + /* fix from Darin Johnson <darin@acuson.com> for prompt string with 19.31 +--- 788,794 ---- 19.32 + wadjust = (newlines == 0) 19.33 + ? prompt_invis_chars_first_line 19.34 +! : ((newlines == prompt_lines_estimate) 19.35 +! ? (wrap_offset - prompt_invis_chars_first_line) 19.36 +! : 0); 19.37 + 19.38 + /* fix from Darin Johnson <darin@acuson.com> for prompt string with 19.39 +*** ../readline-7.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 19.40 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 19.41 +*************** 19.42 +*** 1,3 **** 19.43 + # Do not edit -- exists only for use by patch 19.44 + 19.45 +! 3 19.46 +--- 1,3 ---- 19.47 + # Do not edit -- exists only for use by patch 19.48 + 19.49 +! 4 19.50 +
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/readline/stuff/patches/readline70-005.patch Wed Dec 05 18:07:35 2018 +0200 20.3 @@ -0,0 +1,58 @@ 20.4 + READLINE PATCH REPORT 20.5 + ===================== 20.6 + 20.7 +Readline-Release: 7.0 20.8 +Patch-ID: readline70-005 20.9 + 20.10 +Bug-Reported-by: Nuzhna Pomoshch <nuzhna_pomoshch@yahoo.com> 20.11 +Bug-Reference-ID: <1317167476.1492079.1495999776464@mail.yahoo.com> 20.12 +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2017-05/msg00005.html 20.13 + 20.14 +Bug-Description: 20.15 + 20.16 +There are cases where a failing readline command (e.g., delete-char at the end 20.17 +of a line) can cause a multi-character key sequence to `back up' and attempt 20.18 +to re-read some of the characters in the sequence. 20.19 + 20.20 +Patch (apply with `patch -p0'): 20.21 + 20.22 +*** ../readline-7.0/readline.c 2016-04-20 15:53:52.000000000 -0400 20.23 +--- readline.c 2018-05-26 17:19:00.000000000 -0400 20.24 +*************** 20.25 +*** 1058,1062 **** 20.26 + r = _rl_dispatch (ANYOTHERKEY, m); 20.27 + } 20.28 +! else if (r && map[ANYOTHERKEY].function) 20.29 + { 20.30 + /* We didn't match (r is probably -1), so return something to 20.31 +--- 1056,1060 ---- 20.32 + r = _rl_dispatch (ANYOTHERKEY, m); 20.33 + } 20.34 +! else if (r < 0 && map[ANYOTHERKEY].function) 20.35 + { 20.36 + /* We didn't match (r is probably -1), so return something to 20.37 +*************** 20.38 +*** 1070,1074 **** 20.39 + return -2; 20.40 + } 20.41 +! else if (r && got_subseq) 20.42 + { 20.43 + /* OK, back up the chain. */ 20.44 +--- 1068,1072 ---- 20.45 + return -2; 20.46 + } 20.47 +! else if (r < 0 && got_subseq) /* XXX */ 20.48 + { 20.49 + /* OK, back up the chain. */ 20.50 +*** ../readline-7.0/patchlevel 2013-11-15 08:11:11.000000000 -0500 20.51 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 20.52 +*************** 20.53 +*** 1,3 **** 20.54 + # Do not edit -- exists only for use by patch 20.55 + 20.56 +! 4 20.57 +--- 1,3 ---- 20.58 + # Do not edit -- exists only for use by patch 20.59 + 20.60 +! 5 20.61 +
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/readline/stuff/patches/series Wed Dec 05 18:07:35 2018 +0200 21.3 @@ -0,0 +1,6 @@ 21.4 +# Get patches from ftp.gnu.org/gnu/readline/readline-7.0-patches/ 21.5 +-p0|readline70-001.patch 21.6 +-p0|readline70-002.patch 21.7 +-p0|readline70-003.patch 21.8 +-p0|readline70-004.patch 21.9 +-p0|readline70-005.patch
22.1 --- a/shadow/receipt Wed Dec 05 13:28:22 2018 +0200 22.2 +++ b/shadow/receipt Wed Dec 05 18:07:35 2018 +0200 22.3 @@ -14,6 +14,9 @@ 22.4 22.5 BUILD_DEPENDS="acl-dev attr-dev gettext-dev" 22.6 22.7 +DEPENDS_std="acl attr" 22.8 +TAGS_std="LFS" 22.9 + 22.10 compile_rules() { 22.11 # Disable the installation of the `groups` program and its man pages, as 22.12 # Coreutils provides a better version. 22.13 @@ -34,9 +37,3 @@ 22.14 22.15 mv $install/usr/bin/passwd $install/bin 22.16 } 22.17 - 22.18 -genpkg_rules() { 22.19 - copy @std 22.20 - DEPENDS="acl attr" 22.21 - TAGS="LFS" 22.22 -}
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/shadow/stuff/overrides Wed Dec 05 18:07:35 2018 +0200 23.3 @@ -0,0 +1,10 @@ 23.4 +4755 /bin/passwd 23.5 +4755 /bin/su 23.6 +4755 /usr/bin/chage 23.7 +4755 /usr/bin/chfn 23.8 +4755 /usr/bin/chsh 23.9 +4755 /usr/bin/expiry 23.10 +4755 /usr/bin/gpasswd 23.11 +4755 /usr/bin/newgidmap 23.12 +4755 /usr/bin/newgrp 23.13 +4755 /usr/bin/newuidmap
24.1 --- a/sysklogd/receipt Wed Dec 05 13:28:22 2018 +0200 24.2 +++ b/sysklogd/receipt Wed Dec 05 18:07:35 2018 +0200 24.3 @@ -12,6 +12,8 @@ 24.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 24.5 WGET_URL="${WEB_SITE}download/$TARBALL" 24.6 24.7 +TAGS_std="LFS" 24.8 + 24.9 compile_rules() { 24.10 sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c 24.11 sed -i 's/union wait/int/' syslogd.c 24.12 @@ -23,8 +25,3 @@ 24.13 mkdir -p $install/etc 24.14 cp $stuff/syslog.conf $install/etc 24.15 } 24.16 - 24.17 -genpkg_rules() { 24.18 - copy @std 24.19 - TAGS="LFS" 24.20 -}
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/sysklogd/stuff/overrides Wed Dec 05 18:07:35 2018 +0200 25.3 @@ -0,0 +1,2 @@ 25.4 +0500 /sbin/klogd 25.5 +0500 /sbin/syslogd
26.1 --- a/util-linux/receipt Wed Dec 05 13:28:22 2018 +0200 26.2 +++ b/util-linux/receipt Wed Dec 05 18:07:35 2018 +0200 26.3 @@ -1,7 +1,7 @@ 26.4 # SliTaz package receipt v2. 26.5 26.6 PACKAGE="util-linux" 26.7 -VERSION="2.32.1" 26.8 +VERSION="2.33" 26.9 CATEGORY="meta" 26.10 SHORT_DESC="Random collection of Linux utilities" 26.11 MAINTAINER="devel@slitaz.org" 26.12 @@ -9,8 +9,9 @@ 26.13 WEB_SITE="https://en.wikipedia.org/wiki/Util-linux" 26.14 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/util-linux.html" 26.15 26.16 -TARBALL="$PACKAGE-${VERSION%.0}.tar.xz" 26.17 -WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION%.*}/$TARBALL" 26.18 +HIVERSION=$(echo $VERSION | cut -d. -f1,2) 26.19 +TARBALL="$PACKAGE-$VERSION.tar.xz" 26.20 +WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$HIVERSION/$TARBALL" 26.21 26.22 BUILD_DEPENDS="libcap-dev readline-dev python-dev glib gtk-doc \ 26.23 libxslt gettext-dev ncurses-dev zlib-dev"
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/util-linux/stuff/overrides Wed Dec 05 18:07:35 2018 +0200 27.3 @@ -0,0 +1,3 @@ 27.4 +4755 /bin/mount 27.5 +4755 /bin/umount 27.6 +2755 /usr/bin/wall
28.1 --- a/xz/receipt Wed Dec 05 13:28:22 2018 +0200 28.2 +++ b/xz/receipt Wed Dec 05 18:07:35 2018 +0200 28.3 @@ -15,6 +15,19 @@ 28.4 BUILD_DEPENDS="gettext-dev" 28.5 SPLIT="$PACKAGE-tools $PACKAGE liblzma $PACKAGE-dev" 28.6 28.7 +COPY_tools="/usr/bin/" 28.8 +COPY_std="bin/ @rm" 28.9 +COPY_liblzma="liblzma.so*" 28.10 + 28.11 +CAT_tools="utilities|misc commandline utilities" 28.12 +CAT_liblzma="libs|library" 28.13 + 28.14 +DEPENDS_tools="liblzma" 28.15 +DEPENDS_std="liblzma" 28.16 +DEPENDS_liblzma=" " 28.17 + 28.18 +TAGS_std="LFS compression archive" 28.19 + 28.20 compile_rules() { 28.21 ./configure \ 28.22 --disable-static \ 28.23 @@ -32,27 +45,3 @@ 28.24 ln -sf ../../lib/$(readlink $install/usr/lib/liblzma.so) \ 28.25 $install/usr/lib/liblzma.so 28.26 } 28.27 - 28.28 -genpkg_rules() { 28.29 - case $PACKAGE in 28.30 - xz-tools) 28.31 - copy /usr/bin/ 28.32 - CAT="utilities|misc commandline utilities" 28.33 - DEPENDS="liblzma" 28.34 - ;; 28.35 - xz) 28.36 - copy bin/ @rm 28.37 - DEPENDS="liblzma" 28.38 - TAGS="LFS compression archive" 28.39 - ;; 28.40 - liblzma) 28.41 - copy liblzma.so* 28.42 - CAT="libs|library" 28.43 - DEPENDS=" " 28.44 - ;; 28.45 - xz-dev) 28.46 - copy @dev 28.47 - rm -r $fs/usr/share/ 28.48 - ;; 28.49 - esac 28.50 -}