summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-webserver
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-11-16 00:35:37 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-11-16 00:36:18 +0300
commit87b3cb8045d81fae0a99f13817bfa0c28c9b3576 (patch)
tree2ccd0491dca6659964161e0c3252dc9fb9b1c1e8 /meta-openembedded/meta-webserver
parent1d80a2eac54644288c7f2820d3c3fbcb5402b351 (diff)
downloadopenbmc-87b3cb8045d81fae0a99f13817bfa0c28c9b3576.tar.xz
meta-openembedded: subtree update:3a9262866d..55de2d06ad
Adrian Bunk (1): python-more-itertools: Add PE Andreas Müller (1): Add gnome help packages to image according to IMAGE_LINGUAS Andreas Oberritter (2): live555: Move test progams out of main package pugixml: Update to version 1.10 André Draszik (7): gyp: update to fcd686f1880f gyp: provide a python2 version of gyp as gyp-py2 nodejs: ensure to use correct compiler & flags always nodejs: delete all bundled deps in do_unpack() if needed nodejs: allow use of system gyp nodejs: use OE-provided compiler flags (arm) nodejs: support long directory names for ${B} / ${S} Denys Dmytriyenko (1): mbedtls: upgrade 2.16.2 -> 2.16.3 Fabio Berton (5): python-importlib-metadata: Add native and nativesdk to BBCLASSEXTEND python-more-itertools: Add native and nativesdk to BBCLASSEXTEND python-pathlib2: Add native and nativesdk to BBCLASSEXTEND python-zipp: Add native and nativesdk to BBCLASSEXTEND python3-importlib-metadata: RDEPEND python3-misc only for target and nativesdk Khem Raj (13): sip: Upgrade to 4.19.19 cherokee: Update to latest cherokee: Fix build when time_t is 64bit tvheadend: Update to tip of master lowpan-tools: Blacklist as its deprecated use wpan-tools instead pidgin-sipe: Fix build when time_t is 64bit open-vm-tools: Enable tirpc explicitly, fix build with 64bit time_t python-systemd: Include endian.h for htobe16 tvheadend: Fix build with 64bit time_t tvheadend: Set CLEANBROKEN layer.conf: Add ttf-roboto->fontconfig to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS layer.conf: Add phpmyadmin->php dep to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS python-six: Update to 1.13.0 Michael Scott (1): modemmanager: Upgrade 1.10.6 -> 1.10.8 Nicola Lunghi (5): python3-gmqtt: add recipe python-backports-abc: update to 0.5.0 python-rfc3339-validator: add recipe python-rfc3986-validator: add recipe python-dbus-next: fix recipe position Peace Lee (1): guider: upgrade 3.9.4 -> 3.9.6 Trevor Gamblin (4): python3-werkzeug: upgrade from 0.14.1 to 0.16.0 python3-flask: upgrade from 1.0.2 to 1.1.1 python3-itsdangerous: upgrade from 0.24 to 1.1.0 zabbix: upgrade 4.2.8 -> 4.4.1 Yi Zhao (1): python-ipy: add recipes Zang Ruochen (15): fuse3: upgrade 3.7.0 -> 3.8.0 python-alembic: upgrade 1.2.1 -> 1.3.0 python-astroid: upgrade 2.3.2 -> 2.3.3 python-bitarray: upgrade 1.0.1 -> 1.1.0 python-cffi: upgrade 1.13.1 -> 1.13.2 python-dateutil: upgrade 2.8.0 -> 2.8.1 python-psutil: upgrade 5.6.3 -> 5.6.5 python-pycryptodome: upgrade 3.9.0 -> 3.9.3 python-pyparsing: upgrade 2.4.2 -> 2.4.5 python-pytest-helpers-namespace: upgrade 2016.7.10 -> 2019.1.8 python-pytest-runner: upgrade 5.1 -> 5.2 python-pytest-tempdir: upgrade 2016.8.20 -> 2019.10.12 python-requests-oauthlib: upgrade 0.8.0 -> 1.3.0 python-tornado: upgrade 5.1 -> 6.0.3 python-tqdm: upgrade 4.31.1 -> 4.38.0 Zheng Ruoqin (1): f2fs-tools: Update Homepage Change-Id: Ifc2d7bac36a719f2a4ead82b491d9817f212c56f Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-webserver')
-rw-r--r--meta-openembedded/meta-webserver/conf/layer.conf1
-rw-r--r--meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch47
-rw-r--r--meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb3
3 files changed, 50 insertions, 1 deletions
diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf
index 6157d4d30..2c6fad4ac 100644
--- a/meta-openembedded/meta-webserver/conf/layer.conf
+++ b/meta-openembedded/meta-webserver/conf/layer.conf
@@ -23,4 +23,5 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
phpmyadmin->bash \
+ phpmyadmin->php \
"
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
new file mode 100644
index 000000000..0f4384275
--- /dev/null
+++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
@@ -0,0 +1,47 @@
+From c73415021f3f3b2b30062ab74b25fe49c51c2242 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 10 Nov 2019 15:59:44 -0800
+Subject: [PATCH] common-internal.h: Define LLONG_MAX if undefined
+
+time_t can also be long long type, therefore check for that as fallback
+Fixes build on 32bit hosts where time_t is fixed for Y2K38
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ cherokee/common-internal.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/cherokee/common-internal.h b/cherokee/common-internal.h
+index 5c28da97..5646ec0f 100644
+--- a/cherokee/common-internal.h
++++ b/cherokee/common-internal.h
+@@ -222,6 +222,16 @@ char *strcasestr(char *s, char *find);
+ # endif
+ #endif
+
++/* Long Long limit
++ */
++#ifndef LLONG_MAX
++# if (__SIZEOF_LONG_LONG__ == 8)
++# define LLONG_MAX 0x7fffffffffffffffLL
++# else
++# error "Can't define LLONG_MAX"
++# endif
++#endif
++
+ /* time_t limit
+ */
+ #ifndef TIME_MAX
+@@ -229,6 +239,8 @@ char *strcasestr(char *s, char *find);
+ # define TIME_MAX ((time_t)INT_MAX)
+ # elif (SIZEOF_TIME_T == SIZEOF_LONG)
+ # define TIME_MAX ((time_t)LONG_MAX)
++# elif (SIZEOF_TIME_T == __SIZEOF_LONG_LONG__)
++# define TIME_MAX ((time_t)LLONG_MAX)
+ # else
+ # error "Can't define TIME_MAX"
+ # endif
+--
+2.24.0
+
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
index 3f7eae4c1..490fc53f9 100644
--- a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
+++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-SRCREV = "75f041e2255e6dd0692db2f14611c2647dbe8425"
+SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59"
PV = "1.2.104+git${SRCPV}"
SRC_URI = "git://github.com/cherokee/webserver \
file://cherokee.init \
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/cherokee/webserver \
file://cherokee-install-configured.py-once.patch \
file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \
file://0001-make-Do-not-build-po-files.patch \
+ file://0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch \
"
S = "${WORKDIR}/git"