Compare commits
No commits in common. "rawhide" and "epel8" have entirely different histories.
6 changed files with 15 additions and 270 deletions
|
|
@ -1,28 +0,0 @@
|
|||
From: Julien Viard de Galbert <julien@vdg.blogsite.org>
|
||||
Date: Wed, 24 Nov 2010 00:16:20 +0100
|
||||
Subject: Fix a spelling error
|
||||
|
||||
Thank you lintian ;)
|
||||
|
||||
Index: webalizer/wcmgr.c
|
||||
===================================================================
|
||||
--- webalizer.orig/wcmgr.c 2013-10-06 14:34:50.000000000 +0200
|
||||
+++ webalizer/wcmgr.c 2013-10-06 14:45:59.000000000 +0200
|
||||
@@ -692,7 +692,7 @@
|
||||
}
|
||||
dns_db->close(dns_db, 0);
|
||||
if (verbose)
|
||||
- printf("%s sucessfully deleted from cache file\n",addr);
|
||||
+ printf("%s successfully deleted from cache file\n",addr);
|
||||
}
|
||||
|
||||
/*********************************************/
|
||||
@@ -770,7 +770,7 @@
|
||||
if (db_put(addr, name, (strcmp(name,addr))?0:1, runtime)==0)
|
||||
dns_db->close(dns_db,0);
|
||||
if (verbose)
|
||||
- printf("%s sucessfully added to cache file\n",addr);
|
||||
+ printf("%s successfully added to cache file\n",addr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From: Julien Viard de Galbert <julien@vdg.blogsite.org>
|
||||
Date: Tue, 7 Oct 2014 23:45:04 +0200
|
||||
Subject: Fix cast warnings when building output.c
|
||||
|
||||
Casts were used to cast to the same type, so discarded them.
|
||||
---
|
||||
output.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/output.c b/output.c
|
||||
index 838d383..81e869c 100644
|
||||
--- a/output.c
|
||||
+++ b/output.c
|
||||
@@ -949,7 +949,7 @@ void top_sites_table(int flag)
|
||||
while(cnt--)
|
||||
{
|
||||
/* calculate totals */
|
||||
- switch ( (int)((HNODEPTR)(*pointer)->flag) )
|
||||
+ switch ( (*pointer)->flag )
|
||||
{
|
||||
case OBJ_REG: h_reg++; break;
|
||||
case OBJ_GRP: h_grp++; break;
|
||||
@@ -1182,7 +1182,7 @@ void top_urls_table(int flag)
|
||||
while (cnt--)
|
||||
{
|
||||
/* calculate totals */
|
||||
- switch ( (int)((UNODEPTR)(*pointer)->flag) )
|
||||
+ switch ( (*pointer)->flag )
|
||||
{
|
||||
case OBJ_REG: u_reg++; break;
|
||||
case OBJ_GRP: u_grp++; break;
|
||||
@@ -1436,7 +1436,7 @@ void top_entry_table(int flag)
|
||||
cnt=a_ctr; pointer=u_array;
|
||||
while (cnt--)
|
||||
{
|
||||
- if ( (int)((UNODEPTR)(*pointer)->flag) == OBJ_REG )
|
||||
+ if ( (*pointer)->flag == OBJ_REG )
|
||||
{
|
||||
if ( (u_int64_t)(((UNODEPTR)(*pointer))->entry) )
|
||||
{ u_entry++; t_entry+=(u_int64_t)(((UNODEPTR)(*pointer))->entry); }
|
||||
@@ -1540,7 +1540,7 @@ void top_refs_table()
|
||||
while(cnt--)
|
||||
{
|
||||
/* calculate totals */
|
||||
- switch ( (int)((RNODEPTR)(*pointer)->flag) )
|
||||
+ switch ( (*pointer)->flag )
|
||||
{
|
||||
case OBJ_REG: r_reg++; break;
|
||||
case OBJ_HIDE: r_hid++; break;
|
||||
@@ -1705,7 +1705,7 @@ void top_agents_table()
|
||||
while(cnt--)
|
||||
{
|
||||
/* calculate totals */
|
||||
- switch ( (int)((ANODEPTR)(*pointer)->flag) )
|
||||
+ switch ( (*pointer)->flag )
|
||||
{
|
||||
case OBJ_REG: a_reg++; break;
|
||||
case OBJ_GRP: a_grp++; break;
|
||||
@@ -1972,7 +1972,7 @@ void top_users_table()
|
||||
while(cnt--)
|
||||
{
|
||||
/* calculate totals */
|
||||
- switch ( (int)((INODEPTR)(*pointer)->flag) )
|
||||
+ switch ( (*pointer)->flag )
|
||||
{
|
||||
case OBJ_REG: i_reg++; break;
|
||||
case OBJ_GRP: i_grp++; break;
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
From: Julien Viard de Galbert <julien@vdg.blogsite.org>
|
||||
Subject: enable and add more SearchEngines in .conf file
|
||||
|
||||
Based on patch
|
||||
14_add_search_engines.dpatch by Jose Carlos Medeiros <debian@psabs.com.br>
|
||||
Also uncomment all SearchEngines directives.
|
||||
|
||||
#################################
|
||||
# SearchEngine field for the sensis.com.au search engine
|
||||
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=327496
|
||||
# From: Gavin Rogers <grogers@vk6hgr.echidna.id.au>
|
||||
|
||||
################################
|
||||
# Support for French versions of Google keywords
|
||||
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=253830
|
||||
# From: Cyril Bouthors <cyb@debian.org>
|
||||
No longer needed, the sample configuration matches the ".google." string.
|
||||
|
||||
Index: webalizer/sample.conf
|
||||
===================================================================
|
||||
--- webalizer.orig/sample.conf 2013-10-06 14:58:08.000000000 +0200
|
||||
+++ webalizer/sample.conf 2013-10-06 14:58:08.000000000 +0200
|
||||
@@ -710,21 +710,22 @@
|
||||
# engine, and the second is the URL variable used by that search engine
|
||||
# to define its 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=
|
||||
+SearchEngine sensis.com.au find=
|
||||
|
||||
# Normally, search strings are converted to lower case in order to
|
||||
# increase accuracy. The SearchCaseI option allows them to maintain
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
From: Julien Viard de Galbert <julien@vdg.blogsite.org>
|
||||
Date: Wed, 12 Jul 2017 23:59:31 +0200
|
||||
Subject: Fix typo supress -> suppress in sample.conf
|
||||
|
||||
---
|
||||
sample.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sample.conf b/sample.conf
|
||||
index 925f509..fc91d0c 100644
|
||||
--- a/sample.conf
|
||||
+++ b/sample.conf
|
||||
@@ -289,7 +289,7 @@ PageType cgi
|
||||
|
||||
#Quiet no
|
||||
|
||||
-# ReallyQuiet will supress all messages including errors and
|
||||
+# ReallyQuiet will suppress all messages including errors and
|
||||
# warnings. Values can be 'yes' or 'no' with 'no' being the
|
||||
# default. If 'yes' is used here, it cannot be overriden from
|
||||
# the command line, so use with caution. A value of 'no' has
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Description: Fix compilation with GCC 10.
|
||||
Author: Logan Rosen <logan@ubuntu.com>
|
||||
Bug-Debian: https://bugs.debian.org/957923
|
||||
Forwarded: no
|
||||
Reviewed-By: Francisco Vilmar Cardoso Ruviaro <francisco.ruviaro@riseup.net>
|
||||
Last-Update: 2021-02-12
|
||||
|
||||
--- a/dns_resolv.c
|
||||
+++ b/dns_resolv.c
|
||||
@@ -78,11 +78,11 @@
|
||||
|
||||
struct dns_child child[MAXCHILD]; /* DNS child pipe data */
|
||||
|
||||
-DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */
|
||||
+extern DNODEPTR host_table[MAXHASH]; /* hostname/ip hash table */
|
||||
|
||||
-char buffer[BUFSIZE]; /* log file record buffer */
|
||||
-char tmp_buf[BUFSIZE]; /* used to temp save above */
|
||||
-struct utsname system_info; /* system info structure */
|
||||
+extern char buffer[BUFSIZE]; /* log file record buffer */
|
||||
+extern char tmp_buf[BUFSIZE]; /* used to temp save above */
|
||||
+extern struct utsname system_info; /* system info structure */
|
||||
|
||||
int raiseSigChild = 1;
|
||||
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
%define _legacy_common_support 1
|
||||
|
||||
%define ver 2.23
|
||||
%define patchlevel 08
|
||||
|
||||
|
|
@ -10,10 +12,9 @@
|
|||
Name: webalizer
|
||||
Summary: A flexible Web server log file analysis program
|
||||
Version: 2.23_08
|
||||
Release: 29%{?dist}
|
||||
Release: 15%{?dist}
|
||||
URL: http://www.mrunix.net/webalizer/
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz
|
||||
Source1: webalizer.conf
|
||||
Source2: webalizer.cron
|
||||
|
|
@ -23,16 +24,10 @@ Patch4: webalizer-2.21-02-underrun.patch
|
|||
Patch6: webalizer-2.23-05-confuser.patch
|
||||
Patch9: webalizer-2.23-05-groupvisit.patch
|
||||
Patch10: webalizer-2.23-08-memmove.patch
|
||||
# From Debian
|
||||
Patch21: 02_fix_a_spelling_error.diff
|
||||
Patch22: 04_Fix_cast_warnings_in_output.c.diff
|
||||
Patch23: 14_add_search_engines.diff
|
||||
Patch24: 17_fix_typo_supress_suppress_in_sample.conf.diff
|
||||
Patch25: 27_fix_compilation_with_gcc-10.diff
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gd-devel, %{db_devel}, bzip2-devel
|
||||
BuildRequires: GeoIP-devel
|
||||
Requires(pre): shadow-utils
|
||||
Requires: httpd, crontabs
|
||||
|
||||
%description
|
||||
|
|
@ -44,20 +39,10 @@ Web traffic is coming from easy.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{ver}-%{patchlevel}
|
||||
%patch -P4 -p1 -b .underrun
|
||||
%patch -P6 -p1 -b .confuser
|
||||
%patch -P9 -p1 -b .groupvisit
|
||||
%patch -P10 -p1 -b .memmove
|
||||
%patch -P21 -p1 -b .spelling_error
|
||||
%patch -P22 -p1 -b .cast_warnings
|
||||
%patch -P23 -p1 -b .sample_add_search_engines
|
||||
%patch -P24 -p1 -b .sample_typo
|
||||
%patch -P25 -p1 -b .gcc10_common_support
|
||||
|
||||
# Create a sysusers.d config file
|
||||
cat >webalizer.sysusers.conf <<EOF
|
||||
u webalizer - 'Webalizer' %{_localstatedir}/www/usage -
|
||||
EOF
|
||||
%patch4 -p1 -b .underrun
|
||||
%patch6 -p1 -b .confuser
|
||||
%patch9 -p1 -b .groupvisit
|
||||
%patch10 -p1 -b .memmove
|
||||
|
||||
%build
|
||||
#CPPFLAGS="-I%{_includedir}/db4" ; export CPPFLAGS
|
||||
|
|
@ -87,8 +72,12 @@ install -p -m 644 %{SOURCE4} \
|
|||
|
||||
rm -f %{buildroot}%{_sysconfdir}/webalizer.conf.sample
|
||||
|
||||
install -m0644 -D webalizer.sysusers.conf %{buildroot}%{_sysusersdir}/webalizer.conf
|
||||
|
||||
%pre
|
||||
getent group webalizer >/dev/null || groupadd -r webalizer
|
||||
getent passwd webalizer >/dev/null || \
|
||||
useradd -r -g webalizer -d %{_localstatedir}/www/usage -s /sbin/nologin \
|
||||
-c "Webalizer" -u 67 webalizer
|
||||
exit 0
|
||||
|
||||
%files
|
||||
%doc README
|
||||
|
|
@ -101,51 +90,8 @@ install -m0644 -D webalizer.sysusers.conf %{buildroot}%{_sysusersdir}/webalizer.
|
|||
%attr(-, webalizer, root) %dir %{_localstatedir}/www/usage
|
||||
%attr(-, webalizer, root) %dir %{_localstatedir}/lib/webalizer
|
||||
%attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png
|
||||
%{_sysusersdir}/webalizer.conf
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.23_08-28
|
||||
- Add sysusers.d config file to allow rpm to create users/groups automatically
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.23_08-26
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Jan 15 2022 Sérgio Basto <sergio@serjux.com> - 2.23_08-19
|
||||
- Add some patches from Debian, fix gcc10 common support
|
||||
|
||||
* Sat Jan 15 2022 Sérgio Basto <sergio@serjux.com> - 2.23_08-18
|
||||
- Fix warning message (#2040985)
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.23_08-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue