--- a/components/webalizer/Makefile Fri Mar 11 10:04:18 2016 -0800
+++ b/components/webalizer/Makefile Fri Mar 11 10:20:28 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
COMPILER = gcc
@@ -28,17 +28,17 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= webalizer
-COMPONENT_VERSION= 2.21.2
-HUMAN_VERSION= 2.21-02
+COMPONENT_VERSION= 2.23.8
+HUMAN_VERSION= 2.23-08
COMPONENT_PROJECT_URL= http://www.mrunix.net/webalizer/
COMPONENT_SRC= $(COMPONENT_NAME)-$(HUMAN_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC)-src.tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9
+ sha256:b37524fbd98e97052a80d59f75e69f857468752cf74cc0eb0972e5fab02eb6f7
COMPONENT_ARCHIVE_URL= ftp://ftp.mrunix.net/pub/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/webalizer
-TPNO= 9201
+TPNO= 27276
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
@@ -49,7 +49,7 @@
# Adjust the log file pathname in the sample configuration file.
COMPONENT_PRE_BUILD_ACTION += \
- $(GSED) -i -e 's?lib/httpd/logs/?apache2/2.2/logs/?' \
+ $(GSED) -i -e 's?lib/httpd/logs/?apache2/2.4/logs/?' \
$(SOURCE_DIR)/sample.conf
CONFIGURE_OPTIONS += --enable-dns
--- a/components/webalizer/patches/webalizer-2.01-10-groupvisit.patch Fri Mar 11 10:04:18 2016 -0800
+++ b/components/webalizer/patches/webalizer-2.01-10-groupvisit.patch Fri Mar 11 10:20:28 2016 -0800
@@ -1,15 +1,21 @@
---- webalizer-2.01-10/hashtab.c.groupvisit 2001-06-15 11:34:24.000000000 +0300
-+++ webalizer-2.01-10/hashtab.c 2006-03-30 12:52:30.000000000 +0300
-@@ -94,6 +94,8 @@
+Found in the wild at:
+
+http://www.oss4aix.org/download/patches/webalizer-2.01-10-groupvisit.patch
+
+https://gitlab.7f.dk/Kralian/oi-userland/blob/ef967b086bc86c4e4af7237f974cb574547bde30/components/webalizer/patches/webalizer-2.01-10-groupvisit.patch
+
+--- webalizer-2.23-08/hashtab.c.orig 2016-03-08 14:40:57.594469202 -0800
++++ webalizer-2.23-08/hashtab.c 2016-03-08 14:46:27.371481210 -0800
+@@ -88,6 +88,8 @@
DNODEPTR host_table[MAXHASH]; /* DNS hash table */
#endif /* USE_DNS */
+u_long pre_tstamp = 0; /* prev. real record tstamp */
+
-
/*********************************************/
/* DEL_HTABS - clear out our hash tables */
-@@ -184,6 +186,7 @@
+ /*********************************************/
+@@ -179,6 +181,7 @@
nptr->visit=(visit-1);
nptr->lasturl=find_url(lasturl);
nptr->tstamp=tstamp;
@@ -17,7 +23,7 @@
return 0;
}
else
-@@ -193,6 +196,7 @@
+@@ -188,6 +191,7 @@
if (htab==sm_htab) update_entry(log_rec.url);
nptr->lasturl=find_url(log_rec.url);
nptr->tstamp=tstamp;
@@ -25,7 +31,7 @@
nptr->visit=1;
}
}
-@@ -214,7 +218,8 @@
+@@ -208,7 +212,8 @@
if (ispage(log_rec.url))
{
@@ -35,7 +41,7 @@
{
cptr->visit++;
if (htab==sm_htab)
-@@ -247,6 +252,7 @@
+@@ -241,6 +246,7 @@
nptr->visit = (visit-1);
nptr->lasturl=find_url(lasturl);
nptr->tstamp= tstamp;
@@ -43,7 +49,7 @@
return 0;
}
else
-@@ -256,6 +262,7 @@
+@@ -250,6 +256,7 @@
if (htab==sm_htab) update_entry(log_rec.url);
nptr->lasturl=find_url(log_rec.url);
nptr->tstamp= tstamp;
@@ -51,7 +57,7 @@
nptr->visit=1;
}
}
-@@ -840,11 +847,16 @@
+@@ -845,11 +852,16 @@
{
nptr->visit=(visit-1);
nptr->tstamp=tstamp;
@@ -61,7 +67,7 @@
else
{
- if (ispage(log_rec.url)) nptr->tstamp=tstamp;
-+ if (ispage(log_rec.url))
++ if (ispage(log_rec.url))
+ {
+ nptr->tstamp=tstamp;
+ if ((type!=OBJ_GRP)&&(nptr->flag!=OBJ_GRP)) pre_tstamp=nptr->tstamp;
@@ -69,7 +75,7 @@
}
}
}
-@@ -864,7 +876,8 @@
+@@ -869,7 +881,8 @@
if (ispage(log_rec.url))
{
@@ -79,7 +85,7 @@
cptr->visit++;
cptr->tstamp=tstamp;
}
-@@ -888,11 +901,16 @@
+@@ -893,11 +906,16 @@
{
nptr->visit = (visit-1);
nptr->tstamp= tstamp;
--- a/components/webalizer/webalizer.license Fri Mar 11 10:04:18 2016 -0800
+++ b/components/webalizer/webalizer.license Fri Mar 11 10:20:28 2016 -0800
@@ -1,12 +1,30 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ Copyright (C) 1997-2013 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version, and provided that the above
+ copyright and permission notice is included with all distributed
+ copies of this or derived software.
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +33,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
+the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +73,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +128,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +186,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +243,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +273,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +295,9 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -291,7 +309,7 @@
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (C) 19yy <name of author>
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
@@ -303,16 +321,16 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -335,6 +353,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
+library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
-