wok diff mc/receipt @ rev 25463

Up expat (2.4.9) fixes CVE-2022-40674
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Sep 29 20:05:23 2022 +0000 (20 months ago)
parents 241fb98cab1c
children 6a171134e977
line diff
     1.1 --- a/mc/receipt	Tue Feb 15 18:29:48 2022 +0000
     1.2 +++ b/mc/receipt	Thu Sep 29 20:05:23 2022 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="mc"
     1.7 -VERSION="4.8.24"
     1.8 +VERSION="4.8.28"
     1.9  CATEGORY="system-tools"
    1.10  TAGS="file-manager text-editor"
    1.11  SHORT_DESC="Midnight Commander - ncurses based file manager."
    1.12 @@ -12,10 +12,10 @@
    1.13  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.14  WGET_URL="http://ftp.midnight-commander.org/$TARBALL"
    1.15  
    1.16 -SUGGESTED="cdrkit-isoinfo file gpm lynx poppler-apps w3m wv xz"
    1.17 -DEPENDS="e2fsprogs glib ncursesw util-linux-blkid"
    1.18 -BUILD_DEPENDS="glib-dev gpm-dev ncursesw-dev ncurses-extra 
    1.19 -	util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev "
    1.20 +SUGGESTED="cdrkit-isoinfo file gpm lynx mc-lang poppler-apps w3m wv xz"
    1.21 +DEPENDS="e2fsprogs gcc83-lib-base glib ncursesw util-linux-blkid"
    1.22 +BUILD_DEPENDS="gcc83 glib-dev gpm-dev ncursesw-dev ncurses-extra
    1.23 +	util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev"
    1.24  
    1.25  GENERIC_MENUS="no"
    1.26  
    1.27 @@ -31,9 +31,11 @@
    1.28  # Rules to configure and make the package.
    1.29  compile_rules()
    1.30  {
    1.31 -	sed -i 's/lzma -cd/lzcat/' $src/src/editor/edit.c
    1.32 +	sed -i 's|lzma -cd|lzcat|'	src/editor/edit.c
    1.33  
    1.34  	./configure			\
    1.35 +		CC=gcc-83		\
    1.36 +		CXX=g++-83		\
    1.37  		--prefix=/usr		\
    1.38  		--with-gpm-mouse	\
    1.39  		--with-screen=ncurses	\
    1.40 @@ -41,7 +43,7 @@
    1.41  		--libexecdir=/usr/lib	\
    1.42  		--sysconfdir=/etc	\
    1.43  		$CONFIGURE_ARGS &&
    1.44 -	make -j 1 &&
    1.45 +	make &&
    1.46  	make install
    1.47  
    1.48  	mkdir -p $install/usr/share/terminfo/s
    1.49 @@ -60,18 +62,15 @@
    1.50  	cp -a $install/usr/share/mc		$fs/usr/share
    1.51  	cp -a $install/usr/share/terminfo	$fs/usr/share
    1.52  
    1.53 -	sed -i 's#&) ||#) ||#' \
    1.54 -		$fs/usr/lib/mc/ext.d/*.sh
    1.55 -	sed -i 's#|profile|#&receipt|#' \
    1.56 -		$fs/usr/share/mc/syntax/Syntax
    1.57 -	sed -i 's/lzma -dc/lzcat/g' \
    1.58 -		$fs/usr/lib/mc/ext.d/archive.sh
    1.59 +	sed -i 's#&) ||#) ||#'			$fs/usr/lib/mc/ext.d/*.sh
    1.60 +	sed -i 's#|profile|#&receipt|#'		$fs/usr/share/mc/syntax/Syntax
    1.61 +	sed -i 's/lzma -dc/lzcat/g'		$fs/usr/lib/mc/ext.d/archive.sh
    1.62  
    1.63  	cp -a $stuff/*.desktop			$fs/usr/share/applications
    1.64  
    1.65  	cat > $fs/usr/bin/mc.sh <<EOF
    1.66  case \$TERM in
    1.67 -	linux*)
    1.68 +	(linux*)
    1.69  		{
    1.70  		cat <<EOT
    1.71  shift   keycode  59 = F11
    1.72 @@ -85,11 +84,14 @@
    1.73  shift   keycode  67 = F19
    1.74  shift   keycode  68 = F20
    1.75  EOT
    1.76 -		} | loadkeys -uv ; sleep 1 ;;
    1.77 -	xterm*)
    1.78 +		} | loadkeys -uv
    1.79 +		sleep 1
    1.80 +		;;
    1.81 +	(xterm*)
    1.82  		export TERM='xterm-color'
    1.83  		[ -f '/usr/share/terminfo/s/screen-256color' ] && \\
    1.84 -			export TERM='screen-256color'	;;
    1.85 +			export TERM='screen-256color'
    1.86 +		;;
    1.87  esac
    1.88  mc \$@
    1.89