7 files changed, 879 insertions, 0 deletions
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
new file mode 100644
index 000000000000..3db7c0559d2e
--- /dev/null
+++ b/redland/redland/makefile.mk
@@ -0,0 +1,160 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=redland
+TARGET=so_redland
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(SYSTEM_REDLAND)" == "YES"
+all:
+    @echo "An already available installation of Redland RDF should exist on your system."
+    @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+.INCLUDE :	../redlandversion.mk
+
+REDLANDVERSION=1.0.8
+
+TARFILE_NAME=redland-$(REDLANDVERSION)
+TARFILE_MD5=ca66e26082cab8bb817185a116db809b
+
+ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
+
+OOO_PATCH_FILES= \
+    $(TARFILE_NAME).patch.legal \
+    $(TARFILE_NAME).patch.autotools \
+    $(TARFILE_NAME).patch.dmake \
+    $(TARFILE_NAME).patch.ooo_build \
+    $(TARFILE_NAME).patch.win32
+
+PATCH_FILES=$(OOO_PATCH_FILES) \
+
+
+.IF "$(OS)"=="OS2"
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/librdf
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+redland_CC=$(CC) -mthreads
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+redland_CC+=-shared-libgcc
+.ENDIF
+redland_LIBS=
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+redland_LIBS+=-lstdc++_s
+.ENDIF
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(redland_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(redland_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+BUILD_ACTION=$(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+.ELSE
+# there is no wntmsci build environment in the tarball; we use custom dmakefile
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/librdf
+.ENDIF
+.ELSE # "WNT"
+
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+.ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
+
+.IF "$(COM)"=="C52" && "$(CPU)"=="U"
+CFLAGS=-m64
+.EXPORT: CFLAGS
+.ENDIF
+
+# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto
+CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external
+LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR)
+
+.IF "$(SYSBASE)"!=""
+CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
+LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
+.ENDIF
+.ENDIF			# "$(SYSBASE)"!=""
+
+.IF "$(OS)"=="MACOSX"
+LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib
+.ENDIF
+
+CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
+LDFLAGS+:=$(EXTRA_LINKFLAGS)
+XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
+
+.EXPORT: CPPFLAGS
+.EXPORT: LDFLAGS
+.EXPORT: LIBXML2LIB
+.EXPORT: XSLTLIB
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+#INSTALL_ACTION=$(GNUMAKE) install
+#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
+.ENDIF
+
+
+OUT2INC+=librdf$/*.h
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=librdf$/.libs$/*.a
+OUT2BIN+=librdf$/.libs$/*.dll
+.ELSE
+# if we use dmake, this is done automagically
+.ENDIF
+.ELIF "$(OS)"=="OS2"
+# if we use dmake, this is done automagically
+.ELSE
+OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR)
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools
new file mode 100644
index 000000000000..5b29d0b7708b
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.autotools
@@ -0,0 +1,58 @@
+--- misc/redland-1.0.8/configure	Fri Jul  4 18:00:39 2008
++++ misc/build/redland-1.0.8/configure	Wed Feb 18 13:27:43 2009
+@@ -4671,7 +4671,7 @@
+ 
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+@@ -4680,7 +4680,7 @@
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+   if ( file / ) >/dev/null 2>&1; then
+-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+--- misc/redland-1.0.8/ltmain.sh	Tue Apr 29 23:33:55 2008
++++ misc/build/redland-1.0.8/ltmain.sh	Wed Feb 18 13:28:39 2009
+@@ -1565,6 +1565,11 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  absdir=`cd "$dir" && pwd`
++	  case $host_os in
++	    mingw*)
++	      absdir=`cygpath -m $absdir`
++	      ;;
++	  esac
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ 	    absdir="$dir"
+@@ -3262,9 +3267,9 @@
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor`
+@@ -3344,8 +3349,8 @@
+ 	  ;;
+ 
+ 	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current";
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	irix | nonstopux)
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
new file mode 100644
index 000000000000..34ba51d1c29a
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -0,0 +1,115 @@
+--- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
++++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
+@@ -1,1 +1,111 @@
+-dummy
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2000, 2010 Oracle and/or its affiliates.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=redland
++TARGET=librdf
++LIBTARGET=NO
++UWINAPILIB=
++
++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
++
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
++
++# --- Files --------------------------------------------------------
++
++SLOFILES =	\
++   $(SLO)$/rdf_concepts.obj \
++   $(SLO)$/rdf_digest.obj \
++   $(SLO)$/rdf_digest_md5.obj \
++   $(SLO)$/rdf_digest_openssl.obj \
++   $(SLO)$/rdf_digest_sha1.obj \
++   $(SLO)$/rdf_files.obj \
++   $(SLO)$/rdf_hash.obj \
++   $(SLO)$/rdf_hash_cursor.obj \
++   $(SLO)$/rdf_hash_memory.obj \
++   $(SLO)$/rdf_heuristics.obj \
++   $(SLO)$/rdf_init.obj \
++   $(SLO)$/rdf_iterator.obj \
++   $(SLO)$/rdf_list.obj \
++   $(SLO)$/rdf_log.obj \
++   $(SLO)$/rdf_model.obj \
++   $(SLO)$/rdf_model_storage.obj \
++   $(SLO)$/rdf_node.obj \
++   $(SLO)$/rdf_parser.obj \
++   $(SLO)$/rdf_parser_raptor.obj \
++   $(SLO)$/rdf_query.obj \
++   $(SLO)$/rdf_query_rasqal.obj \
++   $(SLO)$/rdf_query_results.obj \
++   $(SLO)$/rdf_query_triples.obj \
++   $(SLO)$/rdf_serializer.obj \
++   $(SLO)$/rdf_serializer_raptor.obj \
++   $(SLO)$/rdf_statement.obj \
++   $(SLO)$/rdf_storage.obj \
++   $(SLO)$/rdf_storage_file.obj \
++   $(SLO)$/rdf_storage_list.obj \
++   $(SLO)$/rdf_storage_hashes.obj \
++   $(SLO)$/rdf_stream.obj \
++   $(SLO)$/rdf_uri.obj \
++   $(SLO)$/rdf_utf8.obj \
++
++
++#   $(SLO)$/rdf_hash_bdb.obj \
++#   $(SLO)$/rdf_storage_mysql.obj \
++#   $(SLO)$/rdf_storage_sqlite.obj \
++
++
++SHL1DEPN=   makefile.mk
++SHL1OBJS=   $(SLOFILES)
++
++#SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
++SHL1TARGET=	$(TARGET)
++SHL1IMPLIB= $(TARGET)
++SHL1USE_EXPORTS=name
++
++#SHL1VERSIONMAP=../service/exports.map
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++DEF1NAME=$(SHL1TARGET)
++
++SHL1STDLIBS= \
++    $(OPENSSLLIB) \
++    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
++    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
++
++
++#$(LIBXML2LIB) \
++#    $(XSLTLIB) \
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
diff --git a/redland/redland/redland-1.0.8.patch.legal b/redland/redland/redland-1.0.8.patch.legal
new file mode 100644
index 000000000000..9e9a25bef78e
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.legal
@@ -0,0 +1,54 @@
+--- misc/redland-1.0.8/LICENSE.txt	Tue Jul  1 07:55:28 2008
++++ misc/build/redland-1.0.8/LICENSE.txt	Thu Nov  6 12:44:39 2008
+@@ -76,3 +76,15 @@
+   10. NOTICE
+   11. http://www.dajobe.org/
+   12. http://www.bristol.ac.uk/
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
+--- misc/redland-1.0.8/raptor/LICENSE.txt	Sun Mar 30 06:52:22 2008
++++ misc/build/redland-1.0.8/raptor/LICENSE.txt	Thu Nov  6 12:44:39 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2000-2008 David Beckett
+    Copyright (C) 2000-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
+--- misc/redland-1.0.8/rasqal/LICENSE.txt	Fri Jun 27 04:24:52 2008
++++ misc/build/redland-1.0.8/rasqal/LICENSE.txt	Thu Nov  6 12:44:40 2008
+@@ -60,3 +60,15 @@
+ 
+    Copyright (C) 2003-2008 Dave Beckett
+    Copyright (C) 2003-2005 University of Bristol
++
++
++LGPL Disclaimer
++
++For the avoidance of doubt, except that if any license choice other 
++than GPL or LGPL is available it will apply instead, Sun elects to 
++use only the Lesser General Public License version 2.1 (LGPLv2) at 
++this time for any software where a choice of LGPL license versions 
++is made available with the language indicating that LGPLv2.1 or any 
++later version may be used, or where a choice of which version of the 
++LGPL is applied is otherwise unspecified.
++
diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.patch.ooo_build
new file mode 100644
index 000000000000..805a88d49ea2
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.ooo_build
@@ -0,0 +1,22 @@
+--- misc/redland-1.0.8/Makefile.am	2010-02-12 08:47:40.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.am	2010-02-12 08:47:51.000000000 +0000
+@@ -48,7 +48,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
+ 
+ EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+--- misc/redland-1.0.8/Makefile.in	2010-02-12 08:47:39.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.in	2010-02-12 08:47:55.000000000 +0000
+@@ -283,7 +283,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+ README      NEWS      LICENSE.txt  TODO \
diff --git a/redland/redland/redland-1.0.8.patch.win32 b/redland/redland/redland-1.0.8.patch.win32
new file mode 100644
index 000000000000..41d3503dcc98
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.win32
@@ -0,0 +1,154 @@
+--- misc/redland-1.0.8/librdf/win32_rdf_config.h	Tue Jul  1 05:10:26 2008
++++ misc/build/redland-1.0.8/librdf/win32_rdf_config.h	Wed Feb 18 13:31:07 2009
+@@ -43,7 +43,8 @@
+ #define HAVE_STRICMP 1
+ 
+ /* MS names for these functions */
+-#define vsnprintf _vsnprintf
++// next line breaks build on wntmsci12
++//#define vsnprintf _vsnprintf
+ #define snprintf _snprintf
+ #define access _access
+ #define stricmp _stricmp
+@@ -72,40 +73,40 @@
+  */
+ 
+ /* BDB has close method with 2 args */
+-#define HAVE_BDB_CLOSE_2_ARGS 1
++// #define HAVE_BDB_CLOSE_2_ARGS 1
+ 
+ /* BDB defines DBC */
+-#define HAVE_BDB_CURSOR 1
++// #define HAVE_BDB_CURSOR 1
+ 
+ /* BDB cursor method has 4 arguments */
+-#define HAVE_BDB_CURSOR_4_ARGS 1
++// #define HAVE_BDB_CURSOR_4_ARGS 1
+ 
+ /* BDB defines DB_TXN */
+-#define HAVE_BDB_DB_TXN 1
++// #define HAVE_BDB_DB_TXN 1
+ 
+ /* BDB has fd method with 2 args */
+-#define HAVE_BDB_FD_2_ARGS 1
++// #define HAVE_BDB_FD_2_ARGS 1
+ 
+ /* Have BDB hash support */
+-#define HAVE_BDB_HASH 1
++// #define HAVE_BDB_HASH 1
+ 
+ /* BDB has open method with 6 args */
+ /* #undef HAVE_BDB_OPEN_6_ARGS */
+ 
+ /* BDB has open method with 7 args */
+-#define HAVE_BDB_OPEN_7_ARGS 1
++// #define HAVE_BDB_OPEN_7_ARGS 1
+ 
+ /* BDB has set_flags method */
+-#define HAVE_BDB_SET_FLAGS 1
++// #define HAVE_BDB_SET_FLAGS 1
+ 
+ /* BDB has dbopen method */
+ /* #undef HAVE_DBOPEN */
+ 
+ /* BDB has db_create method */
+-#define HAVE_DB_CREATE 1
++// #define HAVE_DB_CREATE 1
+ 
+ /* Define to 1 if you have the <db.h> header file. */
+-#define HAVE_DB_H 1
++// #define HAVE_DB_H 1
+ 
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ /* undef HAVE_DLFCN_H */
+@@ -141,13 +142,13 @@
+ /* #undef HAVE_LIBWWW */
+ 
+ /* Have local MD5 digest */
+-#define HAVE_LOCAL_MD5_DIGEST 1
++// #define HAVE_LOCAL_MD5_DIGEST 1
+ 
+ /* Have local RIPEMD160 digest */
+ /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
+ 
+ /* Have local SHA1 digest */
+-#define HAVE_LOCAL_SHA1_DIGEST 1
++// #define HAVE_LOCAL_SHA1_DIGEST 1
+ 
+ /* Define to 1 if you have the <memory.h> header file. */
+ #define HAVE_MEMORY_H 1
+@@ -159,25 +160,33 @@
+ #define HAVE_MKTEMP 1
+ 
+ /* MySQL libraries are present */
+-#define HAVE_MYSQL 1
++// #define HAVE_MYSQL 1
+ 
+ /* Define to 1 if you have the <openssl/crypto.h> header file. */
+ /* #undef HAVE_OPENSSL_CRYPTO_H */
++#define HAVE_OPENSSL_CRYPTO_H 1
+ 
+ /* Have openssl MD5 digest */
+ /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */
++#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1
+ 
+ /* Have openssl RIPEMD160 digest */
+ /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */
++#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1
+ 
+ /* Have openssl SHA1 digest */
+ /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */
++#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1
+ 
+ /* Have openssl digests */
+ /* #undef HAVE_OPENSSL_DIGESTS */
++#define HAVE_OPENSSL_DIGESTS 1
+ 
+ /* Define to 1 if you have the <pthread.h> header file. */
+ /* #undef HAVE_PTHREAD_H */
++#ifdef __MINGW32__
++#undef HAVE_PTHREAD_H
++#endif
+ 
+ /* Define to 1 if you have the <stdint.h> header file. */
+ #define HAVE_STDINT_H 1
+@@ -246,7 +255,7 @@
+ #define SIZEOF_UNSIGNED_LONG_LONG 8
+ 
+ /* SQLite API version */
+-#define SQLITE_API 3
++// #define SQLITE_API 3
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+ #define STDC_HEADERS 1
+@@ -254,14 +263,17 @@
+ /* Building file storage */
+ #define STORAGE_FILE 1
+ 
++#define STORAGE_HASHES 1
++#define STORAGE_MEMORY 1
++
+ /* Building MySQL storage */
+-#define STORAGE_MYSQL 1
++// #define STORAGE_MYSQL 1
+ 
+ /* Building PostgreSQL storage */
+ /*#undef STORAGE_POSTGRESQL*/
+ 
+ /* Building SQLite storage */
+-#define STORAGE_SQLITE 1
++// #define STORAGE_SQLITE 1
+ 
+ /* Building 3store storage */
+ /*#undef STORAGE_TSTORE*/
+--- misc/redland-1.0.8/utils/rdfproc.c	Tue Jul  1 05:10:25 2008
++++ misc/build/redland-1.0.8/utils/rdfproc.c	Wed Feb 18 13:26:41 2009
+@@ -28,7 +28,7 @@
+ #endif
+ 
+ #ifdef WIN32
+-#include <win32_config.h>
++#include <win32_rdf_config.h>
+ #endif
+ 
+ #include <stdio.h>
diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map
new file mode 100644
index 000000000000..5798f461684b
--- /dev/null
+++ b/redland/redland/redland2.map
@@ -0,0 +1,316 @@
+UDK_3_0_0 {
+global:
+GetVersionInfo;
+librdf_get_concept_resource_by_index;
+librdf_get_concept_uri_by_index;
+librdf_new_digest;
+librdf_digest_update_string;
+librdf_digest_final;
+librdf_digest_print;
+librdf_digest_to_string;
+librdf_free_digest;
+librdf_digest_get_digest_length;
+librdf_digest_get_digest;
+librdf_digest_update;
+librdf_digest_init;
+librdf_new_hash_from_string;
+librdf_new_hash_from_array_of_strings;
+librdf_hash_get_del;
+librdf_hash_get_as_boolean;
+librdf_hash_get_as_long;
+librdf_hash_get;
+librdf_hash_interpret_template;
+librdf_hash_print;
+librdf_hash_print_keys;
+librdf_hash_print_values;
+librdf_new_hash_from_hash;
+librdf_free_hash;
+librdf_hash_put_strings;
+librdf_version_decimal;
+librdf_version_release;
+librdf_version_minor;
+librdf_version_major;
+librdf_version_string;
+librdf_copyright_string;
+librdf_short_copyright_string;
+librdf_init_world;
+librdf_new_world;
+librdf_destroy_world;
+librdf_free_world;
+librdf_world_open;
+librdf_world_init_mutex;
+librdf_world_set_feature;
+librdf_world_get_feature;
+librdf_world_set_digest;
+librdf_world_set_logger;
+librdf_world_set_warning;
+librdf_world_set_error;
+librdf_iterator_have_elements;
+librdf_iterator_end;
+librdf_iterator_next;
+librdf_iterator_get_object;
+librdf_iterator_get_context;
+librdf_iterator_get_key;
+librdf_iterator_get_value;
+librdf_free_iterator;
+librdf_iterator_add_map;
+librdf_new_iterator;
+librdf_new_empty_iterator;
+librdf_log_message_locator;
+librdf_log_message_message;
+librdf_log_message_facility;
+librdf_log_message_level;
+librdf_log_message_code;
+librdf_new_model;
+librdf_new_model_with_options;
+librdf_model_enumerate;
+librdf_free_model;
+librdf_model_add_typed_literal_statement;
+librdf_model_add_string_literal_statement;
+librdf_model_add;
+librdf_model_get_source;
+librdf_model_get_arc;
+librdf_model_get_target;
+librdf_model_add_submodel;
+librdf_model_remove_submodel;
+librdf_model_print;
+librdf_model_add_statement;
+librdf_model_remove_statement;
+librdf_model_contains_statement;
+librdf_model_context_add_statements;
+librdf_model_context_add_statement;
+librdf_model_context_remove_statements;
+librdf_model_context_remove_statement;
+librdf_model_find_statements_with_options;
+librdf_model_find_statements_in_context;
+librdf_new_model_from_model;
+librdf_model_size;
+librdf_model_add_statements;
+librdf_model_as_stream;
+librdf_model_serialise;
+librdf_model_find_statements;
+librdf_model_get_sources;
+librdf_model_get_arcs;
+librdf_model_get_targets;
+librdf_model_get_arcs_in;
+librdf_model_get_arcs_out;
+librdf_model_has_arc_in;
+librdf_model_has_arc_out;
+librdf_model_contains_context;
+librdf_model_context_as_stream;
+librdf_model_context_serialize;
+librdf_model_query_execute;
+librdf_model_sync;
+librdf_model_get_storage;
+librdf_model_get_contexts;
+librdf_model_get_feature;
+librdf_model_set_feature;
+librdf_model_load;
+librdf_model_to_string;
+librdf_model_to_counted_string;
+librdf_model_transaction_get_handle;
+librdf_model_transaction_rollback;
+librdf_model_transaction_commit;
+librdf_model_transaction_start_with_handle;
+librdf_model_transaction_start;
+librdf_new_node_from_uri_local_name;
+librdf_new_node_from_normalised_uri_string;
+librdf_node_decode;
+librdf_new_node_from_uri_string;
+librdf_new_node_from_uri;
+librdf_new_node_from_literal;
+librdf_new_node_from_typed_literal;
+librdf_new_node_from_typed_counted_literal;
+librdf_new_node;
+librdf_new_node_from_blank_identifier;
+librdf_free_node;
+librdf_node_get_literal_value_as_latin1;
+librdf_node_get_literal_value_is_wf_xml;
+librdf_node_get_li_ordinal;
+librdf_node_print;
+librdf_node_to_string;
+librdf_node_to_counted_string;
+librdf_node_encode;
+librdf_node_static_iterator_create;
+librdf_new_node_from_node;
+librdf_node_get_uri;
+librdf_node_get_type;
+librdf_node_get_literal_value;
+librdf_node_get_literal_value_as_counted_string;
+librdf_node_get_literal_value_language;
+librdf_node_get_literal_value_datatype_uri;
+librdf_node_get_blank_identifier;
+librdf_node_is_resource;
+librdf_node_is_literal;
+librdf_node_is_blank;
+librdf_node_equals;
+librdf_parser_register_factory;
+librdf_new_parser;
+librdf_parser_enumerate;
+librdf_new_parser_from_factory;
+librdf_free_parser;
+librdf_parser_parse_as_stream;
+librdf_parser_parse_into_model;
+librdf_parser_parse_string_as_stream;
+librdf_parser_parse_string_into_model;
+librdf_parser_parse_counted_string_as_stream;
+librdf_parser_parse_counted_string_into_model;
+librdf_parser_get_feature;
+librdf_parser_set_feature;
+librdf_parser_guess_name;
+librdf_parser_get_uri_filter;
+librdf_parser_set_uri_filter;
+librdf_parser_get_namespaces_seen_count;
+librdf_parser_get_namespaces_seen_uri;
+librdf_parser_get_namespaces_seen_prefix;
+librdf_parser_get_accept_header;
+librdf_parser_set_warning;
+librdf_parser_set_error;
+librdf_query_register_factory;
+librdf_new_query;
+librdf_new_query_from_query;
+librdf_new_query_from_factory;
+librdf_free_query;
+librdf_query_execute;
+librdf_query_set_offset;
+librdf_query_get_offset;
+librdf_query_set_limit;
+librdf_query_get_limit;
+librdf_free_query_results;
+librdf_query_results_to_string;
+librdf_query_results_to_counted_string;
+librdf_query_results_to_file;
+librdf_query_results_to_file_handle;
+librdf_query_results_get_count;
+librdf_query_results_next;
+librdf_query_results_finished;
+librdf_query_results_get_bindings;
+librdf_query_results_get_binding_value;
+librdf_query_results_get_binding_name;
+librdf_query_results_get_binding_value_by_name;
+librdf_query_results_get_bindings_count;
+librdf_query_results_is_bindings;
+librdf_query_results_is_boolean;
+librdf_query_results_is_graph;
+librdf_query_results_is_syntax;
+librdf_query_results_get_boolean;
+librdf_query_results_as_stream;
+librdf_query_results_formats_check;
+librdf_query_results_formats_enumerate;
+librdf_query_results_formatter_write;
+librdf_free_query_results_formatter;
+librdf_new_query_results_formatter_by_mime_type;
+librdf_new_query_results_formatter;
+librdf_serializer_register_factory;
+librdf_new_serializer;
+librdf_serializer_enumerate;
+librdf_new_serializer_from_factory;
+librdf_free_serializer;
+librdf_serializer_serialize_stream_to_file;
+librdf_serializer_serialize_model_to_file;
+librdf_serializer_set_namespace;
+librdf_serializer_serialize_stream_to_file_handle;
+librdf_serializer_serialize_model;
+librdf_serializer_serialize_model_to_file_handle;
+librdf_serializer_serialize_stream_to_counted_string;
+librdf_serializer_serialize_model_to_counted_string;
+librdf_serializer_serialize_stream_to_string;
+librdf_serializer_serialize_model_to_string;
+librdf_serializer_serialize_stream_to_iostream;
+librdf_serializer_serialize_model_to_iostream;
+librdf_serializer_get_feature;
+librdf_serializer_set_feature;
+librdf_serializer_set_warning;
+librdf_serializer_set_error;
+librdf_new_statement_from_statement;
+librdf_new_statement_from_nodes;
+librdf_new_statement;
+librdf_statement_init;
+librdf_free_statement;
+librdf_statement_is_complete;
+librdf_statement_print;
+librdf_statement_to_string;
+librdf_statement_equals;
+librdf_statement_match;
+librdf_statement_encode;
+librdf_statement_encode_parts;
+librdf_statement_decode;
+librdf_statement_decode_parts;
+librdf_statement_clear;
+librdf_statement_get_subject;
+librdf_statement_set_subject;
+librdf_statement_get_predicate;
+librdf_statement_set_predicate;
+librdf_statement_get_object;
+librdf_statement_set_object;
+librdf_storage_register_factory;
+librdf_new_storage;
+librdf_new_storage_with_options;
+librdf_storage_enumerate;
+librdf_new_storage_from_factory;
+librdf_storage_context_add_statements;
+librdf_storage_add_statements;
+librdf_storage_context_add_statement;
+librdf_storage_add_statement;
+librdf_storage_contains_statement;
+librdf_storage_find_statements;
+librdf_storage_has_arc_in;
+librdf_storage_get_sources;
+librdf_storage_get_arcs;
+librdf_storage_has_arc_out;
+librdf_storage_get_targets;
+librdf_storage_get_arcs_in;
+librdf_storage_get_arcs_out;
+librdf_new_storage_from_storage;
+librdf_storage_remove_reference;
+librdf_free_storage;
+librdf_storage_context_remove_statements;
+librdf_storage_find_statements_with_options;
+librdf_storage_find_statements_in_context;
+librdf_storage_open;
+librdf_storage_close;
+librdf_storage_size;
+librdf_storage_remove_statement;
+librdf_storage_context_remove_statement;
+librdf_storage_context_serialise;
+librdf_storage_context_as_stream;
+librdf_storage_supports_query;
+librdf_storage_query_execute;
+librdf_storage_sync;
+librdf_storage_get_contexts;
+librdf_storage_get_feature;
+librdf_storage_set_feature;
+librdf_storage_transaction_get_handle;
+librdf_storage_transaction_rollback;
+librdf_storage_transaction_commit;
+librdf_storage_transaction_start_with_handle;
+librdf_storage_transaction_start;
+librdf_storage_serialise;
+librdf_storage_add_reference;
+librdf_free_stream;
+librdf_stream_print;
+librdf_stream_end;
+librdf_stream_next;
+librdf_stream_get_object;
+librdf_stream_get_context;
+librdf_stream_add_map;
+librdf_new_stream_from_node_iterator;
+librdf_new_stream;
+librdf_new_empty_stream;
+librdf_new_uri_from_uri_local_name;
+librdf_new_uri_normalised_to_base;
+librdf_new_uri_relative_to_base;
+librdf_new_uri_from_filename;
+librdf_new_uri;
+librdf_free_uri;
+librdf_uri_print;
+librdf_uri_to_string;
+librdf_uri_to_counted_string;
+librdf_uri_is_file_uri;
+librdf_uri_to_filename;
+librdf_new_uri_from_uri;
+librdf_uri_as_string;
+librdf_uri_as_counted_string;
+librdf_uri_equals;
+librdf_uri_compare;
+};