commit 7c6b3ecc08b9590d1b901e9f6ebb875ff1b8df63 Author: Adam Gołębiowski <ad...@pld-linux.org> Date: Tue Sep 25 00:06:46 2018 +0200
- openssl-1.1 buildfix (cherry-picked commit feb6711 from https://github.com/lkarsten/hitch) - release 3 hitch-openssl-1.1.patch | 30 ++++++++++++++++++++++++++++++ hitch.spec | 4 +++- 2 files changed, 33 insertions(+), 1 deletion(-) --- diff --git a/hitch.spec b/hitch.spec index 460c170..61b08df 100644 --- a/hitch.spec +++ b/hitch.spec @@ -6,13 +6,14 @@ Summary: Network proxy that terminates TLS/SSL connections Name: hitch Version: 1.4.6 -Release: 2 +Release: 3 License: BSD Group: Daemons Source0: https://hitch-tls.org/source/%{name}-%{version}.tar.gz # Source0-md5: 3ae020bb5bd2b1f23c860519a89c2e35 Patch0: %{name}.systemd.service.patch Patch1: %{name}.initrc.redhat.patch +Patch2: %{name}-openssl-1.1.patch URL: https://hitch-tls.org/ BuildRequires: libev-devel >= 4 BuildRequires: libtool @@ -54,6 +55,7 @@ machines. cp -p hitch.conf.example hitch.conf %patch0 %patch1 +%patch2 -p1 %build CFLAGS="%{rpmcflags} -fPIE" diff --git a/hitch-openssl-1.1.patch b/hitch-openssl-1.1.patch new file mode 100644 index 0000000..5cc50fa --- /dev/null +++ b/hitch-openssl-1.1.patch @@ -0,0 +1,30 @@ +commit feb67119549125cbac78645c0f37fec6fc4aca9e +Author: Lasse Karstensen <lasse.karsten...@gmail.com> +Date: Sun Mar 25 13:07:00 2018 +0200 + + Unconstify struct frontend pointer. + + Needs review. + +diff --git a/src/hitch.c b/src/hitch.c +index cdfb6c6..115d67c 100644 +--- a/src/hitch.c ++++ b/src/hitch.c +@@ -861,7 +861,7 @@ Find_issuer(X509 *subj, STACK_OF(X509) *chain) + + /* Initialize an SSL context */ + static sslctx * +-make_ctx_fr(const struct cfg_cert_file *cf, const struct frontend *fr, ++make_ctx_fr(const struct cfg_cert_file *cf, struct frontend *fr, + const struct front_arg *fa) + { + SSL_CTX *ctx; +@@ -1079,7 +1079,7 @@ insert_sni_names(sslctx *sc, sni_name **sn_tab) + } + + static sslctx * +-make_ctx(const struct cfg_cert_file *cf) ++make_ctx(struct cfg_cert_file *cf) + { + return (make_ctx_fr(cf, NULL, NULL)); + } ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hitch.git/commitdiff/7c6b3ecc08b9590d1b901e9f6ebb875ff1b8df63 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit