summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2004-10-14 14:52:34 +0000
committerDaniel Drake <dsd@gentoo.org>2004-10-14 14:52:34 +0000
commitba9d45370228b63942010b9cfaf1a2310b8120d2 (patch)
tree3d032067678168e352a599cf1a6b9aa5bce79199 /sys-kernel
parentversion bump, apply bdb/mutex.h patch unconditionally, raise need-kde (diff)
downloadhistorical-ba9d45370228b63942010b9cfaf1a2310b8120d2.tar.gz
historical-ba9d45370228b63942010b9cfaf1a2310b8120d2.tar.bz2
historical-ba9d45370228b63942010b9cfaf1a2310b8120d2.zip
Fix digests
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/gentoo-dev-sources/Manifest3
-rw-r--r--sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.8-r94
-rw-r--r--sys-kernel/gentoo-dev-sources/files/gentoo-dev-sources-2.6.5.CAN-2004-0109.patch88
3 files changed, 3 insertions, 92 deletions
diff --git a/sys-kernel/gentoo-dev-sources/Manifest b/sys-kernel/gentoo-dev-sources/Manifest
index 6a9e6a16c80d..c1650c97a16a 100644
--- a/sys-kernel/gentoo-dev-sources/Manifest
+++ b/sys-kernel/gentoo-dev-sources/Manifest
@@ -32,11 +32,10 @@ MD5 76384ba3ed721c7a118ce26c1a1abcf5 files/digest-gentoo-dev-sources-2.6.8-r5 28
MD5 bedc7f069171f711f192d4c0dd245344 files/digest-gentoo-dev-sources-2.6.8-r6 283
MD5 3634c82b2a27f59ecb9ba78585d8a0d1 files/digest-gentoo-dev-sources-2.6.8-r7 283
MD5 5dd81f06655db1c5383d108e776bfff6 files/digest-gentoo-dev-sources-2.6.8-r8 283
-MD5 0667d9963cc7d4c0136dbcff54ae937f files/digest-gentoo-dev-sources-2.6.8-r9 283
+MD5 b3783cd6813d8e37e1c1c8b8d1bb6722 files/digest-gentoo-dev-sources-2.6.8-r9 283
MD5 5505dba36be29cd0c4521e6e6dac8978 files/digest-gentoo-dev-sources-2.6.7-r10 221
MD5 4480e95e5e59c1f1a309e568d2e448a5 files/digest-gentoo-dev-sources-2.6.7-r11 221
MD5 66e72150c11296bb20bb4e02d1270232 files/digest-gentoo-dev-sources-2.6.7-r12 221
MD5 399fb0ed7c2b6ff9203eaaf209048cd8 files/digest-gentoo-dev-sources-2.6.7-r13 221
MD5 91a2a65a9e5b571fa1b0ef88dbe5cfbe files/digest-gentoo-dev-sources-2.6.7-r14 221
MD5 980949de52189c7d9c1d791b7f5cc27e files/2.6-do_munmap.patch 743
-MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/gentoo-dev-sources-2.6.5.CAN-2004-0109.patch 2072
diff --git a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.8-r9 b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.8-r9
index b32f6bc5a692..d1a22177b902 100644
--- a/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.8-r9
+++ b/sys-kernel/gentoo-dev-sources/files/digest-gentoo-dev-sources-2.6.8-r9
@@ -1,4 +1,4 @@
MD5 2f8b0030ce970f3c1a460faf5d2b1cec linux-2.6.8.tar.bz2 35634061
-MD5 ddd91cd90342e160b2ecbf05b024d266 genpatches-2.6-8.55-base.tar.bz2 78124
-MD5 6b9c4b7896c0dc855d03c01e9c8aa951 genpatches-2.6-8.55-extras.tar.bz2 155079
+MD5 5bf6101fda5f24b2322aa0d39974d0bd genpatches-2.6-8.55-base.tar.bz2 78391
+MD5 394bb4e3561c0910713dd06482a50042 genpatches-2.6-8.55-extras.tar.bz2 155139
MD5 26277c698a1686b66a1da0af453363a2 x86_64-2.6.8-1.bz2 47183
diff --git a/sys-kernel/gentoo-dev-sources/files/gentoo-dev-sources-2.6.5.CAN-2004-0109.patch b/sys-kernel/gentoo-dev-sources/files/gentoo-dev-sources-2.6.5.CAN-2004-0109.patch
deleted file mode 100644
index d7726c2e5aaf..000000000000
--- a/sys-kernel/gentoo-dev-sources/files/gentoo-dev-sources-2.6.5.CAN-2004-0109.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- linux/fs/isofs/rock.c.orig
-+++ linux/fs/isofs/rock.c
-@@ -14,6 +14,7 @@
- #include <linux/slab.h>
- #include <linux/pagemap.h>
- #include <linux/smp_lock.h>
- #include <linux/buffer_head.h>
-+#include <asm/page.h>
-
- #include "rock.h"
-@@ -419,7 +420,7 @@ int parse_rock_ridge_inode_internal(stru
- return 0;
- }
-
--static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
-+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
- {
- int slen;
- int rootflag;
-@@ -431,16 +432,25 @@ static char *get_symlink_chunk(char *rpn
- rootflag = 0;
- switch (slp->flags & ~1) {
- case 0:
-+ if (slp->len > plimit - rpnt)
-+ return NULL;
- memcpy(rpnt, slp->text, slp->len);
- rpnt+=slp->len;
- break;
-+ case 2:
-+ if (rpnt >= plimit)
-+ return NULL;
-+ *rpnt++='.';
-+ break;
- case 4:
-+ if (2 > plimit - rpnt)
-+ return NULL;
- *rpnt++='.';
-- /* fallthru */
-- case 2:
- *rpnt++='.';
- break;
- case 8:
-+ if (rpnt >= plimit)
-+ return NULL;
- rootflag = 1;
- *rpnt++='/';
- break;
-@@ -457,17 +467,23 @@ static char *get_symlink_chunk(char *rpn
- * If there is another SL record, and this component
- * record isn't continued, then add a slash.
- */
-- if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
-+ if ((!rootflag) && (rr->u.SL.flags & 1) &&
-+ !(oldslp->flags & 1)) {
-+ if (rpnt >= plimit)
-+ return NULL;
- *rpnt++='/';
-+ }
- break;
- }
-
- /*
- * If this component record isn't continued, then append a '/'.
- */
-- if (!rootflag && !(oldslp->flags & 1))
-+ if (!rootflag && !(oldslp->flags & 1)) {
-+ if (rpnt >= plimit)
-+ return NULL;
- *rpnt++='/';
--
-+ }
- }
- return rpnt;
- }
-@@ -548,7 +564,10 @@ static int rock_ridge_symlink_readpage(s
- CHECK_SP(goto out);
- break;
- case SIG('S', 'L'):
-- rpnt = get_symlink_chunk(rpnt, rr);
-+ rpnt = get_symlink_chunk(rpnt, rr,
-+ link + (PAGE_SIZE - 1));
-+ if (rpnt == NULL)
-+ goto out;
- break;
- case SIG('C', 'E'):
- /* This tells is if there is a continuation record */
-
-