Obsolete origin-zero syntax in sort changed with POSIX compatible one. Bug 129719. Thank Jeremy Heslop for fix and report.

(Portage version: 2.1_pre7-r5)

5 files changed, 129 insertions, 1 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index a0b87dfe492e..58ccde88d206 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2006/01/08 15:22:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.23 2006/04/14 06:57:37 pva Exp $
+
+*sarg-2.1-r1 (14 Apr 2006)
+
+  14 Apr 2006; Volkov Peter <pva@gentoo.org>
+  +files/sarg-2.1-sort-options.patch, +sarg-2.1-r1.ebuild:
+  Obsolete origin-zero syntax in sort changed with POSIX compatible one.
+  Bug 129719. Thank Jeremy Heslop for fix and report.
 
 *sarg-2.1 (08 Jan 2006)
 
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index d9dd6b3e0cf0..f75f8bda4ed6 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,11 +1,42 @@
 MD5 52bb322d29100722a204b9f9af1a164d ChangeLog 3010
+RMD160 99e4eb8e1921a5da7ba94a9ca93ce130ef571115 ChangeLog 3010
+SHA256 2b43f71f159cf10122b7c9f9a5bda6827d0e3a5d64fe9bbf01c6425f0ee0926f ChangeLog 3010
 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 1d9851934b796e28b98e3e4d41df8232 files/digest-sarg-2.1 60
+RMD160 6e21172717813386026931e2c08a76851ab6a49f files/digest-sarg-2.1 60
+SHA256 b2b909f8ef3dec60070f729e1b77be5c0b9a2117663bf9ac99a5fe424217ec58 files/digest-sarg-2.1 60
+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 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
 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
 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
+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
 MD5 5d82bf1020f73776b224927b62cf6b43 metadata.xml 499
+RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f metadata.xml 499
+SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0 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
 MD5 5dfa5dfb41a438253b2d5d3cc47da146 sarg-2.0.8.ebuild 2091
+RMD160 68df3607b9cb7706984373e9f8b8d17dfb059aa8 sarg-2.0.8.ebuild 2091
+SHA256 c4181b0091c356ebc6324a21dd5ebc142ca828a99f560fe049bfbd624a661f3a sarg-2.0.8.ebuild 2091
+MD5 045825997aa5a66e9ca229bd739a3a8e sarg-2.1-r1.ebuild 2081
+RMD160 f62b8493796cf6419dde4410f85776218524e678 sarg-2.1-r1.ebuild 2081
+SHA256 ca2545dea453248b6cc0cf486e088a16d9868b535653d5196e1eda75bf0ec922 sarg-2.1-r1.ebuild 2081
 MD5 3f3c26a640f7b781805bdad5bd2678e4 sarg-2.1.ebuild 2033
+RMD160 f260e4ed8f731850f9a950c1b1bb3fe72de0346a sarg-2.1.ebuild 2033
+SHA256 165ca3b59d83bbb8012bda23269a470a66898447a42491a1a5a673402dece16a sarg-2.1.ebuild 2033
diff --git a/net-analyzer/sarg/files/digest-sarg-2.1-r1 b/net-analyzer/sarg/files/digest-sarg-2.1-r1
new file mode 100644
index 000000000000..c0eb90ee000c
--- /dev/null
+++ b/net-analyzer/sarg/files/digest-sarg-2.1-r1
@@ -0,0 +1,3 @@
+MD5 15b1c3fbff47ac6ea77573cae75b5e63 sarg-2.1.tar.gz 352935
+RMD160 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05 sarg-2.1.tar.gz 352935
+SHA256 89ec31f3b7b8187de1e4ee4fa0a4abf6867f2404bd9059bbfbe4beb609dd5818 sarg-2.1.tar.gz 352935
diff --git a/net-analyzer/sarg/files/sarg-2.1-sort-options.patch b/net-analyzer/sarg/files/sarg-2.1-sort-options.patch
new file mode 100644
index 000000000000..78a2d68330a2
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.1-sort-options.patch
@@ -0,0 +1,15 @@
+diff -Naur sarg-2.1/index.c sarg-2.1-patched/index.c
+--- sarg-2.1/index.c	2005-11-29 11:39:45.000000000 -0500
++++ sarg-2.1-patched/index.c	2006-04-12 13:49:25.000000000 -0400
+@@ -369,9 +369,9 @@
+       unlink(wdir_tmp2);
+    } else {
+       if(strcmp(IndexSortOrder,"A") == 0)
+-         sprintf(warea,"sort -t';' +6.5n +6.2M +6.0n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
++         sprintf(warea,"sort -t';' -k 7,5n -k 7,2M -k 7n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
+       else
+-         sprintf(warea,"sort -t';' +6.5nr +6.2Mr +6.0nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
++         sprintf(warea,"sort -t';' -k 7,5nr -k 7,2Mr -k 7nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
+       system(warea);
+       unlink(wdir_tmp);
+       if((fp_ou=fopen(wdir,"w"))==NULL) {
diff --git a/net-analyzer/sarg/sarg-2.1-r1.ebuild b/net-analyzer/sarg/sarg-2.1-r1.ebuild
new file mode 100644
index 000000000000..ae23fbeb6954
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.1-r1.ebuild,v 1.1 2006/04/14 06:57:37 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:"/usr/local/etc/httpd/htdocs/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/logs/access.log:' \
+	sarg.1 || die "Failed to fix man page."
+
+	epatch ${FILESDIR}/sarg-2.1-datafile.patch
+	epatch ${FILESDIR}/sarg-2.1-laslog.patch
+	epatch ${FILESDIR}/sarg-2.1-sort-options.patch
+}
+
+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
+}