rpms/openoffice.org/devel openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch, NONE, 1.1 openoffice.org.spec, 1.323, 1.324

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1172

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch 
Log Message:
testing security flags

openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch:
 inc/settings.mk        |    0 
 solenv/inc/settings.mk |    1 -
 2 files changed, 1 deletion(-)

--- NEW FILE openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch ---
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.172
diff -u -p -u -r1.172 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk	11 Jul 2005 15:27:47 -0000	1.172
+++ openoffice.org/solenv/inc/settings.mk	20 Jul 2005 07:37:53 -0000
@@ -253,7 +253,6 @@ CDEFSDBGUTIL=
 CDEFSOPT=
 HDEFS=
 
-CFLAGS=
 CFLAGSCALL=
 CFLAGSCXX=
 CFLAGSCC=


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- openoffice.org.spec	19 Jul 2005 08:21:04 -0000	1.323
+++ openoffice.org.spec	20 Jul 2005 07:40:30 -0000	1.324
@@ -1,5 +1,5 @@
 %define ooo2ver 118
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -165,6 +165,7 @@
 Patch64: openoffice.org-1.9.118.forwarddecl.psprint.patch
 Patch65: openoffice.org-1.9.118.ooo52061.recursive.animations.patch
 Patch66: workspace.qwizardsbfooo20.patch
+Patch67: openoffice.org-1.9.118.rhXXXXX.envcflags.solenv.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -816,6 +817,7 @@
 %patch64 -p1 -b .forwarddecl.psprint.patch
 %patch65 -p1 -b .ooo52061.recursive.animations.patch
 %patch66 -p1 -R -b .workspace.qwizardsbfooo20.patch
+%patch67 -p1 -b .rhXXXXX.envcflags.solenv.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -886,6 +888,9 @@
 export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
 %endif
 
+#give these security flags a whirl
+export CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param ssp-buffer-size=3"
+
 cd transex3/prj
 build --dlv_switch link --all -P$MAXBUILDS
 deliver
@@ -3017,6 +3022,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jul 20 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.118-2
+- experiment with security flags
+
 * Sat Jul 16 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.118-1
 - add experiemental rh150643.fontconfigalwayssystemfont.vcl.patch
 - drop integrated workspace.impress63.patch