Author: lisu Date: Wed Sep 8 13:22:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- reversed
---- Files affected:
packages/webalizer:
webalizer.spec (1.95 -> 1.96) , webalizer-conf.patch (1.4 -> 1.5) ,
webalizer-nolibnsl.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/webalizer/webalizer.spec
diff -u packages/webalizer/webalizer.spec:1.95
packages/webalizer/webalizer.spec:1.96
--- packages/webalizer/webalizer.spec:1.95 Wed Sep 8 15:06:32 2010
+++ packages/webalizer/webalizer.spec Wed Sep 8 15:22:45 2010
@@ -3,13 +3,12 @@
# - subpackage for cgi?
# - move icons out of /home/services
# - think and fix the trigger.
-# - create workaround for language selection
#
# Conditional build:
%bcond_with db3 # build with db3 instead of db 4.x
#
-%define ver 2.21
-%define patchlvl 02
+%define ver 2.01
+%define patchlvl 10
Summary: The Webalizer - A web server log file analysis thingie
Summary(es.UTF-8): Software para análisis de archivos de log de servidores
WWW
Summary(pl.UTF-8): Webalizer - analizator logów serwera WWW
@@ -18,19 +17,21 @@
Summary(uk.UTF-8): Програма аналізу log-файлу web/ftp/proxy-сервера
Name: webalizer
Version: %{ver}_%{patchlvl}
-Release: 1
+Release: 20
License: GPL v2
Group: Networking/Utilities
Source0:
ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlvl}-src.tar.bz2
-# Source0-md5: 29af2558a5564493df654b6310b152e7
+# Source0-md5: 26d0a3c142423678daed2d6f579525d8
Source1: http://linux.gda.pl/pub/webalizer/%{name}_lang.polish
# Source1-md5: 510bc595699373c4d7a8093a5ea10df3
Source2: %{name}.sysconfig
Source3: %{name}.cron
Source4: %{name}.crontab
-Patch0: %{name}-nolibnsl.patch
-Patch1: %{name}-conf.patch
-Patch2: %{name}-gcc44.patch
+Patch0: %{name}-debian-23.patch
+Patch1: %{name}-nolibnsl.patch
+Patch2: %{name}-conf.patch
+Patch3: %{name}-debian_gcc2_fix.patch
+Patch4: %{name}-largefile.patch
URL: http://www.mrunix.net/webalizer/
BuildRequires: autoconf
%{!?with_db3:BuildRequires: db-devel}
@@ -41,7 +42,7 @@
BuildRequires: zlib-devel
Requires: %{name}-base = %{version}-%{release}
# s...@latn vs. s...@latin
-#Conflicts: glibc-misc < 6:2.7
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _webdir /home/services/httpd
@@ -108,10 +109,12 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
-#mv -f po/{no,nb}.po
-#mv -f po/{sr,s...@latin}.po
-#mv -f po/{zh,zh_TW}.po
+mv -f po/{no,nb}.po
+mv -f po/{sr,s...@latin}.po
+mv -f po/{zh,zh_TW}.po
install %{SOURCE1} lang
@@ -141,13 +144,13 @@
install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/webalizer
ln -s webalizer $RPM_BUILD_ROOT%{_bindir}/webazolver
-#for mo in po/*.mo; do
-# file=${mo#po/*}
-# lang=${file%*.mo}
-# install -D $mo
$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/webalizer.mo
-#done
+for mo in po/*.mo; do
+ file=${mo#po/*}
+ lang=${file%*.mo}
+ install -D $mo
$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/webalizer.mo
+done
-#%%find_lang %{name}
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -164,8 +167,7 @@
fi
done
-#%%files -f %{name}.lang
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/cron.d/webalizer
%attr(2755,root,stats) %dir %{_sysconfdir}/%{name}
@@ -179,8 +181,6 @@
%attr(755,root,root) %{_bindir}/webalizer
%attr(755,root,root) %{_bindir}/webazolver
%{_mandir}/man1/*
-%dir %{_webdir}
-%dir %{_webdir}/icons
%{_webdir}/icons/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -189,15 +189,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.95 2010/09/08 13:06:32 lisu
-- fix cvs entry in rev 1.94: -conf.patch wasn't removed, -largefile.patch was
-
-Revision 1.94 2010/09/08 13:01:53 lisu
-- updated to 2.21-02
-- removed pateches: -debian-23.patch, -debian_gcc2_fix.patch, -largefile.patch
-- updated pateches: -nolibnsl.patch, conf.patch
-- added patch: -gcc44.patch
-- no international files (TODO)
+Revision 1.96 2010/09/08 13:22:45 lisu
+- reversed
Revision 1.93 2008/06/14 10:35:09 arekm
- rel .20
================================================================
Index: packages/webalizer/webalizer-conf.patch
diff -u packages/webalizer/webalizer-conf.patch:1.4
packages/webalizer/webalizer-conf.patch:1.5
--- packages/webalizer/webalizer-conf.patch:1.4 Wed Sep 8 15:04:00 2010
+++ packages/webalizer/webalizer-conf.patch Wed Sep 8 15:22:45 2010
@@ -1,8 +1,9 @@
---- webalizer-2.21-02/sample.conf~ 2009-01-13 05:46:19.000000000 +0100
-+++ webalizer-2.21-02/sample.conf 2010-09-08 11:59:02.556144035 +0200
-@@ -26,7 +26,7 @@
- # (bzip2 compressed file), it will be decompressed on the fly as it
- # is being read.
+diff -ur webalizer-2.01-10/sample.conf webalizer-2.01-10.new/sample.conf
+--- webalizer-2.01-10/sample.conf 2000-09-29 03:51:42.000000000 +0000
++++ webalizer-2.01-10.new/sample.conf 2005-10-14 16:54:24.592572712 +0000
+@@ -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/httpd/access_log
@@ -22,10 +23,10 @@
+PageType pl
+PageType shtml
- # PagePrefix allows all requests with a specified prefix to be
- # considered as 'pages'. If you want everything under /documents
-@@ -546,13 +548,16 @@
- #HideReferrer webalizer.org/
+ # UseHTTPS should be used if the analysis is being run on a
+ # secure server, and links to urls should use 'https://' instead
+@@ -383,13 +385,16 @@
+ #HideReferrer mrunix.net/
# This one hides non-referrers ("-" Direct requests)
-#HideReferrer Direct Request
@@ -42,7 +43,7 @@
HideURL *.png
HideURL *.PNG
HideURL *.ra
-@@ -571,10 +576,22 @@
+@@ -408,10 +413,22 @@
#GroupSite *.aol.com
#GroupSite *.compuserve.com
@@ -59,7 +60,7 @@
+GroupReferrer netsprint. NetSprint (netsprint.pl)
+GroupReferrer yandex.pl/ Yandex (yandex.pl)
+GroupReferrer szukacz.pl/ Szukacz (szukacz.pl)
-+GroupReferrer yahoo.com/ Yahoo!
++GroupReferrer yahoo.com/ Yahoo! (yahoo.com)
+GroupReferrer altavista.com/ AltaVista (altavista.com)
+GroupReferrer google. Google (google.com)
+GroupReferrer dmoz.org/ Open Directory Project (dmoz.org)
@@ -69,88 +70,35 @@
#GroupUser root Admin users
#GroupUser admin Admin users
-@@ -584,29 +601,35 @@
+@@ -421,11 +438,16 @@
# for browsers, and not display all the detail records.
# (You should use MangleAgent to refine further...)
--#GroupAgent Opera/ Opera
-+GroupAgent Opera/ Opera
- #HideAgent Opera/
--#GroupAgent "MSIE 7" Microsoft Internet Exploder 7
+-#GroupAgent MSIE Micro$oft Internet Exploder
++GroupAgent MSIE Micro$oft Internet Exploder
++GroupAgent Konqueror Konqueror
++GroupAgent Lynx* Lynx
++GroupAgent Links* Links
++GroupAgent Opera Opera
+GroupAgent w3m* w3m
-+#HideAgent w3m*
+GroupAgent Mozilla Netscape/Mozilla
-+#HideAgnet Mozilla
-+GroupAgent "MSIE 7" Microsoft Internet Exploder 7
- #HideAgent MSIE 7
--#GroupAgent "MSIE 6" Microsoft Internet Exploder 6
-+GroupAgent "MSIE 6" Microsoft Internet Exploder 6
- #HideAgent MSIE 6
--#GroupAgent "MSIE " Older Microsoft Exploders
-+GroupAgent "MSIE " Older Microsoft Exploders
- #HideAgent MSIE
--#GroupAgent Firefox/2. Firefox 2
-+GroupAgent Firefox/2. Firefox 2
- #HideAgent Firefox/2.
--#GroupAgent Firefox/1. Firefox 1.x
-+GroupAgent Firefox/1. Firefox 1.x
- #HideAgent Firefox/1.
--#GroupAgent Konqueror Konqueror
-+GroupAgent Konqueror Konqueror
- #HideAgent Konqueror
--#GroupAgent Safari Safari
-+GroupAgent Safari Safari
- #HideAgent Safari
+ #HideAgent MSIE
+ #GroupAgent Mozilla Netscape
+ #HideAgent Mozilla
-#GroupAgent Lynx* Lynx
-+GroupAgent Lynx* Lynx
#HideAgent Lynx*
--#GroupAgent Wget/ WGet
-+GroupAgent Links* Links
-+#HideAgent Links*
-+GroupAgent Wget/ WGet
- #HideAgent Wget/
--#GroupAgent (compatible; Other Mozilla Compatibles
-+GroupAgent (compatible; Other Mozilla Compatibles
- #HideAgent (compatible;
--#GroupAgent Mozilla* Mozilla/Netscape
-+GroupAgent Mozilla* Mozilla/Netscape
- #HideAgent Mozilla*
# HideAllSites allows forcing individual sites to be hidden in the
-@@ -699,21 +722,21 @@
+@@ -516,9 +538,9 @@
# engine, and the second is the URL variable used by that search engine
# to define it's search terms.
--#SearchEngine .google. q=
--#SearchEngine yahoo.com p=
--#SearchEngine altavista.com q=
--#SearchEngine aolsearch. query=
--#SearchEngine ask.co q=
--#SearchEngine eureka.com q=
--#SearchEngine lycos.com query=
--#SearchEngine hotbot.com MT=
--#SearchEngine msn.com q=
--#SearchEngine infoseek.com qt=
--#SearchEngine excite search=
--#SearchEngine netscape.com query=
--#SearchEngine mamma.com query=
--#SearchEngine alltheweb.com q=
--#SearchEngine northernlight.com qr=
-+SearchEngine .google. q=
-+SearchEngine yahoo.com p=
-+SearchEngine altavista.com q=
-+SearchEngine aolsearch. query=
-+SearchEngine ask.co q=
-+SearchEngine eureka.com q=
-+SearchEngine lycos.com query=
-+SearchEngine hotbot.com MT=
-+SearchEngine msn.com q=
-+SearchEngine infoseek.com qt=
-+SearchEngine excite search=
-+SearchEngine netscape.com query=
-+SearchEngine mamma.com query=
-+SearchEngine alltheweb.com q=
-+SearchEngine northernlight.com qr=
-
- # Normally, search strings are converted to lower case in order to
- # increase accuracy. The SearchCaseI option allows them to maintain
+-SearchEngine yahoo.com p=
+-SearchEngine altavista.com q=
+-SearchEngine google.com q=
++SearchEngine yahoo. p=
++SearchEngine altavista. q=
++SearchEngine google. q=
+ SearchEngine eureka.com q=
+ SearchEngine lycos.com query=
+ SearchEngine hotbot.com MT=
================================================================
Index: packages/webalizer/webalizer-nolibnsl.patch
diff -u packages/webalizer/webalizer-nolibnsl.patch:1.2
packages/webalizer/webalizer-nolibnsl.patch:1.3
--- packages/webalizer/webalizer-nolibnsl.patch:1.2 Wed Sep 8 15:04:00 2010
+++ packages/webalizer/webalizer-nolibnsl.patch Wed Sep 8 15:22:45 2010
@@ -1,12 +1,10 @@
---- webalizer-2.21-02/configure.in~ 2009-01-13 05:45:04.000000000 +0100
-+++ webalizer-2.21-02/configure.in 2010-09-08 11:08:29.743938206 +0200
-@@ -186,9 +186,6 @@
+--- webalizer-2.01-10/configure.in.orig Fri Oct 6 09:51:49 2000
++++ webalizer-2.01-10/configure.in Wed Feb 12 00:09:00 2003
+@@ -93,7 +93,6 @@
+ AC_CHECK_LIB(socket, main, LIBS="-lsocket ${LIBS}";)
fi
AC_CHECK_HEADERS(sys/socket.h)
- AC_CHECK_FUNC(inet_pton,DUMMY="",DUMMY="")
-- if test "$ac_cv_func_inet_pton" = "no"; then
-- AC_CHECK_LIB(nsl,inet_pton, LIBS="-lnsl ${LIBS}")
-- fi
+- AC_CHECK_LIB(nsl, main, LIBS="-lnsl ${LIBS}")
fi
- dnl ------------------------------------------
+ dnl Check for bsd 4.4 library -l44bsd:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer.spec?r1=1.95&r2=1.96&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer-conf.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer-nolibnsl.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
