Updated to the latest pNFS branch: pnfs-all-2.6.38-2011-03-25
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
535b4d942d
commit
8893f983a4
|
@ -3548,6 +3548,15 @@ CONFIG_NFSD_V3=y
|
|||
CONFIG_NFSD_V3_ACL=y
|
||||
CONFIG_NFSD_V4=y
|
||||
CONFIG_NFS_FSCACHE=y
|
||||
# Enable pNFS
|
||||
CONFIG_PNFS_OBJLAYOUT=m
|
||||
CONFIG_PNFS_BLOCK=m
|
||||
CONFIG_PNFS_PANLAYOUT=m
|
||||
CONFIG_PNFSD_LOCAL_EXPORT=y
|
||||
CONFIG_PNFSD=y
|
||||
CONFIG_SPNFS=y
|
||||
CONFIG_SPNFS_LAYOUTSEGMENTS=y
|
||||
CONFIG_SPNFS_BLOCK=y
|
||||
# CONFIG_NFS_USE_LEGACY_DNS is not set
|
||||
# CONFIG_NFS_USE_NEW_IDMAPPER is not set
|
||||
# CONFIG_NFSD_DEPRECATED is not set
|
||||
|
|
12
kernel.spec
12
kernel.spec
|
@ -23,7 +23,8 @@ Summary: The Linux kernel
|
|||
#
|
||||
# (Uncomment the '#' and both spaces below to set the buildid.)
|
||||
#
|
||||
# % define buildid .local
|
||||
%define buildid .pnfs.2011.03.25
|
||||
|
||||
###################################################################
|
||||
|
||||
# The buildid can also be specified on the rpmbuild command line
|
||||
|
@ -739,6 +740,9 @@ Patch12430: dcdbas-force-smi-to-happen-when-expected.patch
|
|||
# CVE-2011-1182
|
||||
Patch12431: prevent-rt_sigqueueinfo-and-rt_tgsigqueueinfo-from-spoofing-the-signal-code.patch
|
||||
|
||||
Patch30000: pnfs-all-2.6.38-2011-03-25.patch
|
||||
Patch30001: linux-2.6-pnfs-compile.patch
|
||||
Patch30002: linux-2.6.35-inline.patch
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||
|
@ -1372,6 +1376,9 @@ ApplyPatch dcdbas-force-smi-to-happen-when-expected.patch
|
|||
# CVE-2011-1182
|
||||
ApplyPatch prevent-rt_sigqueueinfo-and-rt_tgsigqueueinfo-from-spoofing-the-signal-code.patch
|
||||
|
||||
ApplyPatch pnfs-all-2.6.38-2011-03-25.patch
|
||||
ApplyPatch linux-2.6-pnfs-compile.patch
|
||||
ApplyPatch linux-2.6.35-inline.patch
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
@ -1980,6 +1987,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Sat Mar 26 2011 Steve Dickson <steved@redhat.com> 2.6.38.1-6.pnfs
|
||||
- Updated to the latest pNFS branch: pnfs-all-2.6.38-2011-03-25
|
||||
|
||||
* Fri Mar 25 2011 Chuck Ebbert <cebbert@redhat.com>
|
||||
- CVE-2011-1182: kernel signal spoofing issue
|
||||
- Drop unused patches already applied upstream:
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
diff -up linux-2.6.38.noarch/include/net/inet_connection_sock.h.orig linux-2.6.38.noarch/include/net/inet_connection_sock.h
|
||||
--- linux-2.6.38.noarch/include/net/inet_connection_sock.h.orig 2011-03-26 08:15:35.417892830 -0400
|
||||
+++ linux-2.6.38.noarch/include/net/inet_connection_sock.h 2011-03-26 08:15:45.301801362 -0400
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <net/inet_sock.h>
|
||||
#include <net/request_sock.h>
|
||||
|
||||
-#define INET_CSK_DEBUG 1
|
||||
+//#define INET_CSK_DEBUG 1
|
||||
|
||||
/* Cancel timers, when they are not required. */
|
||||
#undef INET_CSK_CLEAR_TIMERS
|
|
@ -0,0 +1,11 @@
|
|||
diff -up linux-2.6.34.noarch/arch/x86/Makefile.orig linux-2.6.34.noarch/arch/x86/Makefile
|
||||
--- linux-2.6.34.noarch/arch/x86/Makefile.orig 2010-07-01 13:33:21.859627499 -0400
|
||||
+++ linux-2.6.34.noarch/arch/x86/Makefile 2010-07-01 13:36:26.751576450 -0400
|
||||
@@ -81,6 +81,7 @@ ifdef CONFIG_CC_STACKPROTECTOR
|
||||
$(warning stack protector enabled but no compiler support)
|
||||
endif
|
||||
endif
|
||||
+KBUILD_CFLAGS += -fno-inline-functions-called-once
|
||||
|
||||
# Don't unroll struct assignments with kmemcheck enabled
|
||||
ifeq ($(CONFIG_KMEMCHECK),y)
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue