diff options
| author | James <> | 2013-03-17 12:16:37 +0000 |
|---|---|---|
| committer | James <> | 2013-03-17 12:16:37 +0000 |
| commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
| tree | 61213d67e7fa87b20356b23798558e2c4212c42f /tools/e2fsprogs/patches/.svn/text-base | |
| download | trunk-36060-master.tar.gz trunk-36060-master.tar.bz2 trunk-36060-master.zip | |
Diffstat (limited to 'tools/e2fsprogs/patches/.svn/text-base')
4 files changed, 59 insertions, 0 deletions
diff --git a/tools/e2fsprogs/patches/.svn/text-base/001-exit_0_on_corrected_errors.patch.svn-base b/tools/e2fsprogs/patches/.svn/text-base/001-exit_0_on_corrected_errors.patch.svn-base new file mode 100644 index 0000000..67a30f6 --- /dev/null +++ b/tools/e2fsprogs/patches/.svn/text-base/001-exit_0_on_corrected_errors.patch.svn-base @@ -0,0 +1,11 @@ +--- a/e2fsck/e2fsck.h ++++ b/e2fsck/e2fsck.h +@@ -73,7 +73,7 @@ + * Exit codes used by fsck-type programs + */ + #define FSCK_OK 0 /* No errors */ +-#define FSCK_NONDESTRUCT 1 /* File system errors corrected */ ++#define FSCK_NONDESTRUCT 0 /* File system errors corrected */ + #define FSCK_REBOOT 2 /* System should be rebooted */ + #define FSCK_UNCORRECTED 4 /* File system errors left uncorrected */ + #define FSCK_ERROR 8 /* Operational error */ diff --git a/tools/e2fsprogs/patches/.svn/text-base/002-dont-build-e4defrag.patch.svn-base b/tools/e2fsprogs/patches/.svn/text-base/002-dont-build-e4defrag.patch.svn-base new file mode 100644 index 0000000..9f6e7b1 --- /dev/null +++ b/tools/e2fsprogs/patches/.svn/text-base/002-dont-build-e4defrag.patch.svn-base @@ -0,0 +1,11 @@ +--- a/misc/Makefile.in ++++ b/misc/Makefile.in +@@ -11,7 +11,7 @@ INSTALL = @INSTALL@ + + @MCONFIG@ + +-@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= e4defrag ++@DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= + @DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8 + + @IMAGER_CMT@E2IMAGE_PROG= e2image diff --git a/tools/e2fsprogs/patches/.svn/text-base/003-openbsd-compat.patch.svn-base b/tools/e2fsprogs/patches/.svn/text-base/003-openbsd-compat.patch.svn-base new file mode 100644 index 0000000..1f7cdca --- /dev/null +++ b/tools/e2fsprogs/patches/.svn/text-base/003-openbsd-compat.patch.svn-base @@ -0,0 +1,24 @@ +diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/getsize.c +--- e2fsprogs-1.42.7.orig/lib/blkid/getsize.c Fri Nov 30 03:40:18 2012 ++++ e2fsprogs-1.42.7/lib/blkid/getsize.c Thu Mar 7 14:21:59 2013 +@@ -26,6 +26,9 @@ + #include <fcntl.h> + #ifdef HAVE_SYS_IOCTL_H + #include <sys/ioctl.h> ++#ifdef __OpenBSD__ ++#include <sys/dkio.h> ++#endif + #endif + #ifdef HAVE_LINUX_FD_H + #include <linux/fd.h> +diff -Nur e2fsprogs-1.42.7.orig/lib/quota/mkquota.c e2fsprogs-1.42.7/lib/quota/mkquota.c +--- e2fsprogs-1.42.7.orig/lib/quota/mkquota.c Wed Jan 2 01:47:20 2013 ++++ e2fsprogs-1.42.7/lib/quota/mkquota.c Thu Mar 7 14:21:59 2013 +@@ -8,6 +8,7 @@ + #include <sys/stat.h> + #include <unistd.h> + #include <errno.h> ++#include <stdint.h> + #include <string.h> + #include <fcntl.h> + diff --git a/tools/e2fsprogs/patches/.svn/text-base/004-freebsd-compat.patch.svn-base b/tools/e2fsprogs/patches/.svn/text-base/004-freebsd-compat.patch.svn-base new file mode 100644 index 0000000..5eff499 --- /dev/null +++ b/tools/e2fsprogs/patches/.svn/text-base/004-freebsd-compat.patch.svn-base @@ -0,0 +1,13 @@ +diff -Nur e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c e2fsprogs-1.42.7/lib/ext2fs/tdb.c +--- e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c 2012-07-06 15:37:27.000000000 +0200 ++++ e2fsprogs-1.42.7/lib/ext2fs/tdb.c 2013-03-07 14:54:59.000000000 +0100 +@@ -56,7 +56,9 @@ + #include <utime.h> + #endif + #include <sys/stat.h> ++#ifndef __FreeBSD__ + #include <sys/file.h> ++#endif + #include <fcntl.h> + + #ifdef HAVE_SYS_MMAN_H |