[packages/conflib] Rel 9

[arekm]

commit a2db2b12b18509f134600d605031e42d3197886d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed May 20 23:32:40 2026 +0200

    Rel 9

 conflib-c23.patch     | 42 +++++++++++++++++++++++++++
 conflib-texinfo.patch | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++
 conflib.spec          |  6 +++-
 3 files changed, 126 insertions(+), 1 deletion(-)
---
diff --git a/conflib.spec b/conflib.spec
index 1088dd5..0bda078 100644
--- a/conflib.spec
+++ b/conflib.spec
@@ -3,7 +3,7 @@ Summary(pl.UTF-8):	Biblioteka plików konfiguracyjnych
 Summary(de.UTF-8):	Library zum Lesen von Konfigurationsdateien
 Name:		conflib
 Version:	0.4.5
-Release:	8
+Release:	9
 License:	GPL
 Group:		Libraries
 Source0:	ftp://ftp.ohse.de/uwe/releases/%{name}-%{version}.tar.gz
@@ -12,6 +12,8 @@ Patch0:		%{name}-info.patch
 Patch1:		%{name}-cl_build_stanza_array-fix.patch
 Patch2:		%{name}-ac25x.patch
 Patch3:		%{name}-locale.patch
+Patch4:		%{name}-c23.patch
+Patch5:		%{name}-texinfo.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
@@ -68,6 +70,8 @@ oraz warunkowe rozwijanie. Ten pakiet zawiera pliki statyczne.
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
 
 %build
 %{__libtoolize}
diff --git a/conflib-c23.patch b/conflib-c23.patch
new file mode 100644
index 0000000..2e37e31
--- /dev/null
+++ b/conflib-c23.patch
@@ -0,0 +1,42 @@
+Remove K&R-style redeclarations of standard library functions that conflict
+with prototypes from <string.h>/<stdlib.h>. Add a missing prototype for
+cl_setvar so libtest.c (and any consumer) compiles under modern GCC, which
+treats implicit declarations as hard errors by default (C23).
+
+--- conflib-0.4.5/src/cl_warning.c.orig
++++ conflib-0.4.5/src/cl_warning.c
+@@ -71,11 +71,7 @@
+ void exit ();
+ #endif
+ 
+-#if HAVE_STRERROR
+-#  ifndef strerror       /* On some systems, strerror is a macro */
+-char *strerror ();
+-#  endif
+-#else
++#if !HAVE_STRERROR
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+ static const char *
+--- conflib-0.4.5/src/cl_strtol.c.orig
++++ conflib-0.4.5/src/cl_strtol.c
+@@ -67,8 +67,6 @@
+ 	}								\
+       while (0)
+ 
+-__unsigned long int __strtol ();
+-
+ /* FIXME: comment.  */
+ 
+ strtol_error
+--- conflib-0.4.5/src/conflib.h.orig
++++ conflib-0.4.5/src/conflib.h
+@@ -168,6 +168,9 @@
+ int cl_putstanza(cl_file_t *handle, cl_var_t *tab, const char *stanza,
+ 				  long flags, cl_ulist_t *unknowns);
+ 
++int cl_setvar(cl_var_t *tab, char *zeile, long flags, cl_ulist_t **unknowns);
++void cl_put_one(FILE *file, const cl_var_t *v);
++
+ char ** cl_build_stanza_array(const char *pattern, cl_file_t *conf);
+ void cl_delete_stanza_array(char **array);
diff --git a/conflib-texinfo.patch b/conflib-texinfo.patch
new file mode 100644
index 0000000..2eddccf
--- /dev/null
+++ b/conflib-texinfo.patch
@@ -0,0 +1,79 @@
+--- conflib-0.4.5/doc/conflib.texi.orig	2026-05-20 22:25:58.318333425 +0200
++++ conflib-0.4.5/doc/conflib.texi	2026-05-20 22:25:58.393825585 +0200
+@@ -5,6 +5,7 @@
+ @set update-month August 1998
+ 
+ @setfilename conflib.info
++ at documentencoding ISO-8859-1
+ @settitle The Conflib Manual @value{version}
+ @setchapternewpage odd
+ @smallbook
+@@ -920,7 +921,7 @@
+ an unknown variable variable. At the time i write this down it has
+ the following members:
+ 
+- at table @bullet
++ at table @code
+ @item char *varname
+ the name of the variable
+ 
+@@ -1000,7 +1001,7 @@
+ @cindex bugs
+ @cindex todo
+ 
+- at table @bullet
++ at table @code
+ @item getpwent etc are used. 
+ 
+ @item the array handling is broken
+--- conflib-0.4.5/doc/cl_getstanza.texi.orig	2026-05-20 22:25:58.320349769 +0200
++++ conflib-0.4.5/doc/cl_getstanza.texi	2026-05-20 22:25:58.393881077 +0200
+@@ -6,7 +6,7 @@
+ file pointed to by @var{handle} into @var{tab}.
+ 
+ @var{flags} is a bitfield consisting of the following bits:
+- at table @bullet
++ at table @code
+ @item CL_GET_NOINCLUDE
+ If this bit is set @code{include}- and @code{includestanza}-statements
+ in @var{handle} will be ignored.
+--- conflib-0.4.5/doc/cl_setvar.texi.orig	2026-05-20 22:25:58.322228054 +0200
++++ conflib-0.4.5/doc/cl_setvar.texi	2026-05-20 22:25:58.393919322 +0200
+@@ -5,7 +5,7 @@
+ file. It looks in @var{tab} for the variable name.
+ 
+ @var{flags} is a bitfield consisting of the following bits:
+- at table @bullet
++ at table @code
+ @item CL_GET_NOINCLUDE
+ If this bit is set @code{include}- and @code{includestanza}-statements
+ in @var{handle} will be ignored.
+--- conflib-0.4.5/doc/tinterp.texi.orig	2026-05-20 22:25:58.324267571 +0200
++++ conflib-0.4.5/doc/tinterp.texi	2026-05-20 22:25:58.393976065 +0200
+@@ -128,7 +128,7 @@
+ 
+ @code{bedingung} kann sein:
+ 
+- at table @bullet
++ at table @code
+ @item something==something-else
+ Das Ergebnis der Bedingung ist wahr, wenn die Interpretationsergebnisse
+ von @code{something} und @code{something-else} gleich sind.
+@@ -274,7 +274,7 @@
+ @end table
+ 
+ Returncodes:
+- at table @bullet
++ at table @code
+ @item TIP_NOTDONE
+ Die Funktion ist nicht aktiv geworden. tip_interpret soll versuchen, 
+ andere Routinen zu finden.
+@@ -294,7 +294,7 @@
+ @subsection Standardersatzroutinen der Library
+ Folgende Ersatzroutinen enthaelt die Library:
+ 
+- at table @bullet
++ at table @code
+ @item tip_dollar
+ Ersetzung durch Environmentvariablen, erwartet als @code{magic} das
+ Zeichen @code{$}. Siehe @ref{$-Ersetzung}.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/conflib.git/commitdiff/a2db2b12b18509f134600d605031e42d3197886d