- make krb5-config suppress CFLAGS output when called with --libs (#544391)

This commit is contained in:
Nalin Dahyabhai 2009-12-04 22:16:38 +00:00
parent 19b0f85a6e
commit d59dcd39c0
2 changed files with 12 additions and 5 deletions

View File

@ -1,6 +1,7 @@
Build binaries in this package as PIEs, install shared libraries with the Build binaries in this package as PIEs and install shared libraries with the
execute bit set on them, and prune out the -L/usr/lib* and PIE flags where they execute bit set on them. Prune out the -L/usr/lib*, PIE flags, and CFLAGS
might leak out and affect apps which want to link with the libraries. 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 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 --- 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 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
+++ 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#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
-e 's#\$(CFLAGS)#'"$CFLAGS"'#'` - -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
+ -e 's#\$(CFLAGS)##'`
+ if test `dirname $libdir` = /usr ; then + if test `dirname $libdir` = /usr ; then
+ lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"` + lib_flags=`echo $lib_flags | sed -e "s#-L$libdir##" -e "s#$RPATH_FLAG$libdir##"`

View File

@ -215,6 +215,9 @@ to obtain initial credentials from a KDC using a private key and a
certificate. certificate.
%changelog %changelog
* Fri Dec 4 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-12
- make krb5-config suppress CFLAGS output when called with --libs (#544391)
* Thu Dec 3 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-11 * Thu Dec 3 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-11
- ksu: move account management checks to before we drop privileges, like - ksu: move account management checks to before we drop privileges, like
su does (#540769) su does (#540769)