[oe-commits] [meta-openembedded] 40/40: sthttpd: update to 2.27.0
git at git.openembedded.org
git at git.openembedded.org
Thu May 19 10:08:09 UTC 2016
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 6b928f3a4184109a2aed1c2964183e964bfd9a7f
Author: Marco Trillo <martri at arantia.com>
AuthorDate: Thu May 19 08:46:33 2016 +0200
sthttpd: update to 2.27.0
Update sthttpd to release 2.27.0.
The variable WEBGROUP is introduced to allow configuring the group used
for the special ${sbindir}/makeweb tool, which in 2.27.0 is installed
setgid to this group by default, whereas in 2.26.4 it was not.
sthttpd 2.27 uses `thttpd' as the default value; here, the more
standard `www-data' group is used by default.
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../sthttpd/{sthttpd_2.26.4.bb => sthttpd_2.27.0.bb} | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.0.bb
similarity index 80%
rename from meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb
rename to meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.0.bb
index 7034921..efa533a 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.0.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://opensource.dyc.edu/pub/sthttpd/sthttpd-${PV}.tar.gz \
file://thttpd.conf \
file://init"
-SRC_URI[md5sum] = "e645a85a97d3cb883011a35bc2211815"
-SRC_URI[sha256sum] = "78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb"
+SRC_URI[md5sum] = "f7dd2d506dc5fad2ad8794b1800d2634"
+SRC_URI[sha256sum] = "97d660a881331e93818e872ce11536f461105d70a18dfc5de5895851c4b2afdb"
S = "${WORKDIR}/sthttpd-${PV}"
@@ -18,7 +18,14 @@ inherit autotools update-rc.d systemd
SRV_DIR ?= "${servicedir}/www"
-EXTRA_OEMAKE += "'WEBDIR=${SRV_DIR}'"
+# Note that `${sbindir}/makeweb' is installed setgid to this group,
+# but ${SRV_DIR} is not installed chgrp'd to the group by default.
+WEBGROUP ?= "www-data"
+
+do_configure_prepend () {
+ export WEBDIR=${SRV_DIR}
+ export WEBGROUP=${WEBGROUP}
+}
do_install_append () {
install -d ${D}${sysconfdir}/init.d
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list