diff options
| author |   Peter Volkov <pva@gentoo.org> | 2006-04-14 06:57:37 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2006-04-14 06:57:37 +0000 |
| commit | 403c0086b11d6af424cfde856136e5d429dbfb01 (patch) | |
| tree | 0b95164fd907c5b175b7e257c7d5bbbb576ff8fc /net-analyzer/sarg/files | |
| parent | fix leading spaces (diff) | |
| download | gentoo-2-403c0086b11d6af424cfde856136e5d429dbfb01.tar.gz gentoo-2-403c0086b11d6af424cfde856136e5d429dbfb01.tar.bz2 gentoo-2-403c0086b11d6af424cfde856136e5d429dbfb01.zip | |
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)
Diffstat (limited to 'net-analyzer/sarg/files')
| -rw-r--r-- | net-analyzer/sarg/files/digest-sarg-2.1-r1 | 3 | ||||
| -rw-r--r-- | net-analyzer/sarg/files/sarg-2.1-sort-options.patch | 15 |
2 files changed, 18 insertions, 0 deletions
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) { |