diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /www-misc/awstats | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'www-misc/awstats')
-rw-r--r-- | www-misc/awstats/Manifest | 4 | ||||
-rw-r--r-- | www-misc/awstats/awstats-7.4.ebuild | 111 | ||||
-rw-r--r-- | www-misc/awstats/awstats-7.8.ebuild | 111 | ||||
-rw-r--r-- | www-misc/awstats/files/awstats-perl-5.22.patch | 45 |
4 files changed, 0 insertions, 271 deletions
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest index 01c752351014..208ab89feba7 100644 --- a/www-misc/awstats/Manifest +++ b/www-misc/awstats/Manifest @@ -1,9 +1,5 @@ AUX awstats-7.1-gentoo.diff 795 BLAKE2B c3c02a9086dc8067cc739ed4b180865aa1c68d5f6786b9a1d850a3c0314bdcb8abb1e3841229ae90cef3e1f6ba24a8262895c44d0b92faffb3f4c4100021e065 SHA512 09e46f32b31389cd1d98465c8b2578c37d5d4d601baf58eb8ed6811875743c3b19819d6820977a9aaace8d8f8c97be8f798fcbaa10f7ed0cb950a2f7f843754c AUX awstats-7.8-mime.patch 479 BLAKE2B 320b201daae7613e532123946f073107bf6096d924caa227463817308bcb6824788d683010031dc9ac5ffaaf65d4c169d49f43dd4d9d30d14697a15975835e85 SHA512 38ff55c99fa01ac52dac492e4153bcc2851e79ce3e1d1319c34a7695e66de9f4fff74739ce06e545fcc8ea3902a0325ff370471d04e136b92a6bef1dbba3095d -AUX awstats-perl-5.22.patch 1981 BLAKE2B 7198b110b2688a989aeecd8ddeb364ab485e615ed045b9fa836f5fd050e344224564300f089cc6f53624e7f36284c0cfdf92930c3e0a82cc52c2ecfce348699b SHA512 9b0b4768583e40a55635b5c81c608798ee3036779359747d91cf12d96757d62b79fc8abbe43dbf322f9958616fafcd99d122fcd5c8234f2e6b871173da769800 -DIST awstats-7.4.tar.gz 2936102 BLAKE2B 2bc7f9619e4d6b13d3909869d642c347d6b9cddbbb3b49d58494ce108c8fe25d59b27198d5a42f8b81c06fdaf1a2e135c82883ec8604e53c6c5adbac07223b66 SHA512 5bce97c71aabeab35e4ff5e5168531e4955d7c1474322c7b4a47d1d06e06ebd0e74d1def73826498e6253f24aeca99309777617b7a914685c927bb6e1c020e1a DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d -EBUILD awstats-7.4.ebuild 3369 BLAKE2B 6866cf202650d148525c9baccf5a0a5249dfdc51bb235f4bb44f9cb67d133be9a385b61fa43d4e3a6dbfd72fd9b94414b59e5514324acff109411ff28ddeba42 SHA512 7d732c580d6facadef850bc82ca5eaa70b44bbfcfba2b9717d325d81a154f44af15a0dc2c850d1d08807d854eae4fa14da2e163271a67d2d3d6da32de2f66b2f EBUILD awstats-7.8-r1.ebuild 3015 BLAKE2B b7f76d10a96968b28aa8a560183d413699405eeba6bb732478e25f1af448bc0e8cba0ab6c207981b282cad1b54efb7c0292d308dac84bb6a1b9967161c6ed1d4 SHA512 4c68225a8f766e6f91053ef53b9065dcb2424a9739f93ecb256a990326472a3cebdbb2bbb683136bb47672540da7faf5f13b4fe638ca97108534516d5dd1b87d -EBUILD awstats-7.8.ebuild 2975 BLAKE2B 3aea1489f4d6565de27edb6916939a375ae90e0d53abf25266783ad6772054c02ed928b658529f00f3595531b6b2aba16fb416d4539885fd56f68dd1f56e73b9 SHA512 c9c14bb3ca79b963c15732169b1cb83b6cb6632eb9649e6571c5bf0dfeadf838c1482cf38f72e3ff80bcdb0a4ee08dc9a8b90192c5ecced08d8a0ede0354a00a MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8 diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild deleted file mode 100644 index 30a6da43390e..000000000000 --- a/www-misc/awstats/awstats-7.4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils - -MY_P=${PN}-${PV%_p*} - -DESCRIPTION="AWStats is short for Advanced Web Statistics" -HOMEPAGE="http://www.awstats.org/" - -if [ ${MY_P} != ${P} ]; then - SRC_URI="https://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz" - # The following SRC_URI is useful only when fetching for the first time - # after bump; upstream does not bump the version when they change it, so - # we rename it to include the date and upload to our mirrors instead. - #SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="http://www.awstats.org/files/${P}.tar.gz" -fi - -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-3" -KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86" -IUSE="geoip ipv6" - -SLOT="0" - -RDEPEND=">=dev-lang/perl-5.6.1 - virtual/perl-Time-Local - dev-perl/URI - geoip? ( dev-perl/Geo-IP ) - ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )" -DEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff - epatch "${FILESDIR}"/${PN}-perl-5.22.patch - - # change default installation directory - find . -type f -exec sed \ - -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \ - -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \ - -i {} + || die "find/sed failed" - - # set default values for directories; use apache log as an example - sed \ - -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \ - -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \ - -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - - # enable plugins - - if use ipv6; then - sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - if use geoip; then - sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die -} - -src_install() { - dohtml -r docs/* - dodoc README.md - newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm - dodoc -r tools/xslt - - keepdir /var/lib/awstats - - insinto /etc/awstats - doins "${S}"/wwwroot/cgi-bin/awstats.model.conf - - # remove extra content that we don't want to install - rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \ - "${S}"/wwwroot/classes/src || die - - insinto /usr/share/awstats - doins -r wwwroot - chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl - - cd "${S}"/tools - dobin awstats_buildstaticpages.pl awstats_exportlib.pl \ - awstats_updateall.pl - newbin logresolvemerge.pl awstats_logresolvemerge.pl - newbin maillogconvert.pl awstats_maillogconvert.pl - newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl -} - -pkg_postinst() { - elog "The AWStats-Manual is available either inside" - elog "the /usr/share/doc/${PF} - folder, or at" - elog "http://awstats.sourceforge.net/docs/index.html ." - elog - elog "Copy the /etc/awstats/awstats.model.conf to" - elog "/etc/awstats/awstats.<yourdomain>.conf and edit it." - elog "" - ewarn "This ebuild does no longer use webapp-config to install" - ewarn "instead you should point your configuration to the stable" - ewarn "directory tree in the following path:" - ewarn " /usr/share/awstats" -} diff --git a/www-misc/awstats/awstats-7.8.ebuild b/www-misc/awstats/awstats-7.8.ebuild deleted file mode 100644 index c73348d6087b..000000000000 --- a/www-misc/awstats/awstats-7.8.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils - -MY_P=${PN}-${PV%_p*} - -DESCRIPTION="AWStats is short for Advanced Web Statistics" -HOMEPAGE="https://www.awstats.org/" -SRC_URI="https://www.awstats.org/files/${P}.tar.gz" -S=${WORKDIR}/${MY_P} -LICENSE="GPL-3" -KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86" -IUSE="geoip ipv6" - -SLOT="0" - -RDEPEND=" - >=dev-lang/perl-5.6.1 - dev-perl/URI - virtual/perl-Time-Local - geoip? ( - dev-perl/Geo-IP - ) - ipv6? ( - dev-perl/Net-DNS - dev-perl/Net-IP - ) -" -DEPEND="" - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.1-gentoo.diff - - # change default installation directory - find . -type f -exec sed \ - -e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \ - -e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \ - -i {} + || die "find/sed failed" - - # set default values for directories; use apache log as an example - sed \ - -e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \ - -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \ - -e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - - # enable plugins - - if use ipv6; then - sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - if use geoip; then - sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \ - -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - fi - - find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die - - eapply_user -} - -HTML_DOCS="docs/" -DOCS="README.md" - -src_install() { - einstalldocs - - newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm - dodoc -r tools/xslt - - keepdir /var/lib/awstats - - insinto /etc/awstats - doins "${S}"/wwwroot/cgi-bin/awstats.model.conf - - # remove extra content that we don't want to install - rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \ - "${S}"/wwwroot/classes/src || die - - insinto /usr/share/awstats - doins -r wwwroot - chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl - - cd "${S}"/tools - dobin awstats_buildstaticpages.pl awstats_exportlib.pl \ - awstats_updateall.pl - newbin logresolvemerge.pl awstats_logresolvemerge.pl - newbin maillogconvert.pl awstats_maillogconvert.pl - newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl -} - -pkg_postinst() { - elog "The AWStats-Manual is available either inside" - elog "the /usr/share/doc/${PF} - folder, or at" - elog "https://awstats.sourceforge.net/docs/index.html ." - elog - elog "Copy the /etc/awstats/awstats.model.conf to" - elog "/etc/awstats/awstats.<yourdomain>.conf and edit it." - elog "" - ewarn "This ebuild does no longer use webapp-config to install" - ewarn "instead you should point your configuration to the stable" - ewarn "directory tree in the following path:" - ewarn " /usr/share/awstats" -} diff --git a/www-misc/awstats/files/awstats-perl-5.22.patch b/www-misc/awstats/files/awstats-perl-5.22.patch deleted file mode 100644 index 8f4e1cac2c0b..000000000000 --- a/www-misc/awstats/files/awstats-perl-5.22.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6ca56baf8e5819787c128e5ccd741701cb84bfdd Mon Sep 17 00:00:00 2001 -From: Laurent Destailleur <eldy@destailleur.fr> -Date: Tue, 18 Aug 2015 20:41:20 +0200 -Subject: [PATCH] Compatibility with Perl 5.22 - ---- - docs/awstats_changelog.txt | 1 + - wwwroot/cgi-bin/awstats.pl | 12 ++++++------ - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt -index 1fcca7f..1b5e342 100644 ---- a/docs/awstats_changelog.txt -+++ b/docs/awstats_changelog.txt -@@ -8,6 +8,7 @@ New features: - option nboflastupdatelookuptosave on command line. - - #199 Added geoip6 plugin with support for IPv4 AND IPv6. - - Work with Amazon AWS log files (using %time5 tag). -+- Compatibility with Perl 5.22 - - Fixes: - - Fixes permission on some .pl scripts. -diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl -index c9dcee9..eb14fc0 100755 ---- a/wwwroot/cgi-bin/awstats.pl -+++ b/wwwroot/cgi-bin/awstats.pl -@@ -9040,12 +9040,12 @@ sub DefinePerlParsingFormat { - $LogFormatString =~ s/%>s/%code/g; - $LogFormatString =~ s/%b(\s)/%bytesd$1/g; - $LogFormatString =~ s/%b$/%bytesd/g; -- $LogFormatString =~ s/\"%{Referer}i\"/%refererquot/g; -- $LogFormatString =~ s/\"%{User-Agent}i\"/%uaquot/g; -- $LogFormatString =~ s/%{mod_gzip_input_size}n/%gzipin/g; -- $LogFormatString =~ s/%{mod_gzip_output_size}n/%gzipout/g; -- $LogFormatString =~ s/%{mod_gzip_compression_ratio}n/%gzipratio/g; -- $LogFormatString =~ s/\(%{ratio}n\)/%deflateratio/g; -+ $LogFormatString =~ s/\"%\{Referer}i\"/%refererquot/g; -+ $LogFormatString =~ s/\"%\{User-Agent}i\"/%uaquot/g; -+ $LogFormatString =~ s/%\{mod_gzip_input_size}n/%gzipin/g; -+ $LogFormatString =~ s/%\{mod_gzip_output_size}n/%gzipout/g; -+ $LogFormatString =~ s/%\{mod_gzip_compression_ratio}n/%gzipratio/g; -+ $LogFormatString =~ s/\(%\{ratio}n\)/%deflateratio/g; - - # Replacement for a IIS and ISA format string - $LogFormatString =~ s/cs-uri-query/%query/g; # Must be before cs-uri |