Control: tags -1 +patch +pending Dear maintainer,
I've prepared an NMU for argus-clients (versioned as 1:3.0.8.2-6.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. diff -Nru argus-clients-3.0.8.2/debian/changelog argus-clients- 3.0.8.2/debian/changelog --- argus-clients-3.0.8.2/debian/changelog 2020-07-29 15:25:38.000000000 -0400 +++ argus-clients-3.0.8.2/debian/changelog 2021-10-01 16:44:40.000000000 -0400 @@ -1,3 +1,18 @@ +argus-clients (1:3.0.8.2-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/0007-Fix-autoconf-2.70-build.patch: Fix FTBFS with + autoconf 2.70+. (Closes: #978769) + * debian/rules: Use -Wno-format-security to avoid FTBFS. + * Apply patch from Ubuntu: + + [ Tiago Stürmer Daitx ] + * Fix FTBFS: + - debian/patch/check-libtirpc.diff: link to and include tirpc headers. + (Closes: #980017) + + -- Boyuan Yang <by...@debian.org> Fri, 01 Oct 2021 16:44:40 -0400 + argus-clients (1:3.0.8.2-6) unstable; urgency=low * Fix FTBFS with gcc-10 (Closes: #957004) diff -Nru argus-clients-3.0.8.2/debian/patches/0007-Fix-autoconf-2.70- build.patch argus-clients-3.0.8.2/debian/patches/0007-Fix-autoconf-2.70- build.patch --- argus-clients-3.0.8.2/debian/patches/0007-Fix-autoconf-2.70- build.patch 1969-12-31 19:00:00.000000000 -0500 +++ argus-clients-3.0.8.2/debian/patches/0007-Fix-autoconf-2.70- build.patch 2021-10-01 16:36:27.000000000 -0400 @@ -0,0 +1,60 @@ +From: Boyuan Yang <by...@debian.org> +Date: Fri, 1 Oct 2021 16:13:38 -0400 +Subject: Fix autoconf 2.70 build + +Bug-Debian: https://bugs.debian.org/978769 +--- + acsite.m4 | 8 ++++---- + configure.ac | 12 ++++++------ + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/acsite.m4 b/acsite.m4 +index 3f3dc0c..1e6b416 100644 +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -715,13 +715,13 @@ AC_DEFUN([AC_QOSIENT_READLINE], [ + esac + fi + +- AC_CHECK_HEADERS(readline/readline.h, +- AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , +- [ ++ AC_CHECK_HEADERS([readline/readline.h], ++ [AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , ++ [[ + #include <stdlib.h> + #include <stdio.h> + #include <readline/readline.h> +- ]), ac_cv_found_readline=no) ++ ]])], [ac_cv_found_readline=no]) + + if test "$ac_cv_found_readline" != no; then + $1="-lreadline" +diff --git a/configure.ac b/configure.ac +index 1d00a16..55d0deb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,17 +41,17 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_YACC + +-AC_CHECK_PROGS(V_RANLIB, ranlib, @true) +-AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) ++AC_CHECK_PROGS([V_RANLIB], [ranlib], [@true]) ++AC_QOSIENT_LEX_AND_YACC([V_LEX], [V_YACC], [argus_]) + + # Checks for libraries. +-AC_QOSIENT_READLINE(V_READLINE, V_INCLS) ++AC_QOSIENT_READLINE([V_READLINE], [V_INCLS]) + +-CMU_SASL2(V_INCLS) ++CMU_SASL2([V_INCLS]) + AC_CMU_MYSQL + +-AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, uncompress, ZLIB="-lz")]) +-AC_QOSIENT_FLOWTOOLS(V_FLOWTOOLS, V_INCLS) ++AC_CHECK_HEADERS([zlib.h], [AC_CHECK_LIB([z], [uncompress], [ZLIB="-lz"])]) ++AC_QOSIENT_FLOWTOOLS([V_FLOWTOOLS], [V_INCLS]) + + if test ! -z "$V_FLOWTOOLS"; then + AC_DEFINE([ARGUS_FLOWTOOLS], [], [Using Flow Tools library]) diff -Nru argus-clients-3.0.8.2/debian/patches/check-libtirpc.diff argus- clients-3.0.8.2/debian/patches/check-libtirpc.diff --- argus-clients-3.0.8.2/debian/patches/check-libtirpc.diff 1969-12-31 19:00:00.000000000 -0500 +++ argus-clients-3.0.8.2/debian/patches/check-libtirpc.diff 2021-10-01 16:36:41.000000000 -0400 @@ -0,0 +1,23 @@ +Description: link to and include tirpc headers + Sun RPC is no longer part of glibc and should be replaced by TI-RPC. + . + This patch fixes a FTBFS. +Author: Tiago Stürmer Daitx <tiago.da...@ubuntu.com> +Forwarded: no +Last-Update: 2021-01-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- a/configure.ac ++++ b/configure.ac +@@ -181,6 +181,10 @@ if test ! -z "$V_WRAPDEP"; then + WRAPLIBS="$V_WRAPDEP" + fi + ++AC_CHECK_LIB([tirpc],[rpc_call],, ++ [AC_MSG_ERROR([no tirpc library, exiting...!])]) ++V_INCLS="$V_INCLS -I/usr/include/tirpc" ++ + AC_CHECK_FUNCS(xdrmem_create) + if test "$ac_cv_func_xdrmem_create" = yes ; then + AC_DEFINE([HAVE_XDR], [], [Using system XDR library]) diff -Nru argus-clients-3.0.8.2/debian/patches/series argus-clients- 3.0.8.2/debian/patches/series --- argus-clients-3.0.8.2/debian/patches/series 2020-07-29 15:25:38.000000000 -0400 +++ argus-clients-3.0.8.2/debian/patches/series 2021-10-01 16:36:27.000000000 -0400 @@ -3,3 +3,5 @@ zstd-support.diff rabins-path.diff gcc10ftbfs.diff +check-libtirpc.diff +0007-Fix-autoconf-2.70-build.patch diff -Nru argus-clients-3.0.8.2/debian/rules argus-clients- 3.0.8.2/debian/rules --- argus-clients-3.0.8.2/debian/rules 2020-07-29 15:25:38.000000000 -0400 +++ argus-clients-3.0.8.2/debian/rules 2021-10-01 16:44:35.000000000 -0400 @@ -1,4 +1,16 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +export DEB_CFLAGS_MAINT_APPEND = -Wno-format-security +# package maintainers to append LDFLAGS +export DEB_LDFLAGS_MAINT_APPEND = PACKAGE = argus-client
signature.asc
Description: This is a digitally signed message part
