mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-18 17:35:59 +01:00
e2fsprogs, bump to version 1.47.3 (#13673)
test case fails the same as with version 1.45.6
This commit is contained in:
Schrijvers Luc
GitHub
@@ -7,7 +7,7 @@ REVISION="1"
|
||||
SOURCE_URI="https://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$portVersion.tar.gz
|
||||
https://sourceforge.mirrorservice.org/e/e2/e2fsprogs/e2fsprogs/v$portVersion/e2fsprogs-$portVersion.tar.gz
|
||||
https://fossies.org/linux/misc/e2fsprogs-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="5f64ac50a2b60b8e67c5b382bb137dec39344017103caffc3a61554424f2d693"
|
||||
CHECKSUM_SHA256="2f5164e64dd7d91eadd1e0e8a77d92c06dd7837bb19f1d9189ce1939b363d2b4"
|
||||
PATCHES="e2fsprogs-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -127,6 +127,8 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
# building test case fails:
|
||||
# undefined reference to `ext2fs_write_bb_FILE'
|
||||
LIBRARY_PATH="$sourceDir/lib${LIBRARY_PATH:+:$LIBRARY_PATH}" \
|
||||
make check
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
From 979be15e98d2eb0c9a3b0ccf24e52ae7c71a55ac Mon Sep 17 00:00:00 2001
|
||||
From 969c478ac340fb6384e80c212073b764b42b2886 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 25 Feb 2018 14:25:11 +0100
|
||||
Subject: Ugly hacks to get things building on Haiku.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5e837c9..0d49ae5 100644
|
||||
index bdd5f1f..e808dfe 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -101,7 +101,8 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
|
||||
@@ -106,7 +106,8 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
|
||||
dnl
|
||||
AC_PROG_CC
|
||||
if test "$GCC" = yes; then
|
||||
@@ -18,7 +18,7 @@ index 5e837c9..0d49ae5 100644
|
||||
AC_SUBST(RDYNAMIC)
|
||||
fi
|
||||
AC_PROG_CPP
|
||||
@@ -1175,7 +1176,7 @@ dnl Check to see if -lsocket is required (solaris) to make something
|
||||
@@ -1294,7 +1295,7 @@ dnl Check to see if -lsocket is required (solaris) to make something
|
||||
dnl that uses socket() to compile; this is needed for the UUID library
|
||||
dnl
|
||||
SOCKET_LIB=''
|
||||
@@ -28,20 +28,20 @@ index 5e837c9..0d49ae5 100644
|
||||
dnl
|
||||
dnl See if libmagic exists
|
||||
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
|
||||
index 8fe05e0..14d6196 100644
|
||||
index fbb7b15..015eb8f 100644
|
||||
--- a/e2fsck/Makefile.in
|
||||
+++ b/e2fsck/Makefile.in
|
||||
@@ -16,7 +16,7 @@ MANPAGES= e2fsck.8
|
||||
@@ -17,7 +17,7 @@ MANPAGES= e2fsck.8
|
||||
FMANPAGES= e2fsck.conf.5
|
||||
|
||||
LIBS= $(LIBSUPPORT) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) \
|
||||
- $(LIBINTL) $(LIBE2P) $(LIBMAGIC) $(SYSLIBS)
|
||||
+ $(LIBINTL) $(LIBE2P) $(LIBMAGIC) $(SYSLIBS) -lbsd
|
||||
+ $(LIBINTL) $(LIBE2P) $(LIBMAGIC) $(SYSLIBS) -lbsd
|
||||
DEPLIBS= $(DEPLIBSUPPORT) $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) \
|
||||
$(DEPLIBUUID) $(DEPLIBE2P)
|
||||
|
||||
diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
|
||||
index cd5cba2..6e1a7b9 100644
|
||||
index ae1273d..691eaaa 100644
|
||||
--- a/e2fsck/e2fsck.h
|
||||
+++ b/e2fsck/e2fsck.h
|
||||
@@ -19,9 +19,7 @@
|
||||
@@ -55,12 +55,12 @@ index cd5cba2..6e1a7b9 100644
|
||||
#include <setjmp.h>
|
||||
#endif
|
||||
diff --git a/misc/create_inode.c b/misc/create_inode.c
|
||||
index 05aa636..0d0d27c 100644
|
||||
index 624efc0..85d73a8 100644
|
||||
--- a/misc/create_inode.c
|
||||
+++ b/misc/create_inode.c
|
||||
@@ -38,6 +38,11 @@
|
||||
#include "create_inode.h"
|
||||
#include "support/nls-enable.h"
|
||||
@@ -45,6 +45,11 @@
|
||||
|
||||
#include "create_inode_libarchive.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define major(x) 0
|
||||
@@ -71,43 +71,62 @@ index 05aa636..0d0d27c 100644
|
||||
#define COPY_FILE_BUFLEN 65536
|
||||
|
||||
--
|
||||
2.16.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From a3dc9722a2ebbd0320e266c8de4d4b0a8404ab19 Mon Sep 17 00:00:00 2001
|
||||
From 29cb70f0b1318361d8e079488b14103f2d7c84b3 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 25 Feb 2018 15:38:54 +0100
|
||||
Subject: Extra patches.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e808dfe..a30f0f0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1533,8 +1533,8 @@ esac
|
||||
dnl
|
||||
dnl Check the available mount options
|
||||
dnl
|
||||
-AX_CHECK_MOUNT_OPT(nosuid)
|
||||
-AX_CHECK_MOUNT_OPT(nodev)
|
||||
+dnl AX_CHECK_MOUNT_OPT(nosuid)
|
||||
+dnl AX_CHECK_MOUNT_OPT(nodev)
|
||||
dnl Enable LTO for all packages
|
||||
dnl
|
||||
AC_ARG_ENABLE([lto],
|
||||
diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
|
||||
index e2b8051..46c9225 100644
|
||||
index 6a21963..d72e64a 100644
|
||||
--- a/lib/blkid/devname.c
|
||||
+++ b/lib/blkid/devname.c
|
||||
@@ -43,6 +43,8 @@
|
||||
@@ -43,6 +43,10 @@
|
||||
|
||||
#include "blkidP.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define makedev(maj,min) (min)
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* Find a dev struct in the cache by device name, if available.
|
||||
*
|
||||
diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
|
||||
index 34ceb3c..4c9f34a 100644
|
||||
index b1cadc9..a5e7541 100644
|
||||
--- a/lib/blkid/devno.c
|
||||
+++ b/lib/blkid/devno.c
|
||||
@@ -37,6 +37,8 @@
|
||||
@@ -37,6 +37,10 @@
|
||||
|
||||
#include "blkidP.h"
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define makedev(maj,min) (min)
|
||||
+#endif
|
||||
+
|
||||
char *blkid_strndup(const char *s, int length)
|
||||
{
|
||||
char *ret;
|
||||
#if defined(__GNUC__) && __GNUC__ >= 8
|
||||
/* gcc incorrectly thinks the destination string is not being null-terminated */
|
||||
#pragma GCC diagnostic push
|
||||
diff --git a/lib/ext2fs/bmap64.h b/lib/ext2fs/bmap64.h
|
||||
index d8c7a3c..8ab1174 100644
|
||||
index de33454..e8ef9de 100644
|
||||
--- a/lib/ext2fs/bmap64.h
|
||||
+++ b/lib/ext2fs/bmap64.h
|
||||
@@ -9,6 +9,8 @@
|
||||
@@ -119,37 +138,18 @@ index d8c7a3c..8ab1174 100644
|
||||
struct ext2_bmap_statistics {
|
||||
int type;
|
||||
struct timeval created;
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ca24553..8bd3a14 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1321,8 +1321,8 @@ esac
|
||||
dnl
|
||||
dnl Check the available mount options
|
||||
dnl
|
||||
-AX_CHECK_MOUNT_OPT(nosuid)
|
||||
-AX_CHECK_MOUNT_OPT(nodev)
|
||||
+dnl AX_CHECK_MOUNT_OPT(nosuid)
|
||||
+dnl AX_CHECK_MOUNT_OPT(nodev)
|
||||
dnl Enable LTO for all packages
|
||||
dnl
|
||||
AC_ARG_ENABLE([lto],
|
||||
--
|
||||
2.16.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 56244924d08f0fa53f15e606231159a0d287222b Mon Sep 17 00:00:00 2001
|
||||
From 5e168fcec0337f578cb45cc3b8d6d34636b05596 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 7 Jan 2021 20:23:58 +0100
|
||||
Subject: [PATCH] Haiku: type loff_t
|
||||
Subject: Haiku: type loff_t
|
||||
|
||||
---
|
||||
lib/ext2fs/imager.c | 3 +++
|
||||
misc/e2fuzz.c | 4 ++++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c
|
||||
index b3ede9a..a1addee 100644
|
||||
index 16b0977..7ebd517 100644
|
||||
--- a/lib/ext2fs/imager.c
|
||||
+++ b/lib/ext2fs/imager.c
|
||||
@@ -37,6 +37,9 @@
|
||||
@@ -163,10 +163,10 @@ index b3ede9a..a1addee 100644
|
||||
/*
|
||||
* This function returns 1 if the specified block is all zeros
|
||||
diff --git a/misc/e2fuzz.c b/misc/e2fuzz.c
|
||||
index 7c0f776..97ffc4a 100644
|
||||
index 9f60bcf..1b1b697 100644
|
||||
--- a/misc/e2fuzz.c
|
||||
+++ b/misc/e2fuzz.c
|
||||
@@ -42,6 +42,10 @@ static ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset)
|
||||
@@ -42,6 +42,10 @@ static ssize_t my_pwrite(int fd, const void *buf, size_t count,
|
||||
}
|
||||
#endif /* !defined HAVE_PWRITE64 && !defined HAVE_PWRITE */
|
||||
|
||||
@@ -178,5 +178,5 @@ index 7c0f776..97ffc4a 100644
|
||||
{
|
||||
int r;
|
||||
--
|
||||
2.30.0
|
||||
2.52.0
|
||||
|
||||
Reference in New Issue
Block a user