From: Peter Volkov Date: Mon, 5 Jun 2006 20:36:56 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2cf9b6fa1b50aff493e31524b1a3328018b478b6;p=gentoo.git Version bump. Package-Manager: portage-2.0.54-r2 --- diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog index 8bdcb3f7b162..2f2ab95dac54 100644 --- a/net-analyzer/sarg/ChangeLog +++ b/net-analyzer/sarg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/sarg # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.25 2006/06/05 17:27:35 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.26 2006/06/05 20:36:56 pva Exp $ + +*sarg-2.2.1 (05 Jun 2006) + + 05 Jun 2006; Peter Volkov +sarg-2.2.1.ebuild: + Version bump. 05 Jun 2006; Simon Stelling sarg-2.1-r1.ebuild: stable on amd64 diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index 3e036968378b..279462502c4c 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,56 +1,16 @@ -AUX sarg-1.4.1-2.6.fix.patch 1556 RMD160 1d29a4b267da6ff479ef6f32f3e49adcf6a43854 SHA1 bc652999b8cb4ca76698ebbca137bbd5848f5296 SHA256 4c07ecd03a42bdeb67e8820c96ba5f974f84cd7b51e2841b9591c4cdc6a70e67 +MD5 37e82515b180926cd11a80aed4f4c454 ChangeLog 3552 +MD5 e8d7d19cc32a200d8d526edb51e65878 files/digest-sarg-1.4.1-r2 132 +MD5 51dfe863ba88a60c8c3ae74fb81729c1 files/digest-sarg-2.0.8 62 +MD5 ace13503b819ad63933c3eefa3beadb9 files/digest-sarg-2.1 226 +MD5 ace13503b819ad63933c3eefa3beadb9 files/digest-sarg-2.1-r1 226 +MD5 cb97f3fb466ee89d024f6efb49452591 files/digest-sarg-2.2.1 62 MD5 4ce75e6dba68e51c94d8fb4b47a5ed9f files/sarg-1.4.1-2.6.fix.patch 1556 -RMD160 1d29a4b267da6ff479ef6f32f3e49adcf6a43854 files/sarg-1.4.1-2.6.fix.patch 1556 -SHA256 4c07ecd03a42bdeb67e8820c96ba5f974f84cd7b51e2841b9591c4cdc6a70e67 files/sarg-1.4.1-2.6.fix.patch 1556 -AUX sarg-2.1-datafile.patch 1300 RMD160 a158013cbb19620f1942201cec0d7896d5a6ebfc SHA1 15e5c4f6d7dd7bb0d978a67fd8163eda5cadc7d5 SHA256 328bdd49a7bc6e0649af6c91620a7f6ddf7cd95f56425a2228e6c1f97fd4e9ed MD5 be7c27dc81fd42e595adbcdcb14130e1 files/sarg-2.1-datafile.patch 1300 -RMD160 a158013cbb19620f1942201cec0d7896d5a6ebfc files/sarg-2.1-datafile.patch 1300 -SHA256 328bdd49a7bc6e0649af6c91620a7f6ddf7cd95f56425a2228e6c1f97fd4e9ed files/sarg-2.1-datafile.patch 1300 -AUX sarg-2.1-laslog.patch 406 RMD160 e72fec0af3ce48df9a3aa43656d8be5cf3c1044b SHA1 c4af4ff498baa5d2a124b52ca84b984169c9eea8 SHA256 9fc56675e99a3d427c22cab90e1e79e3b11382578b1f4c5047c10dcdd910b224 MD5 d2c22dddfa0d8214692f382a69eb82f3 files/sarg-2.1-laslog.patch 406 -RMD160 e72fec0af3ce48df9a3aa43656d8be5cf3c1044b files/sarg-2.1-laslog.patch 406 -SHA256 9fc56675e99a3d427c22cab90e1e79e3b11382578b1f4c5047c10dcdd910b224 files/sarg-2.1-laslog.patch 406 -AUX sarg-2.1-sort-options.patch 757 RMD160 37d4b96a5af7132ff16548cc85837792b048c1c9 SHA1 a5ff1551fdd8053172ec3e143f634ebd1d6a6b40 SHA256 f71d573c2031308f34cc6f4cf3967949b214a9199a95965f523786ce4b7fbb61 MD5 01346d8162696cee5cf24b0b34b3ad73 files/sarg-2.1-sort-options.patch 757 -RMD160 37d4b96a5af7132ff16548cc85837792b048c1c9 files/sarg-2.1-sort-options.patch 757 -SHA256 f71d573c2031308f34cc6f4cf3967949b214a9199a95965f523786ce4b7fbb61 files/sarg-2.1-sort-options.patch 757 -DIST sarg-1.4.1-index.sort.patch 2034 -DIST sarg-1.4.1.tar.gz 125589 -DIST sarg-2.0.8.tar.gz 420970 -DIST sarg-2.1.tar.gz 352935 RMD160 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05 SHA1 e35239d076f8b4bf9b9c41ea68f7711fa9a6d920 SHA256 89ec31f3b7b8187de1e4ee4fa0a4abf6867f2404bd9059bbfbe4beb609dd5818 -EBUILD sarg-1.4.1-r2.ebuild 1026 RMD160 2f5ca2702cf82a3147493168dba7840a69a70a96 SHA1 80d6e93f4ba619ee7ae9b1c13983901c808f6a78 SHA256 e4906310fba217a47b070881bd36ef6f0761805be257f857c6f9086a1bdb6a4f +MD5 5d82bf1020f73776b224927b62cf6b43 metadata.xml 499 MD5 473b928acfa5d227ebd7c224f12f29fe sarg-1.4.1-r2.ebuild 1026 -RMD160 2f5ca2702cf82a3147493168dba7840a69a70a96 sarg-1.4.1-r2.ebuild 1026 -SHA256 e4906310fba217a47b070881bd36ef6f0761805be257f857c6f9086a1bdb6a4f sarg-1.4.1-r2.ebuild 1026 -EBUILD sarg-2.0.8.ebuild 2091 RMD160 68df3607b9cb7706984373e9f8b8d17dfb059aa8 SHA1 352eddf492081ec8d2ff8a48094d50e4e6167059 SHA256 c4181b0091c356ebc6324a21dd5ebc142ca828a99f560fe049bfbd624a661f3a MD5 5dfa5dfb41a438253b2d5d3cc47da146 sarg-2.0.8.ebuild 2091 -RMD160 68df3607b9cb7706984373e9f8b8d17dfb059aa8 sarg-2.0.8.ebuild 2091 -SHA256 c4181b0091c356ebc6324a21dd5ebc142ca828a99f560fe049bfbd624a661f3a sarg-2.0.8.ebuild 2091 -EBUILD sarg-2.1-r1.ebuild 2084 RMD160 4f123bdd6b1143e76e7c66a2857eb22e22b49cd6 SHA1 447f3da4080daa80c49f6c971943a1d1984a8f50 SHA256 96afc99383ae291ebbddae75e3f9e6bb28beb1bbc72dcbac81e5494393cdd602 MD5 d5177fb2540df9c266c252ea06681d01 sarg-2.1-r1.ebuild 2084 -RMD160 4f123bdd6b1143e76e7c66a2857eb22e22b49cd6 sarg-2.1-r1.ebuild 2084 -SHA256 96afc99383ae291ebbddae75e3f9e6bb28beb1bbc72dcbac81e5494393cdd602 sarg-2.1-r1.ebuild 2084 -EBUILD sarg-2.1.ebuild 2033 RMD160 f260e4ed8f731850f9a950c1b1bb3fe72de0346a SHA1 709d09c1be06e5bc484e0fd6101a0d3281909842 SHA256 165ca3b59d83bbb8012bda23269a470a66898447a42491a1a5a673402dece16a MD5 3f3c26a640f7b781805bdad5bd2678e4 sarg-2.1.ebuild 2033 -RMD160 f260e4ed8f731850f9a950c1b1bb3fe72de0346a sarg-2.1.ebuild 2033 -SHA256 165ca3b59d83bbb8012bda23269a470a66898447a42491a1a5a673402dece16a sarg-2.1.ebuild 2033 -MISC ChangeLog 3445 RMD160 1b15ff149be852ad2495596e8da5a94320f79c93 SHA1 016ea70bcbcb12a1a52b08b104b90b68e7c8ff1b SHA256 fc5268bb5800cc297067043670f9d78ea239e810f60b3284a11a5f2d737d1091 -MD5 fb4ac3b8b4692d73f9ae6f3d6c0ac70b ChangeLog 3445 -RMD160 1b15ff149be852ad2495596e8da5a94320f79c93 ChangeLog 3445 -SHA256 fc5268bb5800cc297067043670f9d78ea239e810f60b3284a11a5f2d737d1091 ChangeLog 3445 -MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0 -MD5 5d82bf1020f73776b224927b62cf6b43 metadata.xml 499 -RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f metadata.xml 499 -SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0 metadata.xml 499 -MD5 e8d7d19cc32a200d8d526edb51e65878 files/digest-sarg-1.4.1-r2 132 -RMD160 354df1a7063b42838a2394d8883e866659f633db files/digest-sarg-1.4.1-r2 132 -SHA256 4df1125cc78c715ce220a49ec1d06ecfc48753d7ccf370cfffe4125675136586 files/digest-sarg-1.4.1-r2 132 -MD5 51dfe863ba88a60c8c3ae74fb81729c1 files/digest-sarg-2.0.8 62 -RMD160 3dcf9c837a73e3e82e504f55d229710b62ee2222 files/digest-sarg-2.0.8 62 -SHA256 297884709d82ab1209108145595f29d6294569e25f47862d8585eb40adc73591 files/digest-sarg-2.0.8 62 -MD5 ace13503b819ad63933c3eefa3beadb9 files/digest-sarg-2.1 226 -RMD160 01ecbf07e0555c318b8badc1d81ca90e25f0a7a6 files/digest-sarg-2.1 226 -SHA256 e482074677a083f895267bce5b037798cd9980fa6d2f532ce617e0f863af4f66 files/digest-sarg-2.1 226 -MD5 ace13503b819ad63933c3eefa3beadb9 files/digest-sarg-2.1-r1 226 -RMD160 01ecbf07e0555c318b8badc1d81ca90e25f0a7a6 files/digest-sarg-2.1-r1 226 -SHA256 e482074677a083f895267bce5b037798cd9980fa6d2f532ce617e0f863af4f66 files/digest-sarg-2.1-r1 226 +MD5 e36eef0d612c1539a22b1f1477ed1da3 sarg-2.2.1.ebuild 1929 diff --git a/net-analyzer/sarg/files/digest-sarg-2.2.1 b/net-analyzer/sarg/files/digest-sarg-2.2.1 new file mode 100644 index 000000000000..fbe47fdf2658 --- /dev/null +++ b/net-analyzer/sarg/files/digest-sarg-2.2.1 @@ -0,0 +1 @@ +MD5 8e9a47a63e1326162b6cb6570f24221c sarg-2.2.1.tar.gz 385693 diff --git a/net-analyzer/sarg/sarg-2.2.1.ebuild b/net-analyzer/sarg/sarg-2.2.1.ebuild new file mode 100644 index 000000000000..45f39398da71 --- /dev/null +++ b/net-analyzer/sarg/sarg-2.2.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.1.ebuild,v 1.1 2006/06/05 20:36:56 pva Exp $ + +inherit eutils + +DESCRIPTION="Squid Analysis Report Generator" +HOMEPAGE="http://sarg.sourceforge.net/sarg.php" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" +IUSE="" + +DEPEND="media-libs/gd" + +pkg_setup() { + built_with_use -a media-libs/gd png || die \ + "Please recompile media-libs/gd with USE=\"png\"" +} + +src_unpack() { + unpack ${A} + cd ${S} + + # Fixes bug #43132 + sed -i \ + -e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \ + -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \ + log.c || die "setting default for gentoo directories... failed" + + sed -i \ + -e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \ + -e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \ + sarg.conf || die "setting default for gentoo directories... failed" + + # Fixes bug #64743 + sed -i -e 's:sarg_tmp:sarg:' email.c || die "fixing dir in email.c failed" + + sed -i \ + -e 's:/usr/local/sarg/sarg.conf:/etc/sarg/sarg.conf:' \ + -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \ + sarg.1 || die "Failed to fix man page." +} + +src_compile() { + econf \ + --enable-bindir=/usr/bin \ + --enable-mandir=/usr/share/man/man1 \ + --enable-sysconfdir=/etc/sarg/ || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + # This is workaround for sarg installation script, which does not create dirs + dodir /etc/sarg /usr/sbin + + make \ + BINDIR=${D}/usr/sbin \ + MANDIR=${D}/usr/share/man/man1 \ + SYSCONFDIR=${D}/etc/sarg \ + HTMLDIR=${D}/var/www/html \ + install || die "sarg installation failed" + + dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess +}