[kde-workspace/f19: 22/28] Revert "Changed the KDM hardening to -fpic -pic"

[Rex Dieter]

commit 33fdb5ac28295860541541de54cc7c5fa0d17a29
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 08:16:05 2013 -0500

    Revert "Changed the KDM hardening to -fpic -pic"
    
    This reverts commit 9049cfcdae8432ee4b477b84274e0339aaa9f890.

 kde-workspace-4.10.4-kdm-harden.patch |    8 ++++----
 kde-workspace.spec                    |    5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/kde-workspace-4.10.4-kdm-harden.patch b/kde-workspace-4.10.4-kdm-harden.patch
index 64d349c..d3b6838 100644
--- a/kde-workspace-4.10.4-kdm-harden.patch
+++ b/kde-workspace-4.10.4-kdm-harden.patch
@@ -5,8 +5,8 @@
  macro_add_file_dependencies(error.c ${CMAKE_CURRENT_SOURCE_DIR}/printf.c)
  kde4_add_executable(kdm NOGUI ${kdm_SRCS})
 -macro_add_compile_flags(kdm -U_REENTRANT)
-+macro_add_compile_flags(kdm "-U_REENTRANT -fpie -pie")
-+set_target_properties(kdm PROPERTIES LINK_FLAGS "-fpie -pie -Wl,-z,relro,-z,now ${LINK_FLAGS}")
++macro_add_compile_flags(kdm "-U_REENTRANT -fPIC")
++set_target_properties(kdm PROPERTIES LINK_FLAGS "-pie -fPIE -Wl,-z,relro,-z,now ${LINK_FLAGS}")
  target_link_libraries( kdm
  	${X11_X11_LIB} ${X11_Xau_LIB} ${X11_Xdmcp_LIB} ${X11_X_EXTRA_LIBS}
  	${UNIXAUTH_LIBRARIES}
@@ -16,8 +16,8 @@
  
  macro_add_file_dependencies(kdmconfig.h ${confci})
  kde4_add_executable(kdm_greet ${kdm_greet_SRCS})
-+macro_add_compile_flags(kdm_greet "-fpie -pie")
-+set_target_properties(kdm_greet PROPERTIES LINK_FLAGS "-fpie -pie -Wl,-z,relro,-z,now ${LINK_FLAGS}")
++macro_add_compile_flags(kdm_greet "-fPIC")
++set_target_properties(kdm_greet PROPERTIES LINK_FLAGS "-pie -fPIE -Wl,-z,relro,-z,now ${LINK_FLAGS}")
  target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${POSIX4_LIBRARIES})
  if (X11_XTest_FOUND)
    target_link_libraries(kdm_greet ${X11_XTest_LIB})
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 723d0ab..7a36761 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -17,7 +17,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.10.5
-Release: 5%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -1033,9 +1033,6 @@ fi
 
 
 %changelog
-* Wed Aug 07 2013 Martin Briza <mbriza at redhat.com> - 4.10.5-5
-- Changed the KDM hardening to -fpic -pic
-
 * Mon Aug 05 2013 Martin Briza <mbriza at redhat.com> - 4.10.5-4
 - Made kdm and kdm_greet hardened (#983619)