From d59dcd39c0d1fcd39748819d173e4b3c7a24df52 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Fri, 4 Dec 2009 22:16:38 +0000 Subject: [PATCH] - make krb5-config suppress CFLAGS output when called with --libs (#544391) --- krb5-1.7-buildconf.patch | 14 +++++++++----- krb5.spec | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/krb5-1.7-buildconf.patch b/krb5-1.7-buildconf.patch index 0319e50..296ead2 100644 --- a/krb5-1.7-buildconf.patch +++ b/krb5-1.7-buildconf.patch @@ -1,6 +1,7 @@ -Build binaries in this package as PIEs, install shared libraries with the -execute bit set on them, and prune out the -L/usr/lib* and PIE flags where they -might leak out and affect apps which want to link with the libraries. +Build binaries in this package as PIEs and install shared libraries with the +execute bit set on them. Prune out the -L/usr/lib*, PIE flags, and CFLAGS +where they might leak out and affect apps which just want to link with the +libraries (RT#TBD). diff -up krb5-1.7/src/config/shlib.conf krb5-1.7/src/config/shlib.conf --- krb5-1.7/src/config/shlib.conf 2008-12-08 17:33:07.000000000 -0500 @@ -17,9 +18,12 @@ diff -up krb5-1.7/src/config/shlib.conf krb5-1.7/src/config/shlib.conf diff -up krb5-1.7/src/krb5-config.in krb5-1.7/src/krb5-config.in --- krb5-1.7/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400 +++ krb5-1.7/src/krb5-config.in 2009-06-04 14:01:28.000000000 -0400 -@@ -189,6 +189,11 @@ if test -n "$do_libs"; then +@@ -187,8 +187,13 @@ if test -n "$do_libs"; then + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` +- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` ++ -e 's#\$(CFLAGS)##'` + if test `dirname $libdir` = /usr ; then + lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"` diff --git a/krb5.spec b/krb5.spec index f6498a0..058daa7 100644 --- a/krb5.spec +++ b/krb5.spec @@ -215,6 +215,9 @@ to obtain initial credentials from a KDC using a private key and a certificate. %changelog +* Fri Dec 4 2009 Nalin Dahyabhai - 1.7-12 +- make krb5-config suppress CFLAGS output when called with --libs (#544391) + * Thu Dec 3 2009 Nalin Dahyabhai - 1.7-11 - ksu: move account management checks to before we drop privileges, like su does (#540769)