rpms/dietlibc/F-7 sources,1.6,1.7 dietlibc.spec,1.27,1.28

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/dietlibc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30228/F-7

Modified Files:
	sources dietlibc.spec 
Log Message:
- updated to 0.31
- removed the no-stack-protector bits for i386 and x86_64 archs
- improved stack-smash code a little bit
- disabled dynamic lib for all arches
- made objects non-executable to avoid "No build ID note" errors



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jul 2006 14:18:32 -0000	1.6
+++ sources	1 Sep 2007 13:37:11 -0000	1.7
@@ -1,2 +1,2 @@
-2465d652fff6f1fad3da3b98e60e83c9  dietlibc-0.30.tar.bz2
-698d7624167aad89acfef504da0161ad  dietlibc-0.30.tar.bz2.sig
+acb98d469ee932d902fdf6de07802b7c  dietlibc-0.31.tar.bz2
+77dadb56faa06c1a5177d76806e79b28  dietlibc-0.31.tar.bz2.sig


Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/F-7/dietlibc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dietlibc.spec	17 Jan 2007 01:02:35 -0000	1.27
+++ dietlibc.spec	1 Sep 2007 13:37:11 -0000	1.28
@@ -6,7 +6,7 @@
 ##
 
 %ifarch %ix86 x86_64 arm
-%global do_dyn		1
+%global do_dyn		0
 %else
 %global do_dyn 		0
 %endif
@@ -26,8 +26,8 @@
 
 Summary:	Small libc implementation
 Name:		dietlibc
-Version:	0.30
-Release:	%release_func 4
+Version:	0.31
+Release:	%release_func 1
 License:	GPL
 Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
@@ -37,14 +37,19 @@
 Patch10:	dietlibc-0.29-scall.patch
 Patch20:	dietlibc-0.29-nostackprotector.patch
 Patch30:	dietlibc-0.30-longdouble.patch
+Patch31:	dietlibc-0.31-defpath.patch
+Patch32:	dietlibc-0.31-stacksmash.patch
+Patch33:	dietlibc-0.31-stacksmash-dyn.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 %{?with_dyn:Requires:	dietlibc-lib = %version-%release}
-
+%{!?with_dyn:Obsoletes:	dietlibc-lib < %version-%release}
 
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
 Group:		System Environment/Libraries
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
 
 %description
 The diet libc is a libc that is optimized for small size. It can be
@@ -64,14 +69,23 @@
 %setup -q
 %patch1  -p1 -b .nice
 %patch10 -p1 -b .scall
-%patch20 -p1 -b .nostackprotector
 %patch30 -p1 -b .longdouble
+%patch31 -p1 -b .defpath
+%patch32 -p1 -b .stacksmash
+%patch33 -p1 -b .stacksmash-dyn
 
-sed -i -e 's!strip !: !g' Makefile
+%ifnarch i386 x86_64
+%patch20 -p1 -b .nostackprotector
 sed -i -e 's!^#define WANT_SSP$!// \0!g;
-           s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+	   s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+%global xtra_fixcflags	-fno-stack-protector
+%else
+%global xtra_fixcflags	%nil
+%endif
+
+sed -i -e 's!strip !: !g' Makefile
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -Os
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os
 %global basemakeflags	prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
 %global makeflags	%basemakeflags
 
@@ -91,6 +105,8 @@
 
 ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
 
+chmod a-x $RPM_BUILD_ROOT%_libdir/dietlibc/lib-*/*.o
+rm -f $RPM_BUILD_ROOT%_bindir/dnsd
 
 
 %clean
@@ -116,6 +132,13 @@
 
 
 %changelog
+* Sat Sep  1 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.31-1
+- updated to 0.31
+- removed the no-stack-protector bits for i386 and x86_64 archs
+- improved stack-smash code a little bit
+- disabled dynamic lib for all arches
+- made objects non-executable to avoid "No build ID note" errors
+
 * Wed Jan 17 2007 David Woodhouse <dwmw2 at infradead.org> 0.30-4
 - Bump release to be higher than unexplained 0.30-3.fc6