From 2169fdfe04ed8395518d2d13b1c49db3f783fbda Mon Sep 17 00:00:00 2001 From: Daniel Jahre Date: Sat, 15 Jul 2006 22:55:05 +0000 Subject: [PATCH] Daniel Jahre: updated linux to version 2.6.16.25 this is a SECURITY update git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7735 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.desc | 4 ++-- package/base/linux/linux26/95-cdrom.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 package/base/linux/linux26/95-cdrom.patch diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 2b27e04cd..65aefbe3f 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -50,9 +50,9 @@ #endif #if xpkg == linux26.* -[V] 2.6.16.18 +[V] 2.6.16.25 [D] 82985259 linux-2.6.16.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ -[D] 2019327378 patch-2.6.16.18.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +[D] 4017133076 patch-2.6.16.25.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ [D] 4024976103 patch-2.6.16-pa11.gz http://cvs.parisc-linux.org/download/linux-2.6/ #endif diff --git a/package/base/linux/linux26/95-cdrom.patch b/package/base/linux/linux26/95-cdrom.patch deleted file mode 100644 index 6216b6f2d..000000000 --- a/package/base/linux/linux26/95-cdrom.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c -index ca27ee8..d239cf8 100644 ---- ./drivers/cdrom/cdrom.c -+++ ./drivers/cdrom/cdrom.c -@@ -1837,7 +1837,7 @@ static int dvd_read_bca(struct cdrom_dev - init_cdrom_command(&cgc, buf, sizeof(buf), CGC_DATA_READ); - cgc.cmd[0] = GPCMD_READ_DVD_STRUCTURE; - cgc.cmd[7] = s->type; -- cgc.cmd[9] = cgc.buflen = 0xff; -+ cgc.cmd[9] = cgc.buflen & 0xff; - - if ((ret = cdo->generic_packet(cdi, &cgc))) - return ret;