diff options
| -rw-r--r-- | app-admin/yaala/ChangeLog | 14 | ||||
| -rw-r--r-- | app-admin/yaala/Manifest | 20 | ||||
| -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 |
5 files changed, 126 insertions, 21 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/Manifest b/app-admin/yaala/Manifest index 17ece49e2fe0..b541461b8529 100644 --- a/app-admin/yaala/Manifest +++ b/app-admin/yaala/Manifest @@ -1,22 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - +AUX yaala-0.7.3-r1-correct-paths.patch 1095 SHA256 b7ef7b26c1949e066088402a320786c7035759e566f7e57969203052a47ccc13 SHA512 c44bad33bf23ed089a4ddc2497cc5507c3c1927053c09ed64e39dad95400b0f0d1170da499c504240919262391f6424c5a830298e7c5a49542dd3424fabed8a7 WHIRLPOOL 4da98c2685be166fcc6a58952137c664570635662fc962778ef81c2306f496aafd2d5d847d374de0580ac21666e1a628a9fd6d2bcf20c13c98fc55166db124f4 DIST yaala-0.6.3.tar.bz2 35363 SHA256 eb0fe75667242ad07d5a8ef6bee90602789b311a5229c84f39fd6b283c627aaf SHA512 0ab57f1414bda0348e2e9a9b77cba8157bcb038b8b7226ac0c38b376c7644777e95e76f0df973c6cb348cef5469a13d729c51936d42b1460fad9688c7b0ec91f WHIRLPOOL 964069ff5f0638b9df0fd5ada01c16b4a241b29c0b36f92a875fd3b8860c3a6a2c32baf32653d65269c95c52888049862f6e309fc21f58dec77f6c53e9869038 DIST yaala-0.7.2.tar.bz2 40628 SHA256 8a9f38718bb12af07ab823d788f03d04a94fd5bfa28ea4a3462d88921d523cf9 SHA512 d183919ce7191c8894b210a17331c7934bbba231734eea9972ce800099562ca7225a0efd710fc7929cc9921dab3d6b35e4f6f2cdaf2f87cd58b8da1f40334b41 WHIRLPOOL 355aaf11558434b3b1442a12219738d0d8eaf719559fe99e0002e7abebba1da1c5f77bca43c423e23729c17799829c468abbe3a1a223bcdb7298b0ecd87b97f3 DIST yaala-0.7.3.tar.bz2 41528 SHA256 a2c3a2173ed2f09aae7992ed11c8257ffce631fbe1dc99c286a911f1743ff936 SHA512 30ad37c2c612f47472a840ea40aa924ffa59828455e7268dc29eb3d0276aab835b54396a29eabce88ef0e357523086b182ca1ec366b50851ecb8d2530f4eac01 WHIRLPOOL 949159522a230ce9892bd64537afc8c826dff0496f68e2dd30660ebe099d9dbd59e83cda9acbbd8501026532bd9eb02fe3da3fce3b98a7242eb269c04469d2da EBUILD yaala-0.6.3.ebuild 485 SHA256 4ba9542c4fcab05d0ab4e871bd0c767652b271f256dd93235d34879f47433fe2 SHA512 9d028b058081d8d0e6ae25ce402ab6b75c27ce16b30a2f8ef65e9a5c9fcb787bbba59d9fc528a5498211d38cbd32a12a3c5a8e43ae609e4e46042bfd4222cf63 WHIRLPOOL 20a10ca2505a2a2185a2f3f470b593cf9f2a7e087c9e55978675e309f6dd2abb8ac5dab3041d42b38095d8e28ac61dd58638f26a8d691c35c7737f17c0e72669 EBUILD yaala-0.7.2.ebuild 502 SHA256 ff4f7a14d938305846ee19677d07c9a6e6ac5042946082427976ac8495b738dd SHA512 6018f615466db820d86d9b96a9231371b1efcf6c2589e4c17c77bfc9623477a82ab74fdc01cde32d52579b26b725be441fd20076e4a98e344ae97d816ac2ba66 WHIRLPOOL bb99fc780409cc9ef12255ff2153aa6f988754b88d491ec88fadb3f287fde5faf4213f6a5e04a96cf661e8d11fe8db2142fe9e1baba29454c06a530c58b73571 +EBUILD yaala-0.7.3-r1.ebuild 1731 SHA256 bb8ec7038942e3418d3735d7739410e5dfdb88fbd6c08d246830a85fb020e3d0 SHA512 1fb2d6f101ae74acd95bf812f84d4e911e609491f32c7079f80a9a5c05413e0a4b1105fc4cf794b2c3957c8c74764cbd5b3f82165564836bfb76e2005ebc17ca WHIRLPOOL de51416ceb427f5efa11412574d37f9f0f94d4f5c7f79c7c7976e14002c2266c9b8ba15396f8837fbe13d7b6d919e61faec14a94dc2a661102d70d255e5a1247 EBUILD yaala-0.7.3.ebuild 791 SHA256 e8d3ed7e16dbdf015d1bbf1341a07773fa1c7b5d082ff508a8d31bfb394daa26 SHA512 3e005377a5315e743e7d570a8dbafadc0aa494aaac4ce47c91590f76f6359fc5afe978e5f91999bce6863d8f7f2055fd3ae8b2e46b01f4cd8f2fac562fb5fc22 WHIRLPOOL 8d3b3cc603b60deca49078b00b214fff28ccc6b7f3e2c00f0d6d3623240ec5792063e1816027afa14d5d7fbbe631e8c193972c0cd3ae94c24efaa98845881aca -MISC ChangeLog 1916 SHA256 78d948a163bfdcae97150abf42826a755c989e22ff6ca0b1974d6b6a1272623e SHA512 edf88e15c54d1403db69e184ae074ae902f82a4960f5abe24101726b250c00bb66c8074a17ef859e775253603ec1d9f1da7d64b10cffda699df8c6769f465b65 WHIRLPOOL 9886d431292a654687154f924ee6c337cb2f72747343098047fdad66f0b80642164210a8f2f69fb40ef99eac5dd1faa73af1834ef5ee5442d44a95c33a81441b -MISC metadata.xml 292 SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3 SHA512 0ec4134c0758cff77acbf2579a2643ec60918c78442908c6d9fb905aca1ab933dba831c863409d34b535f7f8f20cbd4faaa5f9e9914995814d5192333eaf7497 WHIRLPOOL 5520ce6a1c103e5a91a62a5c3a38a9b2dbae12991be718f2104e7fae4f0122e9a6bee61edb5b9818c0234b908de9481316b0596b9084cd54c2d36774541dcf11 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBCAAGBQJRQPOGAAoJEJWyH81tNOV9g5IH/jn4ipAj3xmpY12Pz+mn9LUJ -1mMDMM3ldNHgrVDLJwBy0MIvWaJsOChu57Cl5QJna0uTjBEODQl9EXrTfmh1Z+O3 -XycUxcoQS1GL05EijgVK0vW/ELYIpzKug7ELaoFoiSVLMNR2tkUMM54jZTszwKOw -BA8gzQUVq3PpH3uf7raeBizbw+kD4dh1IpE2OmfSj8IIWIPuc+t/YqKZbGyGgQzm -RcTWoyuFV1DbEPrlSlylsefojyvLuyNnLY/eBEex8JvL5MsizXz8bP/SjJzIrUDu -nR8E0nGW3TM4GRh+oGCgezeylVe5eQ1LTyvackN8jUmrU1fZ0puTiw0hCtDNNwc= -=lXKF ------END PGP SIGNATURE----- +MISC ChangeLog 2546 SHA256 cecb6203e8e4cfc990cc6e50ddc5c693e5b23034ceaafbbce5265d38547d40ea SHA512 37d97e198f066c773899b5ad7c5df17d4a6e643db4964c19f112b10580906a1dd6c636b666bbeaa3da960a45a8d0bb6ea22713a7b01f11ba76079f870578ebc6 WHIRLPOOL de9a7641c43baf6f9d1bd0c678b8628b4bda5eb3eeed9e200c353647c93b57f1d24b5d8256c65fb83ccbd88e70e33edd6cbbd045439439978693c15ebfee071f +MISC metadata.xml 405 SHA256 73f70c4e7caafc27c422378f66e9d3f5c03d37e838f68764c9f345919cdce00f SHA512 51b3b44a2af71fe6bd8d8f8b5984d8f351ab20db067cc7c9a6e19c8b27d43684c54ab0280231a4c8d124534a5e014b8fab22c19dfef20e4722bde9c26ba05ddc WHIRLPOOL 7029b2ad1aac889f503f06b85348602051793f9df585a77d1dd71688c570ae896e4512cd523c6a772c060cda278db26d3772df5362020e077449e2390f8cd308 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}." +} |