SliTaz Repositories

     1.1 --- a/apache/receipt	Fri Nov 01 14:48:33 2019 +0100
     1.2 +++ b/apache/receipt	Sun Mar 29 17:21:18 2020 +0100
     1.3 @@ -1,64 +1,77 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apache"
     1.7 -VERSION="2.4.16"
     1.8 +VERSION="2.4.41"
     1.9  CATEGORY="network"
    1.10 +TAGS="webserver http server"
    1.11  SHORT_DESC="Secure, efficient and extensible HTTP server."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="Apache"
    1.14 +WEB_SITE="https://www.apache.org/"
    1.15 +
    1.16  SOURCE="httpd"
    1.17  TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.18 -WEB_SITE="http://www.apache.org/"
    1.19  WGET_URL="${WEB_SITE}dist/$SOURCE/$TARBALL"
    1.20 +
    1.21 +PROVIDE="lighttpd"
    1.22 +DEPENDS="apr apr-util expat openssl pcre util-linux-uuid zlib"
    1.23 +BUILD_DEPENDS="apr-dev apr-util-dev bash expat-dev lua5.1-dev 
    1.24 +	openldap-dev openssl-dev sed util-linux-uuid-dev zlib-dev"
    1.25 +
    1.26  CONFIG_FILES="/etc/apache /var/www /etc/ssl/apache"
    1.27  TAZPANEL_DAEMON="edit::/etc/apache/httpd.conf|web::$WEB_SITE"
    1.28 -PROVIDE="lighttpd"
    1.29 -TAGS="webserver http server"
    1.30 -
    1.31 -DEPENDS="apr-util apr openssl pcre util-linux-uuid expat zlib"
    1.32 -BUILD_DEPENDS="apr-util-dev apr-dev openssl-dev sed expat-dev zlib-dev \
    1.33 -lua5.1-dev util-linux-uuid-dev openldap-dev bash"
    1.34  
    1.35  # Rules to configure and make the package.
    1.36  compile_rules()
    1.37  {
    1.38  	grep -q Slitaz config.layout || \
    1.39  		cat $stuff/slitaz.layout >> config.layout
    1.40 -	./configure --mandir=/usr/share/man \
    1.41 -		--enable-mods-shared=all \
    1.42 -		--enable-proxy \
    1.43 -		--enable-ssl \
    1.44 -		--enable-layout=Slitaz $CONFIGURE_ARGS &&
    1.45 -	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
    1.46 +
    1.47 +	./configure				\
    1.48 +		--mandir=/usr/share/man		\
    1.49 +		--enable-mods-shared=all	\
    1.50 +		--enable-proxy			\
    1.51 +		--enable-ssl			\
    1.52 +		--enable-layout=Slitaz		\
    1.53 +		$CONFIGURE_ARGS &&
    1.54 +	make $MAKEFLAGS &&
    1.55 +	make DESTDIR=$DESTDIR install
    1.56  }
    1.57  
    1.58  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.59  genpkg_rules()
    1.60  {
    1.61 -	mkdir -p $fs/usr/share/apache $fs/etc/init.d $fs/etc/apache/conf.d
    1.62 +	mkdir -p $fs/usr/share/apache
    1.63 +	mkdir -p $fs/etc/init.d
    1.64 +	mkdir -p $fs/etc/apache/conf.d
    1.65 +	mkdir -p $fs/etc/apache/extra
    1.66  	mkdir -p $fs/etc/ssl/apache
    1.67 -	cp -a $install/usr/share/apache/icons $fs/usr/share/apache
    1.68 -	cp -a $install/usr/share/apache/error $fs/usr/share/apache
    1.69 -	cp -a $install/usr/share/apache/modules $fs/usr/share/apache
    1.70 -	cp -a $install/usr/bin $fs/usr
    1.71 -	rm -r $fs/usr/bin/apxs
    1.72 -	cp -a $install/etc $fs
    1.73 -	rm -rf $fs/etc/apache/original
    1.74 -	cp -a $install/var $fs
    1.75 +
    1.76 +	cp -a $install/usr/share/apache/icons	$fs/usr/share/apache
    1.77 +	cp -a $install/usr/share/apache/error	$fs/usr/share/apache
    1.78 +	cp -a $install/usr/share/apache/modules	$fs/usr/share/apache
    1.79 +	cp -a $install/usr/bin			$fs/usr
    1.80 +	rm -r					$fs/usr/bin/apxs
    1.81 +	cp -a $install/etc			$fs
    1.82 +	rm -rf					$fs/etc/apache/original
    1.83 +	cp -a $install/var			$fs
    1.84  	
    1.85 -	cp -a $stuff/apache $fs/etc/init.d
    1.86 -	mkdir -p $fs/etc/apache/extra
    1.87 +	cp -a $stuff/apache			$fs/etc/init.d
    1.88  	cp -a $stuff/fix-range-CVE-2011-3192.conf $fs/etc/apache/extra
    1.89  
    1.90 -	sed -i  -e 's|User daemon|User www|' -e 's|Group daemon|Group www|' \
    1.91 +	sed -i  -e 's|User daemon|User www|' \
    1.92 +		-e 's|Group daemon|Group www|' \
    1.93  		-e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \
    1.94  		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \
    1.95  		-e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \
    1.96  		-e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \
    1.97  		-e 's|#LoadModule ssl_module|LoadModule ssl_module|' \
    1.98 -		$fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf
    1.99 +		$fs/etc/apache/httpd.conf \
   1.100 +		$fs/etc/apache/extra/httpd-ssl.conf
   1.101 +
   1.102  	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf
   1.103  	sed -i 's/^SSLSessionCache /#&/' $fs/etc/apache/extra/httpd-ssl.conf
   1.104 +
   1.105  	cat >> $fs/etc/apache/extra/httpd-ssl.conf <<EOT
   1.106  
   1.107  # Unsafe, see CVE-2014-3566 POODLE
   1.108 @@ -67,12 +80,14 @@
   1.109  }
   1.110  
   1.111  # Pre and post install commands for Tazpkg.
   1.112 -# We stop the server by default in case of upgarde.
   1.113 +# We stop the server by default in case of upgrade.
   1.114  pre_install()
   1.115  {
   1.116 -	[ -z "$1" ] && for i in httpd lighttpd ngnix cherokee $PACKAGE ; do
   1.117 +	[ -z "$1" ] &&
   1.118 +	for i in httpd lighttpd ngnix cherokee $PACKAGE
   1.119 +	  do
   1.120  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   1.121 -	done
   1.122 +	  done
   1.123  }
   1.124  
   1.125  post_install()
   1.126 @@ -104,12 +119,13 @@
   1.127  EOT
   1.128  	[ -z "$quiet" ] && echo # Start new line
   1.129  	( cd "$1/$INSTALLED/" ; grep -l /etc/apache/conf.d/ */receipt ) | \
   1.130 -	while read file; do
   1.131 +	while read file
   1.132 +	  do
   1.133  		pkg=$(dirname $file)
   1.134  		[ "$pkg" = "$PACKAGE" ] && continue
   1.135  		[ -z "$quiet" ] && echo "Reconfiguring $pkg for $PACKAGE..."
   1.136  		tazpkg reconfigure $pkg
   1.137 -	done
   1.138 +	  done
   1.139  	[ -f "$1/etc/php.ini" ] && tazpkg get-install php-apache --root="$1"
   1.140  	[ "$1" ] || netstat -ltn 2> /dev/null | grep -q :80 ||
   1.141  	/etc/init.d/$PACKAGE start