Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] hitch: update to 1.5.2
@ 2020-05-20 14:16 arp242
  2020-05-20 20:15 ` Chocimier
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: arp242 @ 2020-05-20 14:16 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 824 bytes --]

There is a new pull request by arp242 against master on the void-packages repository

https://github.com/arp242/void-packages hitch
https://github.com/void-linux/void-packages/pull/22153

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.

A patch file from https://github.com/void-linux/void-packages/pull/22153.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hitch-22153.patch --]
[-- Type: text/x-diff, Size: 5865 bytes --]

From 8d3fbb1acf80636d918b63748423810d6231dda1 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
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 <hello@jannis.ovh>"
+maintainer="Martin Tournoij <martin@arp242.net>"
 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() {

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: hitch: update to 1.5.2
  2020-05-20 14:16 [PR PATCH] hitch: update to 1.5.2 arp242
@ 2020-05-20 20:15 ` Chocimier
  2020-05-21 23:14 ` ericonr
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-05-20 20:15 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/22153#issuecomment-631701991

Comment:
Apparently cross build patch need to be extended.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: hitch: update to 1.5.2
  2020-05-20 14:16 [PR PATCH] hitch: update to 1.5.2 arp242
  2020-05-20 20:15 ` Chocimier
@ 2020-05-21 23:14 ` ericonr
  2020-05-25 20:57 ` jnbr
  2020-05-26 20:34 ` [PR PATCH] [Closed]: " jnbr
  3 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-05-21 23:14 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22153#issuecomment-632392100

Comment:
> configure: error: cannot run test program while cross compiling

Perhaps there's a configure option to disable testing?

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: hitch: update to 1.5.2
  2020-05-20 14:16 [PR PATCH] hitch: update to 1.5.2 arp242
  2020-05-20 20:15 ` Chocimier
  2020-05-21 23:14 ` ericonr
@ 2020-05-25 20:57 ` jnbr
  2020-05-26 20:34 ` [PR PATCH] [Closed]: " jnbr
  3 siblings, 0 replies; 6+ messages in thread
From: jnbr @ 2020-05-25 20:57 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/22153#issuecomment-633714260

Comment:
there is also https://github.com/void-linux/void-packages/pull/21495

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Closed]: hitch: update to 1.5.2
  2020-05-20 14:16 [PR PATCH] hitch: update to 1.5.2 arp242
                   ` (2 preceding siblings ...)
  2020-05-25 20:57 ` jnbr
@ 2020-05-26 20:34 ` jnbr
  3 siblings, 0 replies; 6+ messages in thread
From: jnbr @ 2020-05-26 20:34 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 677 bytes --]

There's a closed pull request on the void-packages repository

hitch: update to 1.5.2
https://github.com/void-linux/void-packages/pull/22153

Description:
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.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PR PATCH] hitch: update to 1.5.2
@ 2020-04-30 20:40 4ricci
  0 siblings, 0 replies; 6+ messages in thread
From: 4ricci @ 2020-04-30 20:40 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

There is a new pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages hitch
https://github.com/void-linux/void-packages/pull/21495

hitch: update to 1.5.2


A patch file from https://github.com/void-linux/void-packages/pull/21495.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hitch-21495.patch --]
[-- Type: text/x-diff, Size: 6355 bytes --]

From 421f67eeb97606cbdca35b0d9f2b2529e3c303be Mon Sep 17 00:00:00 2001
From: 4ricci <52817765+4ricci@users.noreply.github.com>
Date: Thu, 30 Apr 2020 22:32:23 +0200
Subject: [PATCH] hitch: update to 1.5.2

---
 srcpkgs/hitch/patches/configure.patch | 76 ++++++++++++++++++---------
 srcpkgs/hitch/template                |  8 +--
 2 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/hitch/patches/configure.patch b/srcpkgs/hitch/patches/configure.patch
