diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-11-14 06:41:47 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-11-14 06:41:47 +0000 |
| commit | 571d2ed220791fb9174a1423a3e0bfa3cb955d71 (patch) | |
| tree | 29a9ca9e21cc8eb201a155686cf61c7e8c254d1f | |
| parent | 4c07d8f6c7fa14c65ef33ca3b34f2469dcacde5c (diff) | |
| download | ports-571d2ed220791fb9174a1423a3e0bfa3cb955d71.tar.gz ports-571d2ed220791fb9174a1423a3e0bfa3cb955d71.zip | |
Notes
| -rw-r--r-- | security/john/Makefile | 24 | ||||
| -rw-r--r-- | security/john/files/patch-rawSHA0__fmt__plug.c | 25 |
2 files changed, 40 insertions, 9 deletions
diff --git a/security/john/Makefile b/security/john/Makefile index 1131200d3d30..3dac6f2d965c 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -52,6 +52,28 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS #OPENMP #OPENMP_USES= compiler:openmp +post-patch: +# Replace methods and types that were marked deprecated by OpenSSL 0.9.7 +# and removed in OpenSSL 1.1.0 and LibreSSL + @${REINPLACE_CMD} -e 's|des_string_to_key|DES_string_to_key|' \ + ${WRKSRC}/KRB4_fmt_plug.c + @${REINPLACE_CMD} -e 's|des_set_odd_parity|DES_set_odd_parity|' \ + ${WRKSRC}/KRB4_std_plug.c + @${REINPLACE_CMD} -e 's|C_Block|DES_cblock|' \ + ${WRKSRC}/efs_fmt_plug.c \ + ${WRKSRC}/gpg_fmt_plug.c \ + ${WRKSRC}/keychain_fmt_plug.c \ + ${WRKSRC}/mozilla_ng_fmt_plug.c \ + ${WRKSRC}/opencl_gpg_fmt_plug.c \ + ${WRKSRC}/opencl_keychain_fmt_plug.c \ + ${WRKSRC}/ssh_ng_fmt_plug.c + +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000024 +CFLAGS+= -flax-vector-conversions +.endif + do-install: .for b in ${BINARIES} ${INSTALL_PROGRAM} ${WRKSRC}/../run/${b} ${STAGEDIR}${PREFIX}/bin @@ -71,4 +93,4 @@ do-install-DOCS-on: @${RM} ${WRKSRC}/../doc/COPYING ${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/security/john/files/patch-rawSHA0__fmt__plug.c b/security/john/files/patch-rawSHA0__fmt__plug.c index b183e8fa2a75..a058e163a672 100644 --- a/security/john/files/patch-rawSHA0__fmt__plug.c +++ b/security/john/files/patch-rawSHA0__fmt__plug.c @@ -1,18 +1,27 @@ --- rawSHA0_fmt_plug.c.orig 2014-09-19 16:40:51 UTC +++ rawSHA0_fmt_plug.c -@@ -15,6 +15,8 @@ john_register_one(&fmt_rawSHA_0); - #include <string.h> - #include <openssl/sha.h> +@@ -6,6 +6,10 @@ + * Based on Raw-SHA1, but this is OpenSSL only. + */ ++#include <openssl/sha.h> ++ +#ifndef OPENSSL_NO_SHA0 + + #if FMT_EXTERNS_H + extern struct fmt_main fmt_rawSHA_0; + #elif FMT_REGISTERS_H +@@ -13,7 +17,6 @@ john_register_one(&fmt_rawSHA_0); + #else + + #include <string.h> +-#include <openssl/sha.h> + #include "arch.h" #include "misc.h" - #include "common.h" -@@ -207,4 +209,6 @@ struct fmt_main fmt_rawSHA_0 = { - } +@@ -208,3 +211,5 @@ struct fmt_main fmt_rawSHA_0 = { }; -+#endif /* OPENSSL_NO_SHA0 */ -+ #endif /* plugin stanza */ ++ ++#endif /* OPENSSL_NO_SHA0 */ |