SliTaz Repositories

     1.1 --- a/apache-dev/receipt	Mon Dec 30 16:44:40 2019 +0100
     1.2 +++ b/apache-dev/receipt	Mon Dec 30 17:12:55 2019 +0100
     1.3 @@ -1,21 +1,23 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="apache-dev"
     1.7 -VERSION="2.4.16"
     1.8 +VERSION="2.4.41"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="HTTP server development files."
    1.11 +SHORT_DESC="HTTP server - development files."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="Apache"
    1.14 -WEB_SITE="http://www.apache.org/"
    1.15 +WEB_SITE="https://www.apache.org/"
    1.16 +
    1.17  SOURCE="httpd"
    1.18  WANTED="apache"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21  genpkg_rules()
    1.22  {
    1.23 -	mkdir -p $fs/usr/share/apache $fs/usr/bin
    1.24 -	cp -a $install/usr/include $fs/usr
    1.25 -	cp -a $install/usr/bin/apxs $fs/usr/bin
    1.26 -	cp -a $install/usr/share/apache/build $fs/usr/share/apache
    1.27 +	mkdir -p $fs/usr/share/apache
    1.28 +	mkdir -p $fs/usr/bin
    1.29 +
    1.30 +	cp -a $install/usr/include		$fs/usr
    1.31 +	cp -a $install/usr/bin/apxs		$fs/usr/bin
    1.32 +	cp -a $install/usr/share/apache/build	$fs/usr/share/apache
    1.33  }
    1.34 -

     2.1 --- a/apache-doc/receipt	Mon Dec 30 16:44:40 2019 +0100
     2.2 +++ b/apache-doc/receipt	Mon Dec 30 17:12:55 2019 +0100
     2.3 @@ -1,12 +1,13 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="apache-doc"
     2.7 -VERSION="2.4.16"
     2.8 +VERSION="2.4.41"
     2.9  CATEGORY="development"
    2.10 -SHORT_DESC="HTTP server documentation files."
    2.11 +SHORT_DESC="HTTP server - documentation files."
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="Apache"
    2.14 -WEB_SITE="http://www.apache.org/"
    2.15 +WEB_SITE="https://www.apache.org/"
    2.16 +
    2.17  SOURCE="httpd"
    2.18  WANTED="apache"
    2.19  
    2.20 @@ -14,6 +15,5 @@
    2.21  genpkg_rules()
    2.22  {
    2.23  	mkdir -p $fs/usr/share
    2.24 -	cp -a $install/usr/share/doc $fs/usr/share
    2.25 +	cp -a $install/usr/share/doc	$fs/usr/share
    2.26  }
    2.27 -

     3.1 --- a/apache/receipt	Mon Dec 30 16:44:40 2019 +0100
     3.2 +++ b/apache/receipt	Mon Dec 30 17:12:55 2019 +0100
     3.3 @@ -1,64 +1,77 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="apache"
     3.7 -VERSION="2.4.16"
     3.8 +VERSION="2.4.41"
     3.9  CATEGORY="network"
    3.10 +TAGS="webserver http server"
    3.11  SHORT_DESC="Secure, efficient and extensible HTTP server."
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="Apache"
    3.14 +WEB_SITE="https://www.apache.org/"
    3.15 +
    3.16  SOURCE="httpd"
    3.17  TARBALL="$SOURCE-$VERSION.tar.bz2"
    3.18 -WEB_SITE="http://www.apache.org/"
    3.19  WGET_URL="${WEB_SITE}dist/$SOURCE/$TARBALL"
    3.20 +
    3.21 +PROVIDE="lighttpd"
    3.22 +DEPENDS="apr apr-util expat openssl pcre util-linux-uuid zlib"
    3.23 +BUILD_DEPENDS="apr-dev apr-util-dev bash expat-dev lua5.1-dev 
    3.24 +	openldap-dev openssl-dev sed util-linux-uuid-dev zlib-dev"
    3.25 +
    3.26  CONFIG_FILES="/etc/apache /var/www /etc/ssl/apache"
    3.27  TAZPANEL_DAEMON="edit::/etc/apache/httpd.conf|web::$WEB_SITE"
    3.28 -PROVIDE="lighttpd"
    3.29 -TAGS="webserver http server"
    3.30 -
    3.31 -DEPENDS="apr-util apr openssl pcre util-linux-uuid expat zlib"
    3.32 -BUILD_DEPENDS="apr-util-dev apr-dev openssl-dev sed expat-dev zlib-dev \
    3.33 -lua5.1-dev util-linux-uuid-dev openldap-dev bash"
    3.34  
    3.35  # Rules to configure and make the package.
    3.36  compile_rules()
    3.37  {
    3.38  	grep -q Slitaz config.layout || \
    3.39  		cat $stuff/slitaz.layout >> config.layout
    3.40 -	./configure --mandir=/usr/share/man \
    3.41 -		--enable-mods-shared=all \
    3.42 -		--enable-proxy \
    3.43 -		--enable-ssl \
    3.44 -		--enable-layout=Slitaz $CONFIGURE_ARGS &&
    3.45 -	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
    3.46 +
    3.47 +	./configure				\
    3.48 +		--mandir=/usr/share/man		\
    3.49 +		--enable-mods-shared=all	\
    3.50 +		--enable-proxy			\
    3.51 +		--enable-ssl			\
    3.52 +		--enable-layout=Slitaz		\
    3.53 +		$CONFIGURE_ARGS &&
    3.54 +	make $MAKEFLAGS &&
    3.55 +	make DESTDIR=$DESTDIR install
    3.56  }
    3.57  
    3.58  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.59  genpkg_rules()
    3.60  {
    3.61 -	mkdir -p $fs/usr/share/apache $fs/etc/init.d $fs/etc/apache/conf.d
    3.62 +	mkdir -p $fs/usr/share/apache
    3.63 +	mkdir -p $fs/etc/init.d
    3.64 +	mkdir -p $fs/etc/apache/conf.d
    3.65 +	mkdir -p $fs/etc/apache/extra
    3.66  	mkdir -p $fs/etc/ssl/apache
    3.67 -	cp -a $install/usr/share/apache/icons $fs/usr/share/apache
    3.68 -	cp -a $install/usr/share/apache/error $fs/usr/share/apache
    3.69 -	cp -a $install/usr/share/apache/modules $fs/usr/share/apache
    3.70 -	cp -a $install/usr/bin $fs/usr
    3.71 -	rm -r $fs/usr/bin/apxs
    3.72 -	cp -a $install/etc $fs
    3.73 -	rm -rf $fs/etc/apache/original
    3.74 -	cp -a $install/var $fs
    3.75 +
    3.76 +	cp -a $install/usr/share/apache/icons	$fs/usr/share/apache
    3.77 +	cp -a $install/usr/share/apache/error	$fs/usr/share/apache
    3.78 +	cp -a $install/usr/share/apache/modules	$fs/usr/share/apache
    3.79 +	cp -a $install/usr/bin			$fs/usr
    3.80 +	rm -r					$fs/usr/bin/apxs
    3.81 +	cp -a $install/etc			$fs
    3.82 +	rm -rf					$fs/etc/apache/original
    3.83 +	cp -a $install/var			$fs
    3.84  	
    3.85 -	cp -a $stuff/apache $fs/etc/init.d
    3.86 -	mkdir -p $fs/etc/apache/extra
    3.87 +	cp -a $stuff/apache			$fs/etc/init.d
    3.88  	cp -a $stuff/fix-range-CVE-2011-3192.conf $fs/etc/apache/extra
    3.89  
    3.90 -	sed -i  -e 's|User daemon|User www|' -e 's|Group daemon|Group www|' \
    3.91 +	sed -i  -e 's|User daemon|User www|' \
    3.92 +		-e 's|Group daemon|Group www|' \
    3.93  		-e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \
    3.94  		-e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \
    3.95  		-e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \
    3.96  		-e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \
    3.97  		-e 's|#LoadModule ssl_module|LoadModule ssl_module|' \
    3.98 -		$fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf
    3.99 +		$fs/etc/apache/httpd.conf \
   3.100 +		$fs/etc/apache/extra/httpd-ssl.conf
   3.101 +
   3.102  	echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf
   3.103  	sed -i 's/^SSLSessionCache /#&/' $fs/etc/apache/extra/httpd-ssl.conf
   3.104 +
   3.105  	cat >> $fs/etc/apache/extra/httpd-ssl.conf <<EOT
   3.106  
   3.107  # Unsafe, see CVE-2014-3566 POODLE
   3.108 @@ -67,12 +80,14 @@
   3.109  }
   3.110  
   3.111  # Pre and post install commands for Tazpkg.
   3.112 -# We stop the server by default in case of upgarde.
   3.113 +# We stop the server by default in case of upgrade.
   3.114  pre_install()
   3.115  {
   3.116 -	[ -z "$1" ] && for i in httpd lighttpd ngnix cherokee $PACKAGE ; do
   3.117 +	[ -z "$1" ] &&
   3.118 +	for i in httpd lighttpd ngnix cherokee $PACKAGE
   3.119 +	  do
   3.120  		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   3.121 -	done
   3.122 +	  done
   3.123  }
   3.124  
   3.125  post_install()
   3.126 @@ -104,12 +119,13 @@
   3.127  EOT
   3.128  	[ -z "$quiet" ] && echo # Start new line
   3.129  	( cd "$1/$INSTALLED/" ; grep -l /etc/apache/conf.d/ */receipt ) | \
   3.130 -	while read file; do
   3.131 +	while read file
   3.132 +	  do
   3.133  		pkg=$(dirname $file)
   3.134  		[ "$pkg" = "$PACKAGE" ] && continue
   3.135  		[ -z "$quiet" ] && echo "Reconfiguring $pkg for $PACKAGE..."
   3.136  		tazpkg reconfigure $pkg
   3.137 -	done
   3.138 +	  done
   3.139  	[ -f "$1/etc/php.ini" ] && tazpkg get-install php-apache --root="$1"
   3.140  	[ "$1" ] || netstat -ltn 2> /dev/null | grep -q :80 ||
   3.141  	/etc/init.d/$PACKAGE start