SOURCES (LINUX_2_6): linux-2.6-grsec-minimal.patch, 2.6.x-TGA-fbde...

baggins baggins at pld-linux.org
Tue Sep 6 15:56:20 CEST 2005 

Author: baggins                      Date: Tue Sep  6 13:56:20 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated to 2.6.13

---- Files affected:
SOURCES:
   linux-2.6-grsec-minimal.patch (1.1 -> 1.1.2.1) , 2.6.x-TGA-fbdev-lkml.patch (1.1.2.6 -> 1.1.2.7) , linux-static-dev.patch (1.1.6.3 -> 1.1.6.4) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec-minimal.patch
diff -u SOURCES/linux-2.6-grsec-minimal.patch:1.1 SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.1
--- SOURCES/linux-2.6-grsec-minimal.patch:1.1	Tue Aug 30 18:21:54 2005
+++ SOURCES/linux-2.6-grsec-minimal.patch	Tue Sep  6 15:56:15 2005
@@ -63,8 +63,8 @@
 -	depends on PROC_FS && MMU
 +	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
  
- config SYSFS
- 	bool "sysfs file system support" if EMBEDDED
+ config PROC_VMCORE
+         bool "/proc/vmcore support (EXPERIMENTAL)"
 diff -urN linux-2.6.12.6/fs/namei.c linux-2.6.12.6-gr-minimal/fs/namei.c
 --- linux-2.6.12.6/fs/namei.c	2005-08-30 14:50:44.000074992 +0200
 +++ linux-2.6.12.6-gr-minimal/fs/namei.c	2005-08-30 15:01:26.561724968 +0200
@@ -349,7 +349,7 @@
  	proc_symlink("mounts", NULL, "self/mounts");
  
  	/* And now for trickier ones */
-@@ -586,17 +602,21 @@
+@@ -586,18 +602,22 @@
  	create_seq_entry("partitions", 0, &proc_partitions_operations);
  	create_seq_entry("stat", 0, &proc_stat_operations);
  	create_seq_entry("interrupts", 0, &proc_interrupts_operations);
@@ -360,6 +360,7 @@
 +#endif
  	create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations);
  	create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations);
+ 	create_seq_entry("zoneinfo",S_IRUGO, &proc_zoneinfo_file_operations);
  	create_seq_entry("diskstats", 0, &proc_diskstats_operations);
  #ifdef CONFIG_MODULES
 -	create_seq_entry("modules", 0, &proc_modules_operations);
@@ -422,7 +423,7 @@
 +#endif
  };
  
- /*
+ /* Context switch must be unlocked if interrupts are to be enabled */
 diff -urN linux-2.6.12.6/kernel/signal.c linux-2.6.12.6-gr-minimal/kernel/signal.c
 --- linux-2.6.12.6/kernel/signal.c	2005-08-29 18:55:27.000000000 +0200
 +++ linux-2.6.12.6-gr-minimal/kernel/signal.c	2005-08-30 16:53:56.488528256 +0200
@@ -480,9 +481,9 @@
 --- linux-2.6.12.6/net/socket.c	2005-08-29 18:55:27.000000000 +0200
 +++ linux-2.6.12.6-gr-minimal/net/socket.c	2005-08-30 16:53:54.382848368 +0200
 @@ -81,6 +81,7 @@
- #include <linux/syscalls.h>
  #include <linux/compat.h>
  #include <linux/kmod.h>
+ #include <linux/audit.h>
 +#include <linux/in.h>
  
  #ifdef CONFIG_NET_RADIO

================================================================
Index: SOURCES/2.6.x-TGA-fbdev-lkml.patch
diff -u SOURCES/2.6.x-TGA-fbdev-lkml.patch:1.1.2.6 SOURCES/2.6.x-TGA-fbdev-lkml.patch:1.1.2.7
--- SOURCES/2.6.x-TGA-fbdev-lkml.patch:1.1.2.6	Sat Mar 12 23:44:14 2005
+++ SOURCES/2.6.x-TGA-fbdev-lkml.patch	Tue Sep  6 15:56:15 2005
@@ -1,33 +1,3 @@
-diff -uNr a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
---- a/drivers/video/logo/Kconfig	2004-12-24 22:34:32.000000000 +0100
-+++ b/drivers/video/logo/Kconfig	2005-01-25 11:47:20.000000000 +0100
-@@ -25,7 +25,7 @@
- 
- config LOGO_DEC_CLUT224
- 	bool "224-color Digital Equipment Corporation Linux logo"
--	depends on LOGO && MACH_DECSTATION
-+	depends on LOGO && (MACH_DECSTATION || ALPHA)
- 	default y
- 
- config LOGO_MAC_CLUT224
-diff -uNr a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
---- a/drivers/video/logo/logo.c	2004-12-24 22:34:58.000000000 +0100
-+++ b/drivers/video/logo/logo.c	2005-01-25 11:47:20.000000000 +0100
-@@ -66,9 +66,14 @@
- 		logo = &logo_linux_clut224;
- #endif
- #ifdef CONFIG_LOGO_DEC_CLUT224
-+# if defined(CONFIG_MIPS) || defined(CONFIG_MIPS64)
- 		/* DEC Linux logo on MIPS/MIPS64 */
- 		if (mips_machgroup == MACH_GROUP_DEC)
- 			logo = &logo_dec_clut224;
-+# else
-+		/* Assume DEC Linux logo on ALPHA */
-+		logo = &logo_dec_clut224;
-+# endif
- #endif
- #ifdef CONFIG_LOGO_MAC_CLUT224
- 		/* Macintosh Linux logo on m68k */
 diff -uNr a/drivers/video/tgafb.c b/drivers/video/tgafb.c
 --- a/drivers/video/tgafb.c	2004-12-24 22:35:23.000000000 +0100
 +++ b/drivers/video/tgafb.c	2005-01-25 12:41:07.565680400 +0100
