[packages/libflaim] Rel 2

[arekm]

commit 26bc83b0ab3c5e1e0d7ea9ccecbe522e7854c6a1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 01:19:58 2026 +0100

    Rel 2

 libflaim-fix.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 libflaim.spec      |  8 ++++++-
 2 files changed, 69 insertions(+), 3 deletions(-)
---
diff --git a/libflaim.spec b/libflaim.spec
index 46cf47b..7fb499f 100644
--- a/libflaim.spec
+++ b/libflaim.spec
@@ -9,7 +9,7 @@ Summary:	Embeddable cross-platform database engine
 Summary(pl.UTF-8):	Osadzalny, wieloplatformowy silnik baz danych
 Name:		libflaim
 Version:	4.9.989
-Release:	1
+Release:	2
 License:	(L?)GPL
 Group:		Libraries
 Source0:	http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-%{version}.tar.gz
@@ -64,6 +64,12 @@ Statyczna biblioteka libflaim.
 sed 's/ccflags += \(.*ccdefine.*ccinclude\)/ccflags += $(OPTCXXFLAGS) \1/' -i Makefile
 
 %build
+# create output directories first to avoid parallel make race
+%{__make} dircheck \
+	OSTYPE=%{_os} \
+	HOSTTYPE=%{_arch} \
+	ec=
+
 %{__make} libs \
 	OSTYPE=%{_os} \
 	HOSTTYPE=%{_arch} \
diff --git a/libflaim-fix.patch b/libflaim-fix.patch
index 2f17cb2..38b418e 100644
--- a/libflaim-fix.patch
+++ b/libflaim-fix.patch
@@ -26,10 +26,70 @@
 +++ ftk/src/ftk.h	2009-02-09 16:10:02.000000000 +0100
 @@ -3658,7 +3658,7 @@
  	} F_TMSTAMP;
- 
+
  	#define f_timeIsLeapYear(year) \
 -		((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
 +		(((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
- 
+
  	void f_timeGetSeconds(
  		FLMUINT	*		puiSeconds);
+--- src/imonfram.cpp.orig	2006-09-11 20:48:30.000000000 +0200
++++ src/imonfram.cpp	2026-03-15 12:00:00.000000000 +0100
+@@ -626,7 +626,7 @@
+
+ 		// Now, reset the session password if it exists.
+
+-		pszPassword = '\0';
++		pszPassword = NULL;
+ 		if (fnSetSessionValue( pvSession,
+ 									  FLM_SECURE_PASSWORD,
+ 									  pszPassword,
+--- src/imonrec.cpp.orig	2006-09-11 20:48:30.000000000 +0200
++++ src/imonrec.cpp	2026-03-15 12:00:00.000000000 +0100
+@@ -1054,7 +1054,7 @@
+ 	FLMBYTE					ucVal = 0;
+ 	FLMUINT					uiNibble;
+
+-	if (pszFldValue == '\0' || *pszFldValue == '\0')
++	if (pszFldValue == NULL || *pszFldValue == '\0')
+ 	{
+ 		goto Exit;
+ 	}
+@@ -1149,7 +1149,7 @@
+ 	FLMUINT				uiLen;
+
+ 	// If there is no data, then just return.
+-	if (pszFldValue == '\0' || *pszFldValue == '\0')
++	if (pszFldValue == NULL || *pszFldValue == '\0')
+ 	{
+ 		goto Exit;
+ 	}
+@@ -1189,7 +1189,7 @@
+ 	FLMUINT			uiVal;
+ 	FLMINT			iVal;
+
+-	if (pszFldValue == '\0' || *pszFldValue == '\0')
++	if (pszFldValue == NULL || *pszFldValue == '\0')
+ 	{
+ 		goto Exit;
+ 	}
+@@ -1232,7 +1232,7 @@
+ 	RCODE					rc = FERR_OK;
+ 	FlmBlob *			pBlob = NULL;
+
+-	if (pszFldValue == '\0' || *pszFldValue == '\0')
++	if (pszFldValue == NULL || *pszFldValue == '\0')
+ 	{
+ 		goto Exit;
+ 	}
+--- ftk/src/ftkprntf.cpp.orig	2026-03-15 01:05:35.753238996 +0100
++++ ftk/src/ftkprntf.cpp	2026-03-15 01:05:35.761089269 +0100
+@@ -866,7 +866,7 @@
+ 	f_va_end(args);
+ 	
+ #ifndef FLM_RING_ZERO_NLM
+-	fprintf( stdout, szTmpBuf);
++	fprintf( stdout, "%s", szTmpBuf);
+ 	fflush( stdout);
+ #endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libflaim.git/commitdiff/26bc83b0ab3c5e1e0d7ea9ccecbe522e7854c6a1