From b87acd4c99793fffd61663999b45bbae7ea55603 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 30 Sep 2024 16:01:56 +0000 Subject: [PATCH] import CS lldpd-1.0.18-4.el9 --- .gitignore | 2 +- .lldpd.metadata | 2 +- SOURCES/lldpd-el6.init | 104 -------------- SOURCES/lldpd-fedora.service | 23 --- SOURCES/lldpd-systemd-sysusers.conf | 2 + SOURCES/{lldpd-el7.service => lldpd.service} | 0 ...lldpd-fedora.sysconfig => lldpd.sysconfig} | 0 SPECS/lldpd.spec | 135 ++++++------------ 8 files changed, 46 insertions(+), 222 deletions(-) delete mode 100644 SOURCES/lldpd-el6.init delete mode 100644 SOURCES/lldpd-fedora.service create mode 100644 SOURCES/lldpd-systemd-sysusers.conf rename SOURCES/{lldpd-el7.service => lldpd.service} (100%) rename SOURCES/{lldpd-fedora.sysconfig => lldpd.sysconfig} (100%) diff --git a/.gitignore b/.gitignore index 5f90620..8490aae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lldpd-1.0.4-free.tar.gz +SOURCES/lldpd-1.0.18-free.tar.gz diff --git a/.lldpd.metadata b/.lldpd.metadata index a9831e3..a4f0e84 100644 --- a/.lldpd.metadata +++ b/.lldpd.metadata @@ -1 +1 @@ -21d990d6530789db5de7b0fcaff9cb8a3ba1b4d5 SOURCES/lldpd-1.0.4-free.tar.gz +3552b6c8bea1077345bb29e75feb4646c847efad SOURCES/lldpd-1.0.18-free.tar.gz diff --git a/SOURCES/lldpd-el6.init b/SOURCES/lldpd-el6.init deleted file mode 100644 index 5e0beb4..0000000 --- a/SOURCES/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/SOURCES/lldpd-fedora.service b/SOURCES/lldpd-fedora.service deleted file mode 100644 index 5ef083a..0000000 --- a/SOURCES/lldpd-fedora.service +++ /dev/null @@ -1,23 +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 -ReadWritePaths=/var/run/lldpd -ProtectSystem=strict -ProtectKernelTunables=yes -ProtectControlGroups=yes -ProtectKernelModules=yes - -[Install] -WantedBy=multi-user.target - diff --git a/SOURCES/lldpd-systemd-sysusers.conf b/SOURCES/lldpd-systemd-sysusers.conf new file mode 100644 index 0000000..9b45295 --- /dev/null +++ b/SOURCES/lldpd-systemd-sysusers.conf @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u lldpd - "Used by the lldpd daemon" /var/lib/lldpd /sbin/nologin diff --git a/SOURCES/lldpd-el7.service b/SOURCES/lldpd.service similarity index 100% rename from SOURCES/lldpd-el7.service rename to SOURCES/lldpd.service diff --git a/SOURCES/lldpd-fedora.sysconfig b/SOURCES/lldpd.sysconfig similarity index 100% rename from SOURCES/lldpd-fedora.sysconfig rename to SOURCES/lldpd.sysconfig diff --git a/SPECS/lldpd.spec b/SPECS/lldpd.spec index 35a88f9..706a853 100644 --- a/SPECS/lldpd.spec +++ b/SPECS/lldpd.spec @@ -1,53 +1,29 @@ -%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} +Version: 1.0.18 +Release: 4%{?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 +URL: https://github.com/lldpd/ +# Upstream https://github.com/lldpd/lldpd/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: lldpd-%{version}-free.tar.gz +Source1: %{name}.service Source2: %{name}-tmpfiles -Source3: %{name}-fedora.sysconfig -Source4: %{name}-el6.init -Source5: %{name}-el7.service +Source3: %{name}.sysconfig +Source4: %{name}-systemd-sysusers.conf Source100: lldpd-cleanup.sh -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-rpm-macros %{?systemd_requires} -%else -Requires(post): chkconfig -Requires(preun): chkconfig -# This is for /sbin/service -Requires(preun): initscripts -%endif +%{?sysusers_requires_compat} Requires(pre): shadow-utils @@ -65,107 +41,69 @@ Summary: %{summary} %{name} development libraries and headers %prep -%autosetup - +%autosetup -p1 %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 -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} - # 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} -exit 0 +%sysusers_create_compat %{SOURCE4} %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 +%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 +%{_sysusersdir}/%{name}.conf %dir %attr(-,lldpd,lldpd) %{_sharedstatedir}/%{name} %files devel @@ -174,8 +112,19 @@ fi %{_libdir}/liblldpctl.so %{_libdir}/pkgconfig/lldpctl.pc - %changelog +* Mon May 20 2024 Hangbin Liu - 1.0.18-3 +- Add lldpd-devel package [RHEL-22127] + +* Sun Feb 18 2024 Hangbin Liu - 1.0.18-2 +- Remove networkd gating test [RHEL-25990] + +* Wed Jan 31 2024 Hangbin Liu - 1.0.18-1 +- Rebased to 1.0.18 [RHEL-2211] + +* Mon Nov 06 2023 Hangbin Liu - 1.0.17-1 +- Rebased to 1.0.17 [RHEL-2211, RHEL-5791, RHEL-5796] + * Mon Aug 09 2021 Mohan Boddu - 1.0.4-10 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688