jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hitch: update to 1.4.6

Browse source 
Closes: #6916 [via git-merge-pr]
This commit is contained in:
Sir_Boops 2017-07-01 11:20:17 -06:00 committed by Michael Aldridge
parent aaeb7dfe37
commit cc70924dc5
3 changed files with 110 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
srcpkgs/hitch/patches/configure.patch Normal file
View file

@ -0,0 +1,107 @@
--- 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"

11
srcpkgs/hitch/patches/libressl.patch
View file

@ -1,11 +0,0 @@
--- src/hitch.c.orig 2017-02-16 01:37:27.743263070 -0500
+++ src/hitch.c 2017-02-16 01:37:59.846392318 -0500
@@ -683,7 +683,7 @@
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define SSL_CTX_get_default_passwd_cb(ctx) (ctx->default_passwd_callback)
#define SSL_CTX_get_default_passwd_cb_userdata(ctx) (ctx->default_passwd_callback_userdata)
#endif

6
srcpkgs/hitch/template
View file

@ -1,7 +1,7 @@
# Template file for 'hitch'
pkgname=hitch
version=1.4.4
revision=2
version=1.4.6
revision=1
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes"
hostmakedepends="pkg-config"
@ -11,7 +11,7 @@ maintainer="Jannis Christ <hello@jannis.ovh>"
license="2-clause-BSD"
homepage="https://hitch-tls.org/"
distfiles="https://hitch-tls.org/source/hitch-${version}.tar.gz"
checksum=5b4e8deeaafa6ae3998b24af035c8df9bd25e6527c4e1811645f53368da69eab
checksum=b095e465f0fc37c5e46cfc0fbcf987ba90ed660caf7f559547df8dea985fec2b
system_accounts="_hitch"
post_install() {