Re: UPDATE: john-jumbo to 1.9.0-jumbo-1

Do the new examples files not need @sample?

--
Sent from a phone, apologies for poor formatting.
On 27 November 2020 09:58:47 "Sebastian Reitenbach"
<sebastia@l00-bugdead-prods.de> wrote:

> Hi,
>
> patch below updates john-jumbo to 1.9.0-jumbo-1. I attempted last year, but
> at that time, the SIP test failed reliably. Now, that problem just got
> addressed, and while there, a number of other patches upstreamed.
> At lest for me on amd64, all tests pass. Tests from other platforms welcome.
> While there, take MAINTAINER.
>
> comments, test reports etc. or even OK welcome.
>
> cheers,
> Sebastian
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/john-jumbo/Makefile,v
> retrieving revision 1.22
> diff -u -r1.22 Makefile
> --- Makefile 7 Apr 2020 13:29:52 -0000 1.22
> +++ Makefile 27 Nov 2020 09:49:56 -0000
> @@ -4,9 +4,8 @@
> BROKEN-alpha = DES_bs.c:173: internal compiler error: in get_callee_fndecl,
> at tree.c:5940
> FIX_EXTRACT_PERMISSIONS=Yes
>
> -V = 1.8.0
> +V = 1.9.0
> JV = 1
> -REVISION = 4
> EXTRACT_SUFX = .tar.xz
>
> DISTNAME = john-$V-jumbo-${JV}
> @@ -14,17 +13,17 @@
> CATEGORIES = security
>
> HOMEPAGE = https://www.openwall.com/john/
> +MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
>
> # files from various authors; see license review txt file
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 pthread smime3
> -WANTLIB += nssutil3 sqlite3 ssl ssl3 z
> +WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 smime3
> +WANTLIB += nssutil3 ssl ssl3 z
>
> -MASTER_SITES = https://www.openwall.com/john/j/
> +MASTER_SITES = https://www.openwall.com/john/k/
>
> -LIB_DEPENDS = databases/sqlite3 \
> - security/nss
> +LIB_DEPENDS = security/nss
>
> USE_GMAKE = Yes
> MAKE_FILE = Makefile.legacy
> @@ -68,13 +67,12 @@
> ALL_TARGET= generic
> .endif
>
> -BINS += SIPdump calc_stat cprepair genmkvpwd luks2john makechr
> +BINS += SIPdump calc_stat cprepair genmkvpwd makechr
> BINS += mkvcalcproba raw2dyna tgtsnarf uaf2john vncpcap2john wpapcap2john
>
> do-configure:
> perl -pi -e 's,\$$JOHN/john.conf,${SYSCONFDIR}/john.conf,' ${WRKSRC}/params.h
> rm ${WRKSRC}/KRB4_*_plug.c # no old DES API support in LibreSSL
> - rm ${WRKSRC}/rawSHA0_fmt_plug.c # no SHA-0 support in LibreSSL
>
> do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
> @@ -87,7 +85,7 @@
> ln -sf john ${PREFIX}/bin/`basename $$i`; done
> ${INSTALL_DATA} ${WRKDIST}/run/*.{chr,conf,lst} \
> ${PREFIX}/share/examples/john
> - ${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
> + cp -R ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
>
> # not using TEST_TARGET as it gets confused by the quotes in CFLAGS
> do-test:
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/john-jumbo/distinfo,v
> retrieving revision 1.3
> diff -u -r1.3 distinfo
> --- distinfo 16 Jan 2015 15:40:01 -0000 1.3
> +++ distinfo 27 Nov 2020 09:49:56 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (john-1.8.0-jumbo-1.tar.xz) =
> usk9AlmVoFHwVa29fOLxl1Z2ysbHSmx6PuTP3ZwWCSM=
> -SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492
> +SHA256 (john-1.9.0-jumbo-1.tar.xz) =
> 9dEj+CmDxT2MxZjhdDlLB0vnp3dW9fte2FFZGMgefzs=
> +SIZE (john-1.9.0-jumbo-1.tar.xz) = 33638768
> Index: patches/patch-src_Makefile_legacy
> ===================================================================
> RCS file: /cvs/ports/security/john-jumbo/patches/patch-src_Makefile_legacy,v
> retrieving revision 1.2
> diff -u -r1.2 patch-src_Makefile_legacy
> --- patches/patch-src_Makefile_legacy 24 Apr 2018 18:10:55 -0000 1.2
> +++ patches/patch-src_Makefile_legacy 27 Nov 2020 09:49:56 -0000
> @@ -2,7 +2,7 @@
> Index: src/Makefile.legacy
> --- src/Makefile.legacy.orig
> +++ src/Makefile.legacy
> -@@ -1073,11 +1073,9 @@ openbsd-alpha:
> +@@ -976,11 +976,9 @@ openbsd-alpha:
> openbsd-sparc64:
> $(LN) sparc64.h arch.h
> @echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
> @@ -16,7 +16,7 @@
> @echo "All done"
>
> openbsd-sparc:
> -@@ -1922,7 +1920,7 @@ generic: generic.h
> +@@ -1718,7 +1716,7 @@ generic: generic.h
> $(RM) arch.h
> ln -s generic.h arch.h
> @echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
> @@ -25,12 +25,12 @@
>
> generic.h:
> $(RM) arch.h
> -@@ -2307,7 +2305,7 @@ john.com: john.asm
> +@@ -1919,7 +1917,7 @@ john.com: john.asm
>
> ../run/cprepair: cprepair.c unicode.c unicode.h options.h misc.h misc.c \
> - memdbg.h memdbg.c
> +
> - $(CC) -Wall -O3 -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
> + $(CC) -Wall $(COPTFLAGS) -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c
> unicode.c \
> - misc.c memdbg.c -o ../run/cprepair
> + misc.c memory.c -o ../run/cprepair
>
> ../run/tgtsnarf: tgtsnarf.o
> Index: patches/patch-src_cprepair_c
> ===================================================================
> RCS file: /cvs/ports/security/john-jumbo/patches/patch-src_cprepair_c,v
> retrieving revision 1.1
> diff -u -r1.1 patch-src_cprepair_c
> --- patches/patch-src_cprepair_c 24 Apr 2018 18:10:55 -0000 1.1
> +++ patches/patch-src_cprepair_c 27 Nov 2020 09:49:56 -0000
> @@ -1,14 +1,16 @@
> $OpenBSD: patch-src_cprepair_c,v 1.1 2018/04/24 18:10:55 naddy Exp $
>
> +upstreamed
> +
> Index: src/cprepair.c
> --- src/cprepair.c.orig
> +++ src/cprepair.c
> -@@ -274,7 +274,7 @@ static int process_file(char *name)
> +@@ -241,7 +241,7 @@ static int process_file(char *name)
>
> int main(int argc, char **argv)
> {
> -- char c;
> +- signed char c;
> + int c;
>
> - options.verbosity = 3;
> + options.verbosity = VERB_DEFAULT;
>
> Index: patches/patch-src_efs_fmt_plug_c
> ===================================================================
> RCS file: patches/patch-src_efs_fmt_plug_c
> diff -N patches/patch-src_efs_fmt_plug_c
> --- patches/patch-src_efs_fmt_plug_c 18 Jan 2015 11:57:22 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_efs_fmt_plug_c,v 1.4 2015/01/18 11:57:22 sthen Exp $
> ---- src/efs_fmt_plug.c.orig Thu Dec 18 00:59:02 2014
> -+++ src/efs_fmt_plug.c Sun Jan 18 04:51:49 2015
> -@@ -42,6 +42,10 @@ john_register_one(&fmt_efs);
> -