# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1294003536 -3600
# Node ID 7a5e5ac499e8b769cbe1de479c07d698d4f5db8b
# Parent  db38a28f4300e1070976d1d7709d444699592d96
Up: vzctl (3.0.25.1)

diff -r db38a28f4300 -r 7a5e5ac499e8 vzctl/receipt
--- a/vzctl/receipt	Sun Jan 02 08:25:38 2011 +0000
+++ b/vzctl/receipt	Sun Jan 02 22:25:36 2011 +0100
@@ -1,50 +1,56 @@
 # SliTaz package receipt.
 
 PACKAGE="vzctl"
-VERSION="3.0.23"
+VERSION="3.0.25.1"
 CATEGORY="system-tools"
 SHORT_DESC="OpenVZ containers control utility"
 MAINTAINER="erjo@slitaz.org"
 DEPENDS="udev bash procmail bridge-utils logrotate"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.openvz.org"
-WGET_URL="http://download.openvz.org/utils/$PACKAGE/$VERSION/src/$TARBALL"
+WEB_SITE="http://wiki.openvz.org/Main_Page"
+WGET_URL="http://download.openvz.org/utils/${PACKAGE}/${VERSION}/src/${TARBALL}"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	busybox patch -p1 -i ../stuff/vzctl-3.0.23.u || exit false
+	
+	# Apply patches
+	while read patch_file; do
+		if [ -f done.$patch_file ]; then
+			echo "Skipping $patch_file"
+			continue
+		fi
+		echo "Apply $patch_file"
+		patch -p1 < ../stuff/$patch_file || exit 1
+		touch done.$patch_file
+	done <<EOT
+vzctl-${VERSION}-Makefile.u
+EOT
 	./configure \
 		--prefix=/usr \
 		--localstatedir=/var \
 		--enable-bashcomp \
-		--enable-logrotate \
-		--disable-static && \
+		--enable-logrotate &&
 	make && make DESTDIR=$PWD/_pkg install && make DESTDIR=$PWD/_pkg install-slitaz
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share \
-		-p $fs/etc/conf.d
-	 
+	mkdir -p $fs/usr/lib \
+		$fs/usr/share
+		
+	cp -a $_pkg/usr/sbin $fs/usr
+	cp -a $_pkg/usr/lib/vzctl $fs/usr/lib
+	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	cp -a $_pkg/etc $fs/
-	cp -a $_pkg/var $fs/
-	cp -a $_pkg/vz $fs/
-	cp -a $_pkg/usr/sbin $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
-	cp -a $_pkg/usr/share/vzctl $fs/usr/share
+	cp -a $_pkg/var/ $fs/
+	cp -a $_pkg/vz/ $fs/
 	
