Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lldpd for openSUSE:Factory checked in at 2023-05-30 22:03:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lldpd (Old) and /work/SRC/openSUSE:Factory/.lldpd.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lldpd" Tue May 30 22:03:19 2023 rev:25 rq:1089833 version:1.0.17 Changes: -------- --- /work/SRC/openSUSE:Factory/lldpd/lldpd.changes 2022-11-14 14:29:12.183030613 +0100 +++ /work/SRC/openSUSE:Factory/.lldpd.new.1533/lldpd.changes 2023-05-30 22:03:34.207409075 +0200 @@ -1,0 +2,7 @@ +Mon May 29 20:30:08 UTC 2023 - Dirk Müller <[email protected]> + +- update to 1.0.17: + * Fix: Read overflow when parsing CDP addresses. + * Don't output empty lines on configure commands. + +------------------------------------------------------------------- Old: ---- lldpd-1.0.16.tar.gz lldpd-1.0.16.tar.gz.asc New: ---- lldpd-1.0.17.tar.gz lldpd-1.0.17.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lldpd.spec ++++++ --- /var/tmp/diff_new_pack.Hpabij/_old 2023-05-30 22:03:34.851412871 +0200 +++ /var/tmp/diff_new_pack.Hpabij/_new 2023-05-30 22:03:34.855412894 +0200 @@ -1,7 +1,7 @@ # # spec file for package lldpd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: lldpd -Version: 1.0.16 +Version: 1.0.17 Release: 0 Summary: Implementation of IEEE 802.1ab (LLDP) # We have some GPL linux headers in include/linux, they are used on ++++++ lldpd-1.0.16.tar.gz -> lldpd-1.0.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/.dist-version new/lldpd-1.0.17/.dist-version --- old/lldpd-1.0.16/.dist-version 2022-11-11 14:26:14.000000000 +0100 +++ new/lldpd-1.0.17/.dist-version 2023-05-18 16:12:46.000000000 +0200 @@ -1 +1 @@ -1.0.16 +1.0.17 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/ChangeLog new/lldpd-1.0.17/ChangeLog --- old/lldpd-1.0.16/ChangeLog 2022-11-11 14:26:13.000000000 +0100 +++ new/lldpd-1.0.17/ChangeLog 2023-05-18 16:12:45.000000000 +0200 @@ -1,3 +1,41 @@ +1.0.17 [2023-05-18 16:11:45 +0200]: + + - [ba5cad6a74b8] release: 1.0.17 (Vincent Bernat) + - [14ce09980a71] client: don't output empty lines on configure commands (Vincent Bernat) + - [74d4d69177b8] lib: remove unreachable code (Vincent Bernat) + - [a9aeabdf879c] daemon: fix read overflow when parsing CDP addresses (Vincent Bernat) + - [e1af9ac6424f] build: bump cachix/install-nix-action from 18 to 20 (dependabot[bot]) + - [f493b636b255] interfaces: fix use of isdigit() (Vincent Bernat) + - [5c452f3c8ba9] build: bump cross-platform-actions/action from 0.7.0 to 0.10.0 (dependabot[bot]) + - [77a85a64033f] build: bump docker/build-push-action from 3 to 4 (dependabot[bot]) + - [1ca42cabdb5b] build: don't run clang build with SNMP support (Vincent Bernat) + - [02f38b92e8fb] build: bump cross-platform-actions/action from 0.6.2 to 0.7.0 (#566) (dependabot[bot]) + - [d0eca34a8a5c] build: fix lldpcli build (Vincent Bernat) + - [0fa28337f74d] build: better integration of fuzz-decode in build process (Vincent Bernat) + - [215d04200b58] interfaces: properly initialize ethtool structure (Vincent Bernat) + - [0221be2f09c9] build: make all char unsigned (Vincent Bernat) + - [379b8ab111c7] tests: mark "too_many_vlans" test as unreliable (Vincent Bernat) + - [01aee0f3601c] m4/progname.m4: Include <stdio.h> for printf in lldp_CHECK___PROGNAME (Florian Weimer) + - [257cff48233c] tests: give more time to lldpd when handling many VLANs (Vincent Bernat) + - [16a1a7e64118] tests: use prefixlen instead of mask with pyroute2 (Vincent Bernat) + - [73987a1563e5] tests: upgrade pytest and others to more recent versions (Vincent Bernat) + - [93e336d36b83] tests: fix warnings about format string (Vincent Bernat) + - [e78af8114be2] build: switch back to apheleia (Vincent Bernat) + - [395caf6f6c96] Merge pull request #563 from lldpd/dependabot/github_actions/actions/cache-3 (dependabot[bot]) + - [b9e00dda0518] build: bump actions/cache from 2 to 3 (dependabot[bot]) + - [0dc7a4a96a39] src/client: add two missing commands to manual page (Vincent Bernat) + - [27b380b455b3] build: update two additional docker actions (Vincent Bernat) + - [b373cd6130cb] build: fix release script to work with OOT build dir (Vincent Bernat) + - [62364b80bd8e] osx: update Homebrew recipe (Vincent Bernat) + - [87467d2dcb4a] build: bump docker/build-push-action from 2 to 3 (dependabot[bot]) + - [7deb2013e3eb] build: bump docker/login-action from 1 to 2 (dependabot[bot]) + - [5bed67d2a880] build: bump docker/metadata-action from 3 to 4 (dependabot[bot]) + - [91c4a7335855] build: bump cachix/install-nix-action from 17 to 18 (dependabot[bot]) + - [fcc87c7787a4] build: bump actions/download-artifact from 2 to 3 (dependabot[bot]) + - [0c29b7cb9dad] build: add dependabot (Vincent Bernat) + - [fd117da16af6] build: update some actions to remove warnings (Vincent Bernat) + - [566917f5003b] build: update set-output method for GitHub action (Vincent Bernat) + 1.0.16 [2022-11-11 14:25:30 +0100]: - [7a595f1adfa4] release: 1.0.16 (Vincent Bernat) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/Makefile.in new/lldpd-1.0.17/Makefile.in --- old/lldpd-1.0.16/Makefile.in 2022-11-11 14:25:59.000000000 +0100 +++ new/lldpd-1.0.17/Makefile.in 2023-05-18 16:12:19.000000000 +0200 @@ -332,7 +332,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/NEWS new/lldpd-1.0.17/NEWS --- old/lldpd-1.0.16/NEWS 2022-10-27 23:02:58.000000000 +0200 +++ new/lldpd-1.0.17/NEWS 2023-05-18 16:08:38.000000000 +0200 @@ -1,3 +1,8 @@ +lldpd (1.0.17) + * Fix: + + Read overflow when parsing CDP addresses. Thanks to Matteo Memelli. + + Don't output empty lines on configure commands. + lldpd (1.0.16) * Fix: + Do not use 00:00:00:00:00:00 as chassis ID. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/README.md new/lldpd-1.0.17/README.md --- old/lldpd-1.0.16/README.md 2022-11-05 20:14:15.000000000 +0100 +++ new/lldpd-1.0.17/README.md 2022-12-29 23:24:05.000000000 +0100 @@ -360,10 +360,12 @@ ### With libfuzzer -``` -./tests/fuzzer/build.sh ASan -./tests/fuzzer/build.sh run -``` +Build with `--enable-fuzzer` and `--enable-sanitizers`, then run `./fuzz-decode fuzzer/corpus +fuzzer/seed-corpus` in `tests` folder. For example: + +- using address sanitizer: `./configure --enable-fuzzer --enable-sanitizers=address CFLAGS="-O1 -fsanitize-address-use-after-scope" CC=clang` +- using undefined-behaviour sanitizer: `./configure --enable-fuzzer --enable-sanitizers=array-bounds,bool,builtin,enum,float-divide-by-zero,function,integer-divide-by-zero,null,object-size,return,returns-nonnull-attribute,shift,signed-integer-overflow,unsigned-integer-overflow,unreachable,vla-bound,vptr CFLAGS="-O1 -fno-sanitize-recover=array-bounds,bool,builtin,enum,float-divide-by-zero,function,integer-divide-by-zero,null,object-size,return,returns-nonnull-attribute,shift,signed-integer-overflow,unreachable,vla-bound,vptr" CC=clang` +- using memory sanitizer : `./configure --enable-fuzzer --enable-sanitizers=memory CFLAGS="-O1 -fsanitize-memory-track-origins" CC=clang` ### With AFL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/aclocal.m4 new/lldpd-1.0.17/aclocal.m4 --- old/lldpd-1.0.16/aclocal.m4 2022-11-11 14:25:58.000000000 +0100 +++ new/lldpd-1.0.17/aclocal.m4 2023-05-18 16:12:18.000000000 +0200 @@ -20,8 +20,8 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) dnl Copyright © 2004 Scott James Remnant <[email protected]>. dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> @@ -63,7 +63,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -108,7 +108,7 @@ dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], @@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -174,17 +174,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -195,8 +195,8 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -206,10 +206,10 @@ To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl ]) else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - $3 + $3 fi[]dnl ])dnl PKG_CHECK_MODULES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/configure new/lldpd-1.0.17/configure --- old/lldpd-1.0.16/configure 2022-11-11 14:25:59.000000000 +0100 +++ new/lldpd-1.0.17/configure 2023-05-18 16:12:18.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for lldpd 1.0.16. +# Generated by GNU Autoconf 2.71 for lldpd 1.0.17. # # Report bugs to <https://github.com/lldpd/lldpd/issues>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='lldpd' PACKAGE_TARNAME='lldpd' -PACKAGE_VERSION='1.0.16' -PACKAGE_STRING='lldpd 1.0.16' +PACKAGE_VERSION='1.0.17' +PACKAGE_STRING='lldpd 1.0.17' PACKAGE_BUGREPORT='https://github.com/lldpd/lldpd/issues' PACKAGE_URL='https://lldpd.github.io/' @@ -672,8 +672,8 @@ USE_SNMP_TRUE HAVE_CHECK_FALSE HAVE_CHECK_TRUE -BUILD_FUZZER_FALSE -BUILD_FUZZER_TRUE +ENABLE_FUZZ_DECODE_FALSE +ENABLE_FUZZ_DECODE_TRUE LLDP_BIN_LDFLAGS LLDP_LDFLAGS LLDP_CPPFLAGS @@ -744,7 +744,7 @@ HOST_OS_FREEBSD_TRUE HOST_OS_LINUX_FALSE HOST_OS_LINUX_TRUE -FUZZENGINE +FUZZ_DECODE_ENGINE DOXYGEN_PAPER_SIZE DX_COND_latex_FALSE DX_COND_latex_TRUE @@ -1551,7 +1551,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lldpd 1.0.16 to adapt to many kinds of systems. +\`configure' configures lldpd 1.0.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1622,7 +1622,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lldpd 1.0.16:";; + short | recursive ) echo "Configuration of lldpd 1.0.17:";; esac cat <<\_ACEOF @@ -1841,7 +1841,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lldpd configure 1.0.16 +lldpd configure 1.0.17 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2257,7 +2257,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lldpd $as_me 1.0.16, which was +It was created by lldpd $as_me 1.0.17, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3540,7 +3540,7 @@ # Define the identity of the package. PACKAGE='lldpd' - VERSION='1.0.16' + VERSION='1.0.17' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -16965,6 +16965,138 @@ ;; esac +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -fno-omit-frame-pointer" >&5 +printf %s "checking CFLAGS for gcc -fno-omit-frame-pointer... " >&6; } +if test ${ac_cv_cflags_gcc_option__fno_omit_frame_pointer+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_cflags_gcc_option__fno_omit_frame_pointer="no, unknown" + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_save_CFLAGS="$CFLAGS" +for ac_arg in "-pedantic -Werror % -fno-omit-frame-pointer" "-pedantic % -fno-omit-frame-pointer %% no, obsolete" # +do CFLAGS="$ac_save_CFLAGS $LLDP_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_cflags_gcc_option__fno_omit_frame_pointer=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +done + CFLAGS="$ac_save_CFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&5 +printf "%s\n" "$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&6; } +ac_res=$ac_cv_cflags_gcc_option__fno_omit_frame_pointer +case ".${ac_res}" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) + if echo " $LLDP_CFLAGS " | grep " ${ac_res} " 2>&1 >/dev/null + then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LLDP_CFLAGS does contain \${ac_res}"; } >&5 + (: LLDP_CFLAGS does contain ${ac_res}) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LLDP_CFLAGS=\"\$LLDP_CFLAGS \${ac_res}\""; } >&5 + (: LLDP_CFLAGS="$LLDP_CFLAGS ${ac_res}") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + LLDP_CFLAGS="$LLDP_CFLAGS ${ac_res}" + fi + ;; +esac + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -funsigned-char" >&5 +printf %s "checking CFLAGS for gcc -funsigned-char... " >&6; } +if test ${ac_cv_cflags_gcc_option__funsigned_char+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_cflags_gcc_option__funsigned_char="no, unknown" + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_save_CFLAGS="$CFLAGS" +for ac_arg in "-pedantic -Werror % -funsigned-char" "-pedantic % -funsigned-char %% no, obsolete" # +do CFLAGS="$ac_save_CFLAGS $LLDP_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_cflags_gcc_option__funsigned_char=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +done + CFLAGS="$ac_save_CFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__funsigned_char" >&5 +printf "%s\n" "$ac_cv_cflags_gcc_option__funsigned_char" >&6; } +ac_res=$ac_cv_cflags_gcc_option__funsigned_char +case ".${ac_res}" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) + if echo " $LLDP_CFLAGS " | grep " ${ac_res} " 2>&1 >/dev/null + then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LLDP_CFLAGS does contain \${ac_res}"; } >&5 + (: LLDP_CFLAGS does contain ${ac_res}) 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LLDP_CFLAGS=\"\$LLDP_CFLAGS \${ac_res}\""; } >&5 + (: LLDP_CFLAGS="$LLDP_CFLAGS ${ac_res}") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + LLDP_CFLAGS="$LLDP_CFLAGS ${ac_res}" + fi + ;; +esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -pipe" >&5 printf %s "checking CFLAGS for gcc -pipe... " >&6; } if test ${ac_cv_cflags_gcc_option__pipe+y} @@ -17757,72 +17889,6 @@ ;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -fno-omit-frame-pointer" >&5 -printf %s "checking CFLAGS for gcc -fno-omit-frame-pointer... " >&6; } -if test ${ac_cv_cflags_gcc_option__fno_omit_frame_pointer+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_cflags_gcc_option__fno_omit_frame_pointer="no, unknown" - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_save_CFLAGS="$CFLAGS" -for ac_arg in "-pedantic -Werror % -fno-omit-frame-pointer" "-pedantic % -fno-omit-frame-pointer %% no, obsolete" # -do CFLAGS="$ac_save_CFLAGS $LLDP_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_cflags_gcc_option__fno_omit_frame_pointer=`echo $ac_arg | sed -e 's,.*% *,,'` ; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -done - CFLAGS="$ac_save_CFLAGS" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&5 -printf "%s\n" "$ac_cv_cflags_gcc_option__fno_omit_frame_pointer" >&6; } -ac_res=$ac_cv_cflags_gcc_option__fno_omit_frame_pointer -case ".${ac_res}" in - .ok|.ok,*) ;; - .|.no|.no,*) ;; - *) - if echo " $LLDP_CFLAGS " | grep " ${ac_res} " 2>&1 >/dev/null - then { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LLDP_CFLAGS does contain \${ac_res}"; } >&5 - (: LLDP_CFLAGS does contain ${ac_res}) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - else { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LLDP_CFLAGS=\"\$LLDP_CFLAGS \${ac_res}\""; } >&5 - (: LLDP_CFLAGS="$LLDP_CFLAGS ${ac_res}") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - LLDP_CFLAGS="$LLDP_CFLAGS ${ac_res}" - fi - ;; -esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -Wno-cast-align" >&5 printf %s "checking CFLAGS for gcc -Wno-cast-align... " >&6; } if test ${ac_cv_cflags_gcc_option__Wno_cast_align+y} @@ -19095,7 +19161,7 @@ fi -#Fuzzer +# Fuzzer # Check whether --enable-fuzzer was given. if test ${enable_fuzzer+y} then : @@ -19106,7 +19172,7 @@ *) fuzzer="$enableval" ;; esac if test x"$fuzzer" != x; then - FUZZENGINE="$fuzzer" + FUZZ_DECODE_ENGINE="$fuzzer" fi @@ -19975,7 +20041,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include<stdio.h> int main (void) { @@ -20580,8 +20646,8 @@ fi pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbsd" >&5 -printf %s "checking for libbsd... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbsd-overlay" >&5 +printf %s "checking for libbsd-overlay... " >&6; } if test -n "$libbsd_CFLAGS"; then pkg_cv_libbsd_CFLAGS="$libbsd_CFLAGS" @@ -20621,7 +20687,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -20630,12 +20696,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libbsd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbsd-overlay" 2>&1` + libbsd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbsd-overlay" 2>&1` else - libbsd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbsd-overlay" 2>&1` + libbsd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbsd-overlay" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$libbsd_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$libbsd_PKG_ERRORS" >&5 if test x"$with_libbsd" = x"yes"; then @@ -20647,7 +20713,7 @@ with_libbsd=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if test x"$with_libbsd" = x"yes"; then @@ -20659,8 +20725,8 @@ with_libbsd=no else - libbsd_CFLAGS=$pkg_cv_libbsd_CFLAGS - libbsd_LIBS=$pkg_cv_libbsd_LIBS + libbsd_CFLAGS=$pkg_cv_libbsd_CFLAGS + libbsd_LIBS=$pkg_cv_libbsd_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -21010,8 +21076,8 @@ ## Unit tests wich check pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for check" >&5 -printf %s "checking for check... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for check >= 0.9.4" >&5 +printf %s "checking for check >= 0.9.4... " >&6; } if test -n "$check_CFLAGS"; then pkg_cv_check_CFLAGS="$check_CFLAGS" @@ -21051,7 +21117,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -21060,24 +21126,24 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - check_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.4" 2>&1` + check_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check >= 0.9.4" 2>&1` else - check_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.4" 2>&1` + check_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check >= 0.9.4" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$check_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$check_PKG_ERRORS" >&5 - have_check=no + have_check=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - have_check=no + have_check=no else - check_CFLAGS=$pkg_cv_check_CFLAGS - check_LIBS=$pkg_cv_check_LIBS + check_CFLAGS=$pkg_cv_check_CFLAGS + check_LIBS=$pkg_cv_check_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - have_check=yes + have_check=yes fi # Third-party libraries @@ -21098,8 +21164,8 @@ # If not forced, check first with pkg-config pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libevent" >&5 -printf %s "checking for libevent... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libevent >= 2.0.5" >&5 +printf %s "checking for libevent >= 2.0.5... " >&6; } if test -n "$libevent_CFLAGS"; then pkg_cv_libevent_CFLAGS="$libevent_CFLAGS" @@ -21139,7 +21205,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -21148,12 +21214,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libevent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent >= 2.0.5" 2>&1` + libevent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libevent >= 2.0.5" 2>&1` else - libevent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent >= 2.0.5" 2>&1` + libevent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libevent >= 2.0.5" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$libevent_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$libevent_PKG_ERRORS" >&5 # No appropriate version, let's use the shipped copy if possible @@ -21166,7 +21232,7 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } # No appropriate version, let's use the shipped copy if possible @@ -21179,8 +21245,8 @@ fi else - libevent_CFLAGS=$pkg_cv_libevent_CFLAGS - libevent_LIBS=$pkg_cv_libevent_LIBS + libevent_CFLAGS=$pkg_cv_libevent_CFLAGS + libevent_LIBS=$pkg_cv_libevent_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -21390,8 +21456,8 @@ pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcap" >&5 -printf %s "checking for libcap... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcap >= 2" >&5 +printf %s "checking for libcap >= 2... " >&6; } if test -n "$libcap_CFLAGS"; then pkg_cv_libcap_CFLAGS="$libcap_CFLAGS" @@ -21431,7 +21497,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -21440,12 +21506,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libcap_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcap >= 2" 2>&1` + libcap_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcap >= 2" 2>&1` else - libcap_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcap >= 2" 2>&1` + libcap_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcap >= 2" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$libcap_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$libcap_PKG_ERRORS" >&5 libcap_LIBS=-lcap @@ -21490,7 +21556,7 @@ LIBS="$_save_libs" elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } libcap_LIBS=-lcap @@ -21535,8 +21601,8 @@ LIBS="$_save_libs" else - libcap_CFLAGS=$pkg_cv_libcap_CFLAGS - libcap_LIBS=$pkg_cv_libcap_LIBS + libcap_CFLAGS=$pkg_cv_libcap_CFLAGS + libcap_LIBS=$pkg_cv_libcap_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22035,8 +22101,8 @@ if test x"$with_xml" != x"no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5 -printf %s "checking for libxml2... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5 +printf %s "checking for libxml-2.0... " >&6; } if test -n "$libxml2_CFLAGS"; then pkg_cv_libxml2_CFLAGS="$libxml2_CFLAGS" @@ -22076,7 +22142,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22085,12 +22151,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1` + libxml2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1` else - libxml2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1` + libxml2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$libxml2_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$libxml2_PKG_ERRORS" >&5 if test -n "$ac_tool_prefix"; then @@ -22269,7 +22335,7 @@ fi elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if test -n "$ac_tool_prefix"; then @@ -22448,8 +22514,8 @@ fi else - libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS - libxml2_LIBS=$pkg_cv_libxml2_LIBS + libxml2_CFLAGS=$pkg_cv_libxml2_CFLAGS + libxml2_LIBS=$pkg_cv_libxml2_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -22500,8 +22566,8 @@ if test x"$with_seccomp" != x"no"; then pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseccomp" >&5 -printf %s "checking for libseccomp... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseccomp >= 1" >&5 +printf %s "checking for libseccomp >= 1... " >&6; } if test -n "$libseccomp_CFLAGS"; then pkg_cv_libseccomp_CFLAGS="$libseccomp_CFLAGS" @@ -22541,7 +22607,7 @@ if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22550,12 +22616,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libseccomp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseccomp >= 1" 2>&1` + libseccomp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseccomp >= 1" 2>&1` else - libseccomp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseccomp >= 1" 2>&1` + libseccomp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseccomp >= 1" 2>&1` fi - # Put the nasty error message in config.log where it belongs - echo "$libseccomp_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$libseccomp_PKG_ERRORS" >&5 if test x"$with_seccomp" = x"yes"; then @@ -22567,7 +22633,7 @@ with_seccomp=no elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } if test x"$with_seccomp" = x"yes"; then @@ -22579,8 +22645,8 @@ with_seccomp=no else - libseccomp_CFLAGS=$pkg_cv_libseccomp_CFLAGS - libseccomp_LIBS=$pkg_cv_libseccomp_LIBS + libseccomp_CFLAGS=$pkg_cv_libseccomp_CFLAGS + libseccomp_LIBS=$pkg_cv_libseccomp_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } @@ -23728,11 +23794,11 @@ if test x"$fuzzer" != x; then - BUILD_FUZZER_TRUE= - BUILD_FUZZER_FALSE='#' + ENABLE_FUZZ_DECODE_TRUE= + ENABLE_FUZZ_DECODE_FALSE='#' else - BUILD_FUZZER_TRUE='#' - BUILD_FUZZER_FALSE= + ENABLE_FUZZ_DECODE_TRUE='#' + ENABLE_FUZZ_DECODE_FALSE= fi if test x"$have_check" = x"yes"; then @@ -24011,8 +24077,8 @@ as_fn_error $? "conditional \"ENABLE_SYSTEMTAP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_FUZZER_TRUE}" && test -z "${BUILD_FUZZER_FALSE}"; then - as_fn_error $? "conditional \"BUILD_FUZZER\" was never defined. +if test -z "${ENABLE_FUZZ_DECODE_TRUE}" && test -z "${ENABLE_FUZZ_DECODE_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_FUZZ_DECODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then @@ -24421,7 +24487,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lldpd $as_me 1.0.16, which was +This file was extended by lldpd $as_me 1.0.17, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24490,7 +24556,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -lldpd config.status 1.0.16 +lldpd config.status 1.0.17 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/configure.ac new/lldpd-1.0.17/configure.ac --- old/lldpd-1.0.16/configure.ac 2022-11-04 21:22:25.000000000 +0100 +++ new/lldpd-1.0.17/configure.ac 2023-05-18 16:08:38.000000000 +0200 @@ -76,6 +76,8 @@ AX_CFLAGS_GCC_OPTION([-Wunknown-warning-option], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-fdiagnostics-show-option], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-fdiagnostics-color=auto], [LLDP_CFLAGS]) +AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer], [LLDP_CFLAGS]) +AX_CFLAGS_GCC_OPTION([-funsigned-char], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-pipe], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-Wall], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-W], [LLDP_CFLAGS]) @@ -88,7 +90,6 @@ AX_CFLAGS_GCC_OPTION([-Wdocumentation], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-Winline], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-Wpointer-arith], [LLDP_CFLAGS]) -AX_CFLAGS_GCC_OPTION([-fno-omit-frame-pointer], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-Wno-cast-align], [LLDP_CFLAGS]) dnl clang is bad at this AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter], [LLDP_CFLAGS]) AX_CFLAGS_GCC_OPTION([-Wno-missing-field-initializers], [LLDP_CFLAGS]) @@ -146,7 +147,7 @@ fi ]) -#Fuzzer +# Fuzzer AC_ARG_ENABLE([fuzzer], AS_HELP_STRING([--enable-fuzzer], [Enable fuzzing @<:@default=no@:>@]), @@ -157,7 +158,7 @@ *) fuzzer="$enableval" ;; esac if test x"$fuzzer" != x; then - AC_SUBST([FUZZENGINE], ["$fuzzer"]) + AC_SUBST([FUZZ_DECODE_ENGINE], ["$fuzzer"]) fi ]) @@ -419,7 +420,7 @@ AC_SUBST([LLDP_CPPFLAGS]) AC_SUBST([LLDP_LDFLAGS]) AC_SUBST([LLDP_BIN_LDFLAGS]) -AM_CONDITIONAL([BUILD_FUZZER], [test x"$fuzzer" != x]) +AM_CONDITIONAL([ENABLE_FUZZ_DECODE], [test x"$fuzzer" != x]) AM_CONDITIONAL([HAVE_CHECK], [test x"$have_check" = x"yes"]) AM_CONDITIONAL([USE_SNMP], [test x"$with_snmp" = x"yes"]) AM_CONDITIONAL([USE_XML], [test x"$with_xml" = x"yes"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/libevent/build-aux/ltmain.sh new/lldpd-1.0.17/libevent/build-aux/ltmain.sh --- old/lldpd-1.0.16/libevent/build-aux/ltmain.sh 2022-11-11 14:25:53.000000000 +0100 +++ new/lldpd-1.0.17/libevent/build-aux/ltmain.sh 2023-05-18 16:12:12.000000000 +0200 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-4" +VERSION="2.4.7 Debian-2.4.7-5" package_revision=2.4.7 @@ -2308,7 +2308,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-4 + version: $progname $scriptversion Debian-2.4.7-5 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/ltmain.sh new/lldpd-1.0.17/ltmain.sh --- old/lldpd-1.0.16/ltmain.sh 2022-11-11 14:25:56.000000000 +0100 +++ new/lldpd-1.0.17/ltmain.sh 2023-05-18 16:12:15.000000000 +0200 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.7 Debian-2.4.7-4" +VERSION="2.4.7 Debian-2.4.7-5" package_revision=2.4.7 @@ -2308,7 +2308,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.7-4 + version: $progname $scriptversion Debian-2.4.7-5 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/m4/progname.m4 new/lldpd-1.0.17/m4/progname.m4 --- old/lldpd-1.0.16/m4/progname.m4 2021-08-25 08:38:48.000000000 +0200 +++ new/lldpd-1.0.17/m4/progname.m4 2022-12-09 19:58:43.000000000 +0100 @@ -4,7 +4,7 @@ AC_DEFUN([lldp_CHECK___PROGNAME],[ AC_CACHE_CHECK([whether libc defines __progname], lldp_cv_check___progname, [ AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[]], + [[#include<stdio.h>]], [[ extern char *__progname; printf("%s", __progname); ]])], [ lldp_cv_check___progname="yes" ], [ lldp_cv_check___progname="no" ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/osx/Makefile.in new/lldpd-1.0.17/osx/Makefile.in --- old/lldpd-1.0.16/osx/Makefile.in 2022-11-11 14:25:59.000000000 +0100 +++ new/lldpd-1.0.17/osx/Makefile.in 2023-05-18 16:12:19.000000000 +0200 @@ -221,7 +221,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/Makefile.in new/lldpd-1.0.17/src/Makefile.in --- old/lldpd-1.0.16/src/Makefile.in 2022-11-11 14:25:59.000000000 +0100 +++ new/lldpd-1.0.17/src/Makefile.in 2023-05-18 16:12:19.000000000 +0200 @@ -280,7 +280,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/client/Makefile.in new/lldpd-1.0.17/src/client/Makefile.in --- old/lldpd-1.0.16/src/client/Makefile.in 2022-11-11 14:26:00.000000000 +0100 +++ new/lldpd-1.0.17/src/client/Makefile.in 2023-05-18 16:12:20.000000000 +0200 @@ -314,7 +314,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/client/lldpcli.8.in new/lldpd-1.0.17/src/client/lldpcli.8.in --- old/lldpd-1.0.16/src/client/lldpcli.8.in 2022-09-22 23:14:30.000000000 +0200 +++ new/lldpd-1.0.17/src/client/lldpcli.8.in 2022-11-12 13:09:46.000000000 +0100 @@ -496,6 +496,24 @@ .Ed .Cd configure +.Cd lldp capabilities-advertisements +.Pp +.Cd unconfigure +.Cd lldp capabilities-advertisements +.Bd -ragged -offset XXXXXX +Enable or disable advertisements of the chassis capabilities TLV. +.Ed + +.Cd configure +.Cd lldp management-addresses-advertisements +.Pp +.Cd unconfigure +.Cd lldp management-addresses-advertisements +.Bd -ragged -offset XXXXXX +Enable or disable advertisements of the management address TLV. +.Ed + +.Cd configure .Cd lldp portidsubtype .Cd ifname | macaddress .Pp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/client/text_writer.c new/lldpd-1.0.17/src/client/text_writer.c --- old/lldpd-1.0.16/src/client/text_writer.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/src/client/text_writer.c 2023-04-21 22:30:25.000000000 +0200 @@ -17,6 +17,7 @@ #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <string.h> #include "writer.h" @@ -29,9 +30,28 @@ FILE *fh; int level; int attrs; + int lastnl; }; static void +txt_fprintf(struct txt_writer_private *p, const char *fmt, ...) +{ + va_list ap; + + // Don't add a newline if we already had one. + while (p->lastnl && fmt[0] == '\n') { + fmt += 1; + } + if (fmt[0] == '\0') return; + + va_start(ap, fmt); + vfprintf(p->fh, fmt, ap); + va_end(ap); + + p->lastnl = (strlen(fmt) > 0 && fmt[strlen(fmt) - 1] == '\n'); +} + +static void txt_start(struct writer *w, const char *tag, const char *descr) { struct txt_writer_private *p = w->priv; @@ -39,19 +59,19 @@ char buf[128]; if (p->level == 0) { - fprintf(p->fh, "%s\n", sep); - } else { - fprintf(p->fh, "\n"); + txt_fprintf(p, "%s\n", sep); + } else if (!p->lastnl) { + txt_fprintf(p, "\n"); } for (i = 1; i < p->level; i++) { - fprintf(p->fh, " "); + txt_fprintf(p, " "); } snprintf(buf, sizeof(buf), "%s:", descr); - fprintf(p->fh, "%-13s", buf); + txt_fprintf(p, "%-13s", buf); - if (p->level == 0) fprintf(p->fh, "\n%s", sep); + if (p->level == 0) txt_fprintf(p, "\n%s", sep); p->level++; p->attrs = 0; @@ -63,10 +83,10 @@ struct txt_writer_private *p = w->priv; if (descr == NULL || strlen(descr) == 0) { - fprintf(p->fh, "%s%s", (p->attrs > 0 ? ", " : " "), + txt_fprintf(p, "%s%s", (p->attrs > 0 ? ", " : " "), value ? value : "(none)"); } else { - fprintf(p->fh, "%s%s: %s", (p->attrs > 0 ? ", " : " "), descr, + txt_fprintf(p, "%s%s: %s", (p->attrs > 0 ? ", " : " "), descr, value ? value : "(none)"); } @@ -81,24 +101,24 @@ char *v = begin = data ? strdup(data) : NULL; if (v == NULL) { - fprintf(p->fh, " %s", data ? data : "(none)"); + txt_fprintf(p, " %s", data ? data : "(none)"); return; } - fprintf(p->fh, " "); + txt_fprintf(p, " "); while ((nl = strchr(v, '\n')) != NULL) { *nl = '\0'; - fprintf(p->fh, "%s\n", v); + txt_fprintf(p, "%s\n", v); v = nl + 1; /* Indent */ int i; for (i = 1; i < p->level - 1; i++) { - fprintf(p->fh, " "); + txt_fprintf(p, " "); } - fprintf(p->fh, "%-14s", " "); + txt_fprintf(p, "%-14s", " "); } - fprintf(p->fh, "%s", v); + txt_fprintf(p, "%s", v); free(begin); } @@ -109,7 +129,7 @@ p->level--; if (p->level == 1) { - fprintf(p->fh, "\n%s", sep); + txt_fprintf(p, "\n%s", sep); fflush(p->fh); } } @@ -119,7 +139,7 @@ { struct txt_writer_private *p = w->priv; - fprintf(p->fh, "\n"); + txt_fprintf(p, "\n"); free(w->priv); w->priv = NULL; @@ -143,6 +163,7 @@ priv->fh = fh; priv->level = 0; priv->attrs = 0; + priv->lastnl = 1; result = malloc(sizeof(struct writer)); if (!result) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/compat/Makefile.in new/lldpd-1.0.17/src/compat/Makefile.in --- old/lldpd-1.0.16/src/compat/Makefile.in 2022-11-11 14:26:00.000000000 +0100 +++ new/lldpd-1.0.17/src/compat/Makefile.in 2023-05-18 16:12:20.000000000 +0200 @@ -247,7 +247,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/daemon/Makefile.in new/lldpd-1.0.17/src/daemon/Makefile.in --- old/lldpd-1.0.16/src/daemon/Makefile.in 2022-11-11 14:26:00.000000000 +0100 +++ new/lldpd-1.0.17/src/daemon/Makefile.in 2023-05-18 16:12:20.000000000 +0200 @@ -462,7 +462,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/daemon/interfaces-bsd.c new/lldpd-1.0.17/src/daemon/interfaces-bsd.c --- old/lldpd-1.0.16/src/daemon/interfaces-bsd.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/src/daemon/interfaces-bsd.c 2023-02-11 14:41:08.000000000 +0100 @@ -310,7 +310,9 @@ int i; if (strncmp(iface->name, "p2p", 3)) continue; if (strlen(iface->name) < 4) continue; - for (i = 3; iface->name[i] != '\0' && isdigit(iface->name[i]); i++) + for (i = 3; + iface->name[i] != '\0' && isdigit((unsigned char)(iface->name[i])); + i++) ; if (iface->name[i] == '\0') { log_debug("interfaces", "skip %s: AirDrop interface", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/daemon/interfaces-linux.c new/lldpd-1.0.17/src/daemon/interfaces-linux.c --- old/lldpd-1.0.16/src/daemon/interfaces-linux.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/src/daemon/interfaces-linux.c 2022-12-29 21:58:57.000000000 +0100 @@ -523,7 +523,7 @@ static void iflinux_macphy(struct lldpd *cfg, struct lldpd_hardware *hardware) { - struct ethtool_link_usettings uset; + struct ethtool_link_usettings uset = {}; struct lldpd_port *port = &hardware->h_lport; int j; int advertised_ethtool_to_rfc3636[][2] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/daemon/protocols/cdp.c new/lldpd-1.0.17/src/daemon/protocols/cdp.c --- old/lldpd-1.0.16/src/daemon/protocols/cdp.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/src/daemon/protocols/cdp.c 2023-04-12 20:42:02.000000000 +0200 @@ -466,6 +466,7 @@ goto malformed; } PEEK_DISCARD(address_len); + addresses_len -= address_len; (void)PEEK_SAVE(pos_next_address); /* Next, we go back and try to extract IPv4 address */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/lib/Makefile.in new/lldpd-1.0.17/src/lib/Makefile.in --- old/lldpd-1.0.16/src/lib/Makefile.in 2022-11-11 14:26:00.000000000 +0100 +++ new/lldpd-1.0.17/src/lib/Makefile.in 2023-05-18 16:12:20.000000000 +0200 @@ -297,7 +297,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/src/lib/atoms/chassis.c new/lldpd-1.0.17/src/lib/atoms/chassis.c --- old/lldpd-1.0.16/src/lib/atoms/chassis.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/src/lib/atoms/chassis.c 2023-04-18 07:18:51.000000000 +0200 @@ -290,7 +290,6 @@ default: return SET_ERROR(atom->conn, LLDPCTL_ERR_NOT_EXIST); } - return SET_ERROR(atom->conn, LLDPCTL_ERR_NOT_EXIST); } static const uint8_t * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/tests/Makefile.am new/lldpd-1.0.17/tests/Makefile.am --- old/lldpd-1.0.16/tests/Makefile.am 2022-11-05 20:19:45.000000000 +0100 +++ new/lldpd-1.0.17/tests/Makefile.am 2022-12-29 22:43:55.000000000 +0100 @@ -3,12 +3,19 @@ AM_LDFLAGS = $(LLDP_LDFLAGS) $(LLDP_BIN_LDFLAGS) check_PROGRAMS = decode - decode_SOURCES = decode.c \ $(top_srcdir)/src/daemon/lldpd.h \ pcap-hdr.h -LDADD = $(top_builddir)/src/daemon/liblldpd.la @check_LIBS@ @libevent_LDFLAGS@ +if ENABLE_FUZZ_DECODE +noinst_PROGRAMS = fuzz-decode +fuzz_decode_CFLAGS = $(AM_CFLAGS) -DFUZZ_DECODE +fuzz_decode_LDADD = $(FUZZ_DECODE_ENGINE) $(LDADD) +fuzz_decode_SOURCES = decode.c \ + $(top_srcdir)/src/daemon/lldpd.h +endif + +LDADD = $(top_builddir)/src/daemon/liblldpd.la @libevent_LDFLAGS@ if ENABLE_SYSTEMTAP LDADD += $(top_builddir)/src/daemon/probes.o endif @@ -63,11 +70,4 @@ endif -if BUILD_FUZZER -noinst_PROGRAMS = fuzz-decode -fuzz_decode_CFLAGS = -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fPIE -fuzz_decode_SOURCES = decode.c $(top_srcdir)/src/daemon/lldpd.h -fuzz_decode_LDADD = $(LDADD) $(FUZZENGINE) -endif - MOSTLYCLEANFILES = *.pcap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/tests/Makefile.in new/lldpd-1.0.17/tests/Makefile.in --- old/lldpd-1.0.16/tests/Makefile.in 2022-11-11 14:26:00.000000000 +0100 +++ new/lldpd-1.0.17/tests/Makefile.in 2023-05-18 16:12:20.000000000 +0200 @@ -89,6 +89,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = decode$(EXEEXT) $(am__EXEEXT_3) +@ENABLE_FUZZ_DECODE_TRUE@noinst_PROGRAMS = fuzz-decode$(EXEEXT) @ENABLE_SYSTEMTAP_TRUE@am__append_1 = $(top_builddir)/src/daemon/probes.o @USE_SNMP_TRUE@am__append_2 = @NETSNMP_LIBS@ @HAVE_CHECK_TRUE@TESTS = check_marshal$(EXEEXT) check_pattern$(EXEEXT) \ @@ -100,7 +101,6 @@ @HAVE_CHECK_TRUE@am__append_4 = @check_LIBS@ @HAVE_CHECK_TRUE@@USE_SNMP_TRUE@am__append_5 = check_snmp @HAVE_CHECK_TRUE@am__append_6 = $(TESTS) -@BUILD_FUZZER_TRUE@noinst_PROGRAMS = fuzz-decode$(EXEEXT) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/alignof.m4 \ @@ -222,11 +222,12 @@ $(am__append_1) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__fuzz_decode_SOURCES_DIST = decode.c \ $(top_srcdir)/src/daemon/lldpd.h -@BUILD_FUZZER_TRUE@am_fuzz_decode_OBJECTS = \ -@BUILD_FUZZER_TRUE@ fuzz_decode-decode.$(OBJEXT) +@ENABLE_FUZZ_DECODE_TRUE@am_fuzz_decode_OBJECTS = \ +@ENABLE_FUZZ_DECODE_TRUE@ fuzz_decode-decode.$(OBJEXT) fuzz_decode_OBJECTS = $(am_fuzz_decode_OBJECTS) -@BUILD_FUZZER_TRUE@fuzz_decode_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -@BUILD_FUZZER_TRUE@ $(am__DEPENDENCIES_1) +@ENABLE_FUZZ_DECODE_TRUE@fuzz_decode_DEPENDENCIES = \ +@ENABLE_FUZZ_DECODE_TRUE@ $(am__DEPENDENCIES_1) \ +@ENABLE_FUZZ_DECODE_TRUE@ $(am__DEPENDENCIES_2) fuzz_decode_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fuzz_decode_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -571,7 +572,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FILECMD = @FILECMD@ -FUZZENGINE = @FUZZENGINE@ +FUZZ_DECODE_ENGINE = @FUZZ_DECODE_ENGINE@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -712,9 +713,13 @@ $(top_srcdir)/src/daemon/lldpd.h \ pcap-hdr.h -LDADD = $(top_builddir)/src/daemon/liblldpd.la @check_LIBS@ \ - @libevent_LDFLAGS@ $(am__append_1) $(am__append_2) \ - $(am__append_4) +@ENABLE_FUZZ_DECODE_TRUE@fuzz_decode_CFLAGS = $(AM_CFLAGS) -DFUZZ_DECODE +@ENABLE_FUZZ_DECODE_TRUE@fuzz_decode_LDADD = $(FUZZ_DECODE_ENGINE) $(LDADD) +@ENABLE_FUZZ_DECODE_TRUE@fuzz_decode_SOURCES = decode.c \ +@ENABLE_FUZZ_DECODE_TRUE@ $(top_srcdir)/src/daemon/lldpd.h + +LDADD = $(top_builddir)/src/daemon/liblldpd.la @libevent_LDFLAGS@ \ + $(am__append_1) $(am__append_2) $(am__append_4) @HAVE_CHECK_TRUE@check_marshal_SOURCES = check_marshal.c \ @HAVE_CHECK_TRUE@ $(top_srcdir)/src/marshal.h \ @HAVE_CHECK_TRUE@ check-compat.h @@ -747,9 +752,6 @@ @HAVE_CHECK_TRUE@@USE_SNMP_TRUE@ $(top_srcdir)/src/daemon/lldpd.h \ @HAVE_CHECK_TRUE@@USE_SNMP_TRUE@ $(top_srcdir)/src/daemon/agent.h -@BUILD_FUZZER_TRUE@fuzz_decode_CFLAGS = -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -fPIE -@BUILD_FUZZER_TRUE@fuzz_decode_SOURCES = decode.c $(top_srcdir)/src/daemon/lldpd.h -@BUILD_FUZZER_TRUE@fuzz_decode_LDADD = $(LDADD) $(FUZZENGINE) MOSTLYCLEANFILES = *.pcap all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/tests/check_snmp.c new/lldpd-1.0.17/tests/check_snmp.c --- old/lldpd-1.0.16/tests/check_snmp.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/tests/check_snmp.c 2023-05-18 16:08:38.000000000 +0200 @@ -1058,7 +1058,7 @@ "Inappropriate length for integer type for OID %s", repr); memcpy(&value, result, sizeof(value)); fail_unless(n->value.integer == value, - "For OID %s, expected value %u but got %u instead", repr, + "For OID %s, expected value %lu but got %lu instead", repr, n->value.integer, value); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lldpd-1.0.16/tests/decode.c new/lldpd-1.0.17/tests/decode.c --- old/lldpd-1.0.16/tests/decode.c 2022-11-06 12:45:34.000000000 +0100 +++ new/lldpd-1.0.17/tests/decode.c 2022-12-29 22:44:53.000000000 +0100 @@ -27,19 +27,6 @@ #define BUFSIZE 2000 -static void -usage(void) -{ - fprintf(stderr, "Usage: %s PCAP\n", "decode"); - fprintf(stderr, "Version: %s\n", PACKAGE_STRING); - - fprintf(stderr, "\n"); - - fprintf(stderr, "Decode content of PCAP files and display a summary\n"); - fprintf(stderr, "on standard output. Only the first packet is decoded.\n"); - exit(1); -} - char * tohex(char *str, size_t len) { @@ -103,7 +90,7 @@ return decoded; } -#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +#ifdef FUZZ_DECODE # define kMinInputLength 30 # define kMaxInputLength 1500 @@ -128,6 +115,19 @@ #else +static void +usage(void) +{ + fprintf(stderr, "Usage: %s PCAP\n", "decode"); + fprintf(stderr, "Version: %s\n", PACKAGE_STRING); + + fprintf(stderr, "\n"); + + fprintf(stderr, "Decode content of PCAP files and display a summary\n"); + fprintf(stderr, "on standard output. Only the first packet is decoded.\n"); + exit(1); +} + int main(int argc, char **argv) { ++++++ lldpd.keyring ++++++ --- /var/tmp/diff_new_pack.Hpabij/_old 2023-05-30 22:03:35.183414827 +0200 +++ /var/tmp/diff_new_pack.Hpabij/_new 2023-05-30 22:03:35.187414851 +0200 @@ -1,6 +1,6 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- +Version: Hockeypuck 2.1.0-222-g25248d4 Comment: Hostname: -Version: Hockeypuck 2.1.0-184-g50f1108 xsFNBE/cpVkBEACi8ZoEu+dhI604/5zMuuAlPt7e1GDj75UgXZh5f21JYRt/laVs xiK07BG9NkTCpFzoAFRfndf7HvvTcKrumgPUFw0bYy9uvkrDDAzRV3slA+rL+n6h
