]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
reiserfsprogs: Update to 3.6.27
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Oct 2018 09:53:18 +0000 (10:53 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Oct 2018 09:53:18 +0000 (10:53 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/core/125/filelists/reiserfsprogs [new symlink]
lfs/reiserfsprogs
src/patches/reiserfsprogs-3.6.27-loff_t.patch [new file with mode: 0644]

diff --git a/config/rootfiles/core/125/filelists/reiserfsprogs b/config/rootfiles/core/125/filelists/reiserfsprogs
new file mode 120000 (symlink)
index 0000000..008c3e8
--- /dev/null
@@ -0,0 +1 @@
+../../../common/reiserfsprogs
\ No newline at end of file
index 218796d1a9b80d956fa364559cd3fbfd8c27dbc3..eaa03d787a0314a7de5f2bf69e481f4603b6bc89 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.6.25
+VER        = 3.6.27
 
 THISAPP    = reiserfsprogs-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 027a598b055dccb8da3aea1378a19f3c
+$(DL_FILE)_MD5 = 90c139542725efc6da3a6b1709695395
 
 install : $(TARGET)
 
@@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiserfsprogs-3.6.27-loff_t.patch
+       cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
diff --git a/src/patches/reiserfsprogs-3.6.27-loff_t.patch b/src/patches/reiserfsprogs-3.6.27-loff_t.patch
new file mode 100644 (file)
index 0000000..9ab8519
--- /dev/null
@@ -0,0 +1,16 @@
+glibc-2.28 did hide loff_t indef system-specific macros:
+    https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=663e7d784977f6b15c0cab73f754f9f39c9c0c2c
+
+This caused build failure:
+    ../include/reiserfs_lib.h:300:55: error: unknown type name 'loff_t'; did you mean 'off_t'?
+
+Re-enable extensions to pull loff_t back.
+
+https://bugs.gentoo.org/663930
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET
+ AC_PROG_LIBTOOL
++dnl pull in loff_t from glibc
++AC_USE_SYSTEM_EXTENSIONS