rpms/openoffice.org/devel workspace.cmcfixes48.patch,1.4,1.5
Caolan McNamara
caolanm at fedoraproject.org
Sat Nov 29 14:14:57 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv891
Modified Files:
workspace.cmcfixes48.patch
Log Message:
remove integrated into 3.0.1 portion
workspace.cmcfixes48.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 workspace.cmcfixes48.patch
Index: workspace.cmcfixes48.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes48.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.cmcfixes48.patch 15 Sep 2008 21:50:07 -0000 1.4
+++ workspace.cmcfixes48.patch 29 Nov 2008 14:14:27 -0000 1.5
@@ -1,2158 +1,3 @@
-Index: api/offapi/com/sun/star/security/SerialNumberAdapter.idl
-diff -u /dev/null api/offapi/com/sun/star/security/SerialNumberAdapter.idl:1.1.2.1
---- /dev/null Fri Aug 1 09:30:33 2008
-+++ api/offapi/com/sun/star/security/SerialNumberAdapter.idl Fri Aug 1 09:28:21 2008
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * 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$
-+ * $Revision$
-+ *
-+ * 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.
-+ *
-+ ************************************************************************/
-+
-+#ifndef __com_sun_star_security_SerialNumberAdapter_idl_
-+#define __com_sun_star_security_SerialNumberAdapter_idl_
-+
-+//============================================================================
-+
-+module com { module sun { module star { module security {
-+ interface XSerialNumberAdapter; };
-+}; }; };
-+
-+//============================================================================
-+
-+module com { module sun { module star { module security {
-+
-+//============================================================================
-+
-+/** provides conversion services for Serial Numbers.
-+
-+ <p>An implementation of this service enables the conversion of certificate
-+ serial number to and from a string</p>
-+
-+ @since OOo 3.1.0
-+ */
-+
-+service SerialNumberAdapter : XSerialNumberAdapter;
-+
-+//============================================================================
-+
-+}; }; }; };
-+
-+#endif
-Index: api/offapi/com/sun/star/security/XSerialNumberAdapter.idl
-diff -u /dev/null api/offapi/com/sun/star/security/XSerialNumberAdapter.idl:1.1.2.1
---- /dev/null Fri Aug 1 09:30:33 2008
-+++ api/offapi/com/sun/star/security/XSerialNumberAdapter.idl Fri Aug 1 09:28:21 2008
-@@ -0,0 +1,62 @@
-+/*************************************************************************
-+ *
-+ * 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$
-+ * $Revision$
-+ *
-+ * 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.
-+ *
-+ ************************************************************************/
-+
-+/** -- idl definition -- **/
-+
-+#ifndef __com_sun_star_security_XSerialNumberAdapter_idl_
-+#define __com_sun_star_security_XSerialNumberAdapter_idl_
-+
-+#include <com/sun/star/uno/XInterface.idl>
-+
-+module com { module sun { module star { module security {
-+
-+/**
-+ * Interface of Certificate Serial Number Converter
-+ *
-+ * <p>This interface converts a certificate serial number to and from a string</p>
-+ */
-+interface XSerialNumberAdapter : com::sun::star::uno::XInterface
-+{
-+ /**
-+ * Convert the SerialNumber to a string
-+ */
-+ string toString( [in]sequence< byte > SerialNumber );
-+
-+ /**
-+ * Convert the SerialNumber to a sequence
-+ */
-+ sequence< byte > toSequence( [in]string SerialNumber );
-+
-+} ;
-+
-+} ; } ; } ; } ;
-+
-+#endif
-+
-Index: api/offapi/com/sun/star/security/makefile.mk
-diff -u api/offapi/com/sun/star/security/makefile.mk:1.8 api/offapi/com/sun/star/security/makefile.mk:1.8.108.1
---- api/offapi/com/sun/star/security/makefile.mk:1.8 Thu Apr 10 20:19:53 2008
-+++ api/offapi/com/sun/star/security/makefile.mk Fri Aug 1 09:28:21 2008
-@@ -60,6 +60,8 @@
- XDocumentDigitalSignatures.idl \
- KeyUsage.idl \
- XCertificateContainer.idl \
-+ XSerialNumberAdapter.idl \
-+ SerialNumberAdapter.idl \
- CertificateContainer.idl \
- CertificateContainerStatus.idl
-
-Index: installation/scp2/source/ooo/file_library_ooo.scp
-diff -u installation/scp2/source/ooo/file_library_ooo.scp:1.302 installation/scp2/source/ooo/file_library_ooo.scp:1.302.14.1
---- installation/scp2/source/ooo/file_library_ooo.scp:1.302 Thu Jul 17 08:34:36 2008
-+++ installation/scp2/source/ooo/file_library_ooo.scp Fri Aug 1 07:08:01 2008
-@@ -1104,6 +1104,20 @@
- Name = "oleautobridge.uno.dll";
- End
-
-+#else
-+
-+File gid_File_Lib_Mozbootstrap
-+ TXT_FILE_BODY;
-+ Styles = (PACKED,UNO_COMPONENT,PATCH);
-+ RegistryID = gid_Starregistry_Services_Rdb;
-+ Dir = gid_Dir_Program;
-+ #ifdef UNX
-+ Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
-+ #else
-+ Name = "libmozbootstrap.dll";
-+ #endif
-+End
-+
- #endif
-
- SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2)
-@@ -1657,26 +1671,18 @@
- RegistryID = gid_Starregistry_Services_Rdb;
- End
-
-+#ifdef WNT
- File gid_File_Lib_LibXMLSec_xmlseccore
- TXT_FILE_BODY;
-- #ifdef UNX
-- #ifdef MACOSX
-- Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
-- #else
-- Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
-- #endif
-+ #ifdef _gcc3
-+ Name = "libxmlsec1-1.dll";
- #else
-- #ifdef _gcc3
-- Name = "libxmlsec1-1.dll";
-- #else
-- Name = "libxmlsec.dll";
-- #endif
[...1767 lines suppressed...]
-+
-+Sequence< OUString > SerialNumberAdapterImpl_getSupportedServiceNames()
-+ throw (RuntimeException)
-+{
-+ Sequence < OUString > aRet(1);
-+ OUString* pArray = aRet.getArray();
-+ pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(
-+ "com.sun.star.security.SerialNumberAdapter" ) );
-+ return aRet;
-+}
-+
-+Reference< XInterface > SerialNumberAdapterImpl_createInstance(
-+ const Reference< XComponentContext > &) throw( Exception )
-+{
-+ return Reference< XInterface >( *new SerialNumberAdapterImpl() );
-+}
-+
-+}
-+
- extern "C"
- {
-
-@@ -103,6 +148,18 @@
- xNewKey->createKey( seqServices.getConstArray()[i] ) ;
- }
-
-+ // SerialNumberAdapterImpl
-+ sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ;
-+ sKeyName += SerialNumberAdapterImpl_getImplementationName() ;
-+ sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ;
-+
-+ xNewKey = xKey->createKey( sKeyName ) ;
-+ if( xNewKey.is() ) {
-+ seqServices = SerialNumberAdapterImpl_getSupportedServiceNames() ;
-+ for( i = seqServices.getLength() ; i -- ; )
-+ xNewKey->createKey( seqServices.getConstArray()[i] ) ;
-+ }
-+
- #if defined( XMLSEC_CRYPTO_NSS )
- result = nss_component_writeInfo( pServiceManager, pRegistryKey ) ;
- if( !result )
-@@ -127,7 +184,7 @@
- void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
- {
- void* pRet = 0;
-- Reference< XSingleServiceFactory > xFactory ;
-+ Reference< XInterface > xFactory ;
-
- if( pImplName != NULL && pServiceManager != NULL ) {
- if( XMLElementWrapper_XmlSecImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
-@@ -144,6 +201,13 @@
- OUString::createFromAscii( pImplName ),
- XMLDocumentWrapper_XmlSecImpl_createInstance, XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames() ) );
- }
-+ else if( SerialNumberAdapterImpl_getImplementationName().equals( OUString::createFromAscii( pImplName ) ) )
-+ {
-+ xFactory = ::cppu::createSingleComponentFactory(
-+ SerialNumberAdapterImpl_createInstance,
-+ OUString::createFromAscii( pImplName ),
-+ SerialNumberAdapterImpl_getSupportedServiceNames() );
-+ }
- }
-
- if( xFactory.is() ) {
-Index: xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
-diff -u xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx:1.22 xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx:1.22.22.1
---- xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx:1.22 Thu Apr 10 17:37:54 2008
-+++ xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx Wed Jul 30 02:30:34 2008
-@@ -45,6 +45,11 @@
- #include "certt.h"
- #include "prerror.h"
-
-+#include <sal/types.h>
-+//For reasons that escape me, this is what xmlsec does when size_t is not 4
-+#if SAL_TYPES_SIZEOFPOINTER != 4
-+# define XMLSEC_NO_SIZE_T
-+#endif
- #include <xmlsec/xmlsec.h>
- #include <xmlsec/keysmngr.h>
- #include <xmlsec/crypto.h>
-Index: xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
-diff -u xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx:1.8 xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx:1.8.22.1
---- xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx:1.8 Thu Apr 10 17:38:15 2008
-+++ xml/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx Wed Jul 30 02:30:34 2008
-@@ -59,6 +59,11 @@
- #include "certdb.h"
- #include "list"
-
-+#include <sal/types.h>
-+//For reasons that escape me, this is what xmlsec does when size_t is not 4
-+#if SAL_TYPES_SIZEOFPOINTER != 4
-+# define XMLSEC_NO_SIZE_T
-+#endif
- #include "xmlsec/xmlsec.h"
-
- class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper4<
-Index: xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
-diff -u xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx:1.21 xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx:1.21.22.1
---- xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx:1.21 Thu Apr 10 17:38:31 2008
-+++ xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx Thu Jul 24 06:25:05 2008
-@@ -68,6 +68,7 @@
- #include "pk11func.h"
- #ifdef SYSTEM_MOZILLA
- #include "nssrenam.h"
-+#include "secmod.h"
- #endif
- #include "cert.h"
- #include "cryptohi.h"
-@@ -104,6 +105,15 @@
- printf("%s",error);
- return false ;
- }
-+
-+#ifdef SYSTEM_MOZILLA
-+ if (!SECMOD_HasRootCerts())
-+ {
-+ SECMOD_AddNewModule("Root Certs", "libnssckbi" SAL_DLLEXTENSION,
-+ 0, 0);
-+ }
-+#endif
-+
- initialized = 1 ;
- }
-
-Index: xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
-diff -u xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx:1.9 xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx:1.9.22.1
---- xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx:1.9 Thu Apr 10 17:39:31 2008
-+++ xml/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx Wed Jul 30 02:30:34 2008
-@@ -47,6 +47,11 @@
- #endif
- #include "errorcallback.hxx"
-
-+#include <sal/types.h>
-+//For reasons that escape me, this is what xmlsec does when size_t is not 4
-+#if SAL_TYPES_SIZEOFPOINTER != 4
-+# define XMLSEC_NO_SIZE_T
-+#endif
- #include "xmlsec/xmlsec.h"
- #include "xmlsec/xmltree.h"
- #include "xmlsec/xmlenc.h"
-Index: xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
-diff -u xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx:1.7 xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx:1.7.22.1
---- xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx:1.7 Thu Apr 10 17:40:05 2008
-+++ xml/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx Wed Jul 30 02:30:35 2008
-@@ -39,6 +39,11 @@
- #endif
- #include "xmlstreamio.hxx"
-
-+#include <sal/types.h>
-+//For reasons that escape me, this is what xmlsec does when size_t is not 4
-+#if SAL_TYPES_SIZEOFPOINTER != 4
-+# define XMLSEC_NO_SIZE_T
-+#endif
- #include "xmlsec/xmlsec.h"
- #include "xmlsec/keysmngr.h"
- #include "xmlsec/crypto.h"
-Index: xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
-diff -u xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx:1.9 xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx:1.9.22.1
---- xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx:1.9 Thu Apr 10 17:40:37 2008
-+++ xml/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx Wed Jul 30 02:30:35 2008
-@@ -52,6 +52,11 @@
- #include "xmlstreamio.hxx"
- #include "errorcallback.hxx"
-
-+#include <sal/types.h>
-+//For reasons that escape me, this is what xmlsec does when size_t is not 4
-+#if SAL_TYPES_SIZEOFPOINTER != 4
-+# define XMLSEC_NO_SIZE_T
-+#endif
- #include "xmlsec/xmlsec.h"
- #include "xmlsec/xmldsig.h"
- #include "xmlsec/crypto.h"
-Index: xml/xmlsecurity/util/makefile.mk
-diff -u xml/xmlsecurity/util/makefile.mk:1.22 xml/xmlsecurity/util/makefile.mk:1.22.22.1
---- xml/xmlsecurity/util/makefile.mk:1.22 Thu Apr 10 17:51:04 2008
-+++ xml/xmlsecurity/util/makefile.mk Fri Aug 1 06:54:33 2008
-@@ -137,10 +137,6 @@
- $(SLB)$/dialogs.lib \
- $(SLB)$/component.lib
-
--SHL4OBJS=\
-- $(SLO)$/baseencoding.obj \
-- $(SLO)$/biginteger.obj
--
- SHL4STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
-@@ -158,9 +154,6 @@
- $(XMLOFFLIB) \
- $(SVXLIB)
-
--#MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
--SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
--
- SHL4VERSIONMAP = xmlsecurity.map
- SHL4DEPN=
- SHL4IMPLIB=i$(TARGET)
Index: tools/solenv/bin/langwrap
diff -u tools/solenv/bin/langwrap:1.1.1.1 tools/solenv/bin/langwrap:1.1.1.1.1992.1
--- tools/solenv/bin/langwrap:1.1.1.1 Wed Sep 20 07:43:11 2000
More information about the fedora-extras-commits
mailing list