Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Since RPM 4.20, %prep is no longer implemented as a special "hack" [1]
but is now a regular build scriptlet, meaning that %setup or %patch are
now treated as regular macros and thus will be expanded even in comments
(as documented in [2]).

Our spec has these so fix them up to unbreak the build on F41.

[1] https://github.com/rpm-software-management/rpm/issues/2205
[2] https://rpm-software-management.github.io/rpm/manual/spec.html

dietlibc-c99.patch

@@ -0,0 +1,33 @@
+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,6 +2,9 @@
 ## --with[out] ssp  ...  enable/disable SSP; default depends
 ##                       on target architecture
 
+# Disabled per upstream to fix FTBFS.
+%undefine _hardened_build
+
 #%%global prerelease	20170317
 #%%global githubref	c3f1cf67fcc186bb859e64a085bf98aaa6182a82
 %global pkglibdir	%{_prefix}/lib/dietlibc
@@ -24,8 +27,8 @@
 Summary:	Small libc implementation
 Name:		dietlibc
 Version:	0.34
-Release:	6%{?dist}
+Release:	20%{?dist}
-License:	GPLv2
+License:	GPL-2.0-only
 URL:		http://www.fefe.de/dietlibc/
 %if !0%{?prerelease:1}
 Source0:	https://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz
@@ -37,12 +40,14 @@ Source0:	%{name}-%{version}.%prerelease.tar.xz
 ## CVS..master diff from https://github.com/ensc/dietlibc
 #Patch0:	dietlibc-github-%%githubref.patch.gz
 Patch1:         dietlibc-insecure-defpath.patch
+Patch2:         dietlibc-c99.patch
 #Requires:	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
@@ -78,10 +83,11 @@ This package contains the dynamic libraries for dietlibc.
 
 %prep
 %setup -q %{?prerelease:-n %{name}-%{version}.%prerelease}
-#%setup -qn dietlibc
+%dnl %setup -qn dietlibc
 
-#%apply -n0 -p1
+%dnl %apply -n0 -p1
-%patch1 -p0
+%patch -P 1 -p0
+%patch -P 2 -p1
 
 %if %{without ssp}
 sed -i -e 's!^#define WANT_SSP$!// \0!g;
@@ -103,7 +109,7 @@ 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
+%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 basemakeflags	prefix=%pkglibdir BINDIR=%{_bindir} MAN1DIR=%{_mandir}/man1 CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir STRIP=:
 %global makeflags	%basemakeflags
 
@@ -152,6 +158,48 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512
 %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