Michael McConville wrote:
> Apparently this is their first release in >5 years.
>
> The website says that development is done on GitHub and links to this
> repo. The 0.14 release is only on GitHub.
>
> They use MAP_POPULATE, which is a Linuxism, in an mmap() test call. I
> removed it but I'm not sure what the file tests for. Could this
> interfere?
>
> Also, wouldn't this be better put in the security or devel category?
>
> It fails one test. I'm not sure whether this matters. Any experienced
> zzuf users out there?
Upstream surrounded the mmap test in an #ifdef MAP_POPULATE since the
last release, effectively disabling it, so I opted for that instead.
zhuk suggested that USE_GROFF may be unnecessary and it builds without
it, but I'll leave it in for now because sthen had concerns about the
man page formatting.
I got an ok from zhuk@. Any objections?
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/zzuf/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 21 Mar 2013 08:46:33 -0000 1.11
+++ Makefile 18 Nov 2015 21:43:36 -0000
@@ -2,10 +2,11 @@
COMMENT= transparent application input fuzzer
-DISTNAME= zzuf-0.13
-REVISION= 2
+VERSION= 0.14
+DISTNAME= zzuf-${VERSION}
CATEGORIES= misc
-MASTER_SITES= http://libcaca.zoy.org/files/zzuf/
+
+MASTER_SITES=
https://github.com/samhocevar/zzuf/releases/download/v${VERSION}/
# WTFPL
PERMIT_PACKAGE_CDROM= Yes
@@ -14,12 +15,5 @@ WANTLIB= c m
CONFIGURE_STYLE= gnu
USE_GROFF= Yes
-
-pre-configure:
- perl -pi -e 's/zzcat/zzufcat/g' ${WRKSRC}/doc/zzcat.1.in
-
-post-install:
- cd ${PREFIX}/bin && mv zzcat zzufcat
- cd ${PREFIX}/man/man1 && mv zzcat.1 zzufcat.1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/zzuf/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:14:34 -0000 1.6
+++ distinfo 18 Nov 2015 21:43:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (zzuf-0.13.tar.gz) = CELFSFIgKMPg2cnPfQn2MgtmHzOCS7bfGcogmFG99ic=
-SIZE (zzuf-0.13.tar.gz) = 461498
+SHA256 (zzuf-0.14.tar.gz) = KRtB1Trm33XQ0rSg+qMzrfxKArnKhwa+5H73vmV5Zs4=
+SIZE (zzuf-0.14.tar.gz) = 469885
Index: patches/patch-src_libzzuf_lib-stream_c
===================================================================
RCS file: patches/patch-src_libzzuf_lib-stream_c
diff -N patches/patch-src_libzzuf_lib-stream_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libzzuf_lib-stream_c 18 Nov 2015 21:43:36 -0000
@@ -0,0 +1,16 @@
+A simple missing semicolon. Fixed upstream by commit 9eb78c6:
+
+
https://github.com/samhocevar/zzuf/commit/9eb78c602c1ef292cb5d94e6dad5d3d2c4215786
+
+$OpenBSD$
+--- src/libzzuf/lib-stream.c.orig Tue Nov 17 23:58:02 2015
++++ src/libzzuf/lib-stream.c Tue Nov 17 23:58:29 2015
+@@ -1052,7 +1052,7 @@ char *NEW(fgetln)(FILE *stream, size_t *len)
+
+ fuzz->tmp[i] = (char)(unsigned char)chr;
+ }
+- while (fuzz->tmp[i++] != '\n')
++ while (fuzz->tmp[i++] != '\n');
+
+ *len = i;
+ char *ret = fuzz->tmp;
Index: patches/patch-src_md5_c
===================================================================
RCS file: patches/patch-src_md5_c
diff -N patches/patch-src_md5_c
--- patches/patch-src_md5_c 14 Jul 2014 08:07:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_md5_c,v 1.1 2014/07/14 08:07:37 espie Exp $
---- src/md5.c.orig Mon Jul 14 09:43:54 2014
-+++ src/md5.c Mon Jul 14 09:44:40 2014
-@@ -24,6 +24,10 @@
- #endif
- #if defined HAVE_ENDIAN_H
- # include <endian.h>
-+# if !defined(__BYTE_ORDER)
-+# define __BYTE_ORDER BYTE_ORDER
-+# define __LITTLE_ENDIAN LITTLE_ENDIAN
-+# endif
- #endif
- #include <string.h>
- #include <stdlib.h>
Index: patches/patch-src_util_md5_c
===================================================================
RCS file: patches/patch-src_util_md5_c
diff -N patches/patch-src_util_md5_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_util_md5_c 18 Nov 2015 21:43:36 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/util/md5.c.orig Sat May 30 10:30:00 2015
++++ src/util/md5.c Wed Nov 18 00:05:36 2015
+@@ -24,6 +24,10 @@
+ #endif
+ #if defined HAVE_ENDIAN_H
+ # include <endian.h>
++# if !defined(__BYTE_ORDER)
++# define __BYTE_ORDER BYTE_ORDER
++# define __LITTLE_ENDIAN LITTLE_ENDIAN
++# endif
+ #endif
+ #include <string.h>
+ #include <stdlib.h>
Index: patches/patch-test_bug-mmap_c
===================================================================
RCS file: patches/patch-test_bug-mmap_c
diff -N patches/patch-test_bug-mmap_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_bug-mmap_c 18 Nov 2015 21:43:36 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/bug-mmap.c.orig Sat May 30 10:30:00 2015
++++ test/bug-mmap.c Wed Nov 18 16:39:20 2015
+@@ -13,8 +13,6 @@
+
+ #include "config.h"
+
+-#define _BSD_SOURCE 1 /* for MAP_POPULATE */
+-
+ #if HAVE_SYS_MMAN_H
+ # include <sys/mman.h>
+ #endif
+@@ -32,7 +30,7 @@
+
+ int main(void)
+ {
+-#if defined _SC_PAGE_SIZE
++#if defined _SC_PAGE_SIZE && defined MAP_POPULATE
+ int fd = open("/etc/hosts", O_RDONLY);
+ mmap(0, sysconf(_SC_PAGE_SIZE) * 2, PROT_READ,
+ MAP_PRIVATE | MAP_POPULATE, fd, 0);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/zzuf/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 28 Oct 2010 10:17:54 -0000 1.4
+++ pkg/PLIST 18 Nov 2015 21:43:36 -0000
@@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.4 2010/10/28 10:17:54 steven Exp $
%%SHARED%%
+@bin bin/zzat
@bin bin/zzuf
-@bin bin/zzufcat
lib/zzuf/
lib/zzuf/libzzuf.a
lib/zzuf/libzzuf.la
+@man man/man1/zzat.1
@man man/man1/zzuf.1
-@man man/man1/zzufcat.1
@man man/man3/libzzuf.3
