From 2d275c8e1bc6007d3ff884a3727fe3643620dc6c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:51:45 +0000 Subject: [PATCH 01/16] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- webalizer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/webalizer.spec b/webalizer.spec index c1b952a..a5f9607 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -24,6 +24,7 @@ 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 +BuildRequires: make BuildRequires: gcc BuildRequires: gd-devel, %{db_devel}, bzip2-devel BuildRequires: GeoIP-devel From 06dcb8b05e32bdc7eb3daf6351f704849ae5570c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:23:45 +0000 Subject: [PATCH 02/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index a5f9607..74bcc9f 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -12,7 +12,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 15%{?dist} +Release: 16%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -93,6 +93,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.23_08-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.23_08-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 302e0c696a489f68011b015389e6728a9d07cd61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:50:13 +0000 Subject: [PATCH 03/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 74bcc9f..492de37 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -12,7 +12,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 16%{?dist} +Release: 17%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -93,6 +93,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.23_08-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.23_08-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 44ebe36907a48aa475c7fea4d4c822eae8bfa7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 15 Jan 2022 15:23:47 +0000 Subject: [PATCH 04/16] Fix warning message (#2040985) --- webalizer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webalizer.spec b/webalizer.spec index 492de37..bb220aa 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -12,7 +12,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 17%{?dist} +Release: 18%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -77,7 +77,7 @@ rm -f %{buildroot}%{_sysconfdir}/webalizer.conf.sample 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 + -c "Webalizer" webalizer exit 0 %files @@ -93,6 +93,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jan 15 2022 Sérgio Basto - 2.23_08-18 +- Fix warning message (#2040985) + * Fri Jul 23 2021 Fedora Release Engineering - 2.23_08-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 99084dfb294f0aee7dd1ffbc047ffd56429ee5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 15 Jan 2022 16:28:44 +0000 Subject: [PATCH 05/16] Add some patches from Debian, fix gcc10 common support --- 02_fix_a_spelling_error.diff | 28 ++++++++ 04_Fix_cast_warnings_in_output.c.diff | 67 +++++++++++++++++++ 14_add_search_engines.diff | 60 +++++++++++++++++ ..._typo_supress_suppress_in_sample.conf.diff | 21 ++++++ 27_fix_compilation_with_gcc-10.diff | 25 +++++++ webalizer.spec | 18 ++++- 6 files changed, 216 insertions(+), 3 deletions(-) create mode 100644 02_fix_a_spelling_error.diff create mode 100644 04_Fix_cast_warnings_in_output.c.diff create mode 100644 14_add_search_engines.diff create mode 100644 17_fix_typo_supress_suppress_in_sample.conf.diff create mode 100644 27_fix_compilation_with_gcc-10.diff diff --git a/02_fix_a_spelling_error.diff b/02_fix_a_spelling_error.diff new file mode 100644 index 0000000..5346799 --- /dev/null +++ b/02_fix_a_spelling_error.diff @@ -0,0 +1,28 @@ +From: Julien Viard de Galbert +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); + } + } + } diff --git a/04_Fix_cast_warnings_in_output.c.diff b/04_Fix_cast_warnings_in_output.c.diff new file mode 100644 index 0000000..f7d7277 --- /dev/null +++ b/04_Fix_cast_warnings_in_output.c.diff @@ -0,0 +1,67 @@ +From: Julien Viard de Galbert +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; diff --git a/14_add_search_engines.diff b/14_add_search_engines.diff new file mode 100644 index 0000000..06535a4 --- /dev/null +++ b/14_add_search_engines.diff @@ -0,0 +1,60 @@ +From: Julien Viard de Galbert +Subject: enable and add more SearchEngines in .conf file + +Based on patch +14_add_search_engines.dpatch by Jose Carlos Medeiros +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 + +################################ +# Support for French versions of Google keywords +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=253830 +# From: Cyril Bouthors +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 diff --git a/17_fix_typo_supress_suppress_in_sample.conf.diff b/17_fix_typo_supress_suppress_in_sample.conf.diff new file mode 100644 index 0000000..d7f2764 --- /dev/null +++ b/17_fix_typo_supress_suppress_in_sample.conf.diff @@ -0,0 +1,21 @@ +From: Julien Viard de Galbert +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 diff --git a/27_fix_compilation_with_gcc-10.diff b/27_fix_compilation_with_gcc-10.diff new file mode 100644 index 0000000..e42bdca --- /dev/null +++ b/27_fix_compilation_with_gcc-10.diff @@ -0,0 +1,25 @@ +Description: Fix compilation with GCC 10. +Author: Logan Rosen +Bug-Debian: https://bugs.debian.org/957923 +Forwarded: no +Reviewed-By: Francisco Vilmar Cardoso Ruviaro +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; + diff --git a/webalizer.spec b/webalizer.spec index bb220aa..6018382 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -1,5 +1,3 @@ -%define _legacy_common_support 1 - %define ver 2.23 %define patchlevel 08 @@ -12,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 18%{?dist} +Release: 19%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -24,6 +22,12 @@ 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 @@ -44,6 +48,11 @@ Web traffic is coming from easy. %patch6 -p1 -b .confuser %patch9 -p1 -b .groupvisit %patch10 -p1 -b .memmove +%patch21 -p1 -b .spelling_error +%patch22 -p1 -b .cast_warnings +%patch23 -p1 -b .sample_add_search_engines +%patch24 -p1 -b .sample_typo +%patch25 -p1 -b .gcc10_common_support %build #CPPFLAGS="-I%{_includedir}/db4" ; export CPPFLAGS @@ -93,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jan 15 2022 Sérgio Basto - 2.23_08-19 +- Add some patches from Debian, fix gcc10 common support + * Sat Jan 15 2022 Sérgio Basto - 2.23_08-18 - Fix warning message (#2040985) From 5af73fad6676103e3a035f3cec214130a2f3b3bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:21:27 +0000 Subject: [PATCH 06/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 6018382..71e9625 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 19%{?dist} +Release: 20%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -102,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.23_08-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 15 2022 Sérgio Basto - 2.23_08-19 - Add some patches from Debian, fix gcc10 common support From 938b21a42ff6a5c6930eaad98fe72db2ff7fcf6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:17:56 +0000 Subject: [PATCH 07/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 71e9625..37bae7f 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 20%{?dist} +Release: 21%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -102,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.23_08-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.23_08-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 69921f6fc6b7c7ee4c230560f41673189857a26f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:41:58 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 37bae7f..22aecfc 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 21%{?dist} +Release: 22%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -102,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.23_08-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.23_08-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 034a6a93aa1137b09e9c495b68520f1738e8cc49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:04:29 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 22aecfc..86601b7 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 22%{?dist} +Release: 23%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -102,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.23_08-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.23_08-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a03c0126203691c979a655ae7a0f140634c93c49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:32:15 +0000 Subject: [PATCH 10/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 86601b7..fd99a74 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 23%{?dist} +Release: 24%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -102,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.23_08-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.23_08-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4337b4d498d21a87487935ad30c64c7c085f472a Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 11/16] Eliminate use of obsolete %patchN syntax (#2283636) --- webalizer.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/webalizer.spec b/webalizer.spec index fd99a74..4b470f5 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -44,15 +44,15 @@ Web traffic is coming from easy. %prep %setup -q -n %{name}-%{ver}-%{patchlevel} -%patch4 -p1 -b .underrun -%patch6 -p1 -b .confuser -%patch9 -p1 -b .groupvisit -%patch10 -p1 -b .memmove -%patch21 -p1 -b .spelling_error -%patch22 -p1 -b .cast_warnings -%patch23 -p1 -b .sample_add_search_engines -%patch24 -p1 -b .sample_typo -%patch25 -p1 -b .gcc10_common_support +%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 %build #CPPFLAGS="-I%{_includedir}/db4" ; export CPPFLAGS From 98204d12f113478b21858fa729fba3f5df6be249 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:12:44 +0000 Subject: [PATCH 12/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index 4b470f5..ecb81bd 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 24%{?dist} +Release: 25%{?dist} URL: http://www.mrunix.net/webalizer/ License: GPLv2+ Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz @@ -102,6 +102,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.23_08-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.23_08-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 061d6909e06e640af959a8933df175471bfa0cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:38:43 +0200 Subject: [PATCH 13/16] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- webalizer.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webalizer.spec b/webalizer.spec index ecb81bd..d7ad7a0 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,9 +10,10 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 25%{?dist} +Release: 26%{?dist} URL: http://www.mrunix.net/webalizer/ -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tgz Source1: webalizer.conf Source2: webalizer.cron @@ -102,6 +103,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.23_08-26 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.23_08-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 140b2f2f29ca6d7892ea75b0ba583be00bdbbfc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:51:51 +0000 Subject: [PATCH 14/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index d7ad7a0..85ca250 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 26%{?dist} +Release: 27%{?dist} URL: http://www.mrunix.net/webalizer/ # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -103,6 +103,9 @@ exit 0 %attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.23_08-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.23_08-26 - convert license to SPDX From eaab36ec0d5eb0ab13a2fa6761be0b9aead48261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:12 +0100 Subject: [PATCH 15/16] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- webalizer.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/webalizer.spec b/webalizer.spec index 85ca250..ec83a8e 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 27%{?dist} +Release: 28%{?dist} URL: http://www.mrunix.net/webalizer/ # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -33,7 +33,6 @@ BuildRequires: make BuildRequires: gcc BuildRequires: gd-devel, %{db_devel}, bzip2-devel BuildRequires: GeoIP-devel -Requires(pre): shadow-utils Requires: httpd, crontabs %description @@ -55,6 +54,11 @@ Web traffic is coming from easy. %patch -P24 -p1 -b .sample_typo %patch -P25 -p1 -b .gcc10_common_support +# Create a sysusers.d config file +cat >webalizer.sysusers.conf </dev/null || groupadd -r webalizer -getent passwd webalizer >/dev/null || \ - useradd -r -g webalizer -d %{_localstatedir}/www/usage -s /sbin/nologin \ - -c "Webalizer" webalizer -exit 0 +install -m0644 -D webalizer.sysusers.conf %{buildroot}%{_sysusersdir}/webalizer.conf + %files %doc README @@ -101,8 +101,12 @@ exit 0 %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 +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.23_08-28 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.23_08-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7dd1638b9c6bdbcfa2194ee687a21e70a231fdc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:20:42 +0000 Subject: [PATCH 16/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- webalizer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webalizer.spec b/webalizer.spec index ec83a8e..82a2613 100644 --- a/webalizer.spec +++ b/webalizer.spec @@ -10,7 +10,7 @@ Name: webalizer Summary: A flexible Web server log file analysis program Version: 2.23_08 -Release: 28%{?dist} +Release: 29%{?dist} URL: http://www.mrunix.net/webalizer/ # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -104,6 +104,9 @@ install -m0644 -D webalizer.sysusers.conf %{buildroot}%{_sysusersdir}/webalizer. %{_sysusersdir}/webalizer.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.23_08-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.23_08-28 - Add sysusers.d config file to allow rpm to create users/groups automatically