rpms/krb5/devel krb5-1.7-buildconf.patch, 1.1, 1.2 krb5.spec, 1.216, 1.217

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/krb5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13671

Modified Files:
	krb5-1.7-buildconf.patch krb5.spec 
Log Message:
- make krb5-config suppress CFLAGS output when called with --libs (#544391)


krb5-1.7-buildconf.patch:
 config/shlib.conf |    2 ++
 krb5-config.in    |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: krb5-1.7-buildconf.patch
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5-1.7-buildconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- krb5-1.7-buildconf.patch	4 Jun 2009 19:09:04 -0000	1.1
+++ krb5-1.7-buildconf.patch	4 Dec 2009 22:16:38 -0000	1.2
@@ -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 
 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##"`


Index: krb5.spec
===================================================================
RCS file: /cvs/extras/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- krb5.spec	3 Dec 2009 23:26:02 -0000	1.216
+++ krb5.spec	4 Dec 2009 22:16:38 -0000	1.217
@@ -215,6 +215,9 @@ to obtain initial credentials from a KDC
 certificate.
 
 %changelog
+* Fri Dec  4 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-12
+- make krb5-config suppress CFLAGS output when called with --libs (#544391)
+
 * Thu Dec  3 2009 Nalin Dahyabhai <nalin at redhat.com> - 1.7-11
 - ksu: move account management checks to before we drop privileges, like
   su does (#540769)