summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-02-16 10:31:11 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-02-16 10:31:11 +0000
commita16af27bc459438516b9c25ae55ec91d0f2cef03 (patch)
tree6fc66f5cdf8a07e7e5d3de323b3d0646f4b9c19b
parentd351c7db1df1443c4817ef44d9567d14ffcd619a (diff)
parent20ba7ff25c634d2d917f93b854ed280a91422d09 (diff)
merge of '069cb75cc86b7dc6009c903b63cddcb884858210'
and 'b21fcc2294b39029891cdcf3c5efac9106f179e6'
Diffstat
-rw-r--r--packages/lighttpd/1.4.13/configure.in.patch28
-rw-r--r--packages/lighttpd/conf/.mtn2git_empty0
-rw-r--r--packages/lighttpd/conf/etc/.mtn2git_empty0
-rw-r--r--packages/lighttpd/conf/etc/init.d/.mtn2git_empty0
-rw-r--r--packages/lighttpd/lighttpd/.mtn2git_empty (renamed from packages/lighttpd/1.4.13/.mtn2git_empty)0
-rw-r--r--packages/lighttpd/lighttpd/configure.in.patch34
-rw-r--r--packages/lighttpd/lighttpd/index.html1
-rw-r--r--packages/lighttpd/lighttpd/lighttpd (renamed from packages/lighttpd/conf/etc/init.d/lighttpd)7
-rw-r--r--packages/lighttpd/lighttpd/lighttpd.conf (renamed from packages/lighttpd/conf/etc/lighttpd.conf)0
-rw-r--r--packages/lighttpd/lighttpd/src-server.c.patch (renamed from packages/lighttpd/1.4.13/src-server.c.patch)0
-rw-r--r--packages/lighttpd/lighttpd_1.4.13.bb26
11 files changed, 51 insertions, 45 deletions
diff --git a/packages/lighttpd/1.4.13/configure.in.patch b/packages/lighttpd/1.4.13/configure.in.patch
deleted file mode 100644
index f4db64d4fe..0000000000
--- a/packages/lighttpd/1.4.13/configure.in.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in
-===================================================================
---- lighttpd-1.4.13-r0.orig/lighttpd-1.4.13/configure.in 2006-10-09 18:19:34.000000000 +0200
-+++ lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in 2006-12-07 22:31:52.000000000 +0100
-@@ -250,23 +250,9 @@
- [WITH_PCRE=$withval],[WITH_PCRE=yes])
- AC_MSG_RESULT([$WITH_PCRE])
-
--if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
-- AC_PATH_PROG(PCRECONFIG, pcre-config)
-
-- if test x"$PCRECONFIG" != x; then
-- PCRE_LIB=`$PCRECONFIG --libs`
-- CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
-- OLDLIBS="$LIBS"
-- LIBS="$LIBS $PCRE_LIB"
-- AC_CHECK_LIB(pcre, pcre_compile, [
-- AC_CHECK_HEADERS([pcre.h], [
- AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
- AC_DEFINE([HAVE_PCRE_H], [1])
-- ])
-- ])
-- LIBS="$OLDLIBS"
-- fi
--fi
-
- AC_SUBST(PCRE_LIB)
-
diff --git a/packages/lighttpd/conf/.mtn2git_empty b/packages/lighttpd/conf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lighttpd/conf/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lighttpd/conf/etc/.mtn2git_empty b/packages/lighttpd/conf/etc/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lighttpd/conf/etc/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lighttpd/conf/etc/init.d/.mtn2git_empty b/packages/lighttpd/conf/etc/init.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/lighttpd/conf/etc/init.d/.mtn2git_empty
+++ /dev/null
diff --git a/packages/lighttpd/1.4.13/.mtn2git_empty b/packages/lighttpd/lighttpd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/lighttpd/1.4.13/.mtn2git_empty
+++ b/packages/lighttpd/lighttpd/.mtn2git_empty
diff --git a/packages/lighttpd/lighttpd/configure.in.patch b/packages/lighttpd/lighttpd/configure.in.patch
new file mode 100644
index 0000000000..3387fe5635
--- /dev/null
+++ b/packages/lighttpd/lighttpd/configure.in.patch
@@ -0,0 +1,34 @@
+Index: lighttpd-1.4.13/configure.in
+===================================================================
+--- lighttpd-1.4.13.orig/configure.in 2006-10-09 18:19:34.000000000 +0200
++++ lighttpd-1.4.13/configure.in 2007-02-13 18:42:34.000000000 +0100
+@@ -250,23 +250,23 @@
+ [WITH_PCRE=$withval],[WITH_PCRE=yes])
+ AC_MSG_RESULT([$WITH_PCRE])
+
+-if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
++#if test "x$cross_compiling" = xno -a "$WITH_PCRE" != "no"; then
+ AC_PATH_PROG(PCRECONFIG, pcre-config)
+
+- if test x"$PCRECONFIG" != x; then
++# if test x"$PCRECONFIG" != x; then
+ PCRE_LIB=`$PCRECONFIG --libs`
+ CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
+ OLDLIBS="$LIBS"
+ LIBS="$LIBS $PCRE_LIB"
+- AC_CHECK_LIB(pcre, pcre_compile, [
++# AC_CHECK_LIB(pcre, pcre_compile, [
+ AC_CHECK_HEADERS([pcre.h], [
+ AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
+ AC_DEFINE([HAVE_PCRE_H], [1])
+ ])
+- ])
++# ])
+ LIBS="$OLDLIBS"
+- fi
+-fi
++# fi
++#fi
+
+ AC_SUBST(PCRE_LIB)
+
diff --git a/packages/lighttpd/lighttpd/index.html b/packages/lighttpd/lighttpd/index.html
new file mode 100644
index 0000000000..cd25bf17b3
--- /dev/null
+++ b/packages/lighttpd/lighttpd/index.html
@@ -0,0 +1 @@
+<html><body><h1>It works!</h1></body></html> \ No newline at end of file
diff --git a/packages/lighttpd/conf/etc/init.d/lighttpd b/packages/lighttpd/lighttpd/lighttpd
index 4661210c27..572381499a 100644
--- a/packages/lighttpd/conf/etc/init.d/lighttpd
+++ b/packages/lighttpd/lighttpd/lighttpd
@@ -22,12 +22,7 @@ case "$1" in
echo -n "Restarting $DESC: "
start-stop-daemon -K -x "$DAEMON"
sleep 1
- KEY_ARGS=""
- test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY"
- test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY"
- start-stop-daemon -S \
- -x "$DAEMON" -- $KEY_ARGS \
- -p "$DROPBEAR_PORT" $DROPBEAR_EXTRA_ARGS
+ start-stop-daemon -S -x "$DAEMON"
echo "$NAME."
;;
*)
diff --git a/packages/lighttpd/conf/etc/lighttpd.conf b/packages/lighttpd/lighttpd/lighttpd.conf
index 5642e3175f..5642e3175f 100644
--- a/packages/lighttpd/conf/etc/lighttpd.conf
+++ b/packages/lighttpd/lighttpd/lighttpd.conf
diff --git a/packages/lighttpd/1.4.13/src-server.c.patch b/packages/lighttpd/lighttpd/src-server.c.patch
index 6ca0c9ea40..6ca0c9ea40 100644
--- a/packages/lighttpd/1.4.13/src-server.c.patch
+++ b/packages/lighttpd/lighttpd/src-server.c.patch
diff --git a/packages/lighttpd/lighttpd_1.4.13.bb b/packages/lighttpd/lighttpd_1.4.13.bb
index 9cb3d26425..504a129db8 100644
--- a/packages/lighttpd/lighttpd_1.4.13.bb
+++ b/packages/lighttpd/lighttpd_1.4.13.bb
@@ -2,12 +2,14 @@ DESCRIPTION = "Web server"
SECTION = "net"
DEPENDS = "sqlite3 libpcre libxml2"
LICENSE = "BSD"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://www.lighttpd.net/download/lighttpd-1.4.13.tar.gz \
- file://${PV}/configure.in.patch;patch=1;pnum=2 \
- file://${PV}/src-server.c.patch;patch=1;pnum=1 \
- file://conf/etc "
+ file://configure.in.patch;patch=1 \
+ file://src-server.c.patch;patch=1 \
+ file://index.html \
+ file://lighttpd.conf \
+ file://lighttpd"
EXTRA_OECONF="--without-bzip2 \
--without-ldap \
@@ -20,18 +22,20 @@ EXTRA_OECONF="--without-bzip2 \
--disable-nls \
--disable-static"
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
-do_install_append() {
- cp -R ${WORKDIR}/conf/etc ${D}/etc
- rm -fR ${D}/etc/.svn
- rm -fR ${D}/etc/init.d/.svn
+INITSCRIPT_NAME = "lighttpd"
+INITSCRIPT_PARAMS = "defaults 70"
- chmod -R 755 ${D}/etc
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
+ install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
}
do_stage() {
autotools_stage_all
}
-FILES_${PN} += "${libdir}/mod_*.so /etc"
+FILES_${PN} += "${libdir}/mod_*.so ${sysconfdir} /www"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 07:32:09 +0000