Kaydet (Commit) 341ff020 authored tarafından Caolán McNamara's avatar Caolán McNamara

xmlsec1_2_14: #i107747#: upgrade to latest xmlsec1, libxml2 and libxslt

üst 2f0d4473
This diff is collapsed.
--- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
+++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
@@ -6271,8 +6271,8 @@
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ major=.`expr $current - $age`
+ versuffix=".$major.$age.$revision";
;;
irix | nonstopux)
--- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000
+++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000
@@ -264,7 +264,7 @@
*
* Whether iconv support is available
*/
-#if 1
+#if 0
#define LIBXML_ICONV_ENABLED
#endif
@@ -282,7 +282,7 @@
*
* Whether Debugging module is configured in
*/
-#if 1
+#if 0
#define LIBXML_DEBUG_ENABLED
#endif
@@ -291,7 +291,7 @@
*
* Whether the memory debugging is configured in
*/
-#if 1
+#if 0
#define DEBUG_MEMORY_LOCATION
#endif
@@ -300,7 +300,7 @@
*
* Whether the runtime debugging is configured in
*/
-#if 1
+#if 0
#define LIBXML_DEBUG_RUNTIME
#endif
--- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
+++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000 +0000
@@ -1,9 +1,14 @@
#! /bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
+#prefix=@prefix@
+#exec_prefix=@exec_prefix@
+#includedir=@includedir@
+#libdir=@libdir@
+
+prefix=${SOLARVERSION}/${INPATH}
+exec_prefix=${SOLARVERSION}/${INPATH}
+includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
+libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
usage()
{
@@ -67,7 +72,8 @@
;;
--cflags)
- echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+ echo -I${includedir}
+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@
;;
--libtool-libs)
@@ -82,19 +88,24 @@
;;
--libs)
- if [ "`uname`" = "Linux" ]
- then
- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
- then
- echo @XML_LIBS@
- else
- echo @XML_LIBDIR@ @XML_LIBS@
- fi
- else
- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
- fi
+ echo -L${libdir} ${LIBXML2LIB} -lm
+# if [ "`uname`" = "Linux" ]
+# then
+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+# then
+# echo @XML_LIBS@
+# else
+# echo @XML_LIBDIR@ @XML_LIBS@
+# fi
+# else
+# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
+# fi
;;
+ print) # ugly configure hack
+ exit 0
+ ;;
+
*)
usage
exit 1
--- misc/libxml2-2.6.31/configure 2008-01-11 17:01:56.000000000 +0900 --- misc/libxml2-2.7.6/configure 2008-01-11 17:01:56.000000000 +0900
+++ misc/build/libxml2-2.6.31/configure 2009-09-07 20:48:47.656250000 +0900 +++ misc/build/libxml2-2.7.6/configure 2009-09-07 20:48:47.656250000 +0900
@@ -27331,6 +27331,8 @@ @@ -19914,6 +19914,8 @@
if test "$with_modules" != "no" ; then if test "$with_modules" != "no" ; then
case "$host" in case "$host" in
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
+ ;; + ;;
*-*-cygwin*) *-*-cygwin*)
MODULE_EXTENSION=".dll" MODULE_EXTENSION=".dll"
{ echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5 { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
--- misc/libxml2-2.6.31/libxml.h 2007-11-23 19:47:23.000000000 +0900 --- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900
+++ misc/build/libxml2-2.6.31/libxml.h 2009-07-10 14:37:34.988250000 +0900 +++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900
@@ -30,6 +30,10 @@ @@ -30,6 +30,10 @@
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#else #else
......
...@@ -46,20 +46,16 @@ all: ...@@ -46,20 +46,16 @@ all:
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
LIBXML2VERSION=2.6.31 LIBXML2VERSION=2.7.6
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
#.IF "$(OS)$(COM)"=="WNTGCC" PATCH_FILES=libxml2-configure.patch \
#PATCH_FILES=$(TARFILE_NAME)-mingw.patch libxml2-mingw.patch
#.ELSE
PATCH_FILES=$(TARFILE_NAME).patch
#.ENDIF
# This is only for UNX environment now # This is only for UNX environment now
.IF "$(OS)"=="WNT" .IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
PATCH_FILES+=$(TARFILE_NAME)-mingw.patch
xml2_CC=$(CC) xml2_CC=$(CC)
.IF "$(MINGW_SHARED_GCCLIB)"=="YES" .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
xml2_CC+=-shared-libgcc xml2_CC+=-shared-libgcc
......
--- misc/libxslt-1.1.24/ltmain.sh Wed Aug 29 14:28:46 2007 --- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007
+++ misc/build/libxslt-1.1.24/ltmain.sh Wed Jun 25 13:06:05 2008 +++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008
@@ -3234,9 +3234,9 @@ @@ -6195,9 +6195,9 @@
revision="$number_revision" revision="$number_revision"
;; ;;
freebsd-aout|freebsd-elf|sunos) freebsd-aout|freebsd-elf|sunos)
...@@ -12,20 +12,20 @@ ...@@ -12,20 +12,20 @@
+ revision="$number_revision" + revision="$number_revision"
;; ;;
irix|nonstopux) irix|nonstopux)
current=`expr $number_major + $number_minor` func_arith $number_major + $number_minor
@@ -3311,8 +3311,8 @@ @@ -6271,8 +6271,8 @@
;; ;;
freebsd-elf) freebsd-elf)
- major=".$current" - major=".$current"
- versuffix=".$current"; - versuffix=".$current"
+ major=.`expr $current - $age` + major=.`expr $current - $age`
+ versuffix="$major.$age.$revision" + versuffix="$major.$age.$revision"
;; ;;
irix | nonstopux) irix | nonstopux)
--- misc/libxslt-1.1.24/xslt-config.in Wed Jan 17 14:18:26 2007 --- misc/libxslt-1.1.26/xslt-config.in Wed Jan 17 14:18:26 2007
+++ misc/build/libxslt-1.1.24/xslt-config.in Wed Jun 25 13:06:05 2008 +++ misc/build/libxslt-1.1.26/xslt-config.in Wed Jun 25 13:06:05 2008
@@ -1,10 +1,16 @@ @@ -1,10 +1,16 @@
#! /bin/sh #! /bin/sh
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
if test "$includedir" != "/usr/include"; then if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else else
--- misc/libxslt-1.1.24/configure 2008-05-14 00:40:54.000000000 +0900 --- misc/libxslt-1.1.26/configure 2008-05-14 00:40:54.000000000 +0900
+++ misc/build/libxslt-1.1.24/configure 2008-07-17 22:12:38.097000000 +0900 +++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900
@@ -5730,7 +5730,7 @@ @@ -7437,7 +7437,7 @@
cygwin*) cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh # func_win32_libid is a shell function defined in ltmain.sh
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
lt_cv_file_magic_cmd='func_win32_libid' lt_cv_file_magic_cmd='func_win32_libid'
;; ;;
@@ -5739,7 +5739,7 @@ @@ -7446,7 +7446,7 @@
# func_win32_libid shell function, so use a weaker test based on 'objdump', # func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling. # unless we find 'file', for example because we are cross-compiling.
if ( file / ) >/dev/null 2>&1; then if ( file / ) >/dev/null 2>&1; then
......
--- misc/libxslt-1.1.24/win32/configure.js 2007-08-03 15:41:02.000000000 +0200 --- misc/libxslt-1.1.26/win32/configure.js 2007-08-03 15:41:02.000000000 +0200
+++ misc/build/libxslt-1.1.24/win32/configure.js 2009-05-07 13:09:42.294993200 +0200 +++ misc/build/libxslt-1.1.26/win32/configure.js 2009-05-07 13:09:42.294993200 +0200
@@ -51,7 +51,7 @@ @@ -52,7 +52,7 @@
var dirSep = "\\"; var dirSep = "\\";
var compiler = "msvc"; var compiler = "msvc";
var cruntime = "/MD"; var cruntime = "/MD";
......
...@@ -33,5 +33,5 @@ LIBXSLT_MAJOR=1 ...@@ -33,5 +33,5 @@ LIBXSLT_MAJOR=1
# minor # minor
LIBXSLT_MINOR=1 LIBXSLT_MINOR=1
# micro # micro
LIBXSLT_MICRO=24 LIBXSLT_MICRO=26
...@@ -53,7 +53,7 @@ all: ...@@ -53,7 +53,7 @@ all:
LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO) LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION) TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch PATCH_FILES=libxslt-configure.patch libxslt-win_manifest.patch
# This is only for UNX environment now # This is only for UNX environment now
.IF "$(OS)"=="WNT" .IF "$(OS)"=="WNT"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment