rpms/dietlibc/devel dietlibc-0.29-nostackprotector.patch, NONE, 1.1 dietlibc.spec, 1.16, 1.17

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22568

Modified Files:
	dietlibc.spec 
Added Files:
	dietlibc-0.29-nostackprotector.patch 
Log Message:
remove '-fstack-protector' from CLI because it uses __stack_chk_fail
which is not provided by dietlibc


dietlibc-0.29-nostackprotector.patch:

--- NEW FILE dietlibc-0.29-nostackprotector.patch ---
--- dietlibc-0.29/diet.c.nostackprotector	2005-05-18 16:38:55.000000000 +0200
+++ dietlibc-0.29/diet.c	2005-10-30 12:27:06.000000000 +0100
@@ -319,6 +319,8 @@
 	    if (strcmp(argv[i],"-fpic") && strcmp(argv[i],"-fno-pic"))
 	      continue;
 	  }
+	if (strcmp(argv[i],"-fstack-protector")==0)
+	  continue;
 	*dest++=argv[i];
       }
 #ifndef __DYN_LIB


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dietlibc.spec	26 May 2005 05:19:25 -0000	1.16
+++ dietlibc.spec	30 Oct 2005 14:15:03 -0000	1.17
@@ -36,7 +36,7 @@
 Summary:	Small libc implementation
 Name:		%{?_with_cross:cross-%crossarch-}%NAME
 Version:	0.29
-Release:	%release_func 2
+Release:	%release_func 3
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -44,6 +44,7 @@
 Source1:	http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
 Patch1:		dietlibc-0.28-setpriority.patch
 Patch10:	dietlibc-0.29-scall.patch
+Patch20:	dietlibc-0.29-nostackprotector.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
 
@@ -75,6 +76,7 @@
 %setup -q -n %NAME-%version
 %patch1  -p1 -b .nice
 %patch10 -p1 -b .scall
+%patch20 -p1 -b .nostackprotector
 
 %global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS %fixcflags"}
@@ -134,6 +136,10 @@
 %endif
 
 %changelog
+* Sun Oct 30 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-3
+- remove '-fstack-protector' from CLI because it uses __stack_chk_fail
+  which is not provided by dietlibc
+
 * Thu May 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-2
 - rebuilt