[vserver] Added some deltas which will be part of 2.2.0.7 and fix initpid

security/vserver/pkg_linux_post.conf

@@ -34,6 +34,10 @@ done
 pkg_ctx_fixes_pattern="`basename ${pkg_ctx_patch%.diff} .diff`[.].*[.]diff"
 pkg_ctx_fixes="`match_source_file -p " ${pkg_ctx_fixes_pattern}" vserver`"
 
+# find deltas
+# NOTE: these are version independent
+pkg_ctx_deltas="$( match_source_file -p 'delta-.*\.diff' vserver )"
+
 # prepare vserver patch
 pkg_ctx_ver=$( echo $pkg_ctx_patch | sed -n -e 's,.*-vs\(.*\).diff.*,\1,p' )
 
@@ -55,7 +59,18 @@ BEGIN { FS=\"[ /\t]\"
 	}
 " > $pkg_ctx_tempdir/vserver-${pkg_ctx_ver}.patch
 
-echo_status "Including VServer ($pkg_ctx_ver) support."
-hook_add postpatch 5 "lx_extraversion=\$lx_extraversion-vs${pkg_ctx_ver}"
+# Append patch and fixes
 var_append patchfiles ' ' $pkg_ctx_tempdir/vserver-$pkg_ctx_ver.patch
 [ -n "${pkg_ctx_fixes}" ] && var_append patchfiles ' ' ${pkg_ctx_fixes}
+
+# Add a + at the version if we have deltas, and append them
+if [ -n "$pkg_ctx_deltas" ]; then
+	pkg_ctx_ver="$pkg_ctx_ver+"
+
+	for x in $pkg_ctx_deltas; do
+		var_append patchfiles ' ' "$x"
+	done
+fi
+
+echo_status "Including VServer ($pkg_ctx_ver) support."
+hook_add postpatch 5 "lx_extraversion=\$lx_extraversion-vs${pkg_ctx_ver}"

security/vserver/vserver.desc

@@ -43,3 +43,7 @@
 
 [D] 658328487 patch-2.6.22.18-vs2.2.0.6.diff http://ftp.linux-vserver.org/pub/kernel/vs2.2/
 #[D] 299972723 patch-2.6.21.5-vs2.2.0-rc3.diff http://ftp.linux-vserver.org/pub/kernel/vs2.2/testing/
+
+#[D] 2164392062 delta-keydep-fix01.diff http://vserver.13thfloor.at/Experimental/
+[D] 2892706952 delta-ocfs2-fix01.diff http://people.linux-vserver.org/~dhozac/p/k/
+[D] 3920833347 delta-initpid-fix05.diff http://people.linux-vserver.org/~dhozac/p/k/