diff options
| author | Tobias Krause <tkr@openoffice.org> | 2010-01-25 12:39:18 +0100 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2010-01-25 12:39:18 +0100 |
| commit | f27d0010536c191d18cc9c473a2dae056183de2d (patch) | |
| tree | 30110277817a2b6e0193bb9dfbb5862aa8750b71 | |
| parent | ff6a59354fffcacd98f38b5f1b502f6c0cd16124 (diff) | |
| parent | 48699169a2d6da38e95bf887f8ef4bc78db2416d (diff) | |
tkr32: rebase from m65 to m70
35 files changed, 1521 insertions, 358 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 30f252ef589c..c97522f62612 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -33,7 +33,7 @@ + $(SLO)$/bt_stat.obj \ + $(SLO)$/bt_upgrade.obj \ + $(SLO)$/bt_verify.obj \ -+ $(SLO)$/btree_auto.obj ++ $(SLO)$/btree_auto.obj + +.INCLUDE : target.mk + @@ -53,7 +53,7 @@ +INCPRE+=..$/build_windows ..$/dbinc ..$/ +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS + -+SLOFILES= $(SLO)$/strsep.obj ++SLOFILES= $(SLO)$/strsep.obj + +.INCLUDE : target.mk + @@ -88,7 +88,7 @@ + $(SLO)$/util_cache.obj \ + $(SLO)$/util_log.obj \ + $(SLO)$/util_sig.obj \ -+ $(SLO)$/zerofill.obj ++ $(SLO)$/zerofill.obj + +.INCLUDE : target.mk + @@ -119,7 +119,7 @@ + $(SLO)$/cxx_mpool.obj \ + $(SLO)$/cxx_multi.obj \ + $(SLO)$/cxx_seq.obj \ -+ $(SLO)$/cxx_txn.obj ++ $(SLO)$/cxx_txn.obj + +.INCLUDE : target.mk + @@ -324,7 +324,7 @@ + + local: + *; -+}; ++}; --- misc/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:42:40.000000000 +0200 +++ misc/build/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:39:25.000000000 +0200 @@ -1 +1,16 @@ @@ -375,29 +375,29 @@ @@ -13,7 +13,7 @@ libdir= @libdir@ docdir= $(prefix)/docs - + -dmode= 755 +dmode= 775 emode= 555 fmode= 444 - + @@ -56,6 +56,7 @@ CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@ - + LDFLAGS= @LDFLAGS@ +LDFLAGSVERSION= @LDFLAGSVERSION@ LIBS= @LIBSO_LIBS@ TEST_LIBS= @TEST_LIBS@ LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@ @@ -733,7 +734,7 @@ - + # Shared C library. $(libso_target): $(C_OBJS) - $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) + $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS) $(RM) -f $(libdb) $(LN) -s .libs/$(libdb_version) $(libdb) - + --- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200 @@ -3757,8 +3757,10 @@ @@ -410,7 +410,7 @@ +#CXXFLAGS=${CXXFLAGS-"$CFLAGS"} +CFLAGS="$CFLAGS $optimize_def" +CXXFLAGS="$CXXFLAGS $CFLAGS" - + # The default compiler is cc (NOT gcc), the default CFLAGS is as specified # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags @@ -12566,7 +12568,8 @@ @@ -434,7 +434,7 @@ @@ -36655,7 +36659,7 @@ DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim _ACEOF - + - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then break @@ -482,7 +482,7 @@ + $(SLO)$/env_region.obj \ + $(SLO)$/env_register.obj \ + $(SLO)$/env_sig.obj \ -+ $(SLO)$/env_stat.obj ++ $(SLO)$/env_stat.obj + +.INCLUDE : target.mk + @@ -646,12 +646,13 @@ + --- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200 +++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200 -@@ -1 +1,80 @@ +@@ -1 +1,81 @@ -dummy +PRJ=..$/..$/..$/.. +PRJNAME=libdb47 +TARGET=libdb47 +USE_DEFFILE=true ++UWINAPILIB= + +.INCLUDE : settings.mk +CFLAGS+=-GS -EHsc -Gy @@ -669,7 +670,7 @@ + hash hmac hsearch lock \ + log mp mutex os os_windows \ + qam rep repmgr sequence \ -+ txn xa ++ txn xa + +LIB1TARGET= $(SLB)$/$(TARGET).lib +LIB1FILES= \ diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 7ee3beb1b07d..c6b50c6001cf 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,6 @@ ADDITIONAL_FILES= \ sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \ db_4_7_gcc4.map - - # not needed for win32. comment out when causing problems... .IF "$(GUI)$(COM)"=="WNTGCC" PATCH_FILES=db-4.7.25-mingw.patch @@ -112,13 +110,7 @@ CXXFLAGS+:=$(ARCH_FLAGS) BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) - -.IF "$(OS)"=="IRIX" -CONFIGURE_ACTION= $(CONFIG_SHELL) ..$/dist$/configure -BUILD_ACTION=gmake -.ELSE BUILD_ACTION=make -.ENDIF OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2INC= \ diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst index 4631e5605f51..c74e15efd2fd 100644 --- a/berkeleydb/prj/build.lst +++ b/berkeleydb/prj/build.lst @@ -1,3 +1,3 @@ -db berkeleydb : external xml2cmp sal NULL +db berkeleydb : external stlport NULL db berkeleydb nmake - u as_mkout NULL db berkeleydb nmake - w,vc7 as_mkout NULL diff --git a/curl/makefile.mk b/curl/makefile.mk index 9ab1199e1bc3..61cc9ffecb02 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -80,11 +80,7 @@ CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib -.IF "$(OS)"=="IRIX" -BUILD_ACTION=gmake -.ELSE BUILD_ACTION=$(GNUMAKE) -.ENDIF BUILD_FLAGS+= -j$(EXTMAXPROCESS) OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch new file mode 100644 index 000000000000..9ed7413d40de --- /dev/null +++ b/expat/expat-2.0.1.patch @@ -0,0 +1,97 @@ +--- misc/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:33:55 2008 ++++ misc/build/expat-2.0.1/lib/makefile.mk Wed Aug 20 14:26:42 2008 +@@ -1 +1,93 @@ +-dummy ++#************************************************************************* ++# ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# Copyright 2008 by Sun Microsystems, Inc. ++# ++# OpenOffice.org - a multi-platform office productivity suite ++# ++# $RCSfile: header.hxx,v $ ++# ++# $Revision: 1.1 $ ++# ++# 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=expat ++TARGET=expat ++LIBTARGET=NO ++EXTERNAL_WARNINGS_NOT_ERRORS=TRUE ++ ++# --- Settings ----------------------------------------------------- ++.INCLUDE : settings.mk ++# --- Files -------------------------------------------------------- ++ ++CFLAGS+=-I.. ++ ++.IF "$(OS)"=="WNT" ++CDEFS+=-DCOMPILED_FROM_DSP ++.ELSE ++CDEFS+=-DHAVE_EXPAT_CONFIG_H ++.ENDIF ++ ++.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!="" ++CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY ++.ENDIF # "$(OS)"=="MACOSX" ++ ++SLOFILES=$(SLO)$/xmlparse.obj \ ++ $(SLO)$/xmlrole.obj \ ++ $(SLO)$/xmltok.obj ++ ++SECOND_BUILD=UNICODE ++UNICODE_SLOFILES=$(SLO)$/xmlparse.obj ++UNICODECDEFS+=-DXML_UNICODE ++ ++LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a ++LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib ++LIB1OBJFILES=$(SLO)$/xmlparse.obj ++ ++LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a ++LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib ++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) ++ ++LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a ++LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib ++LIB3OBJFILES=$(SLO)$/xmlrole.obj $(SLO)$/xmltok.obj ++ ++.IF "$(BUILD_X64)"!="" ++# ---------------- X64 stuff special --------------------- ++# use UNICODE only because shell/shlxthandler ++# doesn't link against ascii_expat_xmlparse ++#--------------------------------------------------------- ++SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \ ++ $(SLO_X64)$/xmlrole.obj \ ++ $(SLO_X64)$/xmltok.obj ++CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP ++CFLAGS_X64+=-I.. ++LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib ++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj ++LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib ++LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj ++.ENDIF # "$(BUILD_X64)"!="" ++ ++# --- Targets ------------------------------------------------------ ++.INCLUDE : set_wntx64.mk ++.INCLUDE : target.mk ++.INCLUDE : tg_wntx64.mk diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch new file mode 100644 index 000000000000..dfac519f2ed2 --- /dev/null +++ b/expat/expat-winapi.patch @@ -0,0 +1,13 @@ +--- misc/expat-2.0.1/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000 ++++ misc/build/expat-2.0.1/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000 +@@ -7,10 +7,6 @@ + + /* External API definitions */ + +-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) +-#define XML_USE_MSC_EXTENSIONS 1 +-#endif +- + /* Expat tries very hard to make the API boundary very specifically + defined. There are two macros defined to control this boundary; + each of these can be defined before including this header to diff --git a/expat/expat.patch b/expat/expat.patch deleted file mode 100644 index 4e5336c55786..000000000000 --- a/expat/expat.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- misc/expat/makefile.mk Wed Aug 20 14:33:55 2008 -+++ misc/build/expat/makefile.mk Wed Aug 20 14:26:42 2008 -@@ -1,1 +1,34 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2008 by Sun Microsystems, Inc. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# $RCSfile: header.hxx,v $ -+# -+# $Revision: 1.1 $ -+# -+# 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. -+# -+#************************************************************************* -+ -+target: -+ cd xmltok && $(MAKE) $(MFLAGS) $(CALLMACROS) -+ cd xmlparse && $(MAKE) $(MFLAGS) $(CALLMACROS) ---- misc/expat/xmlparse/makefile.mk Wed Aug 20 14:33:54 2008 -+++ misc/build/expat/xmlparse/makefile.mk Wed Aug 20 14:40:52 2008 -@@ -1,1 +1,73 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2008 by Sun Microsystems, Inc. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# $RCSfile: header.hxx,v $ -+# -+# $Revision: 1.1 $ -+# -+# 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=expat -+TARGET=expat_xmlparse -+LIBTARGET=NO -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+# --- Settings ----------------------------------------------------- -+.INCLUDE : settings.mk -+# --- Files -------------------------------------------------------- -+ -+CFLAGS+=-I..$/xmltok -+ -+SLOFILES= $(SLO)$/xmlparse.obj -+ -+SECOND_BUILD=UNICODE -+UNICODE_SLOFILES= $(SLO)$/xmlparse.obj -+UNICODECDEFS+=-DXML_UNICODE -+ -+LIB1ARCHIV= $(LB)$/libascii_$(TARGET).a -+LIB1TARGET= $(SLB)$/ascii_$(TARGET).lib -+LIB1OBJFILES = $(SLOFILES) -+ -+LIB2ARCHIV= $(LB)$/lib$(TARGET).a -+LIB2TARGET= $(SLB)$/$(TARGET).lib -+LIB2OBJFILES = $(REAL_UNICODE_SLOFILES) -+ -+.IF "$(BUILD_X64)"!="" -+# ---------------- X64 stuff special --------------------- -+# use UNICODE only because shell/shlxthandler -+# doesn't link against ascii_expat_xmlparse -+#--------------------------------------------------------- -+SLOFILES_X64= $(SLO_X64)$/xmlparse.obj -+CDEFS_X64+=-DXML_UNICODE -+CFLAGS_X64+=-I..$/xmltok -+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib -+LIB1OBJFILES_X64=$(SLOFILES_X64) -+.ENDIF # "$(BUILD_X64)"!="" -+ -+# --- Targets ------------------------------------------------------ -+.INCLUDE : set_wntx64.mk -+.INCLUDE : target.mk -+.INCLUDE : tg_wntx64.mk ---- misc/expat/xmltok/makefile.mk Wed Aug 20 14:33:54 2008 -+++ misc/build/expat/xmltok/makefile.mk Wed Aug 20 14:33:12 2008 -@@ -1,1 +1,64 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2008 by Sun Microsystems, Inc. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# $RCSfile: header.hxx,v $ -+# -+# $Revision: 1.1 $ -+# -+# 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=expat -+TARGET=expat_xmltok -+LIBTARGET=NO -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+# --- Settings ----------------------------------------------------- -+.INCLUDE : settings.mk -+# --- Files -------------------------------------------------------- -+ -+SLOFILES = \ -+ $(SLO)$/xmlrole.obj\ -+ $(SLO)$/xmltok.obj -+ -+LIB1ARCHIV= $(LB)$/lib$(TARGET).a -+LIB1TARGET= $(SLB)$/$(TARGET).lib -+LIB1OBJFILES = $(SLOFILES) -+ -+.IF "$(BUILD_X64)"!="" -+# ---------------- X64 stuff special --------------------- -+SLOFILES_X64= \ -+ $(SLO_X64)$/xmlrole.obj\ -+ $(SLO_X64)$/xmltok.obj -+ -+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib -+LIB1OBJFILES_X64=$(SLOFILES_X64) -+.ENDIF # "$(BUILD_X64)"!="" -+ -+# --- Targets ------------------------------------------------------ -+.INCLUDE : set_wntx64.mk -+.INCLUDE : target.mk -+.INCLUDE : tg_wntx64.mk diff --git a/expat/makefile.mk b/expat/makefile.mk index 1b5abd365ef3..a7e9a6fe5d68 100644 --- a/expat/makefile.mk +++ b/expat/makefile.mk @@ -46,15 +46,19 @@ all: # --- Files -------------------------------------------------------- -TARFILE_NAME=expat -ADDITIONAL_FILES=xmlparse$/makefile.mk xmltok$/makefile.mk makefile.mk - -PATCH_FILES=expat.patch +TARFILE_NAME=expat-2.0.1 +ADDITIONAL_FILES=lib$/makefile.mk +PATCH_FILES=expat-2.0.1.patch \ + expat-winapi.patch CONFIGURE_DIR= +.IF "$(OS)"=="WNT" CONFIGURE_ACTION= +.ELSE +CONFIGURE_ACTION=.$/configure +.ENDIF -BUILD_DIR= +BUILD_DIR=lib BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) # --- Targets ------------------------------------------------------ @@ -62,4 +66,3 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk - diff --git a/expat/prj/d.lst b/expat/prj/d.lst index e20e81ed4bda..62e29c2c6005 100644 --- a/expat/prj/d.lst +++ b/expat/prj/d.lst @@ -1,6 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\external\expat mkdir: %_DEST%\lib%_EXT%\x64 -..\%__SRC%\misc\build\expat\xmlparse\xmlparse.h %_DEST%\inc%_EXT%\external\expat\xmlparse.h +..\%__SRC%\misc\build\expat-2.0.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h +..\%__SRC%\misc\build\expat-2.0.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch index a1e5a356e388..e5198f23b706 100644 --- a/hunspell/hunspell-1.2.8.patch +++ b/hunspell/hunspell-1.2.8.patch @@ -343,7 +343,7 @@ -#include "config.h" --- misc/hunspell-1.2.8/src/hunspell/makefile.mk Tue Jun 17 10:57:55 2008 +++ misc/build/hunspell-1.2.8/src/hunspell/makefile.mk Thu Feb 19 18:13:52 2009 -@@ -60,11 +60,12 @@ +@@ -60,11 +60,13 @@ # #************************************************************************* @@ -355,6 +355,7 @@ -LIBTARGET=NO +LIBTARGET=YES +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB=
#----- Settings --------------------------------------------------------- diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst index ac3a882e88a9..ea87500d1d6d 100644 --- a/hunspell/prj/build.lst +++ b/hunspell/prj/build.lst @@ -1,3 +1,3 @@ -hun hunspell : solenv ICU:icu sal NULL +hun hunspell : solenv ICU:icu NULL hun hunspell usr1 - all hun_mkout NULL hun hunspell nmake - all hun_hunspell NULL diff --git a/icu/icu-4.0.patch b/icu/icu4c-4_0_1-src.patch index 172d6244634c..172d6244634c 100644 --- a/icu/icu-4.0.patch +++ b/icu/icu4c-4_0_1-src.patch diff --git a/icu/icuversion.mk b/icu/icuversion.mk index 7c0389093fb3..e0b599f94c4a 100755 --- a/icu/icuversion.mk +++ b/icu/icuversion.mk @@ -33,5 +33,5 @@ ICU_MAJOR=4 # minor ICU_MINOR=0 # micro -ICU_MICRO=0 +ICU_MICRO=1 diff --git a/icu/makefile.mk b/icu/makefile.mk index 7503a4c18dbc..c452443c889d 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -42,9 +42,9 @@ TARGET=so_icu .INCLUDE : icuversion.mk .IF "$(ICU_MICRO)"!="0" -TARFILE_NAME=icu-$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) +TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)_$(ICU_MICRO)-src .ELSE -TARFILE_NAME=icu-$(ICU_MAJOR).$(ICU_MINOR) +TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src .ENDIF TARFILE_ROOTDIR=icu diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index dfb14afa8a3e..81e04ab80ad6 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -67,7 +67,7 @@ NSS_MODULE_RUNTIME_LIST:= \ plds4 \ smime3 \ softokn3 \ - sqlite3 \ + sqlite/sqlite3 \ ssl3 BIN_RUNTIMELIST= \ @@ -307,8 +307,8 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip echo >& $(NULLDEV) .IF "$(ENABLE_NSS_MODULE)" == "YES" # We add the libraries from the separate nss module - $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARLIBDIR)$/$(DLLPRE)$(file)$(DLLPOST) \ - $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \ + $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARLIBDIR)$/$(file:d:d)/$(DLLPRE)$(file:f)$(DLLPOST) \ + $(RUNTIME_DIR)$/$(DLLPRE)$(file:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .ENDIF .ELSE # .IF "$(GUI)" == "UNX" @@ -408,11 +408,10 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h .ENDIF $(TOUCH) $@ .IF "$(ENABLE_NSS_MODULE)"=="YES" - +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCLUDE_DIR)$/$(dir) \ - $(INCLUDE_DIR)$/$(dir)_remove_me &&) \ - echo >& $(NULLDEV) - $(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCLUDE_DIR)$/$(dir)_remove_me &&) \ - echo >& $(NULLDEV) + +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCLUDE_DIR)$/$(dir) $(INCLUDE_DIR)$/$(dir)_remove_me &&) echo >& $(NULLDEV) + $(foreach,dir,$(NSS_INCLUDE_LIST) rm -rf $(INCLUDE_DIR)$/$(dir)_remove_me &&) echo >& $(NULLDEV) + -$(MKDIR) $(OUT)$/inc.nss + cd $(OUT)$/inc.nss && $(foreach,dir,$(NSS_INCLUDE_LIST) $(GNUCOPY) -pRL $(SOLARINCDIR)$/mozilla/$(dir) . &&) echo >& $(NULLDEV) .ENDIF # On UNX the rules for so_moz_runtime_files copy files into the same directory @@ -464,3 +463,6 @@ $(MISC)$/CREATETARBALL: extract_mozab_files .ENDIF cd $(LB) && zip -r ..$/zipped$/$(MOZTARGET)lib.zip * cd $(INCCOM) && zip -r ..$/zipped$/$(MOZTARGET)inc.zip * +.IF "$(ENABLE_NSS_MODULE)"=="YES" + cd $(OUT)$/inc.nss && zip -r ..$/zipped$/$(MOZTARGET)inc.zip * +.ENDIF diff --git a/moz/makefile.mk b/moz/makefile.mk index 3722229bf74d..0aabda002e2e 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -84,7 +84,10 @@ MOZILLA_VERSION=1.1.14 TARFILE_NAME=seamonkey-$(MOZILLA_VERSION).source TARFILE_ROOTDIR=mozilla -PATCH_FILES=seamonkey-source-$(MOZILLA_VERSION).patch +PATCH_FILES = \ + seamonkey-source-$(MOZILLA_VERSION).patch \ + patches/dtoa.patch \ + patches/respect_disable_pango.patch \ # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) @@ -131,6 +134,7 @@ MOZILLA_CONFIGURE_FLAGS += --disable-tests \ --disable-image-encoders \ --disable-plugins \ --disable-printing \ + --disable-pango \ --enable-extensions="pref" #.IF "$(GUI)"!="WNT" @@ -183,6 +187,10 @@ CXXFLAGS+=-m64 .ENDIF .EXPORT : CXXFLAGS .ENDIF # "$(COMNAME)"=="sunpro5" +.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64" +CXXFLAGS:=-mminimal-toc +.EXPORT : CXXFLAGS +.ENDIF .ENDIF .IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U" diff --git a/moz/patches/dtoa.patch b/moz/patches/dtoa.patch new file mode 100644 index 000000000000..fce3be38b10b --- /dev/null +++ b/moz/patches/dtoa.patch @@ -0,0 +1,237 @@ +--- misc/mozilla/nsprpub/pr/src/misc/prdtoa.c 20 Mar 2009 03:41:21 -0000 4.7 ++++ misc/build/mozilla/nsprpub/pr/src/misc/prdtoa.c 15 Sep 2009 00:10:20 -0000 +@@ -169,17 +169,22 @@ void _PR_CleanupDtoa(void) + * Llong, #define #ULLong to be the corresponding unsigned type. + * #define KR_headers for old-style C function headers. + * #define Bad_float_h if your system lacks a float.h or if it does not + * define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP, + * FLT_RADIX, FLT_ROUNDS, and DBL_MAX. + * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n) + * if memory is available and otherwise does something you deem + * appropriate. If MALLOC is undefined, malloc will be invoked +- * directly -- and assumed always to succeed. ++ * directly -- and assumed always to succeed. Similarly, if you ++ * want something other than the system's free() to be called to ++ * recycle memory acquired from MALLOC, #define FREE to be the ++ * name of the alternate routine. (FREE or free is only called in ++ * pathological cases, e.g., in a dtoa call after a dtoa return in ++ * mode 3 with thousands of digits requested.) + * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making + * memory allocations from a private pool of memory when possible. + * When used, the private pool is PRIVATE_MEM bytes long: 2304 bytes, + * unless #defined to be a different length. This default length + * suffices to get rid of MALLOC calls except for unusual cases, + * such as decimal-to-binary conversion of a very long string of + * digits. The longest string dtoa can return is about 751 bytes + * long. For conversions by strtod of strings of 800 digits and +@@ -553,17 +558,17 @@ extern double rnd_prod(double, double), + #endif + #endif /* NO_LONG_LONG */ + + #ifndef MULTIPLE_THREADS + #define ACQUIRE_DTOA_LOCK(n) /*nothing*/ + #define FREE_DTOA_LOCK(n) /*nothing*/ + #endif + +-#define Kmax 15 ++#define Kmax 7 + + struct + Bigint { + struct Bigint *next; + int k, maxwds, sign, wds; + ULong x[1]; + }; + +@@ -581,27 +586,28 @@ Balloc + { + int x; + Bigint *rv; + #ifndef Omit_Private_Memory + unsigned int len; + #endif + + ACQUIRE_DTOA_LOCK(0); +- if (rv = freelist[k]) { ++ /* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */ ++ /* but this case seems very unlikely. */ ++ if (k <= Kmax && (rv = freelist[k])) + freelist[k] = rv->next; +- } + else { + x = 1 << k; + #ifdef Omit_Private_Memory + rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong)); + #else + len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) + /sizeof(double); +- if (pmem_next - private_mem + len <= PRIVATE_mem) { ++ if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) { + rv = (Bigint*)pmem_next; + pmem_next += len; + } + else + rv = (Bigint*)MALLOC(len*sizeof(double)); + #endif + rv->k = k; + rv->maxwds = x; +@@ -615,20 +621,28 @@ Balloc + Bfree + #ifdef KR_headers + (v) Bigint *v; + #else + (Bigint *v) + #endif + { + if (v) { +- ACQUIRE_DTOA_LOCK(0); +- v->next = freelist[v->k]; +- freelist[v->k] = v; +- FREE_DTOA_LOCK(0); ++ if (v->k > Kmax) ++#ifdef FREE ++ FREE((void*)v); ++#else ++ free((void*)v); ++#endif ++ else { ++ ACQUIRE_DTOA_LOCK(0); ++ v->next = freelist[v->k]; ++ freelist[v->k] = v; ++ FREE_DTOA_LOCK(0); ++ } + } + } + + #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \ + y->wds*sizeof(Long) + 2*sizeof(int)) + + static Bigint * + multadd +--- misc/mozilla/js/src/jsdtoa.c 2 Sep 2007 22:20:41 -0000 3.41 ++++ misc/build/mozilla/js/src/jsdtoa.c 18 Sep 2009 16:15:13 -0000 +@@ -145,17 +145,22 @@ + * and if "unsigned Llong" does not work as an unsigned version of + * Llong, #define #ULLong to be the corresponding unsigned type. + * #define Bad_float_h if your system lacks a float.h or if it does not + * define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP, + * FLT_RADIX, FLT_ROUNDS, and DBL_MAX. + * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n) + * if memory is available and otherwise does something you deem + * appropriate. If MALLOC is undefined, malloc will be invoked +- * directly -- and assumed always to succeed. ++ * directly -- and assumed always to succeed. Similarly, if you ++ * want something other than the system's free() to be called to ++ * recycle memory acquired from MALLOC, #define FREE to be the ++ * name of the alternate routine. (FREE or free is only called in ++ * pathological cases, e.g., in a dtoa call after a dtoa return in ++ * mode 3 with thousands of digits requested.) + * #define Omit_Private_Memory to omit logic (added Jan. 1998) for making + * memory allocations from a private pool of memory when possible. + * When used, the private pool is PRIVATE_MEM bytes long: 2000 bytes, + * unless #defined to be a different length. This default length + * suffices to get rid of MALLOC calls except for unusual cases, + * such as decimal-to-binary conversion of a very long string of + * digits. + * #define INFNAN_CHECK on IEEE systems to cause strtod to check for +@@ -320,17 +325,17 @@ static PRLock *freelist_lock; + JS_END_MACRO + #define RELEASE_DTOA_LOCK() PR_Unlock(freelist_lock) + #else + #undef MULTIPLE_THREADS + #define ACQUIRE_DTOA_LOCK() /*nothing*/ + #define RELEASE_DTOA_LOCK() /*nothing*/ + #endif + +-#define Kmax 15 ++#define Kmax 7 + + struct Bigint { + struct Bigint *next; /* Free list link */ + int32 k; /* lg2(maxwds) */ + int32 maxwds; /* Number of words allocated for x */ + int32 sign; /* Zero if positive, 1 if negative. Ignored by most Bigint routines! */ + int32 wds; /* Actual number of words. If value is nonzero, the most significant word must be nonzero. */ + ULong x[1]; /* wds words of number in little endian order */ +@@ -400,26 +405,26 @@ static Bigint *Balloc(int32 k) + + #ifdef ENABLE_OOM_TESTING + if (++allocationNum == desiredFailure) { + printf("Forced Failing Allocation number %d\n", allocationNum); + return NULL; + } + #endif + +- if ((rv = freelist[k]) != NULL) ++ if (k <= Kmax && (rv = freelist[k]) != NULL) + freelist[k] = rv->next; + if (rv == NULL) { + x = 1 << k; + #ifdef Omit_Private_Memory + rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong)); + #else + len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) + /sizeof(double); +- if (pmem_next - private_mem + len <= PRIVATE_mem) { ++ if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) { + rv = (Bigint*)pmem_next; + pmem_next += len; + } + else + rv = (Bigint*)MALLOC(len*sizeof(double)); + #endif + if (!rv) + return NULL; +@@ -428,18 +433,26 @@ static Bigint *Balloc(int32 k) + } + rv->sign = rv->wds = 0; + return rv; + } + + static void Bfree(Bigint *v) + { + if (v) { +- v->next = freelist[v->k]; +- freelist[v->k] = v; ++ if (v->k > Kmax) ++#ifdef FREE ++ FREE((void*)v); ++#else ++ free((void*)v); ++#endif ++ else { ++ v->next = freelist[v->k]; ++ freelist[v->k] = v; ++ } + } + } + + #define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \ + y->wds*sizeof(Long) + 2*sizeof(int32)) + + /* Return b*m + a. Deallocate the old b. Both a and m must be between 0 and + * 65535 inclusive. NOTE: old b is deallocated on memory failure. +--- misc/mozilla/js/src/jsdtoa.c 22 Sep 2009 06:16:27 -0000 3.42 ++++ misc/build/mozilla/js/src/jsdtoa.c 15 Oct 2009 10:34:38 -0000 +@@ -405,19 +405,19 @@ static Bigint *Balloc(int32 k) + + #ifdef ENABLE_OOM_TESTING + if (++allocationNum == desiredFailure) { + printf("Forced Failing Allocation number %d\n", allocationNum); + return NULL; + } + #endif + +- if (k <= Kmax && (rv = freelist[k]) != NULL) ++ if (k <= Kmax && (rv = freelist[k])) + freelist[k] = rv->next; +- if (rv == NULL) { ++ else { + x = 1 << k; + #ifdef Omit_Private_Memory + rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong)); + #else + len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) + /sizeof(double); + if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) { + rv = (Bigint*)pmem_next; diff --git a/moz/patches/respect_disable_pango.patch b/moz/patches/respect_disable_pango.patch new file mode 100644 index 000000000000..07a83e9dd40a --- /dev/null +++ b/moz/patches/respect_disable_pango.patch @@ -0,0 +1,54 @@ +--- misc/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp 2006-02-28 15:55:35.000000000 +0100 ++++ misc/build/mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp 2009-11-13 15:12:24.000000000 +0100 +@@ -66,10 +66,12 @@ + #endif /* MOZ_WIDGET_GTK */ + + #ifdef MOZ_WIDGET_GTK2 ++#ifdef MOZ_ENABLE_PANGO + #include <pango/pango.h> + #include <pango/pangox.h> + #include <pango/pango-fontmap.h> + #endif ++#endif + + #ifdef MOZ_ENABLE_XFT + #include "nsFontMetricsUtils.h" +@@ -963,9 +965,11 @@ + #ifdef MOZ_WIDGET_GTK2 + + #ifdef MOZ_ENABLE_COREXFONTS ++#ifdef MOZ_ENABLE_PANGO + static void xlfd_from_pango_font_description(GtkWidget *aWidget, + const PangoFontDescription *aFontDesc, + nsString& aFontName); ++#endif + #endif /* MOZ_ENABLE_COREXFONTS */ + + nsresult +@@ -997,10 +1001,12 @@ + #endif /* MOZ_ENABLE_XFT */ + + #ifdef MOZ_ENABLE_COREXFONTS ++#ifdef MOZ_ENABLE_PANGO + // if name already set by Xft, do nothing + if (!aFont->name.Length()) { + xlfd_from_pango_font_description(aWidget, desc, aFont->name); + } ++#endif /* MOZ_ENABLE_PANGO */ + #endif /* MOZ_ENABLE_COREXFONTS */ + aFont->weight = pango_font_description_get_weight(desc); + +@@ -1104,6 +1110,7 @@ + #endif /* MOZ_ENABLE_XFT */ + + #if defined(MOZ_WIDGET_GTK2) && defined(MOZ_ENABLE_COREXFONTS) ++#ifdef MOZ_ENABLE_PANGO + // xlfd_from_pango_font_description copied from vte, which was + // written by nalin@redhat.com, and added some codes. + static void +@@ -1226,4 +1233,5 @@ + g_free(spec); + g_object_unref(font); + } ++#endif + #endif /* MOZ_WIDGET_GTK2 && MOZ_ENABLE_COREXFONTS */ diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index a7b3ea846e9b..c8497d36acf9 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -43,7 +43,7 @@ TARGET=moz_unzip .IF "$(PREBUILD_MOZAB)" == "" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO" dummy: - @echo "No need to unpack the prebuild mozab packages" + @echo "No need to unpack the prebuilt mozab packages" .ELSE # unpack mozab zips .INCLUDE : target.mk @@ -175,6 +175,8 @@ FREEBL=freebl3 .ENDIF # "$(OS)" == "SOLARIS" +#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so +#See readme.txt in module nss NSS_MODULE_RUNTIME_LIST:= \ $(FREEBL) \ nspr4 \ @@ -186,7 +188,7 @@ NSS_MODULE_RUNTIME_LIST:= \ plds4 \ smime3 \ softokn3 \ - sqlite3 \ + sqlite/sqlite3 \ ssl3 @@ -200,13 +202,13 @@ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip echo >& $(NULLDEV) $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \ echo >& $(NULLDEV) - $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib)$(DLLPOST) &&) \ + $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .IF "$(GUI)"=="WNT" - $(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \ + +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .ELSE - $(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \ + +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(lib:d)$(DLLPRE)$(lib:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .ENDIF $(TOUCH) $@ diff --git a/neon/makefile.mk b/neon/makefile.mk index 247e640ce8b1..dd0022822752 100644 --- a/neon/makefile.mk +++ b/neon/makefile.mk @@ -54,6 +54,13 @@ NEON_NAME=neon-0.28.2 TARFILE_NAME=$(NEON_NAME) PATCH_FILES=neon.patch + +.IF "$(GUI)"=="WNT" + PATCH_FILES+=neon_exports_win.patch +.ELSE + PATCH_FILES+=neon_exports_unix.patch +.ENDIF + ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c BUILD_DIR=src diff --git a/neon/neon.patch b/neon/neon.patch index 569ed0f0a189..23a6bba02ebe 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -1,5 +1,5 @@ ---- misc/neon-0.28.2/src/config.h 2009-08-30 19:00:56.000000000 +0200 -+++ misc/build/neon-0.28.2/src/config.h 2009-08-11 09:48:54.000000000 +0200 +--- misc/neon-0.28.2/src/config.h 2009-09-29 10:28:26.750000000 +0200 ++++ misc/build/neon-0.28.2/src/config.h 2009-09-29 10:22:51.890625000 +0200 @@ -1 +1,484 @@ -dummy + @@ -486,16 +486,18 @@ +#else +#define HAVE_NTLM 1 +#endif ---- misc/neon-0.28.2/src/makefile.mk 2009-08-30 19:00:56.000000000 +0200 -+++ misc/build/neon-0.28.2/src/makefile.mk 2009-08-11 09:48:54.000000000 +0200 -@@ -1 +1,59 @@ +--- misc/neon-0.28.2/src/makefile.mk 2009-09-29 10:28:26.687500000 +0200 ++++ misc/build/neon-0.28.2/src/makefile.mk 2009-09-17 13:04:18.031250000 +0200 +@@ -1 +1,92 @@ -dummy +PRJ=..$/..$/..$/..$/.. + +PRJNAME=neon +TARGET=neon +LIBTARGET=NO ++USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ UWINAPILIB= + +# --- Settings ----------------------------------------------------- + @@ -506,9 +508,15 @@ +CDEFS+=-DHAVE_CONFIG_H + +.IF "$(SYSTEM_LIBXML)" == "YES" -+CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) ++CFLAGS+= -DSYSTEM_LIBXML $(LIBXML_CFLAGS) ++.ELSE ++LIBXMLINCDIR=external$/libxml ++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) +.ENDIF + ++.IF "$(SYSTEM_OPENSSL)" == "YES" ++CFLAGS+= $(OPENSSL_CFLAGS) ++.ENDIF + +SLOFILES= \ + $(SLO)$/ne_207.obj \ @@ -542,15 +550,40 @@ +# $(SLO)$/ne_gnutls.obj \ +# $(SLO)$/ne_stubssl.obj + -+LIB1TARGET=$(SLB)$/$(TARGET).lib -+LIB1ARCHIV=$(LB)$/lib$(TARGET).a -+LIB1OBJFILES=$(SLOFILES) ++SHL1OBJS=$(SLOFILES) ++SHL1TARGET=$(TARGET) ++SHL1VERSIONMAP=exports.map ++SHL1IMPLIB=i$(TARGET) ++ ++SHL1STDLIBS+= $(LIBXML2LIB) ++ ++.IF "$(GUI)"=="WNT" ++ SHL1STDLIBS+= $(WSOCK32LIB) ++ .IF "$(WINDOWS_VISTA_PSDK)" != "" ++ SHL1STDLIBS+= $(WS2_32LIB) ++ .ENDIF ++ SHL1STDLIBS+= $(OPENSSLLIB) ++.ELSE # WNT ++ .IF "$(OS)"=="SOLARIS" ++ SHL1STDLIBS+= -lnsl -lsocket -ldl ++ .ENDIF # SOLARIS ++ .IF "$(OS)"=="OS2" ++ SHL1STDLIBS+= pthread.lib libz.lib ++ .ENDIF # OS2 ++ .IF "$(SYSTEM_OPENSSL)"=="YES" ++ SHL1STDLIBS+= $(OPENSSLLIB) ++ .ELSE ++ SHL1STDLIBS+= $(OPENSSLLIBST) ++ .ENDIF ++.ENDIF # WNT ++ ++SHL1DEF=$(MISC)$/$(SHL1TARGET).def + +# --- Targets ------------------------------------------------------ -+ ++DEF1NAME=$(SHL1TARGET) +.INCLUDE : target.mk --- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.c 2009-08-24 15:41:32.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_auth.c 2009-09-29 10:22:51.906250000 +0200 @@ -77,6 +77,10 @@ #include "ne_sspi.h" #endif @@ -714,7 +747,7 @@ return ret; } --- misc/neon-0.28.2/src/ne_auth.h 2007-12-05 17:39:58.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.h 2009-08-24 15:16:22.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_auth.h 2009-09-29 10:22:51.921875000 +0200 @@ -47,8 +47,8 @@ * Hint: if you just wish to attempt authentication just once (even if * the user gets the username/password wrong), have the callback @@ -727,7 +760,7 @@ /* Set callbacks to provide credentials for server and proxy * authentication, using the default set of authentication protocols. --- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_defs.h 2009-08-11 09:48:54.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_defs.h 2009-09-29 10:22:51.921875000 +0200 @@ -41,7 +41,7 @@ #endif @@ -738,7 +771,7 @@ #endif --- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_locks.h 2009-08-11 09:48:54.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_locks.h 2009-09-29 10:22:51.921875000 +0200 @@ -22,6 +22,10 @@ #ifndef NE_LOCKS_H #define NE_LOCKS_H @@ -750,8 +783,8 @@ #include "ne_request.h" /* for ne_session + ne_request */ #include "ne_uri.h" /* for ne_uri */ ---- misc/neon-0.28.2/src/ne_ntlm.c 2009-08-30 19:00:56.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-08-11 09:48:54.000000000 +0200 +--- misc/neon-0.28.2/src/ne_ntlm.c 2009-09-29 10:28:26.875000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-09-29 10:22:51.937500000 +0200 @@ -1 +1,700 @@ -dummy +/* @@ -1454,8 +1487,8 @@ + +#endif /* HAVE_OPENSSL */ +#endif /* HAVE_NTLM */ ---- misc/neon-0.28.2/src/ne_ntlm.h 2009-08-30 19:00:56.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-08-11 09:48:54.000000000 +0200 +--- misc/neon-0.28.2/src/ne_ntlm.h 2009-09-29 10:28:26.812500000 +0200 ++++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-09-29 10:22:51.937500000 +0200 @@ -1 +1,44 @@ -dummy +/* @@ -1503,7 +1536,7 @@ + +#endif /* NE_NTLM_H */ --- misc/neon-0.28.2/src/ne_socket.c 2008-02-28 14:19:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_socket.c 2009-08-11 09:48:54.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_socket.c 2009-09-29 10:22:51.953125000 +0200 @@ -60,6 +60,7 @@ #include <stddef.h> #ifdef USE_GETADDRINFO @@ -1513,7 +1546,7 @@ #endif --- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-08-11 09:48:54.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-09-29 10:22:51.953125000 +0200 @@ -202,9 +202,48 @@ return -1; } @@ -1604,7 +1637,7 @@ securityStatus = initializeSecurityContext(&sspiContext->credentials, NULL, --- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-08-11 09:48:54.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-09-29 10:22:51.968750000 +0200 @@ -41,7 +41,7 @@ int ne_sspi_clear_context(void *context); @@ -1615,7 +1648,7 @@ #endif /* HAVE_SSPI */ --- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_uri.c 2009-08-11 09:48:54.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_uri.c 2009-09-29 10:22:51.968750000 +0200 @@ -42,7 +42,7 @@ #include "ne_alloc.h" #include "ne_uri.h" @@ -1662,7 +1695,7 @@ /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, --- misc/neon-0.28.2/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_utils.c 2009-08-30 18:55:04.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_utils.c 2009-09-29 10:22:51.984375000 +0200 @@ -118,6 +118,9 @@ #ifdef HAVE_GNUTLS ", GNU TLS " LIBGNUTLS_VERSION @@ -1693,7 +1726,7 @@ #endif /* NE_HAVE_* */ default: --- misc/neon-0.28.2/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_utils.h 2009-08-24 15:47:03.000000000 +0200 ++++ misc/build/neon-0.28.2/src/ne_utils.h 2009-09-29 10:22:51.984375000 +0200 @@ -54,6 +54,7 @@ #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch new file mode 100644 index 000000000000..1ee17690c8ed --- /dev/null +++ b/neon/neon_exports_unix.patch @@ -0,0 +1,290 @@ +--- misc/neon-0.28.2/src/exports.map 2009-09-29 10:28:13.531250000 +0200 ++++ misc/build/neon-0.28.2/src/exports.map 2009-09-21 12:16:53.453125000 +0200 +@@ -0,0 +1,287 @@ ++NEON_0_28_2 { ++ global: ++ ne__negotiate_ssl; ++ ne__ssl_exit; ++ ne__ssl_init; ++ ne_ssl_cert_cmp; ++ ne_ssl_cert_digest; ++ ne_ssl_cert_export; ++ ne_ssl_cert_free; ++ ne_ssl_cert_identity; ++ ne_ssl_cert_import; ++ ne_ssl_cert_issuer; ++ ne_ssl_cert_read; ++ ne_ssl_cert_signedby; ++ ne_ssl_cert_subject; ++ ne_ssl_cert_validity_time; ++ ne_ssl_cert_write; ++ ne_ssl_clicert_decrypt; ++ ne_ssl_clicert_encrypted; ++ ne_ssl_clicert_free; ++ ne_ssl_clicert_name; ++ ne_ssl_clicert_owner; ++ ne_ssl_clicert_read; ++ ne_ssl_context_create; ++ ne_ssl_context_destroy; ++ ne_ssl_context_keypair; ++ ne_ssl_context_set_flag; ++ ne_ssl_context_set_verify; ++ ne_ssl_context_trustcert; ++ ne_ssl_dname_cmp; ++ ne_ssl_readable_dname; ++ ne_ssl_set_clicert; ++ ne_ssl_trust_default_ca; ++ ne_xml_dispatch_request; ++ ne_xml_parse_response; ++ ne_xml_create; ++ ne_xml_currentline; ++ ne_xml_destroy; ++ ne_xml_doc_encoding; ++ ne_xml_failed; ++ ne_xml_get_attr; ++ ne_xml_get_error; ++ ne_xml_mapid; ++ ne_xml_parse; ++ ne_xml_parse_v; ++ ne_xml_push_handler; ++ ne_xml_resolve_nspace; ++ ne_xml_set_error; ++ ne_debug; ++ ne_debug_init; ++ ne_debug_mask; ++ ne_debug_stream; ++ ne_has_support; ++ ne_parse_statusline; ++ ne_version_match; ++ ne_version_string; ++ ne_path_childof; ++ ne_path_compare; ++ ne_path_escape; ++ ne_path_has_trailing_slash; ++ ne_path_parent; ++ ne_path_unescape; ++ ne_uri_cmp; ++ ne_uri_copy; ++ ne_uri_defaultport; ++ ne_uri_free; ++ ne_uri_parse; ++ ne_uri_resolve; ++ ne_uri_unparse; ++ ne_base64; ++ ne_buffer_altered; ++ ne_buffer_append; ++ ne_buffer_clear; ++ ne_buffer_concat; ++ ne_buffer_create; ++ ne_buffer_destroy; ++ ne_buffer_finish; ++ ne_buffer_grow; ++ ne_buffer_ncreate; ++ ne_buffer_snprintf; ++ ne_buffer_zappend; ++ ne_concat; ++ ne_qtoken; ++ ne_shave; ++ ne_snprintf; ++ ne_strcasecmp; ++ ne_strclean; ++ ne_strerror; ++ ne_strncasecmp; ++ ne_token; ++ ne_tolower_array; ++ ne_unbase64; ++ ne_vsnprintf; ++ ne__sock_sslsock; ++ ne_addr_destroy; ++ ne_addr_error; ++ ne_addr_first; ++ ne_addr_next; ++ ne_addr_resolve; ++ ne_addr_result; ++ ne_iaddr_cmp; ++ ne_iaddr_free; ++ ne_iaddr_make; ++ ne_iaddr_print; ++ ne_iaddr_reverse; ++ ne_iaddr_typeof; ++ ne_sock_accept; ++ ne_sock_accept_ssl; ++ ne_sock_block; ++ ne_sock_cipher; ++ ne_sock_close; ++ ne_sock_connect; ++ ne_sock_connect_ssl; ++ ne_sock_connect_timeout; ++ ne_sock_create; ++ ne_sock_error; ++ ne_sock_exit; ++ ne_sock_fd; ++ ne_sock_fullread; ++ ne_sock_fullwrite; ++ ne_sock_init; ++ ne_sock_peek; ++ ne_sock_peer; ++ ne_sock_prebind; ++ ne_sock_read; ++ ne_sock_read_timeout; ++ ne_sock_readline; ++ ne_sock_sessid; ++ ne__ssl_set_verify_err; ++ ne_close_connection; ++ ne_fill_proxy_uri; ++ ne_fill_server_uri; ++ ne_get_error; ++ ne_get_scheme; ++ ne_get_server_hostport; ++ ne_get_session_flag; ++ ne_hook_close_conn; ++ ne_hook_create_request; ++ ne_hook_destroy_request; ++ ne_hook_destroy_session; ++ ne_hook_post_headers; ++ ne_hook_post_send; ++ ne_hook_pre_send; ++ ne_session_create; ++ ne_session_destroy; ++ ne_session_proxy; ++ ne_set_addrlist; ++ ne_set_connect_timeout; ++ ne_set_error; ++ ne_set_localaddr; ++ ne_set_notifier; ++ ne_set_progress; ++ ne_set_read_timeout; ++ ne_set_session_flag; ++ ne_set_session_private; ++ ne_set_useragent; ++ ne_ssl_cert_validity; ++ ne_ssl_provide_clicert; ++ ne_ssl_set_verify; ++ ne_ssl_trust_cert; ++ ne_unhook_close_conn; ++ ne_unhook_create_request; ++ ne_unhook_destroy_request; ++ ne_unhook_destroy_session; ++ ne_unhook_post_headers; ++ ne_unhook_post_send; ++ ne_unhook_pre_send; ++ ne_version_pre_http11; ++ ne_accept_2xx; ++ ne_accept_always; ++ ne_add_request_header; ++ ne_add_response_body_reader; ++ ne_begin_request; ++ ne_discard_response; ++ ne_end_request; ++ ne_get_request_flag; ++ ne_get_request_private; ++ ne_get_response_header; ++ ne_get_session; ++ ne_get_session_private; ++ ne_get_status; ++ ne_print_request_header; ++ ne_read_response_block; ++ ne_read_response_to_fd; ++ ne_request_create; ++ ne_request_destroy; ++ ne_request_dispatch; ++ ne_response_header_iterate; ++ ne_set_request_body_buffer; ++ ne_set_request_body_fd; ++ ne_set_request_body_provider; ++ ne_set_request_flag; ++ ne_set_request_private; ++ ne_redirect_location; ++ ne_redirect_register; ++ ne_propfind_allprop; ++ ne_propfind_create; ++ ne_propfind_current_private; ++ ne_propfind_destroy; ++ ne_propfind_get_parser; ++ ne_propfind_get_request; ++ ne_propfind_named; ++ ne_propfind_set_private; ++ ne_propnames; ++ ne_proppatch; ++ ne_propset_iterate; ++ ne_propset_lang; ++ ne_propset_private; ++ ne_propset_status; ++ ne_propset_value; ++ ne_simple_propfind; ++ ne_ascii_to_md5; ++ ne_md5_create_ctx; ++ ne_md5_destroy_ctx; ++ ne_md5_dup_ctx; ++ ne_md5_finish_ascii; ++ ne_md5_finish_ctx; ++ ne_md5_process_block; ++ ne_md5_process_bytes; ++ ne_md5_read_ctx; ++ ne_md5_reset_ctx; ++ ne_md5_stream; ++ ne_md5_to_ascii; ++ ne_lock; ++ ne_lock_copy; ++ ne_lock_create; ++ ne_lock_destroy; ++ ne_lock_discover; ++ ne_lock_free; ++ ne_lock_refresh; ++ ne_lock_using_parent; ++ ne_lock_using_resource; ++ ne_lockstore_add; ++ ne_lockstore_create; ++ ne_lockstore_destroy; ++ ne_lockstore_findbyuri; ++ ne_lockstore_first; ++ ne_lockstore_next; ++ ne_lockstore_register; ++ ne_lockstore_remove; ++ ne_unlock; ++ ne_i18n_init; ++ ne_asctime_parse; ++ ne_httpdate_parse; ++ ne_iso8601_parse; ++ ne_rfc1036_parse; ++ ne_rfc1123_date; ++ ne_rfc1123_parse; ++ ne_decompress_destroy; ++ ne_decompress_reader; ++ ne_add_depth_header; ++ ne_copy; ++ ne_delete; ++ ne_get; ++ ne_get_content_type; ++ ne_get_range; ++ ne_getmodtime; ++ ne_mkcol; ++ ne_move; ++ ne_options; ++ ne_options2; ++ ne_post; ++ ne_put; ++ ne_add_proxy_auth; ++ ne_add_server_auth; ++ ne_forget_auth; ++ ne_set_proxy_auth; ++ ne_set_server_auth; ++ ne_calloc; ++ ne_malloc; ++ ne_oom_callback; ++ ne_realloc; ++ ne_strdup; ++ ne_strndup; ++ ne_acl_set; ++ ne_207_create; ++ ne_207_destroy; ++ ne_207_get_current_propstat; ++ ne_207_get_current_response; ++ ne_207_set_propstat_handlers; ++ ne_207_set_response_handlers; ++ ne_accept_207; ++ ne_simple_request; ++ GetVersionInfo; ++ local: ++ *; ++}; diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch new file mode 100644 index 000000000000..479f03a9d6bc --- /dev/null +++ b/neon/neon_exports_win.patch @@ -0,0 +1,295 @@ +--- misc/neon-0.28.2/src/exports.map 2009-09-29 10:28:13.531250000 +0200 ++++ misc/build/neon-0.28.2/src/exports.map 2009-09-21 12:16:53.453125000 +0200 +@@ -0,0 +1,292 @@ ++NEON_0_28_2 { ++ global: ++ ne_sspi_authenticate; ++ ne_sspi_clear_context; ++ ne_sspi_create_context; ++ ne_sspi_deinit; ++ ne_sspi_destroy_context; ++ ne_sspi_init; ++ ne__negotiate_ssl; ++ ne__ssl_exit; ++ ne__ssl_init; ++ ne_ssl_cert_cmp; ++ ne_ssl_cert_digest; ++ ne_ssl_cert_export; ++ ne_ssl_cert_free; ++ ne_ssl_cert_identity; ++ ne_ssl_cert_import; ++ ne_ssl_cert_issuer; ++ ne_ssl_cert_read; ++ ne_ssl_cert_signedby; ++ ne_ssl_cert_subject; ++ ne_ssl_cert_validity_time; ++ ne_ssl_cert_write; ++ ne_ssl_clicert_decrypt; ++ ne_ssl_clicert_encrypted; ++ ne_ssl_clicert_free; ++ ne_ssl_clicert_name; ++ ne_ssl_clicert_owner; ++ ne_ssl_clicert_read; ++ ne_ssl_context_create; ++ ne_ssl_context_destroy; ++ ne_ssl_context_keypair; ++ ne_ssl_context_set_flag; ++ ne_ssl_context_set_verify; ++ ne_ssl_context_trustcert; ++ ne_ssl_dname_cmp; ++ ne_ssl_readable_dname; ++ ne_ssl_set_clicert; ++ ne_ssl_trust_default_ca; ++ ne_xml_dispatch_request; ++ ne_xml_parse_response; ++ ne_xml_create; ++ ne_xml_currentline; ++ ne_xml_destroy; ++ ne_xml_doc_encoding; ++ ne_xml_failed; ++ ne_xml_get_attr; ++ ne_xml_get_error; ++ ne_xml_mapid; ++ ne_xml_parse; ++ ne_xml_parse_v; ++ ne_xml_push_handler; ++ ne_xml_resolve_nspace; ++ ne_xml_set_error; ++ ne_debug; ++ ne_debug_init; ++ ne_debug_mask; ++ ne_debug_stream; ++ ne_has_support; ++ ne_parse_statusline; ++ ne_version_match; ++ ne_version_string; ++ ne_path_childof; ++ ne_path_compare; ++ ne_path_escape; ++ ne_path_has_trailing_slash; ++ ne_path_parent; ++ ne_path_unescape; ++ ne_uri_cmp; ++ ne_uri_copy; ++ ne_uri_defaultport; ++ ne_uri_free; ++ ne_uri_parse; ++ ne_uri_resolve; ++ ne_uri_unparse; ++ ne_base64; ++ ne_buffer_altered; ++ ne_buffer_append; ++ ne_buffer_clear; ++ ne_buffer_concat; ++ ne_buffer_create; ++ ne_buffer_destroy; ++ ne_buffer_finish; ++ ne_buffer_grow; ++ ne_buffer_ncreate; ++ ne_buffer_snprintf; ++ ne_buffer_zappend; ++ ne_concat; ++ ne_qtoken; ++ ne_shave; ++ ne_snprintf; ++ ne_strcasecmp; ++ ne_strclean; ++ ne_strerror; ++ ne_strncasecmp; ++ ne_token; ++ ne_tolower_array; ++ ne_unbase64; ++ ne_vsnprintf; ++ ne__sock_sslsock; ++ ne_addr_destroy; ++ ne_addr_error; ++ ne_addr_first; ++ ne_addr_next; ++ ne_addr_resolve; ++ ne_addr_result; ++ ne_iaddr_cmp; ++ ne_iaddr_free; ++ ne_iaddr_make; ++ ne_iaddr_print; ++ ne_iaddr_reverse; ++ ne_iaddr_typeof; ++ ne_sock_accept; ++ ne_sock_accept_ssl; ++ ne_sock_block; ++ ne_sock_cipher; ++ ne_sock_close; ++ ne_sock_connect; ++ ne_sock_connect_ssl; ++ ne_sock_connect_timeout; ++ ne_sock_create; ++ ne_sock_error; ++ ne_sock_exit; ++ ne_sock_fd; ++ ne_sock_fullread; ++ ne_sock_fullwrite; ++ ne_sock_init; ++ ne_sock_peek; ++ ne_sock_peer; ++ ne_sock_prebind; ++ ne_sock_read; ++ ne_sock_read_timeout; ++ ne_sock_readline; ++ ne_sock_sessid; ++ ne__ssl_set_verify_err; ++ ne_close_connection; ++ ne_fill_proxy_uri; ++ ne_fill_server_uri; ++ ne_get_error; ++ ne_get_scheme; ++ ne_get_server_hostport; ++ ne_get_session_flag; ++ ne_hook_close_conn; ++ ne_hook_create_request; ++ ne_hook_destroy_request; ++ ne_hook_destroy_session; ++ ne_hook_post_headers; ++ ne_hook_post_send; ++ ne_hook_pre_send; ++ ne_session_create; ++ ne_session_destroy; ++ ne_session_proxy; ++ ne_set_addrlist; ++ ne_set_connect_timeout; ++ ne_set_error; ++ ne_set_localaddr; ++ ne_set_notifier; ++ ne_set_progress; ++ ne_set_read_timeout; ++ ne_set_session_flag; ++ ne_set_session_private; ++ ne_set_useragent; ++ ne_ssl_cert_validity; ++ ne_ssl_provide_clicert; ++ ne_ssl_set_verify; ++ ne_ssl_trust_cert; ++ ne_unhook_close_conn; ++ ne_unhook_create_request; ++ ne_unhook_destroy_request; ++ ne_unhook_destroy_session; ++ ne_unhook_post_headers; ++ ne_unhook_post_send; ++ ne_unhook_pre_send; ++ ne_version_pre_http11; ++ ne_accept_2xx; ++ ne_accept_always; ++ ne_add_request_header; ++ ne_add_response_body_reader; ++ ne_begin_request; ++ ne_discard_response; ++ ne_end_request; ++ ne_get_request_flag; ++ ne_get_request_private; ++ ne_get_response_header; ++ ne_get_session; ++ ne_get_session_private; ++ ne_get_status; ++ ne_print_request_header; ++ ne_read_response_block; ++ ne_read_response_to_fd; ++ ne_request_create; ++ ne_request_destroy; ++ ne_request_dispatch; ++ ne_response_header_iterate; ++ ne_set_request_body_buffer; ++ ne_set_request_body_fd; ++ ne_set_request_body_provider; ++ ne_set_request_flag; ++ ne_set_request_private; ++ ne_redirect_location; ++ ne_redirect_register; ++ ne_propfind_allprop; ++ ne_propfind_create; ++ ne_propfind_current_private; ++ ne_propfind_destroy; ++ ne_propfind_get_parser; ++ ne_propfind_get_request; ++ ne_propfind_named; ++ ne_propfind_set_private; ++ ne_propnames; ++ ne_proppatch; ++ ne_propset_iterate; ++ ne_propset_lang; ++ ne_propset_private; ++ ne_propset_status; ++ ne_propset_value; ++ ne_simple_propfind; ++ ne_ascii_to_md5; ++ ne_md5_create_ctx; ++ ne_md5_destroy_ctx; ++ ne_md5_dup_ctx; ++ ne_md5_finish_ascii; ++ ne_md5_finish_ctx; ++ ne_md5_process_block; ++ ne_md5_process_bytes; ++ ne_md5_read_ctx; ++ ne_md5_reset_ctx; ++ ne_md5_stream; ++ ne_md5_to_ascii; ++ ne_lock; ++ ne_lock_copy; ++ ne_lock_create; ++ ne_lock_destroy; ++ ne_lock_discover; ++ ne_lock_free; ++ ne_lock_refresh; ++ ne_lock_using_parent; ++ ne_lock_using_resource; ++ ne_lockstore_add; ++ ne_lockstore_create; ++ ne_lockstore_destroy; ++ ne_lockstore_findbyuri; ++ ne_lockstore_first; ++ ne_lockstore_next; ++ ne_lockstore_register; ++ ne_lockstore_remove; ++ ne_unlock; ++ ne_i18n_init; ++ ne_asctime_parse; ++ ne_httpdate_parse; ++ ne_iso8601_parse; ++ ne_rfc1036_parse; ++ ne_rfc1123_date; ++ ne_rfc1123_parse; ++ ne_decompress_destroy; ++ ne_decompress_reader; ++ ne_add_depth_header; ++ ne_copy; ++ ne_delete; ++ ne_get; ++ ne_get_content_type; ++ ne_get_range; ++ ne_getmodtime; ++ ne_mkcol; ++ ne_move; ++ ne_options; ++ ne_options2; ++ ne_post; ++ ne_put; ++ ne_add_proxy_auth; ++ ne_add_server_auth; ++ ne_forget_auth; ++ ne_set_proxy_auth; ++ ne_set_server_auth; ++ ne_calloc; ++ ne_malloc; ++ ne_oom_callback; ++ ne_realloc; ++ ne_strdup; ++ ne_strndup; ++ ne_acl_set; ++ ne_207_create; ++ ne_207_destroy; ++ ne_207_get_current_propstat; ++ ne_207_get_current_response; ++ ne_207_set_propstat_handlers; ++ ne_207_set_response_handlers; ++ ne_accept_207; ++ ne_simple_request; ++ local: ++ *; ++}; diff --git a/neon/prj/d.lst b/neon/prj/d.lst index c9cf72163a44..a6c269e96600 100644 --- a/neon/prj/d.lst +++ b/neon/prj/d.lst @@ -2,5 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\external mkdir: %_DEST%\inc%_EXT%\external\neon ..\version.mk %_DEST%\inc%_EXT%\external\neon\version.mk ..\%__SRC%\inc\ne_*.h %_DEST%\inc%_EXT%\external\neon\ne_*.h -..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib -..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a +..\%__SRC%\lib\ineon.lib %_DEST%\lib%_EXT%\ineon.lib +..\%__SRC%\bin\neon*.dll %_DEST%\bin%_EXT%\neon*.dll +..\%__SRC%\lib\libneon*.so %_DEST%\lib%_EXT%\libneon*.so +..\%__SRC%\lib\libneon*.dylib %_DEST%\lib%_EXT%\libneon*.dylib
\ No newline at end of file diff --git a/nss/makefile.mk b/nss/makefile.mk index 4ddd2b39015f..94d6e60c5817 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -45,33 +45,44 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss_3_12_4 +TARFILE_NAME=nss_3_12_5 TARFILE_ROOTDIR=mozilla PATCH_FILES=nss.patch +.IF "$(OS)"=="MACOSX" +PATCH_FILES+=nss_macosx.patch +.ENDIF # "$(OS)"=="MACOSX" + .IF "$(debug)" != "" .ELSE BUILD_OPT=1 .EXPORT: BUILD_OPT .ENDIF - .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -.IF "$(CPU)"=="X" +.IF "$(BUILD64)"=="1" # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 .ENDIF # "$(CPU)"=="X" .ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="FREEBSDGCC" +.IF "$(CPU)"=="X" +# force 64-bit buildmode +USE_64:=1 +.EXPORT : USE_64 +.ENDIF # "$(CPU)"=="X" +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)"=="MACOSX" .IF "$(EXTRA_CFLAGS)"!="" CPP:=gcc -E $(EXTRA_CFLAGS) CXX:=g++ $(EXTRA_CFLAGS) CC:=gcc $(EXTRA_CFLAGS) -.EXPORT : CPP +MACOS_SDK_DIR*=$(MACDEVSDK) +.EXPORT : CPP MACOS_SDK_DIR .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" @@ -79,6 +90,10 @@ OUT2LIB=dist$/out$/lib$/*$(DLLPOST) BUILD_DIR=security$/nss BUILD_ACTION= $(GNUMAKE) nss_build_all +#See #i105566# && moz#513024# +.IF "$(OS)"=="LINUX" +BUILD_ACTION+=FREEBL_NO_DEPEND=1 +.ENDIF .ENDIF # "$(GUI)"=="UNX" diff --git a/nss/nss.patch b/nss/nss.patch index d37d892dd6b8..a6ce16071919 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -1,5 +1,5 @@ ---- misc/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200 -+++ misc/build/mozilla/nsprpub/config/rules.mk 2009-09-17 10:29:39.823155149 +0200 +--- misc/mozilla/nsprpub/config/rules.mk Sat May 2 01:08:01 2009 ++++ misc/build/mozilla/nsprpub/config/rules.mk Wed Nov 25 08:06:47 2009 @@ -350,7 +350,12 @@ ifdef NS_USE_GCC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< @@ -14,9 +14,9 @@ endif # GCC @echo $(RES) finished endif ---- misc/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200 -+++ misc/build/mozilla/nsprpub/configure 2009-09-17 10:31:55.064081763 +0200 -@@ -3898,7 +3898,7 @@ +--- misc/mozilla/nsprpub/configure Mon Nov 23 11:44:15 2009 ++++ misc/build/mozilla/nsprpub/configure Wed Nov 25 08:06:47 2009 +@@ -3899,7 +3899,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -25,8 +25,8 @@ _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined ---- misc/mozilla/security/coreconf/Darwin.mk 2009-07-30 23:36:02.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/Darwin.mk 2009-09-17 11:11:36.442683705 +0200 +--- misc/mozilla/security/coreconf/Darwin.mk Thu Jul 30 23:36:02 2009 ++++ misc/build/mozilla/security/coreconf/Darwin.mk Wed Nov 25 08:06:47 2009 @@ -39,8 +39,12 @@ DEFAULT_COMPILER = cc @@ -42,8 +42,8 @@ RANLIB = ranlib ifndef CPU_ARCH ---- misc/mozilla/security/coreconf/Linux.mk 2009-07-30 01:43:41.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/Linux.mk 2009-09-17 10:39:40.372245066 +0200 +--- misc/mozilla/security/coreconf/Linux.mk Mon Nov 23 11:06:29 2009 ++++ misc/build/mozilla/security/coreconf/Linux.mk Wed Nov 25 08:11:35 2009 @@ -46,8 +46,11 @@ IMPL_STRATEGY = _PTH endif @@ -64,11 +64,25 @@ ZDEFS_FLAG = -Wl,-z,defs -DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) +DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN' - DSO_LDFLAGS = LDFLAGS += $(ARCHFLAG) ---- misc/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/SunOS5.mk 2009-09-17 10:42:17.845459669 +0200 + # INCLUDES += -I/usr/include -Y/usr/include/linux +@@ -160,8 +163,13 @@ + # + CPU_TAG = _$(CPU_ARCH) + ++ifeq ($(SYSTEM_ZLIB),YES) ++# Currently (3.12.4) only the tools modutil and signtool are linked with libz ++# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which ++# is also build in nss. + USE_SYSTEM_ZLIB = 1 + ZLIB_LIBS = -lz ++endif + + # The -rpath '$$ORIGIN' linker option instructs this library to search for its + # dependencies in the same directory where it resides. +--- misc/mozilla/security/coreconf/SunOS5.mk Thu Jun 11 02:55:32 2009 ++++ misc/build/mozilla/security/coreconf/SunOS5.mk Wed Nov 25 08:06:47 2009 @@ -89,8 +89,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif @@ -84,8 +98,8 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- misc/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/arch.mk 2009-09-17 10:45:27.710858021 +0200 +--- misc/mozilla/security/coreconf/arch.mk Fri Jun 5 04:14:49 2009 ++++ misc/build/mozilla/security/coreconf/arch.mk Wed Nov 25 08:06:47 2009 @@ -324,7 +324,12 @@ # IMPL_STRATEGY may be defined too. # @@ -100,8 +114,8 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) ifndef BUILD_OPT ---- misc/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/rules.mk 2009-09-17 10:48:07.361462582 +0200 +--- misc/mozilla/security/coreconf/rules.mk Tue Aug 11 05:23:39 2009 ++++ misc/build/mozilla/security/coreconf/rules.mk Wed Nov 25 08:06:47 2009 @@ -355,7 +355,12 @@ ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< @@ -116,9 +130,9 @@ endif @echo $(RES) finished endif ---- misc/mozilla/security/nss/cmd/platlibs.mk 2009-06-18 01:01:48.000000000 +0200 -+++ misc/build/mozilla/security/nss/cmd/platlibs.mk 2009-09-17 11:08:16.697236076 +0200 -@@ -41,27 +41,28 @@ +--- misc/mozilla/security/nss/cmd/platlibs.mk Thu Jun 18 01:01:48 2009 ++++ misc/build/mozilla/security/nss/cmd/platlibs.mk Wed Nov 25 08:06:47 2009 +@@ -41,12 +41,13 @@ ifeq ($(OS_ARCH), SunOS) ifeq ($(BUILD_SUN_PKG), 1) ifeq ($(USE_64), 1) @@ -135,6 +149,7 @@ endif endif +@@ -53,15 +54,15 @@ ifeq ($(OS_ARCH), Linux) ifeq ($(BUILD_SUN_PKG), 1) ifeq ($(USE_64), 1) @@ -154,3 +169,24 @@ endif endif endif +--- misc/mozilla/security/nss/cmd/shlibsign/Makefile Fri Aug 7 21:06:37 2009 ++++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile Fri Nov 27 13:07:52 2009 +@@ -78,10 +78,15 @@ + + # sign any and all shared libraries that contain the word freebl + +-CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) +-CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) ++# Signing causes loading of some system library which in turn loads ++# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper ++# version. Therefore signing fails. ++# We cannot build with the system sqlite3, because it is too old (SDK ++# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. ++#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) ++#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) + ifndef NSS_DISABLE_DBM +-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) ++#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) + endif + CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) + diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch new file mode 100644 index 000000000000..d6ce6ff4f8d0 --- /dev/null +++ b/nss/nss_macosx.patch @@ -0,0 +1,12 @@ +--- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 +@@ -104,6 +104,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif diff --git a/nss/prj/d.lst b/nss/prj/d.lst index 891eb7739b1c..f1090ca8d91e 100755 --- a/nss/prj/d.lst +++ b/nss/prj/d.lst @@ -1,10 +1,31 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\nspr mkdir: %_DEST%\inc%_EXT%\mozilla\nspr\obsolete mkdir: %_DEST%\inc%_EXT%\mozilla\nss +mkdir: %_DEST%\lib%_EXT%\sqlite ..\%__SRC%\inc\include\* %_DEST%\inc%_EXT%\mozilla\nspr ..\%__SRC%\inc\include\obsolete\protypes.h %_DEST%\inc%_EXT%\mozilla\nspr\obsolete\protypes.h ..\%__SRC%\inc\nss\*.h %_DEST%\inc%_EXT%\mozilla\nss -..\%__SRC%\lib\* %_DEST%\lib%_EXT% + +..\%__SRC%\lib\libfreebl3.* %_DEST%\lib%_EXT%\libfreebl.* +..\%__SRC%\lib\libfreebl_32fpu_3.* %_DEST%\lib%_EXT%\libfreebl_32fpu_3.* +..\%__SRC%\lib\libfreebl_32int64_3.* %_DEST%\lib%_EXT%\libfreebl_32int64_3.* +..\%__SRC%\lib\libfreebl_32int_3.* %_DEST%\lib%_EXT%\libfreebl_32int_3.* +..\%__SRC%\lib\libfreebl_64int_3.* %_DEST%\lib%_EXT%\libfreebl_64int_3.* +..\%__SRC%\lib\libfreebl_64fpu_3.* %_DEST%\lib%_EXT%\libfreebl_64fpu_3.* +..\%__SRC%\lib\libnspr4.* %_DEST%\lib%_EXT%\libnspr4.* +..\%__SRC%\lib\libnss3.* %_DEST%\lib%_EXT%\libnss3.* +..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%\libnssckbi.* +..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%\libnssdbm3.* +..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%\libnssutil3.* +..\%__SRC%\lib\libplc4.* %_DEST%\lib%_EXT%\libplc4.* +..\%__SRC%\lib\libplds4.* %_DEST%\lib%_EXT%\libplds4.* +..\%__SRC%\lib\libsmime3.* %_DEST%\lib%_EXT%\libsmime3.* +..\%__SRC%\lib\libsoftokn3.* %_DEST%\lib%_EXT%\libsoftokn3.* +..\%__SRC%\lib\libssl3.* %_DEST%\lib%_EXT%\libssl3.* + +..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite\libsqlite3.* +..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% + ..\%__SRC%\bin\* %_DEST%\bin%_EXT% diff --git a/nss/readme.txt b/nss/readme.txt index de23a264c179..df65908204c4 100755 --- a/nss/readme.txt +++ b/nss/readme.txt @@ -1,56 +1,75 @@ -Relation between nss, moz, moz_prebuilt
----------------------------------------
-nss containes the security libraries which are also part of moz. However nss is
-meant to be more current, that is it to be updated more often. This should be
-easier than doing this with moz.
-
-If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which
-is per default set to YES. In this case nss is build before moz. The nss
-libraries/lib files/headers built in moz are then not delivered. Otherwise they
-would overwrite those from nss. That is, the nss libraries build in moz are
-removed from mozruntime.zip (build in moz/solver/bin), they are removed from the
-lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers
-are also removed (inc/nss and inc/nspr). The nss libraries from the nss module
-are then added to mozruntime.zip.
-
-This also applies for moz_prebuilt. Therefore moz and moz_prebuilt must be build
-again after changes have been made to the libraries in the nss module.
-
-Also when moz was updated to use a newer version of mozilla, then one must make
-sure that new files which also belong to nss are not delivered and are removed
-from mozruntime.zip.
-
-Fips 140 and signed libraries
--------------------------------
-Fips 140 mode is not supported. That is, the *.chk files containing the
-checksums for the cryptographic module are not delivered into solver and will
-not be part of the OOo installation sets.
-
-The *chk files do not match the libraries because we change the rpatch.
-
-libfreebl3
-----------
-Porting to other platforms may require to deliver other variants of
-libfreebl*. The library name varies according to the platform. Changes need to
-be made to
-ooo/moz/extractfiles.mk
-ooo/moz/zipped/makefile.mk
-sun/moz_prebuilt/zipped/makefile.mk
-
-
-See also
-http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-
-
-Windows builds of nss
----------------------
-To build mozilla on windows you'll need the mozilla build tools
-
-Build requirements containing the link to the build tools:
-https://developer.mozilla.org/en/Windows_Build_Prerequisites#ss2.2
-
-The direct link:
-
-http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe
-
-
+Relation between nss, moz, moz_prebuilt +--------------------------------------- +nss containes the security libraries which are also part of moz. However nss is +meant to be more current, that is it to be updated more often. This should be +easier than doing this with moz. + +If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which +is per default set to YES. In this case nss is build before moz. The nss +libraries/lib files/headers built in moz are then not delivered. Otherwise they +would overwrite those from nss. That is, the nss libraries build in moz are +removed from mozruntime.zip (build in moz/solver/bin), they are removed from the +lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers +are also removed (inc/nss and inc/nspr). The nss libraries from the nss module +are then added to mozruntime.zip. + +This also applies for moz_prebuilt. Therefore moz and moz_prebuilt must be build +again after changes have been made to the libraries in the nss module. + +Also when moz was updated to use a newer version of mozilla, then one must make +sure that new files which also belong to nss are not delivered and are removed +from mozruntime.zip. + +Fips 140 and signed libraries +------------------------------- +Fips 140 mode is not supported. That is, the *.chk files containing the +checksums for the cryptographic module are not delivered into solver and will +not be part of the OOo installation sets. + +Signing has been turned off because +- we change the rpath (install names) after signing which breaks the signatures +(Mac) +- sqlite conflicts with the system sqlite when signing which breaks the build + + +libfreebl3 +---------- +Porting to other platforms may require to deliver other variants of +libfreebl*. The library name varies according to the platform. Changes need to +be made to +ooo/moz/extractfiles.mk +ooo/moz/zipped/makefile.mk +sun/moz_prebuilt/zipped/makefile.mk + +See also +http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html + + +Windows builds of nss +--------------------- +To build mozilla on windows you'll need the mozilla build tools + +Build requirements containing the link to the build tools: +https://developer.mozilla.org/en/Windows_Build_Prerequisites#ss2.2 + +The direct link: + +http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe + +libsqlite3 +---------- +The problem described here was found on Mac with OS 10.6 +NSS cannot use the system sqlite on Mac because the base line is still MacOS +10.4. That system sqlite is incompatible with the softokn3 in nss which requires +a later version of sqlite. +When we used a more current Mac SDK then we could set +NSS_USE_SYSTEM_SQLITE=1 +to build using the system sqlite. + +We cannot deliver sqlite in the lib directory of the solver. This directory is +used by tools of the build environment. Using the sqlite from NSS breaks the +tools if they use system libraries which are linked with the system +sqlite. Therefore we deliver it into lib/sqlite on unix systems. + +See also issue +http://qa.openoffice.org/issues/show_bug.cgi?id=106132 diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch index 781889d84e3f..661334cae3bb 100644 --- a/python/Python-2.6.1.patch +++ b/python/Python-2.6.1.patch @@ -56,13 +56,13 @@ +# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} +# EndProjectSection +#EndProject -+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" -+# ProjectSection(ProjectDependencies) = postProject -+# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -+# {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} -+# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -+# EndProjectSection -+#EndProject ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" ++ ProjectSection(ProjectDependencies) = postProject ++ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} ++ {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480} ++ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++ EndProjectSection ++EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" ProjectSection(ProjectDependencies) = postProject {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch new file mode 100644 index 000000000000..642586f31584 --- /dev/null +++ b/python/Python-ssl.patch @@ -0,0 +1,210 @@ +--- misc/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:24:35.140625000 +0000 ++++ misc/build/Python-2.6.1/PCbuild/build_ssl.py 2009-11-02 08:25:11.750000000 +0000 +@@ -255,4 +255,4 @@ + sys.exit(rc) + + if __name__=='__main__': +- main() ++ sys.exit(0) +--- misc/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000 ++++ misc/build/Python-2.6.1/PCbuild/_ssl.vcproj 2009-11-02 08:24:35.140625000 +0000 +@@ -43,7 +43,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -57,7 +57,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -106,7 +106,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc64" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -120,7 +120,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -169,7 +169,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -183,7 +183,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -233,7 +233,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc64" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -247,7 +247,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -296,7 +296,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -310,7 +310,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -360,7 +360,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc64" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -374,7 +374,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + TargetMachine="17" + /> + <Tool +@@ -424,7 +424,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -438,7 +438,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -488,7 +488,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\inc64" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -502,7 +502,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + TargetMachine="17" + /> + <Tool +--- misc/Python-2.6.1/setup.py 2009-11-02 10:12:43.000000000 +0000 ++++ misc/build/Python-2.6.1/setup.py 2009-11-02 10:18:19.000000000 +0000 +@@ -612,7 +612,15 @@ + exts.append( Extension('_socket', ['socketmodule.c'], + depends = ['socketmodule.h']) ) + # Detect SSL support for the socket module (via _ssl) ++ UPDMINOR = os.environ.get('UPDMINOREXT') ++ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \ ++ os.environ.get('INPATH') + '/' + \ ++ 'inc' ++ if UPDMINOR != None: ++ ooosslinc = ooosslinc + UPDMINOR ++ ooosslinc = ooosslinc + '/external/' + search_for_ssl_incs_in = [ ++ ooosslinc, + '/usr/local/ssl/include', + '/usr/contrib/ssl/include/' + ] +@@ -624,8 +632,15 @@ + ['/usr/kerberos/include']) + if krb5_h: + ssl_incs += krb5_h ++ ooossllib = os.environ.get('SOLARVER') + '/' + \ ++ os.environ.get('INPATH') + '/' + \ ++ 'lib' ++ if UPDMINOR != None: ++ ooosslinc = ooosslinc + UPDMINOR ++ ooosslinc = ooosslinc + '/' + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', ++ [ooossllib, ++ '/usr/local/ssl/lib', + '/usr/contrib/ssl/lib/' + ] ) + +--- misc/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:16:50.000000000 +0000 ++++ misc/build/Python-2.6.1/Modules/Setup.dist 2009-12-17 15:17:49.000000000 +0000 +@@ -248,14 +248,14 @@ + # Message-Digest Algorithm, described in RFC 1321. The necessary files + # md5.c and md5.h are included here. + +-#_md5 md5module.c md5.c ++_md5 md5module.c md5.c + + + # The _sha module implements the SHA checksum algorithms. + # (NIST's Secure Hash Algorithms.) +-#_sha shamodule.c +-#_sha256 sha256module.c +-#_sha512 sha512module.c ++_sha shamodule.c ++_sha256 sha256module.c ++_sha512 sha512module.c + + + # SGI IRIX specific modules -- off by default. diff --git a/python/makefile.mk b/python/makefile.mk index 663a5604603d..06e3ffe87a79 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,9 @@ all: TARFILE_NAME=Python-$(PYVERSION) -PATCH_FILES=Python-$(PYVERSION).patch +PATCH_FILES=\ + Python-$(PYVERSION).patch \ + Python-ssl.patch CONFIGURE_DIR= @@ -80,11 +82,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-in .IF "$(OS)$(CPU)" == "SOLARISI" CONFIGURE_ACTION += --disable-ipv6 .ENDIF -.IF "$(OS)" == "IRIX" -BUILD_ACTION=$(ENV_BUILD) gmake -j$(EXTMAXPROCESS) ; gmake install -.ELSE BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; chmod -R ug+w $(MYCWD)/python-inst -.ENDIF .ELSE # ---------------------------------- # WINDOWS diff --git a/python/prj/build.lst b/python/prj/build.lst index e7421332a750..f5ea98adcd4e 100644 --- a/python/prj/build.lst +++ b/python/prj/build.lst @@ -1,3 +1,3 @@ -py python : SO:so_prereq solenv NULL +py python : SO:so_prereq solenv OPENSSL:openssl NULL py python nmake - w,vc7 py_mkout NULL py python nmake - u py_mkout NULL diff --git a/python/prj/d.lst b/python/prj/d.lst index 3ea7a063902c..def1bb84a414 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -94,6 +94,7 @@ symlink: %_DEST%\lib%_EXT%\libpython2.6.so.1.0 %_DEST%\lib%_EXT%\libpython2.6.so ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.dll %_DEST%\bin%_EXT%\python26.dll ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\python26.lib %_DEST%\lib%_EXT%\python26.lib ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\select.pyd %_DEST%\lib%_EXT%\python\select.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch index d17f31f5ccda..26f6bd3ce432 100644 --- a/zlib/zlib-1.1.4.patch +++ b/zlib/zlib-1.1.4.patch @@ -63,7 +63,7 @@ + $(SLO_X64)$/trees.obj \ + $(SLO_X64)$/zutil.obj \ + $(SLO_X64)$/unzip.obj \ -+ $(SLO)$/ioapi.obj ++ $(SLO_X64)$/ioapi.obj + +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib +LIB1OBJFILES_X64=$(SLOFILES_X64) |