wok rev 24339

updated awstats (7.7 -> 7.8)
author Hans-G?nter Theisgen
date Sat Jan 29 17:28:31 2022 +0100 (2022-01-29)
parents f1922233bc3a
children 5f6c5106b1f5
files avfs-dev/receipt awstats/receipt
line diff
     1.1 --- a/avfs-dev/receipt	Sat Jan 29 17:06:12 2022 +0100
     1.2 +++ b/avfs-dev/receipt	Sat Jan 29 17:28:31 2022 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="avfs-dev"
     1.7 -VERSION="1.1.1"
     1.8 +VERSION="1.1.4"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="A virtual Filesystem implemented with FUSE, development files."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -14,8 +14,6 @@
    1.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.14  genpkg_rules()
    1.15  {
    1.16 -	mkdir -p $fs/usr/lib
    1.17 -
    1.18 -	cp -a $install/usr/include	$fs/usr
    1.19 -	cp -a $install/usr/lib/*a	$fs/usr/lib
    1.20 +	cook_copy_folders	include
    1.21 +	cook_copy_files		*.*a
    1.22  }
     2.1 --- a/awstats/receipt	Sat Jan 29 17:06:12 2022 +0100
     2.2 +++ b/awstats/receipt	Sat Jan 29 17:28:31 2022 +0100
     2.3 @@ -1,49 +1,51 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="awstats"
     2.7 -VERSION="7.7"
     2.8 +VERSION="7.8"
     2.9  CATEGORY="network"
    2.10  TAGS="log analysis web mail ftp"
    2.11 -SHORT_DESC="Log file analyzer"
    2.12 +SHORT_DESC="Log file analyzer."
    2.13  MAINTAINER="erjo@slitaz.org"
    2.14  LICENSE="GPL"
    2.15 -WEB_SITE="http://awstats.sourceforge.net/"
    2.16 +WEB_SITE="https://www.awstats.org/"
    2.17  
    2.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.19 -WGET_URL="https://downloads.sourceforge.net/project/$PACKAGE/AWStats/$VERSION/$TARBALL"
    2.20 +WGET_URL="${WEB_SITE}files/$TARBALL"
    2.21  
    2.22 +SUGGESTED="perl-geo-ipfree perl-net-xwhois"
    2.23  DEPENDS="perl"
    2.24 -SUGGESTED="perl-net-xwhois perl-geo-ipfree"
    2.25  
    2.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.27  genpkg_rules()
    2.28  {
    2.29 -	mkdir -p $fs/usr/share/awstats/extras \
    2.30 -		$fs/var/www/cgi-bin \
    2.31 -		$fs/var/lib/awstats \
    2.32 -		$fs/etc/awstats \
    2.33 -		$install/usr/share
    2.34 +	mkdir -p $fs/usr/share/awstats/extras
    2.35 +	mkdir -p $fs/var/www/cgi-bin
    2.36 +	mkdir -p $fs/var/lib/awstats
    2.37 +	mkdir -p $fs/etc/awstats
    2.38 +	mkdir -p $install/usr/share
    2.39  
    2.40 -	cp -a $src/docs $install/usr/share/doc
    2.41 -	cp -a $src/wwwroot/classes $fs/usr/share/awstats
    2.42 -	cp -a $src/wwwroot/css $fs/usr/share/awstats
    2.43 -	cp -a $src/wwwroot/icon $fs/usr/share/awstats
    2.44 -	cp -a $src/wwwroot/js $fs/usr/share/awstats
    2.45 -	cp -a $src/wwwroot/cgi-bin/lang $fs/usr/share/awstats
    2.46 -	cp -a $src/wwwroot/cgi-bin/lib $fs/usr/share/awstats
    2.47 -	cp -a $src/wwwroot/cgi-bin/plugins $fs/usr/share/awstats
    2.48 +	cp -a $src/docs				$install/usr/share/doc
    2.49 +	cp -a $src/wwwroot/classes		$fs/usr/share/awstats
    2.50 +	cp -a $src/wwwroot/css			$fs/usr/share/awstats
    2.51 +	cp -a $src/wwwroot/icon			$fs/usr/share/awstats
    2.52 +	cp -a $src/wwwroot/js			$fs/usr/share/awstats
    2.53 +	cp -a $src/wwwroot/cgi-bin/lang		$fs/usr/share/awstats
    2.54 +	cp -a $src/wwwroot/cgi-bin/lib		$fs/usr/share/awstats
    2.55 +	cp -a $src/wwwroot/cgi-bin/plugins	$fs/usr/share/awstats
    2.56  
    2.57 -	cp -a $src/wwwroot/cgi-bin/awstats.pl  $fs/var/www/cgi-bin
    2.58 -	cp -a $src/wwwroot/cgi-bin/awstats.model.conf  $fs/etc/awstats
    2.59 +	cp -a $src/wwwroot/cgi-bin/awstats.pl 	$fs/var/www/cgi-bin
    2.60 +	cp -a $src/wwwroot/cgi-bin/awstats.model.conf \
    2.61 +						$fs/etc/awstats
    2.62  
    2.63 -	cp $stuff/* $fs/usr/share/awstats/extras
    2.64 +	cp $stuff/*				$fs/usr/share/awstats/extras
    2.65  
    2.66  	# Add a link using google map
    2.67  	sed -i 's|Full Whois Field"|Full Whois Field <a href=\\"http://en.utrace.de/?query=".$HostResolved."\\">?</a>"|' \
    2.68  		$fs/usr/share/awstats/plugins/hostinfo.pm
    2.69  
    2.70  	# Avoid alias conflicts
    2.71 -	for i in classes css icon ; do
    2.72 +	for i in classes css icon
    2.73 +	  do
    2.74  		sed -i "s| /$i| /awstats$i|" \
    2.75  			$fs/usr/share/awstats/extras/awstats-apache.conf
    2.76  		sed -i "s|\"/$i|\"/awstats$i|" \
    2.77 @@ -54,38 +56,44 @@
    2.78  	sed -i 's/classes/awstatsclasses/' \
    2.79  		$fs/usr/share/awstats/plugins/graphapplet.pm
    2.80  
    2.81 -	chown -R root:root $fs
    2.82 +	chown -R root:root	$fs
    2.83  	find $fs -type f -exec chmod a-x \{\} \;
    2.84 -	chmod a+x \
    2.85 -		$fs/usr/share/awstats/extras/update \
    2.86 -		$fs/var/www/cgi-bin/awstats.pl \
    2.87 -		$fs/usr/share/awstats/classes/src/Makefile.pl
    2.88 +
    2.89 +	chmod a+x	$fs/usr/share/awstats/classes/src/Makefile.pl
    2.90 +	chmod a+x	$fs/usr/share/awstats/extras/update
    2.91 +	chmod a+x	$fs/var/www/cgi-bin/awstats.pl
    2.92  }
    2.93  
    2.94  post_install()
    2.95  {
    2.96  	# Set lighttpd or apache config
    2.97 -	if [ -f "$1/etc/apache/httpd.conf" ]; then
    2.98 -		if [ ! -f "$1/etc/apache/conf.d/awstats.conf" ]; then
    2.99 -			
   2.100 +	if [ -f "$1/etc/apache/httpd.conf" ]
   2.101 +	  then
   2.102 +		if [ ! -f "$1/etc/apache/conf.d/awstats.conf" ]
   2.103 +		  then	
   2.104  			cp "$1/usr/share/awstats/extras/awstats-apache.conf" \
   2.105  				"$1/etc/apache/conf.d/awstats.conf"
   2.106  		fi
   2.107 -		if [ -z "$1" ]; then
   2.108 +		if [ -z "$1" ]
   2.109 +		  then
   2.110  			# Start Web server if necessary.
   2.111 -			if [ -f /var/run/apache/httpd.pid ]; then
   2.112 +			if [ -f /var/run/apache/httpd.pid ]
   2.113 +			  then
   2.114  				/etc/init.d/apache restart
   2.115  			fi
   2.116  		fi
   2.117  	fi
   2.118  
   2.119 -	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
   2.120 -		if [ ! -f "$1/etc/lighttpd/awstats.conf" ]; then
   2.121 +	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]
   2.122 +	  then
   2.123 +		if [ ! -f "$1/etc/lighttpd/awstats.conf" ]
   2.124 +		  then
   2.125  			cp "$1/usr/share/awstats/extras/awstats-lighttpd.conf" \
   2.126  				"$1/etc/lighttpd/awstats.conf"
   2.127  		fi
   2.128  					# Start Web server if necessary.
   2.129 -		if [ -f /var/run/lighttpd.pid ]; then
   2.130 +		if [ -f /var/run/lighttpd.pid ]
   2.131 +		  then
   2.132  			/etc/init.d/lighttpd restart
   2.133  		fi
   2.134  	fi
   2.135 @@ -100,18 +108,20 @@
   2.136  post_remove()
   2.137  {
   2.138  		echo "Remove orphan dirctories."
   2.139 -		[ -d /usr/share/awstats ] && rm -rf /usr/share/awstats
   2.140 +		[ -d /usr/share/awstats ] &&
   2.141 +		rm -rf /usr/share/awstats
   2.142  
   2.143  		# FIXME
   2.144  		echo "All database and configuratoin files will be removed"
   2.145 -		echo -n "Please confirm removing (y/N) : "; read answer
   2.146 +		echo -n "Please confirm removing (y/N) : "
   2.147 +		read answer
   2.148  
   2.149  		case $answer in
   2.150 -			y|Y)
   2.151 +			(y|Y)
   2.152  				rm -rf /var/lib/awstats
   2.153  				rm -rf /etc/awstats
   2.154  				;;
   2.155 -			*)
   2.156 +			(*)
   2.157  				;;
   2.158  		esac
   2.159  }