From 097bf84c74acc1691df44c8ade6ccf9e5210b4e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:52:32 +0000 Subject: [PATCH 01/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 6caa60b..a7c818d 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 24 2018 Adam Williamson - 1.0.1-3 - Rebuild for new net-snmp From 127743f0e64e488f664b6930e9a0834ab8347e8e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:51 +0100 Subject: [PATCH 02/31] Rebuild for readline 8.0 --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index a7c818d..bd810c2 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Sun Feb 17 2019 Igor Gnatenko - 1.0.1-5 +- Rebuild for readline 8.0 + * Fri Feb 01 2019 Fedora Release Engineering - 1.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6ecf9d58c5e7b9cf8a41a73bf23c69fabc409449 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:03:42 +0000 Subject: [PATCH 03/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index bd810c2..b6651b8 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Igor Gnatenko - 1.0.1-5 - Rebuild for readline 8.0 From 92c1b0affbd6865e025a49cc258e56a0bc4d0401 Mon Sep 17 00:00:00 2001 From: James Hogarth Date: Tue, 13 Aug 2019 12:37:22 +0100 Subject: [PATCH 04/31] Update to 1.0.4 upstream release --- .gitignore | 1 + lldpd.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 91611f7..0699ad1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /lldpd-0.9.7.tar.gz /lldpd-0.9.8.tar.gz /lldpd-1.0.1.tar.gz +/lldpd-1.0.4.tar.gz diff --git a/lldpd.spec b/lldpd.spec index b6651b8..1486620 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -9,8 +9,8 @@ %global gh_owner vincentbernat Name: lldpd -Version: 1.0.1 -Release: 6%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Tue Aug 13 2019 James Hogarth - 1.0.4-1 +- Updated to new upstream release 1.0.4 + * Thu Jul 25 2019 Fedora Release Engineering - 1.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index bb94576..324eb0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lldpd-1.0.1.tar.gz) = 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd +SHA512 (lldpd-1.0.4.tar.gz) = a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9 From d7a3fa5ca2e68602cc2864a5af345ce5777582b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:09:03 +0000 Subject: [PATCH 05/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 1486620..ebb3dba 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 13 2019 James Hogarth - 1.0.4-1 - Updated to new upstream release 1.0.4 From 9053f3529f0703262949d33af1c61d1e461699a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:11:24 +0000 Subject: [PATCH 06/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index ebb3dba..576c6bf 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6f89166f55c9d46294bedbf0da86d3d7e124207a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Wed, 2 Sep 2020 09:38:31 +0200 Subject: [PATCH 07/31] Rebuilt for new net-snmp release --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 576c6bf..d5a818a 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Wed Sep 02 2020 Josef Ridky - 1.0.4-4 +- Rebuilt for new net-snmp release + * Tue Jul 28 2020 Fedora Release Engineering - 1.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dac3c9398481e5b7f9afb87e726f95595abf640f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 29 Sep 2020 20:35:23 +0200 Subject: [PATCH 08/31] Rebuilt for libevent 2.1.12 See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/QOQW2BJBYMTIEUQIAYVEIX2L5IIOHDZL/ --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index d5a818a..7b8cb01 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -172,6 +172,9 @@ fi %changelog +* Tue Sep 29 20:35:23 CEST 2020 Zbigniew Jędrzejewski-Szmek - 1.0.4-5 +- Rebuilt for libevent 2.1.12 + * Wed Sep 02 2020 Josef Ridky - 1.0.4-4 - Rebuilt for new net-snmp release From 406e64d74ccc2fc1c5bf6a82da0015bdb4d4230d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 03:19:22 +0000 Subject: [PATCH 09/31] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- lldpd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lldpd.spec b/lldpd.spec index 7b8cb01..0dbbf98 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -37,6 +37,7 @@ BuildRequires: libevent-devel %if 0%{?with_systemd} # For systemd stuff BuildRequires: systemd +BuildRequires: make %{?systemd_requires} %else Requires(post): chkconfig From bc4bb42cf467c1723f6ca0f50891df9a2dbde227 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:36:00 +0000 Subject: [PATCH 10/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 0dbbf98..836ab77 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -173,6 +173,9 @@ fi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 29 20:35:23 CEST 2020 Zbigniew Jędrzejewski-Szmek - 1.0.4-5 - Rebuilt for libevent 2.1.12 From 3c3fd479f1b2d57b6e9fe88135b158702d04c8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:36 +0100 Subject: [PATCH 11/31] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- lldpd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 836ab77..0194a66 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -173,6 +173,10 @@ fi %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.4-7 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 1.0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7075f4ffa7f54ac2d6c8a6e1de99df75825bf55e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:02:47 +0000 Subject: [PATCH 12/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 0194a66..a5ee993 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -173,6 +173,9 @@ fi %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.4-7 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From ccd9d51f195762dff4cf65c53a00296523476d93 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 27 Jul 2021 19:30:18 -0400 Subject: [PATCH 13/31] tests: cleanup imports and spelling psutil does not appear to be used, but would require installing python3-psutil. networkd is now a separate subpackage of systemd. --- tests/miscellaneous-tests/lldpd-tests.py | 1 - tests/miscellaneous-tests/runtest.sh | 8 ++++---- tests/tests.yml | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/miscellaneous-tests/lldpd-tests.py b/tests/miscellaneous-tests/lldpd-tests.py index 3b78954..e7c68b0 100755 --- a/tests/miscellaneous-tests/lldpd-tests.py +++ b/tests/miscellaneous-tests/lldpd-tests.py @@ -17,7 +17,6 @@ import subprocess import signal import shutil import re -import psutil import socket LLDPD_TCP_DUMP_FILE='/tmp/lldpd-tcp-dump.pcap' diff --git a/tests/miscellaneous-tests/runtest.sh b/tests/miscellaneous-tests/runtest.sh index acf5d5c..a47923b 100755 --- a/tests/miscellaneous-tests/runtest.sh +++ b/tests/miscellaneous-tests/runtest.sh @@ -2,7 +2,7 @@ # SPDX-License-Identifier: LGPL-2.1+ # ~~~ # LLDPD integration test -# Description: Test for ladpd:implementation of IEEE 802.1ab (LLDP) +# Description: Test for lldpd:implementation of IEEE 802.1ab (LLDP) # # Author: Susant Sahani # Copyright (c) 2018 Red Hat, Inc. @@ -12,7 +12,7 @@ . /usr/share/beakerlib/beakerlib.sh || exit 1 PACKAGE="lldpd" -LadpdPidFile="/var/run/lldpd.pid" +LldpdPidFile="/var/run/lldpd.pid" rlJournalStart rlPhaseStartSetup @@ -21,13 +21,13 @@ rlJournalStart rlPhaseEnd rlPhaseStartTest - rlLog "lladpd tests" + rlLog "lldpd tests" rlRun "/usr/bin/python3 /usr/bin/lldpd-tests.py" rlPhaseEnd rlPhaseStartCleanup rlRun "rm /usr/bin/lldpd-tests.py" - rlLog "lladpd tests done" + rlLog "lldpd tests done" rlPhaseEnd rlJournalPrintText rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml index 0deacc5..99bc873 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -10,4 +10,5 @@ - python3 - tcpdump - systemd + - systemd-networkd - iproute From 12ee52fe5ca219c480455260a51baf2f4687b7df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:57:12 +0000 Subject: [PATCH 14/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index a5ee993..1e73b72 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -173,6 +173,9 @@ fi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b7fb9ab09ed679b97d3aaa5d962b03934c9934c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:44:15 +0000 Subject: [PATCH 15/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 1e73b72..097f336 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -173,6 +173,9 @@ fi %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 143870e5356a075847cb3a4c518c5f569db180c2 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 8 Dec 2022 13:07:01 +0100 Subject: [PATCH 16/31] Port configure script to C99 Related to: --- lldpd-configure-c99.patch | 33 +++++++++++++++++++++++++++++++++ lldpd.spec | 8 ++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 lldpd-configure-c99.patch diff --git a/lldpd-configure-c99.patch b/lldpd-configure-c99.patch new file mode 100644 index 0000000..89be8e6 --- /dev/null +++ b/lldpd-configure-c99.patch @@ -0,0 +1,33 @@ +Include to avoid an implicit declaration of the printf +function. Otherwise, the check always fails with compilers that +do not support implicit function declarations (a C feature removed +in 1999). + +Submitted upstream: + +diff --git a/configure b/configure +index 931bb75d69c1149d..d34641df4b3d8aed 100755 +--- a/configure ++++ b/configure +@@ -18675,7 +18675,7 @@ else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include + int + main () + { +diff --git a/m4/progname.m4 b/m4/progname.m4 +index 28ac1748f7005139..63ddda6ab9003e5d 100644 +--- a/m4/progname.m4 ++++ b/m4/progname.m4 +@@ -3,7 +3,7 @@ + # + AC_DEFUN([lldp_CHECK___PROGNAME],[ + AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ +- AC_TRY_LINK([], ++ AC_TRY_LINK([#include ], + [ extern char *__progname; printf("%s", __progname); ], + [ lldp_cv_check___progname="yes" ], + [ lldp_cv_check___progname="no" ]) diff --git a/lldpd.spec b/lldpd.spec index 097f336..c7a8fbc 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -21,6 +21,7 @@ Source2: %{name}-tmpfiles Source3: %{name}-fedora.sysconfig Source4: %{name}-el6.init Source5: %{name}-el7.service +Patch0: lldpd-configure-c99.patch BuildRequires: gcc BuildRequires: readline-devel @@ -62,7 +63,7 @@ Summary: %{summary} %{name} development libraries and headers %prep -%autosetup +%autosetup -p1 %build @@ -173,6 +174,9 @@ fi %changelog +* Thu Dec 8 2022 Florian Weimer - 1.0.4-11 +- Port configure script to C99 + * Thu Jul 21 2022 Fedora Release Engineering - 1.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9161abcddd59be4b658158e11b6f1be60dca7d5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:09:27 +0000 Subject: [PATCH 17/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index c7a8fbc..a793edb 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,7 +10,7 @@ Name: lldpd Version: 1.0.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -174,6 +174,9 @@ fi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.0.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 8 2022 Florian Weimer - 1.0.4-11 - Port configure script to C99 From 05f07cbc7d3ea321e684c0d2e1e2e6b2314cc74b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 11 Apr 2023 20:19:15 +0100 Subject: [PATCH 18/31] 1.0.16 --- .gitignore | 5 +- lldpd-el6.init | 104 ------------------------------- lldpd-el7.service | 20 ------ lldpd-systemd-sysusers.conf | 2 + lldpd.spec | 120 ++++++++++-------------------------- sources | 2 +- 6 files changed, 35 insertions(+), 218 deletions(-) delete mode 100644 lldpd-el6.init delete mode 100644 lldpd-el7.service create mode 100644 lldpd-systemd-sysusers.conf diff --git a/.gitignore b/.gitignore index 0699ad1..6952cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/lldpd-0.9.7.tar.gz -/lldpd-0.9.8.tar.gz -/lldpd-1.0.1.tar.gz -/lldpd-1.0.4.tar.gz +/lldpd-1.*.tar.gz diff --git a/lldpd-el6.init b/lldpd-el6.init deleted file mode 100644 index 5e0beb4..0000000 --- a/lldpd-el6.init +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# lldpd init file -# -# chkconfig: - 60 20 -# description: 802.1ab (LLDP) daemon -# -# processname: lldpd -# pidfile: /var/run/lldpd.pid - -### BEGIN INIT INFO -# Provides: lldpd -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Should-Start: $syslog $network $net-snmp -# Should-Stop: $syslog $network $net-snmp -# Default-Stop: 0 1 6 -# Short-Description: LLDP daemon -# Description: 802.1ab (LLDP) daemon -### END INIT INFO - -# source function library -. /etc/rc.d/init.d/functions - -exec="/usr/sbin/lldpd" -prog="lldpd" -config="/etc/lldpd.d" - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 4 - [ -d $config ] || exit 6 - echo -n $"Starting $prog: " - daemon $exec $LLDPD_OPTIONS - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc $exec - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/lldpd-el7.service b/lldpd-el7.service deleted file mode 100644 index 93bee22..0000000 --- a/lldpd-el7.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=LLDP daemon -Documentation=man:lldpd(8) -After=network.target - -[Service] -Type=notify -NotifyAccess=main -EnvironmentFile=-/etc/sysconfig/lldpd -ExecStart=/usr/sbin/lldpd $DAEMON_ARGS $LLDPD_OPTIONS -Restart=on-failure -PrivateTmp=yes -RestrictAddressFamilies=AF_INET AF_INET6 AF_PACKET AF_NETLINK AF_UNIX -ProtectHome=yes -ReadWriteDirectories=/var/run/lldpd -ProtectSystem=full - -[Install] -WantedBy=multi-user.target - diff --git a/lldpd-systemd-sysusers.conf b/lldpd-systemd-sysusers.conf new file mode 100644 index 0000000..2e7c2e5 --- /dev/null +++ b/lldpd-systemd-sysusers.conf @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u lldpd - "Used by the lldpd daemon" %{_sharedstatedir}/lldpd /sbin/nologin diff --git a/lldpd.spec b/lldpd.spec index a793edb..5af019d 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,51 +1,25 @@ -%if 0%{?el6} -%bcond_with systemd -%global rundir /var/run/ -%else -%bcond_without systemd -%global rundir /run/ -%endif - -%global gh_owner vincentbernat - Name: lldpd -Version: 1.0.4 -Release: 12%{?dist} +Version: 1.0.16 +Release: 1%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC -URL: https://%{gh_owner}.github.io/%{name}/ -Source0: https://media.luffy.cx/files/lldpd/lldpd-%{version}.tar.gz +URL: https://github.com/lldpd/ +Source0: https://github.com/lldpd/lldpd/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-fedora.service Source2: %{name}-tmpfiles Source3: %{name}-fedora.sysconfig -Source4: %{name}-el6.init -Source5: %{name}-el7.service -Patch0: lldpd-configure-c99.patch +Source4: %{name}-systemd-sysusers.conf -BuildRequires: gcc -BuildRequires: readline-devel BuildRequires: check-devel -BuildRequires: net-snmp-devel +BuildRequires: gcc BuildRequires: libxml2-devel -# EL6 needs libevent2 as the package -%if 0%{?el6} -BuildRequires: libevent2-devel -%else BuildRequires: libevent-devel -%endif - -%if 0%{?with_systemd} -# For systemd stuff -BuildRequires: systemd BuildRequires: make +BuildRequires: net-snmp-devel +BuildRequires: readline-devel +BuildRequires: systemd-devel %{?systemd_requires} -%else -Requires(post): chkconfig -Requires(preun): chkconfig -# This is for /sbin/service -Requires(preun): initscripts -%endif Requires(pre): shadow-utils @@ -69,101 +43,64 @@ Summary: %{summary} %build %configure --disable-static --with-snmp --disable-silent-rules \ --with-privsep-user=%{name} --with-privsep-group=%{name} \ - --with-privsep-chroot=%{rundir}%{name}/chroot \ - --with-lldpd-ctl-socket=%{rundir}%{name}/%{name}.socket \ -%if 0%{?with_systemd} + --with-privsep-chroot=%{_rundir}%{name}/chroot \ + --with-lldpd-ctl-socket=%{_rundir}%{name}/%{name}.socket \ --with-systemdsystemunitdir=%{_unitdir} --with-sysusersdir=no -%endif -make %{?_smp_mflags} +%make_build %install %make_install -%if 0%{?with_systemd} -%if 0%{?fedora} >= 26 install -p -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service -%else -install -p -D -m644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service -%endif install -p -D -m644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf -%else -install -p -D -m755 %{SOURCE4} %{buildroot}%{_initddir}/%{name} -%endif install -p -D -m644 %{SOURCE3} %{buildroot}/etc/sysconfig/%{name} -install -d -D -m 0755 %{buildroot}%{rundir}%{name}/chroot +install -d -D -m 0755 %{buildroot}%{_rundir}%{name}/chroot install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name} # remove the docs from buildroot rm -rf %{buildroot}/usr/share/doc/%{name} - # don't include completion conf yet rm -f %{buildroot}/usr/share/bash-completion/completions/lldpcli rm -f %{buildroot}/usr/share/zsh/vendor-completions/_lldpcli rm -f %{buildroot}/usr/share/zsh/site-functions/_lldpcli # remove static libtool archive -rm -f %{buildroot}%{_libdir}/liblldpctl.la +find %{buildroot} -type f -name "*.la" -delete + +%ldconfig_scriptlets %pre -getent group %{name} >/dev/null || groupadd -r %{name} -getent passwd %{name} >/dev/null || \ - useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \ - -c "Used by the %{name} daemon" %{name} +%sysusers_create_compat %{SOURCE4} exit 0 %post -/sbin/ldconfig -%if 0%{?with_systemd} -%systemd_post %{name}.service -%else -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add %{name} -%endif +%systemd_post lldpd.service %preun -%if 0%{?with_systemd} -%systemd_preun %{name}.service -%else -if [ $1 -eq 0 ] ; then - /sbin/service %{name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name} -fi -%endif +%systemd_preun lldpd.service %postun -/sbin/ldconfig -%if 0%{?with_systemd} -%systemd_postun_with_restart %{name}.service -%else -if [ "$1" -ge "1" ] ; then - /sbin/service %{name} condrestart >/dev/null 2>&1 || : -fi -%endif +%systemd_postun_with_restart lldpd.service %files -%doc NEWS README.md %license LICENSE +%doc NEWS README.md +%config %{_sysconfdir}/%{name}.d +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_sbindir}/lldpcli %{_sbindir}/lldpctl %{_sbindir}/%{name} -%config %{_sysconfdir}/%{name}.d -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man8/lldpcli.8* %{_mandir}/man8/lldpctl.8* %{_mandir}/man8/%{name}.8* -%{_libdir}/liblldpctl.so.4 -%{_libdir}/liblldpctl.so.4.8.0 -%dir %{rundir}%{name} -%dir %{rundir}%{name}/chroot -%if 0%{?with_systemd} +%{_libdir}/liblldpctl.so.4* +%dir %{_rundir}%{name} +%dir %{_rundir}%{name}/chroot %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf -%else -%{_initddir}/%{name} -%endif %dir %attr(-,lldpd,lldpd) %{_sharedstatedir}/%{name} %files devel @@ -174,6 +111,11 @@ fi %changelog +* Tue Apr 11 2023 Peter Robinson - 1.0.16-1 +- Update to 1.0.16 +- Modernise spec file +- CVEs: CVE-2020-27827, CVE-2020-27827, CVE-2021-43612 + * Thu Jan 19 2023 Fedora Release Engineering - 1.0.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 324eb0a..e938795 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lldpd-1.0.4.tar.gz) = a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9 +SHA512 (lldpd-1.0.16.tar.gz) = 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1 From 00f8ba1781c47bce31c1b922d846ddc8f1686eda Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 12 Apr 2023 13:39:19 +0100 Subject: [PATCH 19/31] remove patch that no longer applies --- lldpd-configure-c99.patch | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 lldpd-configure-c99.patch diff --git a/lldpd-configure-c99.patch b/lldpd-configure-c99.patch deleted file mode 100644 index 89be8e6..0000000 --- a/lldpd-configure-c99.patch +++ /dev/null @@ -1,33 +0,0 @@ -Include to avoid an implicit declaration of the printf -function. Otherwise, the check always fails with compilers that -do not support implicit function declarations (a C feature removed -in 1999). - -Submitted upstream: - -diff --git a/configure b/configure -index 931bb75d69c1149d..d34641df4b3d8aed 100755 ---- a/configure -+++ b/configure -@@ -18675,7 +18675,7 @@ else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- -+#include - int - main () - { -diff --git a/m4/progname.m4 b/m4/progname.m4 -index 28ac1748f7005139..63ddda6ab9003e5d 100644 ---- a/m4/progname.m4 -+++ b/m4/progname.m4 -@@ -3,7 +3,7 @@ - # - AC_DEFUN([lldp_CHECK___PROGNAME],[ - AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ -- AC_TRY_LINK([], -+ AC_TRY_LINK([#include ], - [ extern char *__progname; printf("%s", __progname); ], - [ lldp_cv_check___progname="yes" ], - [ lldp_cv_check___progname="no" ]) From b496f4ae4bdf17a0a83c118839f21649008d46bc Mon Sep 17 00:00:00 2001 From: Peter Hjalmarsson Date: Sat, 22 Apr 2023 14:01:48 +0000 Subject: [PATCH 20/31] Currecting user creation and runtime issues --- lldpd-fedora.service | 2 +- lldpd-systemd-sysusers.conf | 2 +- lldpd.spec | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lldpd-fedora.service b/lldpd-fedora.service index 5ef083a..a5fc8c8 100644 --- a/lldpd-fedora.service +++ b/lldpd-fedora.service @@ -12,7 +12,7 @@ Restart=on-failure PrivateTmp=yes RestrictAddressFamilies=AF_INET AF_INET6 AF_PACKET AF_NETLINK AF_UNIX ProtectHome=yes -ReadWritePaths=/var/run/lldpd +ReadWritePaths=/run/lldpd ProtectSystem=strict ProtectKernelTunables=yes ProtectControlGroups=yes diff --git a/lldpd-systemd-sysusers.conf b/lldpd-systemd-sysusers.conf index 2e7c2e5..6058660 100644 --- a/lldpd-systemd-sysusers.conf +++ b/lldpd-systemd-sysusers.conf @@ -1,2 +1,2 @@ #Type Name ID GECOS Home directory Shell -u lldpd - "Used by the lldpd daemon" %{_sharedstatedir}/lldpd /sbin/nologin +u lldpd - "Used by the lldpd daemon" /var/lib/lldpd /sbin/nologin diff --git a/lldpd.spec b/lldpd.spec index 5af019d..d3f116c 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -43,8 +43,8 @@ Summary: %{summary} %build %configure --disable-static --with-snmp --disable-silent-rules \ --with-privsep-user=%{name} --with-privsep-group=%{name} \ - --with-privsep-chroot=%{_rundir}%{name}/chroot \ - --with-lldpd-ctl-socket=%{_rundir}%{name}/%{name}.socket \ + --with-privsep-chroot=%{_rundir}/%{name}/chroot \ + --with-lldpd-ctl-socket=%{_rundir}/%{name}/%{name}.socket \ --with-systemdsystemunitdir=%{_unitdir} --with-sysusersdir=no %make_build @@ -56,8 +56,9 @@ Summary: %{summary} install -p -D -m644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service install -p -D -m644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf install -p -D -m644 %{SOURCE3} %{buildroot}/etc/sysconfig/%{name} +install -p -D -m644 %{SOURCE4} %{buildroot}%{_sysusersdir}/%{name}.conf -install -d -D -m 0755 %{buildroot}%{_rundir}%{name}/chroot +install -d -D -m 0755 %{buildroot}%{_rundir}/%{name}/chroot install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name} # remove the docs from buildroot rm -rf %{buildroot}/usr/share/doc/%{name} @@ -97,10 +98,11 @@ exit 0 %{_mandir}/man8/lldpctl.8* %{_mandir}/man8/%{name}.8* %{_libdir}/liblldpctl.so.4* -%dir %{_rundir}%{name} -%dir %{_rundir}%{name}/chroot +%dir %{_rundir}/%{name} +%dir %{_rundir}/%{name}/chroot %{_unitdir}/%{name}.service %{_tmpfilesdir}/%{name}.conf +%{_sysusersdir}/%{name}.conf %dir %attr(-,lldpd,lldpd) %{_sharedstatedir}/%{name} %files devel @@ -111,6 +113,10 @@ exit 0 %changelog +* Tue May 2 2023 Peter Hjalmarsson - 1.0.16-2 +- Correcting usage of rundir macro +- Fix creation of sysuser + * Tue Apr 11 2023 Peter Robinson - 1.0.16-1 - Update to 1.0.16 - Modernise spec file From 18e5d8ad5087ca06cff1cebe5624511b9d33a459 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:54:45 +0000 Subject: [PATCH 21/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index d3f116c..767d290 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -113,6 +113,9 @@ exit 0 %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.0.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue May 2 2023 Peter Hjalmarsson - 1.0.16-2 - Correcting usage of rundir macro - Fix creation of sysuser From 45a2ef9188435e9a5471cb1b0dd43629b4450db8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 28 Nov 2023 18:53:40 +0100 Subject: [PATCH 22/31] Reapply C99 compatibility fix --- lldpd-configure-c99.patch | 35 +++++++++++++++++++++++++++++++++++ lldpd.spec | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 lldpd-configure-c99.patch diff --git a/lldpd-configure-c99.patch b/lldpd-configure-c99.patch new file mode 100644 index 0000000..f75b621 --- /dev/null +++ b/lldpd-configure-c99.patch @@ -0,0 +1,35 @@ +commit 01aee0f3601c60e570aeb9040c036c83d053cc5a +Author: Florian Weimer +Date: Thu Dec 8 13:01:07 2022 +0100 + + m4/progname.m4: Include for printf in lldp_CHECK___PROGNAME + + Otherwise the checks always fails with a compiler that does not + support implict function declarations. + +diff --git a/configure b/configure +index 10baaca5824a3568..f43b2fd9beb18847 100755 +--- a/configure ++++ b/configure +@@ -18976,7 +18976,7 @@ else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include + int + main () + { +diff --git a/m4/progname.m4 b/m4/progname.m4 +index 031aba65cbf0cc7d..b1a80f7f28c628a8 100644 +--- a/m4/progname.m4 ++++ b/m4/progname.m4 +@@ -4,7 +4,7 @@ + AC_DEFUN([lldp_CHECK___PROGNAME],[ + AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ + AC_LINK_IFELSE([AC_LANG_PROGRAM( +- [[]], ++ [[#include]], + [[ extern char *__progname; printf("%s", __progname); ]])], + [ lldp_cv_check___progname="yes" ], + [ lldp_cv_check___progname="no" ]) diff --git a/lldpd.spec b/lldpd.spec index 767d290..5b5eb28 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -10,6 +10,7 @@ Source1: %{name}-fedora.service Source2: %{name}-tmpfiles Source3: %{name}-fedora.sysconfig Source4: %{name}-systemd-sysusers.conf +Patch1: lldpd-configure-c99.patch BuildRequires: check-devel BuildRequires: gcc @@ -113,6 +114,9 @@ exit 0 %changelog +* Tue Nov 28 2023 Florian Weimer - 1.0.16-4 +- Reapply C99 compatibility fix + * Thu Jul 20 2023 Fedora Release Engineering - 1.0.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 8955f53aa0c2ca226e1dd756ec6f6da8464efd47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:04:49 +0000 Subject: [PATCH 23/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 5b5eb28..a535633 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Florian Weimer - 1.0.16-4 - Reapply C99 compatibility fix From c465fcc83248f6ed1f609b8d5165f8b607ae8d1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:29:39 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index a535633..8a2d081 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.0.16-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.0.16-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d740992627cadb1b7bd69b3afdfc2bf6c17eba59 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 3 Jul 2024 11:13:05 +0100 Subject: [PATCH 25/31] 1.0.18 --- lldpd-configure-c99.patch | 21 ++++----------------- lldpd.spec | 9 ++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/lldpd-configure-c99.patch b/lldpd-configure-c99.patch index f75b621..cebb962 100644 --- a/lldpd-configure-c99.patch +++ b/lldpd-configure-c99.patch @@ -11,25 +11,12 @@ diff --git a/configure b/configure index 10baaca5824a3568..f43b2fd9beb18847 100755 --- a/configure +++ b/configure -@@ -18976,7 +18976,7 @@ else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -19039,7 +19039,7 @@ + do CFLAGS="$ac_save_CFLAGS $LLDP_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include int - main () + main (void) { -diff --git a/m4/progname.m4 b/m4/progname.m4 -index 031aba65cbf0cc7d..b1a80f7f28c628a8 100644 ---- a/m4/progname.m4 -+++ b/m4/progname.m4 -@@ -4,7 +4,7 @@ - AC_DEFUN([lldp_CHECK___PROGNAME],[ - AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ - AC_LINK_IFELSE([AC_LANG_PROGRAM( -- [[]], -+ [[#include]], - [[ extern char *__progname; printf("%s", __progname); ]])], - [ lldp_cv_check___progname="yes" ], - [ lldp_cv_check___progname="no" ]) diff --git a/lldpd.spec b/lldpd.spec index 8a2d081..92f37d1 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,9 +1,9 @@ Name: lldpd -Version: 1.0.16 -Release: 6%{?dist} +Version: 1.0.18 +Release: 1%{?dist} Summary: ISC-licensed implementation of LLDP - License: ISC + URL: https://github.com/lldpd/ Source0: https://github.com/lldpd/lldpd/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-fedora.service @@ -114,6 +114,9 @@ exit 0 %changelog +* Wed Jul 03 2024 Peter Robinson - 1.0.18-1 +- Update to 1.0.18 + * Thu Jan 25 2024 Fedora Release Engineering - 1.0.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index e938795..cdaca36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lldpd-1.0.16.tar.gz) = 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1 +SHA512 (lldpd-1.0.18.tar.gz) = c8734221767cd879c98ea3ee6fa80e1dce2f8470a97b0f757cfe7ef8fe2adaf878fdedcda896cf65e1af980634f2ab312588658fb85f89c6d5b6cc9d2da52045 From 8628bbee8c07cbd1a652dbb534d9df70fd8354b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:51:25 +0000 Subject: [PATCH 26/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 92f37d1..812501d 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 03 2024 Peter Robinson - 1.0.18-1 - Update to 1.0.18 From a9e8ed26c09cd786965363d35e43bef5698a7ad6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 15:49:19 +0000 Subject: [PATCH 27/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 812501d..9439d42 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1.0.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1b7c95110ec6e0a2d631bcab35c9604d0971feea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:46:56 +0000 Subject: [PATCH 28/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 9439d42..0193081 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.0.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.0.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 57db2beb1cfbc68ed46b4e69fef1b33181dbf245 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 19:59:32 +0000 Subject: [PATCH 29/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 0193081..0ab1f8d 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.0.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 1.0.18-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 60cdb0a92eb14307a2872ebfdb94fa857acbcc3d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 2 Feb 2026 10:13:19 -0500 Subject: [PATCH 30/31] Rebuilt for net-snmp 5.9.5.2 (rhbz#2433752) --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 0ab1f8d..8281c77 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Thu Jan 29 2026 Yaakov Selkowitz - 1.0.18-6 +- Rebuilt for net-snmp 5.9.5.2 (rhbz#2433752) + * Fri Jan 16 2026 Fedora Release Engineering - 1.0.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From c6d19ac2efb29b1cb499de95c4cea7f5e245aa36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 07:17:30 +0000 Subject: [PATCH 31/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- lldpd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lldpd.spec b/lldpd.spec index 8281c77..08541a9 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -1,6 +1,6 @@ Name: lldpd Version: 1.0.18 -Release: 6%{?dist} +Release: 7%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC @@ -114,6 +114,9 @@ exit 0 %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 1.0.18-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jan 29 2026 Yaakov Selkowitz - 1.0.18-6 - Rebuilt for net-snmp 5.9.5.2 (rhbz#2433752)