[packages/analog] Up to 6.0.18
arekm
arekm at pld-linux.org
Sun May 17 00:46:02 CEST 2026
commit 6d84e551a04292e48bbc373e39cca9b44a851a51
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun May 17 00:23:32 2026 +0200
Up to 6.0.18
analog-config.patch | 63 ++++++++++++++++------------------------
analog-system-pcre2.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++
analog.spec | 31 ++++++++++++--------
3 files changed, 118 insertions(+), 50 deletions(-)
---
diff --git a/analog.spec b/analog.spec
index 416a805..d4d6a03 100644
--- a/analog.spec
+++ b/analog.spec
@@ -4,16 +4,19 @@
Summary: WWW server logfile analysis program
Summary(pl.UTF-8): Analizator logów serwera WWW
Name: analog
-Version: 6.0
-Release: 8
+Version: 6.0.18
+Release: 1
License: GPL v2
Group: Networking/Utilities
-#Source0Download: http://www.analog.cx/download.html
-Source0: http://www.analog.cx/%{name}-%{version}.tar.gz
-# Source0-md5: 743d03a16eb8c8488205ae63cdb671cd
+#Source0Download: https://github.com/c-amie/analog-ce/releases
+Source0: https://github.com/c-amie/analog-ce/archive/refs/tags/%{version}.tar.gz
+# Source0-md5: 334cfdc27f61797df12f1c40f4b2ce62
Patch0: %{name}-config.patch
+Patch1: %{name}-system-pcre2.patch
+BuildRequires: pcre2-8-devel
+BuildRequires: pkgconfig
Requires: webserver
-URL: http://www.analog.cx/
+URL: https://github.com/c-amie/analog-ce
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _appdir %{_datadir}/%{name}
@@ -46,14 +49,16 @@ wygenerować nowy plik formularza po ustawieniu odpowiednich opcji w
'analog -form +O%{_appdir}/html/anlgform.html'
%prep
-%setup -q
+%setup -q -n %{name}-ce-%{version}
%patch -P0 -p1
+%patch -P1 -p1
%build
-%{__make} %{name} \
+%{__make} -C src \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags}" \
- CEXTRAFLAGS="%{rpmcflags}"
+ CFLAGS="%{rpmcppflags} %{rpmcflags} $(pkg-config --cflags libpcre2-8)" \
+ DEFS="-DHAVE_PCRE" \
+ LIBS="$(pkg-config --libs libpcre2-8) -lm"
%install
rm -rf $RPM_BUILD_ROOT
@@ -62,9 +67,9 @@ install -d $RPM_BUILD_ROOT%{_appdir}/{icons,cgi-bin,html/usage,lang} \
$RPM_BUILD_ROOT%{_mandir}/man1
install analog $RPM_BUILD_ROOT%{_bindir}
-install analog.cfg $RPM_BUILD_ROOT/etc/%{name}.cfg
+install analog.cfg-sample $RPM_BUILD_ROOT/etc/%{name}.cfg
install lang/* $RPM_BUILD_ROOT%{_appdir}/lang
-install analog.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+install analog.cfg-sample $RPM_BUILD_ROOT%{_sysconfdir}/analog.cfg
install images/* $RPM_BUILD_ROOT%{_appdir}/icons
install anlgform.html $RPM_BUILD_ROOT%{_appdir}/html/usage
install anlgform.pl $RPM_BUILD_ROOT%{_appdir}/cgi-bin
@@ -82,10 +87,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(775,root,http) %dir %{_var}/lib/%{name}
%dir %{_sysconfdir}
%config(noreplace) %verify(not md5 mtime size) /etc/%{name}.cfg
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/analog.cfg
%attr(755,root,root) %{_bindir}/analog
%dir %{_appdir}/lang
%{_appdir}/lang/*.*
%dir %{_appdir}/icons
+%{_appdir}/icons/*.css
%{_appdir}/icons/*.gif
%{_appdir}/icons/*.png
%dir %{_appdir}/html
diff --git a/analog-config.patch b/analog-config.patch
index 75319e2..023f964 100644
--- a/analog-config.patch
+++ b/analog-config.patch
@@ -1,46 +1,33 @@
-diff -urN analog-5.22/anlgform.html analog-5.22.new/anlgform.html
---- analog-5.22/anlgform.html Wed Mar 20 10:38:41 2002
-+++ analog-5.22.new/anlgform.html Fri Apr 5 12:38:44 2002
-@@ -3,7 +3,7 @@
- </head>
-
- <body>
--<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
-+<h1><img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
-
- <!-- Make the edits below. You also need to edit anlgform.pl. -->
-
-@@ -15,10 +15,12 @@
-
+diff -urN analog-ce-6.0.18.orig2/anlgform.html analog-ce-6.0.18/anlgform.html
+--- analog-ce-6.0.18.orig2/anlgform.html 2024-08-14 16:39:50.000000000 +0200
++++ analog-ce-6.0.18/anlgform.html 2026-03-14 03:02:58.016015947 +0100
+@@ -15,9 +15,10 @@
+ <!-- form action="/cgi-bin/anlgform.pl" method="POST" -->
<!-- Many systems will want the IMAGEDIR to be different on the form -->
<!-- than from the command line, because it should not be within /cgi-bin/ -->
-<!-- input type=hidden name="IMAGEDIR" value="/images/" -->
+<!-- input type=hidden name="IMAGEDIR" value="/icons/" -->
-
<!-- Some users will want to set their logfile like this. -->
<!-- input type=hidden name="LOGFILE" value="/usr/local/etc/httpd/logs/access_log" -->
+<!-- input type=hidden name="LOGFILE" value="/usr/var/httpd/log/access_log" -->
-+
-
<!-- After you've made these edits, you can remove the "strong" lines below -->
-
-diff -urN analog-5.22/anlgform.pl analog-5.22.new/anlgform.pl
---- analog-5.22/anlgform.pl Wed Mar 20 10:38:41 2002
-+++ analog-5.22.new/anlgform.pl Fri Apr 5 12:39:39 2002
-@@ -19,6 +19,7 @@
+ <hr>
+ <h2>1. Report choices</h2>
+diff -urN analog-ce-6.0.18.orig2/anlgform.pl analog-ce-6.0.18/anlgform.pl
+--- analog-ce-6.0.18.orig2/anlgform.pl 2024-08-14 16:39:50.000000000 +0200
++++ analog-ce-6.0.18/anlgform.pl 2026-03-14 03:02:58.016057249 +0100
+@@ -24,6 +24,7 @@
# of Perl (don't remove the #! though).
# 3) You also need to edit anlgform.html if you want to use the form.
# 4) Add to the forbidden commands below if you want.
-+$analog='/usr/bin/analog'
++$analog='/usr/bin/analog';
@forbidden = qw(LOGFORMAT APACHELOGFORMAT DEFAULTLOGFORMAT
APACHEDEFAULTLOGFORMAT HEADERFILE FOOTERFILE UNCOMPRESS
-Binary files analog-5.22/src/alias.o and analog-5.22.new/src/alias.o differ
-Binary files analog-5.22/src/analog.o and analog-5.22.new/src/analog.o differ
-diff -urN analog-5.22/src/anlghea2.h analog-5.22.new/src/anlghea2.h
---- analog-5.22/src/anlghea2.h Wed Mar 20 10:38:51 2002
-+++ analog-5.22.new/src/anlghea2.h Fri Apr 5 12:40:33 2002
-@@ -50,11 +50,12 @@
+diff -urN analog-ce-6.0.18.orig2/src/anlghea2.h analog-ce-6.0.18/src/anlghea2.h
+--- analog-ce-6.0.18.orig2/src/anlghea2.h 2024-08-14 16:39:50.000000000 +0200
++++ analog-ce-6.0.18/src/anlghea2.h 2026-03-14 03:02:58.015967301 +0100
+@@ -55,11 +55,11 @@
#endif
#ifndef NODNS
@@ -51,14 +38,13 @@ diff -urN analog-5.22/src/anlghea2.h analog-5.22.new/src/anlghea2.h
-#define DNSLOCKFILE "dnslock"
+#define DNSLOCKFILE "/var/lock/dnslock"
-+
/* A lock file to stop two processes trying to write the DNSFILE at once */
#define DNS (DNS_NONE)
-diff -urN analog-5.22/src/anlghead.h analog-5.22.new/src/anlghead.h
---- analog-5.22/src/anlghead.h Wed Mar 20 10:38:52 2002
-+++ analog-5.22.new/src/anlghead.h Fri Apr 5 12:42:55 2002
-@@ -19,30 +19,31 @@
+diff -urN analog-ce-6.0.18.orig2/src/anlghead.h analog-ce-6.0.18/src/anlghead.h
+--- analog-ce-6.0.18.orig2/src/anlghead.h 2024-08-14 16:39:50.000000000 +0200
++++ analog-ce-6.0.18/src/anlghead.h 2026-03-14 03:02:58.015896867 +0100
+@@ -24,13 +24,13 @@
#define ANLGHEAD_H
#ifndef HOSTNAME
@@ -73,7 +59,9 @@ diff -urN analog-5.22/src/anlghead.h analog-5.22.new/src/anlghead.h
+#define HOSTURL "/"
/* The URL of your host's home page, for linking to at the top of the
output; use "none" for no linking. */
- #endif
+ #endif
+@@ -48,18 +48,18 @@
+ #endif
#ifndef LOGFILE
-#define LOGFILE "logfile.log"
@@ -85,7 +73,6 @@ diff -urN analog-5.22/src/anlghead.h analog-5.22.new/src/anlghead.h
#ifndef OUTFILE
-#define OUTFILE "stdout"
+#define OUTFILE "/home/services/httpd/html/usage/analog.html"
-+
/* The default file for output. Use "stdout" for stdout. */
#endif
@@ -95,7 +82,7 @@ diff -urN analog-5.22/src/anlghead.h analog-5.22.new/src/anlghead.h
/* URL of the directory where the images for the graphical reports live.
The URL can be absolute, or relative to the output page: e.g., just the
empty string "" for the same directory as the output page. */
-@@ -61,7 +62,7 @@
+@@ -84,7 +84,7 @@
#endif
#ifndef DEFAULTCONFIGFILE
@@ -104,7 +91,7 @@ diff -urN analog-5.22/src/anlghead.h analog-5.22.new/src/anlghead.h
/* The name of the default configuration file. */
#endif
-@@ -82,7 +83,7 @@
+@@ -105,7 +105,7 @@
directory. This may or may not work, so it's better to specify a location
explicitly here if you know where the files will be kept. */
#ifndef LANGDIR
diff --git a/analog-system-pcre2.patch b/analog-system-pcre2.patch
new file mode 100644
index 0000000..4a900b4
--- /dev/null
+++ b/analog-system-pcre2.patch
@@ -0,0 +1,74 @@
+diff -urN analog-ce-6.0.18.orig/src/anlghea3.h analog-ce-6.0.18/src/anlghea3.h
+--- analog-ce-6.0.18.orig/src/anlghea3.h 2024-08-14 16:39:50.000000000 +0200
++++ analog-ce-6.0.18/src/anlghea3.h 2026-03-14 03:08:53.816587335 +0100
+@@ -262,7 +262,11 @@
+ #include "bzip2/bzlib.h"
+ #endif
+
++#ifdef HAVE_PCRE
++#include <pcre2.h>
++#else
+ #include "pcre2/src/pcre2.h.generic"
++#endif
+
+ #include "libgd/gd.h"
+ #include "libgd/gdfontf.h"
+diff -urN analog-ce-6.0.18.orig/src/Makefile analog-ce-6.0.18/src/Makefile
+--- analog-ce-6.0.18.orig/src/Makefile 2024-08-14 16:39:50.000000000 +0200
++++ analog-ce-6.0.18/src/Makefile 2026-03-14 03:09:27.003253994 +0100
+@@ -54,32 +54,12 @@
+ input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \
+ outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \
+ tree.o utils.o win32.o
+-SUBDIRS = bzip2 libgd libpng pcre2 unzip zlib
++SUBDIRS = bzip2 libgd libpng unzip zlib
+ SUBDIROBJS = libgd/gd.o libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \
+ libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \
+ libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \
+ libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o \
+ libpng/pngwtran.o libpng/pngwutil.o \
+- pcre2/src/libpcre2_8_la-pcre2_auto_possess.o \
+- pcre2/src/libpcre2_8_la-pcre2_chartables.o \
+- pcre2/src/libpcre2_8_la-pcre2_chkdint.o \
+- pcre2/src/libpcre2_8_la-pcre2_compile.o \
+- pcre2/src/libpcre2_8_la-pcre2_context.o \
+- pcre2/src/libpcre2_8_la-pcre2_convert.o \
+- pcre2/src/libpcre2_8_la-pcre2_extuni.o \
+- pcre2/src/libpcre2_8_la-pcre2_find_bracket.o \
+- pcre2/src/libpcre2_8_la-pcre2_match.o \
+- pcre2/src/libpcre2_8_la-pcre2_match_data.o \
+- pcre2/src/libpcre2_8_la-pcre2_newline.o \
+- pcre2/src/libpcre2_8_la-pcre2_ord2utf.o \
+- pcre2/src/libpcre2_8_la-pcre2_pattern_info.o \
+- pcre2/src/libpcre2_8_la-pcre2_script_run.o \
+- pcre2/src/libpcre2_8_la-pcre2_string_utils.o \
+- pcre2/src/libpcre2_8_la-pcre2_study.o \
+- pcre2/src/libpcre2_8_la-pcre2_tables.o \
+- pcre2/src/libpcre2_8_la-pcre2_ucd.o \
+- pcre2/src/libpcre2_8_la-pcre2_valid_utf.o \
+- pcre2/src/libpcre2_8_la-pcre2_xclass.o \
+ zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \
+ zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
+ zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
+@@ -87,7 +67,7 @@
+ bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \
+ bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o
+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \
+- pcre2/src/pcre2.h.generic libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \
++ libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \
+ zlib/zlib.h bzip2/bzlib.h
+ ALLCFLAGS = $(CFLAGS) $(DEFS) -D$(OS)
+ ALLOBJS = $(OBJS) $(SUBDIROBJS)
+@@ -106,12 +86,6 @@
+ libpng: ALWAYS
+ cd libpng && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
+
+-pcre2: ALWAYS
+- chmod 755 pcre2/132html pcre2/ar-lib pcre2/CheckMan pcre2/CleanTxt pcre2/compile pcre2/config.guess pcre2/config.sub pcre2/configure pcre2/depcomp pcre2/Detrail pcre2/install-sh pcre2/missing pcre2/perltest.sh pcre2/PrepareRelease pcre2/RunGrepTest pcre2/RunTest pcre2/test-driver
+- chmod 755 pcre2/cmake pcre2/doc pcre2/m4 pcre2/src pcre2/testdata pcre2/vms
+- chmod 755 pcre2/src/sljit pcre2/src/sljit/allocator_src/
+- cd pcre2 && ./configure && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
+-
+ unzip: ALWAYS
+ cd unzip && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/analog.git/commitdiff/6d84e551a04292e48bbc373e39cca9b44a851a51
More information about the pld-cvs-commit
mailing list