Re: update misc/zzuf
On Sun, Apr 29 2018, Solene Rapenne wrote: > bump 0.14 => 0.15 > > - two patches are removed because merged upstream > - one patch added to remove ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
update misc/zzuf
bump 0.14 => 0.15
- two patches are removed because merged upstream
- one patch added to remove
Index: Makefile
===
RCS file: /cvs/ports/misc/zzuf/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile5 Feb 2018 06:30:21 - 1.18
+++ Makefile29 Apr 2018 12:18:16 -
@@ -4,9 +4,9 @@ BROKEN-hppa=__sync_lock_test_and_set_4
COMMENT= transparent application input fuzzer
-VERSION= 0.14
+VERSION= 0.15
DISTNAME= zzuf-${VERSION}
-REVISION= 1
+
CATEGORIES=misc security
MASTER_SITES=
https://github.com/samhocevar/zzuf/releases/download/v${VERSION}/
Index: distinfo
===
RCS file: /cvs/ports/misc/zzuf/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo19 Nov 2015 00:55:23 - 1.7
+++ distinfo29 Apr 2018 12:18:16 -
@@ -1,2 +1,2 @@
-SHA256 (zzuf-0.14.tar.gz) = KRtB1Trm33XQ0rSg+qMzrfxKArnKhwa+5H73vmV5Zs4=
-SIZE (zzuf-0.14.tar.gz) = 469885
+SHA256 (zzuf-0.15.tar.gz) = o09iRQPgms0mnHDYJqrCo1wD6E3DUYc/FA8LpqeS/9Y=
+SIZE (zzuf-0.15.tar.gz) = 493559
Index: patches/patch-configure
===
RCS file: /cvs/ports/misc/zzuf/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 14 Mar 2017 02:43:18 - 1.1
+++ patches/patch-configure 29 Apr 2018 12:18:16 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.1 2017/03/14 02:43:18 jca Exp $
configure.orig Tue Mar 14 03:39:28 2017
-+++ configure Tue Mar 14 03:41:16 2017
-@@ -11915,7 +11915,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+Index: configure
+--- configure.orig
configure
+@@ -12423,7 +12423,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_try_cflags_ok" >&5
$as_echo "$ac_cv_try_cflags_ok" >&6; }
if test x"$ac_cv_try_cflags_ok" = x"yes"; then
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
--- patches/patch-src_libzzuf_lib-stream_c 19 Nov 2015 00:55:23 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-A simple missing semicolon. Fixed upstream by commit 9eb78c6:
-
-
https://github.com/samhocevar/zzuf/commit/9eb78c602c1ef292cb5d94e6dad5d3d2c4215786
-
-$OpenBSD: patch-src_libzzuf_lib-stream_c,v 1.1 2015/11/19 00:55:23 mmcc Exp $
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_zzuf_c
===
RCS file: patches/patch-src_zzuf_c
diff -N patches/patch-src_zzuf_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_zzuf_c29 Apr 2018 12:18:16 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/zzuf.c
+--- src/zzuf.c.orig
src/zzuf.c
+@@ -48,7 +48,6 @@
+ #include
+ #include
+ #include
+-#include
+ #if defined HAVE_SYS_TIME_H
+ # include
+ #endif
Index: patches/patch-test_bug-mmap_c
===
RCS file: /cvs/ports/misc/zzuf/patches/patch-test_bug-mmap_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-test_bug-mmap_c
--- patches/patch-test_bug-mmap_c 19 Nov 2015 00:55:23 - 1.1
+++ patches/patch-test_bug-mmap_c 29 Apr 2018 12:18:16 -
@@ -10,12 +10,3 @@ $OpenBSD: patch-test_bug-mmap_c,v 1.1 20
#if HAVE_SYS_MMAN_H
# include
#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);
Re: [UPDATE] misc/zzuf 0.14
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
--- Makefile21 Mar 2013 08:46:33 - 1.11
+++ Makefile18 Nov 2015 21:43:36 -
@@ -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
Index: distinfo
===
RCS file: /cvs/ports/misc/zzuf/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:14:34 - 1.6
+++ distinfo18 Nov 2015 21:43:36 -
@@ -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 -
+++ patches/patch-src_libzzuf_lib-stream_c 18 Nov 2015 21:43:36 -
@@ -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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
-+# if !defined(__BYTE_ORDER)
-+# define __BYTE_ORDER BYTE_ORDER
-+# define __LITTLE_ENDIAN LITTLE_ENDIAN
-+# endif
- #endif
- #include
- #include
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 -
+++ patches/patch-src_util_md5_c18 Nov 2015 21:43:36 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/util/md5.c.origSat 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
++# if !defined(__BYTE_ORDER)
++# define __BYTE_ORDER BYTE_ORDER
++# define __LITTLE_ENDIAN LITTLE_ENDIAN
++# endif
+ #endif
+ #include
+ #include
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 -
+++ patches/patch-test_bug-mmap_c 18 Nov 2015 21:43:36 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/bug-mmap.c.orig
[UPDATE] misc/zzuf 0.14
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?
Index: Makefile
===
RCS file: /cvs/ports/misc/zzuf/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile21 Mar 2013 08:46:33 - 1.11
+++ Makefile18 Nov 2015 05:34:03 -
@@ -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
Index: distinfo
===
RCS file: /cvs/ports/misc/zzuf/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo18 Jan 2015 03:14:34 - 1.6
+++ distinfo18 Nov 2015 05:34:03 -
@@ -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 -
+++ patches/patch-src_libzzuf_lib-stream_c 18 Nov 2015 05:34:03 -
@@ -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 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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
-+# if !defined(__BYTE_ORDER)
-+# define __BYTE_ORDER BYTE_ORDER
-+# define __LITTLE_ENDIAN LITTLE_ENDIAN
-+# endif
- #endif
- #include
- #include
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 -
+++ patches/patch-src_util_md5_c18 Nov 2015 05:34:03 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/util/md5.c.origSat 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
++# if !defined(__BYTE_ORDER)
++# define __BYTE_ORDER BYTE_ORDER
++# define __LITTLE_ENDIAN LITTLE_ENDIAN
++# endif
+ #endif
+ #include
+ #include
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 -
+++ patches/patch-test_bug-mmap_c 18 Nov 2015 05:34:03 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/bug-mmap.c.orig Wed Nov 18 00:14:02 2015
test/bug-mmap.cWed Nov 18 00:14:26 2015
+@@ -13,8 +13,6 @@
+
+ #include "config.h"
+
+-#define _BSD_SOURCE 1 /* for MAP_POPULATE */
+-
+ #if HAVE_SYS_MMAN_H
+ # include
+ #endif
+@@ -35,7 +33,7 @@ int main(void)
+ #if defined _SC_PAGE_SIZE
+ int fd = open("/etc/hosts", O_RDONLY);
+ mmap(0, sysconf(_SC_PAGE_SIZE) * 2, PROT_READ,
+- MAP_PRI
UPDATE: misc/zzuf
Changes from zzuf 0.12 to 0.13 * various fixes for Linux, FreeBSD, OS X and OpenBSD libc calls. * network host filtering support. * support for memory limits on OS X. * massive testsuite improvements. * support most cat options in zzcat, which is now fully programmable. Tested on amd64 and powerpc. Index: Makefile === RCS file: /cvs/ports/misc/zzuf/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile18 Oct 2010 20:52:10 - 1.5 +++ Makefile26 Oct 2010 22:41:07 - @@ -2,7 +2,7 @@ COMMENT= zzuf is a transparent application input fuzzer -DISTNAME= zzuf-0.12 +DISTNAME= zzuf-0.13 CATEGORIES=misc MASTER_SITES= http://libcaca.zoy.org/files/zzuf/ @@ -15,6 +15,6 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c m CONFIGURE_STYLE= gnu -USE_GROFF =Yes +USE_GROFF =Yes .include Index: distinfo === RCS file: /cvs/ports/misc/zzuf/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo1 Jul 2008 10:10:24 - 1.4 +++ distinfo26 Oct 2010 22:41:07 - @@ -1,5 +1,5 @@ -MD5 (zzuf-0.12.tar.gz) = Ofl0MrAuNYzfKRX4RO4xBg== -RMD160 (zzuf-0.12.tar.gz) = LrgcQTay9E8BLuw0SEGXE4rthoQ= -SHA1 (zzuf-0.12.tar.gz) = E6Wr7PWF9NqJPwWSSF+eUPtCrXE= -SHA256 (zzuf-0.12.tar.gz) = Con9tpEtTdaKyIxUlR6Hc4KU0TVi4NV2YvuQl0uUdxA= -SIZE (zzuf-0.12.tar.gz) = 446043 +MD5 (zzuf-0.13.tar.gz) = dFecQp+WkfZBoU9AiZfULQ== +RMD160 (zzuf-0.13.tar.gz) = 75mIptl/ITCQInoLbYfk2ULtjBU= +SHA1 (zzuf-0.13.tar.gz) = GfkE1j0EUZSIVjnDgaYHyoajGbU= +SHA256 (zzuf-0.13.tar.gz) = CELFSFIgKMPg2cnPfQn2MgtmHzOCS7bfGcogmFG99ic= +SIZE (zzuf-0.13.tar.gz) = 461498 Index: pkg/PLIST === RCS file: /cvs/ports/misc/zzuf/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 3 Oct 2007 13:48:17 - 1.1.1.1 +++ pkg/PLIST 26 Oct 2010 22:41:07 - @@ -1,7 +1,10 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/03 13:48:17 chl Exp $ %%SHARED%% -bin/zzuf +...@bin bin/zzcat +...@bin bin/zzuf lib/zzuf/ lib/zzuf/libzzuf.a lib/zzuf/libzzuf.la +...@man man/man1/zzcat.1 @man man/man1/zzuf.1 +...@man man/man3/libzzuf.3
