diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 849f81f2862..f494946740e 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2006/01/28 21:22:07 aanriot Exp $ +# $OpenBSD: Makefile,v 1.6 2007/05/16 15:59:23 aanriot Exp $ COMMENT= "Squid Analysis Report Generator" -DISTNAME= sarg-2.1 -PKGNAME= ${DISTNAME}p0 +DISTNAME= sarg-2.2.3.1 CATEGORIES= www HOMEPAGE= http://sarg.sourceforge.net/ diff --git a/www/sarg/distinfo b/www/sarg/distinfo index a368b84bcb2..fb47a41bddc 100644 --- a/www/sarg/distinfo +++ b/www/sarg/distinfo @@ -1,5 +1,5 @@ -MD5 (sarg-2.1.tar.gz) = FbHD+/9HrG6ndXPK51teYw== -RMD160 (sarg-2.1.tar.gz) = Wycy1eSlvNTCsk5WlKPRlYHYewU= -SHA1 (sarg-2.1.tar.gz) = 41I50Hb4tL+bnEHqaPdxH6mm2SA= -SHA256 (sarg-2.1.tar.gz) = iewx87e4GH3h5O5PoKSr9oZ/JAS9kFm7++S+tgndWBg= -SIZE (sarg-2.1.tar.gz) = 352935 +MD5 (sarg-2.2.3.1.tar.gz) = 6e2e2c386a89aaff31f048eb2a6c5b1a +RMD160 (sarg-2.2.3.1.tar.gz) = 3a2ce81e3cf6e8559f3efb53c0e5b0b9526f08b6 +SHA1 (sarg-2.2.3.1.tar.gz) = 6433ef901641245e1283bbb9ae7f7be7959841eb +SHA256 (sarg-2.2.3.1.tar.gz) = fc6d7e92c156b488941820a2d44eac6231d4237435e9fffd9f3ebda51296842e +SIZE (sarg-2.2.3.1.tar.gz) = 641277 diff --git a/www/sarg/patches/patch-configure b/www/sarg/patches/patch-configure index 729d0a4c9e6..a93c3a66a15 100644 --- a/www/sarg/patches/patch-configure +++ b/www/sarg/patches/patch-configure @@ -1,6 +1,7 @@ ---- configure.orig Tue Nov 29 17:39:45 2005 -+++ configure Thu Jan 26 21:31:44 2006 -@@ -2331,12 +2331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +$OpenBSD: patch-configure,v 1.4 2007/05/16 15:59:23 aanriot Exp $ +--- configure.orig Wed Apr 4 07:28:32 2007 ++++ configure Wed Apr 4 07:29:17 2007 +@@ -2335,12 +2335,6 @@ ;; esac @@ -13,3 +14,12 @@ case "$host" in *-solaris*) LDFLAGS="${LDFLAGS} -lsocket -lnsl" +@@ -3990,7 +3984,7 @@ + + 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 iconv.h \ ++ ctype.h iconv.h \ + errno.h sys/resource.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/www/sarg/patches/patch-convlog_c b/www/sarg/patches/patch-convlog_c index 2f19dd5ff99..1e06c39f622 100644 --- a/www/sarg/patches/patch-convlog_c +++ b/www/sarg/patches/patch-convlog_c @@ -1,3 +1,4 @@ +$OpenBSD: patch-convlog_c,v 1.3 2007/05/16 15:59:23 aanriot Exp $ --- convlog.c.orig Tue Nov 29 17:39:45 2005 +++ convlog.c Thu Jan 26 21:31:44 2006 @@ -39,7 +39,7 @@ void convlog(char *arq, char *df, int df diff --git a/www/sarg/patches/patch-index_c b/www/sarg/patches/patch-index_c deleted file mode 100644 index 87160d32af7..00000000000 --- a/www/sarg/patches/patch-index_c +++ /dev/null @@ -1,14 +0,0 @@ ---- index.c.orig Tue Nov 29 17:39:45 2005 -+++ index.c Thu Jan 26 21:31:44 2006 -@@ -369,9 +369,9 @@ void make_index() - 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,7 %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';' -r -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2); - system(warea); - unlink(wdir_tmp); - if((fp_ou=fopen(wdir,"w"))==NULL) { diff --git a/www/sarg/patches/patch-log_c b/www/sarg/patches/patch-log_c index d4e18226e6d..2f2bda65812 100644 --- a/www/sarg/patches/patch-log_c +++ b/www/sarg/patches/patch-log_c @@ -1,20 +1,35 @@ ---- log.c.orig Tue Nov 29 17:39:45 2005 -+++ log.c Thu Jan 26 21:31:44 2006 -@@ -148,7 +148,7 @@ int main(argc,argv) - SquidGuardLogFormat[0]='\0'; +$OpenBSD: patch-log_c,v 1.2 2007/05/16 15:59:23 aanriot Exp $ +--- log.c.orig Wed Apr 4 08:25:56 2007 ++++ log.c Wed Apr 4 08:31:27 2007 +@@ -145,7 +145,7 @@ SquidGuardLogAlternate[0]='\0'; + arq[0]='\0'; - strcpy(AccessLog,"/usr/local/squid/var/logs/access.log"); + strcpy(AccessLog,"/var/squid/logs/access.log"); sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR); strcpy(GraphDaysBytesBarColor,"orange"); strcpy(BgColor,"#ffffff"); -@@ -163,7 +163,7 @@ int main(argc,argv) +@@ -160,7 +160,7 @@ strcpy(LogoTextColor,"#006699"); strcpy(FontSize,"9px"); strcpy(TempDir,"/tmp"); -- strcpy(OutputDir,"/usr/local/etc/httpd/htdocs/squid-reports"); +- strcpy(OutputDir,"/var/www/html/squid-reports"); + strcpy(OutputDir,"/var/www/htdocs/sarg"); strcpy(Ip2Name,"no"); strcpy(DateFormat,"u"); strcpy(OverwriteReport,"no"); +@@ -197,11 +197,11 @@ + strcpy(ShowSargInfo,"yes"); + strcpy(ShowSargLogo,"yes"); + strcpy(ParsedOutputLog,"no"); +- strcpy(ParsedOutputLogCompress,"/bin/gzip"); ++ strcpy(ParsedOutputLogCompress,"/usr/bin/gzip"); + strcpy(DisplayedValues,"abbreviation"); + strcpy(HeaderFontSize,"9px"); + strcpy(TitleFontSize,"11px"); +- strcpy(AuthUserFile,"/usr/local/sarg/passwd"); ++ strcpy(AuthUserFile,"/etc/sarg/passwd"); + strcpy(AuthName,"SARG, Restricted Access"); + strcpy(AuthType,"basic"); + strcpy(Require,"require user admin %u"); diff --git a/www/sarg/patches/patch-sarg_conf b/www/sarg/patches/patch-sarg_conf index 17fbb6625fe..d603eed71aa 100644 --- a/www/sarg/patches/patch-sarg_conf +++ b/www/sarg/patches/patch-sarg_conf @@ -1,51 +1,56 @@ ---- sarg.conf.orig Tue Nov 29 17:39:45 2005 -+++ sarg.conf Thu Jan 26 21:31:44 2006 -@@ -32,7 +32,7 @@ +$OpenBSD: patch-sarg_conf,v 1.2 2007/05/16 15:59:23 aanriot Exp $ +--- sarg.conf.orig Tue Jan 2 17:11:26 2007 ++++ sarg.conf Wed Apr 4 08:42:21 2007 +@@ -33,7 +33,7 @@ # Where is the access.log file # sarg -l file # -#access_log /usr/local/squid/var/logs/access.log -+#access_log /var/squid/logs/access.log ++#access_log /var/squid/logs/access.log # TAG: graphs yes|no # Use graphics where is possible. -@@ -139,7 +139,7 @@ +@@ -140,7 +140,7 @@ # The reports will be saved in that directory # sarg -o dir # -#output_dir /var/www/html/squid-reports -+#output_dir /var/www/htdocs/sarg ++#output_dir /var/www/htdocs/sarg # TAG: output_email # Email address to send the reports. If you use this tag, no html reports will be generated. -@@ -269,7 +269,7 @@ +@@ -270,7 +270,7 @@ # TAG: exclude_codes file # Ignore records with these codes. Eg.: NONE/400 # -#exclude_codes /usr/local/sarg/exclude_codes -+#exclude_codes %%SYSCONFDIR%%/sarg/exclude_codes ++#exclude_codes %%SYSCONFDIR%%/sarg/exclude_codes # TAG: replace_index string # Replace "index.html" in the main index file with this string -@@ -493,7 +493,7 @@ max_elapsed 28800000 - # TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress +@@ -497,10 +497,10 @@ + # + #parsed_output_log none + +-# TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress ++# TAG: parsed_output_log_compress /bin/bin/gzip|/usr/local/bin/bzip2|nocompress # sarg logs compress util # -#parsed_output_log_compress /bin/gzip -+#parsed_output_log_compress /usr/bin/gzip ++#parsed_output_log_compress /usr/bin/gzip # TAG: displayed_values bytes|abbreviation # how the values will be displayed in reports. -@@ -526,7 +526,7 @@ max_elapsed 28800000 +@@ -533,7 +533,7 @@ # Sarg will create sarg-php directory with some PHP modules: # - sarg-squidguard-block.php - add urls from user reports to squidGuard DB # -#www_document_root /var/www/html -+#www_document_root /var/www/htdocs ++#www_document_root /var/www/htdocs # TAG: block_it module_url # This tag allow you to pass urls from user reports to a cgi or php module, -@@ -534,7 +534,7 @@ max_elapsed 28800000 +@@ -541,7 +541,7 @@ # # Eg.: block_it /sarg-php/sarg-block-it.php # sarg-block-it is a php that will append a url to a flat file. @@ -54,7 +59,7 @@ # in $filename variable, and chown to a httpd owner. # # sarg will pass http://module_url?url=url -@@ -555,7 +555,7 @@ max_elapsed 28800000 +@@ -562,7 +562,7 @@ # .data2 table text class, align:right, border colors # .link link class # @@ -63,3 +68,12 @@ # #external_css_file none +@@ -576,7 +576,7 @@ + # %u - user report + # + # user_authentication no +-# AuthUserFile /usr/local/sarg/passwd ++# AuthUserFile %%SYSCONFDIR%%/sarg/passwd + # AuthName "SARG, Restricted Access" + # AuthType Basic + # Require user admin %u diff --git a/www/sarg/patches/patch-splitlog_c b/www/sarg/patches/patch-splitlog_c index 3d05298e70c..0c8a7d70e40 100644 --- a/www/sarg/patches/patch-splitlog_c +++ b/www/sarg/patches/patch-splitlog_c @@ -1,3 +1,4 @@ +$openBSD$ --- splitlog.c.orig Tue Nov 29 17:39:45 2005 +++ splitlog.c Thu Jan 26 21:31:44 2006 @@ -39,7 +39,7 @@ void splitlog(char *arq, char *df, int d diff --git a/www/sarg/pkg/PLIST b/www/sarg/pkg/PLIST index 79456624b26..dafcca14f2b 100644 --- a/www/sarg/pkg/PLIST +++ b/www/sarg/pkg/PLIST @@ -1,43 +1,78 @@ -@comment $OpenBSD: PLIST,v 1.2 2006/01/22 11:05:02 aanriot Exp $ +@comment $OpenBSD: PLIST,v 1.3 2007/05/16 15:59:23 aanriot Exp $ bin/sarg @man man/man1/sarg.1 share/examples/sarg/ @sample ${SYSCONFDIR}/sarg/ share/examples/sarg/css.tpl +@sample ${SYSCONFDIR}/sarg/css.tpl share/examples/sarg/exclude_codes @sample ${SYSCONFDIR}/sarg/exclude_codes share/examples/sarg/fonts/ +@sample ${SYSCONFDIR}/sarg/fonts/ share/examples/sarg/fonts/FreeSans.ttf +@sample ${SYSCONFDIR}/sarg/fonts/FreeSans.ttf share/examples/sarg/images/ +@sample ${SYSCONFDIR}/sarg/images/ share/examples/sarg/images/datetime.png +@sample ${SYSCONFDIR}/sarg/images/datetime.png share/examples/sarg/images/graph.png +@sample ${SYSCONFDIR}/sarg/images/graph.png share/examples/sarg/images/sarg-squidguard-block.png +@sample ${SYSCONFDIR}/sarg/images/sarg-squidguard-block.png share/examples/sarg/images/sarg.png +@sample ${SYSCONFDIR}/sarg/images/sarg.png share/examples/sarg/languages/ +@sample ${SYSCONFDIR}/sarg/languages/ share/examples/sarg/languages/Bulgarian_windows1251 +@sample ${SYSCONFDIR}/sarg/languages/Bulgarian_windows1251 share/examples/sarg/languages/Catalan +@sample ${SYSCONFDIR}/sarg/languages/Catalan share/examples/sarg/languages/Czech +@sample ${SYSCONFDIR}/sarg/languages/Czech +share/examples/sarg/languages/Czech_UTF8 +@sample ${SYSCONFDIR}/sarg/languages/Czech_UTF8 share/examples/sarg/languages/Dutch +@sample ${SYSCONFDIR}/sarg/languages/Dutch share/examples/sarg/languages/English +@sample ${SYSCONFDIR}/sarg/languages/English share/examples/sarg/languages/French +@sample ${SYSCONFDIR}/sarg/languages/French share/examples/sarg/languages/German +@sample ${SYSCONFDIR}/sarg/languages/German share/examples/sarg/languages/Greek +@sample ${SYSCONFDIR}/sarg/languages/Greek share/examples/sarg/languages/Hungarian +@sample ${SYSCONFDIR}/sarg/languages/Hungarian share/examples/sarg/languages/Indonesian +@sample ${SYSCONFDIR}/sarg/languages/Indonesian share/examples/sarg/languages/Italian +@sample ${SYSCONFDIR}/sarg/languages/Italian share/examples/sarg/languages/Japanese +@sample ${SYSCONFDIR}/sarg/languages/Japanese share/examples/sarg/languages/Latvian +@sample ${SYSCONFDIR}/sarg/languages/Latvian share/examples/sarg/languages/Polish +@sample ${SYSCONFDIR}/sarg/languages/Polish share/examples/sarg/languages/Portuguese +@sample ${SYSCONFDIR}/sarg/languages/Portuguese share/examples/sarg/languages/Romanian +@sample ${SYSCONFDIR}/sarg/languages/Romanian share/examples/sarg/languages/Russian_UTF-8 +@sample ${SYSCONFDIR}/sarg/languages/Russian_UTF-8 share/examples/sarg/languages/Russian_koi8 +@sample ${SYSCONFDIR}/sarg/languages/Russian_koi8 share/examples/sarg/languages/Russian_windows1251 +@sample ${SYSCONFDIR}/sarg/languages/Russian_windows1251 share/examples/sarg/languages/Serbian +@sample ${SYSCONFDIR}/sarg/languages/Serbian share/examples/sarg/languages/Slovak +@sample ${SYSCONFDIR}/sarg/languages/Slovak share/examples/sarg/languages/Spanish +@sample ${SYSCONFDIR}/sarg/languages/Spanish share/examples/sarg/languages/Turkish +@sample ${SYSCONFDIR}/sarg/languages/Turkish share/examples/sarg/languages/Ukrainian_windows1251 +@sample ${SYSCONFDIR}/sarg/languages/Ukrainian_windows1251 share/examples/sarg/sarg-php/ share/examples/sarg/sarg-php/language.php share/examples/sarg/sarg-php/locale/