rpms/kernel/devel kernel-2.6.spec,1.3236,1.3237

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31984

Modified Files:
	kernel-2.6.spec 
Log Message:
- Let spec-file ApplyPatch function pass extra args to patch.
- Re-enable utrace patch with -F2, needed after nearby CFS change.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3236
retrieving revision 1.3237
diff -u -r1.3236 -r1.3237
--- kernel-2.6.spec	25 Jun 2007 03:00:46 -0000	1.3236
+++ kernel-2.6.spec	25 Jun 2007 08:30:16 -0000	1.3237
@@ -890,13 +890,15 @@
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
 {
-  if [ ! -f $RPM_SOURCE_DIR/$1 ]; then
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1;
   fi
-  case "$1" in
-  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$1" | $patch_command ;;
-  *.gz) gunzip < "$RPM_SOURCE_DIR/$1" | $patch_command ;;
-  *) $patch_command < "$RPM_SOURCE_DIR/$1" ;;
+  case "$patch" in
+  *.bz2) bunzip2 < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *.gz) gunzip < "$RPM_SOURCE_DIR/$patch" | $patch_command ${1+"$@"} ;;
+  *) $patch_command ${1+"$@"} < "$RPM_SOURCE_DIR/$patch" ;;
   esac
 }
 
@@ -915,9 +917,9 @@
 ApplyPatch linux-2.6-sched-cfs.patch
 
 # Roland's utrace ptrace replacement.
-#ApplyPatch linux-2.6-utrace.patch
-# setuid /proc/self/maps fix. (dependant on utrace)
-#ApplyPatch linux-2.6-proc-self-maps-fix.patch
+ApplyPatch linux-2.6-utrace.patch -F2
+# setuid /proc/self/maps fix. (dependent on utrace)
+ApplyPatch linux-2.6-proc-self-maps-fix.patch
 
 # Nouveau DRM
 #ApplyPatch nouveau-drm.patch
@@ -2088,6 +2090,10 @@
 %endif
 
 %changelog
+* Mon Jun 25 2007 Roland McGrath <roland at redhat.com>
+- Let spec-file ApplyPatch function pass extra args to patch.
+- Re-enable utrace patch with -F2, needed after nearby CFS change.
+
 * Sun Jun 24 2007 Dave Jones <davej at redhat.com>
 - Fix 64 bit overflow in CFS.
 
@@ -2120,7 +2126,7 @@
 - 2.6.22-rc5-git1.
 
 * Mon Jun 18 2007 Jeremy Katz <katzj at redhat.com>
-- add patch from upstream kvm to fix suspend/resume with kvm 
+- add patch from upstream kvm to fix suspend/resume with kvm
   loaded (and guests running)
 
 * Sun Jun 17 2007 Dave Jones <davej at redhat.com>