diff -Naur bash-3.0.orig/Makefile.in bash-3.0/Makefile.in
--- bash-3.0.orig/Makefile.in	2005-01-30 08:47:33.347110692 +0000
+++ bash-3.0/Makefile.in	2005-01-30 08:59:09.356718445 +0000
@@ -115,8 +115,8 @@
 # with gprof, or nothing (the default).
 PROFILE_FLAGS= @PROFILE_FLAGS@
 
-CFLAGS = @CFLAGS@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CFLAGS = @CFLAGS@ @FPIECFLAGS@ @SSPCFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @FPIECFLAGS@ @SSPCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG}
@@ -139,7 +139,9 @@
 
 CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
 
-LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
+LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS) \
+	  @PIELDFLAGS@ @RELROLDFLAGS@ @NOWLDFLAGS@
+
 LDFLAGS_FOR_BUILD = $(LDFLAGS)
 
 INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
diff -Naur bash-3.0.orig/builtins/Makefile.in bash-3.0/builtins/Makefile.in
--- bash-3.0.orig/builtins/Makefile.in	2005-01-30 08:47:33.152165380 +0000
+++ bash-3.0/builtins/Makefile.in	2005-01-30 08:59:46.790202285 +0000
@@ -53,8 +53,8 @@
 LIBBUILD = ${BUILD_DIR}/lib
 
 PROFILE_FLAGS = @PROFILE_FLAGS@
-CFLAGS = @CFLAGS@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @SSPCFLAGS@ @FPICCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG}
diff -Naur bash-3.0.orig/configure.in bash-3.0/configure.in
--- bash-3.0.orig/configure.in	2005-01-30 08:47:33.335114057 +0000
+++ bash-3.0/configure.in	2005-01-30 08:52:50.799045972 +0000
@@ -352,6 +352,12 @@
 dnl different environment
 AC_PROG_CC
 
+_AC_PROG_CC_FPIE
+_AC_PROG_CC_FPIC
+_AC_PROG_CC_SSP
+_AC_PROG_CC_RELRO
+_AC_PROG_CC_NOW
+
 dnl test for Unix variants
 AC_ISC_POSIX
 AC_MINIX
diff -Naur bash-3.0.orig/lib/glob/Makefile.in bash-3.0/lib/glob/Makefile.in
--- bash-3.0.orig/lib/glob/Makefile.in	2005-01-30 08:47:33.217147151 +0000
+++ bash-3.0/lib/glob/Makefile.in	2005-01-30 08:54:47.954150209 +0000
@@ -41,7 +41,7 @@
 
 PROFILE_FLAGS = @PROFILE_FLAGS@
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@
diff -Naur bash-3.0.orig/lib/intl/Makefile.in bash-3.0/lib/intl/Makefile.in
--- bash-3.0.orig/lib/intl/Makefile.in	2005-01-30 08:47:33.219146590 +0000
+++ bash-3.0/lib/intl/Makefile.in	2005-01-30 08:55:02.407090354 +0000
@@ -58,7 +58,7 @@
 -Drelocate=libintl_relocate \
 -DDEPENDS_ON_LIBICONV=1 @DEFS@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 
diff -Naur bash-3.0.orig/lib/malloc/Makefile.in bash-3.0/lib/malloc/Makefile.in
--- bash-3.0.orig/lib/malloc/Makefile.in	2005-01-30 08:47:33.228144066 +0000
+++ bash-3.0/lib/malloc/Makefile.in	2005-01-30 08:55:23.164259590 +0000
@@ -38,7 +38,7 @@
 
 PROFILE_FLAGS = @PROFILE_FLAGS@
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
diff -Naur bash-3.0.orig/lib/readline/Makefile.in bash-3.0/lib/readline/Makefile.in
--- bash-3.0.orig/lib/readline/Makefile.in	2005-01-30 08:47:33.237141542 +0000
+++ bash-3.0/lib/readline/Makefile.in	2005-01-30 08:55:36.403540602 +0000
@@ -51,7 +51,7 @@
 ETAGS = etags -tw
 CTAGS = ctags -tw
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
diff -Naur bash-3.0.orig/lib/sh/Makefile.in bash-3.0/lib/sh/Makefile.in
--- bash-3.0.orig/lib/sh/Makefile.in	2005-01-30 08:47:33.255136494 +0000
+++ bash-3.0/lib/sh/Makefile.in	2005-01-30 08:55:49.693807273 +0000
@@ -54,7 +54,7 @@
 
 SHELL = @MAKE_SHELL@
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG}
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@
diff -Naur bash-3.0.orig/lib/termcap/Makefile.in bash-3.0/lib/termcap/Makefile.in
--- bash-3.0.orig/lib/termcap/Makefile.in	2005-01-30 08:47:33.272131726 +0000
+++ bash-3.0/lib/termcap/Makefile.in	2005-01-30 08:55:59.809965562 +0000
@@ -41,7 +41,7 @@
 
 SHELL = @MAKE_SHELL@
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 
diff -Naur bash-3.0.orig/lib/tilde/Makefile.in bash-3.0/lib/tilde/Makefile.in
--- bash-3.0.orig/lib/tilde/Makefile.in	2005-01-30 08:47:33.274131165 +0000
+++ bash-3.0/lib/tilde/Makefile.in	2005-01-30 08:56:11.582658504 +0000
@@ -41,7 +41,7 @@
 
 PROFILE_FLAGS = @PROFILE_FLAGS@
 
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 LOCAL_CFLAGS = @LOCAL_CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@