wok diff kbd/receipt @ rev 22413

clamav 0.101.1 -> 0.101.2: fixes a few CVEs; new requirement: libcurl
author Erkan Yilmaz <erkan@slitaz.org>
date Sat Dec 14 19:36:12 2019 +0000 (2019-12-14)
parents d5d1aacad4ba
children 620819a54fad
line diff
     1.1 --- a/kbd/receipt	Wed Jun 29 13:04:18 2016 +0200
     1.2 +++ b/kbd/receipt	Sat Dec 14 19:36:12 2019 +0000
     1.3 @@ -1,23 +1,24 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="kbd"
     1.7 -VERSION="2.0.2"
     1.8 +VERSION="2.0.4"
     1.9  CATEGORY="system-tools"
    1.10 -SHORT_DESC="Keyboard maping definitions and tools."
    1.11 +TAGS="keyboard"
    1.12 +SHORT_DESC="Keyboard mapping definitions and tools."
    1.13  MAINTAINER="pankso@slitaz.org"
    1.14  LICENSE="GPL2"
    1.15 +WEB_SITE="http://kbd-project.org/"
    1.16 +
    1.17  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.18 -WEB_SITE="http://kbd-project.org/"
    1.19  WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
    1.20 -TAGS="keyboard"
    1.21 -HOST_ARCH="i486 arm"
    1.22  
    1.23  DEPENDS="kbd-base"
    1.24 -BUILD_DEPENDS="wget flex pam-dev check-dev advancecomp"
    1.25 +BUILD_DEPENDS="advancecomp check-dev flex pam-dev"
    1.26 +HOST_ARCH="i486 arm"
    1.27  
    1.28  # Handle cross compilation.
    1.29  case "$ARCH" in
    1.30 -	arm) BUILD_DEPENDS="flex check-dev" ;;
    1.31 +	arm) BUILD_DEPENDS="check-dev flex" ;;
    1.32  esac
    1.33  
    1.34  # Rules to configure and make the package.
    1.35 @@ -25,22 +26,26 @@
    1.36  {
    1.37  	# standard locale placement
    1.38  	sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in
    1.39 +
    1.40  	# Handle cross compilation.
    1.41  	case "$ARCH" in
    1.42  		arm)
    1.43  			# No PAM support for ARM
    1.44 -			./configure \
    1.45 -				--datadir=/usr/share/kbd \
    1.46 -				--localedir=/usr/share/locale \
    1.47 -				--disable-vlock \
    1.48 +			./configure				\
    1.49 +				--datadir=/usr/share/kbd	\
    1.50 +				--localedir=/usr/share/locale	\
    1.51 +				--disable-vlock			\
    1.52  				$CONFIGURE_ARGS ;;
    1.53  		i486)
    1.54 -			./configure \
    1.55 -				--datadir=/usr/share/kbd \
    1.56 -				--localedir=/usr/share/locale \
    1.57 +			./configure				\
    1.58 +				--datadir=/usr/share/kbd	\
    1.59 +				--localedir=/usr/share/locale	\
    1.60  				$CONFIGURE_ARGS ;;
    1.61  	esac &&
    1.62 -	make && make install &&
    1.63 +
    1.64 +	make -j 1 &&
    1.65 +	make install &&
    1.66 +
    1.67  	find $DESTDIR/usr/share/kbd -name '*gz' -exec advdef -z4 {} \;
    1.68  }
    1.69  
    1.70 @@ -62,7 +67,9 @@
    1.71  	done
    1.72  	rm -rf $fs/usr/share/kbd/keymaps/include
    1.73  	rm -rf $fs/usr/share/kbd/keymaps/i386/include
    1.74 -	rm -f $fs/usr/bin/loadkeys $fs/usr/bin/setfont $fs/usr/bin/vlock
    1.75 +	rm -f $fs/usr/bin/loadkeys
    1.76 +	rm -f $fs/usr/bin/setfont
    1.77 +	rm -f $fs/usr/bin/vlock
    1.78  }
    1.79  
    1.80  # Overlap busybox