diff -Nru mhash-0.9.9.9/debian/changelog mhash-0.9.9.9/debian/changelog --- mhash-0.9.9.9/debian/changelog 2020-01-21 15:34:41.000000000 +0000 +++ mhash-0.9.9.9/debian/changelog 2020-05-31 21:00:11.000000000 +0000 @@ -1,3 +1,13 @@ +mhash (0.9.9.9-9) unstable; urgency=medium + + * add attribution to early free patch + * declare intent to not install *.la files + * install mhash(3) from installation dir rather than source dir + * patch away _Bool, all targets have bool anyway + * bump to debhelper 13 + + -- Barak A. Pearlmutter Sun, 31 May 2020 22:00:11 +0100 + mhash (0.9.9.9-8) unstable; urgency=medium * ACK and merge NMU (thanks Iain!) diff -Nru mhash-0.9.9.9/debian/control mhash-0.9.9.9/debian/control --- mhash-0.9.9.9/debian/control 2020-01-21 15:34:41.000000000 +0000 +++ mhash-0.9.9.9/debian/control 2020-05-31 20:58:31.000000000 +0000 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Barak A. Pearlmutter -Build-Depends: debhelper-compat (= 12), pkg-config +Build-Depends: debhelper-compat (= 13), pkg-config Standards-Version: 4.5.0 Rules-Requires-Root: no Homepage: http://mhash.sourceforge.net/ diff -Nru mhash-0.9.9.9/debian/libmhash-dev.manpages mhash-0.9.9.9/debian/libmhash-dev.manpages --- mhash-0.9.9.9/debian/libmhash-dev.manpages 2020-01-21 14:44:41.000000000 +0000 +++ mhash-0.9.9.9/debian/libmhash-dev.manpages 2020-05-31 20:55:48.000000000 +0000 @@ -1 +1 @@ -doc/mhash.3 +/usr/share/man/man3/mhash.3 diff -Nru mhash-0.9.9.9/debian/not-installed mhash-0.9.9.9/debian/not-installed --- mhash-0.9.9.9/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ mhash-0.9.9.9/debian/not-installed 2020-05-31 20:53:04.000000000 +0000 @@ -0,0 +1 @@ +/usr/lib/*/*.la diff -Nru mhash-0.9.9.9/debian/patches/0015-mhash-0.9.9-no-free-before-use.patch mhash-0.9.9.9/debian/patches/0015-mhash-0.9.9-no-free-before-use.patch --- mhash-0.9.9.9/debian/patches/0015-mhash-0.9.9-no-free-before-use.patch 2020-01-21 15:34:41.000000000 +0000 +++ mhash-0.9.9.9/debian/patches/0015-mhash-0.9.9-no-free-before-use.patch 2020-05-31 21:00:11.000000000 +0000 @@ -1,10 +1,17 @@ -Description: Don't free the 'tmp' variable when it's used later. -Author: Hanno Böck +From: =?utf-8?q?Hanno_B=C3=B6ck?= +Date: Wed, 1 Jul 2015 11:00:58 +0000 +Subject: Don't free the 'tmp' variable when it's used later. + Origin: https://src.fedoraproject.org/rpms/mhash/c/baa57fdba46abadbac4d05762d8812db1cb1b93d?branch=master +Origin: https://sourceforge.net/p/mhash/mailman/message/34273046/ +--- + src/hmac_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff -up mhash-0.9.9.9/src/hmac_test.c.nofree mhash-0.9.9.9/src/hmac_test.c ---- mhash-0.9.9.9/src/hmac_test.c.nofree 2019-07-29 14:44:55.856345469 -0400 -+++ mhash-0.9.9.9/src/hmac_test.c 2019-07-29 14:45:11.466021935 -0400 +diff --git a/src/hmac_test.c b/src/hmac_test.c +index 1ecdef8..9c0e4d5 100644 +--- a/src/hmac_test.c ++++ b/src/hmac_test.c @@ -72,7 +72,7 @@ int main() return(MUTILS_INVALID_RESULT); } diff -Nru mhash-0.9.9.9/debian/patches/0016-_Bool-to-bool.patch mhash-0.9.9.9/debian/patches/0016-_Bool-to-bool.patch --- mhash-0.9.9.9/debian/patches/0016-_Bool-to-bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ mhash-0.9.9.9/debian/patches/0016-_Bool-to-bool.patch 2020-05-31 21:00:11.000000000 +0000 @@ -0,0 +1,21 @@ +From: "Barak A. Pearlmutter" +Date: Sun, 31 May 2020 21:40:34 +0100 +Subject: _Bool to bool + +--- + include/mutils/mutils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mutils/mutils.h b/include/mutils/mutils.h +index 2b3872e..8d5da59 100644 +--- a/include/mutils/mutils.h ++++ b/include/mutils/mutils.h +@@ -97,7 +97,7 @@ typedef unsigned char mutils_word8; + */ + + #if defined(HAVE__BOOL) +-#define mutils_boolean _Bool ++#define mutils_boolean bool + #else + typedef char mutils_boolean; + #endif diff -Nru mhash-0.9.9.9/debian/patches/0017-autoconf-AS_HELP_STRING.patch mhash-0.9.9.9/debian/patches/0017-autoconf-AS_HELP_STRING.patch --- mhash-0.9.9.9/debian/patches/0017-autoconf-AS_HELP_STRING.patch 1970-01-01 00:00:00.000000000 +0000 +++ mhash-0.9.9.9/debian/patches/0017-autoconf-AS_HELP_STRING.patch 2020-05-31 21:00:11.000000000 +0000 @@ -0,0 +1,100 @@ +From: "Barak A. Pearlmutter" +Date: Sun, 31 May 2020 21:40:54 +0100 +Subject: autoconf AS_HELP_STRING + +--- + configure.in | 42 ++++++++++++++---------------------------- + 1 file changed, 14 insertions(+), 28 deletions(-) + +diff --git a/configure.in b/configure.in +index 011c953..bff1f02 100644 +--- a/configure.in ++++ b/configure.in +@@ -86,73 +86,59 @@ dnl Checks for optional libraries and tools + AM_WITH_DMALLOC + + AC_ARG_ENABLE(md5, +-[ --disable-md5 disable the MD5 algorithm], +-, ++[AS_HELP_STRING([--disable-md5],[disable the MD5 algorithm])],, + AC_DEFINE(ENABLE_MD5, 1, "MD-5 Algorithm")) + + AC_ARG_ENABLE(sha1, +-[ --disable-sha1 disable the SHA1 algorithm], +-, ++[AS_HELP_STRING([--disable-sha1],[disable the SHA1 algorithm])],, + AC_DEFINE(ENABLE_SHA1, 1, "SHA-1 Algorithm")) + + AC_ARG_ENABLE(md4, +-[ --disable-md4 disable the MD4 algorithm], +-, ++[AS_HELP_STRING([--disable-md4],[disable the MD4 algorithm])],, + AC_DEFINE(ENABLE_MD4, 1, "MD-4 Algorithm")) + + AC_ARG_ENABLE(md2, +-[ --disable-md2 disable the MD2 algorithm], +-, ++[AS_HELP_STRING([--disable-md2],[disable the MD2 algorithm])],, + AC_DEFINE(ENABLE_MD2, 1, "MD-2 Algorithm")) + + AC_ARG_ENABLE(tiger, +-[ --disable-tiger disable the TIGER algorithm], +-, ++[AS_HELP_STRING([--disable-tiger],[disable the TIGER algorithm])],, + AC_DEFINE(ENABLE_TIGER, 1, "Tiger Algorithm")) + + AC_ARG_ENABLE(haval, +-[ --disable-haval disable the HAVAL algorithm], +-, ++[AS_HELP_STRING([--disable-haval],[disable the HAVAL algorithm])],, + AC_DEFINE(ENABLE_HAVAL, 1, "Haval Algorithm")) + + AC_ARG_ENABLE(crc32, +-[ --disable-crc32 disable the CRC32 algorithm], +-, ++[AS_HELP_STRING([--disable-crc32],[disable the CRC32 algorithm])],, + AC_DEFINE(ENABLE_CRC32, 1, "CRC32 Algorithm")) + + AC_ARG_ENABLE(adler32, +-[ --disable-adler32 disable the ADLER32 algorithm], +-, ++[AS_HELP_STRING([--disable-adler32],[disable the ADLER32 algorithm])],, + AC_DEFINE(ENABLE_ADLER32, 1, "Adler32 Algorithm")) + + AC_ARG_ENABLE(ripemd, +-[ --disable-ripemd disable the RIPEMD128/160/256/320 algorithms], +-, ++[AS_HELP_STRING([--disable-ripemd],[disable the RIPEMD128/160/256/320 algorithms])],, + AC_DEFINE(ENABLE_RIPEMD, 1, "RIPE-MD - RIPE Substitute for MD")) + + AC_ARG_ENABLE(gost, +-[ --disable-gost disable the GOST algorithm], +-, ++[AS_HELP_STRING([--disable-gost],[disable the GOST algorithm])],, + AC_DEFINE(ENABLE_GOST, 1, "GOST Algorithm")) + + AC_ARG_ENABLE(sha256-sha224, +-[ --disable-sha256-sha224 disable the SHA256 and SHA224 algorithms], +-, ++[AS_HELP_STRING([--disable-sha256-sha224],[disable the SHA256 and SHA224 algorithms])],, + AC_DEFINE(ENABLE_SHA256_SHA224, 1, "SHA-224 and SHA-256 - SHA-2 Algorithms")) + + AC_ARG_ENABLE(sha512-sha384, +-[ --disable-sha512-sha384 disable the SHA512 and SHA384 algorithms], +-, ++[AS_HELP_STRING([--disable-sha512-sha384],[disable the SHA512 and SHA384 algorithms])],, + AC_DEFINE(ENABLE_SHA512_SHA384, 1, "SHA-384 and SHA-512 - SHA-2 Algorithms")) + + AC_ARG_ENABLE(snefru, +-[ --disable-snefru disable the SNEFRU algorithm], +-, ++[AS_HELP_STRING([--disable-snefru],[disable the SNEFRU algorithm])],, + AC_DEFINE(ENABLE_SNEFRU, 1, "Snefru Algorithm")) + + AC_ARG_ENABLE(whirlpool, +-[ --disable-whirlpool disable the WHIRLPOOL algorithm], +-, ++[AS_HELP_STRING([--disable-whirlpool],[disable the WHIRLPOOL algorithm])],, + AC_DEFINE(ENABLE_WHIRLPOOL, 1, "Whirlpool Algorithm")) + + AC_ARG_ENABLE([pkgconfig], diff -Nru mhash-0.9.9.9/debian/patches/series mhash-0.9.9.9/debian/patches/series --- mhash-0.9.9.9/debian/patches/series 2020-01-21 15:34:41.000000000 +0000 +++ mhash-0.9.9.9/debian/patches/series 2020-05-31 21:00:11.000000000 +0000 @@ -13,3 +13,5 @@ 0013-autotools-updates.patch 0014-generate-mhash.pc.patch 0015-mhash-0.9.9-no-free-before-use.patch +0016-_Bool-to-bool.patch +0017-autoconf-AS_HELP_STRING.patch