1.0.16

.gitignore

@@ -1,4 +1 @@
-/lldpd-0.9.7.tar.gz
+/lldpd-1.*.tar.gz
-/lldpd-0.9.8.tar.gz
-/lldpd-1.0.1.tar.gz
-/lldpd-1.0.4.tar.gz

lldpd-el6.init

@@ -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 $?

lldpd-el7.service

@@ -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
-

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

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
+Version:  1.0.16
-Release:  12%{?dist}
+Release:  1%{?dist}
 Summary:  ISC-licensed implementation of LLDP
 
 License:  ISC
-URL:      https://%{gh_owner}.github.io/%{name}/
+URL:      https://github.com/lldpd/
-Source0:  https://media.luffy.cx/files/lldpd/lldpd-%{version}.tar.gz
+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
+Source4:  %{name}-systemd-sysusers.conf
-Source5:  %{name}-el7.service
-Patch0: lldpd-configure-c99.patch
 
-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-privsep-chroot=%{_rundir}%{name}/chroot \
-  --with-lldpd-ctl-socket=%{rundir}%{name}/%{name}.socket \
+  --with-lldpd-ctl-socket=%{_rundir}%{name}/%{name}.socket \
-%if 0%{?with_systemd}
   --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}
+%sysusers_create_compat %{SOURCE4}
-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
+%systemd_post lldpd.service
-%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 lldpd.service
-%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
+%systemd_postun_with_restart lldpd.service
-%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*
-%{_libdir}/liblldpctl.so.4.8.0
+%dir %{_rundir}%{name}
-%dir %{rundir}%{name}
+%dir %{_rundir}%{name}/chroot
-%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
@@ -174,6 +111,11 @@ fi
 
 
 %changelog
+* Tue Apr 11 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 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 <releng@fedoraproject.org> - 1.0.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (lldpd-1.0.4.tar.gz) = a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
+SHA512 (lldpd-1.0.16.tar.gz) = 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1