summaryrefslogtreecommitdiff
path: root/filesystems/progsreiserfs/files
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/progsreiserfs/files')
-rw-r--r--filesystems/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in37
-rw-r--r--filesystems/progsreiserfs/files/patch-libdal_file.c26
-rw-r--r--filesystems/progsreiserfs/files/patch-libreiserfs_journal.c11
3 files changed, 74 insertions, 0 deletions
diff --git a/filesystems/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in b/filesystems/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
new file mode 100644
index 000000000000..b482ec8293dd
--- /dev/null
+++ b/filesystems/progsreiserfs/files/extrapatch-progsreiserfs_libmisc_Makefile.in
@@ -0,0 +1,37 @@
+--- progsreiserfs/libmisc/Makefile.in.orig 2002-12-12 12:38:22 UTC
++++ progsreiserfs/libmisc/Makefile.in
+@@ -110,7 +110,7 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
+
+ noinst_LTLIBRARIES = libmisc.la
+-libmisc_la_SOURCES = tools.c getopt.c getopt1.c
++libmisc_la_SOURCES = tools.c getopt.c
+
+ INCLUDES = -I$(top_srcdir)/include @INTLINCS@
+ subdir = progsreiserfs/libmisc
+@@ -121,7 +121,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+ libmisc_la_LDFLAGS =
+ libmisc_la_LIBADD =
+-am_libmisc_la_OBJECTS = tools.lo getopt.lo getopt1.lo
++am_libmisc_la_OBJECTS = tools.lo getopt.lo
+ libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS)
+
+ DEFS = @DEFS@
+@@ -130,7 +130,7 @@ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Plo $(DEPDIR)/getopt1.Plo \
++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Plo \
+ @AMDEP_TRUE@ $(DEPDIR)/tools.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -177,7 +177,6 @@ distclean-compile:
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tools.Plo@am__quote@
+
+ distclean-depend:
diff --git a/filesystems/progsreiserfs/files/patch-libdal_file.c b/filesystems/progsreiserfs/files/patch-libdal_file.c
new file mode 100644
index 000000000000..76a7926d532f
--- /dev/null
+++ b/filesystems/progsreiserfs/files/patch-libdal_file.c
@@ -0,0 +1,26 @@
+--- libdal/file.c.orig 2002-12-12 12:32:34 UTC
++++ libdal/file.c
+@@ -14,6 +14,7 @@
+
+ #if defined(__freebsd__)
+ # define O_LARGEFILE 0
++# include <sys/disk.h>
+ #endif
+
+ #ifndef DJGPP
+@@ -154,6 +155,15 @@ static count_t file_len(dal_t *dal) {
+
+ #endif
+
++#ifdef DIOCGMEDIASIZE
++
++ if (ioctl(*((int *)dal->entity), DIOCGMEDIASIZE, &size) >= 0)
++ return (count_t)(size / dal->blocksize);
++
++ file_save_error(dal);
++
++#endif
++
+ if ((max_off = lseek(*((int *)dal->entity), 0, SEEK_END)) == (off_t)-1) {
+ file_save_error(dal);
+ return 0;
diff --git a/filesystems/progsreiserfs/files/patch-libreiserfs_journal.c b/filesystems/progsreiserfs/files/patch-libreiserfs_journal.c
new file mode 100644
index 000000000000..da24c4593308
--- /dev/null
+++ b/filesystems/progsreiserfs/files/patch-libreiserfs_journal.c
@@ -0,0 +1,11 @@
+--- libreiserfs/journal.c.orig 2002-12-12 12:32:35 UTC
++++ libreiserfs/journal.c
+@@ -482,7 +482,7 @@ static int callback_journal_replay(reise
+ blk_t reiserfs_journal_boundary_transactions(reiserfs_journal_t *journal,
+ reiserfs_journal_trans_t *oldest, reiserfs_journal_trans_t *newest)
+ {
+- reiserfs_gauge_t *gauge;
++ reiserfs_gauge_t *gauge = NULL;
+ struct reiserfs_replay_desc desc;
+
+ desc.oldest_id = 0xffffffff; desc.newest_id = 0x0;