From 8d3fbb1acf80636d918b63748423810d6231dda1 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Wed, 20 May 2020 20:08:03 +0800 Subject: [PATCH] hitch: update to 1.5.2 Minor update: https://github.com/varnish/hitch/blob/master/CHANGES.rst#hitch-152-2019-11-27 I removed the configure hacks, as it failed to apply cleanly and hacking configure scripts is not my idea of fun. It was added in July 2017 (ccc7092) presumably to work around bugs somewhere, which may or may not still be present. I've also taken the library of setting myself as the maintainer, as the current maintainer never did any work on it since 2016 and the domain in the listed email address no longer exists. --- srcpkgs/hitch/patches/configure.patch | 107 -------------------------- srcpkgs/hitch/template | 7 +- 2 files changed, 3 insertions(+), 111 deletions(-) delete mode 100644 srcpkgs/hitch/patches/configure.patch diff --git a/srcpkgs/hitch/patches/configure.patch b/srcpkgs/hitch/patches/configure.patch deleted file mode 100644 index 7ee4f34b829..00000000000 --- a/srcpkgs/hitch/patches/configure.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- configure-master 2017-07-01 11:07:01.170862696 -0600 -+++ configure 2017-07-01 11:17:37.613785126 -0600 -@@ -6544,12 +6544,6 @@ - $as_echo_n "checking whether the compiler accepts -O2... " >&6; } - _cflags="$CFLAGS" - CFLAGS="$HITCH_CFLAGS -O2 $CFLAGS" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(void) { return (0); } -@@ -6563,7 +6557,6 @@ - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - CFLAGS="$_cflags" - -@@ -6572,12 +6565,6 @@ - $as_echo_n "checking whether the compiler accepts -g... " >&6; } - _cflags="$CFLAGS" - CFLAGS="$HITCH_CFLAGS -g $CFLAGS" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(void) { return (0); } -@@ -6591,7 +6578,6 @@ - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - CFLAGS="$_cflags" - -@@ -6600,12 +6586,6 @@ - $as_echo_n "checking whether the compiler accepts -Wall... " >&6; } - _cflags="$CFLAGS" - CFLAGS="$HITCH_CFLAGS -Wall $CFLAGS" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(void) { return (0); } -@@ -6619,7 +6599,6 @@ - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - CFLAGS="$_cflags" - -@@ -6628,12 +6607,6 @@ - $as_echo_n "checking whether the compiler accepts -W... " >&6; } - _cflags="$CFLAGS" - CFLAGS="$HITCH_CFLAGS -W $CFLAGS" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(void) { return (0); } -@@ -6647,7 +6620,6 @@ - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - CFLAGS="$_cflags" - -@@ -6664,12 +6636,6 @@ - $as_echo_n "checking whether the compiler accepts -fno-strict-aliasing... " >&6; } - _cflags="$CFLAGS" - CFLAGS="$EV_CFLAGS -fno-strict-aliasing $CFLAGS" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(void) { return (0); } -@@ -6683,7 +6649,6 @@ - fi - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - CFLAGS="$_cflags" - diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template index b349d38f19e..3d5e302bd8a 100644 --- a/srcpkgs/hitch/template +++ b/srcpkgs/hitch/template @@ -1,17 +1,16 @@ # Template file for 'hitch' pkgname=hitch -version=1.5.0 +version=1.5.2 revision=2 build_style=gnu-configure -configure_args="ac_cv_so_reuseport_works=yes" hostmakedepends="pkg-config" makedepends="libev-devel libressl-devel" short_desc="Libev-based high performance SSL/TLS proxy" -maintainer="Jannis Christ " +maintainer="Martin Tournoij " license="BSD-2-Clause" homepage="https://hitch-tls.org/" distfiles="https://hitch-tls.org/source/hitch-${version}.tar.gz" -checksum=0ec254699292f73e419ff279d2834db31026192ef373a91badd82e2dc7154d0b +checksum=b1a4fd64584cd4ff816b8513ee5522db34a4431747057421b6e870f722c6dfda system_accounts="_hitch" post_install() {