UPDATE archivers/fuse-zip

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

UPDATE archivers/fuse-zip

Björn Ketelaars
Diff below brings fuse-zip to 0.5.0, which fixes an issue which arises
when an archive file or its parent directory is not writeable.

While here re-sync WANTLIB.

Tested lightly on amd64 by adding, and removing some files to a fuse
mounted archive.

Comments/OK?


Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 24 Oct 2018 14:27:57 -0000 1.11
+++ Makefile 7 Dec 2018 05:48:24 -0000
@@ -2,8 +2,7 @@
 
 COMMENT = navigate zip archives through FUSE
 
-DISTNAME = fuse-zip-0.4.5
-REVISION = 0
+DISTNAME = fuse-zip-0.5.0
 
 CATEGORIES = archivers
 
@@ -12,7 +11,7 @@ HOMEPAGE = https://bitbucket.org/agalan
 # GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB = ${COMPILER_LIBCXX} bz2 c fuse m z zip
+WANTLIB += ${COMPILER_LIBCXX} c fuse m zip
 
 MASTER_SITES = https://bitbucket.org/agalanin/fuse-zip/downloads/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 6 Feb 2018 11:16:26 -0000 1.4
+++ distinfo 7 Dec 2018 05:48:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (fuse-zip-0.4.5.tar.gz) = LFEB9by41mbRymAnF7qQFWfa0uetfenbbluyasV0NdE=
-SIZE (fuse-zip-0.4.5.tar.gz) = 687727
+SHA256 (fuse-zip-0.5.0.tar.gz) = 3VUwc/gVS11i51LlPhFfvZKFhvCLeTZzV0/HXmssmro=
+SIZE (fuse-zip-0.5.0.tar.gz) = 688610
Index: patches/patch-fuse-zip_1
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/patches/patch-fuse-zip_1,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-fuse-zip_1
--- patches/patch-fuse-zip_1 28 Jan 2014 01:01:52 -0000 1.1.1.1
+++ patches/patch-fuse-zip_1 7 Dec 2018 05:48:24 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-fuse-zip_1,v 1.1.1.1 2014/01/28 01:01:52 jca Exp $
---- fuse-zip.1.orig Tue Jan 21 00:32:45 2014
-+++ fuse-zip.1 Tue Jan 21 00:33:14 2014
-@@ -69,10 +69,6 @@ Be patient. Wait for fuse-zip process finish after unm
+Index: fuse-zip.1
+--- fuse-zip.1.orig
++++ fuse-zip.1
+@@ -75,10 +75,6 @@ Be patient. Wait for fuse-zip process finish after unm
  .SH "PERMISSIONS"
  Access check will not be performed unless
  \fB-o default_permissions\fP mount option is given.
@@ -10,5 +11,5 @@ $OpenBSD: patch-fuse-zip_1,v 1.1.1.1 201
 -.if !'po4a'hide' .I /var/log/user.log
 -see this file in case any errors occur
  .SH "SEE ALSO"
- .BR fusermount (1).
- .SH "LICENSE"
+ .BR fusermount (1),
+ .BR mount.fuse (8).

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE archivers/fuse-zip

Klemens Nanni-2
On Fri, Dec 07, 2018 at 06:59:49AM +0100, Björn Ketelaars wrote:
> Diff below brings fuse-zip to 0.5.0, which fixes an issue which arises
> when an archive file or its parent directory is not writeable.
>
> While here re-sync WANTLIB.
>
> Tested lightly on amd64 by adding, and removing some files to a fuse
> mounted archive.
>
> Comments/OK?
Looks good, tests also pass on amd64.

Additional makefile improvements:

*
* make -> gmake symlink is needed for tests only as tests/Makefile uses
  `make' whereas Makefile already goes with proper $(MAKE) so turn
  do-configure into pre-test
* post-install is pretty much a do-install, so simply pass the proper
  mandir and just uncompress the manual as that's the only required step

OK kn with or without this.


Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 24 Oct 2018 14:27:57 -0000 1.11
+++ Makefile 7 Dec 2018 08:12:10 -0000
@@ -2,8 +2,7 @@
 
 COMMENT = navigate zip archives through FUSE
 
-DISTNAME = fuse-zip-0.4.5
-REVISION = 0
+DISTNAME = fuse-zip-0.5.0
 
 CATEGORIES = archivers
 
@@ -12,7 +11,7 @@ HOMEPAGE = https://bitbucket.org/agalan
 # GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB = ${COMPILER_LIBCXX} bz2 c fuse m z zip
+WANTLIB += ${COMPILER_LIBCXX} c fuse m zip
 
 MASTER_SITES = https://bitbucket.org/agalanin/fuse-zip/downloads/
 
@@ -21,18 +20,17 @@ COMPILER = base-clang ports-gcc base-gc
 LIB_DEPENDS = archivers/libzip>=0.11.2
 
 MAKE_FLAGS = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" prefix="${PREFIX}"
+ LDFLAGS="${LDFLAGS}"
+FAKE_FLAGS = prefix="${PREFIX}" mandir="${PREFIX}/man"
 
 USE_GMAKE = Yes
 
 TEST_TARGET = check
 
-do-configure:
- ln -s ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
+pre-test:
+ ln -sf ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
 
 post-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/fuse-zip ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/fuse-zip.1 ${PREFIX}/man/man1
- rm -Rf ${PREFIX}/share/man
+ gzip -d ${PREFIX}/man/man[0-9]/*.gz
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 6 Feb 2018 11:16:26 -0000 1.4
+++ distinfo 7 Dec 2018 07:41:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (fuse-zip-0.4.5.tar.gz) = LFEB9by41mbRymAnF7qQFWfa0uetfenbbluyasV0NdE=
-SIZE (fuse-zip-0.4.5.tar.gz) = 687727
+SHA256 (fuse-zip-0.5.0.tar.gz) = 3VUwc/gVS11i51LlPhFfvZKFhvCLeTZzV0/HXmssmro=
+SIZE (fuse-zip-0.5.0.tar.gz) = 688610
Index: patches/patch-fuse-zip_1
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/patches/patch-fuse-zip_1,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-fuse-zip_1
--- patches/patch-fuse-zip_1 28 Jan 2014 01:01:52 -0000 1.1.1.1
+++ patches/patch-fuse-zip_1 7 Dec 2018 07:41:19 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-fuse-zip_1,v 1.1.1.1 2014/01/28 01:01:52 jca Exp $
---- fuse-zip.1.orig Tue Jan 21 00:32:45 2014
-+++ fuse-zip.1 Tue Jan 21 00:33:14 2014
-@@ -69,10 +69,6 @@ Be patient. Wait for fuse-zip process finish after unm
+Index: fuse-zip.1
+--- fuse-zip.1.orig
++++ fuse-zip.1
+@@ -75,10 +75,6 @@ Be patient. Wait for fuse-zip process finish after unm
  .SH "PERMISSIONS"
  Access check will not be performed unless
  \fB-o default_permissions\fP mount option is given.
@@ -10,5 +11,5 @@ $OpenBSD: patch-fuse-zip_1,v 1.1.1.1 201
 -.if !'po4a'hide' .I /var/log/user.log
 -see this file in case any errors occur
  .SH "SEE ALSO"
- .BR fusermount (1).
- .SH "LICENSE"
+ .BR fusermount (1),
+ .BR mount.fuse (8).

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE archivers/fuse-zip

Klemens Nanni-2
On Fri, Dec 07, 2018 at 09:13:27AM +0100, Klemens Nanni wrote:
> * make -> gmake symlink is needed for tests only as tests/Makefile uses
>   `make' whereas Makefile already goes with proper $(MAKE) so turn
>   do-configure into pre-test
> * post-install is pretty much a do-install, so simply pass the proper
>   mandir and just uncompress the manual as that's the only required step
The update went without them, so I'd like to get it in now.

No package change, hence no bump.

Feedback? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/fuse-zip/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 7 Dec 2018 13:20:31 -0000 1.12
+++ Makefile 9 Dec 2018 19:43:10 -0000
@@ -20,18 +20,17 @@ COMPILER = base-clang ports-gcc base-gc
 LIB_DEPENDS = archivers/libzip>=0.11.2
 
 MAKE_FLAGS = CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" prefix="${PREFIX}"
+ LDFLAGS="${LDFLAGS}"
+FAKE_FLAGS = prefix="${PREFIX}" mandir="${PREFIX}/man"
 
 USE_GMAKE = Yes
 
 TEST_TARGET = check
 
-do-configure:
- ln -s ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
+pre-test:
+ ln -sf ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make
 
 post-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/fuse-zip ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/fuse-zip.1 ${PREFIX}/man/man1
- rm -Rf ${PREFIX}/share/man
+ gzip -d ${PREFIX}/man/man[0-9]/*.gz
 
 .include <bsd.port.mk>

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE archivers/fuse-zip

Björn Ketelaars
On Sun 09/12/2018 22:03, Klemens Nanni wrote:

> On Fri, Dec 07, 2018 at 09:13:27AM +0100, Klemens Nanni wrote:
> > * make -> gmake symlink is needed for tests only as tests/Makefile uses
> >   `make' whereas Makefile already goes with proper $(MAKE) so turn
> >   do-configure into pre-test
> > * post-install is pretty much a do-install, so simply pass the proper
> >   mandir and just uncompress the manual as that's the only required step
> The update went without them, so I'd like to get it in now.
>
> No package change, hence no bump.
>
> Feedback? OK?

No problems found while building, and testing.

OK bket@