rpms/openoffice.org/devel openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.4, 1.5 openoffice.org.spec, 1.1460, 1.1461
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Mar 28 14:44:46 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22545
Modified Files:
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
openoffice.org.spec
Log Message:
extend selinux bodge
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch:
Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 27 Mar 2008 15:13:50 -0000 1.4
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 28 Mar 2008 14:44:12 -0000 1.5
@@ -653,3 +653,129 @@
ia64::return_in_hidden_param(
reinterpret_cast<
typelib_InterfaceMethodTypeDescription * >(
+Index: source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx 27 Feb 2008 09:50:53 -0000 1.4
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx 28 Mar 2008 14:41:06 -0000
+@@ -472,7 +472,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -487,7 +487,7 @@
+ {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -499,14 +499,14 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset, true);
+ }
+ break;
+ case typelib_TypeClass_INTERFACE_METHOD:
+ {
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+
+ typelib_InterfaceMethodTypeDescription *pMethodTD =
+ reinterpret_cast<
+Index: source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx,v
+retrieving revision 1.5
+diff -u -r1.5 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx 18 Mar 2008 16:05:50 -0000 1.5
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx 28 Mar 2008 14:41:06 -0000
+@@ -645,7 +645,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -663,7 +663,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -676,13 +676,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vtableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+? source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx.workspace.cmcfixes43.patch
+? source/cpp_uno/gcc3_linux_mips/except.cxx.workspace.cmcfixes43.patch
+Index: source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx 27 Feb 2008 09:54:38 -0000 1.4
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx 28 Mar 2008 14:42:53 -0000
+@@ -752,7 +754,7 @@
+ }
+
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+- Slot ** slots, unsigned char * code,
++ Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+ typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+ sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -772,7 +774,7 @@
+ switch (member->eTypeClass) {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+ // Getter:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
+@@ -785,13 +787,13 @@
+ typelib_InterfaceAttributeTypeDescription * >(
+ member)->bReadOnly)
+ {
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(code, functionOffset++, vtableOffset, true);
+ }
+ break;
+
+ case typelib_TypeClass_INTERFACE_METHOD:
+- (s++)->fn = code;
++ (s++)->fn = code + writetoexecdiff;
+ code = codeSnippet(
+ code, functionOffset++, vtableOffset,
+ bridges::cpp_uno::shared::isSimpleType(
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1460
retrieving revision 1.1461
diff -u -r1.1460 -r1.1461
--- openoffice.org.spec 28 Mar 2008 12:48:37 -0000 1.1460
+++ openoffice.org.spec 28 Mar 2008 14:44:12 -0000 1.1461
@@ -2863,6 +2863,7 @@
- drop integrated workspace.cairotext01.patch
- fix up launchers
- recover most configuration settings
+- extend selinux bodge to arm, mips and s390
* Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
- extend selinux bodge to ia64
More information about the fedora-extras-commits
mailing list