diff options
Diffstat (limited to 'meta-openembedded/meta-webserver/recipes-httpd')
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb (renamed from meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch | 145 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf | 55 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo | 34 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb | 64 |
8 files changed, 4 insertions, 305 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb index 197cb83e6..e84f7eaa2 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb @@ -115,7 +115,7 @@ do_install_append_class-target() { sed -i -e 's,${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk @@ -123,7 +123,7 @@ do_install_append_class-target() { sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb index 89910841f..9729fd4a8 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb @@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ file://hiawatha-init \ file://hiawatha.service " -SRC_URI[md5sum] = "6dcec72e94facbdc69b103006fa5819f" -SRC_URI[sha256sum] = "79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727" +SRC_URI[md5sum] = "d9e282be06ed456207726b7ac0df9d48" +SRC_URI[sha256sum] = "61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d" INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch deleted file mode 100644 index 8cd468235..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 7fa0d31ec5c0be9dca84a03851b2d44f61527ec8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> -Date: Sun, 4 Dec 2011 16:01:04 +0100 -Subject: [PATCH] GNUmakefile: add possibility to override variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this is useful for cross compilation - -Signed-off-by: Eric BĂ©nard <eric@eukrea.com> ---- -Upstream-Status: Inappropriate [embedded specific] - src/libbsd/GNUmakefile | 10 +++++----- - src/libmy/GNUmakefile | 26 +++++++++++++------------- - src/nhttpd/GNUmakefile | 12 ++++++------ - src/tools/GNUmakefile | 8 ++++---- - 4 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile -index e2d01a3..b034bc6 100644 ---- a/src/libbsd/GNUmakefile -+++ b/src/libbsd/GNUmakefile -@@ -1,12 +1,12 @@ --CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c -+CFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes -c - - libbsd.a: strlcpy.o strlcat.o -- ar -r libbsd.a strlcpy.o strlcat.o -- ranlib libbsd.a -+ $(AR) -r libbsd.a strlcpy.o strlcat.o -+ $(RANLIB) libbsd.a - - strlcpy.o: strlcpy.c -- cc ${CCFLAGS} strlcpy.c -+ $(CC) $(CFLAGS) strlcpy.c - strlcat.o: strlcat.c -- cc ${CCFLAGS} strlcat.c -+ $(CC) $(CFLAGS) strlcat.c - clean: - rm -f libbsd.a *.o -diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile -index ce90dd9..891ffea 100644 ---- a/src/libmy/GNUmakefile -+++ b/src/libmy/GNUmakefile -@@ -1,30 +1,30 @@ --CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c -+CFLAGS := -O2 -Wall -Werror -Wstrict-prototypes -c - - libmy.a: strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o -- ar -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o -- ranlib libmy.a -+ $(AR) -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o -+ $(RANLIB) libmy.a - - strcutl.o: strcutl.c -- cc ${CCFLAGS} strcutl.c -+ $(CC) $(CFLAGS) strcutl.c - strcutw.o: strcutw.c -- cc ${CCFLAGS} strcutw.c -+ $(CC) $(CFLAGS) strcutw.c - strcuts.o: strcuts.c -- cc ${CCFLAGS} strcuts.c -+ $(CC) $(CFLAGS) strcuts.c - strcuti.o: strcuti.c -- cc ${CCFLAGS} strcuti.c -+ $(CC) $(CFLAGS) strcuti.c - strcutf.o: strcutf.c -- cc ${CCFLAGS} strcutf.c -+ $(CC) $(CFLAGS) strcutf.c - strlower.o: strlower.c -- cc ${CCFLAGS} strlower.c -+ $(CC) $(CFLAGS) strlower.c - strb64d.o: strb64d.c -- cc ${CCFLAGS} strb64d.c -+ $(CC) $(CFLAGS) strb64d.c - - flog.o: flog.c -- cc ${CCFLAGS} flog.c -+ $(CC) $(CFLAGS) flog.c - flogd.o: flogd.c -- cc ${CCFLAGS} flogd.c -+ $(CC) $(CFLAGS) flogd.c - fparse.o: fparse.c -- cc ${CCFLAGS} fparse.c -+ $(CC) $(CFLAGS) fparse.c - - clean: - rm -f libmy.a *.o -diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile -index f6d12de..9524911 100644 ---- a/src/nhttpd/GNUmakefile -+++ b/src/nhttpd/GNUmakefile -@@ -1,20 +1,20 @@ - # $nostromo: GNUmakefile,v 1.6 2016/04/12 19:02:06 hacki Exp $ - --CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c -+CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c - - nhttpd: main.o http.o sys.o -- cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt -- strip nhttpd -+ $(CC) -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt -+# $(STRIP) nhttpd - nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8 - - main.o: main.c -- cc ${CCFLAGS} main.c -+ $(CC) $(CFLAGS) main.c - - http.o: http.c -- cc ${CCFLAGS} http.c -+ $(CC) $(CFLAGS) http.c - - sys.o: sys.c -- cc ${CCFLAGS} sys.c -+ $(CC) $(CFLAGS) sys.c - - clean: - rm -f nhttpd nhttpd.cat8 *.o -diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile -index 15bea61..663ddb5 100644 ---- a/src/tools/GNUmakefile -+++ b/src/tools/GNUmakefile -@@ -1,13 +1,13 @@ - # $nostromo: GNUmakefile,v 1.3 2016/04/12 19:02:58 hacki Exp $ - --CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c -+CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes - - crypt: crypt.o -- cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd -- strip crypt -+ $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd -+# $(STRIP) crypt - - crypt.o: crypt.c -- cc ${CCFLAGS} crypt.c -+ $(CC) $(CFLAGS) -c crypt.c - - clean: - rm -f crypt *.o --- -1.7.6.4 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf deleted file mode 100644 index 6674bb696..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf +++ /dev/null @@ -1,55 +0,0 @@ -# MAIN [MANDATORY] - -servername localhost -#servername www.nazgul.ch:8080 -serverlisten * -#serverlisten 81.221.21.250 127.0.0.1 ::1 -serveradmin webmaster@localhost -serverroot /var/nostromo -servermimes /var/nostromo/conf/mimes -docroot /var/nostromo/htdocs -docindex index.html - -# LOGS [OPTIONAL] - -logpid /var/run/nostromo/nhttpd.pid -#logaccess /var/log/nostromo/access_log - -# SETUID [RECOMMENDED] - -user www-data - -# BASIC AUTHENTICATION [OPTIONAL] - -#htaccess .htaccess -#htpasswd /var/nostromo/conf/.htpasswd -#htpasswd +bsdauth -#htpasswd +bsdauthnossl - -# SSL [OPTIONAL] - -#sslport 443 -#sslcert /etc/ssl/server.crt -#sslcertkey /etc/ssl/server.key - -# CUSTOM RESPONSES [OPTIONAL] -# -# The custom responses are searched in the corresponding document root. - -#custom_401 custom_401.html -#custom_403 custom_403.html -#custom_404 custom_404.html - -# ALIASES [OPTIONAL] - -/icons /var/nostromo/icons - -# VIRTUAL HOSTS [OPTIONAL] - -#www.rahel.ch /var/nostromo/htdocs/www.rahel.ch -#www.rahel.ch:8080 /var/nostromo/htdocs/www.rahel.ch - -# HOMEDIRS [OPTIONAL] - -#homedirs /home -#homedirs_public public_www diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo deleted file mode 100644 index 8a2886882..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=nhttpd -NAME=nhttpd -DESC="Nostromo Web Server" -OPTS="-c /etc/nhttpd.conf" - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start -x "$DAEMON" -- $OPTS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop -x "$DAEMON" - echo "$NAME." - ;; - restart|force-reload) - echo -n "Restarting $DESC: " - start-stop-daemon --stop -x "$DAEMON" - sleep 1 - start-stop-daemon --start -x "$DAEMON" -- $OPTS - echo "$NAME." - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf deleted file mode 100644 index b7a9f4886..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/nostromo - www-data www-data - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles deleted file mode 100644 index 40924960c..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles +++ /dev/null @@ -1,2 +0,0 @@ -d www-data www-data 0775 /var/run/nostromo none -d www-data www-data 0775 /var/log/nostromo none diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb deleted file mode 100644 index e726c9ac6..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "A simple, fast and secure HTTP server" -HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" - -SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ - file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ - file://nhttpd.conf \ - file://volatiles \ - file://tmpfiles.conf \ - file://nostromo \ -" - -SRC_URI[md5sum] = "a054eb8e09560082793aaad676e33bd3" -SRC_URI[sha256sum] = "1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486" - -TARGET_CC_ARCH += "${LDFLAGS}" - -DEPENDS = "openssl groff-native base-passwd virtual/crypt" - -inherit update-rc.d - -INITSCRIPT_NAME = "nostromo" -INITSCRIPT_PARAMS = "defaults 70" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${sbindir} - install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd - install -m 0755 src/tools/crypt ${D}/${sbindir}/crypt - install -d ${D}/${mandir}/man8 - install -m 0444 src/nhttpd/nhttpd.8 ${D}/${mandir}/man8/nhttpd.8 - install -d ${D}${localstatedir}/nostromo/conf - install -d ${D}${localstatedir}/nostromo/htdocs/cgi-bin - install -d ${D}${localstatedir}/nostromo/icons - install -d ${D}${sysconfdir}/init.d - install -m 0644 conf/mimes ${D}${localstatedir}/nostromo/conf/mimes - install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d - install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf - fi - install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html - install -m 0644 htdocs/nostromo.gif ${D}${localstatedir}/nostromo/htdocs/nostromo.gif - install -m 0644 icons/dir.gif ${D}${localstatedir}/nostromo/icons/dir.gif - install -m 0644 icons/file.gif ${D}${localstatedir}/nostromo/icons/file.gif - chown -R www-data:www-data ${D}/${localstatedir}/nostromo -} - -CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf" - -pkg_postinst_${PN} () { - if [ -z "$D" ]; then - if [ -e /sys/fs/cgroup/systemd ]; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nostromo.conf - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - fi -} |