[oe-commits] org.oe.dev boa: added php via cgi support, initscripts fixes for busybox - close #262

[Dan commit]

boa: added php via cgi support, initscripts fixes for busybox - close #262

Author: Dan
Branch: org.openembedded.dev
Revision: 45060139fa6e253211b72eb0102710685f5584b5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=45060139fa6e253211b72eb0102710685f5584b5
Files:
1
packages/boa/boa-0.94.13/cgi.patch
packages/boa/boa_0.94.13.bb
packages/boa/files/boa.conf
packages/boa/files/boa.init
Diffs:

#
# mt diff -r7f1d20f60484b714c921f3c44ddf0b9f9120fa08 -r45060139fa6e253211b72eb0102710685f5584b5
#
# 
# 
# add_file "packages/boa/boa-0.94.13/cgi.patch"
#  content [ac6b43582f334771ee6db967acd81e04706697bc]
# 
# patch "packages/boa/boa_0.94.13.bb"
#  from [25a784afd440fc30d88ed34df41e4efbc49f8851]
#    to [aa64cd4c455a4b620bb8e0e44a4679e92e6ae0b0]
# 
# patch "packages/boa/files/boa.conf"
#  from [27d2646a5db01b091295bf182c8c39659d09c8ae]
#    to [9b154f4c00acde7361d4ea7cc0fd96e5e7195921]
# 
# patch "packages/boa/files/boa.init"
#  from [09d6f1dc0924f3a0e9ecb650e4b39e730f1261aa]
#    to [8e2420ed914507717c62098d27438f6fab2ec17e]
# 
============================================================
--- packages/boa/boa-0.94.13/cgi.patch	ac6b43582f334771ee6db967acd81e04706697bc
+++ packages/boa/boa-0.94.13/cgi.patch	ac6b43582f334771ee6db967acd81e04706697bc
@@ -0,0 +1,10 @@
+--- boa-0.94.13/src/cgi.c	2002-07-23 08:49:54.000000000 -0700
++++ boa-0.94.13/src/cgi.c~	2005-06-22 23:13:54.000000000 -0700
+@@ -214,6 +214,7 @@
+     my_add_cgi_env(req, "SERVER_ADDR", req->local_ip_addr);
+     my_add_cgi_env(req, "SERVER_PROTOCOL", req->http_version);
+     my_add_cgi_env(req, "REQUEST_URI", req->request_uri);
++    my_add_cgi_env(req, "SCRIPT_FILENAME", req->request_uri);
+ 
+     if (req->path_info)
+         my_add_cgi_env(req, "PATH_INFO", req->path_info);
============================================================
--- packages/boa/boa_0.94.13.bb	25a784afd440fc30d88ed34df41e4efbc49f8851
+++ packages/boa/boa_0.94.13.bb	aa64cd4c455a4b620bb8e0e44a4679e92e6ae0b0
@@ -1,16 +1,16 @@ SECTION = "console/network"
 DESCRIPTION = "Lightweight and High Performance WebServer"
 SECTION = "console/network"
-RPROVIDES = "httpd"
 LICENSE = "GPL"
-PR = "r2"
-
-DEPENDS = "mime-support"
 RDEPENDS = "mime-support"
+RPROVIDES = "httpd"
+PR = "r3"
 
 SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \
+           file://cgi.patch;patch=1;pnum=2 \
            file://debian-patch.diff;patch=1;pnum=2 \
            file://boa.conf \
            file://boa.init"
+
 S = "${WORKDIR}/boa-${PV}/src"
 
 inherit autotools update-rc.d
@@ -31,4 +31,7 @@ do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0640 ${WORKDIR}/boa.conf 	${D}${sysconfdir}/${PN}
 	install -m 0755 ${WORKDIR}/boa.init	${D}${sysconfdir}/init.d/boa
+
+	install -d ${D}${mandir}/man8
+	install -m 0644 ${S}/../docs/boa.8 ${D}${mandir}/man8
 }
============================================================
--- packages/boa/files/boa.conf	27d2646a5db01b091295bf182c8c39659d09c8ae
+++ packages/boa/files/boa.conf	9b154f4c00acde7361d4ea7cc0fd96e5e7195921
@@ -168,7 +168,8 @@ DefaultType text/plain
 # Example: AddType type extension [extension ...]
 
 # Uncomment the next line if you want .cgi files to execute from anywhere
-#AddType application/x-httpd-cgi cgi
+AddType application/x-httpd-cgi cgi
+AddType application/x-httpd-cgi php
 
 # Redirect, Alias, and ScriptAlias all have the same semantics -- they
 # match the beginning of a request and take appropriate action.  Use
============================================================
--- packages/boa/files/boa.init	09d6f1dc0924f3a0e9ecb650e4b39e730f1261aa
+++ packages/boa/files/boa.init	8e2420ed914507717c62098d27438f6fab2ec17e
@@ -26,30 +26,19 @@ case "$1" in
 	;;
   stop)
 	echo -n "Stopping $DESC: $NAME"
-	start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
+	start-stop-daemon --stop --quiet --exec $DAEMON
 	echo "."
 	;;
   restart)
 	echo -n "Restarting $DESC: $NAME"
-	start-stop-daemon --stop --signal HUP --quiet --oknodo --exec $DAEMON
+	start-stop-daemon --stop --exec $DAEMON
+	start-stop-daemon --start --exec $DAEMON
 	echo "done."
         ;;
-  reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	echo -n "Reloading $DESC configuration..."
-	start-stop-daemon --stop --signal 1 --quiet --oknodo --exec $DAEMON
-	echo "done."
-        ;;
   *)
 	N=/etc/init.d/$NAME
 	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|reload}" >&2
+	echo "Usage: $N {start|stop|restart}" >&2
 	exit 1
 	;;
 esac