# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1253385909 0
# Node ID 310ebb8092aa573a7c3c25dd5c4e2175f5a1758d
# Parent  6d83f231517ec02f749047666c50044aecd720d4
Up: Apache* (2.2.13) + init script in slitaz style

diff -r 6d83f231517e -r 310ebb8092aa apache-dev/receipt
--- a/apache-dev/receipt	Sat Sep 19 17:18:37 2009 +0200
+++ b/apache-dev/receipt	Sat Sep 19 18:45:09 2009 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache-dev"
-VERSION="2.2.11"
+VERSION="2.2.13"
 CATEGORY="development"
 SHORT_DESC="HTTP server development files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 6d83f231517e -r 310ebb8092aa apache-doc/receipt
--- a/apache-doc/receipt	Sat Sep 19 17:18:37 2009 +0200
+++ b/apache-doc/receipt	Sat Sep 19 18:45:09 2009 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache-doc"
-VERSION="2.2.11"
+VERSION="2.2.13"
 CATEGORY="development"
 SHORT_DESC="HTTP server documentation files."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r 6d83f231517e -r 310ebb8092aa apache/receipt
--- a/apache/receipt	Sat Sep 19 17:18:37 2009 +0200
+++ b/apache/receipt	Sat Sep 19 18:45:09 2009 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="apache"
-VERSION="2.2.11"
+VERSION="2.2.13"
 CATEGORY="network"
 SHORT_DESC="Secure, efficient and extensible HTTP server."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -39,15 +39,17 @@
 	cp -a $_pkg/etc $fs
 	rm -rf $fs/etc/apache/original
 	cp -a $_pkg/var $fs
-	cat > $fs/etc/init.d/apache <<EOT
+	
+	cp -a stuff/apache $fs/etc/init.d
+#	cat > $fs/etc/init.d/apache <<EOT
 #!/bin/sh
- 
-. /etc/init.d/rc.functions
-active_pidfile /var/run/apache/httpd.pid httpd
- 
-exec /usr/bin/apachectl "\$@"
-EOT
-	chmod +x $fs/etc/init.d/apache
+# 
+#. /etc/init.d/rc.functions
+#active_pidfile /var/run/apache/httpd.pid httpd
+# 
+#exec /usr/bin/apachectl "\$@"
+#EOT
+#	chmod +x $fs/etc/init.d/apache
 	sed -i  -e 's|User daemon|User www|' -e 's|Group daemon|Group www|' \
 		-e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \
 		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \