diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2008-02-19 15:40:49 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2008-02-19 15:40:49 +0000 |
commit | 147fe41d98b551f5e22a4fb3e2671b044ced807a (patch) | |
tree | 854ce81823c095fe21559008766ed7109c06106b /net-www/awstats | |
parent | Version bump, bug 208241 (diff) | |
download | gentoo-2-147fe41d98b551f5e22a4fb3e2671b044ced807a.tar.gz gentoo-2-147fe41d98b551f5e22a4fb3e2671b044ced807a.tar.bz2 gentoo-2-147fe41d98b551f5e22a4fb3e2671b044ced807a.zip |
remove broken ebuild
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-www/awstats')
-rw-r--r-- | net-www/awstats/ChangeLog | 7 | ||||
-rw-r--r-- | net-www/awstats/awstats-6.5-r1.ebuild | 136 | ||||
-rw-r--r-- | net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff | 147 | ||||
-rw-r--r-- | net-www/awstats/files/postinst-en.txt | 159 |
4 files changed, 6 insertions, 443 deletions
diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog index 9e9457382aa7..a3679afe3385 100644 --- a/net-www/awstats/ChangeLog +++ b/net-www/awstats/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/awstats # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.60 2008/02/19 14:27:27 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.61 2008/02/19 15:40:48 hollow Exp $ + + 19 Feb 2008; Benedikt Böhm <hollow@gentoo.org> + -files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff, + -files/postinst-en.txt, -awstats-6.5-r1.ebuild: + remove broken ebuild 19 Feb 2008; Richard Freeman <rich0@gentoo.org> awstats-6.7-r2.ebuild: amd64 stable - #208615 diff --git a/net-www/awstats/awstats-6.5-r1.ebuild b/net-www/awstats/awstats-6.5-r1.ebuild deleted file mode 100644 index ddfdd17014d5..000000000000 --- a/net-www/awstats/awstats-6.5-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.5-r1.ebuild,v 1.7 2007/07/29 17:05:59 phreak Exp $ - -inherit eutils webapp versionator - -DESCRIPTION="AWStats is short for Advanced Web Statistics." -HOMEPAGE="http://awstats.sourceforge.net/" -#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -SRC_URI="http://awstats.sourceforge.net/files/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86 ~x86-fbsd" -IUSE="" - -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" - -RDEPEND=">=dev-lang/perl-5.6.1 - >=media-libs/libpng-1.2 - virtual/perl-Time-Local - dev-perl/URI - www-servers/apache" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - # Fix security bug #130487 - epatch ${FILESDIR}/${PN}-6.5-CVE-2006-2237-CVE-2006-1945.diff - - epatch ${FILESDIR}/${PN}-6.3-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 - - # find apache major version - local apachever=$(best_version www-servers/apache) - apachever="$(get_major_version ${apachever#*/*-})" - [[ ${apachever} == "1" ]] && apachever="" - - # set default values for directories - sed -i -e "s|^\(LogFile=\).*$|\1\"/var/log/apache${apachever}/access_log\"|" \ - -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \ - -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \ - -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \ - ${S}/wwwroot/cgi-bin/awstats.model.conf || die "sed failed" - - # set version in postinst-en.txt - sed -e "s/PVR/${PVR}/g" \ - ${FILESDIR}/postinst-en.txt > ${WORKDIR}/postinst-en.txt || die -} - -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 ${WORKDIR}/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() { - elog - 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 - ewarn "Copy the /etc/awstats/awstats.model.conf to" - ewarn "/etc/awstats/awstats.<yourdomain>.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.5-CVE-2006-2237-CVE-2006-1945.diff b/net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff deleted file mode 100644 index 46c6bc3ecfe0..000000000000 --- a/net-www/awstats/files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff +++ /dev/null @@ -1,147 +0,0 @@ -Index: awstats-6.5/wwwroot/cgi-bin/awstats.pl -=================================================================== ---- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl -+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl -@@ -1131,7 +1131,7 @@ sub Read_Config { - my $configdir=shift; - my @PossibleConfigDir=(); - -- if ($configdir) { @PossibleConfigDir=("$configdir"); } -+ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); } - else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); } - - # Open config file -@@ -5534,7 +5534,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) { # Run f - $QueryString =~ s/&/&/g; - } - -- $QueryString = CleanFromCSSA($QueryString); -+ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString)); - - # Security test - if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); } -@@ -5542,7 +5542,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) { # Run f - # No update but report by default when run from a browser - $UpdateStats=($QueryString=~/update=1/i?1:0); - -- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); } -@@ -5561,7 +5561,7 @@ if ($ENV{'GATEWAY_INTERFACE'}) { # Run f - - # If migrate - if ($QueryString =~ /(^|-|&|&)migrate=([^&]+)/i) { -- $MigrateStats=&DecodeEncodedString("$2"); -+ $MigrateStats=&Sanitize(&DecodeEncodedString("$2")); - $MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/; - $SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file - } -@@ -5591,7 +5591,7 @@ else { # Run from command line - # Update with no report by default when run from command line - $UpdateStats=1; - -- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } -+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); } - if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } - if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); } - if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); } -Index: awstats-6.5/tools/awstats_buildstaticpages.pl -=================================================================== ---- awstats-6.5.orig/tools/awstats_buildstaticpages.pl -+++ awstats-6.5/tools/awstats_buildstaticpages.pl -@@ -75,7 +75,7 @@ $nowsec $nowmin $nowhour $nowday $nowmon - # Return: None - #------------------------------------------------------------------------------ - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -@@ -95,7 +95,7 @@ sub warning { - # print "$messagestring<br />\n"; - # } - # else { -- print "$messagestring\n"; -+ print STDERR "$messagestring\n"; - # } - # } - } -Index: awstats-6.5/tools/awstats_configure.pl -=================================================================== ---- awstats-6.5.orig/tools/awstats_configure.pl -+++ awstats-6.5/tools/awstats_configure.pl -@@ -87,7 +87,7 @@ $Step=0; - # error - #------------------------------------------------------- - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -Index: awstats-6.5/tools/awstats_exportlib.pl -=================================================================== ---- awstats-6.5.orig/tools/awstats_exportlib.pl -+++ awstats-6.5/tools/awstats_exportlib.pl -@@ -93,8 +93,8 @@ sub error { - my $thirdmessage=shift||""; - my $donotshowsetupinfo=shift||0; - if ($Debug) { debug("$message $secondmessage $thirdmessage",1); } -- print "$message"; -- print "\n"; -+ print STDERR "$message"; -+ print STDERR "\n"; - exit 1; - } - -Index: awstats-6.5/tools/awstats_updateall.pl -=================================================================== ---- awstats-6.5.orig/tools/awstats_updateall.pl -+++ awstats-6.5/tools/awstats_updateall.pl -@@ -36,7 +36,7 @@ my $AwstatsProg=''; - # Return: None - #------------------------------------------------------------------------------ - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - -Index: awstats-6.5/tools/logresolvemerge.pl -=================================================================== ---- awstats-6.5.orig/tools/logresolvemerge.pl -+++ awstats-6.5/tools/logresolvemerge.pl -@@ -104,7 +104,7 @@ my $bzcat_file = '\.bz2$';
- # Return: None
- #------------------------------------------------------------------------------
- sub error {
-- print "Error: $_[0].\n";
-+ print STDERR "Error: $_[0].\n";
- exit 1;
- }
-
-@@ -133,7 +133,7 @@ sub debug {
- sub warning {
- my $messagestring=shift;
- if ($Debug) { debug("$messagestring",1); }
-- print "$messagestring\n";
-+ print STDERR "$messagestring\n";
- }
-
- #-----------------------------------------------------------------------------
-Index: awstats-6.5/tools/maillogconvert.pl -=================================================================== ---- awstats-6.5.orig/tools/maillogconvert.pl -+++ awstats-6.5/tools/maillogconvert.pl -@@ -56,7 +56,7 @@ $MailType=''; # Mail server family (p - #------------------------------------------------------- - - sub error { -- print "Error: $_[0].\n"; -+ print STDERR "Error: $_[0].\n"; - exit 1; - } - diff --git a/net-www/awstats/files/postinst-en.txt b/net-www/awstats/files/postinst-en.txt deleted file mode 100644 index f95caeaf28f0..000000000000 --- a/net-www/awstats/files/postinst-en.txt +++ /dev/null @@ -1,159 +0,0 @@ -Alias /awstats/classes "/usr/share/webapps/awstats/PVR/htdocs/classes/" -Alias /awstats/css "/usr/share/webapps/awstats/PVR/htdocs/css/" -Alias /awstats/icons "/usr/share/webapps/awstats/PVR/htdocs/icon/" -ScriptAlias /awstats/ "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/" -ScriptAlias /awstats "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/awstats.pl" -ScriptAlias /awstats.pl "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/awstats.pl" - -<Directory "/usr/share/webapps/awstats/PVR/htdocs"> - Options None - AllowOverride None - <IfModule mod_access.c> - Order allow,deny - Allow from all - </IfModule> -</Directory> - -<Directory "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin"> - Options ExecCGI - AllowOverride None - <IfModule mod_access.c> - Order allow,deny - Allow from all - </IfModule> -</Directory> - -### -# NOTE: The following sections are strictly optional. Please read -# and follow carefully all the instructions before uncommenting -# any lines. Examples shown below are for Apache 2.0.x ONLY. -### - -### -# INSTRUCTIONS: -# -# If you would like to require authentication to access AWStats, -# then uncomment ONE of the example Directory sections below. -# -# NOTE: Related AWStats configuration directives are: -# -# AllowAccessFromWebToAuthenticatedUsersOnly=1 -# AllowAccessFromWebToFollowingAuthenticatedUsers="user1 [user2 ...]" -# -# You can use these to set a per-domain user access when needed -# for virtual hosting. That means: only the selected user(s) will have -# access to stats for the particular domain. All other users -# will not be allowed to see the domain stats even though they -# have authenticated successfully. -### - -### -# SECTION I - Basic Authentication -# -# The following example requires mod_auth to work. -# You need to uncomment the following line in apache2.conf -# and restart Apache to get the module loaded: -# -# LoadModule auth_module modules/mod_auth.so -# -# Add your AWStats users to /etc/awstats/.htpasswd file. -# Please see 'man htpasswd2' for more details if you need. -# -# htpasswd2 -c /etc/awstats/.htpasswd username1 -# htpasswd2 /etc/awstats/.htpasswd username2 -# etc... -### - -#<IfModule mod_auth.c> -#<Directory "/usr/share/webapps/awstats/PVR/hostroot"> -# Options None -# AllowOverride None -# Order allow,deny -# Allow from all -# -# AuthType Basic -# AuthName "AWStats authenticated zone" -# AuthUserFile /etc/awstats/.htpasswd -# Require valid-user -# -#</Directory> -#</IfModule> - -### -# SECTION II - Digest Authentication -# -# The following example requires mod_auth_digest to work. -# You need to uncomment the following line in apache2.conf -# and restart Apache to get the module loaded: -# -# LoadModule auth_digest_module modules/mod_auth_digest.so -# -# Do not forget to replace www.example.com as appropriate. You can also add -# as many domains as you need to this line. -# -# Add your AWStats users to /etc/awstats/.htdigest file. Please see -# 'man htdigest2' and http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html -# for more details if you need. -# -# htdigest2 -c /etc/awstats/.htdigest "AWStats authenticated zone" username1 -# htdigest2 /etc/awstats/.htdigest "AWStats authenticated zone" username2 -# etc... -### - -#<IfModule mod_auth_digest.c> -#<Directory "/usr/share/webapps/awstats/PVR/hostroot"> -# Options None -# AllowOverride None -# Order allow,deny -# Allow from all - -# AuthType Digest -# AuthName "AWStats authenticated zone" -# AuthDigestFile /etc/awstats/.htdigest -# AuthDigestDomain http://www.example.com https://www.example.com -# require valid-user -# # The following line is REQUIRED to work around a bug in MSIE. -# # See http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html -# BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On -#</Directory> -#</IfModule> - -### -# SECTION III - MySQL Authentication -# -# The following example requires mod_auth_mysql to work. -# Emerge mod_auth_mysql and follow the instructions in -# 12_mod_auth_mysql.conf to create MySQL database required -# for authentication. After you finished adding users, add -# '-D AUTH_MYSQL' to your /etc/conf.d/apache2 APACHE2_OPTS -# setting and restart Apache to get the module loaded. -### - -#<IfModule mod_auth_mysql.c> -#<Directory "/usr/share/webapps/awstats/PVR/hostroot"> -# Options None -# AllowOverride None -# Order allow,deny -# Allow from all - -# AuthName "AWStats MySQL authenticated zone" -# AuthType Basic -# AuthMySQLUser authuser -# AuthMySQLPassword PaSsW0Rd -# AuthMySQLDB auth -# AuthMySQLUserTable users -# AuthMySQLNameField user_name -# AuthMySQLPasswordField user_passwd -# # Uncomment the two lines below ONLY if you have -# # the required table for group-based MySQL authentication -# # in your MySQL database. -# #AuthMySQLGroupTable groups -# #AuthMySQLGroupField user_group -# -# # Uncomment one of the following directives according -# # to the database structure you have chosen. -# #require valid-user -# #require group your_group_name_here - -#</Directory> -#</IfModule> |