Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/radvd.git#c93d611f5b3fca0257207cab616c1398cb6533fb
This commit is contained in:
DistroBaker 2020-10-27 22:05:47 +01:00 committed by Petr Šabata
parent 7d3f76539d
commit 95cde75a5f
5 changed files with 7 additions and 46 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ radvd-1.6.tar.gz
/radvd-2.16.tar.xz /radvd-2.16.tar.xz
/radvd-2.17.tar.xz /radvd-2.17.tar.xz
/radvd-2.18.tar.xz /radvd-2.18.tar.xz
/radvd-2.19.tar.xz

View File

@ -1,23 +0,0 @@
From efdef4ee9150dd1a24f5cb292491e0a22035411c Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Fri, 3 Apr 2020 11:36:54 +0200
Subject: [PATCH] Update PidFile path to avoid system warnings
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1785862
---
redhat/systemd/radvd.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/systemd/radvd.service b/redhat/systemd/radvd.service
index b6007c1..03a0cf7 100644
--- a/redhat/systemd/radvd.service
+++ b/redhat/systemd/radvd.service
@@ -7,7 +7,7 @@ Wants=network-online.target
EnvironmentFile=/etc/sysconfig/radvd
ExecStart=/usr/sbin/radvd $OPTIONS
Type=forking
-PIDFile=/var/run/radvd/radvd.pid
+PIDFile=/run/radvd/radvd.pid
ExecReload=/bin/kill -HUP $MAINPID
[Install]

View File

@ -1,18 +0,0 @@
From 30198b37dd9d8cb3b15c90663145d06e2531d87f Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pzhukov@redhat.com>
Date: Tue, 26 Feb 2019 14:37:16 +0100
Subject: [PATCH] packaging: Change location of tmpfiles to /run to avoid
warnings
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1678147
---
redhat/systemd/radvd-tmpfs.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/systemd/radvd-tmpfs.conf b/redhat/systemd/radvd-tmpfs.conf
index 590652c..26f203d 100644
--- a/redhat/systemd/radvd-tmpfs.conf
+++ b/redhat/systemd/radvd-tmpfs.conf
@@ -1 +1 @@
-d /var/run/radvd 0755 radvd radvd
+d /run/radvd 0755 radvd radvd

View File

@ -1,14 +1,12 @@
Summary: A Router Advertisement daemon Summary: A Router Advertisement daemon
Name: radvd Name: radvd
Version: 2.18 Version: 2.19
Release: 6%{?dist} Release: 1%{?dist}
# The code includes the advertising clause, so it's GPL-incompatible # The code includes the advertising clause, so it's GPL-incompatible
License: BSD with advertising License: BSD with advertising
URL: http://www.litech.org/radvd/ URL: http://www.litech.org/radvd/
Source0: %{url}dist/%{name}-%{version}.tar.xz Source0: %{url}dist/%{name}-%{version}.tar.xz
Patch1: radvd-pidfile.patch
Patch2: radvd-tmpfiles.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: bison BuildRequires: bison
@ -95,6 +93,9 @@ exit 0
%{_sbindir}/radvdump %{_sbindir}/radvdump
%changelog %changelog
* Mon Oct 19 2020 Pavel Zhukov <pzhukov@redhat.com> - 2.19-1
- new version v2.19
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-6 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (radvd-2.18.tar.xz) = f45a600d63a93fc58cc3d1c33545ed641337a82281dbeca2f98a9fee224d38e7c547c1624e02682df007e0215b39b5756f60093bae9264d54e4b388f89b6d108 SHA512 (radvd-2.19.tar.xz) = a1eb40af90fc83ebab2517c16a0f7e85c11338ab276bec400b7c33177748d1e36bc5abd7e373b6742f12f7c690dd7ae6b951bc832c7de9bbb56f7e9bc844ed22