From cfdf135db9d07065f78aff8e9096352adeea9af6 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Wed, 27 Jul 2016 12:53:45 -0400 Subject: nostromo: update to version 1.9.6 * Update license checksum to include latest copyright information * Update patch for the latest version Signed-off-by: Derek Straka Signed-off-by: Martin Jansa --- ...ile-add-possibility-to-override-variables.patch | 14 +++-- .../recipes-httpd/nostromo/nostromo_1.9.5.bb | 69 ---------------------- .../recipes-httpd/nostromo/nostromo_1.9.6.bb | 69 ++++++++++++++++++++++ 3 files changed, 78 insertions(+), 74 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb create mode 100644 meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb (limited to 'meta-webserver/recipes-httpd') 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 index 7cf011b1c8..8cd4682355 100644 --- 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 @@ -91,7 +91,9 @@ diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile index f6d12de..9524911 100644 --- a/src/nhttpd/GNUmakefile +++ b/src/nhttpd/GNUmakefile -@@ -1,18 +1,18 @@ +@@ -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 @@ -120,14 +122,16 @@ diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile index 15bea61..663ddb5 100644 --- a/src/tools/GNUmakefile +++ b/src/tools/GNUmakefile -@@ -1,11 +1,11 @@ +@@ -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 -+CCFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes ++CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes crypt: crypt.o -- cc -o crypt crypt.o -lcrypt +- cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd - strip crypt -+ $(CC) $(CFLAGS) -o crypt crypt.o -lcrypt ++ $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd +# $(STRIP) crypt crypt.o: crypt.c diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb deleted file mode 100644 index 562ecd0049..0000000000 --- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb +++ /dev/null @@ -1,69 +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=e5ec3fa723b29b7d59d205afd8d36938" - -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] = "dc6cfd6b5aae04c370c7f818fa7bde55" -SRC_URI[sha256sum] = "5f62578285e02449406b46cf06a7888fe3dc4a90bedf58cc18523bad62f6b914" - -TARGET_CC_ARCH += "${LDFLAGS}" - -DEPENDS = "openssl" - -inherit update-rc.d useradd - -INITSCRIPT_NAME = "nostromo" -INITSCRIPT_PARAMS = "defaults 70" - -do_compile() { - oe_runmake -} - -# we need user/group www-data to exist when we install -# -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g www-data www-data" - -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 -} diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb new file mode 100644 index 0000000000..e06a6965fc --- /dev/null +++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb @@ -0,0 +1,69 @@ +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] = "27aa241d78ff78920354c3e03a5026ea" +SRC_URI[sha256sum] = "541494ecfeafec58c0876ccc90cc23b06e0144f6f42029af44c7cdb1f411e8eb" + +TARGET_CC_ARCH += "${LDFLAGS}" + +DEPENDS = "openssl" + +inherit update-rc.d useradd + +INITSCRIPT_NAME = "nostromo" +INITSCRIPT_PARAMS = "defaults 70" + +do_compile() { + oe_runmake +} + +# we need user/group www-data to exist when we install +# +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system -g www-data www-data" + +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 +} -- cgit 1.2.3-korg