Merge branch 'master' of ssh://openadk.org/git/openadk

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

5 files changed, 10 insertions, 1 deletions

diff --git a/package/php/files/php-cgi.conffiles b/package/php/files/php-cgi.conffiles
new file mode 100644
index 000000000..f1b6b5fc9
--- /dev/null
+++ b/package/php/files/php-cgi.conffiles
@@ -0,0 +1 @@
+/etc/php.ini
diff --git a/package/php/files/php-cli.conffiles b/package/php/files/php-cli.conffiles
new file mode 100644
index 000000000..f1b6b5fc9
--- /dev/null
+++ b/package/php/files/php-cli.conffiles
@@ -0,0 +1 @@
+/etc/php.ini
diff --git a/package/php/files/php-fastcgi.conffiles b/package/php/files/php-fastcgi.conffiles
new file mode 100644
index 000000000..f1b6b5fc9
--- /dev/null
+++ b/package/php/files/php-fastcgi.conffiles
@@ -0,0 +1 @@
+/etc/php.ini
diff --git a/package/php/files/php-fastcgi.postinst b/package/php/files/php-fastcgi.postinst
new file mode 100644
index 000000000..4497d75d1
--- /dev/null
+++ b/package/php/files/php-fastcgi.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf php php NO
+add_rcconf php_flags php_flags "-b 1026"
diff --git a/package/php/files/php.init b/package/php/files/php.init
index c48ae227d..63a91d4c7 100644
--- a/package/php/files/php.init
+++ b/package/php/files/php.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 80
+#PKG php-fastcgi
+#INIT 80
+
 . /etc/rc.conf
 
 export PHP_FCGI_CHILDREN=''