[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 8414eddf2d3dcb12a53be78b07526f0b3e54a7ee
git
git at cross-lfs.org
Mon Jan 10 19:53:59 PST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 8414eddf2d3dcb12a53be78b07526f0b3e54a7ee (commit)
via 409d955efc70a432f0b80266bb7250bde3e306f5 (commit)
via 947369c5dda130659ea04b5d0474b0429479e1d9 (commit)
via 20766cc49338b61086a3411cb9ad0fb5401d2127 (commit)
via 27bebd154b385b4820d5abfd7b29f209de201c4e (commit)
from 0c7419e82c20ff9bd18130a33a559f7d16cda980 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8414eddf2d3dcb12a53be78b07526f0b3e54a7ee
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Jan 10 22:48:13 2011 -0500
Updated the Silo Fixes patch to -2.
diff --git a/BOOK/introduction/sparc64/changelog.xml b/BOOK/introduction/sparc64/changelog.xml
index 95e9381..e37eeb8 100644
--- a/BOOK/introduction/sparc64/changelog.xml
+++ b/BOOK/introduction/sparc64/changelog.xml
@@ -34,6 +34,15 @@
-->
<listitem>
+ <para>Janurary 10, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jciccone] - Updated the Silo Fixes patch to -2.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>February 5, 2009</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index eeb4bbb..d13376d 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -140,6 +140,6 @@
<!ENTITY elftoaout-fixes-patch-md5 "485e77cf2ed082d3d0ea99c703f1f14b">
<!ENTITY elftoaout-fixes-patch-size "6 KB">
-<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-1.patch">
-<!ENTITY silo-fixes-patch-md5 "03e8897c5d33d0e6ee81e8e8aeeb772f">
-<!ENTITY silo-fixes-patch-size "696 KB">
+<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-2.patch">
+<!ENTITY silo-fixes-patch-md5 "b4ad6f61614df6ed7d17f086a5319134">
+<!ENTITY silo-fixes-patch-size "700 KB">
diff --git a/patches/silo-1.4.14-fixes-1.patch b/patches/silo-1.4.14-fixes-2.patch
similarity index 97%
rename from patches/silo-1.4.14-fixes-1.patch
rename to patches/silo-1.4.14-fixes-2.patch
index b31c3be..55ea643 100644
--- a/patches/silo-1.4.14-fixes-1.patch
+++ b/patches/silo-1.4.14-fixes-2.patch
@@ -1,4 +1,4 @@
-Submitted By: Jonathan Norman <Jonathan [at] bluesquarelinux.co.uk>
+Submitted By: Joe Ciccone <jciccone at gmail.com>
Date: 2009-01-07
Initial Package Version: 1.4.14
Upstream Status: Unknown
@@ -6,13 +6,13 @@ Origin: Rocklinux, Jim Gifford, Joe Ciccone, and Blue Square Linux
Description: Fixes cross-compilation issues and silo no longer links to
libext2fs.so, it is integrated instead. Also allows silo to build
and work properly on pure64 systems. Now works with 2.6.25.x
- kernel headers.
+ kernel headers. Updated to work with newer libc headers.
Rediffed for 1.4.14
diff -Naur silo-1.4.14.orig/Makefile silo-1.4.14/Makefile
---- silo-1.4.14.orig/Makefile 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/Makefile 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/Makefile 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/Makefile 2011-01-10 21:59:35.398906853 -0500
@@ -3,7 +3,7 @@
# These only get built on Linux
@@ -23,8 +23,8 @@ diff -Naur silo-1.4.14.orig/Makefile silo-1.4.14/Makefile
endif
diff -Naur silo-1.4.14.orig/Rules.make silo-1.4.14/Rules.make
---- silo-1.4.14.orig/Rules.make 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/Rules.make 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/Rules.make 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/Rules.make 2011-01-10 21:59:35.398906853 -0500
@@ -2,12 +2,14 @@
IMGVERSION=0.99
SHELL=/bin/bash
@@ -47,8 +47,8 @@ diff -Naur silo-1.4.14.orig/Rules.make silo-1.4.14/Rules.make
BIN2H=../common/bin2h
diff -Naur silo-1.4.14.orig/common/Makefile silo-1.4.14/common/Makefile
---- silo-1.4.14.orig/common/Makefile 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/common/Makefile 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/common/Makefile 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/common/Makefile 2011-01-10 21:59:35.398906853 -0500
@@ -5,19 +5,22 @@
include ../Rules.make
@@ -79,8 +79,8 @@ diff -Naur silo-1.4.14.orig/common/Makefile silo-1.4.14/common/Makefile
+ $(RM) bin2h *.o
+
diff -Naur silo-1.4.14.orig/first/Makefile silo-1.4.14/first/Makefile
---- silo-1.4.14.orig/first/Makefile 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/first/Makefile 2009-01-07 15:13:16.000000000 -0800
+--- silo-1.4.14.orig/first/Makefile 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/first/Makefile 2011-01-10 21:59:35.398906853 -0500
@@ -1,4 +1,4 @@
-##
+#
@@ -157,8 +157,8 @@ diff -Naur silo-1.4.14.orig/first/Makefile silo-1.4.14/first/Makefile
ieee32.b: ieee32.o
$(LD) $(LDFLAGS) -o ieee32.b ieee32.o
diff -Naur silo-1.4.14.orig/first-isofs/Makefile silo-1.4.14/first-isofs/Makefile
---- silo-1.4.14.orig/first-isofs/Makefile 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/first-isofs/Makefile 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/first-isofs/Makefile 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/first-isofs/Makefile 2011-01-10 21:59:35.398906853 -0500
@@ -11,10 +11,10 @@
all: $(NAME).b
@@ -182,8 +182,8 @@ diff -Naur silo-1.4.14.orig/first-isofs/Makefile silo-1.4.14/first-isofs/Makefil
clean:
$(RM) *.o $(NAME) $(NAME).b $(NAME).aout
diff -Naur silo-1.4.14.orig/include/asm/page.h silo-1.4.14/include/asm/page.h
---- silo-1.4.14.orig/include/asm/page.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/include/asm/page.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/asm/page.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/include/asm/page.h 2011-01-10 21:59:35.398906853 -0500
@@ -0,0 +1,15 @@
+/* File autogenerated by 'make headers_install' */
+#ifndef __ASM_STUB_PAGE_H
@@ -201,8 +201,8 @@ diff -Naur silo-1.4.14.orig/include/asm/page.h silo-1.4.14/include/asm/page.h
+# endif
+#endif /* __ASM_STUB_PAGE_H */
diff -Naur silo-1.4.14.orig/include/emul_32/asm/elf.h silo-1.4.14/include/emul_32/asm/elf.h
---- silo-1.4.14.orig/include/emul_32/asm/elf.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/include/emul_32/asm/elf.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/emul_32/asm/elf.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/include/emul_32/asm/elf.h 2011-01-10 21:59:35.398906853 -0500
@@ -0,0 +1,162 @@
+#ifndef __ASMSPARC_ELF_H
+#define __ASMSPARC_ELF_H
@@ -367,8 +367,8 @@ diff -Naur silo-1.4.14.orig/include/emul_32/asm/elf.h silo-1.4.14/include/emul_3
+
+#endif /* !(__ASMSPARC_ELF_H) */
diff -Naur silo-1.4.14.orig/include/emul_32/asm/posix_types.h silo-1.4.14/include/emul_32/asm/posix_types.h
---- silo-1.4.14.orig/include/emul_32/asm/posix_types.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/include/emul_32/asm/posix_types.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/emul_32/asm/posix_types.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/include/emul_32/asm/posix_types.h 2011-01-10 21:59:35.398906853 -0500
@@ -0,0 +1,122 @@
+#ifndef __ARCH_SPARC_POSIX_TYPES_H
+#define __ARCH_SPARC_POSIX_TYPES_H
@@ -493,8 +493,8 @@ diff -Naur silo-1.4.14.orig/include/emul_32/asm/posix_types.h silo-1.4.14/includ
+
+#endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */
diff -Naur silo-1.4.14.orig/include/emul_32/asm/types.h silo-1.4.14/include/emul_32/asm/types.h
---- silo-1.4.14.orig/include/emul_32/asm/types.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/include/emul_32/asm/types.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/emul_32/asm/types.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/include/emul_32/asm/types.h 2011-01-10 21:59:35.398906853 -0500
@@ -0,0 +1,41 @@
+#ifndef _SPARC_TYPES_H
+#define _SPARC_TYPES_H
@@ -538,8 +538,8 @@ diff -Naur silo-1.4.14.orig/include/emul_32/asm/types.h silo-1.4.14/include/emul
+
+#endif /* defined(_SPARC_TYPES_H) */
diff -Naur silo-1.4.14.orig/include/ext2fs/ext2_err.h silo-1.4.14/include/ext2fs/ext2_err.h
---- silo-1.4.14.orig/include/ext2fs/ext2_err.h 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/include/ext2fs/ext2_err.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/ext2fs/ext2_err.h 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/include/ext2fs/ext2_err.h 2011-01-10 21:59:35.398906853 -0500
@@ -3,6 +3,8 @@
* This file is automatically generated; please do not edit it.
*/
@@ -587,8 +587,8 @@ diff -Naur silo-1.4.14.orig/include/ext2fs/ext2_err.h silo-1.4.14/include/ext2fs
/* for compatibility with older versions... */
diff -Naur silo-1.4.14.orig/include/ext2fs/ext2_io.h silo-1.4.14/include/ext2fs/ext2_io.h
---- silo-1.4.14.orig/include/ext2fs/ext2_io.h 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/include/ext2fs/ext2_io.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/ext2fs/ext2_io.h 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/include/ext2fs/ext2_io.h 2011-01-10 21:59:35.398906853 -0500
@@ -27,6 +27,8 @@
typedef struct struct_io_manager *io_manager;
typedef struct struct_io_channel *io_channel;
@@ -636,8 +636,8 @@ diff -Naur silo-1.4.14.orig/include/ext2fs/ext2_io.h silo-1.4.14/include/ext2fs/
extern io_manager unix_io_manager;
diff -Naur silo-1.4.14.orig/include/linux/ufs_fs.h silo-1.4.14/include/linux/ufs_fs.h
---- silo-1.4.14.orig/include/linux/ufs_fs.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/include/linux/ufs_fs.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/include/linux/ufs_fs.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/include/linux/ufs_fs.h 2011-01-10 21:59:35.403016722 -0500
@@ -0,0 +1,953 @@
+/*
+ * linux/include/linux/ufs_fs.h
@@ -1592,9 +1592,27 @@ diff -Naur silo-1.4.14.orig/include/linux/ufs_fs.h silo-1.4.14/include/linux/ufs
+};
+
+#endif /* __LINUX_UFS_FS_H */
+diff -Naur silo-1.4.14.orig/include/stringops.h silo-1.4.14/include/stringops.h
+--- silo-1.4.14.orig/include/stringops.h 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/include/stringops.h 2011-01-10 22:12:44.851156025 -0500
+@@ -3,13 +3,7 @@
+
+ #include <silo.h>
+
+-/* common */
+-#ifndef __SIZE_TYPE__
+-#define __SIZE_TYPE__ long unsigned int
+-#endif
+-#ifndef _LINUX_TYPES_H
+-typedef __SIZE_TYPE__ size_t;
+-#endif
++#include <stddef.h>
+
+ /* stringops1.c */
+ char *strcpy(char *, const char *);
diff -Naur silo-1.4.14.orig/libext2fs/ChangeLog silo-1.4.14/libext2fs/ChangeLog
---- silo-1.4.14.orig/libext2fs/ChangeLog 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ChangeLog 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ChangeLog 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ChangeLog 2011-01-10 21:59:35.403016722 -0500
@@ -0,0 +1,3311 @@
+2006-06-30 Theodore Ts'o <tytso at mit.edu>
+
@@ -4908,8 +4926,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ChangeLog silo-1.4.14/libext2fs/ChangeLog
+
+
diff -Naur silo-1.4.14.orig/libext2fs/Makefile silo-1.4.14/libext2fs/Makefile
---- silo-1.4.14.orig/libext2fs/Makefile 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/Makefile 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/Makefile 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,21 @@
+
+include ../Rules.make
@@ -4933,8 +4951,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/Makefile silo-1.4.14/libext2fs/Makefile
+.c.o:
+ $(CC-SILO) $(CFLAGS) $(DEFS) -c $< -o $@
diff -Naur silo-1.4.14.orig/libext2fs/alloc.c silo-1.4.14/libext2fs/alloc.c
---- silo-1.4.14.orig/libext2fs/alloc.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/alloc.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/alloc.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,173 @@
+/*
+ * alloc.c --- allocate new inodes, blocks for ext2fs
@@ -5110,8 +5128,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/alloc.c silo-1.4.14/libext2fs/alloc.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/alloc_sb.c silo-1.4.14/libext2fs/alloc_sb.c
---- silo-1.4.14.orig/libext2fs/alloc_sb.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/alloc_sb.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/alloc_sb.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/alloc_sb.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,57 @@
+/*
+ * alloc_sb.c --- Allocate the superblock and block group descriptors for a
@@ -5171,8 +5189,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/alloc_sb.c silo-1.4.14/libext2fs/alloc_sb.
+ return num_blocks;
+}
diff -Naur silo-1.4.14.orig/libext2fs/alloc_stats.c silo-1.4.14/libext2fs/alloc_stats.c
---- silo-1.4.14.orig/libext2fs/alloc_stats.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/alloc_stats.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/alloc_stats.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/alloc_stats.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,52 @@
+/*
+ * alloc_stats.c --- Update allocation statistics for ext2fs
@@ -5227,8 +5245,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/alloc_stats.c silo-1.4.14/libext2fs/alloc_
+ ext2fs_mark_bb_dirty(fs);
+}
diff -Naur silo-1.4.14.orig/libext2fs/alloc_tables.c silo-1.4.14/libext2fs/alloc_tables.c
---- silo-1.4.14.orig/libext2fs/alloc_tables.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/alloc_tables.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/alloc_tables.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/alloc_tables.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,117 @@
+/*
+ * alloc_tables.c --- Allocate tables for a newly initialized
@@ -5348,8 +5366,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/alloc_tables.c silo-1.4.14/libext2fs/alloc
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/badblocks.c silo-1.4.14/libext2fs/badblocks.c
---- silo-1.4.14.orig/libext2fs/badblocks.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/badblocks.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/badblocks.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/badblocks.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,327 @@
+/*
+ * badblocks.c --- routines to manipulate the bad block structure
@@ -5679,8 +5697,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/badblocks.c silo-1.4.14/libext2fs/badblock
+ return bb->num;
+}
diff -Naur silo-1.4.14.orig/libext2fs/bb_compat.c silo-1.4.14/libext2fs/bb_compat.c
---- silo-1.4.14.orig/libext2fs/bb_compat.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bb_compat.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bb_compat.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bb_compat.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,63 @@
+/*
+ * bb_compat.c --- compatibility badblocks routines
@@ -5746,8 +5764,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bb_compat.c silo-1.4.14/libext2fs/bb_compa
+ ext2fs_badblocks_list_iterate_end(iter);
+}
diff -Naur silo-1.4.14.orig/libext2fs/bb_inode.c silo-1.4.14/libext2fs/bb_inode.c
---- silo-1.4.14.orig/libext2fs/bb_inode.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bb_inode.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bb_inode.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bb_inode.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,267 @@
+/*
+ * bb_inode.c --- routines to update the bad block inode.
@@ -6017,8 +6035,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bb_inode.c silo-1.4.14/libext2fs/bb_inode.
+
+
diff -Naur silo-1.4.14.orig/libext2fs/bitmaps.c silo-1.4.14/libext2fs/bitmaps.c
---- silo-1.4.14.orig/libext2fs/bitmaps.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bitmaps.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bitmaps.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bitmaps.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,212 @@
+/*
+ * bitmaps.c --- routines to read, write, and manipulate the inode and
@@ -6233,8 +6251,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bitmaps.c silo-1.4.14/libext2fs/bitmaps.c
+ (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));
+}
diff -Naur silo-1.4.14.orig/libext2fs/bitops.c silo-1.4.14/libext2fs/bitops.c
---- silo-1.4.14.orig/libext2fs/bitops.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bitops.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bitops.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bitops.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,91 @@
+/*
+ * bitops.c --- Bitmap frobbing code. See bitops.h for the inlined
@@ -6328,8 +6346,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bitops.c silo-1.4.14/libext2fs/bitops.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/bitops.h silo-1.4.14/libext2fs/bitops.h
---- silo-1.4.14.orig/libext2fs/bitops.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bitops.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bitops.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bitops.h 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,617 @@
+/*
+ * bitops.h --- Bitmap frobbing code. The byte swapping routines are
@@ -6949,8 +6967,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bitops.h silo-1.4.14/libext2fs/bitops.h
+#endif
+
diff -Naur silo-1.4.14.orig/libext2fs/block.c silo-1.4.14/libext2fs/block.c
---- silo-1.4.14.orig/libext2fs/block.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/block.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/block.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/block.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,437 @@
+/*
+ * block.c --- iterate over all blocks in an inode
@@ -7390,8 +7408,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/block.c silo-1.4.14/libext2fs/block.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/bmap.c silo-1.4.14/libext2fs/bmap.c
---- silo-1.4.14.orig/libext2fs/bmap.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bmap.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bmap.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bmap.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,270 @@
+/*
+ * bmap.c --- logical to physical block mapping
@@ -7664,8 +7682,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bmap.c silo-1.4.14/libext2fs/bmap.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/bmove.c silo-1.4.14/libext2fs/bmove.c
---- silo-1.4.14.orig/libext2fs/bmove.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/bmove.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/bmove.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/bmove.c 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,160 @@
+/*
+ * bmove.c --- Move blocks around to make way for a particular
@@ -7828,8 +7846,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/bmove.c silo-1.4.14/libext2fs/bmove.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/brel.h silo-1.4.14/libext2fs/brel.h
---- silo-1.4.14.orig/libext2fs/brel.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/brel.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/brel.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/brel.h 2011-01-10 21:59:35.407120276 -0500
@@ -0,0 +1,86 @@
+/*
+ * brel.h
@@ -7918,8 +7936,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/brel.h silo-1.4.14/libext2fs/brel.h
+#define ext2fs_brel_free(brel) ((brel)->free((brel)))
+
diff -Naur silo-1.4.14.orig/libext2fs/brel_ma.c silo-1.4.14/libext2fs/brel_ma.c
---- silo-1.4.14.orig/libext2fs/brel_ma.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/brel_ma.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/brel_ma.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/brel_ma.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,197 @@
+/*
+ * brel_ma.c
@@ -8119,8 +8137,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/brel_ma.c silo-1.4.14/libext2fs/brel_ma.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/check_desc.c silo-1.4.14/libext2fs/check_desc.c
---- silo-1.4.14.orig/libext2fs/check_desc.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/check_desc.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/check_desc.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/check_desc.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,68 @@
+/*
+ * check_desc.c --- Check the group descriptors of an ext2 filesystem
@@ -8191,8 +8209,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/check_desc.c silo-1.4.14/libext2fs/check_d
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/closefs.c silo-1.4.14/libext2fs/closefs.c
---- silo-1.4.14.orig/libext2fs/closefs.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/closefs.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/closefs.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/closefs.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,381 @@
+/*
+ * closefs.c --- close an ext2 filesystem
@@ -8576,8 +8594,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/closefs.c silo-1.4.14/libext2fs/closefs.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/cmp_bitmaps.c silo-1.4.14/libext2fs/cmp_bitmaps.c
---- silo-1.4.14.orig/libext2fs/cmp_bitmaps.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/cmp_bitmaps.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/cmp_bitmaps.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/cmp_bitmaps.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,72 @@
+/*
+ * cmp_bitmaps.c --- routines to compare inode and block bitmaps.
@@ -8652,8 +8670,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/cmp_bitmaps.c silo-1.4.14/libext2fs/cmp_bi
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/dblist.c silo-1.4.14/libext2fs/dblist.c
---- silo-1.4.14.orig/libext2fs/dblist.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dblist.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dblist.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dblist.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,260 @@
+/*
+ * dblist.c -- directory block list functions
@@ -8916,8 +8934,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dblist.c silo-1.4.14/libext2fs/dblist.c
+ return (int) dblist->count;
+}
diff -Naur silo-1.4.14.orig/libext2fs/dblist_dir.c silo-1.4.14/libext2fs/dblist_dir.c
---- silo-1.4.14.orig/libext2fs/dblist_dir.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dblist_dir.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dblist_dir.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dblist_dir.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,75 @@
+/*
+ * dblist_dir.c --- iterate by directory entry
@@ -8995,8 +9013,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dblist_dir.c silo-1.4.14/libext2fs/dblist_
+ db_info->blockcnt, 0, 0, priv_data);
+}
diff -Naur silo-1.4.14.orig/libext2fs/dir_iterate.c silo-1.4.14/libext2fs/dir_iterate.c
---- silo-1.4.14.orig/libext2fs/dir_iterate.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dir_iterate.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dir_iterate.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dir_iterate.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,219 @@
+/*
+ * dir_iterate.c --- ext2fs directory iteration operations
@@ -9218,8 +9236,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dir_iterate.c silo-1.4.14/libext2fs/dir_it
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/dirblock.c silo-1.4.14/libext2fs/dirblock.c
---- silo-1.4.14.orig/libext2fs/dirblock.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dirblock.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dirblock.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dirblock.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,130 @@
+/*
+ * dirblock.c --- directory block routines.
@@ -9352,8 +9370,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dirblock.c silo-1.4.14/libext2fs/dirblock.
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/dirhash.c silo-1.4.14/libext2fs/dirhash.c
---- silo-1.4.14.orig/libext2fs/dirhash.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dirhash.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dirhash.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dirhash.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,233 @@
+/*
+ * dirhash.c -- Calculate the hash of a directory entry
@@ -9589,8 +9607,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dirhash.c silo-1.4.14/libext2fs/dirhash.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/dosio.c silo-1.4.14/libext2fs/dosio.c
---- silo-1.4.14.orig/libext2fs/dosio.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dosio.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dosio.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dosio.c 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,456 @@
+/*
+ * dosio.c -- Disk I/O module for the ext2fs/DOS library.
@@ -10049,8 +10067,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dosio.c silo-1.4.14/libext2fs/dosio.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/dosio.h silo-1.4.14/libext2fs/dosio.h
---- silo-1.4.14.orig/libext2fs/dosio.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dosio.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dosio.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dosio.h 2011-01-10 21:59:35.410976098 -0500
@@ -0,0 +1,153 @@
+/*
+ * v1.0
@@ -10206,8 +10224,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dosio.h silo-1.4.14/libext2fs/dosio.h
+
+#endif /* __diskio_h */
diff -Naur silo-1.4.14.orig/libext2fs/dupfs.c silo-1.4.14/libext2fs/dupfs.c
---- silo-1.4.14.orig/libext2fs/dupfs.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/dupfs.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/dupfs.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/dupfs.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,96 @@
+/*
+ * dupfs.c --- duplicate a ext2 filesystem handle
@@ -10306,8 +10324,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/dupfs.c silo-1.4.14/libext2fs/dupfs.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/e2image.h silo-1.4.14/libext2fs/e2image.h
---- silo-1.4.14.orig/libext2fs/e2image.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/e2image.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/e2image.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/e2image.h 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,51 @@
+/*
+ * e2image.h --- header file describing the ext2 image format
@@ -10361,8 +10379,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/e2image.h silo-1.4.14/libext2fs/e2image.h
+
+
diff -Naur silo-1.4.14.orig/libext2fs/expanddir.c silo-1.4.14/libext2fs/expanddir.c
---- silo-1.4.14.orig/libext2fs/expanddir.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/expanddir.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/expanddir.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/expanddir.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,126 @@
+/*
+ * expand.c --- expand an ext2fs directory
@@ -10491,8 +10509,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/expanddir.c silo-1.4.14/libext2fs/expanddi
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/ext2_err.c silo-1.4.14/libext2fs/ext2_err.c
---- silo-1.4.14.orig/libext2fs/ext2_err.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext2_err.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext2_err.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext2_err.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,148 @@
+/*
+ * ext2_err.c:
@@ -10643,8 +10661,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext2_err.c silo-1.4.14/libext2fs/ext2_err.
+ *end = et;
+}
diff -Naur silo-1.4.14.orig/libext2fs/ext2_ext_attr.h silo-1.4.14/libext2fs/ext2_ext_attr.h
---- silo-1.4.14.orig/libext2fs/ext2_ext_attr.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext2_ext_attr.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext2_ext_attr.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext2_ext_attr.h 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,69 @@
+/*
+ File: linux/ext2_ext_attr.h
@@ -10716,8 +10734,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext2_ext_attr.h silo-1.4.14/libext2fs/ext2
+#endif /* __KERNEL__ */
+
diff -Naur silo-1.4.14.orig/libext2fs/ext2_fs.h silo-1.4.14/libext2fs/ext2_fs.h
---- silo-1.4.14.orig/libext2fs/ext2_fs.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext2_fs.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext2_fs.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext2_fs.h 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,644 @@
+/*
+ * linux/include/linux/ext2_fs.h
@@ -11364,8 +11382,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext2_fs.h silo-1.4.14/libext2fs/ext2_fs.h
+
+#endif /* _LINUX_EXT2_FS_H */
diff -Naur silo-1.4.14.orig/libext2fs/ext2_io.h silo-1.4.14/libext2fs/ext2_io.h
---- silo-1.4.14.orig/libext2fs/ext2_io.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext2_io.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext2_io.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext2_io.h 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,108 @@
+/*
+ * io.h --- the I/O manager abstraction
@@ -11476,8 +11494,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext2_io.h silo-1.4.14/libext2fs/ext2_io.h
+#endif /* _EXT2FS_EXT2_IO_H */
+
diff -Naur silo-1.4.14.orig/libext2fs/ext2fs.h silo-1.4.14/libext2fs/ext2fs.h
---- silo-1.4.14.orig/libext2fs/ext2fs.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext2fs.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext2fs.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext2fs.h 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,1140 @@
+/*
+ * ext2fs.h --- ext2fs
@@ -12620,8 +12638,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext2fs.h silo-1.4.14/libext2fs/ext2fs.h
+
+#endif /* _EXT2FS_EXT2FS_H */
diff -Naur silo-1.4.14.orig/libext2fs/ext2fsP.h silo-1.4.14/libext2fs/ext2fsP.h
---- silo-1.4.14.orig/libext2fs/ext2fsP.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext2fsP.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext2fsP.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext2fsP.h 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,88 @@
+/*
+ * ext2fsP.h --- private header file for ext2 library
@@ -12712,8 +12730,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext2fsP.h silo-1.4.14/libext2fs/ext2fsP.h
+
+
diff -Naur silo-1.4.14.orig/libext2fs/ext_attr.c silo-1.4.14/libext2fs/ext_attr.c
---- silo-1.4.14.orig/libext2fs/ext_attr.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ext_attr.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ext_attr.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ext_attr.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,105 @@
+/*
+ * ext_attr.c --- extended attribute blocks
@@ -12821,8 +12839,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ext_attr.c silo-1.4.14/libext2fs/ext_attr.
+ return retval;
+}
diff -Naur silo-1.4.14.orig/libext2fs/fileio.c silo-1.4.14/libext2fs/fileio.c
---- silo-1.4.14.orig/libext2fs/fileio.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/fileio.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/fileio.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/fileio.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,378 @@
+/*
+ * fileio.c --- Simple file I/O routines
@@ -13203,8 +13221,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/fileio.c silo-1.4.14/libext2fs/fileio.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/finddev.c silo-1.4.14/libext2fs/finddev.c
---- silo-1.4.14.orig/libext2fs/finddev.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/finddev.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/finddev.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/finddev.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,208 @@
+/*
+ * finddev.c -- this routine attempts to find a particular device in
@@ -13415,8 +13433,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/finddev.c silo-1.4.14/libext2fs/finddev.c
+
+#endif
diff -Naur silo-1.4.14.orig/libext2fs/flushb.c silo-1.4.14/libext2fs/flushb.c
---- silo-1.4.14.orig/libext2fs/flushb.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/flushb.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/flushb.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/flushb.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,82 @@
+/*
+ * flushb.c --- Hides system-dependent information for both syncing a
@@ -13501,8 +13519,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/flushb.c silo-1.4.14/libext2fs/flushb.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/freefs.c silo-1.4.14/libext2fs/freefs.c
---- silo-1.4.14.orig/libext2fs/freefs.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/freefs.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/freefs.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/freefs.c 2011-01-10 21:59:35.414677086 -0500
@@ -0,0 +1,147 @@
+/*
+ * freefs.c --- free an ext2 filesystem
@@ -13652,8 +13670,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/freefs.c silo-1.4.14/libext2fs/freefs.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/gen_bitmap.c silo-1.4.14/libext2fs/gen_bitmap.c
---- silo-1.4.14.orig/libext2fs/gen_bitmap.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/gen_bitmap.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/gen_bitmap.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/gen_bitmap.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,48 @@
+/*
+ * gen_bitmap.c --- Generic bitmap routines that used to be inlined.
@@ -13704,8 +13722,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/gen_bitmap.c silo-1.4.14/libext2fs/gen_bit
+ return ext2fs_clear_bit(bitno - bitmap->start, bitmap->bitmap);
+}
diff -Naur silo-1.4.14.orig/libext2fs/get_pathname.c silo-1.4.14/libext2fs/get_pathname.c
---- silo-1.4.14.orig/libext2fs/get_pathname.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/get_pathname.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/get_pathname.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/get_pathname.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,157 @@
+/*
+ * get_pathname.c --- do directry/inode -> name translation
@@ -13865,8 +13883,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/get_pathname.c silo-1.4.14/libext2fs/get_p
+
+}
diff -Naur silo-1.4.14.orig/libext2fs/getsectsize.c silo-1.4.14/libext2fs/getsectsize.c
---- silo-1.4.14.orig/libext2fs/getsectsize.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/getsectsize.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/getsectsize.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/getsectsize.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,60 @@
+/*
+ * getsectsize.c --- get the sector size of a device.
@@ -13929,8 +13947,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/getsectsize.c silo-1.4.14/libext2fs/getsec
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/getsize.c silo-1.4.14/libext2fs/getsize.c
---- silo-1.4.14.orig/libext2fs/getsize.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/getsize.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/getsize.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/getsize.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,293 @@
+/*
+ * getsize.c --- get the size of a partition.
@@ -14226,8 +14244,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/getsize.c silo-1.4.14/libext2fs/getsize.c
+}
+#endif
diff -Naur silo-1.4.14.orig/libext2fs/icount.c silo-1.4.14/libext2fs/icount.c
---- silo-1.4.14.orig/libext2fs/icount.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/icount.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/icount.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/icount.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,483 @@
+/*
+ * icount.c --- an efficient inode count abstraction
@@ -14713,8 +14731,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/icount.c silo-1.4.14/libext2fs/icount.c
+ return icount->size;
+}
diff -Naur silo-1.4.14.orig/libext2fs/imager.c silo-1.4.14/libext2fs/imager.c
---- silo-1.4.14.orig/libext2fs/imager.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/imager.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/imager.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/imager.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,387 @@
+/*
+ * image.c --- writes out the critical parts of the filesystem as a
@@ -15104,8 +15122,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/imager.c silo-1.4.14/libext2fs/imager.c
+ return (retval);
+}
diff -Naur silo-1.4.14.orig/libext2fs/ind_block.c silo-1.4.14/libext2fs/ind_block.c
---- silo-1.4.14.orig/libext2fs/ind_block.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ind_block.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ind_block.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ind_block.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,66 @@
+/*
+ * ind_block.c --- indirect block I/O routines
@@ -15174,8 +15192,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ind_block.c silo-1.4.14/libext2fs/ind_bloc
+
+
diff -Naur silo-1.4.14.orig/libext2fs/initialize.c silo-1.4.14/libext2fs/initialize.c
---- silo-1.4.14.orig/libext2fs/initialize.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/initialize.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/initialize.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/initialize.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,387 @@
+/*
+ * initialize.c --- initialize a filesystem handle given superblock
@@ -15565,8 +15583,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/initialize.c silo-1.4.14/libext2fs/initial
+ return retval;
+}
diff -Naur silo-1.4.14.orig/libext2fs/inline.c silo-1.4.14/libext2fs/inline.c
---- silo-1.4.14.orig/libext2fs/inline.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/inline.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/inline.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/inline.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,32 @@
+/*
+ * inline.c --- Includes the inlined functions defined in the header
@@ -15601,8 +15619,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/inline.c silo-1.4.14/libext2fs/inline.c
+#include "ext2fs.h"
+
diff -Naur silo-1.4.14.orig/libext2fs/inode.c silo-1.4.14/libext2fs/inode.c
---- silo-1.4.14.orig/libext2fs/inode.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/inode.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/inode.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/inode.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,794 @@
+/*
+ * inode.c --- utility routines to read and write inodes
@@ -16399,8 +16417,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/inode.c silo-1.4.14/libext2fs/inode.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/inode_io.c silo-1.4.14/libext2fs/inode_io.c
---- silo-1.4.14.orig/libext2fs/inode_io.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/inode_io.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/inode_io.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/inode_io.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,270 @@
+/*
+ * inode_io.c --- This is allows an inode in an ext2 filesystem image
@@ -16673,8 +16691,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/inode_io.c silo-1.4.14/libext2fs/inode_io.
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/io_manager.c silo-1.4.14/libext2fs/io_manager.c
---- silo-1.4.14.orig/libext2fs/io_manager.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/io_manager.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/io_manager.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/io_manager.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,69 @@
+/*
+ * io_manager.c --- the I/O manager abstraction
@@ -16746,8 +16764,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/io_manager.c silo-1.4.14/libext2fs/io_mana
+ return EXT2_ET_UNIMPLEMENTED;
+}
diff -Naur silo-1.4.14.orig/libext2fs/irel.h silo-1.4.14/libext2fs/irel.h
---- silo-1.4.14.orig/libext2fs/irel.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/irel.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/irel.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/irel.h 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,114 @@
+/*
+ * irel.h
@@ -16864,8 +16882,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/irel.h silo-1.4.14/libext2fs/irel.h
+#define ext2fs_irel_delete(irel, old) ((irel)->delete((irel), old))
+#define ext2fs_irel_free(irel) ((irel)->free((irel)))
diff -Naur silo-1.4.14.orig/libext2fs/irel_ma.c silo-1.4.14/libext2fs/irel_ma.c
---- silo-1.4.14.orig/libext2fs/irel_ma.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/irel_ma.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/irel_ma.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/irel_ma.c 2011-01-10 21:59:35.419156677 -0500
@@ -0,0 +1,372 @@
+/*
+ * irel_ma.c
@@ -17240,8 +17258,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/irel_ma.c silo-1.4.14/libext2fs/irel_ma.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/ismounted.c silo-1.4.14/libext2fs/ismounted.c
---- silo-1.4.14.orig/libext2fs/ismounted.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/ismounted.c 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/ismounted.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/ismounted.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,377 @@
+/*
+ * ismounted.c --- Check to see if the filesystem was mounted
@@ -17621,8 +17639,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/ismounted.c silo-1.4.14/libext2fs/ismounte
+}
+#endif /* DEBUG */
diff -Naur silo-1.4.14.orig/libext2fs/jfs_compat.h silo-1.4.14/libext2fs/jfs_compat.h
---- silo-1.4.14.orig/libext2fs/jfs_compat.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/jfs_compat.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/jfs_compat.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/jfs_compat.h 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,67 @@
+
+#ifndef _JFS_COMPAT_H
@@ -17692,8 +17710,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/jfs_compat.h silo-1.4.14/libext2fs/jfs_com
+
+#endif /* _JFS_COMPAT_H */
diff -Naur silo-1.4.14.orig/libext2fs/jfs_dat.h silo-1.4.14/libext2fs/jfs_dat.h
---- silo-1.4.14.orig/libext2fs/jfs_dat.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/jfs_dat.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/jfs_dat.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/jfs_dat.h 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,64 @@
+/*
+ * jfs_dat.h --- stripped down header file which only contains the JFS
@@ -17760,8 +17778,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/jfs_dat.h silo-1.4.14/libext2fs/jfs_dat.h
+} journal_superblock_t;
+
diff -Naur silo-1.4.14.orig/libext2fs/jfs_user.h silo-1.4.14/libext2fs/jfs_user.h
---- silo-1.4.14.orig/libext2fs/jfs_user.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/jfs_user.h 2009-01-07 15:07:56.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/jfs_user.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/jfs_user.h 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,8 @@
+#ifndef _JFS_USER_H
+#define _JFS_USER_H
@@ -17772,8 +17790,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/jfs_user.h silo-1.4.14/libext2fs/jfs_user.
+
+#endif /* _JFS_USER_H */
diff -Naur silo-1.4.14.orig/libext2fs/kernel-jbd.h silo-1.4.14/libext2fs/kernel-jbd.h
---- silo-1.4.14.orig/libext2fs/kernel-jbd.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/kernel-jbd.h 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/kernel-jbd.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/kernel-jbd.h 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,910 @@
+/*
+ * linux/include/linux/jbd.h
@@ -18686,8 +18704,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/kernel-jbd.h silo-1.4.14/libext2fs/kernel-
+#endif /* defined(__KERNEL__) && !defined(CONFIG_JBD) */
+#endif /* _LINUX_JBD_H */
diff -Naur silo-1.4.14.orig/libext2fs/kernel-list.h silo-1.4.14/libext2fs/kernel-list.h
---- silo-1.4.14.orig/libext2fs/kernel-list.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/kernel-list.h 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/kernel-list.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/kernel-list.h 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,112 @@
+#ifndef _LINUX_LIST_H
+#define _LINUX_LIST_H
@@ -18802,8 +18820,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/kernel-list.h silo-1.4.14/libext2fs/kernel
+
+#endif
diff -Naur silo-1.4.14.orig/libext2fs/link.c silo-1.4.14/libext2fs/link.c
---- silo-1.4.14.orig/libext2fs/link.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/link.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/link.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/link.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,134 @@
+/*
+ * link.c --- create links in a ext2fs directory
@@ -18940,8 +18958,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/link.c silo-1.4.14/libext2fs/link.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/llseek.c silo-1.4.14/libext2fs/llseek.c
---- silo-1.4.14.orig/libext2fs/llseek.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/llseek.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/llseek.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/llseek.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,138 @@
+/*
+ * llseek.c -- stub calling the llseek system call
@@ -19082,8 +19100,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/llseek.c silo-1.4.14/libext2fs/llseek.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/lookup.c silo-1.4.14/libext2fs/lookup.c
---- silo-1.4.14.orig/libext2fs/lookup.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/lookup.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/lookup.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/lookup.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,69 @@
+/*
+ * lookup.c --- ext2fs directory lookup operations
@@ -19155,8 +19173,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/lookup.c silo-1.4.14/libext2fs/lookup.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/mkdir.c silo-1.4.14/libext2fs/mkdir.c
---- silo-1.4.14.orig/libext2fs/mkdir.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/mkdir.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/mkdir.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/mkdir.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,142 @@
+/*
+ * mkdir.c --- make a directory in the filesystem
@@ -19301,8 +19319,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/mkdir.c silo-1.4.14/libext2fs/mkdir.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/mkjournal.c silo-1.4.14/libext2fs/mkjournal.c
---- silo-1.4.14.orig/libext2fs/mkjournal.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/mkjournal.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/mkjournal.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/mkjournal.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,425 @@
+/*
+ * mkjournal.c --- make a journal for a filesystem
@@ -19730,8 +19748,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/mkjournal.c silo-1.4.14/libext2fs/mkjourna
+}
+#endif
diff -Naur silo-1.4.14.orig/libext2fs/namei.c silo-1.4.14/libext2fs/namei.c
---- silo-1.4.14.orig/libext2fs/namei.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/namei.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/namei.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/namei.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,205 @@
+/*
+ * namei.c --- ext2fs directory lookup operations
@@ -19939,8 +19957,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/namei.c silo-1.4.14/libext2fs/namei.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/native.c silo-1.4.14/libext2fs/native.c
---- silo-1.4.14.orig/libext2fs/native.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/native.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/native.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/native.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,27 @@
+/*
+ * native.c --- returns the ext2_flag for a native byte order
@@ -19970,8 +19988,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/native.c silo-1.4.14/libext2fs/native.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/newdir.c silo-1.4.14/libext2fs/newdir.c
---- silo-1.4.14.orig/libext2fs/newdir.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/newdir.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/newdir.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/newdir.c 2011-01-10 21:59:35.423156126 -0500
@@ -0,0 +1,72 @@
+/*
+ * newdir.c --- create a new directory block
@@ -20046,8 +20064,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/newdir.c silo-1.4.14/libext2fs/newdir.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/nt_io.c silo-1.4.14/libext2fs/nt_io.c
---- silo-1.4.14.orig/libext2fs/nt_io.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/nt_io.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/nt_io.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/nt_io.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,1513 @@
+/*
+ * nt_io.c --- This is the Nt I/O interface to the I/O manager.
@@ -21563,8 +21581,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/nt_io.c silo-1.4.14/libext2fs/nt_io.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/openfs.c silo-1.4.14/libext2fs/openfs.c
---- silo-1.4.14.orig/libext2fs/openfs.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/openfs.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/openfs.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/openfs.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,326 @@
+/*
+ * openfs.c --- open an ext2 filesystem
@@ -21893,8 +21911,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/openfs.c silo-1.4.14/libext2fs/openfs.c
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/read_bb.c silo-1.4.14/libext2fs/read_bb.c
---- silo-1.4.14.orig/libext2fs/read_bb.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/read_bb.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/read_bb.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/read_bb.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,97 @@
+/*
+ * read_bb --- read the bad blocks inode
@@ -21994,8 +22012,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/read_bb.c silo-1.4.14/libext2fs/read_bb.c
+
+
diff -Naur silo-1.4.14.orig/libext2fs/read_bb_file.c silo-1.4.14/libext2fs/read_bb_file.c
---- silo-1.4.14.orig/libext2fs/read_bb_file.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/read_bb_file.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/read_bb_file.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/read_bb_file.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,97 @@
+/*
+ * read_bb_file.c --- read a list of bad blocks from a FILE *
@@ -22095,8 +22113,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/read_bb_file.c silo-1.4.14/libext2fs/read_
+
+
diff -Naur silo-1.4.14.orig/libext2fs/res_gdt.c silo-1.4.14/libext2fs/res_gdt.c
---- silo-1.4.14.orig/libext2fs/res_gdt.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/res_gdt.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/res_gdt.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/res_gdt.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,220 @@
+/*
+ * res_gdt.c --- reserve blocks for growing the group descriptor table
@@ -22319,8 +22337,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/res_gdt.c silo-1.4.14/libext2fs/res_gdt.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/rs_bitmap.c silo-1.4.14/libext2fs/rs_bitmap.c
---- silo-1.4.14.orig/libext2fs/rs_bitmap.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/rs_bitmap.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/rs_bitmap.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/rs_bitmap.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,106 @@
+/*
+ * rs_bitmap.c --- routine for changing the size of a bitmap
@@ -22429,8 +22447,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/rs_bitmap.c silo-1.4.14/libext2fs/rs_bitma
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/rw_bitmaps.c silo-1.4.14/libext2fs/rw_bitmaps.c
---- silo-1.4.14.orig/libext2fs/rw_bitmaps.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/rw_bitmaps.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/rw_bitmaps.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/rw_bitmaps.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,300 @@
+/*
+ * rw_bitmaps.c --- routines to read and write the inode and block bitmaps.
@@ -22733,8 +22751,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/rw_bitmaps.c silo-1.4.14/libext2fs/rw_bitm
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/sparse.c silo-1.4.14/libext2fs/sparse.c
---- silo-1.4.14.orig/libext2fs/sparse.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/sparse.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/sparse.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/sparse.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,78 @@
+/*
+ * sparse.c --- find the groups in an ext2 filesystem with metadata backups
@@ -22815,8 +22833,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/sparse.c silo-1.4.14/libext2fs/sparse.c
+ return ret;
+}
diff -Naur silo-1.4.14.orig/libext2fs/swapfs.c silo-1.4.14/libext2fs/swapfs.c
---- silo-1.4.14.orig/libext2fs/swapfs.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/swapfs.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/swapfs.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/swapfs.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,237 @@
+/*
+ * swapfs.c --- swap ext2 filesystem data structures
@@ -23056,8 +23074,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/swapfs.c silo-1.4.14/libext2fs/swapfs.c
+
+#endif
diff -Naur silo-1.4.14.orig/libext2fs/test_io.c silo-1.4.14/libext2fs/test_io.c
---- silo-1.4.14.orig/libext2fs/test_io.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/test_io.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/test_io.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/test_io.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,411 @@
+/*
+ * test_io.c --- This is the Test I/O interface.
@@ -23471,8 +23489,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/test_io.c silo-1.4.14/libext2fs/test_io.c
+ return retval;
+}
diff -Naur silo-1.4.14.orig/libext2fs/tst_badblocks.c silo-1.4.14/libext2fs/tst_badblocks.c
---- silo-1.4.14.orig/libext2fs/tst_badblocks.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/tst_badblocks.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/tst_badblocks.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/tst_badblocks.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,293 @@
+/*
+ * This testing program makes sure the badblocks implementation works.
@@ -23768,8 +23786,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/tst_badblocks.c silo-1.4.14/libext2fs/tst_
+
+}
diff -Naur silo-1.4.14.orig/libext2fs/tst_bitops.c silo-1.4.14/libext2fs/tst_bitops.c
---- silo-1.4.14.orig/libext2fs/tst_bitops.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/tst_bitops.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/tst_bitops.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/tst_bitops.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,44 @@
+/*
+ * This testing program makes sure the bitops functions work
@@ -23816,8 +23834,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/tst_bitops.c silo-1.4.14/libext2fs/tst_bit
+ }
+}
diff -Naur silo-1.4.14.orig/libext2fs/tst_byteswap.c silo-1.4.14/libext2fs/tst_byteswap.c
---- silo-1.4.14.orig/libext2fs/tst_byteswap.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/tst_byteswap.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/tst_byteswap.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/tst_byteswap.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,92 @@
+/*
+ * This testing program makes sure the byteswap functions work
@@ -23912,8 +23930,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/tst_byteswap.c silo-1.4.14/libext2fs/tst_b
+ return errors;
+}
diff -Naur silo-1.4.14.orig/libext2fs/tst_getsectsize.c silo-1.4.14/libext2fs/tst_getsectsize.c
---- silo-1.4.14.orig/libext2fs/tst_getsectsize.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/tst_getsectsize.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/tst_getsectsize.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/tst_getsectsize.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,47 @@
+/*
+ * tst_getsize.c --- this function tests the getsize function
@@ -23963,8 +23981,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/tst_getsectsize.c silo-1.4.14/libext2fs/ts
+ exit(0);
+}
diff -Naur silo-1.4.14.orig/libext2fs/tst_getsize.c silo-1.4.14/libext2fs/tst_getsize.c
---- silo-1.4.14.orig/libext2fs/tst_getsize.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/tst_getsize.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/tst_getsize.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/tst_getsize.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,44 @@
+/*
+ * tst_getsize.c --- this function tests the getsize function
@@ -24011,8 +24029,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/tst_getsize.c silo-1.4.14/libext2fs/tst_ge
+ return 0;
+}
diff -Naur silo-1.4.14.orig/libext2fs/tst_iscan.c silo-1.4.14/libext2fs/tst_iscan.c
---- silo-1.4.14.orig/libext2fs/tst_iscan.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/tst_iscan.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/tst_iscan.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/tst_iscan.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,218 @@
+/*
+ * tst_inode.c --- this function tests the inode scan function
@@ -24233,8 +24251,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/tst_iscan.c silo-1.4.14/libext2fs/tst_isca
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/unix_io.c silo-1.4.14/libext2fs/unix_io.c
---- silo-1.4.14.orig/libext2fs/unix_io.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/unix_io.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/unix_io.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/unix_io.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,710 @@
+/*
+ * unix_io.c --- This is the Unix (well, really POSIX) implementation
@@ -24947,8 +24965,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/unix_io.c silo-1.4.14/libext2fs/unix_io.c
+ return EXT2_ET_INVALID_ARGUMENT;
+}
diff -Naur silo-1.4.14.orig/libext2fs/unlink.c silo-1.4.14/libext2fs/unlink.c
---- silo-1.4.14.orig/libext2fs/unlink.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/unlink.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/unlink.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/unlink.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,99 @@
+/*
+ * unlink.c --- delete links in a ext2fs directory
@@ -25050,8 +25068,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/unlink.c silo-1.4.14/libext2fs/unlink.c
+}
+
diff -Naur silo-1.4.14.orig/libext2fs/valid_blk.c silo-1.4.14/libext2fs/valid_blk.c
---- silo-1.4.14.orig/libext2fs/valid_blk.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/valid_blk.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/valid_blk.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/valid_blk.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,56 @@
+/*
+ * valid_blk.c --- does the inode have valid blocks?
@@ -25110,8 +25128,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/valid_blk.c silo-1.4.14/libext2fs/valid_bl
+ return 1;
+}
diff -Naur silo-1.4.14.orig/libext2fs/version.c silo-1.4.14/libext2fs/version.c
---- silo-1.4.14.orig/libext2fs/version.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/version.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/version.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/version.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,52 @@
+/*
+ * version.c --- Return the version of the ext2 library
@@ -25166,8 +25184,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/version.c silo-1.4.14/libext2fs/version.c
+ return ext2fs_parse_version_string(lib_version);
+}
diff -Naur silo-1.4.14.orig/libext2fs/version.h silo-1.4.14/libext2fs/version.h
---- silo-1.4.14.orig/libext2fs/version.h 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/version.h 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/version.h 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/version.h 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,11 @@
+/*
+ * version.h --- controls the version number printed by the e2fs
@@ -25181,8 +25199,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/version.h silo-1.4.14/libext2fs/version.h
+#define E2FSPROGS_VERSION "1.38"
+#define E2FSPROGS_DATE "30-Jun-2005"
diff -Naur silo-1.4.14.orig/libext2fs/write_bb_file.c silo-1.4.14/libext2fs/write_bb_file.c
---- silo-1.4.14.orig/libext2fs/write_bb_file.c 1969-12-31 16:00:00.000000000 -0800
-+++ silo-1.4.14/libext2fs/write_bb_file.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/libext2fs/write_bb_file.c 1969-12-31 19:00:00.000000000 -0500
++++ silo-1.4.14/libext2fs/write_bb_file.c 2011-01-10 21:59:35.427156659 -0500
@@ -0,0 +1,34 @@
+/*
+ * write_bb_file.c --- write a list of bad blocks to a FILE *
@@ -25219,8 +25237,8 @@ diff -Naur silo-1.4.14.orig/libext2fs/write_bb_file.c silo-1.4.14/libext2fs/writ
+ return 0;
+}
diff -Naur silo-1.4.14.orig/second/Makefile silo-1.4.14/second/Makefile
---- silo-1.4.14.orig/second/Makefile 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/second/Makefile 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/second/Makefile 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/second/Makefile 2011-01-10 21:59:35.427156659 -0500
@@ -27,10 +27,10 @@
LDFLAGS_LARGE=-N -Ttext $(LARGE_RELOC)
@@ -25312,8 +25330,8 @@ diff -Naur silo-1.4.14.orig/second/Makefile silo-1.4.14/second/Makefile
second.b: second util
$(ELFTOAOUT) -o second.aout second
diff -Naur silo-1.4.14.orig/second/ls.c silo-1.4.14/second/ls.c
---- silo-1.4.14.orig/second/ls.c 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/second/ls.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/second/ls.c 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/second/ls.c 2011-01-10 21:59:35.430765491 -0500
@@ -19,10 +19,10 @@
USA. */
@@ -25327,8 +25345,8 @@ diff -Naur silo-1.4.14.orig/second/ls.c silo-1.4.14/second/ls.c
#include <ext2fs/ext2fs.h>
diff -Naur silo-1.4.14.orig/silo/silo.c silo-1.4.14/silo/silo.c
---- silo-1.4.14.orig/silo/silo.c 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/silo/silo.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/silo/silo.c 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/silo/silo.c 2011-01-10 21:59:35.430765491 -0500
@@ -128,8 +128,8 @@
unsigned short nsect; /* Sectors per track */
unsigned char spare3[4]; /* Even more magic... */
@@ -25341,8 +25359,8 @@ diff -Naur silo-1.4.14.orig/silo/silo.c silo-1.4.14/silo/silo.c
unsigned short magic; /* Magic number */
unsigned short csum; /* Label xor'd checksum */
diff -Naur silo-1.4.14.orig/silo/silocheck.c silo-1.4.14/silo/silocheck.c
---- silo-1.4.14.orig/silo/silocheck.c 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/silo/silocheck.c 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/silo/silocheck.c 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/silo/silocheck.c 2011-01-10 21:59:35.430765491 -0500
@@ -101,8 +101,8 @@
unsigned short nsect; /* Sectors per track */
unsigned char spare3[4]; /* Even more magic... */
@@ -25355,8 +25373,8 @@ diff -Naur silo-1.4.14.orig/silo/silocheck.c silo-1.4.14/silo/silocheck.c
unsigned short magic; /* Magic number */
unsigned short csum; /* Label xor'd checksum */
diff -Naur silo-1.4.14.orig/tilo/Makefile silo-1.4.14/tilo/Makefile
---- silo-1.4.14.orig/tilo/Makefile 2008-06-12 09:39:12.000000000 -0700
-+++ silo-1.4.14/tilo/Makefile 2009-01-07 15:07:57.000000000 -0800
+--- silo-1.4.14.orig/tilo/Makefile 2008-06-12 12:39:12.000000000 -0400
++++ silo-1.4.14/tilo/Makefile 2011-01-10 21:59:35.430765491 -0500
@@ -14,10 +14,10 @@
all: maketilo
commit 409d955efc70a432f0b80266bb7250bde3e306f5
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Jan 10 21:18:07 2011 -0500
Fix linking issues with udev in the boot section.
diff --git a/BOOK/boot/64/udev.xml b/BOOK/boot/64/udev.xml
index 3551c94..47584c2 100644
--- a/BOOK/boot/64/udev.xml
+++ b/BOOK/boot/64/udev.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/udev.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" ./configure --prefix=/usr \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
--libdir=/usr/lib --disable-extras --disable-introspection</userinput></screen>
diff --git a/BOOK/boot/common/udev.xml b/BOOK/boot/common/udev.xml
index bf2664c..c8aa1a8 100644
--- a/BOOK/boot/common/udev.xml
+++ b/BOOK/boot/common/udev.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/udev.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>./configure --prefix=/usr \
+<screen os="b"><userinput>LIBS="-lpthread" ./configure --prefix=/usr \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--exec-prefix="" --sysconfdir=/etc \
--libexecdir=/lib/udev --libdir=/usr/lib \
diff --git a/BOOK/boot/multilib/udev.xml b/BOOK/boot/multilib/udev.xml
index d098657..6276fe0 100644
--- a/BOOK/boot/multilib/udev.xml
+++ b/BOOK/boot/multilib/udev.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/udev.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" ./configure --prefix=/usr \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--exec-prefix="" --sysconfdir=/etc --libexecdir=/lib/udev \
--libdir=/usr/lib64 --disable-extras --disable-introspection</userinput></screen>
commit 947369c5dda130659ea04b5d0474b0429479e1d9
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Jan 10 21:17:56 2011 -0500
Fix linking issues with e2fsprogs in the boot section.
diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml
index 5d08f24..fe310ba 100644
--- a/BOOK/boot/common/e2fsprogs.xml
+++ b/BOOK/boot/common/e2fsprogs.xml
@@ -34,7 +34,8 @@
href="../../final-system/common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>PKG_CONFIG=true ../configure --prefix=/tools \
+<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
+ PKG_CONFIG=true ../configure --prefix=/tools \
--enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
diff --git a/BOOK/boot/multilib/e2fsprogs.xml b/BOOK/boot/multilib/e2fsprogs.xml
index b016cda..d506fe6 100644
--- a/BOOK/boot/multilib/e2fsprogs.xml
+++ b/BOOK/boot/multilib/e2fsprogs.xml
@@ -40,7 +40,8 @@ sed -e "/libdir=.*\/lib/s@/lib@/lib64 at g" configure.orig > configure</userinpu
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
+ CC="${CC} ${BUILD64}" PKG_CONFIG=true \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
diff --git a/BOOK/boot/ppc64/e2fsprogs-libs.xml b/BOOK/boot/ppc64/e2fsprogs-libs.xml
index c31db59..8a2f67d 100644
--- a/BOOK/boot/ppc64/e2fsprogs-libs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs-libs.xml
@@ -45,7 +45,8 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
+<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
+ CC="${CC} ${BUILD32}" PKG_CONFIG=true \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
diff --git a/BOOK/boot/ppc64/e2fsprogs.xml b/BOOK/boot/ppc64/e2fsprogs.xml
index f6bd2bb..1dc501c 100644
--- a/BOOK/boot/ppc64/e2fsprogs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs.xml
@@ -53,7 +53,8 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
+ CC="${CC} ${BUILD64}" PKG_CONFIG=true \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
commit 20766cc49338b61086a3411cb9ad0fb5401d2127
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Jan 10 21:03:55 2011 -0500
Remove depreciated option --with-linker from e2fsprogs in the boot section.
diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml
index 40e715d..5d08f24 100644
--- a/BOOK/boot/common/e2fsprogs.xml
+++ b/BOOK/boot/common/e2fsprogs.xml
@@ -35,8 +35,7 @@
xpointer="xpointer(//*[@os='c'])"/>
<screen os="aa"><userinput>PKG_CONFIG=true ../configure --prefix=/tools \
- --enable-elf-shlibs --with-linker=${LD} \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
diff --git a/BOOK/boot/multilib/e2fsprogs.xml b/BOOK/boot/multilib/e2fsprogs.xml
index a3f711a..b016cda 100644
--- a/BOOK/boot/multilib/e2fsprogs.xml
+++ b/BOOK/boot/multilib/e2fsprogs.xml
@@ -42,7 +42,7 @@ sed -e "/libdir=.*\/lib/s@/lib@/lib64 at g" configure.orig > configure</userinpu
<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
../configure --prefix=/tools --enable-elf-shlibs \
- --with-linker=${LD} --host=${CLFS_TARGET} \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
diff --git a/BOOK/boot/ppc64/e2fsprogs-libs.xml b/BOOK/boot/ppc64/e2fsprogs-libs.xml
index a244b1f..c31db59 100644
--- a/BOOK/boot/ppc64/e2fsprogs-libs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs-libs.xml
@@ -47,7 +47,7 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
../configure --prefix=/tools --enable-elf-shlibs \
- --with-linker=${LD} --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
--disable-uuidd --cache-file=config.cache</userinput></screen>
diff --git a/BOOK/boot/ppc64/e2fsprogs.xml b/BOOK/boot/ppc64/e2fsprogs.xml
index 3a7a1ea..f6bd2bb 100644
--- a/BOOK/boot/ppc64/e2fsprogs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs.xml
@@ -55,7 +55,7 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
../configure --prefix=/tools --enable-elf-shlibs \
- --with-linker=${LD} --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
--disable-uuidd --cache-file=config.cache</userinput></screen>
commit 27bebd154b385b4820d5abfd7b29f209de201c4e
Author: Joe Ciccone <jciccone at gmail.com>
Date: Mon Jan 10 21:00:55 2011 -0500
Update Date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index e4c3a68..5f0b723 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "01"> <!-- Use two digits -->
<!ENTITY month_name "January">
-<!ENTITY day "09"> <!-- Use two digits -->
+<!ENTITY day "10"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/udev.xml | 2 +-
BOOK/boot/common/e2fsprogs.xml | 6 +-
BOOK/boot/common/udev.xml | 2 +-
BOOK/boot/multilib/e2fsprogs.xml | 5 +-
BOOK/boot/multilib/udev.xml | 2 +-
BOOK/boot/ppc64/e2fsprogs-libs.xml | 5 +-
BOOK/boot/ppc64/e2fsprogs.xml | 5 +-
BOOK/general.ent | 2 +-
BOOK/introduction/sparc64/changelog.xml | 9 +
BOOK/patches.ent | 6 +-
....14-fixes-1.patch => silo-1.4.14-fixes-2.patch} | 454 ++++++++++----------
11 files changed, 264 insertions(+), 234 deletions(-)
rename patches/{silo-1.4.14-fixes-1.patch => silo-1.4.14-fixes-2.patch} (97%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list