redland/redland-1.0.7.patch

   1 --- misc/redland-1.0.7/LICENSE.txt      Wed May  2 07:45:42 2007
   2 +++ misc/build/redland-1.0.7/LICENSE.txt        Mon Jun 16 15:55:51 2008
   3 @@ -77,3 +77,15 @@
   4    10. NOTICE
   5    11. http://purl.org/net/dajobe/
   6    12. http://www.bristol.ac.uk/
   7 +
   8 +
   9 +LGPL Disclaimer
  10 +
  11 +For the avoidance of doubt, except that if any license choice other
  12 +than GPL or LGPL is available it will apply instead, Sun elects to
  13 +use only the Lesser General Public License version 2.1 (LGPLv2) at
  14 +this time for any software where a choice of LGPL license versions
  15 +is made available with the language indicating that LGPLv2.1 or any
  16 +later version may be used, or where a choice of which version of the
  17 +LGPL is applied is otherwise unspecified.
  18 +
  19 --- misc/redland-1.0.7/librdf/makefile.mk       Mon Jun 16 19:32:46 2008
  20 +++ misc/build/redland-1.0.7/librdf/makefile.mk Mon Jun 16 19:26:20 2008
  21 @@ -1,1 +1,114 @@
  22 -dummy
  23 +#*************************************************************************
  24 +#
  25 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  26 +#
  27 +# Copyright 2008 by Sun Microsystems, Inc.
  28 +#
  29 +# OpenOffice.org - a multi-platform office productivity suite
  30 +#
  31 +# $RCSfile: redland-1.0.7.patch,v $
  32 +#
  33 +# $Revision: 1.2.6.2 $
  34 +#
  35 +# This file is part of OpenOffice.org.
  36 +#
  37 +# OpenOffice.org is free software: you can redistribute it and/or modify
  38 +# it under the terms of the GNU Lesser General Public License version 3
  39 +# only, as published by the Free Software Foundation.
  40 +#
  41 +# OpenOffice.org is distributed in the hope that it will be useful,
  42 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  43 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  44 +# GNU Lesser General Public License version 3 for more details
  45 +# (a copy is included in the LICENSE file that accompanied this code).
  46 +#
  47 +# You should have received a copy of the GNU Lesser General Public License
  48 +# version 3 along with OpenOffice.org.  If not, see
  49 +# <http://www.openoffice.org/license.html>
  50 +# for a copy of the LGPLv3 License.
  51 +#
  52 +#*************************************************************************
  53 +
  54 +PRJ=..$/..$/..$/..$/..
  55 +
  56 +PRJNAME=redland
  57 +TARGET=librdf
  58 +LIBTARGET=NO
  59 +
  60 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
  61 +
  62 +
  63 +# --- Settings -----------------------------------------------------
  64 +
  65 +.INCLUDE :  settings.mk
  66 +
  67 +CDEFS+=-DLIBRDF_INTERNAL -DWIN32 -DNDEBUG -D_WINDOWS -D_USRDLL -DWIN32_EXPORTS
  68 +
  69 +# --- Files --------------------------------------------------------
  70 +
  71 +SLOFILES =     \
  72 +   $(SLO)$/rdf_concepts.obj \
  73 +   $(SLO)$/rdf_digest.obj \
  74 +   $(SLO)$/rdf_digest_md5.obj \
  75 +   $(SLO)$/rdf_digest_openssl.obj \
  76 +   $(SLO)$/rdf_digest_sha1.obj \
  77 +   $(SLO)$/rdf_files.obj \
  78 +   $(SLO)$/rdf_hash.obj \
  79 +   $(SLO)$/rdf_hash_cursor.obj \
  80 +   $(SLO)$/rdf_hash_memory.obj \
  81 +   $(SLO)$/rdf_heuristics.obj \
  82 +   $(SLO)$/rdf_init.obj \
  83 +   $(SLO)$/rdf_iterator.obj \
  84 +   $(SLO)$/rdf_list.obj \
  85 +   $(SLO)$/rdf_log.obj \
  86 +   $(SLO)$/rdf_model.obj \
  87 +   $(SLO)$/rdf_model_storage.obj \
  88 +   $(SLO)$/rdf_node.obj \
  89 +   $(SLO)$/rdf_parser.obj \
  90 +   $(SLO)$/rdf_parser_raptor.obj \
  91 +   $(SLO)$/rdf_query.obj \
  92 +   $(SLO)$/rdf_query_rasqal.obj \
  93 +   $(SLO)$/rdf_query_results.obj \
  94 +   $(SLO)$/rdf_query_triples.obj \
  95 +   $(SLO)$/rdf_serializer.obj \
  96 +   $(SLO)$/rdf_serializer_raptor.obj \
  97 +   $(SLO)$/rdf_statement.obj \
  98 +   $(SLO)$/rdf_storage.obj \
  99 +   $(SLO)$/rdf_storage_file.obj \
 100 +   $(SLO)$/rdf_storage_list.obj \
 101 +   $(SLO)$/rdf_storage_hashes.obj \
 102 +   $(SLO)$/rdf_stream.obj \
 103 +   $(SLO)$/rdf_uri.obj \
 104 +   $(SLO)$/rdf_utf8.obj \
 105 +
 106 +
 107 +#   $(SLO)$/rdf_hash_bdb.obj \
 108 +#   $(SLO)$/rdf_storage_mysql.obj \
 109 +#   $(SLO)$/rdf_storage_sqlite.obj \
 110 +
 111 +
 112 +SHL1DEPN=   makefile.mk
 113 +SHL1OBJS=   $(SLOFILES)
 114 +
 115 +#SHL1TARGET=   $(TARGET)$(DLLPOSTFIX)
 116 +SHL1TARGET=    $(TARGET)
 117 +SHL1IMPLIB= $(TARGET)
 118 +SHL1USE_EXPORTS=name
 119 +
 120 +#SHL1VERSIONMAP=../service/exports.map
 121 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 122 +DEF1NAME=$(SHL1TARGET)
 123 +
 124 +SHL1STDLIBS= \
 125 +    $(OPENSSLLIB) \
 126 +    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
 127 +    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
 128 +
 129 +
 130 +#$(LIBXML2LIB) \
 131 +#    $(XSLTLIB) \
 132 +
 133 +# --- Targets ------------------------------------------------------
 134 +
 135 +.INCLUDE :  target.mk
 136 +
 137 --- misc/redland-1.0.7/librdf/rdf_digest.c      Wed Dec  5 18:25:18 2007
 138 +++ misc/build/redland-1.0.7/librdf/rdf_digest.c        Mon Jun 16 15:55:51 2008
 139 @@ -250,6 +250,8 @@
 140  void
 141  librdf_free_digest(librdf_digest *digest)
 142  {
 143 +  if(!digest)
 144 +    return;
 145    if(digest->context)
 146      LIBRDF_FREE(digest_context, digest->context);
 147    if(digest->digest)
 148 --- misc/redland-1.0.7/librdf/rdf_hash.c        Thu Dec 20 22:39:42 2007
 149 +++ misc/build/redland-1.0.7/librdf/rdf_hash.c  Mon Jun 16 15:55:51 2008
 150 @@ -490,6 +490,8 @@
 151  void
 152  librdf_free_hash(librdf_hash* hash)
 153  {
 154 +  if(!hash)
 155 +    return;
 156    if(hash->context) {
 157      if(hash->is_open)
 158        librdf_hash_close(hash);
 159 --- misc/redland-1.0.7/librdf/rdf_init.c        Tue Nov  6 16:26:18 2007
 160 +++ misc/build/redland-1.0.7/librdf/rdf_init.c  Mon Jun 16 15:55:51 2008
 161 @@ -178,6 +178,9 @@
 162  void
 163  librdf_free_world(librdf_world *world)
 164  {
 165 +  if(!world)
 166 +    return;
 167 +
 168    /* NOTE: raptor is always initialised as a parser and may
 169     * be also used as a serializer, but it is NOT finished
 170     * in the serializer_raptor registration.  Therefore, always
 171 --- misc/redland-1.0.7/librdf/rdf_list.c        Thu Dec 20 22:39:42 2007
 172 +++ misc/build/redland-1.0.7/librdf/rdf_list.c  Mon Jun 16 15:55:51 2008
 173 @@ -108,6 +108,8 @@
 174  void
 175  librdf_free_list(librdf_list* list)
 176  {
 177 +  if(!list)
 178 +    return;
 179    LIBRDF_ASSERT_RETURN(list->iterator_count,
 180                         "Iterators were active on freeing list", );
 181
 182 --- misc/redland-1.0.7/librdf/rdf_model.c       Tue Oct 23 16:55:06 2007
 183 +++ misc/build/redland-1.0.7/librdf/rdf_model.c Mon Jun 16 15:55:51 2008
 184 @@ -393,7 +393,8 @@
 185    librdf_iterator* iterator;
 186    librdf_model* m;
 187
 188 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model);
 189 +  if(!model)
 190 +    return;
 191
 192    if(--model->usage)
 193      return;
 194 --- misc/redland-1.0.7/librdf/rdf_node.c        Thu Dec 20 22:39:42 2007
 195 +++ misc/build/redland-1.0.7/librdf/rdf_node.c  Mon Jun 16 15:55:51 2008
 196 @@ -726,7 +726,8 @@
 197    librdf_world *world;
 198  #endif
 199
 200 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node);
 201 +  if(!node)
 202 +    return;
 203
 204  #ifdef WITH_THREADS
 205    world = node->world;
 206 --- misc/redland-1.0.7/librdf/rdf_parser.c      Mon Dec 17 08:19:11 2007
 207 +++ misc/build/redland-1.0.7/librdf/rdf_parser.c        Mon Jun 16 15:55:51 2008
 208 @@ -371,7 +371,8 @@
 209  void
 210  librdf_free_parser(librdf_parser *parser)
 211  {
 212 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser);
 213 +  if(!parser)
 214 +    return;
 215
 216    if(parser->context) {
 217      if(parser->factory->terminate)
 218 --- misc/redland-1.0.7/librdf/rdf_query.c       Tue Oct 23 16:55:06 2007
 219 +++ misc/build/redland-1.0.7/librdf/rdf_query.c Mon Jun 16 15:55:51 2008
 220 @@ -388,7 +388,8 @@
 221  void
 222  librdf_free_query(librdf_query* query)
 223  {
 224 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query);
 225 +  if(!query)
 226 +    return;
 227
 228    if(--query->usage)
 229      return;
 230 --- misc/redland-1.0.7/librdf/rdf_query_results.c       Fri Oct 26 04:23:36 2007
 231 +++ misc/build/redland-1.0.7/librdf/rdf_query_results.c Mon Jun 16 15:55:51 2008
 232 @@ -244,7 +244,8 @@
 233  void
 234  librdf_free_query_results(librdf_query_results* query_results)
 235  {
 236 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results);
 237 +  if(!query_results)
 238 +    return;
 239
 240    if(query_results->query->factory->free_results)
 241      query_results->query->factory->free_results(query_results);
 242 @@ -636,6 +637,8 @@
 243  void
 244  librdf_free_query_results_formatter(librdf_query_results_formatter* formatter)
 245  {
 246 +  if(!formatter)
 247 +    return;
 248    if(formatter->query_results->query->factory->free_results_formatter)
 249      formatter->query_results->query->factory->free_results_formatter(formatter);
 250  }
 251 --- misc/redland-1.0.7/librdf/rdf_serializer.c  Tue Oct 23 16:55:06 2007
 252 +++ misc/build/redland-1.0.7/librdf/rdf_serializer.c    Mon Jun 16 15:55:51 2008
 253 @@ -373,7 +373,8 @@
 254  void
 255  librdf_free_serializer(librdf_serializer *serializer)
 256  {
 257 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer);
 258 +  if(!serializer)
 259 +    return;
 260
 261    if(serializer->context) {
 262      if(serializer->factory->terminate)
 263 --- misc/redland-1.0.7/librdf/rdf_statement.c   Tue Nov  6 16:26:18 2007
 264 +++ misc/build/redland-1.0.7/librdf/rdf_statement.c     Mon Jun 16 15:55:51 2008
 265 @@ -255,7 +255,8 @@
 266    librdf_world *world;
 267  #endif
 268
 269 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement);
 270 +  if(!statement)
 271 +    return;
 272
 273  #ifdef WITH_THREADS
 274    world = statement->world;
 275 --- misc/redland-1.0.7/librdf/rdf_storage.c     Thu Dec 20 22:39:42 2007
 276 +++ misc/build/redland-1.0.7/librdf/rdf_storage.c       Mon Jun 16 15:55:51 2008
 277 @@ -608,7 +608,8 @@
 278  void
 279  librdf_free_storage (librdf_storage* storage)
 280  {
 281 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage);
 282 +  if(!storage)
 283 +    return;
 284
 285    if(--storage->usage)
 286      return;
 287 --- misc/redland-1.0.7/librdf/rdf_storage_hashes.c      Thu Dec 20 22:39:42 2007
 288 +++ misc/build/redland-1.0.7/librdf/rdf_storage_hashes.c        Mon Jun 16 15:55:51 2008
 289 @@ -1389,6 +1389,66 @@
 290                                                      LIBRDF_STATEMENT_OBJECT);
 291  }
 292
 293 +
 294 +/* return -1 on failure, 1 if context contains stmt, 0 if not */
 295 +static int
 296 +librdf_storage_hashes_context_contains_statement(librdf_storage* storage,
 297 +    librdf_node* context_node,
 298 +    librdf_statement* statement)
 299 +{
 300 +  librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context;
 301 +  librdf_hash_datum key, value; /* on stack - not allocated */
 302 +  size_t size;
 303 +  int status;
 304 +
 305 +  if(context->contexts_index < 0) {
 306 +    librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL,
 307 +               "Storage was created without context support");
 308 +    return -1;
 309 +  }
 310 +
 311 +  /* ENCODE KEY */
 312 +  size=librdf_node_encode(context_node, NULL, 0);
 313 +  if (!size)
 314 +    return -1;
 315 +  key.data=(char*)LIBRDF_MALLOC(cstring, size);
 316 +  if (!key.data)
 317 +    return -1;
 318 +  key.size=librdf_node_encode(context_node,
 319 +                               (unsigned char*)key.data, size);
 320 +  if (!key.size) {
 321 +    LIBRDF_FREE(data, key.data);
 322 +    return -1;
 323 +  }
 324 +
 325 +  /* ENCODE VALUE */
 326 +  size=librdf_statement_encode(statement, NULL, 0);
 327 +  if (!size) {
 328 +    LIBRDF_FREE(data, key.data);
 329 +    return -1;
 330 +  }
 331 +  value.data=(char*)LIBRDF_MALLOC(cstring, size);
 332 +  if (!value.data) {
 333 +    LIBRDF_FREE(data, key.data);
 334 +    return -1;
 335 +  }
 336 +  value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size);
 337 +  if (!value.size) {
 338 +    LIBRDF_FREE(data, value.data);
 339 +    LIBRDF_FREE(data, key.data);
 340 +    return -1;
 341 +  }
 342 +
 343 +  status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value);
 344 +  LIBRDF_FREE(data, value.data);
 345 +  LIBRDF_FREE(data, key.data);
 346 +
 347 +  /* DO NOT free statement, ownership was not passed in */
 348 +  return status;
 349 +}
 350 +
 351 +
 352 +
 353  /**
 354   * librdf_storage_hashes_context_add_statement:
 355   * @storage: #librdf_storage object
 356 @@ -1414,7 +1474,15 @@
 357                 "Storage was created without context support");
 358      return 1;
 359    }
 360 -
 361 +
 362 +  /* Do not add duplicate statements */
 363 +  status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement);
 364 +  if(status)
 365 +    if(status < 0)
 366 +      return 1;
 367 +    else
 368 +      return 0;
 369 +
 370    if(librdf_storage_hashes_add_remove_statement(storage,
 371                                                  statement, context_node, 1))
 372      return 1;
 373 @@ -1595,7 +1663,6 @@
 374  {
 375    librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context;
 376    librdf_hash_datum* v;
 377 -  librdf_node** cnp=NULL;
 378
 379    switch(flags) {
 380      case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT:
 381 @@ -1608,20 +1675,14 @@
 382            return scontext->context_node;
 383        }
 384
 385 -      /* current stuff is out of date - get new cached answers */
 386 -      if(scontext->index_contexts) {
 387 -        if(scontext->context_node)
 388 -          librdf_free_node(scontext->context_node);
 389 -        scontext->context_node=NULL;
 390 -        cnp=&scontext->context_node;
 391 -      }
 392 -
 393 +      /* note: scontext->context_node is still valid */
 394 +
 395        librdf_statement_clear(&scontext->current);
 396
 397        v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator);
 398 -
 399 +
 400        /* decode value content and optional context */
 401 -      if(!librdf_statement_decode_parts(&scontext->current, cnp,
 402 +      if(!librdf_statement_decode_parts(&scontext->current, NULL,
 403                                          (unsigned char*)v->data, v->size)) {
 404          return NULL;
 405        }
 406 --- misc/redland-1.0.7/librdf/rdf_storage_list.c        Thu Dec 20 22:39:42 2007
 407 +++ misc/build/redland-1.0.7/librdf/rdf_storage_list.c  Mon Jun 16 15:55:51 2008
 408 @@ -459,6 +459,64 @@
 409  }
 410
 411
 412 +/* return -1 on failure, 1 if context contains stmt, 0 if not */
 413 +static int
 414 +librdf_storage_list_context_contains_statement(librdf_storage* storage,
 415 +    librdf_node* context_node,
 416 +    librdf_statement* statement)
 417 +{
 418 +  librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context;
 419 +  librdf_hash_datum key, value; /* on stack - not allocated */
 420 +  size_t size;
 421 +  int status;
 422 +
 423 +  if(!context->index_contexts) {
 424 +    librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL,
 425 +               "Storage was created without context support");
 426 +    return -1;
 427 +  }
 428 +
 429 +  /* ENCODE KEY */
 430 +  size=librdf_node_encode(context_node, NULL, 0);
 431 +  if (!size)
 432 +    return -1;
 433 +  key.data=(char*)LIBRDF_MALLOC(cstring, size);
 434 +  if (!key.data)
 435 +    return -1;
 436 +  key.size=librdf_node_encode(context_node,
 437 +                               (unsigned char*)key.data, size);
 438 +  if (!key.size) {
 439 +    LIBRDF_FREE(data, key.data);
 440 +    return -1;
 441 +  }
 442 +
 443 +  /* ENCODE VALUE */
 444 +  size=librdf_statement_encode(statement, NULL, 0);
 445 +  if (!size) {
 446 +    LIBRDF_FREE(data, key.data);
 447 +    return -1;
 448 +  }
 449 +  value.data=(char*)LIBRDF_MALLOC(cstring, size);
 450 +  if (!value.data) {
 451 +    LIBRDF_FREE(data, key.data);
 452 +    return -1;
 453 +  }
 454 +  value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size);
 455 +  if (!value.size) {
 456 +    LIBRDF_FREE(data, value.data);
 457 +    LIBRDF_FREE(data, key.data);
 458 +    return -1;
 459 +  }
 460 +
 461 +  status=librdf_hash_exists(context->contexts, &key, &value);
 462 +  LIBRDF_FREE(data, value.data);
 463 +  LIBRDF_FREE(data, key.data);
 464 +
 465 +  /* DO NOT free statement, ownership was not passed in */
 466 +  return status;
 467 +}
 468 +
 469 +
 470  /**
 471   * librdf_storage_list_context_add_statement:
 472   * @storage: #librdf_storage object
 473 @@ -485,7 +543,15 @@
 474                 "Storage was created without context support");
 475      return 1;
 476    }
 477 -
 478 +
 479 +  /* Do not add duplicate statements */
 480 +  status=librdf_storage_list_context_contains_statement(storage, context_node, statement);
 481 +  if(status)
 482 +    if(status < 0)
 483 +      return 1;
 484 +    else
 485 +      return 0;
 486 +
 487    /* Store statement + node in the storage_list */
 488    sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node));
 489    if(!sln)
 490 --- misc/redland-1.0.7/librdf/rdf_stream.c      Mon Dec 24 00:23:10 2007
 491 +++ misc/build/redland-1.0.7/librdf/rdf_stream.c        Mon Jun 16 15:55:52 2008
 492 @@ -126,6 +126,9 @@
 493  void
 494  librdf_free_stream(librdf_stream* stream)
 495  {
 496 +  if(!stream)
 497 +    return;
 498 +
 499    if(stream->finished_method)
 500      stream->finished_method(stream->context);
 501
 502 --- misc/redland-1.0.7/librdf/rdf_uri.c Tue Oct 23 16:55:06 2007
 503 +++ misc/build/redland-1.0.7/librdf/rdf_uri.c   Mon Jun 16 15:55:52 2008
 504 @@ -409,7 +409,8 @@
 505    librdf_world *world;
 506  #endif
 507
 508 -  LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri);
 509 +  if(!uri)
 510 +    return;
 511
 512  #ifdef WITH_THREADS
 513    world = uri->world;
 514 --- misc/redland-1.0.7/librdf/win32_rdf_config.h        Sun May  6 19:14:36 2007
 515 +++ misc/build/redland-1.0.7/librdf/win32_rdf_config.h  Sat Jul 12 08:56:20 2008
 516 @@ -45,7 +45,8 @@
 517  #define HAVE_STRICMP 1
 518
 519  /* MS names for these functions */
 520 -#define vsnprintf _vsnprintf
 521 +// next line breaks build on wntmsci12
 522 +//#define vsnprintf _vsnprintf
 523  #define snprintf _snprintf
 524  #define access _access
 525  #define stricmp _stricmp
 526 @@ -74,40 +75,40 @@
 527   */
 528
 529  /* BDB has close method with 2 args */
 530 -#define HAVE_BDB_CLOSE_2_ARGS 1
 531 +// #define HAVE_BDB_CLOSE_2_ARGS 1
 532
 533  /* BDB defines DBC */
 534 -#define HAVE_BDB_CURSOR 1
 535 +// #define HAVE_BDB_CURSOR 1
 536
 537  /* BDB cursor method has 4 arguments */
 538 -#define HAVE_BDB_CURSOR_4_ARGS 1
 539 +// #define HAVE_BDB_CURSOR_4_ARGS 1
 540
 541  /* BDB defines DB_TXN */
 542 -#define HAVE_BDB_DB_TXN 1
 543 +// #define HAVE_BDB_DB_TXN 1
 544
 545  /* BDB has fd method with 2 args */
 546 -#define HAVE_BDB_FD_2_ARGS 1
 547 +// #define HAVE_BDB_FD_2_ARGS 1
 548
 549  /* Have BDB hash support */
 550 -#define HAVE_BDB_HASH 1
 551 +// #define HAVE_BDB_HASH 1
 552
 553  /* BDB has open method with 6 args */
 554  /* #undef HAVE_BDB_OPEN_6_ARGS */
 555
 556  /* BDB has open method with 7 args */
 557 -#define HAVE_BDB_OPEN_7_ARGS 1
 558 +// #define HAVE_BDB_OPEN_7_ARGS 1
 559
 560  /* BDB has set_flags method */
 561 -#define HAVE_BDB_SET_FLAGS 1
 562 +// #define HAVE_BDB_SET_FLAGS 1
 563
 564  /* BDB has dbopen method */
 565  /* #undef HAVE_DBOPEN */
 566
 567  /* BDB has db_create method */
 568 -#define HAVE_DB_CREATE 1
 569 +// #define HAVE_DB_CREATE 1
 570
 571  /* Define to 1 if you have the <db.h> header file. */
 572 -#define HAVE_DB_H 1
 573 +// #define HAVE_DB_H 1
 574
 575  /* Define to 1 if you have the <dlfcn.h> header file. */
 576  /* undef HAVE_DLFCN_H */
 577 @@ -143,13 +144,13 @@
 578  /* #undef HAVE_LIBWWW */
 579
 580  /* Have local MD5 digest */
 581 -#define HAVE_LOCAL_MD5_DIGEST 1
 582 +// #define HAVE_LOCAL_MD5_DIGEST 1
 583
 584  /* Have local RIPEMD160 digest */
 585  /* #undef HAVE_LOCAL_RIPEMD160_DIGEST */
 586
 587  /* Have local SHA1 digest */
 588 -#define HAVE_LOCAL_SHA1_DIGEST 1
 589 +// #define HAVE_LOCAL_SHA1_DIGEST 1
 590
 591  /* Define to 1 if you have the <memory.h> header file. */
 592  #define HAVE_MEMORY_H 1
 593 @@ -161,25 +162,33 @@
 594  #define HAVE_MKTEMP 1
 595
 596  /* MySQL libraries are present */
 597 -#define HAVE_MYSQL 1
 598 +// #define HAVE_MYSQL 1
 599
 600  /* Define to 1 if you have the <openssl/crypto.h> header file. */
 601  /* #undef HAVE_OPENSSL_CRYPTO_H */
 602 +#define HAVE_OPENSSL_CRYPTO_H 1
 603
 604  /* Have openssl MD5 digest */
 605  /* #undef HAVE_OPENSSL_CRYPTO_MD5_DIGEST */
 606 +#define HAVE_OPENSSL_CRYPTO_MD5_DIGEST 1
 607
 608  /* Have openssl RIPEMD160 digest */
 609  /* #undef HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST */
 610 +#define HAVE_OPENSSL_CRYPTO_RIPEMD160_DIGEST 1
 611
 612  /* Have openssl SHA1 digest */
 613  /* #undef HAVE_OPENSSL_CRYPTO_SHA1_DIGEST */
 614 +#define HAVE_OPENSSL_CRYPTO_SHA1_DIGEST 1
 615
 616  /* Have openssl digests */
 617  /* #undef HAVE_OPENSSL_DIGESTS */
 618 +#define HAVE_OPENSSL_DIGESTS 1
 619
 620  /* Define to 1 if you have the <pthread.h> header file. */
 621  /* #undef HAVE_PTHREAD_H */
 622 +#ifdef __MINGW32__
 623 +#undef HAVE_PTHREAD_H */
 624 +#endif
 625
 626  /* Define to 1 if you have the <stdint.h> header file. */
 627  #define HAVE_STDINT_H 1
 628 @@ -248,7 +257,7 @@
 629  #define SIZEOF_UNSIGNED_LONG_LONG 8
 630
 631  /* SQLite API version */
 632 -#define SQLITE_API 3
 633 +// #define SQLITE_API 3
 634
 635  /* Define to 1 if you have the ANSI C header files. */
 636  #define STDC_HEADERS 1
 637 @@ -256,14 +265,17 @@
 638  /* Building file storage */
 639  #define STORAGE_FILE 1
 640
 641 +#define STORAGE_HASHES 1
 642 +#define STORAGE_MEMORY 1
 643 +
 644  /* Building MySQL storage */
 645 -#define STORAGE_MYSQL 1
 646 +// #define STORAGE_MYSQL 1
 647
 648  /* Building PostgreSQL storage */
 649  /*#undef STORAGE_POSTGRESQL*/
 650
 651  /* Building SQLite storage */
 652 -#define STORAGE_SQLITE 1
 653 +// #define STORAGE_SQLITE 1
 654
 655  /* Building 3store storage */
 656  /*#undef STORAGE_TSTORE*/
 657 --- misc/redland-1.0.7/raptor/LICENSE.txt       Fri Mar 23 06:28:24 2007
 658 +++ misc/build/redland-1.0.7/raptor/LICENSE.txt Mon Jun 16 15:55:52 2008
 659 @@ -61,3 +61,15 @@
 660
 661     Copyright (C) 2000-2007 David Beckett
 662     Copyright (C) 2000-2005 University of Bristol
 663 +
 664 +
 665 +LGPL Disclaimer
 666 +
 667 +For the avoidance of doubt, except that if any license choice other
 668 +than GPL or LGPL is available it will apply instead, Sun elects to
 669 +use only the Lesser General Public License version 2.1 (LGPLv2) at
 670 +this time for any software where a choice of LGPL license versions
 671 +is made available with the language indicating that LGPLv2.1 or any
 672 +later version may be used, or where a choice of which version of the
 673 +LGPL is applied is otherwise unspecified.
 674 +
 675 --- misc/redland-1.0.7/rasqal/LICENSE.txt       Sun Apr 22 23:09:08 2007
 676 +++ misc/build/redland-1.0.7/rasqal/LICENSE.txt Mon Jun 16 15:55:52 2008
 677 @@ -61,3 +61,15 @@
 678
 679     Copyright (C) 2003-2007 Dave Beckett
 680     Copyright (C) 2003-2005 University of Bristol
 681 +
 682 +
 683 +LGPL Disclaimer
 684 +
 685 +For the avoidance of doubt, except that if any license choice other
 686 +than GPL or LGPL is available it will apply instead, Sun elects to
 687 +use only the Lesser General Public License version 2.1 (LGPLv2) at
 688 +this time for any software where a choice of LGPL license versions
 689 +is made available with the language indicating that LGPLv2.1 or any
 690 +later version may be used, or where a choice of which version of the
 691 +LGPL is applied is otherwise unspecified.
 692 +
 693 --- misc/redland-1.0.7/ltmain.sh        2007-11-28 06:23:09.000000000 +0900
 694 +++ misc/build/redland-1.0.7/ltmain.sh  2008-07-06 15:44:48.725250000 +0900
 695 @@ -1557,6 +1557,11 @@
 696         [\\/]* | [A-Za-z]:[\\/]*) ;;
 697         *)
 698           absdir=`cd "$dir" && pwd`
 699 +         case $host_os in
 700 +           mingw*)
 701 +             absdir=`cygpath -m $absdir`
 702 +             ;;
 703 +           esac
 704           if test -z "$absdir"; then
 705             $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
 706             absdir="$dir"
 707 @@ -3237,9 +3242,9 @@
 708             revision="$number_revision"
 709             ;;
 710           freebsd-aout|freebsd-elf|sunos)
 711 -           current="$number_major"
 712 -           revision="$number_minor"
 713 -           age="0"
 714 +           current=`expr $number_major + $number_minor`
 715 +           age="$number_minor"
 716 +           revision="$number_revision"
 717             ;;
 718           irix|nonstopux)
 719             current=`expr $number_major + $number_minor`
 720 @@ -3319,8 +3324,8 @@
 721           ;;
 722
 723         freebsd-elf)
 724 -         major=".$current"
 725 -         versuffix=".$current";
 726 +         major=.`expr $current - $age`
 727 +         versuffix="$major.$age.$revision"
 728           ;;
 729
 730         irix | nonstopux)
 731 --- misc/redland-1.0.7/configure        2007-12-17 16:58:16.000000000 +0900
 732 +++ misc/build/redland-1.0.7/configure  2008-07-06 15:12:01.397125000 +0900
 733 @@ -4544,7 +4544,7 @@
 734
 735  cygwin*)
 736    # func_win32_libid is a shell function defined in ltmain.sh
 737 -  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 738 +  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
 739    lt_cv_file_magic_cmd='func_win32_libid'
 740    ;;
 741
 742 @@ -4553,7 +4553,7 @@
 743    # func_win32_libid shell function, so use a weaker test based on 'objdump',
 744    # unless we find 'file', for example because we are cross-compiling.
 745    if ( file / ) >/dev/null 2>&1; then
 746 -    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 747 +    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
 748      lt_cv_file_magic_cmd='func_win32_libid'
 749    else
 750      lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 751 --- misc/redland-1.0.7/utils/rdfproc.c  2007-10-23 23:55:06.000000000 +0900
 752 +++ misc/build/redland-1.0.7/utils/rdfproc.c    2008-07-06 17:44:47.615875000 +0900
 753 @@ -30,7 +30,7 @@
 754  #endif
 755
 756  #ifdef WIN32
 757 -#include <win32_config.h>
 758 +#include <win32_rdf_config.h>
 759  #endif
 760
 761  #include <stdio.h>