diff options
6 files changed, 0 insertions, 301 deletions
diff --git a/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch deleted file mode 100644 index 8cd4682355..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch +++ /dev/null | |||
| @@ -1,145 +0,0 @@ | |||
| 1 | From 7fa0d31ec5c0be9dca84a03851b2d44f61527ec8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
| 3 | Date: Sun, 4 Dec 2011 16:01:04 +0100 | ||
| 4 | Subject: [PATCH] GNUmakefile: add possibility to override variables | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | this is useful for cross compilation | ||
| 10 | |||
| 11 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
| 12 | --- | ||
| 13 | Upstream-Status: Inappropriate [embedded specific] | ||
| 14 | src/libbsd/GNUmakefile | 10 +++++----- | ||
| 15 | src/libmy/GNUmakefile | 26 +++++++++++++------------- | ||
| 16 | src/nhttpd/GNUmakefile | 12 ++++++------ | ||
| 17 | src/tools/GNUmakefile | 8 ++++---- | ||
| 18 | 4 files changed, 28 insertions(+), 28 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/src/libbsd/GNUmakefile b/src/libbsd/GNUmakefile | ||
| 21 | index e2d01a3..b034bc6 100644 | ||
| 22 | --- a/src/libbsd/GNUmakefile | ||
| 23 | +++ b/src/libbsd/GNUmakefile | ||
| 24 | @@ -1,12 +1,12 @@ | ||
| 25 | -CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c | ||
| 26 | +CFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes -c | ||
| 27 | |||
| 28 | libbsd.a: strlcpy.o strlcat.o | ||
| 29 | - ar -r libbsd.a strlcpy.o strlcat.o | ||
| 30 | - ranlib libbsd.a | ||
| 31 | + $(AR) -r libbsd.a strlcpy.o strlcat.o | ||
| 32 | + $(RANLIB) libbsd.a | ||
| 33 | |||
| 34 | strlcpy.o: strlcpy.c | ||
| 35 | - cc ${CCFLAGS} strlcpy.c | ||
| 36 | + $(CC) $(CFLAGS) strlcpy.c | ||
| 37 | strlcat.o: strlcat.c | ||
| 38 | - cc ${CCFLAGS} strlcat.c | ||
| 39 | + $(CC) $(CFLAGS) strlcat.c | ||
| 40 | clean: | ||
| 41 | rm -f libbsd.a *.o | ||
| 42 | diff --git a/src/libmy/GNUmakefile b/src/libmy/GNUmakefile | ||
| 43 | index ce90dd9..891ffea 100644 | ||
| 44 | --- a/src/libmy/GNUmakefile | ||
| 45 | +++ b/src/libmy/GNUmakefile | ||
| 46 | @@ -1,30 +1,30 @@ | ||
| 47 | -CCFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -c | ||
| 48 | +CFLAGS := -O2 -Wall -Werror -Wstrict-prototypes -c | ||
| 49 | |||
| 50 | libmy.a: strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o | ||
| 51 | - ar -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o | ||
| 52 | - ranlib libmy.a | ||
| 53 | + $(AR) -r libmy.a strcutl.o strcutw.o strcuts.o strcuti.o strcutf.o flog.o flogd.o fparse.o strlower.o strb64d.o | ||
| 54 | + $(RANLIB) libmy.a | ||
| 55 | |||
| 56 | strcutl.o: strcutl.c | ||
| 57 | - cc ${CCFLAGS} strcutl.c | ||
| 58 | + $(CC) $(CFLAGS) strcutl.c | ||
| 59 | strcutw.o: strcutw.c | ||
| 60 | - cc ${CCFLAGS} strcutw.c | ||
| 61 | + $(CC) $(CFLAGS) strcutw.c | ||
| 62 | strcuts.o: strcuts.c | ||
| 63 | - cc ${CCFLAGS} strcuts.c | ||
| 64 | + $(CC) $(CFLAGS) strcuts.c | ||
| 65 | strcuti.o: strcuti.c | ||
| 66 | - cc ${CCFLAGS} strcuti.c | ||
| 67 | + $(CC) $(CFLAGS) strcuti.c | ||
| 68 | strcutf.o: strcutf.c | ||
| 69 | - cc ${CCFLAGS} strcutf.c | ||
| 70 | + $(CC) $(CFLAGS) strcutf.c | ||
| 71 | strlower.o: strlower.c | ||
| 72 | - cc ${CCFLAGS} strlower.c | ||
| 73 | + $(CC) $(CFLAGS) strlower.c | ||
| 74 | strb64d.o: strb64d.c | ||
| 75 | - cc ${CCFLAGS} strb64d.c | ||
| 76 | + $(CC) $(CFLAGS) strb64d.c | ||
| 77 | |||
| 78 | flog.o: flog.c | ||
| 79 | - cc ${CCFLAGS} flog.c | ||
| 80 | + $(CC) $(CFLAGS) flog.c | ||
| 81 | flogd.o: flogd.c | ||
| 82 | - cc ${CCFLAGS} flogd.c | ||
| 83 | + $(CC) $(CFLAGS) flogd.c | ||
| 84 | fparse.o: fparse.c | ||
| 85 | - cc ${CCFLAGS} fparse.c | ||
| 86 | + $(CC) $(CFLAGS) fparse.c | ||
| 87 | |||
| 88 | clean: | ||
| 89 | rm -f libmy.a *.o | ||
| 90 | diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile | ||
| 91 | index f6d12de..9524911 100644 | ||
| 92 | --- a/src/nhttpd/GNUmakefile | ||
| 93 | +++ b/src/nhttpd/GNUmakefile | ||
| 94 | @@ -1,20 +1,20 @@ | ||
| 95 | # $nostromo: GNUmakefile,v 1.6 2016/04/12 19:02:06 hacki Exp $ | ||
| 96 | |||
| 97 | -CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c | ||
| 98 | +CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c | ||
| 99 | |||
| 100 | nhttpd: main.o http.o sys.o | ||
| 101 | - cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt | ||
| 102 | - strip nhttpd | ||
| 103 | + $(CC) -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt | ||
| 104 | +# $(STRIP) nhttpd | ||
| 105 | nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8 | ||
| 106 | |||
| 107 | main.o: main.c | ||
| 108 | - cc ${CCFLAGS} main.c | ||
| 109 | + $(CC) $(CFLAGS) main.c | ||
| 110 | |||
| 111 | http.o: http.c | ||
| 112 | - cc ${CCFLAGS} http.c | ||
| 113 | + $(CC) $(CFLAGS) http.c | ||
| 114 | |||
| 115 | sys.o: sys.c | ||
| 116 | - cc ${CCFLAGS} sys.c | ||
| 117 | + $(CC) $(CFLAGS) sys.c | ||
| 118 | |||
| 119 | clean: | ||
| 120 | rm -f nhttpd nhttpd.cat8 *.o | ||
| 121 | diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile | ||
| 122 | index 15bea61..663ddb5 100644 | ||
| 123 | --- a/src/tools/GNUmakefile | ||
| 124 | +++ b/src/tools/GNUmakefile | ||
| 125 | @@ -1,13 +1,13 @@ | ||
| 126 | # $nostromo: GNUmakefile,v 1.3 2016/04/12 19:02:58 hacki Exp $ | ||
| 127 | |||
| 128 | -CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c | ||
| 129 | +CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes | ||
| 130 | |||
| 131 | crypt: crypt.o | ||
| 132 | - cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd | ||
| 133 | - strip crypt | ||
| 134 | + $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd | ||
| 135 | +# $(STRIP) crypt | ||
| 136 | |||
| 137 | crypt.o: crypt.c | ||
| 138 | - cc ${CCFLAGS} crypt.c | ||
| 139 | + $(CC) $(CFLAGS) -c crypt.c | ||
| 140 | |||
| 141 | clean: | ||
| 142 | rm -f crypt *.o | ||
| 143 | -- | ||
| 144 | 1.7.6.4 | ||
| 145 | |||
diff --git a/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf b/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf deleted file mode 100644 index 6674bb696c..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | # MAIN [MANDATORY] | ||
| 2 | |||
| 3 | servername localhost | ||
| 4 | #servername www.nazgul.ch:8080 | ||
| 5 | serverlisten * | ||
| 6 | #serverlisten 81.221.21.250 127.0.0.1 ::1 | ||
| 7 | serveradmin webmaster@localhost | ||
| 8 | serverroot /var/nostromo | ||
| 9 | servermimes /var/nostromo/conf/mimes | ||
| 10 | docroot /var/nostromo/htdocs | ||
| 11 | docindex index.html | ||
| 12 | |||
| 13 | # LOGS [OPTIONAL] | ||
| 14 | |||
| 15 | logpid /var/run/nostromo/nhttpd.pid | ||
| 16 | #logaccess /var/log/nostromo/access_log | ||
| 17 | |||
| 18 | # SETUID [RECOMMENDED] | ||
| 19 | |||
| 20 | user www-data | ||
| 21 | |||
| 22 | # BASIC AUTHENTICATION [OPTIONAL] | ||
| 23 | |||
| 24 | #htaccess .htaccess | ||
| 25 | #htpasswd /var/nostromo/conf/.htpasswd | ||
| 26 | #htpasswd +bsdauth | ||
| 27 | #htpasswd +bsdauthnossl | ||
| 28 | |||
| 29 | # SSL [OPTIONAL] | ||
| 30 | |||
| 31 | #sslport 443 | ||
| 32 | #sslcert /etc/ssl/server.crt | ||
| 33 | #sslcertkey /etc/ssl/server.key | ||
| 34 | |||
| 35 | # CUSTOM RESPONSES [OPTIONAL] | ||
| 36 | # | ||
| 37 | # The custom responses are searched in the corresponding document root. | ||
| 38 | |||
| 39 | #custom_401 custom_401.html | ||
| 40 | #custom_403 custom_403.html | ||
| 41 | #custom_404 custom_404.html | ||
| 42 | |||
| 43 | # ALIASES [OPTIONAL] | ||
| 44 | |||
| 45 | /icons /var/nostromo/icons | ||
| 46 | |||
| 47 | # VIRTUAL HOSTS [OPTIONAL] | ||
| 48 | |||
| 49 | #www.rahel.ch /var/nostromo/htdocs/www.rahel.ch | ||
| 50 | #www.rahel.ch:8080 /var/nostromo/htdocs/www.rahel.ch | ||
| 51 | |||
| 52 | # HOMEDIRS [OPTIONAL] | ||
| 53 | |||
| 54 | #homedirs /home | ||
| 55 | #homedirs_public public_www | ||
diff --git a/meta-webserver/recipes-httpd/nostromo/files/nostromo b/meta-webserver/recipes-httpd/nostromo/files/nostromo deleted file mode 100644 index 8a28868829..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/files/nostromo +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
| 4 | DAEMON=nhttpd | ||
| 5 | NAME=nhttpd | ||
| 6 | DESC="Nostromo Web Server" | ||
| 7 | OPTS="-c /etc/nhttpd.conf" | ||
| 8 | |||
| 9 | case "$1" in | ||
| 10 | start) | ||
| 11 | echo -n "Starting $DESC: " | ||
| 12 | start-stop-daemon --start -x "$DAEMON" -- $OPTS | ||
| 13 | echo "$NAME." | ||
| 14 | ;; | ||
| 15 | stop) | ||
| 16 | echo -n "Stopping $DESC: " | ||
| 17 | start-stop-daemon --stop -x "$DAEMON" | ||
| 18 | echo "$NAME." | ||
| 19 | ;; | ||
| 20 | restart|force-reload) | ||
| 21 | echo -n "Restarting $DESC: " | ||
| 22 | start-stop-daemon --stop -x "$DAEMON" | ||
| 23 | sleep 1 | ||
| 24 | start-stop-daemon --start -x "$DAEMON" -- $OPTS | ||
| 25 | echo "$NAME." | ||
| 26 | ;; | ||
| 27 | *) | ||
| 28 | N=/etc/init.d/$NAME | ||
| 29 | echo "Usage: $N {start|stop|restart|force-reload}" >&2 | ||
| 30 | exit 1 | ||
| 31 | ;; | ||
| 32 | esac | ||
| 33 | |||
| 34 | exit 0 | ||
diff --git a/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf b/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf deleted file mode 100644 index b7a9f4886e..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | d /run/nostromo - www-data www-data - | ||
diff --git a/meta-webserver/recipes-httpd/nostromo/files/volatiles b/meta-webserver/recipes-httpd/nostromo/files/volatiles deleted file mode 100644 index 40924960c6..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/files/volatiles +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | d www-data www-data 0775 /var/run/nostromo none | ||
| 2 | d www-data www-data 0775 /var/log/nostromo none | ||
diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb deleted file mode 100644 index e726c9ac66..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb +++ /dev/null | |||
| @@ -1,64 +0,0 @@ | |||
| 1 | SUMMARY = "A simple, fast and secure HTTP server" | ||
| 2 | HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" | ||
| 5 | |||
| 6 | SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ | ||
| 7 | file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ | ||
| 8 | file://nhttpd.conf \ | ||
| 9 | file://volatiles \ | ||
| 10 | file://tmpfiles.conf \ | ||
| 11 | file://nostromo \ | ||
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI[md5sum] = "a054eb8e09560082793aaad676e33bd3" | ||
| 15 | SRC_URI[sha256sum] = "1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486" | ||
| 16 | |||
| 17 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 18 | |||
| 19 | DEPENDS = "openssl groff-native base-passwd virtual/crypt" | ||
| 20 | |||
| 21 | inherit update-rc.d | ||
| 22 | |||
| 23 | INITSCRIPT_NAME = "nostromo" | ||
| 24 | INITSCRIPT_PARAMS = "defaults 70" | ||
| 25 | |||
| 26 | do_compile() { | ||
| 27 | oe_runmake | ||
| 28 | } | ||
| 29 | |||
| 30 | do_install() { | ||
| 31 | install -d ${D}/${sbindir} | ||
| 32 | install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd | ||
| 33 | install -m 0755 src/tools/crypt ${D}/${sbindir}/crypt | ||
| 34 | install -d ${D}/${mandir}/man8 | ||
| 35 | install -m 0444 src/nhttpd/nhttpd.8 ${D}/${mandir}/man8/nhttpd.8 | ||
| 36 | install -d ${D}${localstatedir}/nostromo/conf | ||
| 37 | install -d ${D}${localstatedir}/nostromo/htdocs/cgi-bin | ||
| 38 | install -d ${D}${localstatedir}/nostromo/icons | ||
| 39 | install -d ${D}${sysconfdir}/init.d | ||
| 40 | install -m 0644 conf/mimes ${D}${localstatedir}/nostromo/conf/mimes | ||
| 41 | install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} | ||
| 42 | install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d | ||
| 43 | install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo | ||
| 44 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
| 45 | install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf | ||
| 46 | fi | ||
| 47 | install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html | ||
| 48 | install -m 0644 htdocs/nostromo.gif ${D}${localstatedir}/nostromo/htdocs/nostromo.gif | ||
| 49 | install -m 0644 icons/dir.gif ${D}${localstatedir}/nostromo/icons/dir.gif | ||
| 50 | install -m 0644 icons/file.gif ${D}${localstatedir}/nostromo/icons/file.gif | ||
| 51 | chown -R www-data:www-data ${D}/${localstatedir}/nostromo | ||
| 52 | } | ||
| 53 | |||
| 54 | CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf" | ||
| 55 | |||
| 56 | pkg_postinst_${PN} () { | ||
| 57 | if [ -z "$D" ]; then | ||
| 58 | if [ -e /sys/fs/cgroup/systemd ]; then | ||
| 59 | systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nostromo.conf | ||
| 60 | elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then | ||
| 61 | ${sysconfdir}/init.d/populate-volatile.sh update | ||
| 62 | fi | ||
| 63 | fi | ||
| 64 | } | ||