-	rm -f $fs/usr/lib/*.la
-	
-	# Fix permission
-	chmod 755 $fs/usr/sbin/*
-	chmod 755 $fs/etc/init.d/*
-	chmod 755 $fs/usr/share/vzctl/scripts/*
-	chmod 755 $fs/usr/lib/vzctl/scripts/*
-	
-	
+	# fix permissions
+	chmod 0755 $fs/usr/lib/vzctl/scripts/v*
+	chmod 0755 $fs/usr/sbin/*
+	chmod 0755 $fs/etc/init.d/vz
 }
 
diff -r db38a28f4300 -r 7a5e5ac499e8 vzctl/stuff/vzctl-3.0.23-Makefile.u
--- a/vzctl/stuff/vzctl-3.0.23-Makefile.u	Sun Jan 02 08:25:38 2011 +0000
+++ b/vzctl/stuff/vzctl-3.0.23-Makefile.u	Sun Jan 02 22:25:36 2011 +0100
@@ -1,5 +1,5 @@
 --- vzctl-3.0.23-ori/Makefile.am	Thu Oct 30 14:24:43 2008
-+++ vzctl-3.0.23/Makefile.am	Mon Nov 16 21:43:03 2009
++++ vzctl-3.0.23/Makefile.am	Mon Nov 16 16:32:40 2009
 @@ -49,7 +49,8 @@
  	install-redhat \
  	install-gentoo \
@@ -11,7 +11,7 @@
  $(DISTRO_TARGETS):
  	$(MAKE) $(AM_MAKEFLAGS) -C etc $@
 --- vzctl-3.0.23-ori/Makefile.in	Thu Oct 30 14:24:52 2008
-+++ vzctl-3.0.23/Makefile.in	Mon Nov 16 21:43:03 2009
++++ vzctl-3.0.23/Makefile.in	Mon Nov 16 16:33:11 2009
 @@ -217,7 +217,8 @@
  	install-redhat \
  	install-gentoo \
@@ -23,7 +23,7 @@
  all: all-recursive
  
 --- vzctl-3.0.23-ori/etc/Makefile.am	Thu Oct 30 14:24:43 2008
-+++ vzctl-3.0.23/etc/Makefile.am	Mon Nov 16 21:43:03 2009
++++ vzctl-3.0.23/etc/Makefile.am	Mon Nov 16 16:33:39 2009
 @@ -43,6 +43,9 @@
  
  install-debian:
@@ -35,7 +35,7 @@
  install-gentoo:
  	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
 --- vzctl-3.0.23-ori/etc/Makefile.in	Thu Oct 30 14:24:49 2008
-+++ vzctl-3.0.23/etc/Makefile.in	Mon Nov 16 21:43:03 2009
++++ vzctl-3.0.23/etc/Makefile.in	Mon Nov 16 16:34:00 2009
 @@ -563,6 +563,9 @@
  install-debian:
  	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
@@ -47,29 +47,23 @@
  	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
 --- vzctl-3.0.23-ori/etc/init.d/Makefile.am	Thu Oct 30 14:24:43 2008
-+++ vzctl-3.0.23/etc/init.d/Makefile.am	Mon Nov 16 21:46:42 2009
-@@ -31,6 +31,11 @@
++++ vzctl-3.0.23/etc/init.d/Makefile.am	Mon Nov 16 16:34:25 2009
+@@ -31,6 +31,8 @@
  
  install-debian: install-redhat
  
-+install-slitaz: 
-+	$(mkinstalldirs) $(DESTDIR)$(initddir)
-+	$(INSTALL_SCRIPT) vz-redhat $(DESTDIR)$(initddir)/vz
-+	sed -e 's!/subsys!!'
++install-slitaz: install-redhat
 +
  install-gentoo: vz-gentoo
  	$(mkinstalldirs) $(DESTDIR)$(initddir)
  	$(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
 --- vzctl-3.0.23-ori/etc/init.d/Makefile.in	Thu Oct 30 14:24:50 2008
-+++ vzctl-3.0.23/etc/init.d/Makefile.in	Mon Nov 16 22:12:15 2009
-@@ -404,6 +404,11 @@
++++ vzctl-3.0.23/etc/init.d/Makefile.in	Mon Nov 16 16:34:40 2009
+@@ -404,6 +404,8 @@
  
  install-debian: install-redhat
  
 +install-slitaz: install-redhat
-+	sed -i -e 's!/subsys!!' $(DESTDIR)$(initddir)/vz
-+	sed -i -e 's/sysctl -q/sysctl -n/' $(DESTDIR)$(initddir)/vz
-+	
 +
  install-gentoo: vz-gentoo
  	$(mkinstalldirs) $(DESTDIR)$(initddir)
diff -r db38a28f4300 -r 7a5e5ac499e8 vzctl/stuff/vzctl-3.0.25.1-Makefile.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vzctl/stuff/vzctl-3.0.25.1-Makefile.u	Sun Jan 02 22:25:36 2011 +0100
@@ -0,0 +1,133 @@
+--- vzctl-3.0.25.1-ori/Makefile.am	Fri Dec 24 12:45:32 2010
++++ vzctl-3.0.25.1/Makefile.am	Fri Dec 31 09:27:42 2010
+@@ -49,7 +49,8 @@
+ 	install-redhat \
+ 	install-gentoo \
+ 	install-suse \
+-	install-debian
++	install-debian\
++	install-slitaz
+ 
+ DISTRO_TARGETS_ALL = \
+ 	$(DISTRO_TARGETS) \
+--- vzctl-3.0.25.1-ori/Makefile.in	Fri Dec 24 12:45:44 2010
++++ vzctl-3.0.25.1/Makefile.in	Fri Dec 31 09:27:42 2010
+@@ -266,7 +266,8 @@
+ 	install-redhat \
+ 	install-gentoo \
+ 	install-suse \
+-	install-debian
++	install-debian \
++	install-slitaz
+ 
+ DISTRO_TARGETS_ALL = \
+ 	$(DISTRO_TARGETS) \
+--- vzctl-3.0.25.1-ori/bin/Makefile.am	Fri Dec 24 12:45:38 2010
++++ vzctl-3.0.25.1/bin/Makefile.am	Fri Dec 31 09:35:38 2010
+@@ -57,6 +57,8 @@
+ 
+ install-debian:
+ 
++install-slitaz: 
++
+ install-gentoo:
+ 	@echo
+ 	@echo "***************************************************"
+--- vzctl-3.0.25.1-ori/bin/Makefile.in	Fri Dec 24 12:45:43 2010
++++ vzctl-3.0.25.1/bin/Makefile.in	Fri Dec 31 09:35:39 2010
+@@ -530,6 +530,8 @@
+ 
+ install-debian:
+ 
++install-slitaz: 
++
+ install-gentoo:
+ 	@echo
+ 	@echo "***************************************************"
+--- vzctl-3.0.25.1-ori/etc/Makefile.am	Fri Dec 24 12:45:34 2010
++++ vzctl-3.0.25.1/etc/Makefile.am	Fri Dec 31 09:27:42 2010
+@@ -50,3 +50,6 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
+ 	$(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
++	
++install-slitaz:
++	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
+--- vzctl-3.0.25.1-ori/etc/Makefile.in	Fri Dec 24 12:45:43 2010
++++ vzctl-3.0.25.1/etc/Makefile.in	Fri Dec 31 09:27:42 2010
+@@ -683,6 +683,10 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/conf.d
+ 	$(LN_S) $(pkgconfdir)/vz.conf $(DESTDIR)$(sysconfdir)/conf.d/vz
+ 
++install-slitaz:
++	$(MAKE) $(AM_MAKEFLAGS) -C init.d $@
++
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- vzctl-3.0.25.1-ori/etc/init.d/Makefile.am	Fri Dec 24 12:45:34 2010
++++ vzctl-3.0.25.1/etc/init.d/Makefile.am	Fri Dec 31 09:27:42 2010
+@@ -33,6 +33,8 @@
+ 
+ install-debian: install-redhat
+ 
++install-slitaz: install-redhat
++
+ install-gentoo: vz-gentoo vzeventd-gentoo
+ 	$(mkinstalldirs) $(DESTDIR)$(initddir)
+ 	$(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
+--- vzctl-3.0.25.1-ori/etc/init.d/Makefile.in	Fri Dec 24 12:45:43 2010
++++ vzctl-3.0.25.1/etc/init.d/Makefile.in	Fri Dec 31 09:27:40 2010
+@@ -492,6 +492,8 @@
+ 
+ install-debian: install-redhat
+ 
++install-slitaz: install-redhat
++
+ install-gentoo: vz-gentoo vzeventd-gentoo
+ 	$(mkinstalldirs) $(DESTDIR)$(initddir)
+ 	$(INSTALL_SCRIPT) vz-gentoo $(DESTDIR)$(initddir)/vz
+--- vzctl-3.0.25.1-ori/etc/init.d/initd-functions.in	Fri Dec 24 12:45:35 2010
++++ vzctl-3.0.25.1/etc/init.d/initd-functions.in	Sun Jan  2 14:29:21 2011
+@@ -28,6 +28,9 @@
+ elif [ -r /etc/debian_version ]; then
+ 	DISTR=debian
+ 	VARLOCK=/var/lock
++elif [ -r /etc/slitaz-release ]; then
++	DISTR=slitaz
++	VARLOCK=/var/lock
+ fi
+ 
+ print_success()
+--- vzctl-3.0.25.1-ori/etc/init.d/vz-redhat.in	Fri Dec 24 12:45:35 2010
++++ vzctl-3.0.25.1/etc/init.d/vz-redhat.in	Fri Dec 31 14:50:22 2010
+@@ -189,7 +189,7 @@
+ 	if [ "${IPV6}" = "yes" ]; then
+ 		ip -6 addr add fe80::1/128 dev $VZDEV
+ 	fi
+-	sysctl -q -w net.ipv4.conf.$VZDEV.send_redirects=0
++	sysctl -w net.ipv4.conf.$VZDEV.send_redirects=0
+ 	if [ "$(sysctl -n -e net.ipv4.ip_forward)" != "1" ]; then
+ 		print_warning "IP forwarding is not enabled"
+ 	fi
+@@ -242,7 +242,7 @@
+ 	need_restart=""
+ 	velist=$(vzlist -aH -octid,onboot -s-bootorder |
+ 		awk '$2 == "yes" {print $1}')
+-	sysctl -q -w net.ipv4.route.src_check=0
++	sysctl -w net.ipv4.route.src_check=0
+ 	for veid in $velist; do
+ 		[ "${veid}" = "0" ] && continue
+ 		__echo "Starting CT ${veid}: "
+--- vzctl-3.0.25.1-ori/scripts/vps-create.in	Fri Dec 24 12:45:37 2010
++++ vzctl-3.0.25.1/scripts/vps-create.in	Fri Dec 31 14:53:35 2010
+@@ -38,7 +38,7 @@
+ 		vzerror "Tarball does not exist: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT}
+ 	HEADER="$(od -A n -N 2 -t x1 -- "$PRIVATE_TEMPLATE")" ||
+ 		vzerror "Invalid tarball: $PRIVATE_TEMPLATE" ${VZ_FS_NEW_VE_PRVT}
+-	TMP="$(df -P "$VE_PRVT")" ||
++	TMP="$(df "$VE_PRVT")" ||
+ 		vzerror "Failed to calculate available disk space on $VE_PRVT" ${VZ_FS_NEW_VE_PRVT}
+ 	AVAIL="$(echo "$TMP" | awk 'END{print $4}')"
+ 	if [ "$HEADER" = ' 1f 8b' ]; then