summaryrefslogtreecommitdiff
path: root/sysutils/e2fsprogs/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/e2fsprogs/files')
-rw-r--r--sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c6
-rw-r--r--sysutils/e2fsprogs/files/patch-configure4
-rw-r--r--sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h2
-rw-r--r--sysutils/e2fsprogs/files/patch-misc_Makefile.in25
4 files changed, 28 insertions, 9 deletions
diff --git a/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c b/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
index fa10795ad942..2184e08bfde9 100644
--- a/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
+++ b/sysutils/e2fsprogs/files/patch-SIGINFO-e2fck_unix.c
@@ -1,6 +1,6 @@
--- e2fsprogs-1.35/e2fsck/unix.c~ Sun Dec 7 18:11:38 2003
+++ e2fsprogs-1.35/e2fsck/unix.c Tue Feb 24 22:13:52 2004
-@@ -416,6 +416,24 @@
+@@ -461,6 +461,24 @@
return 0;
}
@@ -25,7 +25,7 @@
#define PATH_SET "PATH=/sbin"
static void reserve_stdio_fds(void)
-@@ -448,6 +466,17 @@
+@@ -493,6 +511,17 @@
ctx->progress_fd = 0;
}
@@ -43,7 +43,7 @@
static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
-@@ -740,6 +769,8 @@
+@@ -825,6 +854,8 @@
sigaction(SIGUSR1, &sa, 0);
sa.sa_handler = signal_progress_off;
sigaction(SIGUSR2, &sa, 0);
diff --git a/sysutils/e2fsprogs/files/patch-configure b/sysutils/e2fsprogs/files/patch-configure
index ba95f5599dce..7e15828ae621 100644
--- a/sysutils/e2fsprogs/files/patch-configure
+++ b/sysutils/e2fsprogs/files/patch-configure
@@ -1,6 +1,6 @@
--- a/configure.orig Thu Jun 8 15:30:16 2006
+++ b/configure Thu Jun 8 15:30:34 2006
-@@ -8095,7 +8095,7 @@
+@@ -9044,7 +9044,7 @@
@@ -9,7 +9,7 @@
stdlib.h string.h unistd.h sys/param.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -16641,7 +16641,7 @@
+@@ -15105,7 +15105,7 @@
fi
{ echo "$as_me:$LINENO: checking for unified diff option" >&5
echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; }
diff --git a/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h b/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
index 547befb3ec5a..4c6667079709 100644
--- a/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
+++ b/sysutils/e2fsprogs/files/patch-lib_ext2fs_ext2_fs.h
@@ -1,6 +1,6 @@
--- a/lib/ext2fs/ext2_fs.h.orig Sat Jun 30 16:36:37 2007
+++ b/lib/ext2fs/ext2_fs.h Sat Jun 30 16:36:43 2007
-@@ -414,7 +414,7 @@
+@@ -418,7 +418,7 @@
#define i_size_high i_dir_acl
diff --git a/sysutils/e2fsprogs/files/patch-misc_Makefile.in b/sysutils/e2fsprogs/files/patch-misc_Makefile.in
index e27756f2affa..b1c8d6c41d8c 100644
--- a/sysutils/e2fsprogs/files/patch-misc_Makefile.in
+++ b/sysutils/e2fsprogs/files/patch-misc_Makefile.in
@@ -1,6 +1,25 @@
---- a/misc/Makefile.in.orig Sat Jun 30 16:57:47 2007
-+++ b/misc/Makefile.in Sat Jun 30 16:58:17 2007
-@@ -295,11 +295,9 @@
+--- a/misc/Makefile.in.orig Tue Jan 1 04:35:42 2008
++++ b/misc/Makefile.in Sun Jan 13 10:46:31 2008
+@@ -19,14 +19,14 @@
+
+ SPROGS= mke2fs badblocks tune2fs dumpe2fs blkid logsave \
+ $(E2IMAGE_PROG) @FSCK_PROG@
+-USPROGS= mklost+found filefrag $(UUIDD_PROG)
++USPROGS= mklost+found
+ SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
+ e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
+- logsave.8 filefrag.8 $(UUIDD_MAN) @FSCK_MAN@
++ logsave.8 @FSCK_MAN@
+ FMANPAGES= mke2fs.conf.5
+
+-UPROGS= chattr lsattr uuidgen
+-UMANPAGES= chattr.1 lsattr.1 uuidgen.1
++UPROGS= chattr lsattr
++UMANPAGES= chattr.1 lsattr.1
+
+ LPROGS= @E2INITRD_PROG@
+
+@@ -311,11 +310,9 @@
echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done