From dd32676d486c1cb65e41a1c3b4814e1404297a9b Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Mon, 24 Jan 2005 14:46:56 +0000 Subject: Version bump for sec bug 77963. Also fixes bugs 63200, 63198, 63197, and 70996. (Portage version: 2.0.51-r14) --- net-www/awstats/ChangeLog | 11 ++- net-www/awstats/Manifest | 10 ++- net-www/awstats/awstats-6.3.ebuild | 125 ++++++++++++++++++++++++++ net-www/awstats/files/awstats-6.3-gentoo.diff | 32 +++++++ net-www/awstats/files/digest-awstats-6.3 | 1 + net-www/awstats/files/postinst-en.txt | 22 +++++ net-www/awstats/metadata.xml | 6 +- 7 files changed, 201 insertions(+), 6 deletions(-) create mode 100644 net-www/awstats/awstats-6.3.ebuild create mode 100644 net-www/awstats/files/awstats-6.3-gentoo.diff create mode 100644 net-www/awstats/files/digest-awstats-6.3 create mode 100644 net-www/awstats/files/postinst-en.txt (limited to 'net-www/awstats') diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog index 74bf0b64319b..74ffd860e05d 100644 --- a/net-www/awstats/ChangeLog +++ b/net-www/awstats/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-www/awstats -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.7 2004/09/03 23:24:07 pvdabeel Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.8 2005/01/24 14:46:56 ka0ttic Exp $ + +*awstats-6.3 (24 Jan 2005) + + 24 Jan 2005; Aaron Walker metadata.xml, + +files/awstats-6.3-gentoo.diff, +files/postinst-en.txt, + +awstats-6.3.ebuild: + Version bump for sec bug 77963. Also fixes bugs 63200, 63198, 63197, and 70996. 04 Sep 2004; Pieter Van den Abeele awstats-6.1.ebuild: Masked awstats-6.1.ebuild stable for ppc diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest index bf9740ff6dc3..db961c2ad85b 100644 --- a/net-www/awstats/Manifest +++ b/net-www/awstats/Manifest @@ -1,5 +1,9 @@ -MD5 789d3b6f752930fee89811a68b8ed999 ChangeLog 1329 +MD5 356b5213469bdc4fcca24f2869795c40 awstats-6.3.ebuild 3754 +MD5 05d3928995244e8e8cd910a1a270008e ChangeLog 1584 +MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255 MD5 344e16a880e4d54f9f76c54270011165 awstats-6.1.ebuild 4006 -MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159 -MD5 10127a480be4fd2c2eb40cbe88f10ad0 files/awstats-6.1-r1.diff 564 MD5 2e2bdf14564309eeb8366a8b6b65b54c files/digest-awstats-6.1 60 +MD5 6e7773a7ddac4fe0259957c488da02cd files/digest-awstats-6.3 60 +MD5 10127a480be4fd2c2eb40cbe88f10ad0 files/awstats-6.1-r1.diff 564 +MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219 +MD5 102ec928bf01d326931ea260173c1dab files/postinst-en.txt 649 diff --git a/net-www/awstats/awstats-6.3.ebuild b/net-www/awstats/awstats-6.3.ebuild new file mode 100644 index 000000000000..af6c054739ae --- /dev/null +++ b/net-www/awstats/awstats-6.3.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3.ebuild,v 1.1 2005/01/24 14:46:56 ka0ttic Exp $ + +inherit eutils webapp + +DESCRIPTION="AWStats is a short for Advanced Web Statistics." +HOMEPAGE="http://awstats.sourceforge.net/" +SRC_URI="http://awstats.sourceforge/files/${P}.tgz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~ppc ~mips ~sparc x86 ~amd64" +IUSE="" + +DEPEND=">=dev-lang/perl-5.6.1 + >=media-libs/libpng-1.2 + dev-perl/Time-Local + net-www/apache" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.diff + + # change AWStats default installation directory to installation directory of Gentoo + for file in tools/* wwwroot/cgi-bin/*; do + if [[ -f "$file" ]]; then + sed -i -e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \ + -e "s#/usr/local/awstats/wwwroot/icon#${MY_HTDOCSDIR}/icon#g" \ + -e "s#/usr/local/awstats/wwwroot/plugins#${MY_HOSTROOTDIR}/plugins#g" \ + -e "s#/usr/local/awstats/wwwroot/classes#${MY_HTDOCSDIR}/classes#g" \ + -e "s#/usr/local/awstats/wwwroot#${MY_HTDOCSDIR}#g" \ + $file || die "sed $file failed" + fi + done + + # Remove .cvs* files and CVS directories + find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf + + # set default values for directories + sed -i -e "s#LogFile=.*#LogFile=\"/var/log/apache${APACHEVER}/access_log\"#" \ + -e "s#SiteDomain=.*#SiteDomain=\"localhost\"#" \ + -e "s#DirIcons=.*#DirIcons=\"/awstats/icons\"#" \ + -e "s#DirCgi=.*#DirCgi=\"/cgi-bin/awstats\"#" \ + -e "s#DataDir=.*#DataDir=\"${MY_HOSTROOTDIR}/awstats/datadir\"#" \ + ${S}/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" + +} + + + +src_install() { + webapp_src_preinst + + # handle documentation files + # + # NOTE that doc files go into /usr/share/doc as normal; they do NOT + # get installed per vhost! + + dohtml -r docs/*.html docs/*.xml docs/*.css docs/*.js docs/images + dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT + newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm + docinto xslt + dodoc tools/xslt/* + + webapp_postinst_txt en ${FILESDIR}/postinst-en.txt + + keepdir /var/lib/awstats + + # Copy the app's main files + exeinto ${MY_CGIBINDIR} + doexe ${S}/wwwroot/cgi-bin/*.pl + + exeinto ${MY_HTDOCSDIR}/classes + doexe ${S}/wwwroot/classes/*.jar + + # install language files, libraries and plugins + mkdir -p ${D}${MY_CGIBINDIR} + for dir in lang lib plugins; do + cp -R ${S}/wwwroot/cgi-bin/${dir} ${D}${MY_CGIBINDIR} + chmod 0755 ${D}${MY_CGIBINDIR}/${dir} + done + + # install the app's www files + mkdir -p ${D}${MY_HTDOCSDIR} + for dir in icon css js; do + cp -R ${S}/wwwroot/${dir} ${D}${MY_HTDOCSDIR} + chmod 0755 ${D}${MY_HTDOCSDIR}/${dir} + done + + # copy configuration file + insinto /etc/awstats + doins ${S}/wwwroot/cgi-bin/awstats.model.conf + + # create the data directory for awstats + mkdir -p ${D}/${MY_HOSTROOTDIR}/datadir + + # install command line tools + cd ${S}/tools + dobin awstats_buildstaticpages.pl awstats_exportlib.pl \ + awstats_updateall.pl logresolvemerge.pl \ + maillogconvert.pl awstats_configure.pl + newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl + + # all done + # + # now we let the eclass strut its stuff ;-) + + webapp_src_install +} + +pkg_postinst() { + einfo + einfo "The AWStats-Manual is available either inside" + einfo " the /usr/share/doc/${PF} - folder, or at" + einfo " http://awstats.sourceforge.net/docs/index.html ." + einfo + ewarn "Copy the /etc/awstats/awstats.model.conf to" + ewarn "/etc/awstats/awstats..conf and edit." + ewarn "use the command" + ewarn " webapp-config" + ewarn "to install awstats for each virtual host. See proper man page." +} + diff --git a/net-www/awstats/files/awstats-6.3-gentoo.diff b/net-www/awstats/files/awstats-6.3-gentoo.diff new file mode 100644 index 000000000000..ec3b115afa4f --- /dev/null +++ b/net-www/awstats/files/awstats-6.3-gentoo.diff @@ -0,0 +1,32 @@ +diff -urN awstats-6.3.orig/tools/awstats_configure.pl awstats-6.3/tools/awstats_configure.pl +--- awstats-6.3.orig/tools/awstats_configure.pl 2005-01-24 09:28:43.980923725 -0500 ++++ awstats-6.3/tools/awstats_configure.pl 2005-01-24 09:28:52.034571769 -0500 +@@ -658,13 +658,27 @@ + print "\n-----> Restart Web server with '$command'\n"; + my $ret=`$command`; + print "$ret"; ++ } elsif (-f "/etc/gentoo-release") { ++ my $command; ++ if (-x "/usr/sbin/apache2ctl") { ++ $command="/usr/sbin/apache2ctl graceful"; ++ } elsif (-x "/usr/sbin/apachectl") { ++ $command="/usr/sbin/apachectl graceful"; ++ } else { ++ print "\n-----> Don't forget to restart manually your web server\n"; ++ } ++ if ($command != "") { ++ print "\n-----> Restart Web server with '$command'\n"; ++ my $ret=`$command`; ++ print "$ret"; ++ } + } elsif (-x "/sbin/service") { + # We are not on debian + my $command="/sbin/service httpd restart"; + print "\n-----> Restart Web server with '$command'\n"; + my $ret=`$command`; + print "$ret"; +- } else { ++ } else { + print "\n-----> Don't forget to restart manually your web server\n"; + } + } diff --git a/net-www/awstats/files/digest-awstats-6.3 b/net-www/awstats/files/digest-awstats-6.3 new file mode 100644 index 000000000000..bf5ecfb2f5f1 --- /dev/null +++ b/net-www/awstats/files/digest-awstats-6.3 @@ -0,0 +1 @@ +MD5 4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz 936817 diff --git a/net-www/awstats/files/postinst-en.txt b/net-www/awstats/files/postinst-en.txt new file mode 100644 index 000000000000..959f99af59f4 --- /dev/null +++ b/net-www/awstats/files/postinst-en.txt @@ -0,0 +1,22 @@ +Alias /awstats/classes "/usr/share/webapps/awstats/6.3/htdocs/classes/" +Alias /awstats/css "/usr/share/webapps/awstats/6.3/htdocs/css/" +Alias /awstats/icons "/usr/share/webapps/awstats/6.3/htdocs/icon/" +ScriptAlias /awstats/ "/usr/share/webapps/awstats/6.3/hostroot/cgi-bin/" + + + Options None + AllowOverride None + + Order allow,deny + Allow from all + + + + + Options ExecCGI + AllowOverride None + + Order allow,deny + Allow from all + + diff --git a/net-www/awstats/metadata.xml b/net-www/awstats/metadata.xml index c054a8cd9b61..dd2c192f1941 100644 --- a/net-www/awstats/metadata.xml +++ b/net-www/awstats/metadata.xml @@ -1,5 +1,9 @@ -apache + web-apps + + ka0ttic@gentoo.org + Aaron Walker + -- cgit v1.2.3-65-gdbad