r1544 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches: . series

[Joshua Kwan]

Author: joshk
Date: 2004-09-04 14:10:23 -0600 (Sat, 04 Sep 2004)
New Revision: 1544

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/076_isofs_acorn_support.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/077_isofs_ignore_volseqno.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/078_isofs_nodot_execute.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
Log:
split out a diff, for inclusion purposes


Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/076_isofs_acorn_support.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/076_isofs_acorn_support.diff	2004-09-04 05:00:11 UTC (rev 1543)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/076_isofs_acorn_support.diff	2004-09-04 20:10:23 UTC (rev 1544)
@@ -0,0 +1,20 @@
+# origin: Debian, #141660
+# cset: n/a
+# inclusion: not submitted
+# description: translate slashes to dots for broken Acorn images
+# revision date: 2004-09-04
+
+diff -urN kernel-source-2.4.26/fs/isofs/dir.c kernel-source-2.4.26-1/fs/isofs/dir.c
+--- kernel-source-2.4.26/fs/isofs/dir.c	2002-02-26 06:38:08.000000000 +1100
++++ kernel-source-2.4.26-1/fs/isofs/dir.c	2002-04-13 21:45:40.000000000 +1000
+@@ -63,7 +63,8 @@
+ 			break;
+ 
+ 		/* Convert remaining ';' to '.' */
+-		if (c == ';')
++		/* Also '/' to '.' (broken Acorn-generated ISO9660 images) */
++		if (c == ';' || c == '/')
+ 			c = '.';
+ 
+ 		new[i] = c;
+

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/077_isofs_ignore_volseqno.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/077_isofs_ignore_volseqno.diff	2004-09-04 05:00:11 UTC (rev 1543)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/077_isofs_ignore_volseqno.diff	2004-09-04 20:10:23 UTC (rev 1544)
@@ -0,0 +1,42 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not submitted
+# description: do not get seqno if we will not use it
+# revision date: 2004-09-04
+
+diff -urN kernel-source-2.4.26/fs/isofs/inode.c kernel-source-2.4.26-1/fs/isofs/inode.c
+--- kernel-source-2.4.26/fs/isofs/inode.c	2002-11-29 10:53:15.000000000 +1100
++++ kernel-source-2.4.26-1/fs/isofs/inode.c	2002-11-30 15:49:27.000000000 +1100
+@@ -1148,7 +1148,10 @@
+ 	struct iso_directory_record * tmpde = NULL;
+ 	unsigned int de_len;
+ 	unsigned long offset;
+-	int volume_seq_no, i;
++	int i;
++#ifndef IGNORE_WRONG_MULTI_VOLUME_SPECS
++	int volume_seq_no;
++#endif
+ 
+ 	bh = sb_bread(inode->i_sb, block);
+ 	if (!bh)
+@@ -1280,9 +1275,6 @@
+ 		test_and_set_gid(&inode->i_gid, inode->i_sb->u.isofs_sb.s_gid);
+ 	}
+ 
+-	/* get the volume sequence number */
+-	volume_seq_no = isonum_723 (de->volume_sequence_number) ;
+-
+     /*
+      * Multi volume means tagging a group of CDs with info in their headers.
+      * All CDs of a group must share the same vol set name and vol set size
+@@ -1292,6 +1284,9 @@
+      * of ftp://ftp.ecma.ch/ecma-st/Ecma-119.pdf (ECMA 119 2nd Ed = ISO 9660)
+      */
+ #ifndef IGNORE_WRONG_MULTI_VOLUME_SPECS
++	/* get the volume sequence number */
++	volume_seq_no = isonum_723 (de->volume_sequence_number) ;
++
+ 	/*
+ 	 * Disable checking if we see any volume number other than 0 or 1.
+ 	 * We could use the cruft option, but that has multiple purposes, one
+

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/078_isofs_nodot_execute.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/078_isofs_nodot_execute.diff	2004-09-04 05:00:11 UTC (rev 1543)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/078_isofs_nodot_execute.diff	2004-09-04 20:10:23 UTC (rev 1544)
@@ -0,0 +1,24 @@
+# origin: Debian, #162190
+# cset: n/a
+# inclusion: not submitted
+# description: remove period check for executables
+# revision date: 2004-09-04
+
+diff -urN kernel-source-2.4.26/fs/isofs/inode.c kernel-source-2.4.26-1/fs/isofs/inode.c
+--- kernel-source-2.4.26/fs/isofs/inode.c	2002-11-29 10:53:15.000000000 +1100
++++ kernel-source-2.4.26-1/fs/isofs/inode.c	2002-11-30 15:49:27.000000000 +1100
+@@ -1190,14 +1193,6 @@
+ 		inode->i_mode = inode->i_sb->u.isofs_sb.s_mode;
+ 		inode->i_nlink = 1;
+ 	        inode->i_mode |= S_IFREG;
+-		/* If there are no periods in the name,
+-		 * then set the execute permission bit
+-		 */
+-		for(i=0; i< de->name_len[0]; i++)
+-			if(de->name[i]=='.' || de->name[i]==';')
+-				break;
+-		if(i == de->name_len[0] || de->name[i] == ';')
+-			inode->i_mode |= S_IXUGO; /* execute permission */
+ 	}
+ 	inode->i_uid = inode->i_sb->u.isofs_sb.s_uid;
+ 	inode->i_gid = inode->i_sb->u.isofs_sb.s_gid;

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-09-04 05:00:11 UTC (rev 1543)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-09-04 20:10:23 UTC (rev 1544)
@@ -0,0 +1,4 @@
+- 024_isofs_fixes.diff
++ 076_isofs_acorn_support.diff
++ 077_isofs_ignore_volseqno.diff
++ 078_isofs_nodot_execute.diff