From 2691b699d40072fc46b6fa10b78d522fea338d15 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Thu, 18 Jun 2015 08:20:47 +0000 Subject: [PATCH] h2o: update to 1.3.0. --- srcpkgs/h2o/patches/glibc-execinfo.patch | 29 ++++++++++++++++++++++++ srcpkgs/h2o/template | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/h2o/patches/glibc-execinfo.patch diff --git a/srcpkgs/h2o/patches/glibc-execinfo.patch b/srcpkgs/h2o/patches/glibc-execinfo.patch new file mode 100644 index 00000000000..b9428143d91 --- /dev/null +++ b/srcpkgs/h2o/patches/glibc-execinfo.patch @@ -0,0 +1,29 @@ +--- src/main.c.orig 2015-06-18 08:13:27.185634622 +0000 ++++ src/main.c 2015-06-18 08:14:36.524223552 +0000 +@@ -47,7 +47,7 @@ + #include + #include + #include +-#ifdef __linux__ ++#ifdef __GLIBC__ + #include + #endif + #include "cloexec.h" +@@ -1065,7 +1065,7 @@ + notify_all_threads(); + } + +-#ifdef __linux__ ++#ifdef __GLIBC__ + static int popen_annotate_backtrace_symbols(void) + { + char *cmd_fullpath = h2o_configurator_get_cmd_path("share/h2o/annotate-backtrace-symbols"), *argv[] = {cmd_fullpath, NULL}; +@@ -1118,7 +1118,7 @@ + { + h2o_set_signal_handler(SIGTERM, on_sigterm); + h2o_set_signal_handler(SIGPIPE, SIG_IGN); +-#ifdef __linux__ ++#ifdef __GLIBC__ + if ((backtrace_symbols_to_fd = popen_annotate_backtrace_symbols()) == -1) + backtrace_symbols_to_fd = 2; + h2o_set_signal_handler(SIGABRT, on_sigfatal); diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 51ff0353fda..fa56eb58da4 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -1,6 +1,6 @@ # Template file for 'h2o' pkgname=h2o -version=1.2.0 +version=1.3.0 revision=1 build_style=cmake configure_flags="-DUSE_BUNDLED_SSL=OFF" @@ -15,7 +15,7 @@ maintainer="Eivind Uggedal " license="MIT" homepage="https://github.com/h2o/h2o" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=09aacd84ea0a53eaffdc8e0c2a2cf1108bea5db81d5859a136221fd67f07833f +checksum=01a32a51edfea24526a0d0df085c66867706e41dd07073f777d6fbaa8d15a62d post_install() { vsv h2o