diff --git a/.gitignore b/.gitignore index 6736c6b..e1cc335 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -udpcast-20071228.tar.bz2 -/udpcast-20120424.tar.gz -results_udpcast -udpcast-*.src.rpm +/udpcast-*.tar.gz diff --git a/sources b/sources index 3c37a33..d527a26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9b67a577ca5659a93bcb9e43f298fb2 udpcast-20120424.tar.gz +SHA512 (udpcast-20250223.tar.gz) = 7b5cfee630ec44d3598cb37a08a3b1c5a757d30c8e7703c89c87fb23bd9095391ee9922d78ec77dde9a3968e1384fbf7d0ecb864eb7b4b65903ddfaa6b400537 diff --git a/udpcast-20120424-buildflags.patch b/udpcast-20120424-buildflags.patch deleted file mode 100644 index 017159f..0000000 --- a/udpcast-20120424-buildflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up udpcast-20120424/Makefile.in~ udpcast-20120424/Makefile.in ---- udpcast-20120424/Makefile.in~ 2008-11-16 19:36:25.000000000 +0200 -+++ udpcast-20120424/Makefile.in 2013-02-22 17:31:35.148709718 +0200 -@@ -30,8 +30,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - - # For additional warnings & checks, add -Wstrict-prototypes -Wshadow to the - # following: --CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG -DUSE_ASSEMBLER -O6 --LDFLAGS +=-s -+CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -D_FILE_OFFSET_BITS=64 -DUSE_SYSLOG -DUSE_ASSEMBLER - LIBS +=@LIBS@ - - BUSYBOX=../udp-busybox/busybox diff --git a/udpcast-20120424-fd_set.patch b/udpcast-20120424-fd_set.patch deleted file mode 100644 index 6701b84..0000000 --- a/udpcast-20120424-fd_set.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur udpcast-20120424.old/console.h udpcast-20120424/console.h ---- udpcast-20120424.old/console.h 2005-12-22 22:59:18.000000000 +0000 -+++ udpcast-20120424/console.h 2013-02-20 12:52:52.267583033 +0000 -@@ -4,7 +4,9 @@ - #ifdef __MINGW32__ - #include - #include --#endif /* __MINGW32__ */ -+#else /* !__MINGW32__ */ -+#include -+#endif /* !__MINGW32__ */ - - #define prepareConsole udpc_prepareConsole - #define getConsoleFd udpc_getConsoleFd diff --git a/udpcast-20200328-read-warn.patch b/udpcast-20200328-read-warn.patch new file mode 100644 index 0000000..0fa147e --- /dev/null +++ b/udpcast-20200328-read-warn.patch @@ -0,0 +1,14 @@ +diff -druN udpcast-20200328.old/console.c udpcast-20200328/console.c +--- udpcast-20200328.old/console.c 2020-04-05 15:25:54.000000000 +0300 ++++ udpcast-20200328/console.c 2021-11-24 12:53:51.944291221 +0200 +@@ -86,7 +86,9 @@ + + /* If key pressed, consume it. If letter is q, quit */ + if(doConsume) { +- read(c->fd, &ch, 1); ++ if (1 != read(c->fd, &ch, 1)) { ++ ch='\0'; ++ } + } + + if(c->needRestore && tcsetattr(c->fd, TCSAFLUSH, &c->oldtio) < 0) { diff --git a/udpcast.spec b/udpcast.spec index 72d5981..f9d4007 100644 --- a/udpcast.spec +++ b/udpcast.spec @@ -1,19 +1,19 @@ -Name: udpcast -Summary: UDP broadcast file distribution and installation -Version: 20120424 -Release: 18%{?dist} -License: GPLv2+ and BSD -URL: http://udpcast.linux.lu/ -Source: http://udpcast.linux.lu/download/%{name}-%{version}.tar.gz -Patch0: udpcast-20120424-buildflags.patch +Name: udpcast +Summary: UDP broadcast file distribution and installation +Version: 20250223 +Release: 1%{?dist} +License: GPL-2.0-or-later AND BSD-2-Clause-first-lines AND MPL-1.1 +URL: http://udpcast.linux.lu/ +Source: https://www.udpcast.linux.lu/download/%{name}-%{version}.tar.gz -BuildRequires: gcc -BuildRequires: m4 -BuildRequires: perl-interpreter -BuildRequires: /usr/bin/pod2man +# Fix console.c:89:7: warning: ignoring return value of 'read' +Patch1: udpcast-20200328-read-warn.patch -# Fix for build failure on Fedora Rawhide, sent upstream 2013-02-20. -Patch1: udpcast-20120424-fd_set.patch +BuildRequires: make +BuildRequires: gcc +BuildRequires: m4 +BuildRequires: perl-interpreter +BuildRequires: /usr/bin/pod2man %description @@ -32,19 +32,17 @@ application for multicasting data to multiple targets. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup %build %configure -make %{?_smp_mflags} +%make_build %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install %files @@ -61,6 +59,70 @@ make DESTDIR=$RPM_BUILD_ROOT install %changelog +* Sun Jul 26 2026 Artur Frenszek-Iwicki - 20250223-1 +- Update to v20250223 +- Drop Patch2 (sbindir fix - merged upstream) + +* Fri Jul 17 2026 Fedora Release Engineering - 20211207-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 20211207-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 20211207-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Feb 06 2025 Richard W.M. Jones - 20211207-11 +- Bump and rebuild (RHBZ#2341475) + +* Tue Feb 04 2025 Lukáš Zapletal - 20211207-10 +- Updated licenses +- Fedora sbin–>bin patch + +* Sun Jan 19 2025 Fedora Release Engineering - 20211207-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 20211207-8 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 20211207-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 20211207-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 20211207-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 20211207-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 20211207-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 20211207-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Dec 11 2021 Richard W.M. Jones - 20211207-1 +- New upstream version 2021/12/07 + +* Wed Nov 24 2021 Doncho Gunchev - 20200328-0 +- New upstream version 20200328. +- Port/update the patches +- Use new macros like %%autosetup + +* Fri Jul 23 2021 Fedora Release Engineering - 20120424-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 20120424-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 20120424-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 20120424-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 20120424-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -100,7 +162,7 @@ make DESTDIR=$RPM_BUILD_ROOT install * Sun Aug 04 2013 Fedora Release Engineering - 20120424-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Fri Feb 22 2013 Ville Skyttä - 20120424-5 +* Fri Feb 22 2013 Ville Skytta - 20120424-5 - Sanitize CFLAGS and LDFLAGS (#914704). - Move %%configure to %%build section, build with %%{_smp_mflags}. - Fix bogus date in %%changelog. @@ -126,7 +188,7 @@ make DESTDIR=$RPM_BUILD_ROOT install * Mon Feb 07 2011 Fedora Release Engineering - 20071228-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Tue Aug 11 2009 Ville Skyttä - 20071228-7 +* Tue Aug 11 2009 Ville Skytta - 20071228-7 - Use bzipped upstream tarball. * Sun Jul 26 2009 Fedora Release Engineering - 20071228-6