diff -u vzctl-3.0.22/etc/bash_completion.d/vzctl.sh.in vzctl-3.0.22/etc/bash_completion.d/vzctl.sh.in
--- vzctl-3.0.22/etc/bash_completion.d/vzctl.sh.in
+++ vzctl-3.0.22/etc/bash_completion.d/vzctl.sh.in
@@ -111,7 +111,7 @@
 			--ostemplate)
 				# get the template path from the vz.conf
 				local vztmpl=`grep ^TEMPLATE @PKGCONFDIR@/vz.conf | cut -d "=" -f 2`
-				COMPREPLY=( $( compgen -W "$(ls -1 $vztmpl/cache/*.tar.gz |
+				COMPREPLY=( $( compgen -W "$(/bin/ls -1 $vztmpl/cache/*.tar.gz |
 						    sed -e "s#^$vztmpl/cache/##" -e 's#.tar.gz$##')" -- $cur ) )
 
 				;;
@@ -122,7 +122,7 @@
 				COMPREPLY=( $( compgen -W "restart ignore" -- $cur ) )
 				;;
 			--config|--applyconfig)
-				local configs=$(ls -1 @PKGCONFDIR@/conf/*.conf-sample |
+				local configs=$(/bin/ls -1 @PKGCONFDIR@/conf/*.conf-sample |
 						    cut -d "-" -f 2- | sed -e 's#.conf-sample$##')
 
 				configs=${configs/.conf-sample/}
only in patch2:
unchanged:
--- vzctl-3.0.22.orig/src/lib/ub.c
+++ vzctl-3.0.22/src/lib/ub.c
@@ -210,7 +210,7 @@
 	}
 	if ((ret = set_ublimit(h, veid, ub)))
 		return ret;
-	logger(-1, 0, "UB limits were set successefully");
+	logger(-1, 0, "UB limits were set successfully");
 	return 0;
 }
 
only in patch2:
unchanged:
--- vzctl-3.0.22.orig/src/lib/util.c
+++ vzctl-3.0.22/src/lib/util.c
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
only in patch2:
unchanged:
--- vzctl-3.0.22.orig/src/lib/config.c
+++ vzctl-3.0.22/src/lib/config.c
@@ -16,6 +16,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <stdlib.h>
+#include <limits.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>