delete old files

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2848 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2011-03-05 09:00:54 +00:00
parent c5853d5ccc
commit 350f3de359
11 changed files with 0 additions and 321 deletions

View File

@ -1,19 +0,0 @@
--- Makefile.orig 2008-06-01 09:47:35.000000000 +0300
+++ Makefile 2008-06-01 09:50:57.000000000 +0300
@@ -1009,7 +1009,7 @@
# Compiler defines and flags
ifeq ($(compiler),g++)
- ccflags += -Wall -Werror -fPIC
+ ccflags += -Wall -fPIC
ifneq ($(target_processor_family),ia64)
ccflags += -m$(target_word_size)
endif
@@ -1888,7 +1888,6 @@
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)
$(ec)$(gprintf) "Installation complete.\n"
endif

View File

@ -1,46 +0,0 @@
--- util/sharutil.h.orig 2008-03-24 19:52:35.000000000 +0000
+++ 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)
--- util/dbshell.h.orig 2008-03-24 19:54:09.000000000 +0000
+++ 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
--- util/flmunittest.h.orig 2008-03-24 19:56:35.000000000 +0000
+++ 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

View File

@ -1,46 +0,0 @@
--- 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

View File

@ -1,24 +0,0 @@
--- 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);

View File

@ -1,12 +0,0 @@
--- 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';

View File

@ -1,40 +0,0 @@
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"

View File

@ -1,12 +0,0 @@
diff -up libflaim-4.9.1052/flaim/Makefile~ libflaim-4.9.1052/flaim/Makefile
--- libflaim-4.9.1052/flaim/Makefile~ 2007-09-06 18:13:15.000000000 +0300
+++ libflaim-4.9.1052/flaim/Makefile 2009-05-10 17:09:08.000000000 +0300
@@ -962,7 +962,7 @@ ifdef unix_target
endif
gcc_optimization_flags = \
- -O \
+ $(CXXFLAGS) \
-foptimize-sibling-calls \
-fstrength-reduce -fcse-follow-jumps \
-fcse-skip-blocks \

View File

@ -1,11 +0,0 @@
--- libflaim-4.9.966.orig/Makefile
+++ libflaim-4.9.966/Makefile
@@ -935,7 +935,7 @@
static_lib_suffix = .a
shared_lib_suffix = .so.$(shared_lib_version)
- compiler = g++
+ compiler = g++ -U_FORTIFY_SOURCE -fPIC
exe_linker = g++
shared_linker = g++

View File

@ -1,24 +0,0 @@
--- 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;
}
--- flaim/ftk/src/ftk.h 2006-10-12 23:56:32.000000000 +0100
+++ flaim/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);

View File

@ -1,12 +0,0 @@
--- 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';

View File

@ -1,75 +0,0 @@
--- ftk/src/ftk.h
+++ ftk/src/ftk.h
@@ -330,8 +330,10 @@
#endif
#if defined( FLM_WIN) || defined( FLM_NLM)
+ #define FLMATOMIC_RET long
#define FLMATOMIC volatile long
#else
+ #define FLMATOMIC_RET int
#define FLMATOMIC volatile int
#endif
@@ -3943,7 +3945,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);
--- ftk/src/ftksys.h
+++ ftk/src/ftksys.h
@@ -218,7 +218,7 @@
Desc:
**********************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
- extern "C" FLMATOMIC ppc_atomic_add(
+ extern "C" FLMATOMIC_RET ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta);
#endif
@@ -227,7 +227,7 @@
Desc:
**********************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC) && defined( FLM_LINUX)
- extern "C" FLMATOMIC ppc_atomic_xchg(
+ extern "C" FLMATOMIC_RET ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue);
#endif
--- ftk/src/ftkunix.cpp
+++ ftk/src/ftkunix.cpp
@@ -1356,7 +1356,7 @@
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_add(
+FLMATOMIC_RET ppc_atomic_add(
FLMATOMIC * piTarget,
FLMINT32 iDelta)
{
@@ -1381,7 +1381,7 @@
Desc:
****************************************************************************/
#if defined( FLM_PPC) && defined( FLM_GNUC)
-FLMATOMIC ppc_atomic_xchg(
+FLMATOMIC_RET ppc_atomic_xchg(
FLMATOMIC * piTarget,
FLMATOMIC iNewValue)
{
--- src/kybuild.cpp
+++ src/kybuild.cpp
@@ -534,8 +534,8 @@
if (pIxd->uiFlags & IXD_OFFLINE)
{
if (uiContainerNum > pIxd->uiLastContainerIndexed ||
- uiContainerNum == pIxd->uiLastContainerIndexed &&
- uiDrn > pIxd->uiLastDrnIndexed)
+ ( uiContainerNum == pIxd->uiLastContainerIndexed &&
+ uiDrn > pIxd->uiLastDrnIndexed ) )
{
continue;
}