Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/filesystems/fuse-ext2 fuse-ext2: Update to 0.0.10
details: https://anonhg.NetBSD.org/pkgsrc/rev/0ad9432cb76e
branches: trunk
changeset: 436889:0ad9432cb76e
user: nia <nia%pkgsrc.org@localhost>
date: Tue Aug 11 13:38:14 2020 +0000
description:
fuse-ext2: Update to 0.0.10
this is a settlement release for fuse-ext2.
limitations:
disabled multithread support by default for fuse.
write support is disabled by default, use '-o rw+' option for to enable writing. and use at your own risk.
Mon Mar 30 19:17:44 EEST 2015
- version 0.0.9
- fix write tests for pjdfstest
- fix ext2fs_file_*, need to open/release in every file operation
Mon Mar 28 10:21:43 EEST 2015
- version 0.0.8 - lazarus, raised from dead
- use e2fsprogs from system (mac, linux)
- fix build routines for new systems (mac, linux)
- switch to osxfuse (mac)
diffstat:
filesystems/fuse-ext2/DESCR | 7 +-
filesystems/fuse-ext2/Makefile | 18 +-
filesystems/fuse-ext2/PLIST | 5 +-
filesystems/fuse-ext2/distinfo | 10 +-
filesystems/fuse-ext2/patches/patch-aa | 47 ----------
filesystems/fuse-ext2/patches/patch-ab | 37 -------
filesystems/fuse-ext2/patches/patch-ac | 19 ----
filesystems/fuse-ext2/patches/patch-af | 20 ----
filesystems/fuse-ext2/patches/patch-ag | 20 ----
filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_bitops.h | 13 --
filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h | 13 --
filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_icount.c | 12 --
filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_test__io.c | 12 --
13 files changed, 21 insertions(+), 212 deletions(-)
diffs (truncated from 309 to 300 lines):
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/DESCR
--- a/filesystems/fuse-ext2/DESCR Tue Aug 11 12:45:54 2020 +0000
+++ b/filesystems/fuse-ext2/DESCR Tue Aug 11 13:38:14 2020 +0000
@@ -1,2 +1,5 @@
-Fuse-ext2 is a multi OS FUSE module to mount ext2 and ext3 file system devices
-and/or images with read write support.
+fuse-ext2 is a multi OS FUSE module to mount ext2, ext3, and ext4
+file system devices and/or images with read write support.
+
+Even though write support is available, please do not mount your
+filesystems with write support unless you have nothing to lose.
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/Makefile
--- a/filesystems/fuse-ext2/Makefile Tue Aug 11 12:45:54 2020 +0000
+++ b/filesystems/fuse-ext2/Makefile Tue Aug 11 13:38:14 2020 +0000
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2020/05/23 10:33:16 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2020/08/11 13:38:14 nia Exp $
-DISTNAME= fuse-ext2-0.0.7
-PKGREVISION= 2
+DISTNAME= fuse-ext2-0.0.10
CATEGORIES= filesystems
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=alperakcan/}
+GITHUB_PROJECT= fuse-ext2
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://alperakcan.net/projects/fuse-ext2/
-COMMENT= FUSE file-system to mount ext2 and ext3 file system
+HOMEPAGE= https://github.com/alperakcan/fuse-ext2
+COMMENT= FUSE module to mount ext2, ext3, and ext4 filesystems
LICENSE= gnu-gpl-v2
-ONLY_FOR_PLATFORM= Linux-*-* NetBSD-*-*
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= autoheader automake autoreconf gmake pkg-config
@@ -20,7 +19,8 @@
CHECK_PORTABILITY_SKIP= tools/macosx/fuse-ext2.fs/fuse-ext2.util
pre-configure:
- cd ${WRKSRC} && autoreconf --verbose --install --force
+ cd ${WRKSRC} && autoreconf -fi
.include "../../mk/fuse.buildlink3.mk"
+.include "../../sysutils/e2fsprogs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/PLIST
--- a/filesystems/fuse-ext2/PLIST Tue Aug 11 12:45:54 2020 +0000
+++ b/filesystems/fuse-ext2/PLIST Tue Aug 11 13:38:14 2020 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/08/11 13:38:14 nia Exp $
bin/fuse-ext2
-bin/fuse-ext2.e2label
-bin/fuse-ext2.mke2fs
bin/fuse-ext2.probe
lib/pkgconfig/fuse-ext2.pc
man/man1/fuse-ext2.1
+@pkgdir lib/umview/modules
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/distinfo
--- a/filesystems/fuse-ext2/distinfo Tue Aug 11 12:45:54 2020 +0000
+++ b/filesystems/fuse-ext2/distinfo Tue Aug 11 13:38:14 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2019/04/10 21:37:51 maya Exp $
+$NetBSD: distinfo,v 1.7 2020/08/11 13:38:14 nia Exp $
-SHA1 (fuse-ext2-0.0.7.tar.gz) = cdfef525838d2de07a4da6d60b65efce5a1cffa0
-RMD160 (fuse-ext2-0.0.7.tar.gz) = 29cb85f033b65fba4d82d14de907dd4458173c2b
-SHA512 (fuse-ext2-0.0.7.tar.gz) = ac3e9a5bd5587cd382d5119bc7e5716a057be290045d67c03ce8308da36647382065e645124d8e5862304e8ecb61a54c4474fcebb8524233c76e0f27d979846d
-Size (fuse-ext2-0.0.7.tar.gz) = 570156 bytes
+SHA1 (fuse-ext2-0.0.10.tar.gz) = cb92048bf3aac01b55af8c1362ab903b19669f3a
+RMD160 (fuse-ext2-0.0.10.tar.gz) = 6303f369301eb58c78bb495ee1b1bee3f69ccf4a
+SHA512 (fuse-ext2-0.0.10.tar.gz) = b884c0f92b706ae3f03dd75f489990e7cea31fd68526ade48ab5a11e1c9f78ec02a4dbb82450ce2aca12742a799c334a3ab8f2443a96ad003a76f0a86567fa24
+Size (fuse-ext2-0.0.10.tar.gz) = 122746 bytes
SHA1 (patch-aa) = d9f8189f4bbed569cc2b4bb8f160dcf231cc76ff
SHA1 (patch-ab) = 830bc968c55b13125700a6fbeff9808610d065f0
SHA1 (patch-ac) = 253561f1e6a67b5d66d7409af3bf26477ad57b2c
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-aa
--- a/filesystems/fuse-ext2/patches/patch-aa Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2019/04/10 21:37:51 maya Exp $
-
-Make automake-1.12 happy.
-Add NetBSD support.
-
---- configure.ac.orig 2009-12-24 12:38:06.000000000 +0000
-+++ configure.ac
-@@ -11,10 +11,13 @@ AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
- AC_PATH_PROG(CHMOD, chmod, :)
-+AM_PROG_AR
-+AM_PROG_CC_C_O
-
- case $target_os in
- *linux*) arch=linux;;
- *darwin*) arch=darwin;;
-+ *netbsd*) arch=netbsd;;
- *) arch=unknown;;
- esac
-
-@@ -96,6 +99,8 @@ dnl Check to see if ssize_t was decleare
- AC_CHECK_TYPE(ssize_t,[AC_DEFINE(HAVE_TYPE_SSIZE_T, 1, [Define to 1 if you have the `ssize_t' prototype.])],,
- [#include <sys/types.h>])
-
-+AC_CHECK_DECLS([fuse_version], [], [], [[#include <fuse.h>]])
-+
- # Checks for library functions.
- AC_FUNC_VPRINTF
- AC_FUNC_CHOWN
-@@ -137,7 +142,7 @@ AC_CHECK_FUNCS([ \
- ])
-
- # Checks for libraries
--AC_CHECK_LIB([fuse], [fuse_main], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])])
-+AC_CHECK_LIB([fuse], [fuse_exit], [FUSE_LIBS="-lfuse"], [AC_MSG_ERROR([Can't find libfuse, please install it])])
-
- AC_MSG_CHECKING([if FUSE on this system is too new for us])
- AC_EGREP_CPP([fuse_version_yes], [
-@@ -193,6 +198,7 @@ AC_SUBST(pkgconfigdir)
-
- AM_CONDITIONAL(LINUX, test "$arch" = linux)
- AM_CONDITIONAL(DARWIN, test "$arch" = darwin)
-+AM_CONDITIONAL(NETBSD, test "$arch" = netbsd)
-
- AC_CONFIG_FILES([
- fuse-ext2.pc
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-ab
--- a/filesystems/fuse-ext2/patches/patch-ab Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
-
-Add NetBSD support to autotools files.
-
---- fuse-ext2/Makefile.am.orig 2009-11-09 16:31:37.000000000 +0000
-+++ fuse-ext2/Makefile.am 2011-07-09 14:17:19.000000000 +0100
-@@ -39,6 +39,17 @@
- -lfuse \
- -lext2fs
- endif
-+if NETBSD
-+fuse_ext2_probe_CFLAGS = \
-+ -Wall \
-+ -DHAVE_CONFIG_H \
-+ -I$(top_srcdir)/e2fsprogs-1.41.9
-+
-+fuse_ext2_probe_LDADD = \
-+ ../e2fsprogs-1.41.9/ext2fs/libext2fs.a \
-+ ../e2fsprogs-1.41.9/et/libcom_err.a \
-+ -lrefuse
-+endif
-
- fuse_ext2_SOURCES = \
- fuse-ext2.h \
-@@ -183,6 +194,12 @@
- -lfuse \
- -lext2fs
- endif
-+if NETBSD
-+fuse_ext2_LDADD = \
-+ ../e2fsprogs-1.41.9/ext2fs/libext2fs.a \
-+ ../e2fsprogs-1.41.9/et/libcom_err.a \
-+ -lrefuse
-+endif
-
- install-data-hook:
- cd "$(DESTDIR)/$(moddir)" && rm -f $(mod_LTLIBRARIES)
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-ac
--- a/filesystems/fuse-ext2/patches/patch-ac Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
-
-Fix build under NetBSD, based on "pkgsrc/sysutils/e2fsprogs/patches/patch-af".
-
---- e2fsprogs-1.41.9/ext2fs/ismounted.c.orig 2010-05-18 03:04:39.000000000 +0000
-+++ e2fsprogs-1.41.9/ext2fs/ismounted.c
-@@ -198,7 +198,11 @@ static errcode_t check_mntent(const char
- static errcode_t check_getmntinfo(const char *file, int *mount_flags,
- char *mtpt, int mtlen)
- {
-- struct statfs *mp;
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
-+ struct statvfs *mp;
-+#else
-+ struct statfs *mp;
-+#endif
- int len, n;
- const char *s1;
- char *s2;
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-af
--- a/filesystems/fuse-ext2/patches/patch-af Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.2 2019/04/10 21:37:51 maya Exp $
-
-Fix build under NetBSD.
-
---- fuse-ext2/fuse-ext2.c.orig 2009-11-09 15:28:02.000000000 +0000
-+++ fuse-ext2/fuse-ext2.c
-@@ -78,6 +78,13 @@ static int strappend (char **dest, const
- return 0;
- }
-
-+#if !HAVE_DECL_FUSE_VERSION
-+static int fuse_version (void)
-+{
-+ return FUSE_VERSION;
-+}
-+#endif
-+
- static void usage (void)
- {
- printf(usage_msg, PACKAGE, VERSION, fuse_version(), PACKAGE, HOME);
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-ag
--- a/filesystems/fuse-ext2/patches/patch-ag Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2019/04/10 21:37:51 maya Exp $
-
-Fix build under NetBSD.
-
---- fuse-ext2/fuse-ext2.probe.c.orig 2009-11-03 13:50:57.000000000 +0000
-+++ fuse-ext2/fuse-ext2.probe.c
-@@ -35,6 +35,13 @@ static const char *usage_msg =
- "%s\n"
- "\n";
-
-+#if !HAVE_DECL_FUSE_VERSION
-+static int fuse_version (void)
-+{
-+ return FUSE_VERSION;
-+}
-+#endif
-+
- static void usage (void)
- {
- printf(usage_msg, PACKAGE, VERSION, fuse_version(), PACKAGE, HOME);
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_bitops.h
--- a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_bitops.h Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_bitops.h,v 1.1 2012/12/20 21:54:24 joerg Exp $
-
---- e2fsprogs-1.41.9/ext2fs/bitops.h.orig 2009-10-19 13:17:52.000000000 +0000
-+++ e2fsprogs-1.41.9/ext2fs/bitops.h
-@@ -139,7 +139,7 @@ extern __u32 ext2fs_get_generic_bitmap_e
- #define _INLINE_ extern
- #else
- #ifdef __GNUC__
--#define _INLINE_ extern __inline__
-+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
- #else /* For Watcom C */
- #define _INLINE_ extern inline
- #endif
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h
--- a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_ext2fs.h,v 1.1 2012/12/20 21:54:24 joerg Exp $
-
---- e2fsprogs-1.41.9/ext2fs/ext2fs.h.orig 2012-12-20 13:55:15.000000000 +0000
-+++ e2fsprogs-1.41.9/ext2fs/ext2fs.h
-@@ -1179,7 +1179,7 @@ extern unsigned int ext2fs_div_ceil(unsi
- #define _INLINE_ extern
- #else
- #ifdef __GNUC__
--#define _INLINE_ extern __inline__
-+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
- #else /* For Watcom C */
- #define _INLINE_ extern inline
- #endif
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_icount.c
--- a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_icount.c Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_icount.c,v 1.1 2012/12/20 21:54:24 joerg Exp $
-
---- e2fsprogs-1.41.9/ext2fs/icount.c.orig 2012-12-20 13:30:46.000000000 +0000
-+++ e2fsprogs-1.41.9/ext2fs/icount.c
-@@ -8,6 +8,7 @@
- * License.
- * %End-Header%
- */
-+#include "config.h"
-
- #if HAVE_UNISTD_H
- #include <unistd.h>
diff -r f2076e3563f6 -r 0ad9432cb76e filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_test__io.c
--- a/filesystems/fuse-ext2/patches/patch-e2fsprogs-1.41.9_ext2fs_test__io.c Tue Aug 11 12:45:54 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-e2fsprogs-1.41.9_ext2fs_test__io.c,v 1.1 2012/12/20 21:54:24 joerg Exp $
-
---- e2fsprogs-1.41.9/ext2fs/test_io.c.orig 2012-12-20 13:30:54.000000000 +0000
Home |
Main Index |
Thread Index |
Old Index