wok-6.x rev 23728

updated vzquota (3.0.12 -> 3.1)
author Hans-G?nter Theisgen
date Fri May 01 06:58:50 2020 +0100 (2020-05-01)
parents 1c8bb7fdb913
children c1e7c7ea9c19
files vzquota/receipt vzquota/stuff/patches/Makefile-3.1
line diff
     1.1 --- a/vzquota/receipt	Thu Apr 30 17:49:28 2020 +0100
     1.2 +++ b/vzquota/receipt	Fri May 01 06:58:50 2020 +0100
     1.3 @@ -1,13 +1,14 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="vzquota"
     1.7 -VERSION="3.0.12"
     1.8 +VERSION="3.1"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Virtuozzo/OpenVZ disk quota control utility"
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 +WEB_SITE="https://openvz.org"
    1.14 +
    1.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.16 -WEB_SITE="http://openvz.org"
    1.17  WGET_URL="http://download.openvz.org/utils/$PACKAGE/$VERSION/src/$TARBALL"
    1.18  
    1.19  DEPENDS=""
    1.20 @@ -16,26 +17,32 @@
    1.21  compile_rules()
    1.22  {
    1.23  	sed -i 's|uname -m|echo i486|' src/Makefile
    1.24 +
    1.25  	# Apply patches
    1.26 -	while read patch_file; do
    1.27 -		if [ -f done.$patch_file ]; then
    1.28 -			echo "Skipping $patch_file"
    1.29 -			continue
    1.30 -		fi
    1.31 -		echo "Apply $patch_file"
    1.32 -		patch -p1 < $stuff/$patch_file || return 1
    1.33 -		touch done.$patch_file
    1.34 -	done <<EOT
    1.35 -vzquota-${VERSION}.u
    1.36 -EOT
    1.37 +#	while read patch_file; do
    1.38 +#		if [ -f done.$patch_file ]; then
    1.39 +#			echo "Skipping $patch_file"
    1.40 +#			continue
    1.41 +#		fi
    1.42 +#		echo "Apply $patch_file"
    1.43 +#		patch -p1 < $stuff/$patch_file || return 1
    1.44 +#		touch done.$patch_file
    1.45 +#	done <<EOT
    1.46 +#vzquota-${VERSION}.u
    1.47 +#EOT
    1.48  
    1.49 -	make && make DESTDIR=$DESTDIR install
    1.50 +	patch	--input=$stuff/patches/Makefile-3.1 \
    1.51 +		src/Makefile
    1.52 +
    1.53 +	make &&
    1.54 +	make DESTDIR=$DESTDIR install
    1.55  }
    1.56  
    1.57  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.58  genpkg_rules()
    1.59  {
    1.60 -	mkdir -p $fs/usr $fs/var/lib/vzquota
    1.61 -	cp -a $install/usr/sbin $fs/usr
    1.62 +	mkdir -p $fs/usr
    1.63 +	mkdir -p $fs/var/lib/vzquota
    1.64 +
    1.65 +	cp -a $install/usr/sbin	$fs/usr
    1.66  }
    1.67 -
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/vzquota/stuff/patches/Makefile-3.1	Fri May 01 06:58:50 2020 +0100
     2.3 @@ -0,0 +1,11 @@
     2.4 +--- Makefile.orig
     2.5 ++++ Makefile
     2.6 +@@ -18,7 +18,7 @@
     2.7 + INSTALL = install
     2.8 + PREFIX = /usr
     2.9 + SBINDIR = ${PREFIX}/sbin
    2.10 +-VARDIR = /var
    2.11 ++VARDIR = /var/lib
    2.12 + 
    2.13 + #DEBUG = -D_DEBUG -g3 -ggdb3 -p -pg
    2.14 + CFLAGS += -pipe -I../include -std=gnu99 \