@@ -38,7 +8,7 @@
 +static int tgafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info);
  
  static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);
- #ifdef MODULE
+ static void tgafb_pci_unregister(struct pci_dev *);
 @@ -62,6 +63,7 @@
  	.fb_set_par		= tgafb_set_par,
  	.fb_setcolreg		= tgafb_setcolreg,
@@ -47,22 +17,6 @@
  	.fb_fillrect		= tgafb_fillrect,
  	.fb_copyarea		= tgafb_copyarea,
  	.fb_imageblit		= tgafb_imageblit,
-@@ -78,6 +80,7 @@
- 	  0, 0, 0 }
- };
- 
-+
- static struct pci_driver tgafb_driver = {
- 	.name			= "tgafb",
- 	.id_table		= tgafb_pci_table,
-@@ -85,7 +88,6 @@
- 	.remove			= __devexit_p(tgafb_pci_unregister),
- };
- 
--
- /**
-  *      tgafb_check_var - Optional function.  Validates a var passed in.
-  *      @var: frame buffer variable screen structure
 @@ -129,10 +131,10 @@
  tgafb_set_par(struct fb_info *info)
  {
@@ -427,7 +381,7 @@
  			   NULL, 0, NULL,
  			   tga_type == TGA_TYPE_8PLANE ? 8 : 32);
  	if (ret == 0 || ret == 4) {
-@@ -1451,41 +1500,40 @@
+@@ -1451,40 +1500,39 @@
  		goto err1;
  	}
  
@@ -471,7 +425,6 @@
  	return ret;
  }
  
- #ifdef MODULE
 -static void __exit
 +static void __devexit
  tgafb_pci_unregister(struct pci_dev *pdev)
@@ -485,7 +438,7 @@
 +	framebuffer_release(info);
  }
  
- static void __exit
+ #ifdef MODULE
 diff -uNr a/include/video/tgafb.h b/include/video/tgafb.h
 --- a/include/video/tgafb.h	2004-12-24 22:35:24.000000000 +0100
 +++ b/include/video/tgafb.h	2005-01-25 12:41:44.717032536 +0100

================================================================
Index: SOURCES/linux-static-dev.patch
diff -u SOURCES/linux-static-dev.patch:1.1.6.3 SOURCES/linux-static-dev.patch:1.1.6.4
--- SOURCES/linux-static-dev.patch:1.1.6.3	Mon Aug 22 10:46:10 2005
+++ SOURCES/linux-static-dev.patch	Tue Sep  6 15:56:15 2005
@@ -20,14 +20,3 @@
  	.name  		= DM_NAME,
  	.devfs_name 	= "mapper/control",
  	.fops  		= &_ctl_fops
---- a/fs/inotify.c.orig	2005-04-10 14:08:07.000000000 +0200
-+++ b/fs/inotify.c	2005-04-10 14:09:57.000000000 +0200
-@@ -934,7 +934,7 @@
- };
- 
- static struct miscdevice inotify_device = {
--	.minor  = MISC_DYNAMIC_MINOR,
-+	.minor  = 61 /* MISC_DYNAMIC_MINOR */,
- 	.name	= "inotify",
- 	.fops	= &inotify_fops,
- };
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-grsec-minimal.patch?r1=1.1&r2=1.1.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/2.6.x-TGA-fbdev-lkml.patch?r1=1.1.2.6&r2=1.1.2.7&f=u
    http://cvs.pld-linux.org/SOURCES/linux-static-dev.patch?r1=1.1.6.3&r2=1.1.6.4&f=u

More information about the pld-cvs-commit mailing list