Skip to content

C
core
Kaydet (Commit) db637a1d authored tarafından Kai Sommerfeld's avatar Kai Sommerfeld
Dosyalara gözat
Seçenekler

rebase to dev300 m69.

üst d19b4f2d 35c909bf
Hide whitespace changes
Inline Side-by-side
Showing with 495 additions and 384 deletions
berkeleydb/db-4.7.25.patch
Dosyayı görüntüle @ db637a1d
......@@ -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= \
......
berkeleydb/makefile.mk
Dosyayı görüntüle @ db637a1d
#*************************************************************************
#
# 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= \
......
berkeleydb/prj/build.lst
Dosyayı görüntüle @ db637a1d
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
curl/makefile.mk
Dosyayı görüntüle @ db637a1d
......@@ -74,11 +74,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).3
......
expat/expat.patch → expat/expat-2.0.1.patch
Dosyayı görüntüle @ db637a1d
--- 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 @@
--- 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
+#*************************************************************************
+#
......@@ -73,7 +35,7 @@
+PRJ=..$/..$/..$/..$/..
+
+PRJNAME=expat
+TARGET=expat_xmlparse
+TARGET=expat
+LIBTARGET=NO
+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
+
......@@ -81,100 +43,52 @@
+.INCLUDE : settings.mk
+# --- Files --------------------------------------------------------
+
+CFLAGS+=-I..$/xmltok
+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
+SLOFILES=$(SLO)$/xmlparse.obj \
+ $(SLO)$/xmlrole.obj \
+ $(SLO)$/xmltok.obj
+
+SECOND_BUILD=UNICODE
+UNICODE_SLOFILES= $(SLO)$/xmlparse.obj
+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
+UNICODECDEFS+=-DXML_UNICODE
+
+LIB1ARCHIV= $(LB)$/libascii_$(TARGET).a
+LIB1TARGET= $(SLB)$/ascii_$(TARGET).lib
+LIB1OBJFILES = $(SLOFILES)
+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
+LIB1OBJFILES=$(SLO)$/xmlparse.obj
+
+LIB2ARCHIV= $(LB)$/lib$(TARGET).a
+LIB2TARGET= $(SLB)$/$(TARGET).lib
+LIB2OBJFILES = $(REAL_UNICODE_SLOFILES)
+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
+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)
+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 ------------------------------------------------------
......
expat/expat-winapi.patch 0 → 100644
Dosyayı görüntüle @ db637a1d
--- 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
expat/makefile.mk
Dosyayı görüntüle @ db637a1d
......@@ -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
expat/prj/d.lst
Dosyayı görüntüle @ db637a1d
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
......
hunspell/hunspell-1.2.8.patch
Dosyayı görüntüle @ db637a1d
......@@ -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 ---------------------------------------------------------
......
hunspell/prj/build.lst
Dosyayı görüntüle @ db637a1d
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
moz/extractfiles.mk
Dosyayı görüntüle @ db637a1d
......@@ -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"
......
moz/zipped/makefile.mk
Dosyayı görüntüle @ db637a1d
......@@ -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) $@
......
neon/neon.patch
Dosyayı görüntüle @ db637a1d
......@@ -492,7 +492,7 @@
+#endif
--- misc/neon-0.28.2/src/makefile.mk 2009-12-10 13:29:15.000000000 +0100
+++ misc/build/neon-0.28.2/src/makefile.mk 2009-12-10 13:21:58.000000000 +0100
@@ -1 +1,99 @@
@@ -1 +1,100 @@
-dummy
+PRJ=..$/..$/..$/..$/..
+
......@@ -501,6 +501,7 @@
+LIBTARGET=NO
+USE_DEFFILE=TRUE
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+UWINAPILIB=
+
+# --- Settings -----------------------------------------------------
+
......@@ -633,8 +634,8 @@
static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
struct auth_challenge *chall, char *pwbuf)
{
- if (chall->handler->creds(chall->handler->userdata, sess->realm,
+ if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm,
- if (chall->handler->creds(chall->handler->userdata, sess->realm,
+ if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm,
chall->handler->attempt++, sess->username, pwbuf) == 0) {
return 0;
} else {
......@@ -642,9 +643,9 @@
int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
int status;
char *response = NULL;
-
-
+ char password[NE_ABUFSIZ];
+
+
NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
if (!sess->sspi_context) {
......@@ -1630,12 +1631,12 @@
return -1;
}
+ return 0;
+ return 0;
+}
+
+/*
+ * Simplification wrapper arround AcquireCredentialsHandle as most of
+ * the parameters do not change.
+ * the parameters do not change.
+ */
+static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
+{
......@@ -1688,7 +1689,7 @@
/* Reset any existing context since we are starting over */
resetContext(sspiContext);
+
+
+ if (strlen(username) != 0) {
+ if (acquireCredentialsHandleForUsername
+ (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
......
neon/neon_exports_unix.patch
Dosyayı görüntüle @ db637a1d
--- 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,286 @@
@@ -0,0 +1,287 @@
+NEON_0_28_2 {
+ global:
+ ne__negotiate_ssl;
......@@ -284,6 +284,7 @@
+ ne_207_set_response_handlers;
+ ne_accept_207;
+ ne_simple_request;
+ GetVersionInfo;
+ local:
+ *;
+};
nss/dtoa.patch deleted 100644 → 0
Dosyayı görüntüle @ d19b4f2d
--- 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
nss/makefile.mk
Dosyayı görüntüle @ db637a1d
......@@ -45,11 +45,13 @@ 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 dtoa.patch
# Note: dtoa.patch fixes https://bugzilla.mozilla.org/show_bug.cgi?id=516396. It can be removed as soon as
# we upgrade to a new NSS version which already contains this fix.
PATCH_FILES=nss.patch
.IF "$(OS)"=="MACOSX"
PATCH_FILES+=nss_macosx.patch
.ENDIF # "$(OS)"=="MACOSX"
.IF "$(debug)" != ""
.ELSE
......@@ -57,7 +59,6 @@ BUILD_OPT=1
.EXPORT: BUILD_OPT
.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(OS)$(COM)"=="LINUXGCC"
.IF "$(BUILD64)"=="1"
......@@ -67,13 +68,21 @@ USE_64:=1
.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"
......@@ -81,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"
......
nss/nss.patch
Dosyayı görüntüle @ db637a1d
--- misc/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200
+++ misc/build/mozilla/nsprpub/config/rules.mk 2009-10-20 17:03:24.733286198 +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-10-20 17:03:24.759501457 +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-10-20 17:03:24.767804881 +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-10-20 17:04:09.972612751 +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,10 +64,10 @@
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)
@@ -161,8 +164,13 @@
# INCLUDES += -I/usr/include -Y/usr/include/linux
@@ -160,8 +163,13 @@
#
CPU_TAG = _$(CPU_ARCH)
......@@ -81,8 +81,8 @@
# 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 2009-06-11 02:55:32.000000000 +0200
+++ misc/build/mozilla/security/coreconf/SunOS5.mk 2009-10-20 17:03:24.786509911 +0200
--- 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
......@@ -98,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-10-20 17:03:24.807236644 +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.
#
......@@ -114,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-10-20 17:03:24.815121351 +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 $@ $<
......@@ -130,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-10-20 17:03:24.831220397 +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)
......@@ -149,6 +149,7 @@
endif
endif
@@ -53,15 +54,15 @@
ifeq ($(OS_ARCH), Linux)
ifeq ($(BUILD_SUN_PKG), 1)
ifeq ($(USE_64), 1)
......@@ -168,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)
nss/nss_macosx.patch 0 → 100644
Dosyayı görüntüle @ db637a1d
--- 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
nss/prj/d.lst
Dosyayı görüntüle @ db637a1d
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%
nss/readme.txt
Dosyayı görüntüle @ db637a1d
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
python/Python-2.6.1.patch
Dosyayı görüntüle @ db637a1d
......@@ -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}
......
python/Python-ssl.patch 0 → 100644
Dosyayı görüntüle @ db637a1d
--- 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.
python/makefile.mk
Dosyayı görüntüle @ db637a1d
......@@ -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
......
python/prj/build.lst
Dosyayı görüntüle @ db637a1d
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
python/prj/d.lst
Dosyayı görüntüle @ db637a1d
......@@ -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
......
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