From: Vincent Bernat Date: Sat, 7 Dec 2024 10:39:38 +0000 (+0100) Subject: lib: bump library version X-Git-Tag: 1.0.19~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ae345c4dbbcfb3ff827ebe1302108c3836e9638;p=thirdparty%2Flldpd.git lib: bump library version Also fix versioning of lldpctl_watch_sync_unblock. And add a NEWS entry. --- diff --git a/NEWS b/NEWS index 828248b9..5d26cfd8 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ lldpd (1.0.19) + Disable LLDP in firmware for Intel X7xx cards on FreeBSD. + Do not query stats for a down interface on Linux. + Fix AppArmor policy for /run/lldpd/lldpd.socket.lock. + + Add lldpctl_watch_sync_unblock to liblldpctl. lldpd (1.0.18) * Changes (breaking): diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index c1a6d819..f7dbb033 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -56,7 +56,7 @@ CLEANFILES = atom-glue.c # -version-number could be computed from -version-info, mostly major # is `current` - `age`, minor is `age` and revision is `revision' and # major.minor should be used when updating lldpctl.map. -liblldpctl_la_LDFLAGS = $(AM_LDFLAGS) -version-info 13:1:9 +liblldpctl_la_LDFLAGS = $(AM_LDFLAGS) -version-info 14:0:10 liblldpctl_la_DEPENDENCIES = libfixedpoint.la if HAVE_LD_VERSION_SCRIPT diff --git a/src/lib/lldpctl.h b/src/lib/lldpctl.h index 364c760a..6c293796 100644 --- a/src/lib/lldpctl.h +++ b/src/lib/lldpctl.h @@ -551,12 +551,14 @@ int lldpctl_watch_callback2(lldpctl_conn_t *conn, lldpctl_change_callback2 cb, int lldpctl_watch(lldpctl_conn_t *conn); /** - * Unblock another thread that's waiting for the next change on that synchronous callback connection. + * Unblock another thread that's waiting for the next change on that synchronous + * callback connection. * * @param conn Synchronous callback connection with lldpd. * - * If some thread is blocked at @ref lldpctl_watch() with the same synchronous callback @p conn, - * then this function will unblock it. Otherwise, this function will have no effect. + * If some thread is blocked at @ref lldpctl_watch() with the same synchronous + * callback @p conn, then this function will unblock it. Otherwise, this + * function will have no effect. This function is signal-safe. */ void lldpctl_watch_sync_unblock(lldpctl_conn_t *conn); diff --git a/src/lib/lldpctl.map b/src/lib/lldpctl.map index 4c0f202d..f9c3c1b2 100644 --- a/src/lib/lldpctl.map +++ b/src/lib/lldpctl.map @@ -1,3 +1,8 @@ +LIBLLDPCTL_4.10 { + global: + lldpctl_watch_sync_unblock; +}; + LIBLLDPCTL_4.9 { global: lldpctl_watch_callback2; @@ -47,7 +52,6 @@ LIBLLDPCTL_4.6 { lldpctl_strerror; lldpctl_watch; lldpctl_watch_callback; - lldpctl_watch_sync_unblock; local: *;