Index: SUNWxscreensaver.spec
===================================================================
--- SUNWxscreensaver.spec (revision 20298)
+++ SUNWxscreensaver.spec (working copy)
@@ -42,7 +42,6 @@
Source3: solaris-lockscreen-logos-1.0.tar.bz2
%endif
Source4: suntouch-manpages.pl
-Source5: map.noexbss
# date:2008-12-15 owner:alanc type:bug bugster:6785377 state:upstream
Patch1: xscreensaver-01-datarootdir.diff
@@ -406,7 +405,7 @@
# so that it's harder for attackers to exploit buffer overflows
# SPARC architecture requires PLT section in .data be executable, so
# we can only make .bss, not all of .data no-exec on SPARC
-%define mapfile_noexbss -Wl,-M,%SOURCE5
+%define mapfile_noexbss -Wl,-M,/usr/lib/ld/map.noexbss
%ifarch sparc
%define mapfile_noexdata %{mapfile_noexbss}
%else
@@ -668,6 +667,9 @@
%endif
%changelog
+* Tue Dec 22 2009 - alan.coopersmith at sun.com
+- Use /usr/lib/ld/map.noexbss now that it's shipped in snv_125 & later
+ builds (CR 6843010)
* Mon Oct 19 2009 - alan.coopersmith at sun.com
- Change default DPMS settings to match Xorg 1.7 defaults (10 minutes)
- Merge xscreensaver-32-XScr.ad.lockTimeout.diff
Index: ext-sources/map.noexbss
===================================================================
--- ext-sources/map.noexbss (revision 20298)
+++ ext-sources/map.noexbss (working copy)
@@ -1,36 +0,0 @@
-#ident "@(#)map.noexbss 1.5 05/09/02 SMI"
-#
-# Copyright 2005 by Sun Microsystems, Inc. All rights reserved.
-# Use subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-############################################################################
-#
-# Make bss section non-executable for further buffer overflow protection
-# (can't make whole data section non-exec on SPARC since that includes PLT
-# which must be executable on SPARC).
-bss = ?RW;
