wok diff apache/receipt @ rev 4635

Up: cairo (1.8.8)
author Christophe Lincoln <pankso@slitaz.org>
date Thu Dec 24 18:17:20 2009 +0100 (2009-12-24)
parents 0588160a6878
children 8b98d274afb5
line diff
     1.1 --- a/apache/receipt	Wed Sep 09 21:42:10 2009 +0200
     1.2 +++ b/apache/receipt	Thu Dec 24 18:17:20 2009 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apache"
     1.7 -VERSION="2.2.11"
     1.8 +VERSION="2.2.13"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Secure, efficient and extensible HTTP server."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -39,15 +39,17 @@
    1.13  	cp -a $_pkg/etc $fs
    1.14  	rm -rf $fs/etc/apache/original
    1.15  	cp -a $_pkg/var $fs
    1.16 -	cat > $fs/etc/init.d/apache <<EOT
    1.17 +	
    1.18 +	cp -a stuff/apache $fs/etc/init.d
    1.19 +#	cat > $fs/etc/init.d/apache <<EOT
    1.20  #!/bin/sh
    1.21 - 
    1.22 -. /etc/init.d/rc.functions
    1.23 -active_pidfile /var/run/apache/httpd.pid httpd
    1.24 - 
    1.25 -exec /usr/bin/apachectl "\$@"
    1.26 -EOT
    1.27 -	chmod +x $fs/etc/init.d/apache
    1.28 +# 
    1.29 +#. /etc/init.d/rc.functions
    1.30 +#active_pidfile /var/run/apache/httpd.pid httpd
    1.31 +# 
    1.32 +#exec /usr/bin/apachectl "\$@"
    1.33 +#EOT
    1.34 +#	chmod +x $fs/etc/init.d/apache
    1.35  	sed -i  -e 's|User daemon|User www|' -e 's|Group daemon|Group www|' \
    1.36  		-e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \
    1.37  		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \