4 changed files with 10 additions and 161 deletions
--- a/SOURCES/radvd-c99-1.patch
+++ b/SOURCES/radvd-c99-1.patch
@ -1,31 +0,0 @@
-commit ff7ab0cf445236f30e58531175ba912614fed952
-Author: Sam James <sam@gentoo.org>
-Date:   Thu Nov 17 22:03:25 2022 +0000
-
-    Makefile.am: drop -Wno-implicit-function-declaration
-    
-    1. Clang 16 makes -Wimplicit-function-declaration error by default
-       (and it's planned that GCC 14 will do the same) so we need to fix
-       the real problem. This is papering over it.
-    
-    2. It's not true that there's nothing we can do about it. Fix in a follow-up
-       commit.
-    
-    Bug: https://bugs.gentoo.org/880823
-    Fixes: b5e6b09cf914a960ac3b1676b77d3ea9f91821c7
-    Signed-off-by: Sam James <sam@gentoo.org>
-
-diff --git a/Makefile.am b/Makefile.am
-index 3a52e3a4abab088b..88b0c3514d265524 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,9 +66,6 @@ radvd_LDADD = \
- scanner.c: gram.h
- gram.h: gram.c
- 
-libradvd_parser_a_CFLAGS = \
-	-Wno-implicit-function-declaration
-
- libradvd_parser_a_SOURCES = \
- 	gram.h \
- 	gram.y \
--- a/SOURCES/radvd-c99-2.patch
+++ b/SOURCES/radvd-c99-2.patch
@ -1,34 +0,0 @@
-commit e0f5bcd9091a5f7abd423fce9f372c8079849a64
-Author: Sam James <sam@gentoo.org>
-Date:   Thu Nov 17 22:03:25 2022 +0000
-
-    gram.y: Fix -Wimplicit-function-declaration
-    
-    Clang 16 makes -Wimplicit-function-declaration an error by default.
-    
-    For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
-    or the (new) c-std-porting mailing list [3].
-    
-    [0] https://lwn.net/Articles/913505/
-    [1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
-    [2] https://wiki.gentoo.org/wiki/Modern_C_porting
-    [3] hosted at lists.linux.dev.
-    
-    Bug: https://bugs.gentoo.org/880823
-    Signed-off-by: Sam James <sam@gentoo.org>
-
-diff --git a/gram.y b/gram.y
-index 4115390c249ab62b..2b142125e9dd05ae 100644
--- a/gram.y
-+++ b/gram.y
-@@ -20,6 +20,10 @@
- 
- #define YYERROR_VERBOSE 1
- 
-+int yylex (void);
-+void yyset_in (FILE * _in_str);
-+int yylex_destroy (void);
-+
- #if 0 /* no longer necessary? */
- #ifndef HAVE_IN6_ADDR_S6_ADDR
- # ifdef __FreeBSD__
--- a/SOURCES/radvd-configure-c99.patch
+++ b/SOURCES/radvd-configure-c99.patch
@ -1,47 +0,0 @@
-commit 5acb1c64766dfaf37c9745632f99feecf11d1403
-Author: Sam James <sam@gentoo.org>
-Date:   Fri Feb 3 02:33:13 2023 +0000
-
-    configure.ac: Fix -Wint-conversion warnings
-    
-    These become fatal with Clang 15 and may lead to incorrect configure
-    test results.
-    
-    ```
-    -ignoreme: warning: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion]
-    +ignoreme: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion]
-     int u =  in6_u.s6_addr16;
-         ^    ~~~~~~~~~~~~~~~
-    ```
-    
-    Signed-off-by: Sam James <sam@gentoo.org>
-
-diff --git a/configure.ac b/configure.ac
-index 23c21e7b4abedca1..a3976b605fa096e9 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -174,15 +174,19 @@ AC_HEADER_TIME
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_MSG_CHECKING(whether struct sockaddr_in6 has sin6_scope_id)
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <netinet/in.h>], [static struct sockaddr_in6 ac_sin6; int ac_size = 
-sizeof (ac_sin6.sin6_scope_id);], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID],
-+AC_TRY_COMPILE([#include <stdint.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>], [
-+static struct sockaddr_in6 ac_sin6;
-+uint32_t ac_size = sizeof (ac_sin6.sin6_scope_id);
-+], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID],
- 1, [whether struct sockaddr_in6 has sin6_scope_id])],
- AC_MSG_RESULT(no))
- 
- AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX)
-AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; 
-int u =  in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR],
-+AC_TRY_COMPILE([#include <stdint.h>
-+#include <netinet/in.h>], [static struct in6_addr in6_u;
-+uint16_t u =  in6_u.s6_addr16[0];], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR],
- 1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])],
- AC_MSG_RESULT(no))
- 
--- a/SPECS/radvd.spec
+++ b/SPECS/radvd.spec
@ -1,15 +1,13 @@
 Summary: A Router Advertisement daemon
 Name: radvd
 Version: 2.19
-Release: 15%{?dist}
+Release: 5%{?dist}

-License: radvd
+# The code includes the advertising clause, so it's GPL-incompatible
+License: BSD with advertising
 URL: http://www.litech.org/radvd/
 Source0: %{url}dist/%{name}-%{version}.tar.xz
 Source1: radvd.sysusers
-Patch0: radvd-c99-1.patch
-Patch1: radvd-c99-2.patch
-Patch2: radvd-configure-c99.patch

 BuildRequires: make
 BuildRequires: gcc
@ -22,8 +20,6 @@ BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
 %{?systemd_requires}
 %{?sysusers_requires_compat}
-BuildRequires: autoconf
-BuildRequires: automake

 %description
 radvd is the router advertisement daemon for IPv6.  It listens to router
@ -46,7 +42,6 @@ for F in CHANGES; do
 done

 %build
-autoreconf -iv
 export CFLAGS="$RPM_OPT_FLAGS -fPIE " 
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen'
 %configure \
@ -99,49 +94,15 @@ make check
 %{_sbindir}/radvdump

 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.19-15
- Rebuilt for MSVSphere 10
+* Thu Nov 03 2022 Martin Osvald <mosvald@redhat.com> - 2.19-5
+- Use systemd-sysusers for radvd user and group (#2095457)

-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.19-15
- Bump release for June 2024 mass rebuild
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.19-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Mon May 27 2024 Martin Osvald <mosvald@redhat.com> - 2.19-14
- Migrate to SPDX license (RHEL-35724)
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Nov 27 2023 Florian Weimer <fweimer@redhat.com> - 2.19-11
- Backport upstream patch to fix another C99 issue in configure
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Dec 22 2022 Florian Weimer <fweimer@redhat.com> - 2.19-8
- Apply upstream patches to fix C99 compatibility issue
- Run autoconf/automake during the build
-
-* Thu Nov 03 2022 Martin Osvald <mosvald@redhat.com> - 2.19-7
- Use systemd-sysusers for radvd user and group (rhbz#2139755)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.19-3
- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.19-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild