diff --git a/dietlibc-c99.patch b/dietlibc-c99.patch deleted file mode 100644 index 218c679..0000000 --- a/dietlibc-c99.patch +++ /dev/null @@ -1,33 +0,0 @@ -Changes to avoid implicit function declarations: -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 - #include -+#include - - 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 - #include - #include -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 - #include - #include diff --git a/dietlibc.spec b/dietlibc.spec index 37aa2d9..32be1a9 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -2,9 +2,6 @@ ## --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 @@ -27,8 +24,8 @@ Summary: Small libc implementation Name: dietlibc Version: 0.34 -Release: 20%{?dist} -License: GPL-2.0-only +Release: 6%{?dist} +License: GPLv2 URL: http://www.fefe.de/dietlibc/ %if !0%{?prerelease:1} Source0: https://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz @@ -40,14 +37,12 @@ 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 @@ -83,11 +78,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 -%patch -P 1 -p0 -%patch -P 2 -p1 +#%apply -n0 -p1 +%patch1 -p0 %if %{without ssp} sed -i -e 's!^#define WANT_SSP$!// \0!g; @@ -109,7 +103,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 -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 @@ -158,48 +152,6 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512 %pkglibdir %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 0.34-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.34-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 0.34-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 0.34-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.34-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Aug 24 2023 Gwyn Ciesla - 0.34-15 -- Fix FTBFS - -* Wed Jul 19 2023 Fedora Release Engineering - 0.34-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Mar 07 2023 Gwyn Ciesla - 0.34-13 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 0.34-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Dec 23 2022 Florian Weimer - 0.34-11 -- C99 compatibility fixes (#2156074) - -* Thu Jul 21 2022 Fedora Release Engineering - 0.34-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.34-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.34-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.34-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Mon Jul 27 2020 Fedora Release Engineering - 0.34-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild