From ab1ce6f074d4d6721da7ea95ce58222a282edfa6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 3 Nov 2021 03:22:58 -0400 Subject: [PATCH] import lldpd-1.0.4-10.el9 --- .gitignore | 1 + .lldpd.metadata | 1 + SOURCES/lldpd-cleanup.sh | 31 ++++ SOURCES/lldpd-el6.init | 104 +++++++++++++ SOURCES/lldpd-el7.service | 20 +++ SOURCES/lldpd-fedora.service | 23 +++ SOURCES/lldpd-fedora.sysconfig | 8 + SOURCES/lldpd-tmpfiles | 2 + SPECS/lldpd.spec | 264 +++++++++++++++++++++++++++++++++ 9 files changed, 454 insertions(+) create mode 100644 .gitignore create mode 100644 .lldpd.metadata create mode 100755 SOURCES/lldpd-cleanup.sh create mode 100644 SOURCES/lldpd-el6.init create mode 100644 SOURCES/lldpd-el7.service create mode 100644 SOURCES/lldpd-fedora.service create mode 100644 SOURCES/lldpd-fedora.sysconfig create mode 100644 SOURCES/lldpd-tmpfiles create mode 100644 SPECS/lldpd.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5f90620 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/lldpd-1.0.4-free.tar.gz diff --git a/.lldpd.metadata b/.lldpd.metadata new file mode 100644 index 0000000..a9831e3 --- /dev/null +++ b/.lldpd.metadata @@ -0,0 +1 @@ +21d990d6530789db5de7b0fcaff9cb8a3ba1b4d5 SOURCES/lldpd-1.0.4-free.tar.gz diff --git a/SOURCES/lldpd-cleanup.sh b/SOURCES/lldpd-cleanup.sh new file mode 100755 index 0000000..5a09592 --- /dev/null +++ b/SOURCES/lldpd-cleanup.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Process a lldpd tarball to remove proprietary source code. +# +# Yaakov Selkowitz - 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" diff --git a/SOURCES/lldpd-el6.init b/SOURCES/lldpd-el6.init new file mode 100644 index 0000000..5e0beb4 --- /dev/null +++ b/SOURCES/lldpd-el6.init @@ -0,0 +1,104 @@ +#!/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/SOURCES/lldpd-el7.service b/SOURCES/lldpd-el7.service new file mode 100644 index 0000000..93bee22 --- /dev/null +++ b/SOURCES/lldpd-el7.service @@ -0,0 +1,20 @@ +[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/SOURCES/lldpd-fedora.service b/SOURCES/lldpd-fedora.service new file mode 100644 index 0000000..5ef083a --- /dev/null +++ b/SOURCES/lldpd-fedora.service @@ -0,0 +1,23 @@ +[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 +ReadWritePaths=/var/run/lldpd +ProtectSystem=strict +ProtectKernelTunables=yes +ProtectControlGroups=yes +ProtectKernelModules=yes + +[Install] +WantedBy=multi-user.target + diff --git a/SOURCES/lldpd-fedora.sysconfig b/SOURCES/lldpd-fedora.sysconfig new file mode 100644 index 0000000..de2adcc --- /dev/null +++ b/SOURCES/lldpd-fedora.sysconfig @@ -0,0 +1,8 @@ +## Path: Network/Discovery +## Description: lldpd configuration +## Type: string(-x,-c,-s,-e,-f) +## Default: "" +## ServiceRestart: lldpd +# Parameters for lldpd. See the manual page for the +# accepted parameters. +LLDPD_OPTIONS="" diff --git a/SOURCES/lldpd-tmpfiles b/SOURCES/lldpd-tmpfiles new file mode 100644 index 0000000..875f2a7 --- /dev/null +++ b/SOURCES/lldpd-tmpfiles @@ -0,0 +1,2 @@ +d /run/lldpd 0755 root root - +d /run/lldpd/chroot 0755 root root - diff --git a/SPECS/lldpd.spec b/SPECS/lldpd.spec new file mode 100644 index 0000000..35a88f9 --- /dev/null +++ b/SPECS/lldpd.spec @@ -0,0 +1,264 @@ +%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: 10%{?dist} +Summary: ISC-licensed implementation of LLDP + +License: ISC +URL: https://%{gh_owner}.github.io/%{name}/ +# 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 +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 +%{?systemd_requires} +%else +Requires(post): chkconfig +Requires(preun): chkconfig +# This is for /sbin/service +Requires(preun): initscripts +%endif + +Requires(pre): shadow-utils + +%description +LLDP is an industry standard protocol designed to supplant proprietary +Link-Layer protocols such as EDP or CDP. The goal of LLDP is to provide +an inter-vendor compatible mechanism to deliver Link-Layer notifications +to adjacent network devices. + +%package devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: %{summary} + +%description devel +%{name} development libraries and headers + +%prep +%autosetup + + +%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-systemdsystemunitdir=%{_unitdir} --with-sysusersdir=no +%endif + +make %{?_smp_mflags} + + +%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 -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 + +%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} +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 + +%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 + +%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 + +%files +%doc NEWS README.md +%license LICENSE +%{_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} +%{_unitdir}/%{name}.service +%{_tmpfilesdir}/%{name}.conf +%else +%{_initddir}/%{name} +%endif +%dir %attr(-,lldpd,lldpd) %{_sharedstatedir}/%{name} + +%files devel +%{_includedir}/lldp-const.h +%{_includedir}/lldpctl.h +%{_libdir}/liblldpctl.so +%{_libdir}/pkgconfig/lldpctl.pc + + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 1.0.4-10 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Mon Jul 12 2021 Aaron Conole - 1.0.4-9 +- Strip ASL components (#1982259) + +* Tue Jun 22 2021 Mohan Boddu - 1.0.4-8 +- Rebuilt for RHEL 9 BETA for openssl 3.0 + Related: rhbz#1971065 + +* Fri Apr 16 2021 Mohan Boddu - 1.0.4-7 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Fri Jul 13 2018 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Apr 17 2018 James Hogarth - 1.0.1-1 +- Update to 1.0.1 + +* Thu Feb 08 2018 Fedora Release Engineering - 0.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Aug 21 2017 James Hogarth - 0.9.8-1 +- Update to 0.9.8 + +* Fri Aug 11 2017 Igor Gnatenko - 0.9.7-10 +- Rebuilt after RPM update (№ 3) + +* Thu Aug 10 2017 Igor Gnatenko - 0.9.7-9 +- Rebuilt for RPM soname bump + +* Thu Aug 10 2017 Igor Gnatenko - 0.9.7-8 +- Rebuilt for RPM soname bump + +* Thu Aug 03 2017 Fedora Release Engineering - 0.9.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 06 2017 James Hogarth - 0.9.7-5 +- Older fedora needs the older syntax matching EPEL7 + +* Wed Apr 05 2017 James Hogarth - 0.9.7-4 +- EPEL7 systemd needs an older syntax + +* Wed Apr 05 2017 James Hogarth - 0.9.7-3 +- Use the official release tarball rather than the github snapshot +- Add EPEL6 conditionals + +* Wed Apr 05 2017 James Hogarth - 0.9.7-2 +- Tweaks to spec requested in review + +* Tue Apr 04 2017 James Hogarth - 0.9.7-1 +- Initial package