From a5e2de6e1ed24ca3b8a0b933ceabace3fa6c1e2b Mon Sep 17 00:00:00 2001
From: soochoi <soochoi@unknown>
Date: Tue, 28 Feb 2006 22:56:33 +0000
Subject: [PATCH] add fstack-protector into makefile

---
 CASA.changes                     | 6 ------
 shsrc/lshsrc/mk-authkrb5token-ol | 2 +-
 shsrc/lshsrc/mk-authtoken-ol     | 2 +-
 shsrc/lshsrc/mk-clientlogin-ol   | 2 +-
 shsrc/lshsrc/mk-jmicasa-ol       | 2 +-
 shsrc/lshsrc/mk-loginpam-ol      | 2 +-
 shsrc/lshsrc/mk-micasa_gk-ol     | 2 +-
 shsrc/lshsrc/mk-micasa_kw-ol     | 2 +-
 shsrc/lshsrc/mk-micasacache-ol   | 2 +-
 shsrc/lshsrc/mk-micasadk-ol      | 2 +-
 shsrc/lshsrc/mk-pamauthtoken-ol  | 2 +-
 11 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/CASA.changes b/CASA.changes
index 636f9c5c..d685f30a 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Feb 28 13:44:22 MST 2006 - schoi@novell.com
-                                                                                                                                            
-- compiler option -fstack-protector was removed to the build scripts
-  due to build failure.
-
 -------------------------------------------------------------------
 Wed Feb 28 14:00:00 IST 2006 - mmanohar@novell.com
 
diff --git a/shsrc/lshsrc/mk-authkrb5token-ol b/shsrc/lshsrc/mk-authkrb5token-ol
index e37a44b5..976e0ed2 100755
--- a/shsrc/lshsrc/mk-authkrb5token-ol
+++ b/shsrc/lshsrc/mk-authkrb5token-ol
@@ -20,7 +20,7 @@ fi
 
 
 cd $PR/auth_token/krb5_token/linux
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"../..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"../..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -fstack-protector -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-authtoken-ol b/shsrc/lshsrc/mk-authtoken-ol
index 2686ebdf..99039173 100755
--- a/shsrc/lshsrc/mk-authtoken-ol
+++ b/shsrc/lshsrc/mk-authtoken-ol
@@ -20,7 +20,7 @@ fi
 
 
 cd $PR/auth_token/linux
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -fstack-protector -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-clientlogin-ol b/shsrc/lshsrc/mk-clientlogin-ol
index 82e467be..8169e260 100644
--- a/shsrc/lshsrc/mk-clientlogin-ol
+++ b/shsrc/lshsrc/mk-clientlogin-ol
@@ -19,7 +19,7 @@ ARCH_LIB=
 fi
 
 cd $PR/c_clientlogin
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\"  XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\"  XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $5)
 RCODE=$?
 
 cp ./Release/nwautologin ../bin/lux/ndbg/.
diff --git a/shsrc/lshsrc/mk-jmicasa-ol b/shsrc/lshsrc/mk-jmicasa-ol
index 0f789ccc..a67eb4e1 100644
--- a/shsrc/lshsrc/mk-jmicasa-ol
+++ b/shsrc/lshsrc/mk-jmicasa-ol
@@ -42,7 +42,7 @@ exit $RCODE
 fi
 
 cd ../jnsscs
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-I\"$JAVA_HOME/include\" -I\"$JAVA_HOME/include/linux\" -DDEBUG -g -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-I\"$JAVA_HOME/include\" -I\"$JAVA_HOME/include/linux\" -DDEBUG -g -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-loginpam-ol b/shsrc/lshsrc/mk-loginpam-ol
index ed38de1e..5682bd86 100644
--- a/shsrc/lshsrc/mk-loginpam-ol
+++ b/shsrc/lshsrc/mk-loginpam-ol
@@ -20,7 +20,7 @@ fi
 
 
 cd $PR/login_capture/PAM
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fno-strict-aliasing" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fno-strict-aliasing -fstack-protector" $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-micasa_gk-ol b/shsrc/lshsrc/mk-micasa_gk-ol
index 821c51ad..3592ad1e 100644
--- a/shsrc/lshsrc/mk-micasa_gk-ol
+++ b/shsrc/lshsrc/mk-micasa_gk-ol
@@ -22,7 +22,7 @@ fi
 export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
 
 cd $PR/c_adlib/ad_gk/native
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall  -fstack-protector" $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-micasa_kw-ol b/shsrc/lshsrc/mk-micasa_kw-ol
index f561c2a4..1ae76c4a 100644
--- a/shsrc/lshsrc/mk-micasa_kw-ol
+++ b/shsrc/lshsrc/mk-micasa_kw-ol
@@ -24,7 +24,7 @@ fi
 #(ln -f $COMMON_FILES $PR/c_micasadk)
 cd $PR/c_adlib/ad_kw/native
 moc kwallets_rw.h -o kwallets_rw.moc
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g" $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 rm kwallets_rw.moc
diff --git a/shsrc/lshsrc/mk-micasacache-ol b/shsrc/lshsrc/mk-micasacache-ol
index 20be23c4..9fb30bd6 100644
--- a/shsrc/lshsrc/mk-micasacache-ol
+++ b/shsrc/lshsrc/mk-micasacache-ol
@@ -20,7 +20,7 @@ fi
 
 
 cd $PR/c_micasacache
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\"  XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\"  XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-micasadk-ol b/shsrc/lshsrc/mk-micasadk-ol
index 435518bf..5b3b5a45 100644
--- a/shsrc/lshsrc/mk-micasadk-ol
+++ b/shsrc/lshsrc/mk-micasadk-ol
@@ -23,7 +23,7 @@ cd $PR/c_common
 COMMON_FILES=$(ls)
 (ln -f $COMMON_FILES $PR/c_micasadk)
 cd $PR/c_micasadk
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)
diff --git a/shsrc/lshsrc/mk-pamauthtoken-ol b/shsrc/lshsrc/mk-pamauthtoken-ol
index 0bc04ca4..d60f611f 100755
--- a/shsrc/lshsrc/mk-pamauthtoken-ol
+++ b/shsrc/lshsrc/mk-pamauthtoken-ol
@@ -20,7 +20,7 @@ fi
 
 
 cd $PR/auth_token/PAM
-(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
+(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -fstack-protector -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)