help with updating a port - sysutils/e2fsprogs

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

help with updating a port - sysutils/e2fsprogs

Aisha Tammy-5
Hi,
  I've been trying to get e2fsprogs to latest 1.4.6 but am
running into a bunch of errors with loff_t not defined errors

Reason for updating, I'm try to build 389-ds-base (ldap server)
in OpenBSD which needs the newer version of e2fsprogs for
some functions.

Also seems like this package has no maintainer and hasn't been
updated in a while.

Thanks,
Aisha

gmake[2]: Entering directory '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64/lib/ext2fs'                                                             
cc -I. -I../../lib -I/usr/obj/ports/e2fsprogs-1.45.6/e2fsprogs-1.45.6/lib -D_EXT2_USE_C_VERSIONS_ -I/usr/local/include  -O2 -pipe  -DHAVE_CONFIG_H
 -c /usr/obj/ports/e2fsprogs-1.45.6/e2fsprogs-1.45.6/lib/ext2fs/imager.c -o imager.o                                                              
/usr/obj/ports/e2fsprogs-1.45.6/e2fsprogs-1.45.6/lib/ext2fs/imager.c:63:2: error: unknown type name 'loff_t'; did you mean 'off_t'?               
        loff_t          r;                                                                                                                        
        ^~~~~~                                                                                                                                    
        off_t                                                                                                                                     
/usr/include/sys/types.h:194:18: note: 'off_t' declared here                                                                                      
typedef __off_t         off_t;                                                                                                                    
                        ^                                                                                                                         
1 error generated.                                                                                                                                
gmake[2]: *** [Makefile:677: imager.o] Error 1                                                                                                    
gmake[2]: Leaving directory '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64/lib/ext2fs'                                                              
gmake[1]: *** [Makefile:445: all-libs-recursive] Error 1                                                                                          
gmake[1]: Leaving directory '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64'                                                                         
gmake: *** [Makefile:366: all] Error 2                                                                                                            
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2930 '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64/.build_done')                        
*** Error 2 in /usr/ports/sysutils/e2fsprogs (/usr/ports/infrastructure/mk/bsd.port.mk:2589 'fake': @lock=e2fsprogs-1.45.6p5;  export _LOCKS...)  


Reply | Threaded
Open this post in threaded view
|

Re: help with updating a port - sysutils/e2fsprogs

Aisha Tammy-5
On 1/20/21 12:34 PM, Aisha Tammy wrote:
> Hi,
>   I've been trying to get e2fsprogs to latest 1.4.6 but am
> running into a bunch of errors with loff_t not defined errors
>
Sorry I meant 1.45.6

> Reason for updating, I'm try to build 389-ds-base (ldap server)
> in OpenBSD which needs the newer version of e2fsprogs for
> some functions.
>
> Also seems like this package has no maintainer and hasn't been
> updated in a while.
>
> Thanks,
> Aisha
>
> gmake[2]: Entering directory '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64/lib/ext2fs'                                                             
> cc -I. -I../../lib -I/usr/obj/ports/e2fsprogs-1.45.6/e2fsprogs-1.45.6/lib -D_EXT2_USE_C_VERSIONS_ -I/usr/local/include  -O2 -pipe  -DHAVE_CONFIG_H
>  -c /usr/obj/ports/e2fsprogs-1.45.6/e2fsprogs-1.45.6/lib/ext2fs/imager.c -o imager.o                                                              
> /usr/obj/ports/e2fsprogs-1.45.6/e2fsprogs-1.45.6/lib/ext2fs/imager.c:63:2: error: unknown type name 'loff_t'; did you mean 'off_t'?               
>         loff_t          r;                                                                                                                        
>         ^~~~~~                                                                                                                                    
>         off_t                                                                                                                                     
> /usr/include/sys/types.h:194:18: note: 'off_t' declared here                                                                                      
> typedef __off_t         off_t;                                                                                                                    
>                         ^                                                                                                                         
> 1 error generated.                                                                                                                                
> gmake[2]: *** [Makefile:677: imager.o] Error 1                                                                                                    
> gmake[2]: Leaving directory '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64/lib/ext2fs'                                                              
> gmake[1]: *** [Makefile:445: all-libs-recursive] Error 1                                                                                          
> gmake[1]: Leaving directory '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64'                                                                         
> gmake: *** [Makefile:366: all] Error 2                                                                                                            
> *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2930 '/usr/obj/ports/e2fsprogs-1.45.6/build-amd64/.build_done')                        
> *** Error 2 in /usr/ports/sysutils/e2fsprogs (/usr/ports/infrastructure/mk/bsd.port.mk:2589 'fake': @lock=e2fsprogs-1.45.6p5;  export _LOCKS...)  
>
>

Reply | Threaded
Open this post in threaded view
|

Re: help with updating a port - sysutils/e2fsprogs

Stuart Henderson
In reply to this post by Aisha Tammy-5
On 2021/01/20 12:34, Aisha Tammy wrote:
>   I've been trying to get e2fsprogs to latest 1.4.6 but am
> running into a bunch of errors with loff_t not defined errors
>
> Reason for updating, I'm try to build 389-ds-base (ldap server)
> in OpenBSD which needs the newer version of e2fsprogs for
> some functions.

loff_t is for large file support which we don't have a special type for,
normal off_t supports large files. Something like the diff below would
do I think. Or the relevant bits could be disabled (configure flag for
e2image, e2fuzz by patching, it isn't installed by default anyway).

What does 389-ds-base want from e2fsprogs? I don't see any reference
in the tar.bz2.

> Also seems like this package has no maintainer and hasn't been
> updated in a while.

yep.


Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 12 Jul 2019 20:49:42 -0000 1.41
+++ Makefile 20 Jan 2021 18:10:34 -0000
@@ -2,14 +2,13 @@
 
 COMMENT= utilities to manipulate ext2 filesystems
 
-DISTNAME= e2fsprogs-1.42.12
-REVISION= 5
+DISTNAME= e2fsprogs-1.45.6
 CATEGORIES= sysutils devel
 SHARED_LIBS= blkid 0.0 \
  com_err 21.0 \
- e2p 3.1 \
- ext2fs 4.1 \
- ss 3.1 \
+ e2p 3.2 \
+ ext2fs 5.0 \
+ ss 3.2 \
  uuid 14.0
 
 HOMEPAGE= http://e2fsprogs.sourceforge.net/
@@ -21,20 +20,21 @@ WANTLIB += c iconv intl
 
 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
 LIB_DEPENDS= devel/gettext,-runtime
 
 SEPARATE_BUILD= Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= --disable-tls \
  --disable-uuidd \
- --enable-elf-shlibs
+ --disable-fuse2fs \
+ --enable-elf-shlibs \
+ --enable-verbose-makecmds
 CONFIGURE_ENV= CPPFLAGS="-D_EXT2_USE_C_VERSIONS_" \
  ac_cv_header_execinfo_h=no
 USE_GMAKE= Yes
 
-MAKE_FLAGS= V=1 \
- LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
+MAKE_FLAGS= LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
  LIBblkid_VERSION=${LIBblkid_VERSION} \
  LIBcom_err_VERSION=${LIBcom_err_VERSION} \
  LIBe2p_VERSION=${LIBe2p_VERSION} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 8 Nov 2014 11:28:04 -0000 1.7
+++ distinfo 20 Jan 2021 18:10:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (e2fsprogs-1.42.12.tar.gz) = 4XhG2RoO3Yn6WbBkvej45c7FhR419Ye8zLQBTb1jGGw=
-SIZE (e2fsprogs-1.42.12.tar.gz) = 6381695
+SHA256 (e2fsprogs-1.45.6.tar.gz) = X2SsUKK2C45nxbOCuxN97Dk0QBcQPK/8OmFVRCTy1pM=
+SIZE (e2fsprogs-1.45.6.tar.gz) = 7938544
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-doc_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 30 Apr 2014 11:40:04 -0000 1.4
+++ patches/patch-doc_Makefile_in 20 Jan 2021 18:10:34 -0000
@@ -1,6 +1,8 @@
 $OpenBSD: patch-doc_Makefile_in,v 1.4 2014/04/30 11:40:04 ajacoutot Exp $
---- doc/Makefile.in.orig Sun Dec 29 05:18:02 2013
-+++ doc/Makefile.in Wed Apr 30 10:36:56 2014
+
+Index: doc/Makefile.in
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
 @@ -17,9 +17,9 @@ INFO=@MAKEINFO@
  HTML=makeinfo --html --no-split
  PS2PDF=ps2pdf
@@ -11,14 +13,14 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 20
 -install-doc-libs: libext2fs.info libext2fs.dvi
 +install-doc-libs: libext2fs.info
  $(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
- $(E) " MKINSTALLDIRS $(infodir)"
- $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ $(E) " MKDIR_P $(infodir)"
+ $(Q) $(MKDIR_P) $(DESTDIR)$(infodir)
 @@ -27,8 +27,6 @@ install-doc-libs: libext2fs.info libext2fs.dvi
  echo " INSTALL_DATA $(infodir)/$$i" ; \
  $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
  done
 - $(E) " GZIP $(infodir)/libext2fs.info*"
-- -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+- -$(Q) gzip -9n $(DESTDIR)$(infodir)/libext2fs.info*
 
  uninstall-doc-libs:
  $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
Index: patches/patch-lib_Makefile_elf-lib
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib,v
retrieving revision 1.7
diff -u -p -r1.7 patch-lib_Makefile_elf-lib
--- patches/patch-lib_Makefile_elf-lib 21 Jun 2013 22:35:51 -0000 1.7
+++ patches/patch-lib_Makefile_elf-lib 20 Jan 2021 18:10:34 -0000
@@ -3,8 +3,9 @@ $OpenBSD: patch-lib_Makefile_elf-lib,v 1
 Don't generate library symlinks.
 Don't run ldconfig.
 
---- lib/Makefile.elf-lib.orig Wed Aug 15 21:43:55 2012
-+++ lib/Makefile.elf-lib Wed Jun 19 14:25:04 2013
+Index: lib/Makefile.elf-lib
+--- lib/Makefile.elf-lib.orig
++++ lib/Makefile.elf-lib
 @@ -32,7 +32,6 @@ $(ELF_LIB): $(OBJS)
  $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
  `echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB))
@@ -12,7 +13,7 @@ Don't run ldconfig.
 - $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
 
  installdirs-elf-lib::
- $(E) " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+ $(E) " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
 @@ -44,14 +43,6 @@ installdirs:: installdirs-elf-lib
  install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
  $(E) " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
Index: patches/patch-lib_blkid_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_blkid_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_blkid_Makefile_in
--- patches/patch-lib_blkid_Makefile_in 21 Jun 2013 22:35:51 -0000 1.2
+++ patches/patch-lib_blkid_Makefile_in 20 Jan 2021 18:10:34 -0000
@@ -1,4 +1,5 @@
 $OpenBSD: patch-lib_blkid_Makefile_in,v 1.2 2013/06/21 22:35:51 sthen Exp $
+
 --- lib/blkid/Makefile.in.orig Thu Jan  3 03:39:51 2013
 +++ lib/blkid/Makefile.in Wed Jun 19 14:25:06 2013
 @@ -31,8 +31,8 @@ HFILES_IN= blkid.h blkid_types.h
Index: patches/patch-lib_blkid_getsize_c
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_blkid_getsize_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_blkid_getsize_c
--- patches/patch-lib_blkid_getsize_c 8 Nov 2014 11:28:04 -0000 1.3
+++ patches/patch-lib_blkid_getsize_c 20 Jan 2021 18:10:34 -0000
@@ -1,7 +1,9 @@
 $OpenBSD: patch-lib_blkid_getsize_c,v 1.3 2014/11/08 11:28:04 sthen Exp $
---- lib/blkid/getsize.c.orig Sat Aug  2 21:26:22 2014
-+++ lib/blkid/getsize.c Sat Nov  8 10:41:17 2014
-@@ -25,6 +25,7 @@
+
+Index: lib/blkid/getsize.c
+--- lib/blkid/getsize.c.orig
++++ lib/blkid/getsize.c
+@@ -29,6 +29,7 @@
  #include <fcntl.h>
  #ifdef HAVE_SYS_IOCTL_H
  #include <sys/ioctl.h>
Index: patches/patch-lib_e2p_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_e2p_Makefile_in
--- patches/patch-lib_e2p_Makefile_in 21 Jun 2013 22:35:51 -0000 1.3
+++ patches/patch-lib_e2p_Makefile_in 20 Jan 2021 18:10:34 -0000
@@ -1,7 +1,9 @@
 $OpenBSD: patch-lib_e2p_Makefile_in,v 1.3 2013/06/21 22:35:51 sthen Exp $
---- lib/e2p/Makefile.in.orig Fri Sep 21 17:30:42 2012
-+++ lib/e2p/Makefile.in Wed Jun 19 14:25:06 2013
-@@ -34,8 +34,8 @@ HFILES= e2p.h
+
+Index: lib/e2p/Makefile.in
+--- lib/e2p/Makefile.in.orig
++++ lib/e2p/Makefile.in
+@@ -36,8 +36,8 @@ HFILES= e2p.h
  LIBRARY= libe2p
  LIBDIR= e2p
 
Index: patches/patch-lib_ext2fs_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-lib_ext2fs_Makefile_in
--- patches/patch-lib_ext2fs_Makefile_in 8 Nov 2014 11:28:04 -0000 1.6
+++ patches/patch-lib_ext2fs_Makefile_in 20 Jan 2021 18:10:34 -0000
@@ -1,7 +1,9 @@
 $OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.6 2014/11/08 11:28:04 sthen Exp $
---- lib/ext2fs/Makefile.in.orig Sat Aug  2 21:26:22 2014
-+++ lib/ext2fs/Makefile.in Sat Nov  8 10:41:17 2014
-@@ -203,8 +203,8 @@ HFILES_IN=  ext2_err.h ext2_types.h
+
+Index: lib/ext2fs/Makefile.in
+--- lib/ext2fs/Makefile.in.orig
++++ lib/ext2fs/Makefile.in
+@@ -233,8 +233,8 @@ HFILES_IN=  ext2_err.h ext2_types.h
  LIBRARY= libext2fs
  LIBDIR= ext2fs
 
Index: patches/patch-lib_ext2fs_blkmap64_rb_c
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_blkmap64_rb_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_ext2fs_blkmap64_rb_c
--- patches/patch-lib_ext2fs_blkmap64_rb_c 10 Sep 2016 13:03:43 -0000 1.1
+++ patches/patch-lib_ext2fs_blkmap64_rb_c 20 Jan 2021 18:10:34 -0000
@@ -1,7 +1,9 @@
 $OpenBSD: patch-lib_ext2fs_blkmap64_rb_c,v 1.1 2016/09/10 13:03:43 ajacoutot Exp $
---- lib/ext2fs/blkmap64_rb.c.orig Sat Sep 10 12:30:47 2016
-+++ lib/ext2fs/blkmap64_rb.c Sat Sep 10 12:31:10 2016
-@@ -15,6 +15,7 @@
+
+Index: lib/ext2fs/blkmap64_rb.c
+--- lib/ext2fs/blkmap64_rb.c.orig
++++ lib/ext2fs/blkmap64_rb.c
+@@ -16,6 +16,7 @@
  #include <unistd.h>
  #endif
  #include <fcntl.h>
Index: patches/patch-lib_ext2fs_ext2_fs_h
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2_fs_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_ext2fs_ext2_fs_h
--- patches/patch-lib_ext2fs_ext2_fs_h 28 Mar 2016 20:08:56 -0000 1.1
+++ patches/patch-lib_ext2fs_ext2_fs_h 20 Jan 2021 18:10:34 -0000
@@ -1,7 +1,9 @@
 $OpenBSD: patch-lib_ext2fs_ext2_fs_h,v 1.1 2016/03/28 20:08:56 kili Exp $
---- lib/ext2fs/ext2_fs.h.orig Sat Aug  2 22:26:22 2014
-+++ lib/ext2fs/ext2_fs.h Tue Mar 22 22:26:56 2016
-@@ -344,6 +344,7 @@ struct ext4_new_group_input {
+
+Index: lib/ext2fs/ext2_fs.h
+--- lib/ext2fs/ext2_fs.h.orig
++++ lib/ext2fs/ext2_fs.h
+@@ -374,6 +374,7 @@ struct ext4_new_group_input {
  #define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
  #endif
 
@@ -9,7 +11,7 @@ $OpenBSD: patch-lib_ext2fs_ext2_fs_h,v 1
  #define EXT2_IOC_GETFLAGS _IOR('f', 1, long)
  #define EXT2_IOC_SETFLAGS _IOW('f', 2, long)
  #define EXT2_IOC_GETVERSION _IOR('v', 1, long)
-@@ -354,6 +355,7 @@ struct ext4_new_group_input {
+@@ -384,6 +385,7 @@ struct ext4_new_group_input {
  #define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input)
  #define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input)
  #define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64)
Index: patches/patch-lib_ext2fs_imager_c
===================================================================
RCS file: patches/patch-lib_ext2fs_imager_c
diff -N patches/patch-lib_ext2fs_imager_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_ext2fs_imager_c 20 Jan 2021 18:10:34 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib/ext2fs/imager.c
+--- lib/ext2fs/imager.c.orig
++++ lib/ext2fs/imager.c
+@@ -67,7 +67,7 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int
+ blk64_t blk;
+ ssize_t actual;
+ errcode_t retval;
+- loff_t r;
++ off_t r;
+
+ buf = malloc(fs->blocksize * BUF_BLOCKS);
+ if (!buf)
Index: patches/patch-lib_ext2fs_unix_io_c
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_ext2fs_unix_io_c
--- patches/patch-lib_ext2fs_unix_io_c 21 Jun 2013 22:35:51 -0000 1.2
+++ patches/patch-lib_ext2fs_unix_io_c 20 Jan 2021 18:10:34 -0000
@@ -1,11 +1,13 @@
 $OpenBSD: patch-lib_ext2fs_unix_io_c,v 1.2 2013/06/21 22:35:51 sthen Exp $
---- lib/ext2fs/unix_io.c.orig Wed Jan  2 00:47:20 2013
-+++ lib/ext2fs/unix_io.c Wed Jun 19 14:25:04 2013
-@@ -39,6 +39,7 @@
+
+Index: lib/ext2fs/unix_io.c
+--- lib/ext2fs/unix_io.c.orig
++++ lib/ext2fs/unix_io.c
+@@ -51,6 +51,7 @@
  #include <sys/ioctl.h>
  #endif
  #ifdef HAVE_SYS_MOUNT_H
 +#include <sys/param.h>
  #include <sys/mount.h>
  #endif
- #if HAVE_SYS_STAT_H
+ #ifdef HAVE_SYS_PRCTL_H
Index: patches/patch-lib_quota_mkquota_c
===================================================================
RCS file: patches/patch-lib_quota_mkquota_c
diff -N patches/patch-lib_quota_mkquota_c
--- patches/patch-lib_quota_mkquota_c 21 Jun 2013 22:35:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-lib_quota_mkquota_c,v 1.1 2013/06/21 22:35:51 sthen Exp $
---- lib/quota/mkquota.c.orig Wed Jan  2 00:47:20 2013
-+++ lib/quota/mkquota.c Wed Jun 19 14:25:04 2013
-@@ -7,6 +7,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <stdint.h>
- #include <errno.h>
- #include <string.h>
- #include <fcntl.h>
Index: patches/patch-lib_uuid_gen_uuid_c
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_uuid_gen_uuid_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-lib_uuid_gen_uuid_c
--- patches/patch-lib_uuid_gen_uuid_c 10 Nov 2014 20:38:50 -0000 1.1
+++ patches/patch-lib_uuid_gen_uuid_c 20 Jan 2021 18:10:34 -0000
@@ -1,6 +1,8 @@
 $OpenBSD: patch-lib_uuid_gen_uuid_c,v 1.1 2014/11/10 20:38:50 sthen Exp $
---- lib/uuid/gen_uuid.c.orig Sat Nov  8 10:51:53 2014
-+++ lib/uuid/gen_uuid.c Sat Nov  8 11:12:57 2014
+
+Index: lib/uuid/gen_uuid.c
+--- lib/uuid/gen_uuid.c.orig
++++ lib/uuid/gen_uuid.c
 @@ -167,8 +167,17 @@ static int get_random_fd(void)
  return fd;
  }
@@ -28,7 +30,7 @@ $OpenBSD: patch-lib_uuid_gen_uuid_c,v 1.
 
  /*
   * Get the ethernet hardware address, if we can find it...
-@@ -663,7 +673,17 @@ void uuid_generate_random(uuid_t out)
+@@ -679,7 +689,17 @@ void uuid_generate_random(uuid_t out)
  }
 
 
@@ -46,7 +48,7 @@ $OpenBSD: patch-lib_uuid_gen_uuid_c,v 1.
   * This is the generic front-end to uuid_generate_random and
   * uuid_generate_time.  It uses uuid_generate_random only if
   * /dev/urandom is available, since otherwise we won't have
-@@ -676,3 +696,4 @@ void uuid_generate(uuid_t out)
+@@ -692,3 +712,4 @@ void uuid_generate(uuid_t out)
  else
  uuid_generate_time(out);
  }
Index: patches/patch-misc_e2fuzz_c
===================================================================
RCS file: patches/patch-misc_e2fuzz_c
diff -N patches/patch-misc_e2fuzz_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-misc_e2fuzz_c 20 Jan 2021 18:10:34 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: misc/e2fuzz.c
+--- misc/e2fuzz.c.orig
++++ misc/e2fuzz.c
+@@ -181,9 +181,9 @@ static int process_fs(const char *fsname)
+ int flags, fd;
+ ext2_filsys fs = NULL;
+ ext2fs_block_bitmap corrupt_map;
+- loff_t hsize, count, off, offset, corrupt_bytes;
++ off_t hsize, count, off, offset, corrupt_bytes;
+ unsigned char c;
+- loff_t i;
++ off_t i;
+
+ /* If mounted rw, force dryrun mode */
+ ret = ext2fs_check_if_mounted(fsname, &flags);
Index: patches/patch-misc_fsck_8_in
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-misc_fsck_8_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-misc_fsck_8_in
--- patches/patch-misc_fsck_8_in 21 Jun 2013 22:35:51 -0000 1.3
+++ patches/patch-misc_fsck_8_in 20 Jan 2021 18:10:34 -0000
@@ -1,18 +1,26 @@
 $OpenBSD: patch-misc_fsck_8_in,v 1.3 2013/06/21 22:35:51 sthen Exp $
---- misc/fsck.8.in.orig Thu Aug 13 02:39:57 2009
-+++ misc/fsck.8.in Wed Jun 19 14:25:04 2013
-@@ -2,11 +2,11 @@
+
+Index: misc/fsck.8.in
+--- misc/fsck.8.in.orig
++++ misc/fsck.8.in
+@@ -2,9 +2,9 @@
  .\" Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
  .\" This file may be copied under the terms of the GNU Public License.
- .\"
+ .\"
 -.TH FSCK 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
 +.TH PFSCK 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
  .SH NAME
 -fsck \- check and repair a Linux file system
 +pfsck \- check and repair a Linux file system
  .SH SYNOPSIS
--.B fsck
-+.B pfsck
+ .B fsck
  [
- .B \-sAVRTMNP
+@@ -25,7 +25,7 @@ fsck \- check and repair a Linux file system
+ .B fs-specific-options
  ]
+ .SH DESCRIPTION
+-.B fsck
++.B pfsck
+ is used to check and optionally repair one or more Linux file systems.
+ .I filesys
+ can be a device name (e.g.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/e2fsprogs/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 10 Nov 2014 20:38:50 -0000 1.16
+++ pkg/PLIST 20 Jan 2021 18:10:34 -0000
@@ -26,6 +26,7 @@ include/ext2fs/ext2_io.h
 include/ext2fs/ext2_types.h
 include/ext2fs/ext2fs.h
 include/ext2fs/ext3_extents.h
+include/ext2fs/hashmap.h
 include/ext2fs/qcow2.h
 include/ext2fs/tdb.h
 include/ss/
@@ -35,17 +36,17 @@ include/uuid/
 include/uuid/uuid.h
 @info info/libext2fs.info
 @bin lib/e2initrd_helper
-lib/libblkid.a
+@static-lib lib/libblkid.a
 @lib lib/libblkid.so.${LIBblkid_VERSION}
-lib/libcom_err.a
+@static-lib lib/libcom_err.a
 @lib lib/libcom_err.so.${LIBcom_err_VERSION}
-lib/libe2p.a
+@static-lib lib/libe2p.a
 @lib lib/libe2p.so.${LIBe2p_VERSION}
-lib/libext2fs.a
+@static-lib lib/libext2fs.a
 @lib lib/libext2fs.so.${LIBext2fs_VERSION}
-lib/libss.a
+@static-lib lib/libss.a
 @lib lib/libss.so.${LIBss_VERSION}
-lib/libuuid.a
+@static-lib lib/libuuid.a
 @lib lib/libuuid.so.${LIBuuid_VERSION}
 lib/pkgconfig/blkid.pc
 lib/pkgconfig/com_err.pc
@@ -84,20 +85,19 @@ lib/pkgconfig/uuid.pc
 @man man/man8/e2fsck.8
 @man man/man8/e2image.8
 @man man/man8/e2label.8
+@man man/man8/e2mmpstatus.8
 @man man/man8/e2undo.8
 @man man/man8/filefrag.8
 @man man/man8/findfs.8
 @man man/man8/fsck.ext2.8
 @man man/man8/fsck.ext3.8
 @man man/man8/fsck.ext4.8
-@man man/man8/fsck.ext4dev.8
 @man man/man8/fsck_ext2fs.8
 @man man/man8/logsave.8
 @man man/man8/mke2fs.8
 @man man/man8/mkfs.ext2.8
 @man man/man8/mkfs.ext3.8
 @man man/man8/mkfs.ext4.8
-@man man/man8/mkfs.ext4dev.8
 @man man/man8/mklost+found.8
 @man man/man8/resize2fs.8
 @man man/man8/tune2fs.8
@@ -109,20 +109,19 @@ lib/pkgconfig/uuid.pc
 @bin sbin/e2fsck
 @bin sbin/e2image
 @bin sbin/e2label
+@bin sbin/e2mmpstatus
 @bin sbin/e2undo
 @bin sbin/filefrag
 @bin sbin/findfs
 @bin sbin/fsck.ext2
 @bin sbin/fsck.ext3
 @bin sbin/fsck.ext4
-@bin sbin/fsck.ext4dev
 @bin sbin/fsck_ext2fs
 @bin sbin/logsave
 @bin sbin/mke2fs
 @bin sbin/mkfs.ext2
 @bin sbin/mkfs.ext3
 @bin sbin/mkfs.ext4
-@bin sbin/mkfs.ext4dev
 @bin sbin/mklost+found
 @bin sbin/resize2fs
 @bin sbin/tune2fs
@@ -134,14 +133,22 @@ share/examples/e2fsprogs/mke2fs.conf
 @sample ${SYSCONFDIR}/mke2fs.conf
 share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 share/locale/cs/LC_MESSAGES/e2fsprogs.mo
+share/locale/da/LC_MESSAGES/e2fsprogs.mo
 share/locale/de/LC_MESSAGES/e2fsprogs.mo
 share/locale/eo/LC_MESSAGES/e2fsprogs.mo
 share/locale/es/LC_MESSAGES/e2fsprogs.mo
+share/locale/fi/LC_MESSAGES/e2fsprogs.mo
 share/locale/fr/LC_MESSAGES/e2fsprogs.mo
+share/locale/hu/LC_MESSAGES/e2fsprogs.mo
 share/locale/id/LC_MESSAGES/e2fsprogs.mo
 share/locale/it/LC_MESSAGES/e2fsprogs.mo
+share/locale/ms/
+share/locale/ms/LC_MESSAGES/
+share/locale/ms/LC_MESSAGES/e2fsprogs.mo
 share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 share/locale/pl/LC_MESSAGES/e2fsprogs.mo
+share/locale/pt/LC_MESSAGES/e2fsprogs.mo
+share/locale/sr/LC_MESSAGES/e2fsprogs.mo
 share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 share/locale/uk/LC_MESSAGES/e2fsprogs.mo

Reply | Threaded
Open this post in threaded view
|

Re: help with updating a port - sysutils/e2fsprogs

Aisha Tammy-5
On 1/20/21 1:10 PM, Stuart Henderson wrote:

> On 2021/01/20 12:34, Aisha Tammy wrote:
>>   I've been trying to get e2fsprogs to latest 1.4.6 but am
>> running into a bunch of errors with loff_t not defined errors
>>
>> Reason for updating, I'm try to build 389-ds-base (ldap server)
>> in OpenBSD which needs the newer version of e2fsprogs for
>> some functions.
>
> loff_t is for large file support which we don't have a special type for,
> normal off_t supports large files. Something like the diff below would
> do I think. Or the relevant bits could be disabled (configure flag for
> e2image, e2fuzz by patching, it isn't installed by default anyway).
>
> What does 389-ds-base want from e2fsprogs? I don't see any reference
> in the tar.bz2.
>

Whoops, sorry. I got confused with the names of my ports.
I am also trying to get MIT Kerberos (yes I know we have heimdal, I'm
just being a bit masochistic) to build on OpenBSD and thats
the one that needs e2fsprogs.

I'll try this update, thanks a lot Stuart <3 !!

Cheers,
Aisha

>> Also seems like this package has no maintainer and hasn't been
>> updated in a while.
>
> yep.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- Makefile 12 Jul 2019 20:49:42 -0000 1.41
> +++ Makefile 20 Jan 2021 18:10:34 -0000
> @@ -2,14 +2,13 @@
>  
>  COMMENT= utilities to manipulate ext2 filesystems
>  
> -DISTNAME= e2fsprogs-1.42.12
> -REVISION= 5
> +DISTNAME= e2fsprogs-1.45.6
>  CATEGORIES= sysutils devel
>  SHARED_LIBS= blkid 0.0 \
>   com_err 21.0 \
> - e2p 3.1 \
> - ext2fs 4.1 \
> - ss 3.1 \
> + e2p 3.2 \
> + ext2fs 5.0 \
> + ss 3.2 \
>   uuid 14.0
>  
>  HOMEPAGE= http://e2fsprogs.sourceforge.net/
> @@ -21,20 +20,21 @@ WANTLIB += c iconv intl
>  
>  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
>  
> +DEBUG_PACKAGES= ${BUILD_PACKAGES}
>  LIB_DEPENDS= devel/gettext,-runtime
>  
>  SEPARATE_BUILD= Yes
> -CONFIGURE_STYLE= autoconf
> -AUTOCONF_VERSION= 2.69
> +CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS+= --disable-tls \
>   --disable-uuidd \
> - --enable-elf-shlibs
> + --disable-fuse2fs \
> + --enable-elf-shlibs \
> + --enable-verbose-makecmds
>  CONFIGURE_ENV= CPPFLAGS="-D_EXT2_USE_C_VERSIONS_" \
>   ac_cv_header_execinfo_h=no
>  USE_GMAKE= Yes
>  
> -MAKE_FLAGS= V=1 \
> - LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
> +MAKE_FLAGS= LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
>   LIBblkid_VERSION=${LIBblkid_VERSION} \
>   LIBcom_err_VERSION=${LIBcom_err_VERSION} \
>   LIBe2p_VERSION=${LIBe2p_VERSION} \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 8 Nov 2014 11:28:04 -0000 1.7
> +++ distinfo 20 Jan 2021 18:10:34 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (e2fsprogs-1.42.12.tar.gz) = 4XhG2RoO3Yn6WbBkvej45c7FhR419Ye8zLQBTb1jGGw=
> -SIZE (e2fsprogs-1.42.12.tar.gz) = 6381695
> +SHA256 (e2fsprogs-1.45.6.tar.gz) = X2SsUKK2C45nxbOCuxN97Dk0QBcQPK/8OmFVRCTy1pM=
> +SIZE (e2fsprogs-1.45.6.tar.gz) = 7938544
> Index: patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-doc_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 30 Apr 2014 11:40:04 -0000 1.4
> +++ patches/patch-doc_Makefile_in 20 Jan 2021 18:10:34 -0000
> @@ -1,6 +1,8 @@
>  $OpenBSD: patch-doc_Makefile_in,v 1.4 2014/04/30 11:40:04 ajacoutot Exp $
> ---- doc/Makefile.in.orig Sun Dec 29 05:18:02 2013
> -+++ doc/Makefile.in Wed Apr 30 10:36:56 2014
> +
> +Index: doc/Makefile.in
> +--- doc/Makefile.in.orig
> ++++ doc/Makefile.in
>  @@ -17,9 +17,9 @@ INFO=@MAKEINFO@
>   HTML=makeinfo --html --no-split
>   PS2PDF=ps2pdf
> @@ -11,14 +13,14 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 20
>  -install-doc-libs: libext2fs.info libext2fs.dvi
>  +install-doc-libs: libext2fs.info
>   $(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
> - $(E) " MKINSTALLDIRS $(infodir)"
> - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
> + $(E) " MKDIR_P $(infodir)"
> + $(Q) $(MKDIR_P) $(DESTDIR)$(infodir)
>  @@ -27,8 +27,6 @@ install-doc-libs: libext2fs.info libext2fs.dvi
>   echo " INSTALL_DATA $(infodir)/$$i" ; \
>   $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
>   done
>  - $(E) " GZIP $(infodir)/libext2fs.info*"
> -- -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
> +- -$(Q) gzip -9n $(DESTDIR)$(infodir)/libext2fs.info*
>  
>   uninstall-doc-libs:
>   $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
> Index: patches/patch-lib_Makefile_elf-lib
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-lib_Makefile_elf-lib
> --- patches/patch-lib_Makefile_elf-lib 21 Jun 2013 22:35:51 -0000 1.7
> +++ patches/patch-lib_Makefile_elf-lib 20 Jan 2021 18:10:34 -0000
> @@ -3,8 +3,9 @@ $OpenBSD: patch-lib_Makefile_elf-lib,v 1
>  Don't generate library symlinks.
>  Don't run ldconfig.
>  
> ---- lib/Makefile.elf-lib.orig Wed Aug 15 21:43:55 2012
> -+++ lib/Makefile.elf-lib Wed Jun 19 14:25:04 2013
> +Index: lib/Makefile.elf-lib
> +--- lib/Makefile.elf-lib.orig
> ++++ lib/Makefile.elf-lib
>  @@ -32,7 +32,6 @@ $(ELF_LIB): $(OBJS)
>   $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
>   `echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB))
> @@ -12,7 +13,7 @@ Don't run ldconfig.
>  - $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
>  
>   installdirs-elf-lib::
> - $(E) " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
> + $(E) " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
>  @@ -44,14 +43,6 @@ installdirs:: installdirs-elf-lib
>   install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
>   $(E) " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
> Index: patches/patch-lib_blkid_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_blkid_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-lib_blkid_Makefile_in
> --- patches/patch-lib_blkid_Makefile_in 21 Jun 2013 22:35:51 -0000 1.2
> +++ patches/patch-lib_blkid_Makefile_in 20 Jan 2021 18:10:34 -0000
> @@ -1,4 +1,5 @@
>  $OpenBSD: patch-lib_blkid_Makefile_in,v 1.2 2013/06/21 22:35:51 sthen Exp $
> +
>  --- lib/blkid/Makefile.in.orig Thu Jan  3 03:39:51 2013
>  +++ lib/blkid/Makefile.in Wed Jun 19 14:25:06 2013
>  @@ -31,8 +31,8 @@ HFILES_IN= blkid.h blkid_types.h
> Index: patches/patch-lib_blkid_getsize_c
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_blkid_getsize_c,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lib_blkid_getsize_c
> --- patches/patch-lib_blkid_getsize_c 8 Nov 2014 11:28:04 -0000 1.3
> +++ patches/patch-lib_blkid_getsize_c 20 Jan 2021 18:10:34 -0000
> @@ -1,7 +1,9 @@
>  $OpenBSD: patch-lib_blkid_getsize_c,v 1.3 2014/11/08 11:28:04 sthen Exp $
> ---- lib/blkid/getsize.c.orig Sat Aug  2 21:26:22 2014
> -+++ lib/blkid/getsize.c Sat Nov  8 10:41:17 2014
> -@@ -25,6 +25,7 @@
> +
> +Index: lib/blkid/getsize.c
> +--- lib/blkid/getsize.c.orig
> ++++ lib/blkid/getsize.c
> +@@ -29,6 +29,7 @@
>   #include <fcntl.h>
>   #ifdef HAVE_SYS_IOCTL_H
>   #include <sys/ioctl.h>
> Index: patches/patch-lib_e2p_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lib_e2p_Makefile_in
> --- patches/patch-lib_e2p_Makefile_in 21 Jun 2013 22:35:51 -0000 1.3
> +++ patches/patch-lib_e2p_Makefile_in 20 Jan 2021 18:10:34 -0000
> @@ -1,7 +1,9 @@
>  $OpenBSD: patch-lib_e2p_Makefile_in,v 1.3 2013/06/21 22:35:51 sthen Exp $
> ---- lib/e2p/Makefile.in.orig Fri Sep 21 17:30:42 2012
> -+++ lib/e2p/Makefile.in Wed Jun 19 14:25:06 2013
> -@@ -34,8 +34,8 @@ HFILES= e2p.h
> +
> +Index: lib/e2p/Makefile.in
> +--- lib/e2p/Makefile.in.orig
> ++++ lib/e2p/Makefile.in
> +@@ -36,8 +36,8 @@ HFILES= e2p.h
>   LIBRARY= libe2p
>   LIBDIR= e2p
>  
> Index: patches/patch-lib_ext2fs_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-lib_ext2fs_Makefile_in
> --- patches/patch-lib_ext2fs_Makefile_in 8 Nov 2014 11:28:04 -0000 1.6
> +++ patches/patch-lib_ext2fs_Makefile_in 20 Jan 2021 18:10:34 -0000
> @@ -1,7 +1,9 @@
>  $OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.6 2014/11/08 11:28:04 sthen Exp $
> ---- lib/ext2fs/Makefile.in.orig Sat Aug  2 21:26:22 2014
> -+++ lib/ext2fs/Makefile.in Sat Nov  8 10:41:17 2014
> -@@ -203,8 +203,8 @@ HFILES_IN=  ext2_err.h ext2_types.h
> +
> +Index: lib/ext2fs/Makefile.in
> +--- lib/ext2fs/Makefile.in.orig
> ++++ lib/ext2fs/Makefile.in
> +@@ -233,8 +233,8 @@ HFILES_IN=  ext2_err.h ext2_types.h
>   LIBRARY= libext2fs
>   LIBDIR= ext2fs
>  
> Index: patches/patch-lib_ext2fs_blkmap64_rb_c
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_blkmap64_rb_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-lib_ext2fs_blkmap64_rb_c
> --- patches/patch-lib_ext2fs_blkmap64_rb_c 10 Sep 2016 13:03:43 -0000 1.1
> +++ patches/patch-lib_ext2fs_blkmap64_rb_c 20 Jan 2021 18:10:34 -0000
> @@ -1,7 +1,9 @@
>  $OpenBSD: patch-lib_ext2fs_blkmap64_rb_c,v 1.1 2016/09/10 13:03:43 ajacoutot Exp $
> ---- lib/ext2fs/blkmap64_rb.c.orig Sat Sep 10 12:30:47 2016
> -+++ lib/ext2fs/blkmap64_rb.c Sat Sep 10 12:31:10 2016
> -@@ -15,6 +15,7 @@
> +
> +Index: lib/ext2fs/blkmap64_rb.c
> +--- lib/ext2fs/blkmap64_rb.c.orig
> ++++ lib/ext2fs/blkmap64_rb.c
> +@@ -16,6 +16,7 @@
>   #include <unistd.h>
>   #endif
>   #include <fcntl.h>
> Index: patches/patch-lib_ext2fs_ext2_fs_h
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2_fs_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-lib_ext2fs_ext2_fs_h
> --- patches/patch-lib_ext2fs_ext2_fs_h 28 Mar 2016 20:08:56 -0000 1.1
> +++ patches/patch-lib_ext2fs_ext2_fs_h 20 Jan 2021 18:10:34 -0000
> @@ -1,7 +1,9 @@
>  $OpenBSD: patch-lib_ext2fs_ext2_fs_h,v 1.1 2016/03/28 20:08:56 kili Exp $
> ---- lib/ext2fs/ext2_fs.h.orig Sat Aug  2 22:26:22 2014
> -+++ lib/ext2fs/ext2_fs.h Tue Mar 22 22:26:56 2016
> -@@ -344,6 +344,7 @@ struct ext4_new_group_input {
> +
> +Index: lib/ext2fs/ext2_fs.h
> +--- lib/ext2fs/ext2_fs.h.orig
> ++++ lib/ext2fs/ext2_fs.h
> +@@ -374,6 +374,7 @@ struct ext4_new_group_input {
>   #define _IOT_ext2_new_group_input _IOT (_IOTS(__u32), 5, _IOTS(__u16), 2, 0, 0)
>   #endif
>  
> @@ -9,7 +11,7 @@ $OpenBSD: patch-lib_ext2fs_ext2_fs_h,v 1
>   #define EXT2_IOC_GETFLAGS _IOR('f', 1, long)
>   #define EXT2_IOC_SETFLAGS _IOW('f', 2, long)
>   #define EXT2_IOC_GETVERSION _IOR('v', 1, long)
> -@@ -354,6 +355,7 @@ struct ext4_new_group_input {
> +@@ -384,6 +385,7 @@ struct ext4_new_group_input {
>   #define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input)
>   #define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input)
>   #define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64)
> Index: patches/patch-lib_ext2fs_imager_c
> ===================================================================
> RCS file: patches/patch-lib_ext2fs_imager_c
> diff -N patches/patch-lib_ext2fs_imager_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-lib_ext2fs_imager_c 20 Jan 2021 18:10:34 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: lib/ext2fs/imager.c
> +--- lib/ext2fs/imager.c.orig
> ++++ lib/ext2fs/imager.c
> +@@ -67,7 +67,7 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int
> + blk64_t blk;
> + ssize_t actual;
> + errcode_t retval;
> +- loff_t r;
> ++ off_t r;
> +
> + buf = malloc(fs->blocksize * BUF_BLOCKS);
> + if (!buf)
> Index: patches/patch-lib_ext2fs_unix_io_c
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-lib_ext2fs_unix_io_c
> --- patches/patch-lib_ext2fs_unix_io_c 21 Jun 2013 22:35:51 -0000 1.2
> +++ patches/patch-lib_ext2fs_unix_io_c 20 Jan 2021 18:10:34 -0000
> @@ -1,11 +1,13 @@
>  $OpenBSD: patch-lib_ext2fs_unix_io_c,v 1.2 2013/06/21 22:35:51 sthen Exp $
> ---- lib/ext2fs/unix_io.c.orig Wed Jan  2 00:47:20 2013
> -+++ lib/ext2fs/unix_io.c Wed Jun 19 14:25:04 2013
> -@@ -39,6 +39,7 @@
> +
> +Index: lib/ext2fs/unix_io.c
> +--- lib/ext2fs/unix_io.c.orig
> ++++ lib/ext2fs/unix_io.c
> +@@ -51,6 +51,7 @@
>   #include <sys/ioctl.h>
>   #endif
>   #ifdef HAVE_SYS_MOUNT_H
>  +#include <sys/param.h>
>   #include <sys/mount.h>
>   #endif
> - #if HAVE_SYS_STAT_H
> + #ifdef HAVE_SYS_PRCTL_H
> Index: patches/patch-lib_quota_mkquota_c
> ===================================================================
> RCS file: patches/patch-lib_quota_mkquota_c
> diff -N patches/patch-lib_quota_mkquota_c
> --- patches/patch-lib_quota_mkquota_c 21 Jun 2013 22:35:51 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-lib_quota_mkquota_c,v 1.1 2013/06/21 22:35:51 sthen Exp $
> ---- lib/quota/mkquota.c.orig Wed Jan  2 00:47:20 2013
> -+++ lib/quota/mkquota.c Wed Jun 19 14:25:04 2013
> -@@ -7,6 +7,7 @@
> - #include <sys/types.h>
> - #include <sys/stat.h>
> - #include <unistd.h>
> -+#include <stdint.h>
> - #include <errno.h>
> - #include <string.h>
> - #include <fcntl.h>
> Index: patches/patch-lib_uuid_gen_uuid_c
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-lib_uuid_gen_uuid_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-lib_uuid_gen_uuid_c
> --- patches/patch-lib_uuid_gen_uuid_c 10 Nov 2014 20:38:50 -0000 1.1
> +++ patches/patch-lib_uuid_gen_uuid_c 20 Jan 2021 18:10:34 -0000
> @@ -1,6 +1,8 @@
>  $OpenBSD: patch-lib_uuid_gen_uuid_c,v 1.1 2014/11/10 20:38:50 sthen Exp $
> ---- lib/uuid/gen_uuid.c.orig Sat Nov  8 10:51:53 2014
> -+++ lib/uuid/gen_uuid.c Sat Nov  8 11:12:57 2014
> +
> +Index: lib/uuid/gen_uuid.c
> +--- lib/uuid/gen_uuid.c.orig
> ++++ lib/uuid/gen_uuid.c
>  @@ -167,8 +167,17 @@ static int get_random_fd(void)
>   return fd;
>   }
> @@ -28,7 +30,7 @@ $OpenBSD: patch-lib_uuid_gen_uuid_c,v 1.
>  
>   /*
>    * Get the ethernet hardware address, if we can find it...
> -@@ -663,7 +673,17 @@ void uuid_generate_random(uuid_t out)
> +@@ -679,7 +689,17 @@ void uuid_generate_random(uuid_t out)
>   }
>  
>  
> @@ -46,7 +48,7 @@ $OpenBSD: patch-lib_uuid_gen_uuid_c,v 1.
>    * This is the generic front-end to uuid_generate_random and
>    * uuid_generate_time.  It uses uuid_generate_random only if
>    * /dev/urandom is available, since otherwise we won't have
> -@@ -676,3 +696,4 @@ void uuid_generate(uuid_t out)
> +@@ -692,3 +712,4 @@ void uuid_generate(uuid_t out)
>   else
>   uuid_generate_time(out);
>   }
> Index: patches/patch-misc_e2fuzz_c
> ===================================================================
> RCS file: patches/patch-misc_e2fuzz_c
> diff -N patches/patch-misc_e2fuzz_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-misc_e2fuzz_c 20 Jan 2021 18:10:34 -0000
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Index: misc/e2fuzz.c
> +--- misc/e2fuzz.c.orig
> ++++ misc/e2fuzz.c
> +@@ -181,9 +181,9 @@ static int process_fs(const char *fsname)
> + int flags, fd;
> + ext2_filsys fs = NULL;
> + ext2fs_block_bitmap corrupt_map;
> +- loff_t hsize, count, off, offset, corrupt_bytes;
> ++ off_t hsize, count, off, offset, corrupt_bytes;
> + unsigned char c;
> +- loff_t i;
> ++ off_t i;
> +
> + /* If mounted rw, force dryrun mode */
> + ret = ext2fs_check_if_mounted(fsname, &flags);
> Index: patches/patch-misc_fsck_8_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/patches/patch-misc_fsck_8_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-misc_fsck_8_in
> --- patches/patch-misc_fsck_8_in 21 Jun 2013 22:35:51 -0000 1.3
> +++ patches/patch-misc_fsck_8_in 20 Jan 2021 18:10:34 -0000
> @@ -1,18 +1,26 @@
>  $OpenBSD: patch-misc_fsck_8_in,v 1.3 2013/06/21 22:35:51 sthen Exp $
> ---- misc/fsck.8.in.orig Thu Aug 13 02:39:57 2009
> -+++ misc/fsck.8.in Wed Jun 19 14:25:04 2013
> -@@ -2,11 +2,11 @@
> +
> +Index: misc/fsck.8.in
> +--- misc/fsck.8.in.orig
> ++++ misc/fsck.8.in
> +@@ -2,9 +2,9 @@
>   .\" Copyright 1993, 1994, 1995 by Theodore Ts'o.  All Rights Reserved.
>   .\" This file may be copied under the terms of the GNU Public License.
> - .\"
> + .\"
>  -.TH FSCK 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
>  +.TH PFSCK 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
>   .SH NAME
>  -fsck \- check and repair a Linux file system
>  +pfsck \- check and repair a Linux file system
>   .SH SYNOPSIS
> --.B fsck
> -+.B pfsck
> + .B fsck
>   [
> - .B \-sAVRTMNP
> +@@ -25,7 +25,7 @@ fsck \- check and repair a Linux file system
> + .B fs-specific-options
>   ]
> + .SH DESCRIPTION
> +-.B fsck
> ++.B pfsck
> + is used to check and optionally repair one or more Linux file systems.
> + .I filesys
> + can be a device name (e.g.
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/e2fsprogs/pkg/PLIST,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST
> --- pkg/PLIST 10 Nov 2014 20:38:50 -0000 1.16
> +++ pkg/PLIST 20 Jan 2021 18:10:34 -0000
> @@ -26,6 +26,7 @@ include/ext2fs/ext2_io.h
>  include/ext2fs/ext2_types.h
>  include/ext2fs/ext2fs.h
>  include/ext2fs/ext3_extents.h
> +include/ext2fs/hashmap.h
>  include/ext2fs/qcow2.h
>  include/ext2fs/tdb.h
>  include/ss/
> @@ -35,17 +36,17 @@ include/uuid/
>  include/uuid/uuid.h
>  @info info/libext2fs.info
>  @bin lib/e2initrd_helper
> -lib/libblkid.a
> +@static-lib lib/libblkid.a
>  @lib lib/libblkid.so.${LIBblkid_VERSION}
> -lib/libcom_err.a
> +@static-lib lib/libcom_err.a
>  @lib lib/libcom_err.so.${LIBcom_err_VERSION}
> -lib/libe2p.a
> +@static-lib lib/libe2p.a
>  @lib lib/libe2p.so.${LIBe2p_VERSION}
> -lib/libext2fs.a
> +@static-lib lib/libext2fs.a
>  @lib lib/libext2fs.so.${LIBext2fs_VERSION}
> -lib/libss.a
> +@static-lib lib/libss.a
>  @lib lib/libss.so.${LIBss_VERSION}
> -lib/libuuid.a
> +@static-lib lib/libuuid.a
>  @lib lib/libuuid.so.${LIBuuid_VERSION}
>  lib/pkgconfig/blkid.pc
>  lib/pkgconfig/com_err.pc
> @@ -84,20 +85,19 @@ lib/pkgconfig/uuid.pc
>  @man man/man8/e2fsck.8
>  @man man/man8/e2image.8
>  @man man/man8/e2label.8
> +@man man/man8/e2mmpstatus.8
>  @man man/man8/e2undo.8
>  @man man/man8/filefrag.8
>  @man man/man8/findfs.8
>  @man man/man8/fsck.ext2.8
>  @man man/man8/fsck.ext3.8
>  @man man/man8/fsck.ext4.8
> -@man man/man8/fsck.ext4dev.8
>  @man man/man8/fsck_ext2fs.8
>  @man man/man8/logsave.8
>  @man man/man8/mke2fs.8
>  @man man/man8/mkfs.ext2.8
>  @man man/man8/mkfs.ext3.8
>  @man man/man8/mkfs.ext4.8
> -@man man/man8/mkfs.ext4dev.8
>  @man man/man8/mklost+found.8
>  @man man/man8/resize2fs.8
>  @man man/man8/tune2fs.8
> @@ -109,20 +109,19 @@ lib/pkgconfig/uuid.pc
>  @bin sbin/e2fsck
>  @bin sbin/e2image
>  @bin sbin/e2label
> +@bin sbin/e2mmpstatus
>  @bin sbin/e2undo
>  @bin sbin/filefrag
>  @bin sbin/findfs
>  @bin sbin/fsck.ext2
>  @bin sbin/fsck.ext3
>  @bin sbin/fsck.ext4
> -@bin sbin/fsck.ext4dev
>  @bin sbin/fsck_ext2fs
>  @bin sbin/logsave
>  @bin sbin/mke2fs
>  @bin sbin/mkfs.ext2
>  @bin sbin/mkfs.ext3
>  @bin sbin/mkfs.ext4
> -@bin sbin/mkfs.ext4dev
>  @bin sbin/mklost+found
>  @bin sbin/resize2fs
>  @bin sbin/tune2fs
> @@ -134,14 +133,22 @@ share/examples/e2fsprogs/mke2fs.conf
>  @sample ${SYSCONFDIR}/mke2fs.conf
>  share/locale/ca/LC_MESSAGES/e2fsprogs.mo
>  share/locale/cs/LC_MESSAGES/e2fsprogs.mo
> +share/locale/da/LC_MESSAGES/e2fsprogs.mo
>  share/locale/de/LC_MESSAGES/e2fsprogs.mo
>  share/locale/eo/LC_MESSAGES/e2fsprogs.mo
>  share/locale/es/LC_MESSAGES/e2fsprogs.mo
> +share/locale/fi/LC_MESSAGES/e2fsprogs.mo
>  share/locale/fr/LC_MESSAGES/e2fsprogs.mo
> +share/locale/hu/LC_MESSAGES/e2fsprogs.mo
>  share/locale/id/LC_MESSAGES/e2fsprogs.mo
>  share/locale/it/LC_MESSAGES/e2fsprogs.mo
> +share/locale/ms/
> +share/locale/ms/LC_MESSAGES/
> +share/locale/ms/LC_MESSAGES/e2fsprogs.mo
>  share/locale/nl/LC_MESSAGES/e2fsprogs.mo
>  share/locale/pl/LC_MESSAGES/e2fsprogs.mo
> +share/locale/pt/LC_MESSAGES/e2fsprogs.mo
> +share/locale/sr/LC_MESSAGES/e2fsprogs.mo
>  share/locale/sv/LC_MESSAGES/e2fsprogs.mo
>  share/locale/tr/LC_MESSAGES/e2fsprogs.mo
>  share/locale/uk/LC_MESSAGES/e2fsprogs.mo
>