packages (LINUX_2_6_38): kernel/kernel.spec - patch-2.5.9-3.amd64 fails to ...

glen glen at pld-linux.org
Wed Oct 5 21:39:13 CEST 2011


Author: glen                         Date: Wed Oct  5 19:39:13 2011 GMT
Module: packages                      Tag: LINUX_2_6_38
---- Log message:
- patch-2.5.9-3.amd64 fails to apply grsec patch, 2.6.1 applies fine, so assume 2.6.0 is needed

---- Files affected:
packages/kernel:
   kernel.spec (1.924.2.9 -> 1.924.2.10) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.924.2.9 packages/kernel/kernel.spec:1.924.2.10
--- packages/kernel/kernel.spec:1.924.2.9	Wed Sep  7 18:38:23 2011
+++ packages/kernel/kernel.spec	Wed Oct  5 21:39:08 2011
@@ -258,7 +258,7 @@
 # cat aufs2-kbuild.patch aufs2-base.patch aufs2-standalone.patch > ~/rpm/packages/kernel/kernel-aufs2.patch
 # mkdir linux
 # cp -a Documentation fs include linux
-# diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs2.patch 
+# diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs2.patch
 #
 Patch145:	kernel-aufs2.patch
 Patch146:	kernel-aufs2-unionfs.patch
@@ -295,7 +295,7 @@
 Patch2484:	kernel-CVE-2011-2484.patch
 
 # buffer overflow CVE fix
-Patch2700:	kernel-CVE-2011-2700.patch	
+Patch2700:	kernel-CVE-2011-2700.patch
 
 # kill some thousands of warnings
 # (only warnings, so just remove parts of this patch if conflics)
@@ -337,9 +337,9 @@
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	xz >= 1:4.999.7
 AutoReqProv:	no
-# for hostname command
-BuildRequires:	module-init-tools >= 3.5
 BuildRequires:	hostname
+BuildRequires:	module-init-tools >= 3.5
+BuildRequires:	patch >= 2.6.0
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
 BuildRequires:	rpmbuild(macros) >= 1.217
@@ -1577,6 +1577,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.924.2.10  2011/10/05 19:39:08  glen
+- patch-2.5.9-3.amd64 fails to apply grsec patch, 2.6.1 applies fine, so assume 2.6.0 is needed
+
 Revision 1.924.2.9  2011/09/07 16:38:23  arekm
 - rel 5; fix hang problems when ulinking big number of files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.924.2.9&r2=1.924.2.10&f=u



More information about the pld-cvs-commit mailing list