[krb5] update for 1.10; we don't need to prune out CFLAGS any more

[Nalin Dahyabhai]

commit 0fde11f8897293e44e9f66b099a07b6c3d5fe017
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Wed Nov 9 15:26:34 2011 -0500

    update for 1.10; we don't need to prune out CFLAGS any more

 ....1-buildconf.patch => krb5-1.10-buildconf.patch |   24 +++++++------------
 1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/krb5-1.9.1-buildconf.patch b/krb5-1.10-buildconf.patch
similarity index 71%
rename from krb5-1.9.1-buildconf.patch
rename to krb5-1.10-buildconf.patch
index 85173cf..25b05ac 100644
--- a/krb5-1.9.1-buildconf.patch
+++ b/krb5-1.10-buildconf.patch
@@ -1,12 +1,11 @@
 Build binaries in this package as RELRO PIEs, libraries as partial RELRO,
 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
+the -L/usr/lib* and PIE flags where they might leak out and affect
 apps which just want to link with the libraries. FIXME: needs to check and
 not just assume that the compiler supports using these flags.
 
-diff -up krb5-1.9/src/config/shlib.conf krb5-1.9/src/config/shlib.conf
---- krb5-1.9/src/config/shlib.conf	2008-12-08 17:33:07.000000000 -0500
-+++ krb5-1.9/src/config/shlib.conf	2009-06-04 14:01:28.000000000 -0400
+--- krb5/src/config/shlib.conf
++++ krb5/src/config/shlib.conf
 @@ -419,7 +419,7 @@ mips-*-netbsd*)
  	SHLIBEXT=.so
  	# Linux ld doesn't default to stuffing the SONAME field...
@@ -26,15 +25,11 @@ diff -up krb5-1.9/src/config/shlib.conf krb5-1.9/src/config/shlib.conf
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
  	CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
-diff -up krb5-1.9/src/krb5-config.in krb5-1.9/src/krb5-config.in
---- krb5-1.9/src/krb5-config.in	2009-06-04 14:01:28.000000000 -0400
-+++ krb5-1.9/src/krb5-config.in	2009-06-04 14:01:28.000000000 -0400
-@@ -187,8 +187,15 @@ if test -n "$do_libs"; then
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+--- krb5/src/krb5-config.in
++++ krb5/src/krb5-config.in
+@@ -189,6 +189,13 @@ if test -n "$do_libs"; then
  	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
--	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+	    -e 's#\$(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##"`
@@ -46,9 +41,8 @@ diff -up krb5-1.9/src/krb5-config.in krb5-1.9/src/krb5-config.in
      if test $library = 'kdb'; then
  	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
  	library=krb5
-diff -up krb5-1.9/src/config/pre.in krb5-1.9/src/config/pre.in
---- krb5-1.9/src/config/pre.in	2011-04-01 15:45:06.640705226 -0400
-+++ krb5-1.9/src/config/pre.in	2011-04-01 15:45:11.179705234 -0400
+--- krb5/src/config/pre.in
++++ krb5/src/config/pre.in
 @@ -188,7 +188,7 @@
  INSTALL_SCRIPT=@INSTALL_PROGRAM@
  INSTALL_DATA=@INSTALL_DATA@