thttpd: Port thttpd from oe-classic.
PATCH 1/1 thttpd: Port thttpd from oe-classic.
* Port thttpd recipe from oe-classic to meta-oe.
--- .../thttpd/thttpd-2.25b/acinclude.m4 | 188 ++++++++++++++++++++ .../thttpd/thttpd-2.25b/htpasswd_getline.diff | 20 ++ .../thttpd/thttpd-2.25b/htpasswd_shared.diff | 11 ++ meta-oe/recipes-extended/thttpd/thttpd-2.25b/init | 47 +++++ .../thttpd/thttpd-2.25b/install.patch | 87 +++++++++ meta-oe/recipes-extended/thttpd/thttpd_2.25b.bb | 40 ++++ 6 files changed, 393 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-extended/thttpd/thttpd-2.25b/acinclude.m4 create mode 100644 meta-oe/recipes-extended/thttpd/thttpd-2.25b/htpasswd_getline.diff create mode 100644 meta-oe/recipes-extended/thttpd/thttpd-2.25b/htpasswd_shared.diff create mode 100644 meta-oe/recipes-extended/thttpd/thttpd-2.25b/init create mode 100644 meta-oe/recipes-extended/thttpd/thttpd-2.25b/install.patch create mode 100644 meta-oe/recipes-extended/thttpd/thttpd_2.25b.bb
meta-oe/recipes-extended/thttpd/thttpd-2.25b/acinclude.m4 new file +188 -0
@@ -0,0 +1,188 @@ +dnl +dnl Improved version of AC_CHECK_LIB +dnl +dnl Thanks to John Hawkinson ([email protected]) +dnl +dnl usage: +dnl +dnl AC_LBL_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, +dnl ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]]) +dnl +dnl results: +dnl +dnl LIBS +dnl + +define(AC_LBL_CHECK_LIB, +[AC_MSG_CHECKING([for $2 in -l$1]) +dnl Use a cache variable name containing both the library and function name, +dnl because the test really is for library $1 defining function $2, not +dnl just for library $1. Separate tests with the same $1 and different $2's +dnl may have different results. +ac_lib_var=`echo $1['_']$2['_']$5 | sed 'y%./+- %__p__%'` +AC_CACHE_VAL(ac_cv_lbl_lib_$ac_lib_var, +[ac_save_LIBS="$LIBS" +LIBS="-l$1 $5 $LIBS" +AC_TRY_LINK(dnl +ifelse([$2], [main], , dnl Avoid conflicting decl of main. +[/* Override any gcc2 internal prototype to avoid an error. */ +]AC_LANG_CASE(c++, [#ifdef __cplusplus +extern "C" +#endif +])dnl +[/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $2(); +]), + [$2()], + eval "ac_cv_lbl_lib_$ac_lib_var=yes", + eval "ac_cv_lbl_lib_$ac_lib_var=no") +LIBS="$ac_save_LIBS" +])dnl +if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$3], , +[changequote(, )dnl + ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +changequote([, ])dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + LIBS="-l$1 $LIBS" +], [$3]) +else + AC_MSG_RESULT(no) +ifelse([$4], , , [$4 +])dnl +fi +]) + +dnl +dnl AC_LBL_LIBRARY_NET +dnl +dnl This test is for network applications that need socket() and +dnl gethostbyname() -ish functions. Under Solaris, those applications +dnl need to link with "-lsocket -lnsl". Under IRIX, they need to link +dnl with "-lnsl" but should *not* link with "-lsocket" because +dnl libsocket.a breaks a number of things (for instance: +dnl gethostbyname() under IRIX 5.2, and snoop sockets under most +dnl versions of IRIX). +dnl +dnl Unfortunately, many application developers are not aware of this, +dnl and mistakenly write tests that cause -lsocket to be used under +dnl IRIX. It is also easy to write tests that cause -lnsl to be used +dnl under operating systems where neither are necessary (or useful), +dnl such as SunOS 4.1.4, which uses -lnsl for TLI. +dnl +dnl This test exists so that every application developer does not test +dnl this in a different, and subtly broken fashion. + +dnl It has been argued that this test should be broken up into two +dnl seperate tests, one for the resolver libraries, and one for the +dnl libraries necessary for using Sockets API. Unfortunately, the two +dnl are carefully intertwined and allowing the autoconf user to use +dnl them independantly potentially results in unfortunate ordering +dnl dependancies -- as such, such component macros would have to +dnl carefully use indirection and be aware if the other components were +dnl executed. Since other autoconf macros do not go to this trouble, +dnl and almost no applications use sockets without the resolver, this +dnl complexity has not been implemented. +dnl +dnl The check for libresolv is in case you are attempting to link +dnl statically and happen to have a libresolv.a lying around (and no +dnl libnsl.a). +dnl +AC_DEFUN([AC_LBL_LIBRARY_NET], [ + # Most operating systems have gethostbyname() in the default searched + # libraries (i.e. libc): + AC_CHECK_FUNC(gethostbyname, , + # Some OSes (eg. Solaris) place it in libnsl: + AC_LBL_CHECK_LIB(nsl, gethostbyname, , + # Some strange OSes (SINIX) have it in libsocket: + AC_LBL_CHECK_LIB(socket, gethostbyname, , + # Unfortunately libsocket sometimes depends on libnsl. + # AC_CHECK_LIB's API is essentially broken so the + # following ugliness is necessary: + AC_LBL_CHECK_LIB(socket, gethostbyname, + LIBS="-lsocket -lnsl $LIBS", + AC_CHECK_LIB(resolv, gethostbyname), + -lnsl)))) + AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, , + AC_LBL_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , + -lnsl))) + # DLPI needs putmsg under HPUX so test for -lstr while we're at it + AC_CHECK_LIB(str, putmsg) + ]) + +dnl +dnl Checks to see if struct tm has the BSD tm_gmtoff member +dnl +dnl usage: +dnl +dnl AC_ACME_TM_GMTOFF +dnl +dnl results: +dnl +dnl HAVE_TM_GMTOFF (defined) +dnl +AC_DEFUN([AC_ACME_TM_GMTOFF], + [AC_MSG_CHECKING(if struct tm has tm_gmtoff member) + AC_CACHE_VAL(ac_cv_acme_tm_has_tm_gmtoff, + AC_TRY_COMPILE([ +# include <sys/types.h> +# include <time.h>], + [u_int i = sizeof(((struct tm *)0)->tm_gmtoff)], + ac_cv_acme_tm_has_tm_gmtoff=yes, + ac_cv_acme_tm_has_tm_gmtoff=no)) + AC_MSG_RESULT($ac_cv_acme_tm_has_tm_gmtoff) + if test $ac_cv_acme_tm_has_tm_gmtoff = yes ; then + AC_DEFINE(HAVE_TM_GMTOFF) + fi]) + +dnl +dnl Checks to see if int64_t exists +dnl +dnl usage: +dnl +dnl AC_ACME_INT64T +dnl +dnl results: +dnl +dnl HAVE_INT64T (defined) +dnl +AC_DEFUN([AC_ACME_INT64T], + [AC_MSG_CHECKING(if int64_t exists) + AC_CACHE_VAL(ac_cv_acme_int64_t, + AC_TRY_COMPILE([ +# include <sys/types.h>], + [int64_t i64], + ac_cv_acme_int64_t=yes, + ac_cv_acme_int64_t=no)) + AC_MSG_RESULT($ac_cv_acme_int64_t) + if test $ac_cv_acme_int64_t = yes ; then + AC_DEFINE(HAVE_INT64T) + fi]) + +dnl +dnl Checks to see if socklen_t exists +dnl +dnl usage: +dnl +dnl AC_ACME_SOCKLENT +dnl +dnl results: +dnl +dnl HAVE_SOCKLENT (defined) +dnl +AC_DEFUN([AC_ACME_SOCKLENT], + [AC_MSG_CHECKING(if socklen_t exists) + AC_CACHE_VAL(ac_cv_acme_socklen_t, + AC_TRY_COMPILE([ +# include <sys/types.h> +# include <sys/socket.h>], + [socklen_t slen], + ac_cv_acme_socklen_t=yes, + ac_cv_acme_socklen_t=no)) + AC_MSG_RESULT($ac_cv_acme_socklen_t) + if test $ac_cv_acme_socklen_t = yes ; then + AC_DEFINE(HAVE_SOCKLENT) + fi])
meta-oe/recipes-extended/thttpd/thttpd-2.25b/htpasswd_getline.diff new file +20 -0
@@ -0,0 +1,20 @@ +--- thttpd-2.25b/extras/htpasswd.c.old 2010-04-28 17:23:40.000000000 +0100 ++++ thttpd-2.25b/extras/htpasswd.c 2010-04-28 17:24:00.000000000 +0100 +@@ -49,7 +49,7 @@ + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int ht_getline(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(ht_getline(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue;
meta-oe/recipes-extended/thttpd/thttpd-2.25b/htpasswd_shared.diff new file +11 -0
@@ -0,0 +1,11 @@ +--- thttpd-2.25b/extras/Makefile.in.orig 2007-03-17 22:30:47.356393000 +0100 ++++ thttpd-2.25b/extras/Makefile.in 2007-03-17 22:31:34.566393000 +0100 +@@ -36,7 +36,7 @@ + DEFS = @DEFS@ + INCLS = -I.. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +-STATICFLAG = @V_STATICFLAG@ ++STATICFLAG = + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + NETLIBS = @V_NETLIBS@
meta-oe/recipes-extended/thttpd/thttpd-2.25b/init new file +47 -0
47 lines not on this page · raw message
meta-oe/recipes-extended/thttpd/thttpd-2.25b/install.patch new file +87 -0
87 lines not on this page · raw message
meta-oe/recipes-extended/thttpd/thttpd_2.25b.bb new file +40 -0
@@ -0,0 +1,40 @@ +DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." +LICENSE = "BSD" +HOMEPAGE = "http://www.acme.com/software/thttpd/" +PR ="r0" + +LIC_FILES_CHKSUM = "file://thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dcbe9eb18815516502872" +SRC_URI = "http://www.acme.com/software/thttpd/thttpd-${PV}.tar.gz \ + file://install.patch \ + file://acinclude.m4 \ + file://init \ + file://htpasswd_shared.diff \ + file://htpasswd_getline.diff" + +S = "${WORKDIR}/thttpd-${PV}" + +PARALLEL_MAKE = "" + +INITSCRIPT_NAME = "thttpd" +INITSCRIPT_PARAMS = "defaults" + +inherit autotools update-rc.d + +EXTRA_OEMAKE += "'WEBDIR=${servicedir}/www'" +FILES_${PN}-dbg_append = " ${servicedir}/www/cgi-bin/.debug" +FILES_${PN}_append = " ${servicedir}" + +do_configure () { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + autotools_do_configure +} + +do_install_append () { + install -d "${D}${sysconfdir}/init.d" + cat ${WORKDIR}/init | sed -e 's,@@SRVDIR,${servicedir}/www,g' > ${WORKDIR}/thttpd + install -c -m 755 ${WORKDIR}/thttpd ${D}${sysconfdir}/init.d/thttpd +} + + +SRC_URI[md5sum] = "156b249b3b0bcd48b06badd2db0d56c5" +SRC_URI[sha256sum] = "07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360"
Signature · 1 line
1.7.0.4
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 17-09-12 20:18, Franklin S. Cooper Jr schreef:
Quoted 1 line
* Port thttpd recipe from oe-classic to meta-oe.
It should go into meta-networking
Quoted 13 lines
Signed-off-by Franklin S. Cooper Jr <[email protected]> ---(quoted diff) +0
-0b/meta-oe/recipes-extended/thttpd/thttpd-2.25b/init new file mode 100644 index 0000000..df6d648 ---
/dev/null+++ b/meta-oe/recipes-extended/thttpd/thttpd-2.25b/init @@ -0,0 +1,47 @@ +#!/bin/sh+# +# This is an init script for openembedded +# Copy it to/etc/init.d/thttpdand type +# > update-rc.d thttpd defaults 60 +# + + +thttpd=/usr/sbin/thttpd +test -x "$thttpd" || exit 0 + + +case "$1" in +
start) + echo -n "Starting thttpd" + start-stop-daemon --start
--quiet --exec $thttpd -- -d @@SRVDIR + echo "." + ;; + stop) +
echo -n "Stopping thttpd" + start-stop-daemon --stop --quiet --exec
$thttpd + echo "." + ;; + reload|force-reload) +
Quoted 8 lines
start-stop-daemon --stop --quiet --signal 1 --exec $thttpd + ;; +
restart) + echo -n "Stopping thttpd" + start-stop-daemon --stop
--quiet --exec $thttpd -- -d @@SRVDIR + echo "." + echo -n "Waiting
for thttpd to die off" + for i in 1 2 3 ; + do + sleep 1 +
echo -n "." + done + echo "" + echo -n "Starting thttpd" +
start-stop-daemon --start --quiet --exec $thttpd -- -d @@SRVDIR + echo
"." + ;; + *) + echo "Usage:/etc/init.d/thttpd
{start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0
And that's not LSB compliant.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQWDMXMkyGM64RGpERAuzAAJ44UYtqHx35wKF9m0vy6rDY1d67zwCfbYyv dqzWiGMeiAdkWYrHLR9EAt4=
=hJhu
-----END PGP SIGNATURE-----
Quoted 7 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 17-09-12 20:18, Franklin S. Cooper Jr schreef:
Quoted 1 line
* Port thttpd recipe from oe-classic to meta-oe.
It should go into meta-networking
Agreed. Once it's been LSB'd, please put the recipe in meta-networking/recipes-daemons/
Thanks,
-J.
Quoted 38 lines
Quoted 14 lines
Signed-off-by Franklin S. Cooper Jr <[email protected]> ---(quoted diff) +0
-0b/meta-oe/recipes-extended/thttpd/thttpd-2.25b/init new file mode 100644 index 0000000..df6d648 ---
/dev/null+++ b/meta-oe/recipes-extended/thttpd/thttpd-2.25b/init @@ -0,0 +1,47 @@ +#!/bin/sh+# +# This is an init script for openembedded +# Copy it to/etc/init.d/thttpdand type +# > update-rc.d thttpd defaults 60 +# + + +thttpd=/usr/sbin/thttpd +test -x "$thttpd" || exit 0 + + +case "$1" in +
start) + echo -n "Starting thttpd" + start-stop-daemon --start
--quiet --exec $thttpd -- -d @@SRVDIR + echo "." + ;; + stop) +
echo -n "Stopping thttpd" + start-stop-daemon --stop --quiet --exec
$thttpd + echo "." + ;; + reload|force-reload) +Quoted 8 lines
start-stop-daemon --stop --quiet --signal 1 --exec $thttpd + ;; +
restart) + echo -n "Stopping thttpd" + start-stop-daemon --stop
--quiet --exec $thttpd -- -d @@SRVDIR + echo "." + echo -n "Waiting
for thttpd to die off" + for i in 1 2 3 ; + do + sleep 1 +
echo -n "." + done + echo "" + echo -n "Starting thttpd" +
start-stop-daemon --start --quiet --exec $thttpd -- -d @@SRVDIR + echo
"." + ;; + *) + echo "Usage:/etc/init.d/thttpd
{start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0And that's not LSB compliant.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.orgiD8DBQFQWDMXMkyGM64RGpERAuzAAJ44UYtqHx35wKF9m0vy6rDY1d67zwCfbYyv dqzWiGMeiAdkWYrHLR9EAt4=
=hJhu
-----END PGP SIGNATURE-----_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 2 lines
Joe MacDonald :wq
Quoted 1 line · On Tuesday 18 September 2012 11:39:24 Joe MacDonald wrote:
On Tue, Sep 18, 2012 at 4:38 AM, Koen Kooi <[email protected]>
Quoted 10 lines · wrote:
Quoted 7 lines
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 17-09-12 20:18, Franklin S. Cooper Jr schreef:
Quoted 1 line
* Port thttpd recipe from oe-classic to meta-oe.
It should go into meta-networking
Agreed. Once it's been LSB'd, please put the recipe in meta-networking/recipes-daemons/
meta-networking or meta-webserver?
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 7 lines · [Re: [oe] [meta-oe][PATCH] thttpd: Port thttpd from oe-classic.] On 12.10.19…
Quoted 1 line · On Tuesday 18 September 2012 11:39:24 Joe MacDonald wrote:
On Tue, Sep 18, 2012 at 4:38 AM, Koen Kooi <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 17-09-12 20:18, Franklin S. Cooper Jr schreef:
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
* Port thttpd recipe from oe-classic to meta-oe.
It should go into meta-networking
Agreed. Once it's been LSB'd, please put the recipe in meta-networking/recipes-daemons/
meta-networking or meta-webserver?
I'd originally had it on my proposed meta-networking list, but that pre-dated the meta-webserver layer. I'm okay with either location, but there does seem to be a natural fit with meta-webserver, now that I think about it.
Signature · 2 lines
Joe MacDonald, Sr. Member of Technical Staff, Linux Products Group, Wind River direct 613.270.5750 mobile 613.291.7421 fax 613.592.2283