[oe-commits] org.oe.dev lighttpd: lot of bugfixes

hrw commit openembedded-commits at lists.openembedded.org
Fri Feb 16 10:37:45 UTC 2007 

lighttpd: lot of bugfixes
- forced PCRE detection so it is linked in
- cleaned directory structure
- added /www/ dirs needed
- added empty homepage
- fixed initscript

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 760aa4900b6222376d10756436dd82ffe1ade2fa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=760aa4900b6222376d10756436dd82ffe1ade2fa
Files:
1
packages/lighttpd/conf
packages/lighttpd/conf/etc
packages/lighttpd/conf/etc/init.d
packages/lighttpd/1.4.13
packages/lighttpd/lighttpd
packages/lighttpd/conf/etc/init.d/lighttpd
packages/lighttpd/lighttpd/lighttpd
packages/lighttpd/conf/etc/lighttpd.conf
packages/lighttpd/lighttpd/lighttpd.conf
packages/lighttpd/lighttpd/index.html
packages/lighttpd/lighttpd/configure.in.patch
packages/lighttpd/lighttpd_1.4.13.bb
Diffs:

#
# mt diff -r1c7464901fc8ab3cb0e3ade6fdf445011603f0c4 -r760aa4900b6222376d10756436dd82ffe1ade2fa
#
# 
# 
# delete "packages/lighttpd/conf"
# 
# delete "packages/lighttpd/conf/etc"
# 
# delete "packages/lighttpd/conf/etc/init.d"
# 
# rename "packages/lighttpd/1.4.13"
#     to "packages/lighttpd/lighttpd"
# 
# rename "packages/lighttpd/conf/etc/init.d/lighttpd"
#     to "packages/lighttpd/lighttpd/lighttpd"
# 
# rename "packages/lighttpd/conf/etc/lighttpd.conf"
#     to "packages/lighttpd/lighttpd/lighttpd.conf"
# 
# add_file "packages/lighttpd/lighttpd/index.html"
#  content [12179caec26a089cabcbb75c4dbe0bdfe60951f7]
# 
# patch "packages/lighttpd/lighttpd/configure.in.patch"
#  from [3b1047b51cbd62e6d50a13e0b5073df8bfca02df]
#    to [2b9e5d60f128a7e9ab3268894c5bd42853a9f84a]
# 
# patch "packages/lighttpd/lighttpd/lighttpd"
#  from [8944655486b91e16b11aefefd5cec88da451a0eb]
#    to [ed9e3cde9e3adcba2416e92aeda833fd0ea52a92]
# 
# patch "packages/lighttpd/lighttpd_1.4.13.bb"
#  from [223b049fefca1c82d7ccd27885a63537b9276483]
#    to [8b5674cbb64f69a0c4f5bc1c5cea3b6dd6ac2ca3]
# 
============================================================
--- packages/lighttpd/lighttpd/index.html	12179caec26a089cabcbb75c4dbe0bdfe60951f7
+++ packages/lighttpd/lighttpd/index.html	12179caec26a089cabcbb75c4dbe0bdfe60951f7
@@ -0,0 +1 @@
+<html><body><h1>It works!</h1></body></html>
============================================================
--- packages/lighttpd/lighttpd/configure.in.patch	3b1047b51cbd62e6d50a13e0b5073df8bfca02df
+++ packages/lighttpd/lighttpd/configure.in.patch	2b9e5d60f128a7e9ab3268894c5bd42853a9f84a
@@ -1,28 +1,34 @@
-Index: lighttpd-1.4.13-r0/lighttpd-1.4.13/configure.in
+Index: 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 @@
+--- 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
--  AC_PATH_PROG(PCRECONFIG, pcre-config)
++#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"
++#  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_CHECK_LIB(pcre, pcre_compile, [
+       AC_CHECK_HEADERS([pcre.h], [
          AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
          AC_DEFINE([HAVE_PCRE_H], [1])
--      ])
+       ])
 -    ])
--    LIBS="$OLDLIBS"
++#    ])
+     LIBS="$OLDLIBS"
 -  fi
 -fi
++#  fi
++#fi
  
  AC_SUBST(PCRE_LIB)
  
============================================================
--- packages/lighttpd/conf/etc/init.d/lighttpd	8944655486b91e16b11aefefd5cec88da451a0eb
+++ packages/lighttpd/lighttpd/lighttpd	ed9e3cde9e3adcba2416e92aeda833fd0ea52a92
@@ -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."
 	;;
   *)
============================================================
--- packages/lighttpd/lighttpd_1.4.13.bb	223b049fefca1c82d7ccd27885a63537b9276483
+++ packages/lighttpd/lighttpd_1.4.13.bb	8b5674cbb64f69a0c4f5bc1c5cea3b6dd6ac2ca3
@@ -1,13 +1,15 @@ LICENSE = "BSD"
 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 ${sysconfdir} /www"
-FILES_${PN} += "${libdir}/mod_*.so /etc"

More information about the Openembedded-commits mailing list