[packages/bird] Up to 3.3.2

[arekm]

commit 57069b3c83bb1fa758e5742870751e4d5a9f4e6f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 23 14:31:08 2026 +0200

    Up to 3.3.2

 bird-krt-gr-export-fix.patch | 32 --------------------------------
 bird.spec                    | 15 ++++++++-------
 2 files changed, 8 insertions(+), 39 deletions(-)
---
diff --git a/bird.spec b/bird.spec
index b9f4d78..7197d6b 100644
--- a/bird.spec
+++ b/bird.spec
@@ -5,21 +5,19 @@
 Summary:	The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
-Version:	3.2.0
-Release:	3
+Version:	3.3.2
+Release:	1
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	https://bird.nic.cz/download/%{name}-%{version}.tar.gz
-# Source0-md5:	96c1da55667ca6c08b4d41ecfb871efc
+# Source0-md5:	a9ca0d29e9531c0add78e7b3e5d41b3a
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	https://bird.nic.cz/download/%{name}-doc-%{version}.tar.gz
-# Source3-md5:	77fd807bdd8ff4369fe7653b5b6a7137
+# Source3-md5:	f40f463087208ca753276444c126e9b0
 Source4:	%{name}.service
 Source5:	%{name}.tmpfiles
 Patch0:		%{name}-xbasename-const.patch
-# check on releases > 3.2.- how this got fixed
-Patch1:		%{name}-krt-gr-export-fix.patch
 URL:		https://bird.nic.cz/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -31,7 +29,11 @@ BuildRequires:	readline-devel >= 6.0
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
+Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Provides:	bird-daemon
 Provides:	group(bird)
@@ -58,7 +60,6 @@ filtrów o dużych możliwościach.
 %prep
 %setup -q -a 3
 %patch -P0 -p1
-%patch -P1 -p1
 
 %build
 cp -f /usr/share/automake/config.* tools
diff --git a/bird-krt-gr-export-fix.patch b/bird-krt-gr-export-fix.patch
deleted file mode 100644
index 5d35f67..0000000
--- a/bird-krt-gr-export-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Kernel: skip export start in krt_init_scan() when gr_wait is set
-
-When graceful restart recovery is active (-R), krt_start() sets gr_wait=1
-on the kernel channel to defer export until recovery completes (via
-graceful_recovery_done()). However, krt_init_scan() unconditionally calls
-channel_start_export() when transitioning from KPS_INIT, without checking
-gr_wait. When graceful_recovery_done() later runs, it finds gr_wait=1 and
-tries to start the export again, triggering:
-
-  bug("%s.%s: Attempted to start channel's already started export")
-
-Reported on bird-users by Christoph (Jan 2026) for BIRD 3.1.5.
-Still present in 3.2.0 despite bda2178e ("Kernel: pause exports also
-on restart until scan is done") which set rt_notify=NULL in krt_start()
-but didn't address the krt_init_scan() path.
-
-Skip channel_start_export() in krt_init_scan() when gr_wait is set,
-letting graceful_recovery_done() handle it instead.
-
---- a/sysdep/unix/krt.c
-+++ b/sysdep/unix/krt.c
-@@ -449,7 +449,9 @@ krt_init_scan(struct krt_proto *p)
-     case KPS_INIT:
-       /* Allow exports now */
-       p->p.rt_notify = krt_rt_notify;
--      channel_start_export(p->p.main_channel);
-+      /* When gr_wait is set, graceful_recovery_done() will start the export */
-+      if (!p->p.main_channel->gr_wait)
-+	channel_start_export(p->p.main_channel);
-       rt_refresh_begin(&p->p.main_channel->in_req);
-       p->sync_state = KPS_FIRST_SCAN;
-       return 1;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bird.git/commitdiff/57069b3c83bb1fa758e5742870751e4d5a9f4e6f