Author: ydario
Date: Fri Nov 28 14:02:37 2014
New Revision: 1642301
URL: http://svn.apache.org/r1642301
Log:
#i125592# enable NSS modules also on OS/2 port.
Added:
openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch
Modified:
openoffice/trunk/main/configure.cmd
openoffice/trunk/main/libxmlsec/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/xmlsecurity/prj/d.lst
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
openoffice/trunk/main/xmlsecurity/util/makefile.mk
Modified: openoffice/trunk/main/configure.cmd
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.cmd?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/configure.cmd (original)
+++ openoffice/trunk/main/configure.cmd Fri Nov 28 14:02:37 2014
@@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_
set config_shell=sh
set perl_sh_dir=%UNIXROOT%/usr/bin
-sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg
--without-stlport --with-system-icu --with-system-curl --with-system-python
--with-system-openssl --with-system-libxml --with-system-libxslt
--disable-werror --disable-mozilla --disable-odk --with-x=no
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit
--with-system-apr --with-system-apr-util --with-system-serf
--enable-bundled-dictionaries --enable-category-b --disable-nss-module
--with-lang="de es fr it nl ru" | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg
--without-stlport --with-system-icu --with-system-curl --with-system-python
--with-system-openssl --with-system-libxml --with-system-libxslt
--disable-werror --disable-mozilla --disable-odk --with-x=no
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit
--with-system-apr --with-system-apr-util --with-system-serf
--enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl
ru" | tee configure.log
endlocal
Modified: openoffice/trunk/main/libxmlsec/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxmlsec/makefile.mk?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/libxmlsec/makefile.mk (original)
+++ openoffice/trunk/main/libxmlsec/makefile.mk Fri Nov 28 14:02:37 2014
@@ -63,6 +63,9 @@ PATCH_FILES=\
xmlsec1-mingw32.patch \
xmlsec1-mingw-keymgr-mscrypto.patch
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=xmlsec1-os2.patch
+.ENDIF
ADDITIONAL_FILES= \
include$/xmlsec$/mscrypto$/akmngr.h \
@@ -175,6 +178,9 @@ OUT2BIN+=src$/.libs$/libxmlsec1.dll src$
OUT2LIB+=win32$/binaries$/*.lib
OUT2BIN+=win32$/binaries$/*.dll
.ENDIF
+.ELIF "$(OS)"=="OS2"
+OUT2LIB+=src$/.libs$/xmlsec1.lib src$/nss$/.libs$/xmlsec1-nss.lib
+OUT2BIN+=src$/xmlsec1.dll src$/nss$/xmlsec1n.dll
.ELSE
OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a
.ENDIF
Added: openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch?rev=1642301&view=auto
==============================================================================
--- openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch (added)
+++ openoffice/trunk/main/libxmlsec/xmlsec1-os2.patch Fri Nov 28 14:02:37 2014
@@ -0,0 +1,94 @@
+--- misc/xmlsec1-1.2.14/src/Makefile.in 2009-12-05 22:19:34.000000000
+0100
++++ misc/build/xmlsec1-1.2.14/src/Makefile.in 2014-11-26 22:02:00.000000000
+0100
+@@ -12,6 +12,11 @@
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
++
++OS2_LA_NAME=xmlsec1
++OS2_DLL_NAME=xmlsec1
++OS2_DLL_OBJ=$(libxmlsec1_la_OBJECTS:%.lo=%.o)
++OS2_DLL_LIBS=-lxml2 -lz -lm -lurpo -lmmap -lpthread $(LIBS)
+
+ @SET_MAKE@
+
+@@ -736,7 +741,7 @@
+ done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(libdir)"; do \
+@@ -861,3 +866,13 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
++ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
++ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" >
$(OS2_DLL_NAME).def
++ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
++ echo "EXPORTS" >> $(OS2_DLL_NAME).def
++ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
++ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@
$(OS2_DLL_OBJ) $(OS2_DLL_LIBS)
++ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
++ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def
+--- misc/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26 22:02:36.000000000
+0100
++++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26
22:02:28.000000000 +0100
+@@ -12,6 +12,11 @@
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
++
++OS2_LA_NAME=xmlsec1-nss
++OS2_DLL_NAME=xmlsec1n
++OS2_DLL_OBJ=$(libxmlsec1_nss_la_OBJECTS:%.lo=%.o)
++OS2_DLL_LIBS=-l../.libs/xmlsec1 -lxml2 -lssl3 -lsmime3 -lnss3 -lnssutil3
-lplds4 -lplc4 -lnspr4 $(LIBS)
+
+ @SET_MAKE@
+
+@@ -691,7 +696,7 @@
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -812,3 +817,13 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
++ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
++ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" >
$(OS2_DLL_NAME).def
++ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
++ echo "EXPORTS" >> $(OS2_DLL_NAME).def
++ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
++ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@
$(OS2_DLL_OBJ) $(OS2_DLL_LIBS)
++ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
++ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def
+--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c 2014-11-26 21:59:58.000000000
+0100
++++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c 2014-11-26
21:50:14.000000000 +0100
+@@ -1126,7 +1126,7 @@
+ NULL, /* void* reserved1; */
+ };
+
+-#ifndef __MINGW32__
++#if !defined(__MINGW32__) && !defined(__KLIBC__)
+ /**
+ * xmlSecNssTransformKWAes128GetKlass:
+ *
+@@ -1199,7 +1199,7 @@
+ NULL, /* void* reserved1; */
+ };
+
+-#ifndef __MINGW32__
++#if !defined(__MINGW32__) && !defined(__KLIBC__)
+ /**
+ * xmlSecNssTransformKWDes3GetKlass:
+ *
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Nov 28
14:02:37 2014
@@ -1678,6 +1678,8 @@ File gid_File_Lib_XSec_XmlSec
TXT_FILE_BODY;
#ifdef UNX
Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
+ #elif defined(OS2)
+ Name = "xsec_xs.dll";
#else
Name = "xsec_xmlsec.dll";
#endif
@@ -1689,6 +1691,8 @@ File gid_File_Lib_XSec_XMLSecurity
TXT_FILE_BODY;
#ifdef UNX
Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
+ #elif defined(OS2)
+ Name = "xmlsecur.dll";
#else
Name = "xmlsecurity.dll";
#endif
@@ -1696,11 +1700,13 @@ File gid_File_Lib_XSec_XMLSecurity
Styles = (PACKED);
End
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
File gid_File_Lib_LibXMLSec_xmlseccore
TXT_FILE_BODY;
- #ifdef _gcc3
+ #if defined(OS2)
+ Name = "xmlsec1.dll";
+ #elif defined(_gcc3)
Name = "libxmlsec1.dll";
#else
Name = "libxmlsec.dll";
@@ -1711,7 +1717,9 @@ End
File gid_File_Lib_LibXMLSec_xmlsecmscrypto
TXT_FILE_BODY;
- #ifdef _gcc3
+ #if defined(OS2)
+ Name = "xmlsec1n.dll";
+ #elif defined(_gcc3)
Name = "libxmlsec1-mscrypto.dll";
#else
Name = "libxmlsec-mscrypto.dll";
Modified: openoffice/trunk/main/xmlsecurity/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/prj/d.lst?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/prj/d.lst (original)
+++ openoffice/trunk/main/xmlsecurity/prj/d.lst Fri Nov 28 14:02:37 2014
@@ -2,7 +2,9 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
..\%__SRC%\bin\xsec_fw.dll %_DEST%\bin%_EXT%\xsec_fw.dll
..\%__SRC%\bin\xsec_xmlsec.dll %_DEST%\bin%_EXT%\xsec_xmlsec.dll
+..\%__SRC%\bin\xsec_xs.dll %_DEST%\bin%_EXT%\xsec_xs.dll
..\%__SRC%\bin\xmlsecurity.dll %_DEST%\bin%_EXT%\xmlsecurity.dll
+..\%__SRC%\bin\xmlsecur.dll %_DEST%\bin%_EXT%\xmlsecur.dll
..\%__SRC%\lib\libxsec_fw.so %_DEST%\lib%_EXT%\libxsec_fw.so
..\%__SRC%\lib\libxsec_xmlsec.so %_DEST%\lib%_EXT%\libxsec_xmlsec.so
..\%__SRC%\lib\libxmlsecurity.so %_DEST%\lib%_EXT%\libxmlsecurity.so
Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk Fri Nov 28
14:02:37 2014
@@ -46,6 +46,9 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
NSS_INC = $(MOZ_INC)$/nss
NSPR_INC = $(MOZ_INC)$/nspr
+.ELIF "$(GUI)" == "OS2"
+NSS_INC = /@unixroot/usr/include/nss3
+NSPR_INC = /@unixroot/usr/include/nspr4
.ELSE
# TODO: better use pkgconfig to find the proper system include path
NSS_INC = /usr/include/nss3
Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
(original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx Fri
Nov 28 14:02:37 2014
@@ -295,7 +295,10 @@ bool nsscrypto_initialize( const css::un
#endif
deleteRootsModule();
-#if defined SYSTEM_MOZILLA
+#if defined OS2
+ // YD the nss system dlls names are ending with 'k'
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik"
SAL_DLLEXTENSION));
+#elif defined SYSTEM_MOZILLA
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi"
SAL_DLLEXTENSION));
#else
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM(
"${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
Modified: openoffice/trunk/main/xmlsecurity/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/util/makefile.mk?rev=1642301&r1=1642300&r2=1642301&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/util/makefile.mk Fri Nov 28 14:02:37 2014
@@ -68,6 +68,9 @@ DEF1EXPORTFILE = xsec_fw.dxp
#
SHL2NAME=xsec_xmlsec
+.IF "$(GUI)"=="OS2"
+SHL2NAME=xsec_xs
+.ENDIF
SHL2TARGET= $(SHL2NAME)
