Control: tags 1071933 + patch Control: tags 1071933 + pending Dear maintainer,
I've prepared an NMU for libccrtp (versioned as 2.0.9-4.1) and uploaded it to unstable. Regards.
diff -Nru libccrtp-2.0.9/debian/changelog libccrtp-2.0.9/debian/changelog --- libccrtp-2.0.9/debian/changelog 2024-05-03 20:35:11.000000000 +0200 +++ libccrtp-2.0.9/debian/changelog 2024-07-09 13:14:07.000000000 +0200 @@ -1,3 +1,12 @@ +libccrtp (2.0.9-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Delete outdated (and renamed) copy of libgcrypt.m4 and use upstream macro + instead to fix FTBFS against libgcrypt without libgcrypt-config. + Closes: #1071933 + + -- Andreas Metzler <ametz...@debian.org> Tue, 09 Jul 2024 13:14:07 +0200 + libccrtp (2.0.9-4) unstable; urgency=medium * Team upload. diff -Nru libccrtp-2.0.9/debian/patches/15_delete_outdated_libgcrypt_m4_macro.diff libccrtp-2.0.9/debian/patches/15_delete_outdated_libgcrypt_m4_macro.diff --- libccrtp-2.0.9/debian/patches/15_delete_outdated_libgcrypt_m4_macro.diff 1970-01-01 01:00:00.000000000 +0100 +++ libccrtp-2.0.9/debian/patches/15_delete_outdated_libgcrypt_m4_macro.diff 2024-07-09 13:14:07.000000000 +0200 @@ -0,0 +1,117 @@ +Description: Delete outdated (and renamed) copy of libgcrypt.m4 to fix FTBFS + against libgcrypt without libgcrypt-config. +Author: Andreas Metzler <ametz...@debian.org> +Bug-Debian: https://bugs.debian.org/1071933 +Last-Update: 2024-07-09 + +--- libccrtp-2.0.9.orig/m4/libgcrypt_local.m4 ++++ /dev/null +@@ -1,108 +0,0 @@ +-dnl Autoconf macros for libgcrypt +-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. +-dnl +-dnl This file is free software; as a special exception the author gives +-dnl unlimited permission to copy and/or distribute it, with or without +-dnl modifications, as long as this notice is preserved. +-dnl +-dnl This file is distributed in the hope that it will be useful, but +-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +- +- +-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed +-dnl with the API version to also check the API compatibility. Example: +-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed +-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using +-dnl this features allows one to prevent build against newer versions of libgcrypt +-dnl with a changed API. +-dnl +-AC_DEFUN([AM_PATH_LIBGCRYPT_CCRTP], +-[ AC_ARG_WITH(libgcrypt-prefix, +- AC_HELP_STRING([--with-libgcrypt-prefix=PFX], +- [prefix where LIBGCRYPT is installed (optional)]), +- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") +- if test x$libgcrypt_config_prefix != x ; then +- if test x${LIBGCRYPT_CONFIG+set} != xset ; then +- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config +- fi +- fi +- +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) +- tmp=ifelse([$1], ,1:1.2.0,$1) +- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then +- req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` +- else +- req_libgcrypt_api=0 +- min_libgcrypt_version="$tmp" +- fi +- +- AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) +- ok=no +- if test "$LIBGCRYPT_CONFIG" != "no" ; then +- req_major=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` +- major=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- micro=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$minor" -eq "$req_minor"; then +- if test "$micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- AC_MSG_RESULT([yes ($libgcrypt_config_version)]) +- else +- AC_MSG_RESULT(no) +- fi +- if test $ok = yes; then +- # If we have a recent libgcrypt, we should also check that the +- # API is compatible +- if test "$req_libgcrypt_api" -gt 0 ; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- AC_MSG_CHECKING([LIBGCRYPT API version]) +- if test "$req_libgcrypt_api" -eq "$tmp" ; then +- AC_MSG_RESULT([okay]) +- else +- ok=no +- AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` +- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` +- ifelse([$2], , :, [$2]) +- else +- LIBGCRYPT_CFLAGS="" +- LIBGCRYPT_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(LIBGCRYPT_CFLAGS) +- AC_SUBST(LIBGCRYPT_LIBS) +-]) diff -Nru libccrtp-2.0.9/debian/patches/16_use_gcrypt_upstream_m4.diff libccrtp-2.0.9/debian/patches/16_use_gcrypt_upstream_m4.diff --- libccrtp-2.0.9/debian/patches/16_use_gcrypt_upstream_m4.diff 1970-01-01 01:00:00.000000000 +0100 +++ libccrtp-2.0.9/debian/patches/16_use_gcrypt_upstream_m4.diff 2024-07-09 13:14:07.000000000 +0200 @@ -0,0 +1,16 @@ +Description: Use AM_PATH_LIBGCRYPT from gcrypt upstream +Author: Andreas Metzler <ametz...@debian.org> +Bug-Debian: https://bugs.debian.org/1071933 +Last-Update: 2024-07-09 + +--- libccrtp-2.0.9.orig/configure.ac ++++ libccrtp-2.0.9/configure.ac +@@ -43,7 +43,7 @@ if test "${enable_srtp}" = "yes" + then + openssl="false" + gcrypt="false" +- AM_PATH_LIBGCRYPT_CCRTP([1:1.2.3], ++ AM_PATH_LIBGCRYPT([1:1.2.3], + [AC_CHECK_HEADERS([gcrypt.h], + [], AC_MSG_ERROR([libgcrypt headers not found.])) + LIBS="$LIBGCRYPT_LIBS $LIBS" diff -Nru libccrtp-2.0.9/debian/patches/series libccrtp-2.0.9/debian/patches/series --- libccrtp-2.0.9/debian/patches/series 2023-12-05 23:11:43.000000000 +0100 +++ libccrtp-2.0.9/debian/patches/series 2024-07-09 13:14:07.000000000 +0200 @@ -2,3 +2,5 @@ without-demo 05_ftbfs_no-add-needed.diff 10_ftbfsgcc4.6.diff +15_delete_outdated_libgcrypt_m4_macro.diff +16_use_gcrypt_upstream_m4.diff
signature.asc
Description: PGP signature
