.gitignore

@@ -1,4 +1 @@
-SOURCES/lldpd-1.0.1.tar.gz
-/lldpd-1.0.1.tar.gz
-/lldpd-1.0.17.tar.gz
-/lldpd-1.0.17-free.tar.gz
+SOURCES/lldpd-1.0.18-free.tar.gz

.lldpd.metadata

@@ -0,0 +1 @@
+3552b6c8bea1077345bb29e75feb4646c847efad SOURCES/lldpd-1.0.18-free.tar.gz

SOURCES/lldpd-cleanup.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Process a lldpd tarball to remove proprietary source code.
+#
+# Yaakov Selkowitz <yselkowi@redhat.com> - 2021
+#
+
+SOURCE="$1"
+NEW_SOURCE=`echo $SOURCE | sed 's/\.tar\.gz/-free&/'`
+DIRECTORY=`echo $SOURCE | sed 's/\.tar\.gz//'`
+
+error()
+{
+	MESSAGE=$1
+	echo $MESSAGE
+	exit 1
+}
+
+rm -rf $DIRECTORY
+tar xzf $SOURCE || error "Cannot unpack $SOURCE"
+pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\""
+
+echo "Remove proprietary source files"
+find include/osx -type f -delete
+
+echo
+
+popd > /dev/null
+
+tar czf $NEW_SOURCE $DIRECTORY
+echo "$NEW_SOURCE is ready to use"

SPECS/lldpd.spec

@@ -9,19 +9,23 @@
 %global gh_owner vincentbernat
 
 Name:     lldpd
-Version:  1.0.17
-Release:  2%{?dist}
+Version:  1.0.18
+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
+# Upstream https://media.luffy.cx/files/lldpd/lldpd-%{version}.tar.gz
+Source0: lldpd-%{version}-free.tar.gz
 Source1:  %{name}-fedora.service
 Source2:  %{name}-tmpfiles
 Source3:  %{name}-fedora.sysconfig
 Source4:  %{name}-el6.init
 Source5:  %{name}-el7.service
 
+Source100: lldpd-cleanup.sh
+
+BuildRequires: gcc
 BuildRequires: readline-devel
 BuildRequires: check-devel
 BuildRequires: net-snmp-devel
@@ -36,6 +40,7 @@ BuildRequires: libevent-devel
 %if 0%{?with_systemd}
 # For systemd stuff
 BuildRequires: systemd
+BuildRequires: make
 %{?systemd_requires}
 %else
 Requires(post): chkconfig
@@ -170,14 +175,58 @@ fi
 
 
 %changelog
-* Mon Nov 06 2023 Hangbin Liu <haliu@redhat.com> - 1.0.17-2
-- Fix liblldpctl version [RHEL-2211]
+* Wed Jan 31 2024 Hangbin Liu <haliu@redhat.com> - 1.0.18-1
+- Rebased to 1.0.18 [RHEL-2211]
 
 * Mon Nov 06 2023 Hangbin Liu <haliu@redhat.com> - 1.0.17-1
-- Rebased to 1.0.17 [RHEL-2211]
+- Rebased to 1.0.17 [RHEL-2211, RHEL-5791, RHEL-5796]
 
-* Thu Aug 09 2018 Josef Ridky <jridky@redhat.com> - 1.0.1-2
-- Rebuild for Net-SNMP
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.4-10
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Jul 12 2021 Aaron Conole <aconole@redhat.com> - 1.0.4-9
+- Strip ASL components (#1982259)
+
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.4-8
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.4-7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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 <zbyszek@in.waw.pl> - 1.0.4-5
+- Rebuilt for libevent 2.1.12
+
+* Wed Sep 02 2020 Josef Ridky <jridky@redhat.com> - 1.0.4-4
+- Rebuilt for new net-snmp release
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Aug 13 2019 James Hogarth <james.hogarth@gmail.com> - 1.0.4-1
+- Updated to new upstream release 1.0.4
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.1-5
+- Rebuild for readline 8.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 1.0.1-3
+- Rebuild for new net-snmp
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue Apr 17 2018 James Hogarth <james.hogarth@gmail.com> - 1.0.1-1
 - Update to 1.0.1

sources

@@ -1 +0,0 @@
-SHA512 (lldpd-1.0.17.tar.gz) = 8f6d6ea6a32cc0f238158a2d1f08224224bca250cf61f80e4d8b633c0471e4ff9a17a7a7d7f313f10d557a256c7419f54cbb3b78903b7bba3619f9c5b6c114c8