[arch-commits] Commit in awstats/repos/community-any (5 files)

Sergej Pupykin spupykin at archlinux.org
Sat Apr 18 16:30:52 UTC 2020


    Date: Saturday, April 18, 2020 @ 16:30:50
  Author: spupykin
Revision: 616081

archrelease: copy trunk to community-any

Added:
  awstats/repos/community-any/PKGBUILD
    (from rev 616080, awstats/trunk/PKGBUILD)
  awstats/repos/community-any/build-fix.patch
    (from rev 616080, awstats/trunk/build-fix.patch)
  awstats/repos/community-any/cron.awstats
    (from rev 616080, awstats/trunk/cron.awstats)
Deleted:
  awstats/repos/community-any/PKGBUILD
  awstats/repos/community-any/cron.awstats

-----------------+
 PKGBUILD        |  135 ++++++++++++++++++++++++++++--------------------------
 build-fix.patch |   12 ++++
 cron.awstats    |    8 +--
 3 files changed, 87 insertions(+), 68 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-18 16:30:37 UTC (rev 616080)
+++ PKGBUILD	2020-04-18 16:30:50 UTC (rev 616081)
@@ -1,64 +0,0 @@
-# Maintainer: Phillip Smith <fukawi2 at NO-SPAM.gmail.com>
-# http://github.com/fukawi2/aur-packages
-# Contributor: Piotr Beling <qwak at w8.pl>
-
-pkgname=awstats
-pkgver=7.8
-pkgrel=1
-pkgdesc="tool that generates web, streaming, ftp and mail server statistics, graphically"
-arch=('any')
-license=('GPL')
-url="http://awstats.sourceforge.net/"
-depends=('perl')
-backup=('etc/awstats/awstats.model.conf'
-	'etc/httpd/conf/extra/httpd-awstats.conf')
-#source=("http://www.awstats.org/files/${pkgname}-${pkgver}.tar.gz"
-source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	"cron.awstats")
-sha256sums=('4a52279792b6e43c9dd7e448181a31a84b8507243d67fb5ef6c74eac7288a2c4'
-            '18e2a1568da87540e8331982fc10f63f7c2ad8ba8fc593f3219469c6ecdef5d2')
-
-package() {
-  _SYSCONFDIR="etc"
-  _WWWROOT="usr/share/webapps/${pkgname}"
-  _INSTDIR="usr/share/${pkgname}"
-  _DOCDIR="usr/share/doc/${pkgname}-${pkgver}"
-
-  cd "$srcdir"/${pkgname}-${pkgver}
-
-  mkdir -p "$pkgdir"/${_INSTDIR}/tools/webmin/
-  mkdir -p "$pkgdir"/${_INSTDIR}/tools/xslt/
-  mkdir -p "$pkgdir"/${_WWWROOT}/
-  mkdir -p "$pkgdir"/${_DOCDIR}/
-  mkdir -p "$pkgdir"/var/lib/$pkgname
-
-  # Arch Linux specific path:
-  install -Dm644 tools/httpd_conf "$pkgdir"/${_SYSCONFDIR}/httpd/conf/extra/httpd-awstats.conf
-  install -Dm644 wwwroot/cgi-bin/awstats.model.conf "$pkgdir"/${_SYSCONFDIR}/awstats/awstats.model.conf
-  install -Dm644 "$srcdir"/cron.awstats "$pkgdir"/${_DOCDIR}/cron.hourly
-
-  install -m 755 tools/logresolvemerge.pl "$pkgdir"/${_INSTDIR}/tools/logresolvemerge.pl
-  install -m 755 tools/maillogconvert.pl "$pkgdir"/${_INSTDIR}/tools/maillogconvert.pl
-  install -m 755 tools/urlaliasbuilder.pl "$pkgdir"/${_INSTDIR}/tools/urlaliasbuilder.pl
-  install -m 755 tools/awstats_buildstaticpages.pl "$pkgdir"/${_INSTDIR}/tools/awstats_buildstaticpages.pl
-  install -m 755 tools/awstats_configure.pl "$pkgdir"/${_INSTDIR}/tools/awstats_configure.pl
-  install -m 755 tools/awstats_exportlib.pl "$pkgdir"/${_INSTDIR}/tools/awstats_exportlib.pl
-  install -m 755 tools/awstats_updateall.pl "$pkgdir"/${_INSTDIR}/tools/awstats_updateall.pl
-  install -m 755 tools/webmin/* "$pkgdir"/${_INSTDIR}/tools/webmin
-  install -m 755 tools/xslt/* "$pkgdir"/${_INSTDIR}/tools/xslt
-
-  # install the documentation
-  cp -ra docs/* "$pkgdir"/${_DOCDIR}/
-
-  # www files
-  cp -ra wwwroot/* "$pkgdir"/${_WWWROOT}/
-  rm -f "$pkgdir"/${_WWWROOT}/cgi-bin/awstats.model.conf
-  install -Dm444 README.md "$pkgdir"/${_INSTDIR}/README.md
-
-  # fix the default http config
-  sed \
-	-e "s|/usr/local/awstats/wwwroot|/${_WWWROOT}|g" \
-	-i "$pkgdir"/${_SYSCONFDIR}/httpd/conf/extra/httpd-awstats.conf
-
-  echo "deny from all" > "$pkgdir"/${_WWWROOT}/.htaccess
-}

Copied: awstats/repos/community-any/PKGBUILD (from rev 616080, awstats/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-18 16:30:50 UTC (rev 616081)
@@ -0,0 +1,71 @@
+# Maintainer: Phillip Smith <fukawi2 at NO-SPAM.gmail.com>
+# http://github.com/fukawi2/aur-packages
+# Contributor: Piotr Beling <qwak at w8.pl>
+
+pkgname=awstats
+pkgver=7.8
+pkgrel=2
+pkgdesc="tool that generates web, streaming, ftp and mail server statistics, graphically"
+arch=('any')
+license=('GPL')
+url="http://awstats.sourceforge.net/"
+depends=('perl')
+backup=('etc/awstats/awstats.model.conf'
+	'etc/httpd/conf/extra/httpd-awstats.conf')
+#source=("http://www.awstats.org/files/${pkgname}-${pkgver}.tar.gz"
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+	"cron.awstats"
+	"build-fix.patch")
+sha256sums=('4a52279792b6e43c9dd7e448181a31a84b8507243d67fb5ef6c74eac7288a2c4'
+            '18e2a1568da87540e8331982fc10f63f7c2ad8ba8fc593f3219469c6ecdef5d2'
+            '05734f017ad6ce34298f547248dd8369ce18a41075f4967ad6f1f164cddd326b')
+
+prepare() {
+  cd "$srcdir"/${pkgname}-${pkgver}
+  patch -p1 <../build-fix.patch
+}
+
+package() {
+  _SYSCONFDIR="etc"
+  _WWWROOT="usr/share/webapps/${pkgname}"
+  _INSTDIR="usr/share/${pkgname}"
+  _DOCDIR="usr/share/doc/${pkgname}-${pkgver}"
+
+  cd "$srcdir"/${pkgname}-${pkgver}
+
+  mkdir -p "$pkgdir"/${_INSTDIR}/tools/webmin/
+  mkdir -p "$pkgdir"/${_INSTDIR}/tools/xslt/
+  mkdir -p "$pkgdir"/${_WWWROOT}/
+  mkdir -p "$pkgdir"/${_DOCDIR}/
+  mkdir -p "$pkgdir"/var/lib/$pkgname
+
+  # Arch Linux specific path:
+  install -Dm644 tools/httpd_conf "$pkgdir"/${_SYSCONFDIR}/httpd/conf/extra/httpd-awstats.conf
+  install -Dm644 wwwroot/cgi-bin/awstats.model.conf "$pkgdir"/${_SYSCONFDIR}/awstats/awstats.model.conf
+  install -Dm644 "$srcdir"/cron.awstats "$pkgdir"/${_DOCDIR}/cron.hourly
+
+  install -m 755 tools/logresolvemerge.pl "$pkgdir"/${_INSTDIR}/tools/logresolvemerge.pl
+  install -m 755 tools/maillogconvert.pl "$pkgdir"/${_INSTDIR}/tools/maillogconvert.pl
+  install -m 755 tools/urlaliasbuilder.pl "$pkgdir"/${_INSTDIR}/tools/urlaliasbuilder.pl
+  install -m 755 tools/awstats_buildstaticpages.pl "$pkgdir"/${_INSTDIR}/tools/awstats_buildstaticpages.pl
+  install -m 755 tools/awstats_configure.pl "$pkgdir"/${_INSTDIR}/tools/awstats_configure.pl
+  install -m 755 tools/awstats_exportlib.pl "$pkgdir"/${_INSTDIR}/tools/awstats_exportlib.pl
+  install -m 755 tools/awstats_updateall.pl "$pkgdir"/${_INSTDIR}/tools/awstats_updateall.pl
+  install -m 755 tools/webmin/* "$pkgdir"/${_INSTDIR}/tools/webmin
+  install -m 755 tools/xslt/* "$pkgdir"/${_INSTDIR}/tools/xslt
+
+  # install the documentation
+  cp -ra docs/* "$pkgdir"/${_DOCDIR}/
+
+  # www files
+  cp -ra wwwroot/* "$pkgdir"/${_WWWROOT}/
+  rm -f "$pkgdir"/${_WWWROOT}/cgi-bin/awstats.model.conf
+  install -Dm444 README.md "$pkgdir"/${_INSTDIR}/README.md
+
+  # fix the default http config
+  sed \
+	-e "s|/usr/local/awstats/wwwroot|/${_WWWROOT}|g" \
+	-i "$pkgdir"/${_SYSCONFDIR}/httpd/conf/extra/httpd-awstats.conf
+
+  echo "deny from all" > "$pkgdir"/${_WWWROOT}/.htaccess
+}

Copied: awstats/repos/community-any/build-fix.patch (from rev 616080, awstats/trunk/build-fix.patch)
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2020-04-18 16:30:50 UTC (rev 616081)
@@ -0,0 +1,12 @@
+diff -wbBur awstats-7.8/wwwroot/cgi-bin/lib/mime.pm awstats-7.8.my/wwwroot/cgi-bin/lib/mime.pm
+--- awstats-7.8/wwwroot/cgi-bin/lib/mime.pm	2020-04-16 12:18:35.000000000 +0300
++++ awstats-7.8.my/wwwroot/cgi-bin/lib/mime.pm	2020-04-18 19:27:04.242408222 +0300
+@@ -56,7 +56,7 @@
+ 'diskimage', 'Disc and media file extensions',
+ 'vm',        'Virtual Machine image',
+ 'torrent',   'BitTorrent File',
+-'gis',       'GIS File'
++'gis',       'GIS File',
+ 'ebook',     'Ebook File'
+ );
+ 

Deleted: cron.awstats
===================================================================
--- cron.awstats	2020-04-18 16:30:37 UTC (rev 616080)
+++ cron.awstats	2020-04-18 16:30:50 UTC (rev 616081)
@@ -1,4 +0,0 @@
-#!/bin/sh
-/usr/share/awstats/tools/awstats_updateall.pl now \
-	-configdir=/etc/awstats \
-	-awstatsprog=/usr/share/webapps/awstats/cgi-bin/awstats.pl > /dev/null

Copied: awstats/repos/community-any/cron.awstats (from rev 616080, awstats/trunk/cron.awstats)
===================================================================
--- cron.awstats	                        (rev 0)
+++ cron.awstats	2020-04-18 16:30:50 UTC (rev 616081)
@@ -0,0 +1,4 @@
+#!/bin/sh
+/usr/share/awstats/tools/awstats_updateall.pl now \
+	-configdir=/etc/awstats \
+	-awstatsprog=/usr/share/webapps/awstats/cgi-bin/awstats.pl > /dev/null


More information about the arch-commits mailing list