# HG changeset patch # User Hans-G?nter Theisgen # Date 1643473711 -3600 # Node ID 5836340a00c29090c27c81df3c287b1f2a101c23 # Parent f1922233bc3abacb55d40c42fbddccc0e6081d6a updated awstats (7.7 -> 7.8) diff -r f1922233bc3a -r 5836340a00c2 avfs-dev/receipt --- a/avfs-dev/receipt Sat Jan 29 17:06:12 2022 +0100 +++ b/avfs-dev/receipt Sat Jan 29 17:28:31 2022 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="avfs-dev" -VERSION="1.1.1" +VERSION="1.1.4" CATEGORY="development" SHORT_DESC="A virtual Filesystem implemented with FUSE, development files." MAINTAINER="pascal.bellard@slitaz.org" @@ -14,8 +14,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*a $fs/usr/lib + cook_copy_folders include + cook_copy_files *.*a } diff -r f1922233bc3a -r 5836340a00c2 awstats/receipt --- a/awstats/receipt Sat Jan 29 17:06:12 2022 +0100 +++ b/awstats/receipt Sat Jan 29 17:28:31 2022 +0100 @@ -1,49 +1,51 @@ # SliTaz package receipt. PACKAGE="awstats" -VERSION="7.7" +VERSION="7.8" CATEGORY="network" TAGS="log analysis web mail ftp" -SHORT_DESC="Log file analyzer" +SHORT_DESC="Log file analyzer." MAINTAINER="erjo@slitaz.org" LICENSE="GPL" -WEB_SITE="http://awstats.sourceforge.net/" +WEB_SITE="https://www.awstats.org/" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="https://downloads.sourceforge.net/project/$PACKAGE/AWStats/$VERSION/$TARBALL" +WGET_URL="${WEB_SITE}files/$TARBALL" +SUGGESTED="perl-geo-ipfree perl-net-xwhois" DEPENDS="perl" -SUGGESTED="perl-net-xwhois perl-geo-ipfree" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/awstats/extras \ - $fs/var/www/cgi-bin \ - $fs/var/lib/awstats \ - $fs/etc/awstats \ - $install/usr/share + mkdir -p $fs/usr/share/awstats/extras + mkdir -p $fs/var/www/cgi-bin + mkdir -p $fs/var/lib/awstats + mkdir -p $fs/etc/awstats + mkdir -p $install/usr/share - cp -a $src/docs $install/usr/share/doc - cp -a $src/wwwroot/classes $fs/usr/share/awstats - cp -a $src/wwwroot/css $fs/usr/share/awstats - cp -a $src/wwwroot/icon $fs/usr/share/awstats - cp -a $src/wwwroot/js $fs/usr/share/awstats - cp -a $src/wwwroot/cgi-bin/lang $fs/usr/share/awstats - cp -a $src/wwwroot/cgi-bin/lib $fs/usr/share/awstats - cp -a $src/wwwroot/cgi-bin/plugins $fs/usr/share/awstats + cp -a $src/docs $install/usr/share/doc + cp -a $src/wwwroot/classes $fs/usr/share/awstats + cp -a $src/wwwroot/css $fs/usr/share/awstats + cp -a $src/wwwroot/icon $fs/usr/share/awstats + cp -a $src/wwwroot/js $fs/usr/share/awstats + cp -a $src/wwwroot/cgi-bin/lang $fs/usr/share/awstats + cp -a $src/wwwroot/cgi-bin/lib $fs/usr/share/awstats + cp -a $src/wwwroot/cgi-bin/plugins $fs/usr/share/awstats - cp -a $src/wwwroot/cgi-bin/awstats.pl $fs/var/www/cgi-bin - cp -a $src/wwwroot/cgi-bin/awstats.model.conf $fs/etc/awstats + cp -a $src/wwwroot/cgi-bin/awstats.pl $fs/var/www/cgi-bin + cp -a $src/wwwroot/cgi-bin/awstats.model.conf \ + $fs/etc/awstats - cp $stuff/* $fs/usr/share/awstats/extras + cp $stuff/* $fs/usr/share/awstats/extras # Add a link using google map sed -i 's|Full Whois Field"|Full Whois Field ?"|' \ $fs/usr/share/awstats/plugins/hostinfo.pm # Avoid alias conflicts - for i in classes css icon ; do + for i in classes css icon + do sed -i "s| /$i| /awstats$i|" \ $fs/usr/share/awstats/extras/awstats-apache.conf sed -i "s|\"/$i|\"/awstats$i|" \ @@ -54,38 +56,44 @@ sed -i 's/classes/awstatsclasses/' \ $fs/usr/share/awstats/plugins/graphapplet.pm - chown -R root:root $fs + chown -R root:root $fs find $fs -type f -exec chmod a-x \{\} \; - chmod a+x \ - $fs/usr/share/awstats/extras/update \ - $fs/var/www/cgi-bin/awstats.pl \ - $fs/usr/share/awstats/classes/src/Makefile.pl + + chmod a+x $fs/usr/share/awstats/classes/src/Makefile.pl + chmod a+x $fs/usr/share/awstats/extras/update + chmod a+x $fs/var/www/cgi-bin/awstats.pl } post_install() { # Set lighttpd or apache config - if [ -f "$1/etc/apache/httpd.conf" ]; then - if [ ! -f "$1/etc/apache/conf.d/awstats.conf" ]; then - + if [ -f "$1/etc/apache/httpd.conf" ] + then + if [ ! -f "$1/etc/apache/conf.d/awstats.conf" ] + then cp "$1/usr/share/awstats/extras/awstats-apache.conf" \ "$1/etc/apache/conf.d/awstats.conf" fi - if [ -z "$1" ]; then + if [ -z "$1" ] + then # Start Web server if necessary. - if [ -f /var/run/apache/httpd.pid ]; then + if [ -f /var/run/apache/httpd.pid ] + then /etc/init.d/apache restart fi fi fi - if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then - if [ ! -f "$1/etc/lighttpd/awstats.conf" ]; then + if [ -f "$1/etc/lighttpd/lighttpd.conf" ] + then + if [ ! -f "$1/etc/lighttpd/awstats.conf" ] + then cp "$1/usr/share/awstats/extras/awstats-lighttpd.conf" \ "$1/etc/lighttpd/awstats.conf" fi # Start Web server if necessary. - if [ -f /var/run/lighttpd.pid ]; then + if [ -f /var/run/lighttpd.pid ] + then /etc/init.d/lighttpd restart fi fi @@ -100,18 +108,20 @@ post_remove() { echo "Remove orphan dirctories." - [ -d /usr/share/awstats ] && rm -rf /usr/share/awstats + [ -d /usr/share/awstats ] && + rm -rf /usr/share/awstats # FIXME echo "All database and configuratoin files will be removed" - echo -n "Please confirm removing (y/N) : "; read answer + echo -n "Please confirm removing (y/N) : " + read answer case $answer in - y|Y) + (y|Y) rm -rf /var/lib/awstats rm -rf /etc/awstats ;; - *) + (*) ;; esac }