[packages/free-sa] Rel 2

[arekm]

commit c189da58802a56faa8a3283ff821d1b96058f1e7
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 21 15:58:30 2026 +0200

    Rel 2

 free-sa-build.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 free-sa.spec        |  9 ++++++---
 2 files changed, 63 insertions(+), 3 deletions(-)
---
diff --git a/free-sa.spec b/free-sa.spec
index 0dca870..2dc86a4 100644
--- a/free-sa.spec
+++ b/free-sa.spec
@@ -1,14 +1,14 @@
-# TODO: optflags
 Summary:	Squid report generator per user/IP/name
 Summary(pl.UTF-8):	Generator raportów ze squida
 Name:		free-sa
 Version:	1.6.2
-Release:	1
+Release:	2
 License:	GPL v3
 Group:		Networking/Utilities
 Source0:	http://dl.sourceforge.net/free-sa/%{name}-%{version}.tar.gz
 # Source0-md5:	4f65f0840ab6f4bdb3513f533d6c4719
 Patch0:		%{name}-global.mk.patch
+Patch1:		%{name}-build.patch
 URL:		http://free-sa.sourceforge.net/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,10 +27,13 @@ wygenerowanego kodu HTML/CSS z wytycznymi W3C.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__make} \
-	CC="%{__cc}"
+	CC="%{__cc}" \
+	ADDCFLAGS="%{rpmcflags} %{rpmcppflags}" \
+	ADDLDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/free-sa-build.patch b/free-sa-build.patch
new file mode 100644
index 0000000..c384fbb
--- /dev/null
+++ b/free-sa-build.patch
@@ -0,0 +1,57 @@
+--- free-sa-1.6.2.orig/src/work/w_log_operations.h	2026-05-21 01:37:27.197287650 +0200
++++ free-sa-1.6.2/src/work/w_log_operations.h	2026-05-21 01:37:34.536219023 +0200
+@@ -10,11 +10,11 @@
+ extern int ccCount;
+ 
+ 
+-struct MailRecord *(* READ_RECORDM)(FILE *iLog);
+-char (* READ_RECORDI)(FILE *Log, time_t *ttime, double *tSeconds, char *tip, short int *tcode, double *tBytes, char *tmethod, char *turl, char *tname, char *tstat);
+-char (* READ_DTI)(FILE *Log, time_t *ttime);
+-char (* READ_FULLDTI)(FILE *Log, time_t *ttime, char *tbuf);
+-void (* READ_ALIGN)(FILE *Log);
++extern struct MailRecord *(* READ_RECORDM)(FILE *iLog);
++extern char (* READ_RECORDI)(FILE *Log, time_t *ttime, double *tSeconds, char *tip, short int *tcode, double *tBytes, char *tmethod, char *turl, char *tname, char *tstat);
++extern char (* READ_DTI)(FILE *Log, time_t *ttime);
++extern char (* READ_FULLDTI)(FILE *Log, time_t *ttime, char *tbuf);
++extern void (* READ_ALIGN)(FILE *Log);
+ 
+ 
+ extern short int ComputeIndics(short int tcode, char tmethod, char *turl, char *tstat, char *iname, double tbytes);
+--- free-sa-1.6.2.orig/src/work/w_log_operations.c	2026-05-21 01:37:27.197447342 +0200
++++ free-sa-1.6.2/src/work/w_log_operations.c	2026-05-21 01:37:42.426219023 +0200
+@@ -6,6 +6,12 @@
+ struct BSC ec[CODESSIZE];
+ struct BSC all[5] = { { 0.0, 0.0, 0 }, { 0.0, 0.0, 0 }, { 0.0, 0.0, 0 }, { 0.0, 0.0, 0 }, { 0.0, 0.0, 0 } };
+ 
++struct MailRecord *(* READ_RECORDM)(FILE *iLog);
++char (* READ_RECORDI)(FILE *Log, time_t *ttime, double *tSeconds, char *tip, short int *tcode, double *tBytes, char *tmethod, char *turl, char *tname, char *tstat);
++char (* READ_DTI)(FILE *Log, time_t *ttime);
++char (* READ_FULLDTI)(FILE *Log, time_t *ttime, char *tbuf);
++void (* READ_ALIGN)(FILE *Log);
++
+ 
+ char FilterI(const char *iEntry, const void **iList, const char iMode, const short int iCount);
+ char FilterI(const char *iEntry, const void **iList, const char iMode, const short int iCount) {
+--- free-sa-1.6.2.orig/src/reports/r_users.c	2026-05-21 01:37:27.198400399 +0200
++++ free-sa-1.6.2/src/reports/r_users.c	2026-05-21 01:38:43.082885690 +0200
+@@ -1,8 +1,8 @@
+ #include "global.h"
+ 
+ 
+-inline void ReportAnyDTG(double (*tBytes)[12][31][24], const char *vname, const char *name, const double bytes, const char tlFlag);
+-inline void ReportAnyDTG(double (*tBytes)[12][31][24], const char *vname, const char *name, const double bytes, const char tlFlag) {
++static inline void ReportAnyDTG(double (*tBytes)[12][31][24], const char *vname, const char *name, const double bytes, const char tlFlag);
++static inline void ReportAnyDTG(double (*tBytes)[12][31][24], const char *vname, const char *name, const double bytes, const char tlFlag) {
+     short int hour, day, month, year;
+     double xBytes[31];
+ 
+--- free-sa-1.6.2.orig/src/Makefile	2026-05-21 01:37:27.196507144 +0200
++++ free-sa-1.6.2/src/Makefile	2026-05-21 01:39:33.559552356 +0200
+@@ -36,7 +36,6 @@
+ 	$(CC) $(LDFLAGS) $(AOBJS) $@.o $(LIBS) -o $@
+ 
+ release: all
+-	strip ./free-sa ./free-sa.cgi
+ 
+ clean:
+ 	$(MAKEDIRS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/free-sa.git/commitdiff/c189da58802a56faa8a3283ff821d1b96058f1e7