Hello community, here is the log from the commit of package webalizer for openSUSE:Factory checked in at Mon Mar 9 23:42:49 CET 2009. -------- --- webalizer/webalizer.changes 2008-07-28 19:09:26.000000000 +0200 +++ webalizer/webalizer.changes 2009-03-09 17:19:24.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 9 17:18:28 CET 2009 - anicka@suse.cz + +- update to 2.20 + * Added missing memory deallocation call in DNS lookup code. + * Minor fixes to configure script + * Added "YearTotals" config option for main index page totals + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webalizer-2.20-01-configuration.diff webalizer-2.20-01.diff webalizer-2.20-01-ia64.diff webalizer-2.20-01-maxagent.diff webalizer-2.20-01-src.tar.bz2 New: ---- webalizer-2.21-02-configuration.diff webalizer-2.21-02.diff webalizer-2.21-02-ia64.diff webalizer-2.21-02-maxagent.diff webalizer-2.21-02-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webalizer.spec ++++++ --- /var/tmp/diff_new_pack.I10449/_old 2009-03-09 23:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.I10449/_new 2009-03-09 23:36:12.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package webalizer (Version 2.20) +# spec file for package webalizer (Version 2.21) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,13 +20,13 @@ Name: webalizer BuildRequires: apache2-devel db-devel db1-devel gd-devel libapr-util1-devel libjpeg-devel libpng-devel mm pcre-devel xorg-x11 xorg-x11-devel -%define editlvl 01 +%define editlvl 02 License: LGPL v2.1 or later Group: Productivity/Networking/Web/Utilities Provides: webalize Obsoletes: webalize AutoReqProv: on -Version: 2.20 +Version: 2.21 Release: 1 Url: http://www.mrunix.net/webalizer/ Summary: A Web Server Log File Analysis Program @@ -95,6 +102,11 @@ /var/lib/webalizer %changelog +* Mon Mar 09 2009 anicka@suse.cz +- update to 2.20 + * Added missing memory deallocation call in DNS lookup code. + * Minor fixes to configure script + * Added "YearTotals" config option for main index page totals * Mon Jul 28 2008 anicka@suse.cz - update to 2.20 * Fixed problem with timing totals. @@ -232,7 +244,7 @@ - Remove stupid casts. * Wed May 23 2001 cihlar@suse.cz - fixed cast warnings on ia64 -* Thu Mar 22 2001 ro@suse.de +* Wed Mar 21 2001 ro@suse.de - added freetype2 to neededforbuild * Fri Feb 23 2001 ro@suse.de - changed neededforbuild <apache> to <apache apache-devel> ++++++ webalizer-2.20-01-configuration.diff -> webalizer-2.21-02-configuration.diff ++++++ --- webalizer/webalizer-2.20-01-configuration.diff 2006-03-16 14:47:29.000000000 +0100 +++ webalizer/webalizer-2.21-02-configuration.diff 2009-03-09 17:16:43.000000000 +0100 @@ -1,15 +1,15 @@ --- sample.conf +++ sample.conf -@@ -25,7 +25,7 @@ - # the log filename ends in '.gz' (ie: a gzip compressed file), it will - # be decompressed on the fly as it is being read. +@@ -26,7 +26,7 @@ + # (bzip2 compressed file), it will be decompressed on the fly as it + # is being read. -#LogFile /var/lib/httpd/logs/access_log +LogFile /var/log/apache2/access_log # LogType defines the log type being processed. Normally, the Webalizer # expects a CLF or Combined web server log as input. Using this option, -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ # should be a full path name, however relative ones might work as well. # If no output directory is specified, the current directory will be used. @@ -17,8 +17,8 @@ +OutputDir /srv/www/htdocs/webalizer # HistoryName allows you to specify the name of the history file produced - # by the Webalizer. The history file keeps the data for up to 12 months -@@ -126,7 +126,7 @@ + # by the Webalizer. The history file keeps the data for previous months, +@@ -168,7 +168,7 @@ # relative to the default output directory. See the DNS.README file for # additional information. @@ -27,12 +27,12 @@ # DNSChildren allows you to specify how many "children" processes are # run to perform DNS lookups to create or update the DNS cache file. -@@ -140,7 +140,7 @@ +@@ -182,7 +182,7 @@ # normal system operations. Reasonable values should be between 5 and # 20. See the DNS.README file for additional information. -#DNSChildren 0 +DNSChildren 10 - # HTMLPre defines HTML code to insert at the very beginning of the - # file. Default is the DOCTYPE line shown below. Max line length + # CacheIPs allows unresolved IP addresses to be cached in the DNS + # database. Normally, only resolved addresses are saved. At some ++++++ webalizer-2.20-01-configuration.diff -> webalizer-2.21-02.diff ++++++ --- webalizer/webalizer-2.20-01-configuration.diff 2006-03-16 14:47:29.000000000 +0100 +++ webalizer/webalizer-2.21-02.diff 2009-03-09 17:16:43.000000000 +0100 @@ -1,38 +1,23 @@ ---- sample.conf -+++ sample.conf -@@ -25,7 +25,7 @@ - # the log filename ends in '.gz' (ie: a gzip compressed file), it will - # be decompressed on the fly as it is being read. - --#LogFile /var/lib/httpd/logs/access_log -+LogFile /var/log/apache2/access_log - - # LogType defines the log type being processed. Normally, the Webalizer - # expects a CLF or Combined web server log as input. Using this option, -@@ -39,7 +39,7 @@ - # should be a full path name, however relative ones might work as well. - # If no output directory is specified, the current directory will be used. - --#OutputDir /var/lib/httpd/htdocs/usage -+OutputDir /srv/www/htdocs/webalizer - - # HistoryName allows you to specify the name of the history file produced - # by the Webalizer. The history file keeps the data for up to 12 months -@@ -126,7 +126,7 @@ - # relative to the default output directory. See the DNS.README file for - # additional information. - --#DNSCache dns_cache.db -+DNSCache dns_cache.db - - # DNSChildren allows you to specify how many "children" processes are - # run to perform DNS lookups to create or update the DNS cache file. -@@ -140,7 +140,7 @@ - # normal system operations. Reasonable values should be between 5 and - # 20. See the DNS.README file for additional information. - --#DNSChildren 0 -+DNSChildren 10 - - # HTMLPre defines HTML code to insert at the very beginning of the - # file. Default is the DOCTYPE line shown below. Max line length +--- Makefile.in ++++ Makefile.in +@@ -26,7 +26,7 @@ + GEODB = @GEODB_LOC@ + CC = @CC@ + CFLAGS = @CFLAGS@ @CPPFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -ljpeg -ldb -L/usr/X11R6/$(LIBNAME) -lX11 -lXpm + WCMGR_LIBS = @WCMGR_LIBS@ + DEFS = -DETCDIR=\"${ETCDIR}\" -DGEODB_LOC=\"${GEODB}\" @DEFS@ @OPTS@ + LDFLAGS = @LDFLAGS@ +--- configure.in ++++ configure.in +@@ -48,9 +48,6 @@ + [ --enable-static Build as static executable [[default=no]]], + LDFLAGS="--static ${LDFLAGS}") + +- if test "$IN_CFLAGS" = ""; then +- CFLAGS="-Wall -O2" +- fi + if test "$ac_cv_c_char_unsigned" = "yes"; then + CFLAGS="-fsigned-char ${CFLAGS}" + fi ++++++ webalizer-2.20-01-ia64.diff -> webalizer-2.21-02-ia64.diff ++++++ ++++++ webalizer-2.20-01-maxagent.diff -> webalizer-2.21-02-maxagent.diff ++++++ ++++++ webalizer-2.20-01-src.tar.bz2 -> webalizer-2.21-02-src.tar.bz2 ++++++ ++++ 3609 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/CHANGES new/webalizer-2.21-02/CHANGES --- old/webalizer-2.20-01/CHANGES 2008-07-01 22:35:37.000000000 +0200 +++ new/webalizer-2.21-02/CHANGES 2009-01-08 06:38:59.000000000 +0100 @@ -1,4 +1,16 @@ -------------------------------------------------------------------- +2.21-xx changes from 2.20-xx (brad@mrunix.net) +-------------------------------------------------------------------- + +Fixes: + o Added missing memory deallocation call in DNS lookup code. + + o Minor fixes to configure script + +Changes/Additions: + o Added "YearTotals" config option for main index page totals + +-------------------------------------------------------------------- 2.20-xx changes from 2.01-xx (brad@mrunix.net) -------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/configure.in new/webalizer-2.21-02/configure.in --- old/webalizer-2.20-01/configure.in 2008-07-05 20:43:19.000000000 +0200 +++ new/webalizer-2.21-02/configure.in 2009-01-13 05:45:04.000000000 +0100 @@ -1,6 +1,6 @@ dnl dnl The Webalizer - A web server log file analysis program -dnl Copyright (C) 1997-2008 by Bradford L. Barrett +dnl Copyright (C) 1997-2009 by Bradford L. Barrett dnl dnl configure.in template for The Webalizer Version 2.20 dnl Process this file with autoconf to produce a configure script. @@ -197,7 +197,7 @@ AC_ARG_ENABLE(bz2, [ --enable-bz2 Enable BZip2 decompression code [[default=no]]], - USE_BZIP="yes", USE_BZIP="no") + USE_BZIP="${enableval}", USE_BZIP="no") AC_ARG_WITH(bz2, [ --with-bz2=DIR Alternate location for bz2 header files], @@ -233,7 +233,7 @@ AC_ARG_ENABLE(geoip, [ --enable-geoip Enable GeoIP geolocation code [[default=no]]], - USE_GEOIP="yes", USE_GEOIP="no") + USE_GEOIP="${enableval}", USE_GEOIP="no") AC_ARG_WITH(geoip, [ --with-geoip=DIR Alternate location for libGeoIP header files], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/Copyright new/webalizer-2.21-02/Copyright --- old/webalizer-2.20-01/Copyright 2008-06-08 03:49:30.000000000 +0200 +++ new/webalizer-2.21-02/Copyright 2009-01-13 05:47:39.000000000 +0100 @@ -1,6 +1,6 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/dns_resolv.c new/webalizer-2.21-02/dns_resolv.c --- old/webalizer-2.20-01/dns_resolv.c 2008-07-01 07:51:40.000000000 +0200 +++ new/webalizer-2.21-02/dns_resolv.c 2009-01-13 05:42:46.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -277,6 +277,7 @@ put_dnode(log_rec.hostname, ares->ai_addr, ares->ai_addrlen, host_table); } + freeaddrinfo(ares); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/graphs.c new/webalizer-2.21-02/graphs.c --- old/webalizer-2.20-01/graphs.c 2008-06-16 08:27:11.000000000 +0200 +++ new/webalizer-2.21-02/graphs.c 2009-01-13 05:42:53.000000000 +0100 @@ -1,7 +1,7 @@ /* graphs.c - produces graphs used by the Webalizer - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/hashtab.c new/webalizer-2.21-02/hashtab.c --- old/webalizer-2.20-01/hashtab.c 2008-05-26 19:13:41.000000000 +0200 +++ new/webalizer-2.21-02/hashtab.c 2009-01-13 05:42:57.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/lang/webalizer_lang.swedish new/webalizer-2.21-02/lang/webalizer_lang.swedish --- old/webalizer-2.20-01/lang/webalizer_lang.swedish 2008-07-02 00:24:12.000000000 +0200 +++ new/webalizer-2.21-02/lang/webalizer_lang.swedish 2008-12-15 08:34:02.000000000 +0100 @@ -16,6 +16,7 @@ 01-Jun-2000 Modified/corrected by Joaquim Homrighausen (joho@webbplatsen.se) 26-Mar-2008 Updated to current IANA TLDs (brad@mrunix.net) 26-May-2008 Modified for level 2.2 support (brad@mrunix.net) + 14-nov-2008 Modifed for HTML-special chars (bengt@sm7jqb.se) Please fix all typos, or drop me a note and i will fix it and submit patches upstream. /daniel @@ -186,7 +187,7 @@ #endif #ifdef USE_GEOIP "-w = Enable GeoIP lookups" , - "-W namn = Use GeoIP database 'namn'" , + "-W namn = Anv�nd GeoIP databas 'namn'" , #endif NULL}; @@ -200,106 +201,121 @@ /* Webalizer. */ /* */ /***********************************************************************/ +/* Changed by Bengt Samuelsson <bengt@sm7jqb.se> */ +/* � = Å � = Ä � = Ö */ +/* � = å � = ä � = ö */ +/***********************************************************************/ /* header strings */ -char *msg_hhdr_sp = "Period f�r summering"; +char *msg_hhdr_sp = "Period för summering"; char *msg_hhdr_gt = "Skapad"; /* main index strings */ +/* For libgd is no HTML letters */ char *msg_main_us = "Summering f�r"; -/* char *msg_main_per= "Senaste 12 m�naderna"; */ -char *msg_main_per= "Summering m�nad f�r m�nad"; -char *msg_main_sum= "Summering m�nad f�r m�nad"; -char *msg_main_da = "Medel �ver dagen"; -char *msg_main_mt = "M�natliga summor"; + +/* char *msg_main_per= "Senaste 12 månaderna"; */ +char *msg_main_per= "Summering månad för månad"; +char *msg_main_sum= "Summering månad för månad"; +char *msg_main_da = "Medel över dagen"; +char *msg_main_mt = "Månatliga summor"; /* month HTML page strings */ +/* For libgd is no HTML letters */ char *msg_hmth_du = "Daglig anv�ndning f�r"; char *msg_hmth_hu = "Anv�ndning timme f�r timme f�r"; /* table header strings */ -char *msg_h_by = "By"; +/* For libgd is no HTML letters */ +char *msg_h_by = "av"; char *msg_h_avg = "Medel"; char *msg_h_max = "Max"; char *msg_h_total = "Summa"; char *msg_h_totals= "Summor"; char *msg_h_day = "Dag"; -char *msg_h_mth = "M�nad"; +// char *msg_h_mth = "Månad"; // HTML +char *msg_h_mth = "M�nad"; // GD char *msg_h_hour = "Timme"; -char *msg_h_hits = "Tr�ffar"; +// char *msg_h_hits = "Träffar"; // HTML +char *msg_h_hits = "Tr�ffar"; // GD char *msg_h_pages = "Sidor"; -char *msg_h_visits= "Bes�kare"; +// char *msg_h_visits= "Besö."; // HTML +char *msg_h_visits= "Bes�k."; // GD char *msg_h_files = "Filer"; -char *msg_h_sites = "Klientadresser"; +char *msg_h_sites = "Klient."; char *msg_h_xfer = "kilobyte"; -char *msg_h_hname = "V�rdnamn"; +// char *msg_h_hname = "Värdnamn"; // HTML +char *msg_h_hname = "V�rdnamn"; // GD char *msg_h_url = "URL"; char *msg_h_agent = "Klienttyp"; -char *msg_h_ref = "Refererare"; +char *msg_h_ref = "Referens"; char *msg_h_ctry = "Land"; -char *msg_h_search= "S�kstr�ng"; -char *msg_h_uname = "Username"; +// char *msg_h_search= "Söksträng"; // HTML +char *msg_h_search= "S�kstr�ng"; // GD +// char *msg_h_uname = "Användarnamn"; // HTML +char *msg_h_uname = "Anv�ndarnamn"; // GD /* links along top of page */ char *msg_hlnk_ds = "Daglig statistik"; -char *msg_hlnk_hs = "Statistik timme f�r timme"; +char *msg_hlnk_hs = "Statistik timme för timme"; char *msg_hlnk_u = "URLer"; char *msg_hlnk_s = "Klientadresser"; char *msg_hlnk_a = "Klienttyper"; -char *msg_hlnk_c = "L�nder"; -char *msg_hlnk_r = "H�nvisare"; -char *msg_hlnk_en = "Ing�ng"; -char *msg_hlnk_ex = "Utg�ng"; -char *msg_hlnk_sr = "S�k"; -char *msg_hlnk_i = "Users"; +char *msg_hlnk_c = "Länder"; +char *msg_hlnk_r = "Hänvisare"; +char *msg_hlnk_en = "Ingång"; +char *msg_hlnk_ex = "Utgång"; +char *msg_hlnk_sr = "Sök"; +char *msg_hlnk_i = "Användare"; /* monthly total table */ -char *msg_mtot_ms = "M�natlig statistik f�r"; -char *msg_mtot_th = "Totalt antal tr�ffar"; +char *msg_mtot_ms = "Månatlig statistik för"; +char *msg_mtot_th = "Totalt antal träffar"; char *msg_mtot_tf = "Totalt antal filer"; char *msg_mtot_tx = "Totalt antal kilobytes"; char *msg_mtot_us = "Totalt antal unika klientadresser"; -char *msg_mtot_ur = "Totalt antal unika h�nvisningar"; +char *msg_mtot_ur = "Totalt antal unika hänvisningar"; char *msg_mtot_ua = "Totalt antal unika klienttyper"; char *msg_mtot_uu = "Totalt antal unika URLer"; -char *msg_mtot_ui = "Totalt antal unika anv�ndarnamn"; -char *msg_mtot_mhd= "Tr�ffar per dag"; -char *msg_mtot_mhh= "Tr�ffar per timme"; +char *msg_mtot_ui = "Totalt antal unika användarnamn"; +char *msg_mtot_mhd= "Träffar per dag"; +char *msg_mtot_mhh= "Träffar per timme"; char *msg_mtot_mfd= "Filer per dag"; char *msg_mtot_mpd= "Sidor per dag"; char *msg_mtot_msd= "Klientadresser per dag"; -char *msg_mtot_mvd= "Bes�k per dag"; +char *msg_mtot_mvd= "Besök per dag"; char *msg_mtot_mkd= "Kilobytes per dag"; -char *msg_mtot_rc = "Tr�ffar sorterade efter svarskod"; +char *msg_mtot_rc = "Träffar sorterade efter svarskod"; /* daily total table */ -char *msg_dtot_ds = "Daglig statistik f�r"; +char *msg_dtot_ds = "Daglig statistik för"; /* hourly total table */ -char *msg_htot_hs = "Statistik timme f�r timme f�r"; +char *msg_htot_hs = "Statistik timme för timme för"; /* country pie chart */ +/* For libgd is no HTML letters */ char *msg_ctry_use= "Statsistik sorterat efter land f�r"; /* top tables */ /* Formatted as "Top xxx of xxx Total something" */ char *msg_top_top = "Vanligaste"; -char *msg_top_of = "utav totalt"; +char *msg_top_of = "av totalt"; char *msg_top_s = "klientursprung"; char *msg_top_u = "URLer"; -char *msg_top_r = "h�nvisnigar"; +char *msg_top_r = "hänvisnigar"; char *msg_top_a = "klienttyper"; -char *msg_top_c = "l�nder"; -char *msg_top_en = "totalt ing�ngssidor"; -char *msg_top_ex = "totalt utg�ngssidor"; -char *msg_top_sr = "totalt s�kstr�ngar"; -char *msg_top_i = "totalt anv�ndarnamn"; -char *msg_v_sites = "View All Sites"; -char *msg_v_urls = "View All URLs"; -char *msg_v_refs = "View All Referrers"; -char *msg_v_agents= "View All User Agents"; -char *msg_v_search= "View All Search Strings"; -char *msg_v_users = "View All Usernames"; +char *msg_top_c = "länder"; +char *msg_top_en = "totalt ingångssidor"; +char *msg_top_ex = "totalt utgångssidor"; +char *msg_top_sr = "totalt söksträngar"; +char *msg_top_i = "totalt användarnamn"; +char *msg_v_sites = "Visa Alla Sidor"; +char *msg_v_urls = "Visa Alla URLer"; +char *msg_v_refs = "Visa Alla Referenser"; +char *msg_v_agents= "Visa Alla Användar Agenter"; +char *msg_v_search= "Visa Alla Sök Strängar"; +char *msg_v_users = "Visa Alla Användarnamn"; /* short month names MUST BE 3 CHARS in size... pad if needed*/ char *s_month[12]={ "Jan", "Feb", "Mar", @@ -315,331 +331,333 @@ /* response code descriptions... order IS important! */ struct response_code response[] = { { "Oidentifierad svarskod", 0 }, - { "Kod 100 - Forts�tt", 0 }, + { "Kod 100 - Fortsätt", 0 }, { "Kod 101 - Byter protokoll", 0 }, { "Kod 200 - OK", 0 }, { "Kod 201 - Skapad", 0 }, { "Kod 202 - Accepterad", 0 }, { "Kod 203 - Icke auktoritativ information", 0 }, - { "Kod 204 - Inget inneh�ll", 0 }, - { "Kod 205 - �terst�ll inneh�ll", 0 }, - { "Kod 206 - Partiellt inneh�ll", 0 }, + { "Kod 204 - Inget innehåll", 0 }, + { "Kod 205 - återställ innehåll", 0 }, + { "Kod 206 - Partiellt innehåll", 0 }, { "Kod 300 - Multipla val", 0 }, { "Kod 301 - Permanent flyttad", 0 }, - { "Kod 302 - Hittad", 0 }, + { "Kod 302 - Funnen", 0 }, { "Kod 303 - Se annan", 0 }, - { "Kod 304 - Of�r�ndrad", 0 }, - { "Kod 305 - Anv�nd proxy", 0 }, - { "Kod 307 - Tillf�lligt flyttad", 0 }, - { "Kod 400 - Felaktig f�rfr�gan", 0 }, + { "Kod 304 - Inte ändrad", 0 }, + { "Kod 305 - Använd proxy", 0 }, + { "Kod 307 - Tillfälligt flyttad", 0 }, + { "Kod 400 - Felaktig förfrågan", 0 }, { "Kod 401 - Icke auktoriserad", 0 }, - { "Kod 402 - Betalning kr�vs", 0 }, - { "Kod 403 - F�rbjuden", 0 }, + { "Kod 402 - Betalning krävs", 0 }, + { "Kod 403 - Förbjuden", 0 }, { "Kod 404 - Hittades ej", 0 }, - { "Kod 405 - Otill�ten metod", 0 }, + { "Kod 405 - Otillåten metod", 0 }, { "Kod 406 - Icke accepterbar", 0 }, - { "Kod 407 - Verifiering fr�n proxy kr�vs", 0 }, - { "Kod 408 - F�rfr�gan gick �ver tiden", 0 }, + { "Kod 407 - Verifiering från proxy krävs", 0 }, + { "Kod 408 - Förfrågan gick över tiden", 0 }, { "Kod 409 - Konflikt", 0 }, { "Kod 410 - Borta", 0 }, - { "Kod 411 - Beh�ver l�ngd", 0 }, + { "Kod 411 - Behöver längd", 0 }, { "Kod 412 - Misslyckades med villkor", 0 }, - { "Kod 413 - F�rfr�geenhet f�r stor", 0 }, - { "Kod 414 - F�rfr�ge-URI f�r l�ng", 0 }, - { "Kod 415 - Ej st�dd medietyp", 0 }, - { "Kod 416 - Efterfr�gat intervall ej m�jligt",0 }, + { "Kod 413 - Förfrågeenhet för stor", 0 }, + { "Kod 414 - Förfråge-URI för lång", 0 }, + { "Kod 415 - Ej stödd medietyp", 0 }, + { "Kod 416 - Efterfrågat intervall ej möjligt",0 }, { "Kod 417 - Expectation Failed", 0 }, { "Kod 500 - Internt serverfel", 0 }, { "Kod 501 - Ej implementerad", 0 }, { "Kod 502 - Felaktig gateway", 0 }, - { "Kod 503 - Tj�nsten otillg�nglig", 0 }, - { "Kod 504 - Gateway gick �ver tiden", 0 }, - { "Kod 505 - denna HTTP-version st�ds icke", 0 } }; + { "Kod 503 - Tjänsten otillgänglig", 0 }, + { "Kod 504 - Gateway gick över tiden", 0 }, + { "Kod 505 - denna HTTP-version stöds icke",0 } +}; -char *msg_title = "Statistik �ver anv�ndning f�r"; +char *msg_title = "Statistik över användning för"; char *msg_h_other = "Annan"; /* Country codes (previously in ctry.h header file) */ - +/* For libgd is no HTML letters */ struct country_code ctry[] = { -{ 0, "Ej uppslagen/ok�nd", 0,0,0 }, -{ IDX_3C('c','o','m'), "Kommersiell (com)", 0,0,0 }, -{ IDX_3C('e','d','u'), "Utbildning (edu)", 0,0,0 }, -{ IDX_3C('g','o','v'), "USA, staten (gov)", 0,0,0 }, -{ IDX_3C('i','n','t'), "Interationell (int)", 0,0,0 }, -{ IDX_3C('m','i','l'), "USA, milit�r (mil)", 0,0,0 }, -{ IDX_3C('n','e','t'), "N�tverk (net)", 0,0,0 }, -{ IDX_3C('o','r','g'), "Ideell organisation (org)", 0,0,0 }, -{ IDX_3C('b','i','z'), "Generic Business (biz)", 0,0,0 }, -{ IDX_3C('c','a','t'), "Catalan Community (cat)", 0,0,0 }, -{ IDX_3C('p','r','o'), "Professional (pro)", 0,0,0 }, -{ IDX_3C('t','e','l'), "Ind. Contact Data (tel)", 0,0,0 }, -{ IDX_4C('a','e','r','o'),"Air Transport Industry (aero)", 0,0,0 }, -{ IDX_4C('a','s','i','a'),"Asia Pacific Community (asia)", 0,0,0 }, -{ IDX_4C('c','o','o','p'),"Cooperative Association (coop)", 0,0,0 }, -{ IDX_4C('i','n','f','o'),"Generic TLD (info)", 0,0,0 }, -{ IDX_4C('j','o','b','s'),"Human Resources (jobs)", 0,0,0 }, -{ IDX_4C('m','o','b','i'),"Generic Mobile TLD (mobi)", 0,0,0 }, -{ IDX_4C('n','a','m','e'),"Individual (name)", 0,0,0 }, -{ IDX_4C('a','r','p','a'),"Address Routing (arpa)", 0,0,0 }, -{ IDX_4C('n','a','t','o'),"Nato (nato)", 0,0,0 }, -{ IDX_6C('m','u','s','e','u','m'), "Museums (museum)", 0,0,0 }, -{ IDX_6C('t','r','a','v','e','l'), "Travel Ind. (travel)", 0,0,0 }, -{ IDX_2C('a','c'), "Ascension Island", 0,0,0 }, -{ IDX_2C('a','d'), "Andorra", 0,0,0 }, -{ IDX_2C('a','e'), "F�renade arabemiraten", 0,0,0 }, -{ IDX_2C('a','f'), "Afganistan", 0,0,0 }, -{ IDX_2C('a','g'), "Antigua and Barbuda", 0,0,0 }, -{ IDX_2C('a','i'), "Anguilla", 0,0,0 }, -{ IDX_2C('a','l'), "Albanien", 0,0,0 }, -{ IDX_2C('a','m'), "Armenien", 0,0,0 }, -{ IDX_2C('a','n'), "Nederl�nderna", 0,0,0 }, -{ IDX_2C('a','o'), "Angola", 0,0,0 }, -{ IDX_2C('a','q'), "Antarktis", 0,0,0 }, -{ IDX_2C('a','r'), "Argentina", 0,0,0 }, -{ IDX_2C('a','s'), "Amerikanska Samoa", 0,0,0 }, -{ IDX_2C('a','t'), "�sterrike", 0,0,0 }, -{ IDX_2C('a','u'), "Australien", 0,0,0 }, -{ IDX_2C('a','w'), "Aruba", 0,0,0 }, -{ IDX_2C('a','x'), "Aland Islands", 0,0,0 }, -{ IDX_2C('a','z'), "Azerbadjan", 0,0,0 }, -{ IDX_2C('b','a'), "Bosnien Herzegovina", 0,0,0 }, -{ IDX_2C('b','b'), "Barbados", 0,0,0 }, -{ IDX_2C('b','d'), "Bangladesh", 0,0,0 }, -{ IDX_2C('b','e'), "Belgien", 0,0,0 }, -{ IDX_2C('b','f'), "Burkina Faso", 0,0,0 }, -{ IDX_2C('b','g'), "Bulgarien", 0,0,0 }, -{ IDX_2C('b','h'), "Bahrain", 0,0,0 }, -{ IDX_2C('b','i'), "Burundi", 0,0,0 }, -{ IDX_2C('b','j'), "Benin", 0,0,0 }, -{ IDX_2C('b','l'), "Saint Barthelemy", 0,0,0 }, -{ IDX_2C('b','m'), "Bermuda", 0,0,0 }, -{ IDX_2C('b','n'), "Brunei Darussalam", 0,0,0 }, -{ IDX_2C('b','o'), "Bolivia", 0,0,0 }, -{ IDX_2C('b','r'), "Brazilien", 0,0,0 }, -{ IDX_2C('b','s'), "Bahamas", 0,0,0 }, -{ IDX_2C('b','t'), "Bhutan", 0,0,0 }, -{ IDX_2C('b','v'), "Bouvet Island", 0,0,0 }, -{ IDX_2C('b','w'), "Botswana", 0,0,0 }, -{ IDX_2C('b','y'), "Belarus", 0,0,0 }, -{ IDX_2C('b','z'), "Belize", 0,0,0 }, -{ IDX_2C('c','a'), "Canada", 0,0,0 }, -{ IDX_2C('c','c'), "Cocos�arna", 0,0,0 }, -{ IDX_2C('c','d'), "Congo, Democratic Republic", 0,0,0 }, -{ IDX_2C('c','f'), "Centralafrikanska republiken", 0,0,0 }, -{ IDX_2C('c','g'), "Congo", 0,0,0 }, -{ IDX_2C('c','h'), "Schweiz", 0,0,0 }, -{ IDX_2C('c','i'), "Elfenbenskusten", 0,0,0 }, -{ IDX_2C('c','k'), "Cook Islands", 0,0,0 }, -{ IDX_2C('c','l'), "Chile", 0,0,0 }, -{ IDX_2C('c','m'), "Kamerun", 0,0,0 }, -{ IDX_2C('c','n'), "Kina", 0,0,0 }, -{ IDX_2C('c','o'), "Colombia", 0,0,0 }, -{ IDX_2C('c','r'), "Costa Rica", 0,0,0 }, -{ IDX_2C('c','u'), "Kuba", 0,0,0 }, -{ IDX_2C('c','v'), "Cape Verde", 0,0,0 }, -{ IDX_2C('c','x'), "Jul�n", 0,0,0 }, -{ IDX_2C('c','y'), "Cypern", 0,0,0 }, -{ IDX_2C('c','z'), "Tjeckien", 0,0,0 }, -{ IDX_2C('d','e'), "Tyskland", 0,0,0 }, -{ IDX_2C('d','j'), "Djibouti", 0,0,0 }, -{ IDX_2C('d','k'), "Danmark", 0,0,0 }, -{ IDX_2C('d','m'), "Dominica", 0,0,0 }, -{ IDX_2C('d','o'), "Dominikanska Republiken", 0,0,0 }, -{ IDX_2C('d','z'), "Algeriet", 0,0,0 }, -{ IDX_2C('e','c'), "Ekvador", 0,0,0 }, -{ IDX_2C('e','e'), "Estland", 0,0,0 }, -{ IDX_2C('e','g'), "Egypten", 0,0,0 }, -{ IDX_2C('e','h'), "V�stsahara", 0,0,0 }, -{ IDX_2C('e','r'), "Eritrea", 0,0,0 }, -{ IDX_2C('e','s'), "Spanien", 0,0,0 }, -{ IDX_2C('e','t'), "Etiopien", 0,0,0 }, -{ IDX_2C('e','u'), "European Union", 0,0,0 }, -{ IDX_2C('f','i'), "Finland", 0,0,0 }, -{ IDX_2C('f','j'), "Fiji", 0,0,0 }, -{ IDX_2C('f','k'), "Falklands�arna", 0,0,0 }, -{ IDX_2C('f','m'), "Mikronesien", 0,0,0 }, -{ IDX_2C('f','o'), "Farao�arna", 0,0,0 }, -{ IDX_2C('f','r'), "Frankrike", 0,0,0 }, -{ IDX_2C('g','a'), "Gabon", 0,0,0 }, -{ IDX_2C('g','b'), "England", 0,0,0 }, -{ IDX_2C('g','d'), "Grenada", 0,0,0 }, -{ IDX_2C('g','e'), "Georgien", 0,0,0 }, -{ IDX_2C('g','f'), "Franska Guiana", 0,0,0 }, -{ IDX_2C('g','g'), "Guernsey", 0,0,0 }, -{ IDX_2C('g','h'), "Ghana", 0,0,0 }, -{ IDX_2C('g','i'), "Gibraltar", 0,0,0 }, -{ IDX_2C('g','l'), "Gr�nland", 0,0,0 }, -{ IDX_2C('g','m'), "Gambia", 0,0,0 }, -{ IDX_2C('g','n'), "Guinea", 0,0,0 }, -{ IDX_2C('g','p'), "Guadeloupe", 0,0,0 }, -{ IDX_2C('g','q'), "Ekvatorialguinea", 0,0,0 }, -{ IDX_2C('g','r'), "Grekland", 0,0,0 }, -{ IDX_2C('g','s'), "S. Georgia och S. Sandwich�arna", 0,0,0 }, -{ IDX_2C('g','t'), "Guatemala", 0,0,0 }, -{ IDX_2C('g','u'), "Guam", 0,0,0 }, -{ IDX_2C('g','w'), "Guinea-Bissau", 0,0,0 }, -{ IDX_2C('g','y'), "Guyana", 0,0,0 }, -{ IDX_2C('h','k'), "Hong Kong", 0,0,0 }, -{ IDX_2C('h','m'), "Heard- och McDonald�arna", 0,0,0 }, -{ IDX_2C('h','n'), "Honduras", 0,0,0 }, -{ IDX_2C('h','r'), "Kroatien", 0,0,0 }, -{ IDX_2C('h','t'), "Haiti", 0,0,0 }, -{ IDX_2C('h','u'), "Ungern" , 0,0,0 }, -{ IDX_2C('i','d'), "Indonesien", 0,0,0 }, -{ IDX_2C('i','e'), "Irland", 0,0,0 }, -{ IDX_2C('i','l'), "Israel", 0,0,0 }, -{ IDX_2C('i','m'), "Isle of Man", 0,0,0 }, -{ IDX_2C('i','n'), "Indien", 0,0,0 }, -{ IDX_2C('i','o'), "British Indian Ocean Territory", 0,0,0 }, -{ IDX_2C('i','q'), "Irak", 0,0,0 }, -{ IDX_2C('i','r'), "Iran", 0,0,0 }, -{ IDX_2C('i','s'), "Island", 0,0,0 }, -{ IDX_2C('i','t'), "Italien", 0,0,0 }, -{ IDX_2C('j','e'), "Jersey", 0,0,0 }, -{ IDX_2C('j','m'), "Jamaica", 0,0,0 }, -{ IDX_2C('j','o'), "Jordanien", 0,0,0 }, -{ IDX_2C('j','p'), "Japan", 0,0,0 }, -{ IDX_2C('k','e'), "Kenya", 0,0,0 }, -{ IDX_2C('k','g'), "Kirgistan", 0,0,0 }, -{ IDX_2C('k','h'), "Kambodja", 0,0,0 }, -{ IDX_2C('k','i'), "Kiribati", 0,0,0 }, -{ IDX_2C('k','m'), "Comoros", 0,0,0 }, -{ IDX_2C('k','n'), "Saint Kitts och Nevis", 0,0,0 }, -{ IDX_2C('k','p'), "Nordkorea", 0,0,0 }, -{ IDX_2C('k','r'), "Sydkorea", 0,0,0 }, -{ IDX_2C('k','w'), "Kuwait", 0,0,0 }, -{ IDX_2C('k','y'), "Cayman�arna", 0,0,0 }, -{ IDX_2C('k','z'), "Kazachstan", 0,0,0 }, -{ IDX_2C('l','a'), "Laos", 0,0,0 }, -{ IDX_2C('l','b'), "Libanon", 0,0,0 }, -{ IDX_2C('l','c'), "Saint Lucia", 0,0,0 }, -{ IDX_2C('l','i'), "Liechtenstein", 0,0,0 }, -{ IDX_2C('l','k'), "Sri Lanka", 0,0,0 }, -{ IDX_2C('l','r'), "Liberia", 0,0,0 }, -{ IDX_2C('l','s'), "Lesotho", 0,0,0 }, -{ IDX_2C('l','t'), "Litauen", 0,0,0 }, -{ IDX_2C('l','u'), "Luxembourg", 0,0,0 }, -{ IDX_2C('l','v'), "Lettland", 0,0,0 }, -{ IDX_2C('l','y'), "Libyen", 0,0,0 }, -{ IDX_2C('m','a'), "Marocco", 0,0,0 }, -{ IDX_2C('m','c'), "Monaco", 0,0,0 }, -{ IDX_2C('m','d'), "Moldavien", 0,0,0 }, -{ IDX_2C('m','e'), "Montenegro", 0,0,0 }, -{ IDX_2C('m','f'), "Saint Martin (French part)", 0,0,0 }, -{ IDX_2C('m','g'), "Malagasy", 0,0,0 }, -{ IDX_2C('m','h'), "Marshall�arna", 0,0,0 }, -{ IDX_2C('m','k'), "Makedonien", 0,0,0 }, -{ IDX_2C('m','l'), "Mali", 0,0,0 }, -{ IDX_2C('m','m'), "Myanmar", 0,0,0 }, -{ IDX_2C('m','n'), "Mongoliet", 0,0,0 }, -{ IDX_2C('m','o'), "Macau", 0,0,0 }, -{ IDX_2C('m','p'), "Norra Mariana�arna", 0,0,0 }, -{ IDX_2C('m','q'), "Martinique", 0,0,0 }, -{ IDX_2C('m','r'), "Mauritania", 0,0,0 }, -{ IDX_2C('m','s'), "Montserrat", 0,0,0 }, -{ IDX_2C('m','t'), "Malta", 0,0,0 }, -{ IDX_2C('m','u'), "Mauritius", 0,0,0 }, -{ IDX_2C('m','v'), "Maldiverna", 0,0,0 }, -{ IDX_2C('m','w'), "Malawi", 0,0,0 }, -{ IDX_2C('m','x'), "Mexico", 0,0,0 }, -{ IDX_2C('m','y'), "Malaysia", 0,0,0 }, -{ IDX_2C('m','z'), "Mo�ambique", 0,0,0 }, -{ IDX_2C('n','a'), "Namibia", 0,0,0 }, -{ IDX_2C('n','c'), "Nya Caledonien", 0,0,0 }, -{ IDX_2C('n','e'), "Niger", 0,0,0 }, -{ IDX_2C('n','f'), "Norfolk Island", 0,0,0 }, -{ IDX_2C('n','g'), "Nigeria", 0,0,0 }, -{ IDX_2C('n','i'), "Nicaragua", 0,0,0 }, -{ IDX_2C('n','l'), "Nederl�nderna", 0,0,0 }, -{ IDX_2C('n','o'), "Norge", 0,0,0 }, -{ IDX_2C('n','p'), "Nepal", 0,0,0 }, -{ IDX_2C('n','r'), "Nauru", 0,0,0 }, -{ IDX_2C('n','u'), "Niue", 0,0,0 }, -{ IDX_2C('n','z'), "Nya Zeeland", 0,0,0 }, -{ IDX_2C('o','m'), "Oman", 0,0,0 }, -{ IDX_2C('p','a'), "Panama", 0,0,0 }, -{ IDX_2C('p','e'), "Peru", 0,0,0 }, -{ IDX_2C('p','f'), "Franska Polynesien", 0,0,0 }, -{ IDX_2C('p','g'), "Papua Nya Guinea", 0,0,0 }, -{ IDX_2C('p','h'), "Filippinerna", 0,0,0 }, -{ IDX_2C('p','k'), "Pakistan", 0,0,0 }, -{ IDX_2C('p','l'), "Polen", 0,0,0 }, -{ IDX_2C('p','m'), "St. Pierre och Miquelon", 0,0,0 }, -{ IDX_2C('p','n'), "Pitcairn", 0,0,0 }, -{ IDX_2C('p','r'), "Puerto Rico", 0,0,0 }, -{ IDX_2C('p','s'), "Palestinian Territory, Occupied", 0,0,0 }, -{ IDX_2C('p','t'), "Portugal", 0,0,0 }, -{ IDX_2C('p','w'), "Palau", 0,0,0 }, -{ IDX_2C('p','y'), "Paraguay", 0,0,0 }, -{ IDX_2C('q','a'), "Qatar", 0,0,0 }, -{ IDX_2C('r','e'), "Reunion", 0,0,0 }, -{ IDX_2C('r','o'), "Rum�nien", 0,0,0 }, -{ IDX_2C('r','s'), "Serbia", 0,0,0 }, -{ IDX_2C('r','u'), "Ryssland", 0,0,0 }, -{ IDX_2C('r','w'), "Rwanda", 0,0,0 }, -{ IDX_2C('s','a'), "Saudiarabien", 0,0,0 }, -{ IDX_2C('s','b'), "Solomon�arna", 0,0,0 }, -{ IDX_2C('s','c'), "Seychelles", 0,0,0 }, -{ IDX_2C('s','d'), "Sudan", 0,0,0 }, -{ IDX_2C('s','e'), "Sverige", 0,0,0 }, -{ IDX_2C('s','g'), "Singapore", 0,0,0 }, -{ IDX_2C('s','h'), "St. Helena", 0,0,0 }, -{ IDX_2C('s','i'), "Slovenien", 0,0,0 }, -{ IDX_2C('s','j'), "Svalbard och Jan Mayen-�arna", 0,0,0 }, -{ IDX_2C('s','k'), "Slovakien", 0,0,0 }, -{ IDX_2C('s','l'), "Sierra Leone", 0,0,0 }, -{ IDX_2C('s','m'), "San Marino", 0,0,0 }, -{ IDX_2C('s','n'), "Senegal", 0,0,0 }, -{ IDX_2C('s','o'), "Somalia", 0,0,0 }, -{ IDX_2C('s','r'), "Surinam", 0,0,0 }, -{ IDX_2C('s','t'), "Sao Tome och Principe", 0,0,0 }, -{ IDX_2C('s','u'), "Sovjet (f�re detta)", 0,0,0 }, -{ IDX_2C('s','v'), "El Salvador", 0,0,0 }, -{ IDX_2C('s','y'), "Syrien", 0,0,0 }, -{ IDX_2C('s','z'), "Swaziland", 0,0,0 }, -{ IDX_2C('t','c'), "Turks och Caicos�arna", 0,0,0 }, -{ IDX_2C('t','d'), "Chad", 0,0,0 }, -{ IDX_2C('t','f'), "S�dra Franska territorierna", 0,0,0 }, -{ IDX_2C('t','g'), "Togo", 0,0,0 }, -{ IDX_2C('t','h'), "Thailand", 0,0,0 }, -{ IDX_2C('t','j'), "Tajikistan", 0,0,0 }, -{ IDX_2C('t','k'), "Tokelau", 0,0,0 }, -{ IDX_2C('t','l'), "Timor-Leste", 0,0,0 }, -{ IDX_2C('t','m'), "Turkmenistan", 0,0,0 }, -{ IDX_2C('t','n'), "Tunisien", 0,0,0 }, -{ IDX_2C('t','o'), "Tonga", 0,0,0 }, -{ IDX_2C('t','p'), "�sttimor", 0,0,0 }, -{ IDX_2C('t','r'), "Turkiet", 0,0,0 }, -{ IDX_2C('t','t'), "Trinidad och Tobago", 0,0,0 }, -{ IDX_2C('t','v'), "Tuvalu", 0,0,0 }, -{ IDX_2C('t','w'), "Taiwan", 0,0,0 }, -{ IDX_2C('t','z'), "Tanzania", 0,0,0 }, -{ IDX_2C('u','a'), "Ukraina", 0,0,0 }, -{ IDX_2C('u','g'), "Uganda", 0,0,0 }, -{ IDX_2C('u','k'), "Storbritanien", 0,0,0 }, -{ IDX_2C('u','m'), "US Minor Outlying Islands", 0,0,0 }, -{ IDX_2C('u','s'), "USA", 0,0,0 }, -{ IDX_2C('u','y'), "Uruguay", 0,0,0 }, -{ IDX_2C('u','z'), "Uzbekistan", 0,0,0 }, -{ IDX_2C('v','a'), "Vatikanstaten", 0,0,0 }, -{ IDX_2C('v','c'), "Saint Vincent och Grenadinerna", 0,0,0 }, -{ IDX_2C('v','e'), "Venezuela", 0,0,0 }, -{ IDX_2C('v','g'), "Virgin-�arna (Brittiska)", 0,0,0 }, -{ IDX_2C('v','i'), "Virgin-�arna (Amerikanska)", 0,0,0 }, -{ IDX_2C('v','n'), "Vietnam", 0,0,0 }, -{ IDX_2C('v','u'), "Vanuatu", 0,0,0 }, -{ IDX_2C('w','f'), "Wallis och Futuna�arna", 0,0,0 }, -{ IDX_2C('w','s'), "Samoa", 0,0,0 }, -{ IDX_2C('y','e'), "Yemen", 0,0,0 }, -{ IDX_2C('y','t'), "Mayotte", 0,0,0 }, -{ IDX_2C('y','u'), "Jugoslavien", 0,0,0 }, -{ IDX_2C('z','a'), "Sydafrika", 0,0,0 }, -{ IDX_2C('z','m'), "Zambia", 0,0,0 }, -{ IDX_2C('z','w'), "Zimbabwe", 0,0,0 }, -{ IDX_2C('a','1'), "Anonymous Proxy", 0,0,0 }, -{ IDX_2C('a','2'), "Satellite Provider", 0,0,0 }, -{ IDX_2C('o','1'), "Other", 0,0,0 }, -{ IDX_2C('a','p'), "Asia/Pacific Region", 0,0,0 }, -{ IDX_3C('l','a','n'), "Local Network (lan)", 0,0,0 }, -{ 0, NULL, 0,0,0 }}; +{ 0, "Ej uppslagen/ok�nd",0,0,0 }, +{ IDX_3C('c','o','m'), "Kommersiell (com)",0,0,0 }, +{ IDX_3C('e','d','u'), "Utbildning (edu)",0,0,0 }, +{ IDX_3C('g','o','v'), "USA, staten (gov)",0,0,0 }, +{ IDX_3C('i','n','t'), "Interationell (int)",0,0,0 }, +{ IDX_3C('m','i','l'), "USA, milit�r (mil)",0,0,0 }, +{ IDX_3C('n','e','t'), "N�tverk (net)",0,0,0 }, +{ IDX_3C('o','r','g'), "Ideell organisation (org)",0,0,0 }, +{ IDX_3C('b','i','z'), "Generic Business (biz)",0,0,0 }, +{ IDX_3C('c','a','t'), "Catalan Community (cat)",0,0,0 }, +{ IDX_3C('p','r','o'), "Professional (pro)",0,0,0 }, +{ IDX_3C('t','e','l'), "Ind. Contact Data (tel)",0,0,0 }, +{ IDX_4C('a','e','r','o'), "Air Transport Industry (aero)",0,0,0 }, +{ IDX_4C('a','s','i','a'), "Asia Pacific Community (asia)",0,0,0 }, +{ IDX_4C('c','o','o','p'), "Cooperative Association (coop)",0,0,0 }, +{ IDX_4C('i','n','f','o'), "Generic TLD (info)",0,0,0 }, +{ IDX_4C('j','o','b','s'), "Human Resources (jobs)",0,0,0 }, +{ IDX_4C('m','o','b','i'), "Generic Mobile TLD (mobi)",0,0,0 }, +{ IDX_4C('n','a','m','e'), "Individual (name)",0,0,0 }, +{ IDX_4C('a','r','p','a'), "Address Routing (arpa)",0,0,0 }, +{ IDX_4C('n','a','t','o'), "Nato (nato)", 0,0,0 }, +{ IDX_6C('m','u','s','e','u','m'),"Museums (museum)", 0,0,0 }, +{ IDX_6C('t','r','a','v','e','l'),"Travel Ind. (travel)",0,0,0 }, +{ IDX_2C('a','c'), "Ascension Island",0,0,0 }, +{ IDX_2C('a','d'), "Andorra",0,0,0 }, +{ IDX_2C('a','e'), "F�renade arabemiraten",0,0,0 }, +{ IDX_2C('a','f'), "Afganistan", 0,0,0 }, +{ IDX_2C('a','g'), "Antigua and Barbuda",0,0,0 }, +{ IDX_2C('a','i'), "Anguilla",0,0,0 }, +{ IDX_2C('a','l'), "Albanien",0,0,0 }, +{ IDX_2C('a','m'), "Armenien",0,0,0 }, +{ IDX_2C('a','n'), "Nederl�nderna",0,0,0 }, +{ IDX_2C('a','o'), "Angola",0,0,0 }, +{ IDX_2C('a','q'), "Antarktis",0,0,0 }, +{ IDX_2C('a','r'), "Argentina",0,0,0 }, +{ IDX_2C('a','s'), "Amerikanska Samoa",0,0,0 }, +{ IDX_2C('a','t'), "�sterrike",0,0,0 }, +{ IDX_2C('a','u'), "Australien",0,0,0 }, +{ IDX_2C('a','w'), "Aruba",0,0,0 }, +{ IDX_2C('a','x'), "Aland Islands",0,0,0 }, +{ IDX_2C('a','z'), "Azerbadjan",0,0,0 }, +{ IDX_2C('b','a'), "Bosnien Herzegovina",0,0,0 }, +{ IDX_2C('b','b'), "Barbados",0,0,0 }, +{ IDX_2C('b','d'), "Bangladesh",0,0,0 }, +{ IDX_2C('b','e'), "Belgien",0,0,0 }, +{ IDX_2C('b','f'), "Burkina Faso",0,0,0 }, +{ IDX_2C('b','g'), "Bulgarien",0,0,0 }, +{ IDX_2C('b','h'), "Bahrain",0,0,0 }, +{ IDX_2C('b','i'), "Burundi",0,0,0 }, +{ IDX_2C('b','j'), "Benin",0,0,0 }, +{ IDX_2C('b','l'), "Saint Barthelemy",0,0,0 }, +{ IDX_2C('b','m'), "Bermuda",0,0,0 }, +{ IDX_2C('b','n'), "Brunei Darussalam",0,0,0 }, +{ IDX_2C('b','o'), "Bolivia",0,0,0 }, +{ IDX_2C('b','r'), "Brazilien",0,0,0 }, +{ IDX_2C('b','s'), "Bahamas",0,0,0 }, +{ IDX_2C('b','t'), "Bhutan",0,0,0 }, +{ IDX_2C('b','v'), "Bouvet Island",0,0,0 }, +{ IDX_2C('b','w'), "Botswana",0,0,0 }, +{ IDX_2C('b','y'), "Vitryssland",0,0,0 }, +{ IDX_2C('b','z'), "Belize",0,0,0 }, +{ IDX_2C('c','a'), "Kanada",0,0,0 }, +{ IDX_2C('c','c'), "Cocos�arna",0,0,0 }, +{ IDX_2C('c','d'), "Kongo, Democratic Republic",0,0,0 }, +{ IDX_2C('c','f'), "Centralafrikanska republiken",0,0,0 }, +{ IDX_2C('c','g'), "Kongo",0,0,0 }, +{ IDX_2C('c','h'), "Schweiz",0,0,0 }, +{ IDX_2C('c','i'), "Elfenbenskusten",0,0,0 }, +{ IDX_2C('c','k'), "Cook �arna",0,0,0 }, +{ IDX_2C('c','l'), "Chile",0,0,0 }, +{ IDX_2C('c','m'), "Kamerun",0,0,0 }, +{ IDX_2C('c','n'), "Kina",0,0,0 }, +{ IDX_2C('c','o'), "Colombia",0,0,0 }, +{ IDX_2C('c','r'), "Costa Rica",0,0,0 }, +{ IDX_2C('c','u'), "Kuba",0,0,0 }, +{ IDX_2C('c','v'), "Cape Verde",0,0,0 }, +{ IDX_2C('c','x'), "Jul�n",0,0,0 }, +{ IDX_2C('c','y'), "Cypern",0,0,0 }, +{ IDX_2C('c','z'), "Tjeckien",0,0,0 }, +{ IDX_2C('d','e'), "Tyskland",0,0,0 }, +{ IDX_2C('d','j'), "Djibouti",0,0,0 }, +{ IDX_2C('d','k'), "Danmark",0,0,0 }, +{ IDX_2C('d','m'), "Dominica",0,0,0 }, +{ IDX_2C('d','o'), "Dominikanska Republiken",0,0,0 }, +{ IDX_2C('d','z'), "Algeriet",0,0,0 }, +{ IDX_2C('e','c'), "Ekvador",0,0,0 }, +{ IDX_2C('e','e'), "Estland",0,0,0 }, +{ IDX_2C('e','g'), "Egypten",0,0,0 }, +{ IDX_2C('e','h'), "V�stsahara",0,0,0 }, +{ IDX_2C('e','r'), "Eritrea",0,0,0 }, +{ IDX_2C('e','s'), "Spanien",0,0,0 }, +{ IDX_2C('e','t'), "Etiopien",0,0,0 }, +{ IDX_2C('e','u'), "European Union",0,0,0 }, +{ IDX_2C('f','i'), "Finland",0,0,0 }, +{ IDX_2C('f','j'), "Fiji",0,0,0 }, +{ IDX_2C('f','k'), "Falklands�arna",0,0,0 }, +{ IDX_2C('f','m'), "Mikronesien",0,0,0 }, +{ IDX_2C('f','o'), "Farao�arna",0,0,0 }, +{ IDX_2C('f','r'), "Frankrike",0,0,0 }, +{ IDX_2C('g','a'), "Gabon",0,0,0 }, +{ IDX_2C('g','b'), "England",0,0,0 }, +{ IDX_2C('g','d'), "Grenada",0,0,0 }, +{ IDX_2C('g','e'), "Georgien",0,0,0 }, +{ IDX_2C('g','f'), "Franska Guiana",0,0,0 }, +{ IDX_2C('g','g'), "Guernsey",0,0,0 }, +{ IDX_2C('g','h'), "Ghana",0,0,0 }, +{ IDX_2C('g','i'), "Gibraltar",0,0,0 }, +{ IDX_2C('g','l'), "Gr�nland",0,0,0 }, +{ IDX_2C('g','m'), "Gambia",0,0,0 }, +{ IDX_2C('g','n'), "Guinea",0,0,0 }, +{ IDX_2C('g','p'), "Guadeloupe",0,0,0 }, +{ IDX_2C('g','q'), "Ekvatorialguinea",0,0,0 }, +{ IDX_2C('g','r'), "Grekland",0,0,0 }, +{ IDX_2C('g','s'), "S. Georgia och S. Sandwich�arna",0,0,0 }, +{ IDX_2C('g','t'), "Guatemala",0,0,0 }, +{ IDX_2C('g','u'), "Guam",0,0,0 }, +{ IDX_2C('g','w'), "Guinea-Bissau",0,0,0 }, +{ IDX_2C('g','y'), "Guyana",0,0,0 }, +{ IDX_2C('h','k'), "Hong Kong",0,0,0 }, +{ IDX_2C('h','m'), "Heard- och McDonald�arna",0,0,0 }, +{ IDX_2C('h','n'), "Honduras",0,0,0 }, +{ IDX_2C('h','r'), "Kroatien",0,0,0 }, +{ IDX_2C('h','t'), "Haiti",0,0,0 }, +{ IDX_2C('h','u'), "Ungern" ,0,0,0 }, +{ IDX_2C('i','d'), "Indonesien",0,0,0 }, +{ IDX_2C('i','e'), "Irland",0,0,0 }, +{ IDX_2C('i','l'), "Israel",0,0,0 }, +{ IDX_2C('i','m'), "Isle of Man",0,0,0 }, +{ IDX_2C('i','n'), "Indien",0,0,0 }, +{ IDX_2C('i','o'), "Brittiska Indiska Osianien",0,0,0 }, +{ IDX_2C('i','q'), "Irak",0,0,0 }, +{ IDX_2C('i','r'), "Iran",0,0,0 }, +{ IDX_2C('i','s'), "Island",0,0,0 }, +{ IDX_2C('i','t'), "Italien",0,0,0 }, +{ IDX_2C('j','e'), "Jersey",0,0,0 }, +{ IDX_2C('j','m'), "Jamaica",0,0,0 }, +{ IDX_2C('j','o'), "Jordanien",0,0,0 }, +{ IDX_2C('j','p'), "Japan",0,0,0 }, +{ IDX_2C('k','e'), "Kenya",0,0,0 }, +{ IDX_2C('k','g'), "Kirgistan",0,0,0 }, +{ IDX_2C('k','h'), "Kambodja",0,0,0 }, +{ IDX_2C('k','i'), "Kiribati",0,0,0 }, +{ IDX_2C('k','m'), "Comoros",0,0,0 }, +{ IDX_2C('k','n'), "Saint Kitts och Nevis",0,0,0 }, +{ IDX_2C('k','p'), "Nord Korea",0,0,0 }, +{ IDX_2C('k','r'), "Syd Korea",0,0,0 }, +{ IDX_2C('k','w'), "Kuwait",0,0,0 }, +{ IDX_2C('k','y'), "Cayman�arna",0,0,0 }, +{ IDX_2C('k','z'), "Kazachstan",0,0,0 }, +{ IDX_2C('l','a'), "Laos",0,0,0 }, +{ IDX_2C('l','b'), "Libanon",0,0,0 }, +{ IDX_2C('l','c'), "Saint Lucia",0,0,0 }, +{ IDX_2C('l','i'), "Liechtenstein",0,0,0 }, +{ IDX_2C('l','k'), "Sri Lanka",0,0,0 }, +{ IDX_2C('l','r'), "Liberia",0,0,0 }, +{ IDX_2C('l','s'), "Lesotho",0,0,0 }, +{ IDX_2C('l','t'), "Litauen",0,0,0 }, +{ IDX_2C('l','u'), "Luxembourg",0,0,0 }, +{ IDX_2C('l','v'), "Lettland",0,0,0 }, +{ IDX_2C('l','y'), "Libyen",0,0,0 }, +{ IDX_2C('m','a'), "Marocco",0,0,0 }, +{ IDX_2C('m','c'), "Monaco",0,0,0 }, +{ IDX_2C('m','d'), "Moldavien",0,0,0 }, +{ IDX_2C('m','e'), "Montenegro",0,0,0 }, +{ IDX_2C('m','f'), "Saint Martin (Franska delen)",0,0,0 }, +{ IDX_2C('m','g'), "Malagasy",0,0,0 }, +{ IDX_2C('m','h'), "Marshall�arna",0,0,0 }, +{ IDX_2C('m','k'), "Makedonien",0,0,0 }, +{ IDX_2C('m','l'), "Mali",0,0,0 }, +{ IDX_2C('m','m'), "Myanmar",0,0,0 }, +{ IDX_2C('m','n'), "Mongoliet",0,0,0 }, +{ IDX_2C('m','o'), "Macau",0,0,0 }, +{ IDX_2C('m','p'), "Norra Mariana�arna",0,0,0 }, +{ IDX_2C('m','q'), "Martinique",0,0,0 }, +{ IDX_2C('m','r'), "Mauritania",0,0,0 }, +{ IDX_2C('m','s'), "Montserrat",0,0,0 }, +{ IDX_2C('m','t'), "Malta",0,0,0 }, +{ IDX_2C('m','u'), "Mauritius",0,0,0 }, +{ IDX_2C('m','v'), "Maldiverna",0,0,0 }, +{ IDX_2C('m','w'), "Malawi",0,0,0 }, +{ IDX_2C('m','x'), "Mexico",0,0,0 }, +{ IDX_2C('m','y'), "Malaysia",0,0,0 }, +{ IDX_2C('m','z'), "Mozambique",0,0,0 }, +{ IDX_2C('n','a'), "Namibia",0,0,0 }, +{ IDX_2C('n','c'), "Nya Caledonien",0,0,0 }, +{ IDX_2C('n','e'), "Niger",0,0,0 }, +{ IDX_2C('n','f'), "Norfolk Island",0,0,0 }, +{ IDX_2C('n','g'), "Nigeria",0,0,0 }, +{ IDX_2C('n','i'), "Nicaragua",0,0,0 }, +{ IDX_2C('n','l'), "Nederl�nderna",0,0,0 }, +{ IDX_2C('n','o'), "Norge",0,0,0 }, +{ IDX_2C('n','p'), "Nepal",0,0,0 }, +{ IDX_2C('n','r'), "Nauru",0,0,0 }, +{ IDX_2C('n','u'), "Niue",0,0,0 }, +{ IDX_2C('n','z'), "Nya Zeland",0,0,0 }, +{ IDX_2C('o','m'), "Oman",0,0,0 }, +{ IDX_2C('p','a'), "Panama",0,0,0 }, +{ IDX_2C('p','e'), "Peru",0,0,0 }, +{ IDX_2C('p','f'), "Franska Polynesien",0,0,0 }, +{ IDX_2C('p','g'), "Papua Nya Guinea",0,0,0 }, +{ IDX_2C('p','h'), "Filippinerna",0,0,0 }, +{ IDX_2C('p','k'), "Pakistan",0,0,0 }, +{ IDX_2C('p','l'), "Polen",0,0,0 }, +{ IDX_2C('p','m'), "St. Pierre och Miquelon",0,0,0 }, +{ IDX_2C('p','n'), "Pitcairn",0,0,0 }, +{ IDX_2C('p','r'), "Puerto Rico",0,0,0 }, +{ IDX_2C('p','s'), "Palestinian Territory, Occupied",0,0,0 }, +{ IDX_2C('p','t'), "Portugal",0,0,0 }, +{ IDX_2C('p','w'), "Palau",0,0,0 }, +{ IDX_2C('p','y'), "Paraguay",0,0,0 }, +{ IDX_2C('q','a'), "Qatar",0,0,0 }, +{ IDX_2C('r','e'), "Reunion",0,0,0 }, +{ IDX_2C('r','o'), "Rum�nien",0,0,0 }, +{ IDX_2C('r','s'), "Serbien",0,0,0 }, +{ IDX_2C('r','u'), "Ryssland",0,0,0 }, +{ IDX_2C('r','w'), "Rwanda",0,0,0 }, +{ IDX_2C('s','a'), "Saudiarabien",0,0,0 }, +{ IDX_2C('s','b'), "Solomon�arna",0,0,0 }, +{ IDX_2C('s','c'), "Seychellerna",0,0,0 }, +{ IDX_2C('s','d'), "Sudan",0,0,0 }, +{ IDX_2C('s','e'), "Sverige",0,0,0 }, +{ IDX_2C('s','g'), "Singapor",0,0,0 }, +{ IDX_2C('s','h'), "St. Helena",0,0,0 }, +{ IDX_2C('s','i'), "Slovenien",0,0,0 }, +{ IDX_2C('s','j'), "Svalbard och Jan Mayen-�arna",0,0,0 }, +{ IDX_2C('s','k'), "Slovakien",0,0,0 }, +{ IDX_2C('s','l'), "Sierra Leone",0,0,0 }, +{ IDX_2C('s','m'), "San Marino",0,0,0 }, +{ IDX_2C('s','n'), "Senegal",0,0,0 }, +{ IDX_2C('s','o'), "Somalia",0,0,0 }, +{ IDX_2C('s','r'), "Surinam",0,0,0 }, +{ IDX_2C('s','t'), "Sao Tome och Principe",0,0,0 }, +{ IDX_2C('s','u'), "Sovjet",0,0,0 }, +{ IDX_2C('s','v'), "El Salvador",0,0,0 }, +{ IDX_2C('s','y'), "Syrien",0,0,0 }, +{ IDX_2C('s','z'), "Swaziland",0,0,0 }, +{ IDX_2C('t','c'), "Turks och Caicos�arna",0,0,0 }, +{ IDX_2C('t','d'), "Chad",0,0,0 }, +{ IDX_2C('t','f'), "S�dra Franska territorierna",0,0,0 }, +{ IDX_2C('t','g'), "Togo",0,0,0 }, +{ IDX_2C('t','h'), "Thailand",0,0,0 }, +{ IDX_2C('t','j'), "Tajikistan",0,0,0 }, +{ IDX_2C('t','k'), "Tokelau",0,0,0 }, +{ IDX_2C('t','l'), "Timor-Leste",0,0,0 }, +{ IDX_2C('t','m'), "Turkmenistan",0,0,0 }, +{ IDX_2C('t','n'), "Tunisien",0,0,0 }, +{ IDX_2C('t','o'), "Tonga",0,0,0 }, +{ IDX_2C('t','p'), "�sttimor",0,0,0 }, +{ IDX_2C('t','r'), "Turkiet",0,0,0 }, +{ IDX_2C('t','t'), "Trinidad och Tobago",0,0,0 }, +{ IDX_2C('t','v'), "Tuvalu",0,0,0 }, +{ IDX_2C('t','w'), "Taiwan",0,0,0 }, +{ IDX_2C('t','z'), "Tanzania",0,0,0 }, +{ IDX_2C('u','a'), "Ukraina",0,0,0 }, +{ IDX_2C('u','g'), "Uganda",0,0,0 }, +{ IDX_2C('u','k'), "Storbritanien",0,0,0 }, +{ IDX_2C('u','m'), "US Minor Outlying Islands",0,0,0 }, +{ IDX_2C('u','s'), "USA",0,0,0 }, +{ IDX_2C('u','y'), "Uruguay",0,0,0 }, +{ IDX_2C('u','z'), "Uzbekistan",0,0,0 }, +{ IDX_2C('v','a'), "Vatikanstaten",0,0,0 }, +{ IDX_2C('v','c'), "Saint Vincent och Grenadinerna",0,0,0 }, +{ IDX_2C('v','e'), "Venezuela",0,0,0 }, +{ IDX_2C('v','g'), "Jungfru-�arna (Brittiska)",0,0,0 }, +{ IDX_2C('v','i'), "Jungfru-�arna (Amerikanska)",0,0,0 }, +{ IDX_2C('v','n'), "Vietnam",0,0,0 }, +{ IDX_2C('v','u'), "Vanuatu",0,0,0 }, +{ IDX_2C('w','f'), "Wallis och Futuna�arna",0,0,0 }, +{ IDX_2C('w','s'), "Samoa",0,0,0 }, +{ IDX_2C('y','e'), "Yemen",0,0,0 }, +{ IDX_2C('y','t'), "Mayotte",0,0,0 }, +{ IDX_2C('y','u'), "Jugoslavien",0,0,0 }, +{ IDX_2C('z','a'), "Sydafrika",0,0,0 }, +{ IDX_2C('z','m'), "Zambia",0,0,0 }, +{ IDX_2C('z','w'), "Zimbabwe",0,0,0 }, +{ IDX_2C('a','1'), "Anonymous Proxy",0,0,0 }, +{ IDX_2C('a','2'), "Satellite Provider",0,0,0 }, +{ IDX_2C('o','1'), "Other",0,0,0 }, +{ IDX_2C('a','p'), "Asia/Pacific Region",0,0,0 }, +{ IDX_3C('l','a','n'), "Local Network (lan)",0,0,0 }, +{ 0, NULL,0,0,0 } +}; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/linklist.c new/webalizer-2.21-02/linklist.c --- old/webalizer-2.20-01/linklist.c 2008-07-01 06:12:13.000000000 +0200 +++ new/webalizer-2.21-02/linklist.c 2009-01-13 05:43:00.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/Makefile.std new/webalizer-2.21-02/Makefile.std --- old/webalizer-2.20-01/Makefile.std 2008-07-02 00:28:24.000000000 +0200 +++ new/webalizer-2.21-02/Makefile.std 2009-01-13 05:46:50.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for webalizer - a web server logfile analysis thingie # -# (c)1997-2008 by Bradford L. Barrett +# (c)1997-2009 by Bradford L. Barrett # Distributed under the GNU GPL. See "README" and "Copyright" # files supplied with this distribution for more information. # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/output.c new/webalizer-2.21-02/output.c --- old/webalizer-2.20-01/output.c 2008-07-01 00:04:39.000000000 +0200 +++ new/webalizer-2.21-02/output.c 2009-01-13 06:34:04.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -175,7 +175,7 @@ fprintf(out_fp,"<!-- Generated by The Webalizer Ver. %s-%s -->\n", version,editlvl); fprintf(out_fp,"<!-- -->\n"); - fprintf(out_fp,"<!-- Copyright 1997-2008 Bradford L. Barrett -->\n"); + fprintf(out_fp,"<!-- Copyright 1997-2009 Bradford L. Barrett -->\n"); fprintf(out_fp,"<!-- -->\n"); fprintf(out_fp,"<!-- Distributed under the GNU GPL Version 2 -->\n"); fprintf(out_fp,"<!-- Full text may be found at: -->\n"); @@ -2386,6 +2386,11 @@ int s_year=hist[HISTSIZE-1].year; char index_fname[256]; char buffer[BUFSIZE]; + u_int64_t m_hit=0; + u_int64_t m_files=0; + u_int64_t m_pages=0; + u_int64_t m_visits=0; + double m_xfer=0.0; double gt_hit=0.0; double gt_files=0.0; double gt_pages=0.0; @@ -2473,6 +2478,26 @@ /* Check for year change */ if (s_year!=hist[i].year) { + /* Year Totals */ + if (index_mths>16 && year_totals) + { + fprintf(out_fp,"<TR><TH COLSPAN=6 BGCOLOR=\"%s\" " \ + "ALIGN=left><FONT SIZE=\"-1\"><STRONG>%04d</TH>\n", + GRPCOLOR,s_year); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%.0f</TH>", GRPCOLOR, m_xfer); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_visits); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_pages); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_files); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_hit); + m_xfer=0; m_visits=0; m_pages=0; m_files=0; m_hit=0; + } + + /* Year Header */ s_year=hist[i].year; if (index_mths>16 && year_hdrs) fprintf(out_fp,"<TR><TH COLSPAN=11 BGCOLOR=\"%s\" " \ @@ -2515,6 +2540,28 @@ gt_pages += hist[i].page; gt_xfer += hist[i].xfer; gt_visits+= hist[i].visit; + m_hit += hist[i].hit; + m_files += hist[i].files; + m_pages += hist[i].page; + m_visits+= hist[i].visit; + m_xfer += hist[i].xfer; + } + + if (index_mths>16 && year_totals) + { + fprintf(out_fp,"<TR><TH COLSPAN=6 BGCOLOR=\"%s\" " \ + "ALIGN=left><FONT SIZE=\"-1\"><STRONG>%04d</TH>\n", + GRPCOLOR,s_year); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%.0f</TH>", GRPCOLOR, m_xfer); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_visits); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_pages); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_files); + fprintf(out_fp,"<TH ALIGN=\"right\" BGCOLOR=\"%s\">" \ + "<FONT SIZE=\"-1\">%0llu</TH>", GRPCOLOR, m_hit); } fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n"); fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" COLSPAN=6 ALIGN=left>" \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/parser.c new/webalizer-2.21-02/parser.c --- old/webalizer-2.20-01/parser.c 2008-05-29 18:25:55.000000000 +0200 +++ new/webalizer-2.21-02/parser.c 2009-01-13 05:43:08.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/preserve.c new/webalizer-2.21-02/preserve.c --- old/webalizer-2.20-01/preserve.c 2008-07-03 08:13:16.000000000 +0200 +++ new/webalizer-2.21-02/preserve.c 2009-01-13 05:43:12.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/README new/webalizer-2.21-02/README --- old/webalizer-2.20-01/README 2008-07-10 21:16:58.000000000 +0200 +++ new/webalizer-2.21-02/README 2009-01-13 05:44:49.000000000 +0100 @@ -1,5 +1,5 @@ The Webalizer - A web server log file analysis tool -Copyright 1997-2008 by Bradford L. Barrett +Copyright 1997-2009 by Bradford L. Barrett Distributed under the GNU GPL. See the files "COPYING" and "Copyright" supplied with the distribution for additional info. @@ -43,7 +43,7 @@ cache files used and produced by the webalizer. See the file DNS.README for additional information regarding DNS support. -This documentation applies to The Webalizer Version 2.20 +This documentation applies to The Webalizer Version 2.21 Running the Webalizer --------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/sample.conf new/webalizer-2.21-02/sample.conf --- old/webalizer-2.20-01/sample.conf 2008-07-10 09:09:33.000000000 +0200 +++ new/webalizer-2.21-02/sample.conf 2009-01-13 05:46:19.000000000 +0100 @@ -1,6 +1,6 @@ # # Sample Webalizer configuration file -# Copyright 1997-2008 by Bradford L. Barrett +# Copyright 1997-2009 by Bradford L. Barrett # # Distributed under the GNU General Public License. See the # files "Copyright" and "COPYING" provided with the webalizer @@ -431,6 +431,13 @@ #YearHeaders yes +# YearTotals enables/disables the display of yearly totals in the main +# index (yearly summary) table. If enabled, year totals will be shown +# when the table is displaying more than 16 months worth of data. Values +# can be 'yes' or 'no', with 'yes' being the default. + +#YearTotals yes + # GraphMonths defines the number of months to display in the main index # (yearly summary) graph. Value can be between 12 and 72 months, with # the default being 12 months. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/wcmgr.1 new/webalizer-2.21-02/wcmgr.1 --- old/webalizer-2.20-01/wcmgr.1 2008-07-13 00:07:20.000000000 +0200 +++ new/webalizer-2.21-02/wcmgr.1 2009-01-13 05:45:27.000000000 +0100 @@ -103,7 +103,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2008 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/wcmgr.c new/webalizer-2.21-02/wcmgr.c --- old/webalizer-2.20-01/wcmgr.c 2008-07-13 00:07:46.000000000 +0200 +++ new/webalizer-2.21-02/wcmgr.c 2009-01-13 05:45:49.000000000 +0100 @@ -3,7 +3,7 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -96,7 +96,7 @@ char *version = "1.00"; /* program version */ char *editlvl = "03"; /* edit level */ char *moddate = "12-Jul-2008"; /* modification date */ -char *copyright = "Copyright 2007-2008 by Bradford L. Barrett"; +char *copyright = "Copyright 2007-2009 by Bradford L. Barrett"; int action = 'l'; /* action flag (default=list) */ int create = 0; /* cache creation flag */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/webalizer.1 new/webalizer-2.21-02/webalizer.1 --- old/webalizer-2.20-01/webalizer.1 2008-07-13 00:07:09.000000000 +0200 +++ new/webalizer-2.21-02/webalizer.1 2009-01-13 05:51:37.000000000 +0100 @@ -535,6 +535,12 @@ is displaying more than 16 months worth of data. Values can be 'yes' or 'no'. Default is 'yes'. .TP 8 +.B YearTotals \fP( \fByes\fP | no ) +Enable/disable the display of year totals in the main index (yearly +summary) table. If enabled, year totals will be shown when the table +is displaying more than 16 months worth of data. Values can be 'yes' +or 'no'. Default is 'yes'. +.TP 8 .B GraphMonths \fInum\fP Specify the number of months to display in the main index (yearly summary) graph. Default is 12 months. Can be set to anything between @@ -892,7 +898,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2008 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/webalizer.c new/webalizer-2.21-02/webalizer.c --- old/webalizer-2.20-01/webalizer.c 2008-07-13 00:07:34.000000000 +0200 +++ new/webalizer-2.21-02/webalizer.c 2009-01-13 06:35:54.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2008 Bradford L. Barrett + Copyright (C) 1997-2009 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,13 @@ /* STANDARD INCLUDES */ /*********************************************/ +/* Fix broken Zlib 64 bitness */ +#if _FILE_OFFSET_BITS == 64 +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE = 1 +#endif +#endif + #include <time.h> #include <stdio.h> #include <stdlib.h> @@ -104,10 +111,10 @@ /* GLOBAL VARIABLES */ /*********************************************/ -char *version = "2.20"; /* program version */ -char *editlvl = "01"; /* edit level */ -char *moddate = "12-Jul-2008"; /* modification date */ -char *copyright = "Copyright 1997-2008 by Bradford L. Barrett"; +char *version = "2.21"; /* program version */ +char *editlvl = "02"; /* edit level */ +char *moddate = "13-Jan-2009"; /* modification date */ +char *copyright = "Copyright 1997-2009 by Bradford L. Barrett"; int verbose = 2; /* 2=verbose,1=err, 0=none */ int debug_mode = 0; /* debug mode flag */ @@ -158,6 +165,7 @@ int graph_mths = 12; /* # months in index graph */ int index_mths = 12; /* # months in index table */ int year_hdrs = 1; /* index year seperators */ +int year_totals = 1; /* index year subtotals */ int use_flags = 0; /* Show flags in ctry table */ char *flag_dir = "flags"; /* location of flag icons */ @@ -1617,9 +1625,10 @@ "IndexMonths", /* # months for main page 114 */ "GraphMonths", /* # months for yearly graph 115 */ "YearHeaders", /* use year headers? (1=yes) 116 */ - "CountryFlags", /* show country flags? (0-no) 117 */ - "FlagDir", /* directory w/flag images 118 */ - "SearchCaseI" /* srch str case insensitive 119 */ + "YearTotals", /* show year subtotals (0=no) 117 */ + "CountryFlags", /* show country flags? (0-no) 118 */ + "FlagDir", /* directory w/flag images 119 */ + "SearchCaseI" /* srch str case insensitive 120 */ }; FILE *fp; @@ -1847,10 +1856,12 @@ case 115: graph_mths=atoi(value); break; /* GraphMonths */ case 116: year_hdrs= (tolower(value[0])=='n')?0:1; break; /* YearHeaders */ - case 117: use_flags= + case 117: year_totals= + (tolower(value[0])=='n')?0:1; break; /* YearTotals */ + case 118: use_flags= (tolower(value[0])=='y')?1:0; break; /* CountryFlags */ - case 118: use_flags=1; flag_dir=save_opt(value); break; /* FlagDir */ - case 119: searchcasei= + case 119: use_flags=1; flag_dir=save_opt(value); break; /* FlagDir */ + case 120: searchcasei= (tolower(value[0])=='n')?0:1; break; /* SearchCaseI */ } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webalizer-2.20-01/webalizer.h new/webalizer-2.21-02/webalizer.h --- old/webalizer-2.20-01/webalizer.h 2008-07-01 07:19:17.000000000 +0200 +++ new/webalizer-2.21-02/webalizer.h 2009-01-08 06:10:27.000000000 +0100 @@ -194,6 +194,7 @@ extern int graph_mths ; /* # months in index graph */ extern int index_mths ; /* # months in index table */ extern int year_hdrs ; /* Show year headers (0=no) */ +extern int year_totals ; /* Show year totals (0=no) */ extern int use_flags ; /* Show flags in ctry table */ extern char *flag_dir ; /* flag directory */ extern char *hname ; /* hostname for reports */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org