index 7ee4f34b829..eba616119d1 100644
--- a/srcpkgs/hitch/patches/configure.patch
+++ b/srcpkgs/hitch/patches/configure.patch
@@ -1,9 +1,9 @@
---- 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"
+--- configure-master	2020-04-30 18:55:31.884880427 +0200
++++ configure	2020-04-30 19:58:12.271990731 +0200
+@@ -6798,12 +6798,6 @@
+ $as_echo_n "checking whether the compiler accepts -g... " >&6; }
+ 	hitch_save_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;}
@@ -13,18 +13,18 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int main(void) { return (0); }
-@@ -6563,7 +6557,6 @@
+@@ -6817,7 +6811,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"
+ 	CFLAGS=$hitch_save_CFLAGS
  
-@@ -6572,12 +6565,6 @@
- $as_echo_n "checking whether the compiler accepts -g... " >&6; }
- 	_cflags="$CFLAGS"
- 	CFLAGS="$HITCH_CFLAGS -g $CFLAGS"
+@@ -6826,12 +6819,6 @@
+ $as_echo_n "checking whether the compiler accepts -O2... " >&6; }
+ 	hitch_save_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;}
@@ -34,17 +34,17 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int main(void) { return (0); }
-@@ -6591,7 +6578,6 @@
+@@ -6845,7 +6832,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"
+ 	CFLAGS=$hitch_save_CFLAGS
  
-@@ -6600,12 +6586,6 @@
+@@ -6862,12 +6848,6 @@
  $as_echo_n "checking whether the compiler accepts -Wall... " >&6; }
- 	_cflags="$CFLAGS"
+ 	hitch_save_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
@@ -55,17 +55,17 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int main(void) { return (0); }
-@@ -6619,7 +6599,6 @@
+@@ -6881,7 +6861,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"
+ 	CFLAGS=$hitch_save_CFLAGS
  
-@@ -6628,12 +6607,6 @@
+@@ -6890,12 +6869,6 @@
  $as_echo_n "checking whether the compiler accepts -W... " >&6; }
- 	_cflags="$CFLAGS"
+ 	hitch_save_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
@@ -76,17 +76,38 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int main(void) { return (0); }
-@@ -6647,7 +6620,6 @@
+@@ -6909,7 +6882,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"
+ 	CFLAGS=$hitch_save_CFLAGS
  
-@@ -6664,12 +6636,6 @@
+@@ -6918,12 +6890,6 @@
+ $as_echo_n "checking whether the compiler accepts -Werror... " >&6; }
+ 	hitch_save_CFLAGS=$CFLAGS
+ 	CFLAGS="$HITCH_CFLAGS -Werror $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); }
+@@ -6937,7 +6903,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=$hitch_save_CFLAGS
+ 
+@@ -6956,12 +6921,6 @@
  $as_echo_n "checking whether the compiler accepts -fno-strict-aliasing... " >&6; }
- 	_cflags="$CFLAGS"
+ 	hitch_save_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
@@ -97,11 +118,14 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  int main(void) { return (0); }
-@@ -6683,7 +6649,6 @@
+@@ -6975,9 +6934,8 @@
  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"
+-	CFLAGS=$hitch_save_CFLAGS
++	CFLAGS="$hitch_save_CFLAGS -fno-strict-aliasing"
+ 
+ 
  
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index b349d38f19e..b8b2fc494a2 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,9 +1,9 @@
 # Template file for 'hitch'
 pkgname=hitch
-version=1.5.0
-revision=2
+version=1.5.2
+revision=1
 build_style=gnu-configure
-configure_args="ac_cv_so_reuseport_works=yes"
+configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
 hostmakedepends="pkg-config"
 makedepends="libev-devel libressl-devel"
 short_desc="Libev-based high performance SSL/TLS proxy"
@@ -11,7 +11,7 @@ maintainer="Jannis Christ <hello@jannis.ovh>"
 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() {

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 14:16 [PR PATCH] hitch: update to 1.5.2 arp242
2020-05-20 20:15 ` Chocimier
2020-05-21 23:14 ` ericonr
2020-05-25 20:57 ` jnbr
2020-05-26 20:34 ` [PR PATCH] [Closed]: " jnbr
  -- strict thread matches above, loose matches on Subject: below --
2020-04-30 20:40 [PR PATCH] " 4ricci

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git