.gitignore

@@ -5,5 +5,3 @@
 /dietlibc.tar.gz
 /dietlibc-0.33.20170317.tar.xz
 /dietlibc-0.34.20170317.tar.xz
-/dietlibc-0.34.tar.xz
-/dietlibc-0.34.tar.xz.sig

dietlibc-c99.patch

@@ -1,33 +0,0 @@
-Changes to avoid implicit function declarations: <arpa/inet.h>
-provides a declaration of noths.  -D_BSD_SOURCE enables declarations
-of random, srandom.
-
-diff -ur dietlibc-0.34.orig/test/getservbyname.c dietlibc-0.34/test/getservbyname.c
---- dietlibc-0.34.orig/test/getservbyname.c	2003-12-15 14:07:42.000000000 +0100
-+++ dietlibc-0.34/test/getservbyname.c	2022-12-23 18:17:26.645479365 +0100
-@@ -1,5 +1,6 @@
- #include <stdio.h>
- #include <netdb.h>
-+#include <arpa/inet.h>
- 
- int main(int argc,char *argv[]) {
-   struct servent* se;
-diff -ur dietlibc-0.34.orig/test/stdlib/testsort.c dietlibc-0.34/test/stdlib/testsort.c
---- dietlibc-0.34.orig/test/stdlib/testsort.c	2003-12-15 14:07:42.000000000 +0100
-+++ dietlibc-0.34/test/stdlib/testsort.c	2022-12-23 18:16:33.758018509 +0100
-@@ -1,3 +1,4 @@
-+#define _BSD_SOURCE
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-diff -ur dietlibc-0.34.orig/test/stdlib/tst-calloc.c dietlibc-0.34/test/stdlib/tst-calloc.c
---- dietlibc-0.34.orig/test/stdlib/tst-calloc.c	2003-12-15 14:07:42.000000000 +0100
-+++ dietlibc-0.34/test/stdlib/tst-calloc.c	2022-12-23 18:16:49.272860349 +0100
-@@ -17,6 +17,7 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#define _BSD_SOURCE
- #include <errno.h>
- #include <limits.h>
- #include <malloc.h>

dietlibc.spec

@@ -2,11 +2,8 @@
 ## --with[out] ssp  ...  enable/disable SSP; default depends
 ##                       on target architecture
 
-# Disabled per upstream to fix FTBFS.
+%global prerelease	20170317
-%undefine _hardened_build
+#%global githubref	c3f1cf67fcc186bb859e64a085bf98aaa6182a82
-
-#%%global prerelease	20170317
-#%%global githubref	c3f1cf67fcc186bb859e64a085bf98aaa6182a82
 %global pkglibdir	%{_prefix}/lib/dietlibc
 
 %ifarch %ix86 x86_64
@@ -27,30 +24,30 @@
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.34
-Release:	20%{?dist}
+Release:	0.3.%prerelease%{?dist}
-License:	GPL-2.0-only
+License:	GPLv2
+Group:		Development/Libraries
 URL:		http://www.fefe.de/dietlibc/
 %if !0%{?prerelease:1}
-Source0:	https://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz
+Source0:	http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
-Source1:	http://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz.sig
+Source1:	http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2.sig
 %else
 # generated by 'make cvs-sources [CVS_DATE=....]'
 Source0:	%{name}-%{version}.%prerelease.tar.xz
 %endif
 ## CVS..master diff from https://github.com/ensc/dietlibc
-#Patch0:	dietlibc-github-%%githubref.patch.gz
+#Patch0:	dietlibc-github-%githubref.patch.gz
 Patch1:         dietlibc-insecure-defpath.patch
-Patch2:         dietlibc-c99.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-#Requires:	dietlibc-lib = %%{version}-%%{release}}
+#Requires:	dietlibc-lib = %{version}-%{release}}
-Obsoletes:	dietlibc-lib < %{version}-%{release}
+Obsoletes:	dietlibc-lib < %{version}-%{release}}
 
 Requires:	%{name}-devel = %{version}-%{release}
-BuildRequires:  gcc
 BuildRequires:	gdb
-BuildRequires: make
 
 %package devel
 Summary:	dietlibc development files
+Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	%{name}-header < %{version}-%{release}
 Provides:	%{name}-header = %{version}-%{release}
@@ -59,6 +56,7 @@ Provides:	%{name}-static%{?_isa} = %{version}-%{release}
 
 %package lib
 Summary:	Dynamic libraries for dietlibc
+Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description
@@ -83,11 +81,10 @@ This package contains the dynamic libraries for dietlibc.
 
 %prep
 %setup -q %{?prerelease:-n %{name}-%{version}.%prerelease}
-%dnl %setup -qn dietlibc
+#%setup -qn dietlibc
 
-%dnl %apply -n0 -p1
+#%apply -n0 -p1
-%patch -P 1 -p0
+%patch1 -p0
-%patch -P 2 -p1
 
 %if %{without ssp}
 sed -i -e 's!^#define WANT_SSP$!// \0!g;
@@ -109,24 +106,21 @@ sed -i \
 	dietfeatures.h
 %endif
 
-%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3 -Werror-implicit-function-declaration -Wno-unused -Wno-switch -std=gnu17
+%global fixcflags	-fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3 -Werror-implicit-function-declaration -Wno-unused -Wno-switch
 %global basemakeflags	prefix=%pkglibdir BINDIR=%{_bindir} MAN1DIR=%{_mandir}/man1 CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir STRIP=:
 %global makeflags	%basemakeflags
 
 
 %build
-# This package strips .o files as they are created which removes the LTO
-# sections.  It's likely this would work if those strip commands were
-# changed to leave the LTO sections alone.  For now, disable LTO
-%define _lto_cflags %{nil}
-
 make %makeflags all %{?_smp_mflags}
 
 # 'dyn' target is not SMP safe
-#make %%makeflags dyn
+#make %makeflags dyn
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 install -d -m755 $RPM_BUILD_ROOT/etc
 make %makeflags DESTDIR=$RPM_BUILD_ROOT install
 
@@ -147,7 +141,11 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512
 #bash ./runtests-X.sh
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
+%defattr(-,root,root,-)
 %doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README*
 %doc SECURITY THANKS TODO
 %doc %{_mandir}/*/*
@@ -155,78 +153,10 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512
 
 
 %files devel
+%defattr(-,root,root,-)
 %pkglibdir
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Aug 24 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.34-15
-- Fix FTBFS
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Mar 07 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.34-13
-- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec 23 2022 Florian Weimer <fweimer@redhat.com> - 0.34-11
-- C99 compatibility fixes (#2156074)
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 13 2020 Jeff Law <law@redhat.com> - 0.34-5
-- Disable LTO
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Sep 25 2018 Gwyn Ciesla <limburgher@gmail.com> - 0.34-1
-- 0.34
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-0.6.20170317
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.34-0.5.20170317
-- Escape macros in %%changelog
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-0.4.20170317
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.34-0.3.20170317
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
@@ -411,7 +341,7 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512
 
 * Wed Feb 13 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.31-1.20080212
 - updated to CVS snapshot 20080212
-- fixed printf regression for '%%+04i' style formats
+- fixed printf regression for '%+04i' style formats
 - added %%check and run a testsuite; it does not succeed now so it is
   for informational purposes only...
 - added bunch of patches to fixes big-endian issues in string routines

sources

@@ -1,2 +1 @@
-SHA512 (dietlibc-0.34.tar.xz) = 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
+SHA512 (dietlibc-0.34.20170317.tar.xz) = 082962cdc4fe8812dcd30eaddabd705953da5b9e144f58251f32e763d15fe814328f2b87a9c0afe932c795c558d41b8db09ea53aaed80ebe7f2a3dceda4c4820
-SHA512 (dietlibc-0.34.tar.xz.sig) = 0428f1a7430b335f527ceb0fb347d50846c25aff38e32ca961f07ca3fc7dc4ca657c09c0797c7bb38b5c126a21e3d6a96f76e6d511e5121bd500276a9ded2a4c