wok-6.x diff apache/receipt @ rev 15272

ntop: remove a wrong error trigger
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Sep 25 13:23:35 2013 +0000 (2013-09-25)
parents e9130cce9043
children 191b99ca9dc2
line diff
     1.1 --- a/apache/receipt	Sun Jun 30 09:55:32 2013 +0200
     1.2 +++ b/apache/receipt	Wed Sep 25 13:23:35 2013 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apache"
     1.7 -VERSION="2.2.22"
     1.8 +VERSION="2.4.4"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Secure, efficient and extensible HTTP server."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -23,8 +23,11 @@
    1.13  	cd $src
    1.14  	grep -q Slitaz config.layout || \
    1.15  		cat $stuff/slitaz.layout >> config.layout
    1.16 -	./configure --mandir=/usr/share/man --enable-mods-shared=all \
    1.17 -		--enable-proxy --enable-ssl \
    1.18 +	./configure --mandir=/usr/share/man \
    1.19 +		--with-program-name=apache \
    1.20 +		--enable-mods-shared=all \
    1.21 +		--enable-proxy \
    1.22 +		--enable-ssl \
    1.23  		--enable-layout=Slitaz $CONFIGURE_ARGS &&
    1.24  	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
    1.25  }
    1.26 @@ -52,8 +55,8 @@
    1.27  		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \
    1.28  		-e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \
    1.29  		-e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \
    1.30 -		$fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf
    1.31 -	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf
    1.32 +		$fs/etc/apache/apache.conf $fs/etc/apache/extra/httpd-ssl.conf
    1.33 +	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/apache.conf
    1.34  }
    1.35  
    1.36  # Pre and post install commands for Tazpkg.