dev-db/libflaim: Bump
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1856 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
46
dev-db/libflaim/files/libflaim-4.9.1052-fortify-source.patch
Normal file
46
dev-db/libflaim/files/libflaim-4.9.1052-fortify-source.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
--- flaim/util/sharutil.h.orig 2008-03-24 19:52:35.000000000 +0000
|
||||
+++ flaim/util/sharutil.h 2008-03-24 19:55:49.000000000 +0000
|
||||
@@ -28,6 +28,9 @@
|
||||
|
||||
#include "flaim.h"
|
||||
|
||||
+#include <stdio.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
#if defined( FLM_WIN)
|
||||
// Conversion from XXX to YYY, possible loss of data
|
||||
#pragma warning( disable : 4244)
|
||||
--- flaim/util/dbshell.h.orig 2008-03-24 19:54:09.000000000 +0000
|
||||
+++ flaim/util/dbshell.h 2008-03-24 19:56:13.000000000 +0000
|
||||
@@ -30,6 +30,9 @@
|
||||
#include "flaimsys.h"
|
||||
#include "sharutil.h"
|
||||
|
||||
+#include <stdio.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
// Types of clipboard data
|
||||
|
||||
enum eClipboardDataType
|
||||
--- flaim/util/flmunittest.h.orig 2008-03-24 19:56:35.000000000 +0000
|
||||
+++ flaim/util/flmunittest.h 2008-03-24 19:58:21.000000000 +0000
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "flaimsys.h"
|
||||
#ifndef FLM_NLM
|
||||
#include <stdio.h>
|
||||
+ #include <string.h>
|
||||
#endif
|
||||
|
||||
// Status codes passed to recordUnitTestResults
|
||||
--- ftk/src/ftk.h.orig 2008-03-24 19:39:41.000000000 +0000
|
||||
+++ ftk/src/ftk.h 2008-03-24 19:55:06.000000000 +0000
|
||||
@@ -28,6 +28,9 @@
|
||||
#ifndef FTK_H
|
||||
#define FTK_H
|
||||
|
||||
+#include <stdio.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
/// \defgroup retcodes Return Codes
|
||||
|
||||
#ifndef FLM_PLATFORM_CONFIGURED
|
||||
24
dev-db/libflaim/files/libflaim-4.9.1052-gcc43.patch
Normal file
24
dev-db/libflaim/files/libflaim-4.9.1052-gcc43.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
--- flaim/src/kybuild.cpp 2008-02-15 20:02:22.000000000 +0000
|
||||
+++ flaim/src/kybuild.cpp 2008-02-15 20:02:50.000000000 +0000
|
||||
@@ -533,8 +533,8 @@
|
||||
if (pIxd->uiFlags & IXD_OFFLINE)
|
||||
{
|
||||
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
|
||||
- uiContainerNum == pIxd->uiLastContainerIndexed &&
|
||||
- uiDrn > pIxd->uiLastDrnIndexed)
|
||||
+ (uiContainerNum == pIxd->uiLastContainerIndexed &&
|
||||
+ uiDrn > pIxd->uiLastDrnIndexed))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
--- ftk/src/ftk.h 2006-10-12 23:56:32.000000000 +0100
|
||||
+++ ftk/src/ftk.h 2008-02-15 21:00:17.000000000 +0000
|
||||
@@ -3687,7 +3687,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);
|
||||
12
dev-db/libflaim/files/libflaim-4.9.1052-gcc44.patch
Normal file
12
dev-db/libflaim/files/libflaim-4.9.1052-gcc44.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
--- ftkdir.cpp.orig 2006-10-13 02:56:32 +0400
|
||||
+++ ftk/src/ftkdir.cpp 2007-05-25 00:48:30 +0400
|
||||
@@ -1075,7 +1075,8 @@
|
||||
if( (PathSeparator = strrchr( DirInfo->full_path, '/')) == NULL)
|
||||
#endif
|
||||
{
|
||||
- (void) getcwd( DirInfo->full_path, F_PATH_MAX_SIZE);
|
||||
+ if (!getcwd( DirInfo->full_path, F_PATH_MAX_SIZE))
|
||||
+ return (EINVAL);
|
||||
uiLen = f_strlen( DirInfo->full_path );
|
||||
DirInfo->full_path[uiLen] = '/';
|
||||
DirInfo->full_path[uiLen+1] = '\0';
|
||||
40
dev-db/libflaim/files/libflaim-4.9.1052-no-ldconfig-1.patch
Normal file
40
dev-db/libflaim/files/libflaim-4.9.1052-no-ldconfig-1.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
||||
Date: 2010-01-16
|
||||
Initial Package Version: 4.9.1052
|
||||
Origin: me
|
||||
Upstream Status: never accepted
|
||||
Description: dont do ldconfig in sandbox
|
||||
|
||||
diff -Naur libflaim-4.9.1052.orig/flaim/Makefile libflaim-4.9.1052/flaim/Makefile
|
||||
--- libflaim-4.9.1052.orig/flaim/Makefile 2010-01-16 08:47:31.885993339 +0000
|
||||
+++ libflaim-4.9.1052/flaim/Makefile 2010-01-16 08:48:05.043193729 +0000
|
||||
@@ -1902,7 +1902,7 @@
|
||||
cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current).$(so_revision) $(lib_prefix)$(project_name).so.$(so_current)
|
||||
endif
|
||||
cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current) $(lib_prefix)$(project_name).so
|
||||
- -ldconfig $(lib_install_dir)
|
||||
+# -ldconfig $(lib_install_dir)
|
||||
$(ec)$(gprintf) "Installation complete.\n"
|
||||
endif
|
||||
|
||||
diff -Naur libflaim-4.9.1052.orig/ftk/Makefile libflaim-4.9.1052/ftk/Makefile
|
||||
--- libflaim-4.9.1052.orig/ftk/Makefile 2010-01-16 08:47:31.859102242 +0000
|
||||
+++ libflaim-4.9.1052/ftk/Makefile 2010-01-16 08:48:48.610836620 +0000
|
||||
@@ -1689,7 +1689,7 @@
|
||||
install --mode=644 $(ftk_static_lib) $(lib_install_dir)
|
||||
install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir)
|
||||
install --mode=644 src/ftk.h $(include_install_dir)
|
||||
- -ldconfig $(lib_install_dir)
|
||||
+# -ldconfig $(lib_install_dir)
|
||||
$(ec)$(gprintf) "Installation complete.\n"
|
||||
endif
|
||||
|
||||
@@ -1826,7 +1826,7 @@
|
||||
$(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so.$(so_current)\n" >> $(ubuntu_pkginfo_dir)/postinst
|
||||
endif
|
||||
$(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so\n" >> $(ubuntu_pkginfo_dir)/postinst
|
||||
- $(ec)$(gprintf) "ldconfig /usr/lib/$(ftk_shared_lib)\n" >> $(ubuntu_pkginfo_dir)/postinst
|
||||
+# $(ec)$(gprintf) "ldconfig /usr/lib/$(ftk_shared_lib)\n" >> $(ubuntu_pkginfo_dir)/postinst
|
||||
$(ec)chmod 0755 $(ubuntu_pkginfo_dir)/postinst
|
||||
|
||||
$(ec)$(gprintf) "Creating Ubuntu pre-uninstall file ...\n"
|
||||
Reference in New Issue
Block a user