diff options
| -rw-r--r-- | app-admin/yaala/ChangeLog | 14 | ||||
| -rw-r--r-- | app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch | 31 | ||||
| -rw-r--r-- | app-admin/yaala/metadata.xml | 14 | ||||
| -rw-r--r-- | app-admin/yaala/yaala-0.7.3-r1.ebuild | 68 |
4 files changed, 122 insertions, 5 deletions
diff --git a/app-admin/yaala/ChangeLog b/app-admin/yaala/ChangeLog index ba092b9d5aa1..ce0f656923cb 100644 --- a/app-admin/yaala/ChangeLog +++ b/app-admin/yaala/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-admin/yaala # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/ChangeLog,v 1.17 2013/03/13 21:45:55 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/ChangeLog,v 1.18 2013/04/03 14:26:31 tomwij Exp $ + +*yaala-0.7.3-r1 (03 Apr 2013) + + 03 Apr 2013; Tom Wijsman <TomWij@gentoo.org> + +files/yaala-0.7.3-r1-correct-paths.patch, +yaala-0.7.3-r1.ebuild, + metadata.xml: + Taking maintainership. Bump: Added required perl dependencies and two optional + dependencies gd and storable as per the scripts and site which users, this + will bring more functionality to the user. Revised the install function to + install to the proper locations (eg. /etc), also added patches in src_prepare + such that the proper config and var directories are used by Yaala by default. + Also made the ebuild slightly more maintainable. Extensively tested. 13 Mar 2013; Tom Wijsman <TomWij@gentoo.org> yaala-0.6.3.ebuild, yaala-0.7.2.ebuild, yaala-0.7.3.ebuild: diff --git a/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch new file mode 100644 index 000000000000..e938abf4b802 --- /dev/null +++ b/app-admin/yaala/files/yaala-0.7.3-r1-correct-paths.patch @@ -0,0 +1,31 @@ +--- a/yaala 2013-04-03 15:50:03.909024254 +0200 ++++ b/yaala 2013-04-03 15:49:46.545691028 +0200 +@@ -58,6 +58,6 @@ + + parse_argv (@ARGV); +-read_config (get_config ('config') ? get_config ('config') : 'config'); ++read_config (get_config ('config') ? get_config ('config') : '/etc/yaala/config'); + + unless (get_config ('input')) + { +--- a/lib/Yaala/Parser/WebserverTools.pm 2013-04-03 16:04:02.665685730 +0200 ++++ b/lib/Yaala/Parser/WebserverTools.pm 2013-04-03 16:04:36.729018853 +0200 +@@ -11,7 +11,7 @@ + detect_browser detect_os extract_data); + @Yaala::Parser::WebserverTools::ISA = ('Exporter'); + +-read_config ('webserver.config'); ++read_config ('/etc/yaala/webserver.config'); + + our $referer_format = get_config ('referer_format'); + our $localhost_name = ''; +--- a/lib/Yaala/Data/Persistent.pm 2013-04-03 16:08:06.935684219 +0200 ++++ b/lib/Yaala/Data/Persistent.pm 2013-04-03 16:07:54.229017631 +0200 +@@ -18,5 +18,5 @@ + our $HAVE_STORABLE = 0; + our $WANT_PERSISTENCY = 1; + our $DATA_STRUCTURE = {}; +-our $FILENAME = 'persistency.data'; ++our $FILENAME = '/var/lib/yaala/persistency.data'; + + diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml index f9d50da18d39..338adfa33535 100644 --- a/app-admin/yaala/metadata.xml +++ b/app-admin/yaala/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer> - <email>maintainer-needed@gentoo.org</email> - <description>This package lacks a primary herd or maintainer.</description> - </maintainer> + <maintainer> + <email>TomWij@gentoo.org</email> + <name>Tom Wijsman</name> + </maintainer> + <longdescription> + Yet Another Log Analyzer + </longdescription> + <use> + <flag name='storable'>Support for persistence of Perl data structures.</flag> + </use> </pkgmetadata> diff --git a/app-admin/yaala/yaala-0.7.3-r1.ebuild b/app-admin/yaala/yaala-0.7.3-r1.ebuild new file mode 100644 index 000000000000..76ad5902b237 --- /dev/null +++ b/app-admin/yaala/yaala-0.7.3-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/yaala/yaala-0.7.3-r1.ebuild,v 1.1 2013/04/03 14:26:31 tomwij Exp $ + +EAPI="5" + +inherit eutils + +DESCRIPTION="Yet Another Log Analyzer" +HOMEPAGE="http://www.yaala.org/" +SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gd storable" + +RDEPEND="dev-lang/perl + gd? ( dev-perl/GDGraph ) + storable? ( virtual/perl-Storable )" + +src_prepare() { + epatch "${FILESDIR}"/${PF}-correct-paths.patch + + sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.' +} + +src_install() { + dobin ${PN} + + exeinto /usr/lib64/perl5/vendor_perl/${PN^}/ + doexe lib/${PN^}/*.pm + + exeinto /usr/lib64/perl5/vendor_perl/${PN^}/Data/ + doexe lib/${PN^}/Data/*.pm + + exeinto /usr/lib64/perl5/vendor_perl/${PN^}/Parser/ + doexe lib/${PN^}/Parser/*.pm + + exeinto /usr/lib64/perl5/vendor_perl/${PN^}/Report/ + doexe lib/${PN^}/Report/*.pm + + dodoc AUTHORS CHANGELOG README{,.persistency,.selections} + + insinto /usr/share/${PN} + doins -r reports + doins -r sample_configs + + insinto /etc/${PN} + doins {,webserver.}config + + insinto /etc/logrotate.d + doins packaging/${PN}.cron + + if use storable ; then + dodir /var/lib/${PN} + keepdir /var/lib/${PN} + chmod 777 /var/lib/${PN} + fi +} + +pkg_postinst() { + ewarn "It is required that you change the configuration files in /etc/${PN}" + ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because" + ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set." + echo "" + elog "Example configuration files can be found in /usr/share/${PN}." +} |