dev-db/libflaim: Stable from Debian orig.tar.gz

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1630 6952d904-891a-0410-993b-d76249ca496b

dev-db/libflaim/ChangeLog

@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Dec 2009; Mario Fetka <mario.fetka@gmail.com> -libflaim-4.9.845.ebuild,
+  +libflaim-4.9.1046.ebuild, +files/libflaim-4.9.1052-optflags.patch,
+  +files/do-not-compile-with-werror.patch, +files/fortify-source.patch,
+  +files/libflaim-fortify.patch:
+  Stable from Debian orig.tar.gz
+
   03 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
   +files/libflaim-gcc43.patch, +files/libflaim-gcc44.patch,
   +libflaim-4.9.845.ebuild, +files/libflaim-warning.patch:

dev-db/libflaim/Manifest

@@ -1,11 +1,15 @@
+AUX do-not-compile-with-werror.patch 696 RMD160 3fdcac469ff0675f3f477c6125424a52967c4c80 SHA1 64fa14b8d4db58eded94451f1db9269a4aa74476 SHA256 4bcf060945095f56676e4cebd794534bf642f18c1240b3d261652d65a7fef0b5
+AUX fortify-source.patch 1159 RMD160 eaebf509f09a60dbba095b40bc4433a02d4b64e4 SHA1 708abcaa8148baa89db4bd5a71f3387fd18e6f57 SHA256 247509233f5f8998bd4fb584a988d8fe54e831b49fcb5333dc61715f1f20882c
+AUX libflaim-4.9.1052-optflags.patch 420 RMD160 515ebbfa1b117c168ea65751b3626c497971b21d SHA1 12c93c0e98960fe200ccebfe45918145e82e3789 SHA256 3492e75510a638b8adfbdd0576f8973a6cbe59588da6290d070ece636d828bbf
+AUX libflaim-fortify.patch 262 RMD160 eff690951020830207c65c369bfce95478cd4913 SHA1 6a44390ef9898b3a45cd2618b464a4c7da828a22 SHA256 b4678dea7c281a429aac9fe0f9aa19416336f4e7ec5574c381762457ed898a7c
 AUX libflaim-gcc43.patch 887 RMD160 4ae2a662a0b4f86addb89b56dcb58ed58f6327b5 SHA1 139fd6eb1981e3588bfbb73bb0e56601e6d077fb SHA256 8542bb4640782ed68f1207106eed6f08808ff09f4fde363772a1c7aacab6c5af
 AUX libflaim-gcc44.patch 445 RMD160 0b41b6c456e778448863026db84852966ef97c12 SHA1 36a2e5d191b0ee37c3e4b4a0f25c45fa51f4375d SHA256 ebd9e33a31d3f95fe5dce3382739fdf6842508ad7c9ffcc202c6421df7abe7f9
 AUX libflaim-warning.patch 2211 RMD160 f7dced21bfe29b8308b6dec1214e44aca5b3bded SHA1 27b05204217056c21c26c042480b1ac648ab6f54 SHA256 ff0f55ecdf7968be8c6e8e04fdc3d7e3abf10e741927fe463ea85579da2b636c
-DIST libflaim-4.9.845.tar.gz 2852582 RMD160 28210d8f1f48813f07b85090d7b8028d2f37a1df SHA1 c3b4ae0dc68ae9d26cc3d28f286cd0bc509f4212 SHA256 32992394f70be202eb85a17082b2a30a2bc5d1cecdcc031e272176eac6d1807c
+DIST libflaim-4.9.1046.tar.gz 2255728 RMD160 e7dacc24e9768810a2686e95977b24e0d427e92c SHA1 72dd78c496f43c6c2ea872b6b095024dbf33fd62 SHA256 27a95fc95fb9710d8f20b5cabe6e7072a56d38f8b1e1687f7980d08c19517b50
 EBUILD libflaim-4.10_pre1084.ebuild 918 RMD160 8c72b3cb944f44bb6539453e7c83270b8874de55 SHA1 bb900def3935b22ac06b682cf9c02b730b0480fb SHA256 eab82e9f3ec4068c2513087287e49ce242351ebc02f7fb7154ac90f44b4d8681
 EBUILD libflaim-4.10_pre1106.ebuild 946 RMD160 fe87e519a1aa4d364717ade96561f9077104ec90 SHA1 e52ed144944525e4de37e6ed22345beb4aa8fdf3 SHA256 2e00130e5b032a7f0642435aac726248c1fbbbc7515a18216b08b8713834f721
 EBUILD libflaim-4.10_pre1107.ebuild 978 RMD160 f80ba01b71252ab8598046b2e75d1054753dc3b6 SHA1 2fadd5f069e14a25c84c5ca6d9187d16e17726e9 SHA256 44488467016f0a0f1190c7c0117a2196e8603c8bbbae545f75300e7dad27fbc7
 EBUILD libflaim-4.10_pre1110.ebuild 964 RMD160 947d4ff677096effb10e9100061d4cf3c79a618d SHA1 321eecff42f11be96f65c0fe5fd7e00dbd817677 SHA256 6fb15571fe2dfa020f8a55ff2d1b37bdc8b2f7ec455d966c2880ff1c75f963fa
-EBUILD libflaim-4.9.845.ebuild 850 RMD160 5f8312d96a71ba4bfbc91329c1759c8655415b37 SHA1 6458e1dfbd2cda0546fb9c5dd2694edcfe9cc2c1 SHA256 1bda9bcf5420345ceabd9742d408da051b483b32904d30cbc16ef7c5ecc4369c
+EBUILD libflaim-4.9.1046.ebuild 1020 RMD160 f484a907c61d11559057f21fd92560a8b8f1c44f SHA1 5a9f5d4d29c5d2337a27d6b80a762c7365135954 SHA256 9912a49c50149ffabac9ee10439f6cb945a86749aaa803b4d1198a6167bce7ee
-MISC ChangeLog 2651 RMD160 c4a74ec45f1d2e70e103bdc7f303e16a2d1c0299 SHA1 ea64a97cc002464b3c79656ecbc746fa5e1db763 SHA256 24ea76ac2c22dcb5e3e5c08d7606624641a67df6e19949d86597276442a725d6
+MISC ChangeLog 2937 RMD160 0f047665eed78d2a479ba4c7829ff16ddcaa30fb SHA1 c0f8114188b03cb5e66ecf064aca98d367606a8e SHA256 b8153dc33187fe2d1f43aa04712a8ee345a105f7b5ab6614e671c02ff0065dc0
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

dev-db/libflaim/files/do-not-compile-with-werror.patch

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

dev-db/libflaim/files/fortify-source.patch

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

dev-db/libflaim/files/libflaim-4.9.1052-optflags.patch

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

dev-db/libflaim/files/libflaim-fortify.patch

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

dev-db/libflaim/libflaim-4.9.1046.ebuild

@@ -20,12 +20,15 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/fortify-source.patch
 	epatch ${FILESDIR}/libflaim-gcc43.patch
 	epatch ${FILESDIR}/libflaim-gcc44.patch
+	epatch ${FILESDIR}/libflaim-4.9.1052-optflags.patch
+	epatch ${FILESDIR}/do-not-compile-with-werror.patch
 }
 
 src_compile() {
-	make DESTDIR=${D} OSTYPE=`uname -s` HOSTTYPE=`uname -m`  || \
+	make DESTDIR=${D} CXXFLAGS="${CXXFLAGS}" OSTYPE=`uname -s` HOSTTYPE=`uname -m`  || \
 	die "Error compiling ${PN}"
 }