diff -Nru hydra-9.2/debian/changelog hydra-9.2/debian/changelog --- hydra-9.2/debian/changelog 2021-11-13 00:52:58.000000000 +0000 +++ hydra-9.2/debian/changelog 2022-01-31 21:45:43.000000000 +0000 @@ -1,3 +1,16 @@ +hydra (9.2-1ubuntu1) jammy; urgency=medium + + * Adjust include directory for memcached so as to not shadow the + /usr/include/limits.h file for the one in memcached (LP: #1959622). + + -- Dan Bungert Mon, 31 Jan 2022 14:45:43 -0700 + +hydra (9.2-1build1) jammy; urgency=medium + + * No-change rebuild against libssl3 + + -- Steve Langasek Wed, 08 Dec 2021 23:34:21 +0000 + hydra (9.2-1) unstable; urgency=medium * New upstream release. diff -Nru hydra-9.2/debian/control hydra-9.2/debian/control --- hydra-9.2/debian/control 2021-11-13 00:52:58.000000000 +0000 +++ hydra-9.2/debian/control 2021-12-08 23:34:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: hydra Section: net Priority: optional -Maintainer: Debian Security Tools +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Security Tools Uploaders: Julián Moreno Patiño , Daniel Echeverri Build-Depends: debhelper-compat (= 13), firebird-dev[!hurd-any], diff -Nru hydra-9.2/debian/patches/10_memcached_include.diff hydra-9.2/debian/patches/10_memcached_include.diff --- hydra-9.2/debian/patches/10_memcached_include.diff 1970-01-01 00:00:00.000000000 +0000 +++ hydra-9.2/debian/patches/10_memcached_include.diff 2022-01-31 21:45:43.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Adjust memcached include dir lookup to not shadow limits.h + Compilation against openssl 3.0 causes a failure to find INT_MAX, despite the + openssl headers including limits.h. However, the fact that the + libmemcached-dev package provides both /usr/include/libmemcached{,-1.0} + directories, both of which contain memcached.h, mean that MCACHED_IPATH ends + up set to the libmemcached-1.0 one, which contains a limits.h, which shadows + /usr/include/limits.h. + Don't do that. +Author: Dan Bungert +Bug-Ubuntu: https://launchpad.net/bugs/1959622 +Forwarded: https://github.com/vanhauser-thc/thc-hydra/pull/718 +Last-Update: 2022-01-31 +--- a/configure ++++ b/configure +@@ -998,11 +998,9 @@ + if [ "X" = "X$MCACHED_IPATH" ]; then + if [ -f "$i/memcached.h" ]; then + MCACHED_IPATH="$i" +- fi +- if [ -f "$i/libmemcached/memcached.h" ]; then ++ elif [ -f "$i/libmemcached/memcached.h" ]; then + MCACHED_IPATH="$i/libmemcached" +- fi +- if [ -f "$i/libmemcached-1.0/memcached.h" ]; then ++ elif [ -f "$i/libmemcached-1.0/memcached.h" ]; then + MCACHED_IPATH="$i/libmemcached-1.0" + fi + fi diff -Nru hydra-9.2/debian/patches/series hydra-9.2/debian/patches/series --- hydra-9.2/debian/patches/series 2021-11-13 00:52:58.000000000 +0000 +++ hydra-9.2/debian/patches/series 2022-01-31 21:45:43.000000000 +0000 @@ -5,3 +5,4 @@ 03_use_bin_path.diff 06_show_xhydra_build_output.diff 07_remove_troubled_files.diff +10_memcached_include.diff