SliTaz Repositories

     1.1 --- a/apache-dev/receipt	Wed Jul 17 13:30:02 2013 +0200
     1.2 +++ b/apache-dev/receipt	Wed Jul 17 13:31:24 2013 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apache-dev"
     1.7 -VERSION="2.2.22"
     1.8 +VERSION="2.4.4"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="HTTP server development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"

     2.1 --- a/apache-doc/receipt	Wed Jul 17 13:30:02 2013 +0200
     2.2 +++ b/apache-doc/receipt	Wed Jul 17 13:31:24 2013 +0200
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="apache-doc"
     2.7 -VERSION="2.2.22"
     2.8 +VERSION="2.4.4"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="HTTP server documentation files."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"

     3.1 --- a/apache/receipt	Wed Jul 17 13:30:02 2013 +0200
     3.2 +++ b/apache/receipt	Wed Jul 17 13:31:24 2013 +0200
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="apache"
     3.7 -VERSION="2.2.22"
     3.8 +VERSION="2.4.4"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Secure, efficient and extensible HTTP server."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12 @@ -23,8 +23,11 @@
    3.13  	cd $src
    3.14  	grep -q Slitaz config.layout || \
    3.15  		cat $stuff/slitaz.layout >> config.layout
    3.16 -	./configure --mandir=/usr/share/man --enable-mods-shared=all \
    3.17 -		--enable-proxy --enable-ssl \
    3.18 +	./configure --mandir=/usr/share/man \
    3.19 +		--with-program-name=apache \
    3.20 +		--enable-mods-shared=all \
    3.21 +		--enable-proxy \
    3.22 +		--enable-ssl \
    3.23  		--enable-layout=Slitaz $CONFIGURE_ARGS &&
    3.24  	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
    3.25  }
    3.26 @@ -52,8 +55,8 @@
    3.27  		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \
    3.28  		-e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \
    3.29  		-e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \
    3.30 -		$fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf
    3.31 -	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf
    3.32 +		$fs/etc/apache/apache.conf $fs/etc/apache/extra/httpd-ssl.conf
    3.33 +	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/apache.conf
    3.34  }
    3.35  
    3.36  # Pre and post install commands for Tazpkg.

     4.1 --- a/apache/stuff/apache	Wed Jul 17 13:30:02 2013 +0200
     4.2 +++ b/apache/stuff/apache	Wed Jul 17 13:31:24 2013 +0200
     4.3 @@ -8,13 +8,13 @@
     4.4  
     4.5  NAME=Apache
     4.6  DESC="Apache Web Server"
     4.7 -DAEMON=/usr/bin/httpd
     4.8 +DAEMON=/usr/bin/apache
     4.9  OPTIONS=
    4.10 -PIDFILE=/var/run/apache/httpd.pid
    4.11 +PIDFILE=/var/run/apache/apache.pid
    4.12  
    4.13  case "$1" in
    4.14    start)
    4.15 -    if active_pidfile $PIDFILE httpd ; then
    4.16 +    if active_pidfile $PIDFILE apache ; then
    4.17        echo "$NAME already running."
    4.18        exit 1
    4.19      fi
    4.20 @@ -23,7 +23,7 @@
    4.21      status
    4.22      ;;
    4.23    stop)
    4.24 -    if ! active_pidfile $PIDFILE httpd ; then
    4.25 +    if ! active_pidfile $PIDFILE apache ; then
    4.26        echo "$NAME is not running."
    4.27        exit 1
    4.28      fi
    4.29 @@ -33,7 +33,7 @@
    4.30      status
    4.31      ;;
    4.32    reload)
    4.33 -    if ! active_pidfile $PIDFILE httpd ; then
    4.34 +    if ! active_pidfile $PIDFILE apache ; then
    4.35        echo "$NAME is not running."
    4.36        exit 1
    4.37      fi
    4.38 @@ -42,7 +42,7 @@
    4.39      status
    4.40      ;;
    4.41    restart)
    4.42 -    if ! active_pidfile $PIDFILE httpd ; then
    4.43 +    if ! active_pidfile $PIDFILE apache ; then
    4.44        echo "$NAME is not running."
    4.45        exit 1
    4.46      fi

     5.1 --- a/apache/stuff/slitaz.layout	Wed Jul 17 13:30:02 2013 +0200
     5.2 +++ b/apache/stuff/slitaz.layout	Wed Jul 17 13:31:24 2013 +0200
     5.3 @@ -13,10 +13,10 @@
     5.4      iconsdir:        /usr/share/apache/icons
     5.5      htdocsdir:       /var/www
     5.6      manualdir:       /usr/share/doc/apache
     5.7 -    cgidir:          /var/www/cgi-bin
     5.8 +    cgidir:          /var/lib/apache/cgi-bin
     5.9      includedir:      /usr/include
    5.10      localstatedir:   /var/lib/apache
    5.11      runtimedir:      /var/run/apache
    5.12      logfiledir:      /var/log/apache
    5.13 -    proxycachedir:   /var/lib/apache/proxy
    5.14 +    proxycachedir:   /var/cache/apache/proxy
    5.15  </Layout>