diff options
author | ben <ben@pkgsrc.org> | 2006-05-22 03:44:55 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2006-05-22 03:44:55 +0000 |
commit | 8b63513b867b01427772ebf404305cb5e597390a (patch) | |
tree | 033ed127f8c88f053e378ad75e8a63bb828c1bf3 /www/sarg | |
parent | 143b5f7d148dfa538bb18fb22a3bd3755f6f8c80 (diff) | |
download | pkgsrc-8b63513b867b01427772ebf404305cb5e597390a.tar.gz |
Update sarg to version 2.1. Notable changes include:
- site moved to sourceforge
- index_tree tag added. Look at TAG: index_tree in sarg.conf file
default is file - old format.
- realtime report added. sarg -r option
Look at these tags ion sarg.conf file:
TAG: realtime_refresh_time num sec
TAG: realtime_access_log_lines num
TAG: realtime_types: GET,PUT,CONNECT,ICP_QUERY,POST
TAG: realtime_unauthenticated_records: ignore|show
- garbage in topuser report with unitialized variable.
Thanks to Craig Brockmeier <craig@ppco.com>
- memory leaks caused by a wrong variable size
Fixed by Klaus Singvogel <kssingvo@suse.de>. Thanks.
- ignoring users with '.' in password file.
Thanks to Emerson Valdir Pellis <webmaster@marisol.com.br>
- error with "resolve_ip" with "user_authentication yes"
Fixed by Grigory Trenin <gtrenin@gmail.com>. Thanks.
- long url causing fault. Thanks to Vassily Andin <vasya@avitalight.com>
- hanging on a log file containing space.
Thanks to Fabio Lo Votrico <fabio@link.it>
- bug fixed in squidguard report module
- squidguard_ignore_date on|off tag added to sarg.conf file
You can ignore the squidguard log record date if outisde of
date range in squid access.log file.
- alternate squidguard log added using -L option on sarg command line.
Thanks to Dave Karlson <dkarlson@r9esd.k12.or.us>
- fixed malloc withou free.
- datafile-url ip|name added to sarg.conf file - saves ip address or name
in url when using datafile tag. Thanks to Calvin Muller <calvin@siryn.co.za>
- wronk link point in Generated by sarg-2..
Thanks to Markus Hoffmann <ipcop@mh-lantech.de>
- Russian_UFT-8 language added by Alex Deiter <tiamat@komi.mts.ru>
- dansguardian_report_limit missing in sarg.conf file.
- ntlm domain+user format added.
- index date sort fixed by Olivier JAVAUX. Thanks
- Improve broken record detection
Thanks to Artem Korneev <akorneev@intelsysus.com>
- sort open failed causing an empty topuser report
- sarg losslessly size optimized images
Thanks to Tonda Mí¿ek <tonda.misek@post.cz> and Luigi Gangitano.
- sarg calling sort without quoting filenames Thanks to Luigi Gangitano.
- download_report_limit tag added.
Thanks to Leonardo Rodrigues <leonardo@solutti.com.br>
- logo css class defined but never used.
Thanks to Roger Favero <favero@sparkenergy.it>
- verdana.ttf font removed to avoid patent infringement issues.
Now sarg uses a GPL FreeSans font from http://savannah.gnu.org
- ISA report with wrong date in date/time report. Thanks to Richard Berndt
- connect records ignored when using emulate_http_log on in squid.conf file.
Thanks to Dusan Woletz
- bug that prevents the correct usage of switch -d <date1-date2> when using
an "emulate_httpd_log on" logfile and some performance improvements
added. Thanks to Filippo Grassilli
- Spanish language fixed by José Luis Hernández López. Thanks.
- url variable size changed to acomodate big urls with coded symbols and some
minor changes in util.c file.
Thanks to Oleg <xsov@mail.ru>
- download suffixes improved by Oleg <xsov@mail.ru>. Thanks.
Now sarg uses these suffixes:
7z,ace,arj,avi,bat,bin,bz2,bzip,cab,com,cpio,dll,doc,dot,exe,gz,iso,
lha,lzh,mdb,mov,mp3,mpeg,mpg,mso,nrg,ogg,ppt,rar,rtf,shs,src,sys,tar,
tgz,vcd,vob,wma,wmv,zip
- DansGuardian report added. Thanks to Adolfas Kupliauskas for the access.log
- Slovak language added by Dusan Woletz Thank you
- wrong usertab user on topuser report. Thanks to Marcos Favoretto
- ntlm_user_format added to sarg.conf. Now you can choose the following formats
for the username on reports: user|domainname+user Suggested by Roger Favero
- exclude_users ignored in some situations.
- Fixes by Sapon Oleg from Russia:
. there are two equal lines about Evren Yurtesen in CONTRIBUTORS file.
. Internationalisation of SARG user graph added, using iconv function,
which is presented only in Linux, so I add required #ifdef and other
stuff to clean compile code on other platforms.
. Fixed two issues:
- '?' symbol problems for apache and other cgi-supporting web server which
doesn't support '?' symbol in links (all of them interprete this like
parameter to cgi script);
- some good optimization to all three similar cicles in these files by
reducing false checks in 'if ...' strings.
. Fixes segfault, produced by inproper use of strncpy functions, look
- strncpy doesn't copy leading '\0' symbol!
. Just localisation support for repday report.
. Support usertab IP->USERNAME change in siteuser report.
. Just proper Russian koi8 localisation.
- Greek language by Antonis Maglaras <vegos@magla.gr> Thank you.
- time period added to -t option. Now you can use -t HH-HH, HH:MM-HH:MM
- support to isa proxy 2004 log added.
Thanks to William da Rocha Lima <wrochal@linuxit.com.br>
- French language fixed by Alexey Znamerovskiy <alexz@everys.com> Thanks
- internal LC_ALL=C removed to avoid errors on Solaris.
Thanks to Hraska, Frantisek <frantisek.hraska@hupro.sk>
- non authenticated records removed from Topuser report.
Thanks to Brian <brian@reginachristianschool.org>
- Compilation error on FreeBSD > 5 - log.c:645: error: `RLIMIT_OFILE' undeclared
- Sarg abbreviation values improved.
- fixed: some changes to avoid segmentation fault.
- fixed: some changes to avoid compilation errors on freeBSD.
- fixed: exclude_hosts not excluding correctly.
- exclude hosts not excluding correctly. Thanks to Oleg
- download report showing jpeg files.
- support to Microsoft isa proxy log files added.
Thanks to Trankov Vladislav <vtrankov@kb-obibank.ru>
- fixed: error when using relative paths in -o and -w options. Just
absolute paths can be used now. Thanks to Andreas Grosse <andi@majestyk.de>
- fixed: segfault fix in vrfydir() in util.c
Prevent buffer overflow in subs(); replace one constant with sizeof()
in my_lltoa(). vrfydir(): fix segfault if sub-directory "images" is
not exists function builddia() don't check the parameters. Result:
segmentation fault in some cases.
Thanks to Stas Degteff stas_degteff@users.sourceforge.net for the fixes.
- fixed: wrond date period in squidguard_log when using european date format.
Thanks to Guenther Mair <gunnyst@users.sourceforge.net>
- ulimit tag added on sarg.conf to avoid "Too many open files" error.
Thanks to Paulo Pires <paulo.pires@vodafone.pt>
- squidguard parse logs method changed.
Thanks to Joao Mendes <jmendes@credibom.pt>
Thanks to Guenther Mair <gunnyst@users.sourceforge.net>
- wrong results in -v option.
- fixed: error when using -u (include user)
Thanks to Bochkarev Vladimi <bochkarev@expocentr.ru>
- export LC_ALL=C will be issued before sort to avoid high cpu usage
- grepday with invalid font path.
Thanks to Marcelo Ricardo Leitner <mrl@conectiva.com.br>
- -v option added to display Sarg version on console
- Segmenation fault caused by an unclosed file. Thanks to Pustovalov Leonid
- SquidGuard log formats added. Thanks to Kolotov Alexandr
- time field added to topsites report
Thanks to Miles Roper <mroper@westcoastdhb.org.nz>
- fixtime function with wrong definition, changed to long long
Thanks to Valery from Russia
- Solaris 9 compiling error: error: conflicting types for 'my_mkdir'
Thanks to Brad Larden <Brad.Larden@alphawest.com.au>
- segfaults if the denied report is disabled in sarg.conf.
Thanks to Filippo Carletti <filippo.carletti@nethesis.it>
- reading performance improved by Francesco Perrillo <fperillo@totalfax.it>
Thanks
- Russian sarg-php translation added.
Thanks to Michael Stepanenko <mistic@ecolines.ru>
- configure error with no gd installed.
- graph with no text when using --enable-sysconfdir
- graph day incorrect when using dd/mm/yy date format
- show_sarg_logo yes|no added
- site_user_time_date with wrong patch.
Thanks to Ricardo R. Hoffmann <hoffmann@uninet.com.br>
- Internal/External css implemented
- User authentication access (htaccess) implemented
- large file support added
- Report limits implemented
- Download report implemented
- Sarg logo by Osamu Matsuzaki <matsu_o@robata.org> added.
- Internal mkdir added to easy port to various plataform.
- long url now show only accessed site and module name.
- now you can add a user report url to a flat file to be blocked
by some Squid acl.
Request by Francesco Collini <collini@colliniconsulting.it>
- remove temporary files, if already exist, to avoid conflits with a
previous sarg process.. Thanks to Renato Leon <rl_sita@hotmail.com>
- squidGuard improved
- now only records with the same period from access.log
will be in squidGuard report.
- squidGuard limit report
- now you can save some urls in squidGuard db using
sarg-squidguard PHP utility.
bug fixed: fault caused by rewinddir after closedir.
Thanks to Lucas Bocchi <challado@ibocchi.com.br>
and to Freek
Fixed: - missing </body> tags in all HTML pages
- missing </html> tag in some HTML pages
- missing DOCTYPE in all HTML pages
- grammar in man page
- URL Links to SourceForge http://sarg.sourceforge.net/
Added: - Included more detailed information in man the page
Thanks to Billy Newsom of U.S.
To Do: - There are still major validation problems in the HTML generated
fixed: - link error to denied site in squidGuard report
- resolve name error in squidGuard report
- some fixes to HPUX. Thanks to Miles Roper <mroper@westcoastdhb.org.nz>
- index_sort_order tag don't work correctly.
- too many open files fixed.
Thanks to Francesco Perrillo <fperillo@totalfax.it>
- Ukrainian_windows1251 included in sarg.conf file
- exclude_string don´t work correctly.
Thanks to Modric Kristijan <Kristijan.Modric@pliva.hr>
Diffstat (limited to 'www/sarg')
-rw-r--r-- | www/sarg/Makefile | 16 | ||||
-rw-r--r-- | www/sarg/PLIST | 43 | ||||
-rw-r--r-- | www/sarg/distinfo | 32 | ||||
-rw-r--r-- | www/sarg/patches/patch-aa | 10 | ||||
-rw-r--r-- | www/sarg/patches/patch-ab | 6 | ||||
-rw-r--r-- | www/sarg/patches/patch-ac | 20 | ||||
-rw-r--r-- | www/sarg/patches/patch-ad | 15 | ||||
-rw-r--r-- | www/sarg/patches/patch-ae | 14 | ||||
-rw-r--r-- | www/sarg/patches/patch-af | 6 | ||||
-rw-r--r-- | www/sarg/patches/patch-ag | 49 | ||||
-rw-r--r-- | www/sarg/patches/patch-ah | 99 | ||||
-rw-r--r-- | www/sarg/patches/patch-ai | 13 |
12 files changed, 270 insertions, 53 deletions
diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 08ab8197cb5..e9535b6b75e 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2006/04/22 09:22:17 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2006/05/22 03:44:55 ben Exp $ -DISTNAME= sarg-1.4.1 +DISTNAME= sarg-2.1 CATEGORIES= www -MASTER_SITES= http://web.onda.com.br/orso/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sarg/} -PATCH_SITES= http://web.onda.com.br/orso/patches/ -PATCHFILES= sarg-1.4.1-index.sort.patch +PATCH_SITES= http://sarg.sourceforge.net/ +PATCHFILES= datafile.patch lastlog.patch MAINTAINER= mishka@terabyte.com.ua -HOMEPAGE= http://web.onda.com.br/orso/ +HOMEPAGE= http://sarg.sourceforge.net/sarg.php COMMENT= Squid-Cache proxy server Analysis Report Generator GNU_CONFIGURE= yes @@ -52,6 +52,7 @@ CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf \ ${EGLNG}/English ${CFLNG}/English \ ${EGLNG}/French ${CFLNG}/French \ ${EGLNG}/German ${CFLNG}/German \ + ${EGLNG}/Greek ${CFLNG}/Greek \ ${EGLNG}/Hungarian ${CFLNG}/Hungarian \ ${EGLNG}/Indonesian ${CFLNG}/Indonesian \ ${EGLNG}/Italian ${CFLNG}/Italian \ @@ -61,9 +62,11 @@ CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf \ ${EGLNG}/Portuguese ${CFLNG}/Portuguese \ ${EGLNG}/Romanian ${CFLNG}/Romanian \ ${EGLNG}/Russian_koi8 ${CFLNG}/Russian_koi8 \ + ${EGLNG}/Russian_UTF8 ${CFLNG}/Russian_UTF8 \ ${EGLNG}/Russian_windows1251 \ ${CFLNG}/Russian_windows1251 \ ${EGLNG}/Serbian ${CFLNG}/Serbian \ + ${EGLNG}/Slovak ${CFLNG}/Slovak \ ${EGLNG}/Spanish ${CFLNG}/Spanish \ ${EGLNG}/Turkish ${CFLNG}/Turkish \ ${EGLNG}/Ukrainian_windows1251 \ @@ -73,4 +76,5 @@ post-extract: @${FIND} ${WRKSRC} -type d -exec ${CHMOD} +x {} \; @${RM} ${WRKSRC}/languages/.new +.include "../../graphics/gd/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/sarg/PLIST b/www/sarg/PLIST index 637ecbc52fd..157eff2437f 100644 --- a/www/sarg/PLIST +++ b/www/sarg/PLIST @@ -1,8 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2006/05/22 03:44:55 ben Exp $ sbin/sarg man/man1/sarg.1 share/examples/sarg/sarg.conf +share/examples/sarg/css.tpl share/examples/sarg/exclude_codes +share/examples/sarg/fonts/FreeSans.ttf +share/examples/sarg/fonts/README +share/examples/sarg/fonts/license +share/examples/sarg/images/datetime.png +share/examples/sarg/images/graph.png +share/examples/sarg/images/sarg-squidguard-block.png +share/examples/sarg/images/sarg.png share/examples/sarg/languages/Bulgarian_windows1251 share/examples/sarg/languages/Catalan share/examples/sarg/languages/Czech @@ -10,6 +18,7 @@ share/examples/sarg/languages/Dutch share/examples/sarg/languages/English share/examples/sarg/languages/French share/examples/sarg/languages/German +share/examples/sarg/languages/Greek share/examples/sarg/languages/Hungarian share/examples/sarg/languages/Indonesian share/examples/sarg/languages/Italian @@ -20,9 +29,41 @@ share/examples/sarg/languages/Portuguese share/examples/sarg/languages/Romanian share/examples/sarg/languages/Russian_koi8 share/examples/sarg/languages/Russian_windows1251 +share/examples/sarg/languages/Russian_UTF-8 share/examples/sarg/languages/Serbian +share/examples/sarg/languages/Slovak share/examples/sarg/languages/Spanish share/examples/sarg/languages/Turkish share/examples/sarg/languages/Ukrainian_windows1251 +share/examples/sarg/sarg-php/COPYING +share/examples/sarg/sarg-php/INSTALL +share/examples/sarg/sarg-php/LANGUAGES +share/examples/sarg/sarg-php/language.php +share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo +share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po +share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.mo +share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.po +share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo +share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po +share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo +share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po +share/examples/sarg/sarg-php/sarg-block-it.php +share/examples/sarg/sarg-php/sarg-realtime.php +share/examples/sarg/sarg-php/sarg-squidguard-block.php +share/examples/sarg/sarg-php/sarg-squidguard-block2.php +share/examples/sarg/sarg-php/style.php +share/examples/sarg/sarg-php/translate.this +@dirrm share/examples/sarg/fonts +@dirrm share/examples/sarg/images @dirrm share/examples/sarg/languages +@dirrm share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES +@dirrm share/examples/sarg/sarg-php/locale/en_EN +@dirrm share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES +@dirrm share/examples/sarg/sarg-php/locale/fr +@dirrm share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES +@dirrm share/examples/sarg/sarg-php/locale/pt_BR +@dirrm share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES +@dirrm share/examples/sarg/sarg-php/locale/ru +@dirrm share/examples/sarg/sarg-php/locale +@dirrm share/examples/sarg/sarg-php @dirrm share/examples/sarg diff --git a/www/sarg/distinfo b/www/sarg/distinfo index 220a765c07f..3ba4c4ff3b3 100644 --- a/www/sarg/distinfo +++ b/www/sarg/distinfo @@ -1,14 +1,20 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 14:08:38 wiz Exp $ +$NetBSD: distinfo,v 1.3 2006/05/22 03:44:55 ben Exp $ -SHA1 (sarg-1.4.1/sarg-1.4.1.tar.gz) = 7b01ad67ca1e6795e33301ac03e455c01259b0f9 -RMD160 (sarg-1.4.1/sarg-1.4.1.tar.gz) = 8e5adc86ddd56152cc0392d44f1775bb1622fd92 -Size (sarg-1.4.1/sarg-1.4.1.tar.gz) = 125589 bytes -SHA1 (sarg-1.4.1/sarg-1.4.1-index.sort.patch) = 4fb150014d027dd24891a292c1c4ad7fafe0e66f -RMD160 (sarg-1.4.1/sarg-1.4.1-index.sort.patch) = a865614ee7a77014f48775f630abd4f5b0905cdc -Size (sarg-1.4.1/sarg-1.4.1-index.sort.patch) = 2034 bytes -SHA1 (patch-aa) = c625b392bb7bc6cec773c8c6c14dbe2fba86377e -SHA1 (patch-ab) = fd2d38a511e1bc3b95a854a8e9fc8beb9631fe3e -SHA1 (patch-ac) = 59ac8d12b3e8fbd6230fed23fd5da542aee18184 -SHA1 (patch-ad) = 393cc7a76e0a8d01b0387890f7c9f12c08787827 -SHA1 (patch-ae) = d3fac03932f2471fa298069336a890d0a884557f -SHA1 (patch-af) = 13a7d437eb90ccdcb18851338ab2ebe5512dc84e +SHA1 (sarg-2.1/sarg-2.1.tar.gz) = e35239d076f8b4bf9b9c41ea68f7711fa9a6d920 +RMD160 (sarg-2.1/sarg-2.1.tar.gz) = 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05 +Size (sarg-2.1/sarg-2.1.tar.gz) = 352935 bytes +SHA1 (sarg-2.1/datafile.patch) = 15e5c4f6d7dd7bb0d978a67fd8163eda5cadc7d5 +RMD160 (sarg-2.1/datafile.patch) = a158013cbb19620f1942201cec0d7896d5a6ebfc +Size (sarg-2.1/datafile.patch) = 1300 bytes +SHA1 (sarg-2.1/lastlog.patch) = c4af4ff498baa5d2a124b52ca84b984169c9eea8 +RMD160 (sarg-2.1/lastlog.patch) = e72fec0af3ce48df9a3aa43656d8be5cf3c1044b +Size (sarg-2.1/lastlog.patch) = 406 bytes +SHA1 (patch-aa) = aadbd10cfa7bedd2c7ba629f5be40f48d3092776 +SHA1 (patch-ab) = a22082096256009cef93095184859815f48ec533 +SHA1 (patch-ac) = 7157d9ee56f1d31273e6d020a0d970bd55278ebd +SHA1 (patch-ad) = 26f90ff3a3c1099f36c6d4a32f7309c4b70a3365 +SHA1 (patch-ae) = 46e01d4c2f106629e512523e3b4d58118ccfb0bf +SHA1 (patch-af) = e3dc4c6edd26f7361974f573e38265f613e1da42 +SHA1 (patch-ag) = f895801bf2834fb7c65233f15c20cca7c50f6a44 +SHA1 (patch-ah) = 9f3486723378085a8c3d1fdf4b549543038e40e1 +SHA1 (patch-ai) = fb00daf29e53f56e2b2a1a0997f8f364d82e6acf diff --git a/www/sarg/patches/patch-aa b/www/sarg/patches/patch-aa index 32f192732be..77ba2d7b4fe 100644 --- a/www/sarg/patches/patch-aa +++ b/www/sarg/patches/patch-aa @@ -1,18 +1,20 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/05/22 03:44:55 ben Exp $ ---- Makefile.in.orig 2003-04-25 20:20:55.000000000 +0300 +--- Makefile.in.orig 2005-11-29 08:39:45.000000000 -0800 +++ Makefile.in -@@ -4,10 +4,10 @@ CC = @CC@ +@@ -4,12 +4,12 @@ CC = @CC@ BINDIR = @BINDIR@ IBINDIR = -DBINDIR=\"@BINDIR@\" MANDIR = @MANDIR@ -SYSCONFDIR = @SYSCONFDIR@ +SYSCONFDIR = ${EGDIR} + HTMLDIR = @HTMLDIR@ ISYSCONFDIR = -DSYSCONFDIR=\"@SYSCONFDIR@\" + IHTMLDIR = -DHTMLDIR=\"@HTMLDIR@\" -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ +CFLAGS += @CFLAGS@ ${PKG_FLAGS} +LDFLAGS += @LDFLAGS@ DEFS = @DEFS@ + LIBS = @LIBS@ SRCDIR = . - VPATH = . diff --git a/www/sarg/patches/patch-ab b/www/sarg/patches/patch-ab index f4697ed2027..26549bdb5da 100644 --- a/www/sarg/patches/patch-ab +++ b/www/sarg/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2006/05/22 03:44:55 ben Exp $ ---- convlog.c.orig 2003-04-25 20:20:55.000000000 +0300 +--- convlog.c.orig 2005-11-29 08:39:45.000000000 -0800 +++ convlog.c -@@ -19,7 +19,7 @@ void convlog(char *arq, char *df, int df +@@ -39,7 +39,7 @@ void convlog(char *arq, char *df, int df struct tm *t; if(arq[0] == '\0') diff --git a/www/sarg/patches/patch-ac b/www/sarg/patches/patch-ac index bfe8f387d4d..f836c8d74df 100644 --- a/www/sarg/patches/patch-ac +++ b/www/sarg/patches/patch-ac @@ -1,19 +1,19 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2006/05/22 03:44:55 ben Exp $ ---- log.c.orig 2003-04-25 20:20:55.000000000 +0300 +--- log.c.orig 2005-11-29 08:39:45.000000000 -0800 +++ log.c -@@ -133,7 +133,7 @@ int main(argc,argv) - ReportType[0]='\0'; - UserTabFile[0]='\0'; +@@ -148,7 +148,7 @@ int main(argc,argv) + SquidGuardLogFormat[0]='\0'; + SquidGuardLogAlternate[0]='\0'; - strcpy(AccessLog,"/usr/local/squid/var/logs/access.log"); + strcpy(AccessLog,SQUID_ACCESSLOG); sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR); - strcpy(BgColor,"white"); - strcpy(TxColor,"black"); -@@ -146,7 +146,7 @@ int main(argc,argv) - strcpy(HeaderBgColor,"blanchedalmond"); - strcpy(FontSize,"-1"); + strcpy(GraphDaysBytesBarColor,"orange"); + strcpy(BgColor,"#ffffff"); +@@ -163,7 +163,7 @@ int main(argc,argv) + strcpy(LogoTextColor,"#006699"); + strcpy(FontSize,"9px"); strcpy(TempDir,"/tmp"); - strcpy(OutputDir,"/usr/local/etc/httpd/htdocs/squid-reports"); + strcpy(OutputDir,SARG_REPORTSDIR); diff --git a/www/sarg/patches/patch-ad b/www/sarg/patches/patch-ad index 2a7a8dd9326..23e794e5a87 100644 --- a/www/sarg/patches/patch-ad +++ b/www/sarg/patches/patch-ad @@ -1,13 +1,16 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2006/05/22 03:44:55 ben Exp $ ---- sarg.1.orig 2003-04-25 20:20:55.000000000 +0300 +--- sarg.1.orig 2005-11-29 08:39:45.000000000 -0800 +++ sarg.1 -@@ -124,7 +124,7 @@ Convert the logfile's date/time field to +@@ -131,9 +131,9 @@ Convert the logfile's date/time field to .B \-split Split the log file by date in \fB-d\fP parameter. .SH FILES --.BR /etc/squid/sarg.conf +-.BR /usr/local/sarg/sarg.conf +.BR @PKG_SYSCONFDIR@/sarg.conf .br - .SH AUTHOR - This manual page was written by Luigi Gangitano <gangitano@lugroma3.org>, +-.B /usr/local/squid/logs/access.log ++.B @SQUID_ACCESSLOG@ + .br + .B /usr/local/squidGuard/logs/squidGuard.log + .SH SEE ALSO diff --git a/www/sarg/patches/patch-ae b/www/sarg/patches/patch-ae index 7ca3444a0d9..a6f9eaa72de 100644 --- a/www/sarg/patches/patch-ae +++ b/www/sarg/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2006/05/22 03:44:55 ben Exp $ ---- sarg.conf.orig 2003-04-25 20:20:55.000000000 +0300 +--- sarg.conf.orig 2005-11-29 08:39:45.000000000 -0800 +++ sarg.conf -@@ -29,7 +29,7 @@ +@@ -32,7 +32,7 @@ # Where is the access.log file # sarg -l file # -#access_log /usr/local/squid/var/logs/access.log +#access_log @SQUID_ACCESSLOG@ - # TAG: title - # Especify the title for html page. -@@ -120,7 +120,7 @@ + # TAG: graphs yes|no + # Use graphics where is possible. +@@ -139,7 +139,7 @@ # The reports will be saved in that directory # sarg -o dir # @@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ # TAG: output_email # Email address to send the reports. If you use this tag, no html reports will be generated. -@@ -244,7 +244,7 @@ +@@ -269,7 +269,7 @@ # TAG: exclude_codes file # Ignore records with these codes. Eg.: NONE/400 # diff --git a/www/sarg/patches/patch-af b/www/sarg/patches/patch-af index d77d8c09ee1..acf400c76f0 100644 --- a/www/sarg/patches/patch-af +++ b/www/sarg/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2003/12/04 16:06:32 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2006/05/22 03:44:55 ben Exp $ ---- splitlog.c.orig 2003-04-25 20:20:55.000000000 +0300 +--- splitlog.c.orig 2005-11-29 08:39:45.000000000 -0800 +++ splitlog.c -@@ -19,7 +19,7 @@ void splitlog(char *arq, char *df, int d +@@ -39,7 +39,7 @@ void splitlog(char *arq, char *df, int d struct tm *t; if(arq[0] == '\0') diff --git a/www/sarg/patches/patch-ag b/www/sarg/patches/patch-ag new file mode 100644 index 00000000000..5a63f4622a3 --- /dev/null +++ b/www/sarg/patches/patch-ag @@ -0,0 +1,49 @@ +$NetBSD: patch-ag,v 1.1 2006/05/22 03:44:55 ben Exp $ + +--- configure.in.orig 2005-11-29 08:39:45.000000000 -0800 ++++ configure.in +@@ -6,33 +6,8 @@ LDFLAGS="-g" + + AC_CANONICAL_HOST + +-AC_ARG_WITH(gcc, +-[ --without-gcc use CC to compile]) +- +-test -n "$CC" && cc_specified=yes +-case ${with_gcc} in +- yes ) CC=gcc ;; +-dnl yes ) CC=g++ ;; +- no ) CC=cc ;; +- * ) AC_PROG_CC;; +-dnl * ) AC_PROG_CXX ;; +-esac +- +-if test "${CC}" = "cc" ; then +- CFLAGS="${CFLAGS} -w -g -O2 -Aa" +-else +- CFLAGS="${CFLAGS} -w" +-fi +- +-case "$host" in +- *-solaris*) +- LDFLAGS="${LDFLAGS} -lsocket -lnsl" +- CFLAGS="-DSOLARIS ${CFLAGS}" +- ;; +-esac +- +-#dnl Checks for programs. +-#AC_PROG_CC ++dnl Checks for programs. ++AC_PROG_CC + + dnl Check for headers + AC_HEADER_DIRENT +@@ -40,7 +15,7 @@ AC_HEADER_STDC + + AC_CHECK_HEADERS(stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \ + dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \ +- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h) ++ ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h) + + AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD="yes", HAVE_GD="") + diff --git a/www/sarg/patches/patch-ah b/www/sarg/patches/patch-ah new file mode 100644 index 00000000000..02ea0533259 --- /dev/null +++ b/www/sarg/patches/patch-ah @@ -0,0 +1,99 @@ +$NetBSD: patch-ah,v 1.1 2006/05/22 03:44:55 ben Exp $ + +--- configure.orig 2005-11-29 08:39:45.000000000 -0800 ++++ configure +@@ -853,11 +853,6 @@ Optional Features: + --enable-htmldir=htmldir + Select htmldir + +-Optional Packages: +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --without-gcc use CC to compile +- + Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags +@@ -1388,18 +1383,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^ + + + +- +-# Check whether --with-gcc or --without-gcc was given. +-if test "${with_gcc+set}" = set; then +- withval="$with_gcc" +- +-fi; +- +-test -n "$CC" && cc_specified=yes +-case ${with_gcc} in +- yes ) CC=gcc ;; +- no ) CC=cc ;; +- * ) ac_ext=c ++ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +@@ -2328,24 +2312,7 @@ ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-;; +-esac +- +-if test "${CC}" = "cc" ; then +- CFLAGS="${CFLAGS} -w -g -O2 -Aa" +-else +- CFLAGS="${CFLAGS} -w" +-fi +- +-case "$host" in +- *-solaris*) +- LDFLAGS="${LDFLAGS} -lsocket -lnsl" +- CFLAGS="-DSOLARIS ${CFLAGS}" +- ;; +-esac + +-#dnl Checks for programs. +-#AC_PROG_CC + + + +@@ -3166,10 +3133,35 @@ fi + + done + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + for ac_header in stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \ + dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \ +- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h errno.h \ +- sys/resource.h ++ ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/www/sarg/patches/patch-ai b/www/sarg/patches/patch-ai new file mode 100644 index 00000000000..24c484fe97d --- /dev/null +++ b/www/sarg/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2006/05/22 03:44:55 ben Exp $ + +--- grepday.c.orig 2005-11-29 08:39:45.000000000 -0800 ++++ grepday.c +@@ -43,7 +43,7 @@ char s[15]; + #include <iconv.h> + #define SARGgdImageStringFT I18NgdImageStringFT + +-BGD_DECLARE(char *) I18NgdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist, ++char *I18NgdImageStringFT(gdImage * im, int *brect, int fg, char *fontlist, + double ptsize, double angle, int x, int y, + char *string) + { |