|
|
@@ -28,7 +28,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
|
|
|
%define patchlevel 12
|
|
|
%define kversion 2.6.%{sublevel}
|
|
|
%define rpmversion 2.6.%{sublevel}
|
|
|
-%define release 10%{?_dist_release}
|
|
|
+%define release 11%{?_dist_release}
|
|
|
|
|
|
%define make_target bzImage
|
|
|
%define hdrarch %_target_cpu
|
|
|
@@ -303,9 +303,10 @@ Patch2830: drm-radeon-r600-cs-checker-fixes.patch
|
|
|
# 6000 to 10000 is for Vine Linux
|
|
|
#
|
|
|
|
|
|
-# unionfs 2.5.6
|
|
|
+# unionfs 2.5.8
|
|
|
# http://www.am-utils.org/project-unionfs.html
|
|
|
-Patch6030: unionfs-2.5.6_for_2.6.35.5.diff.gz
|
|
|
+Patch6030: unionfs-2.5.8_for_2.6.35.9.diff.gz
|
|
|
+Patch6031: unionfs-2.5.8-open-unlink-ftruncate-crash-fix.patch
|
|
|
|
|
|
#
|
|
|
# TuxOnIce (formerly suspend2) patch
|
|
|
@@ -647,7 +648,8 @@ cd linux-%{kversion}
|
|
|
|
|
|
# unionfs
|
|
|
%if !%{_minimum_patches}
|
|
|
-%patch6030 -p1
|
|
|
+%patch6030 -p1 -b .unionfs
|
|
|
+%patch6031 -p1 -b .open-unlink-ftruncate-crash-fix
|
|
|
%endif
|
|
|
|
|
|
# tuxonice (suspend2)
|
|
|
@@ -1154,6 +1156,11 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Apr 25 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-11
|
|
|
+- update to unionfs to 2.5.8
|
|
|
+- add patch6031 to fix open+unlink+ftruncate crash
|
|
|
+ http://www.fsl.cs.sunysb.edu/pipermail/unionfs/2011-March/006091.html
|
|
|
+
|
|
|
* Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-10
|
|
|
- disable drm update patches
|
|
|
- update x86 config
|
daisuke