aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-10-15 14:25:56 -0600
committerDan McGregor <dan.mcgregor@usask.ca>2015-10-23 10:00:55 -0600
commit46764811c3514e299eba73f4a2e3960f1119fa6c (patch)
tree050881b50d38112edc39e62636a46d7272455c43
parent38922a504329d79aa71b46dd04030afaa68e2f27 (diff)
downloadmeta-openembedded-contrib-dankm/emacs.tar.gz
meta-openembedded-contrib-dankm/emacs.tar.bz2
meta-openembedded-contrib-dankm/emacs.zip
gateone: update to latest gitdankm/emacs
This version works with pyton-tornado 4.2 as currently distributed with OE. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
-rw-r--r--meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch26
-rw-r--r--meta-python/recipes-connectivity/gateone/gateone/80oe.conf1
-rw-r--r--meta-python/recipes-connectivity/gateone/gateone_git.bb7
3 files changed, 5 insertions, 29 deletions
diff --git a/meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch b/meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
deleted file mode 100644
index 5f5fa9117e..0000000000
--- a/meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d811d3bdf06d78c93c48bef762c19c392c879077 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Tue, 26 Nov 2013 15:54:10 +0100
-Subject: [PATCH] configuration.py: Hack around broken gethostname thingy
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- gateone/core/configuration.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gateone/core/configuration.py b/gateone/core/configuration.py
-index da41cbd..d1c8222 100644
---- a/gateone/core/configuration.py
-+++ b/gateone/core/configuration.py
-@@ -162,7 +162,7 @@ def define_options(installed=True):
- ]
- # Used both http and https above to demonstrate that both are acceptable
- try:
-- additional_origins = socket.gethostbyname_ex(socket.gethostname())
-+ additional_origins = [] # additional_origins = socket.gethostbyname_ex(socket.gethostname())
- except socket.gaierror:
- # Couldn't get any IPs from the hostname
- additional_origins = []
---
-1.8.4.2
-
diff --git a/meta-python/recipes-connectivity/gateone/gateone/80oe.conf b/meta-python/recipes-connectivity/gateone/gateone/80oe.conf
index cde98bc10d..09cdbfaecb 100644
--- a/meta-python/recipes-connectivity/gateone/gateone/80oe.conf
+++ b/meta-python/recipes-connectivity/gateone/gateone/80oe.conf
@@ -2,6 +2,7 @@
{
"*": {
"gateone": { // These settings apply to all of Gate One
+ "log_file_prefix": "/var/log/gateone.log", // default would be /var/log/gateone/gateone.log
"log_file_max_size": 5242880, // 5 megabyte logs for OE by default (default would normally be 100Mb)
"log_file_num_backups": 2, // Default is normally 10
"origins": ["*"], // Every device has a unique origin
diff --git a/meta-python/recipes-connectivity/gateone/gateone_git.bb b/meta-python/recipes-connectivity/gateone/gateone_git.bb
index 7eae12a8bf..80bbae8c21 100644
--- a/meta-python/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-python/recipes-connectivity/gateone/gateone_git.bb
@@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=834cbc6995db88433db17cdf8953a428"
HOMEPAGE = "http://liftoffsoftware.com/Products/GateOne"
PV = "1.2"
-SRCREV = "1528d324088fc1c180b7fdf50f5b5c1af057eef6"
-SRC_URI = "git://github.com/liftoff/GateOne.git \
- file://0001-configuration.py-Hack-around-broken-gethostname-thin.patch \
+SRCREV = "17fbf85753f4d9c317950a3ef14f811188a51cb7"
+SRC_URI = "git://github.com/liftoff/GateOne.git;branch=master \
file://gateone-avahi.service \
file://80oe.conf \
file://gateone.service \
@@ -49,6 +48,7 @@ FILES_${PN} = "${localstatedir}/lib ${bindir} ${base_libdir} ${sysconfdir} ${PYT
RDEPENDS_${PN} = "mime-support \
openssh-ssh \
python-compression \
+ python-contextlib \
python-crypt \
python-datetime \
python-email \
@@ -76,6 +76,7 @@ RDEPENDS_${PN} = "mime-support \
python-tornado \
python-unixadmin \
python-xml \
+ python-html5lib \
bash \
"