diff -pruN 1.6.1-2/debian/changelog 1.6.1-2ubuntu1/debian/changelog --- 1.6.1-2/debian/changelog 2020-02-10 16:23:36.000000000 +0000 +++ 1.6.1-2ubuntu1/debian/changelog 2020-04-27 10:49:56.000000000 +0000 @@ -1,3 +1,11 @@ +keyutils (1.6.1-2ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/patches/private-priv.patch: Rename arguments to dh_compute_kdf to + match dh_compute and avoid C++ keyword "private" (closes: #923011) + + -- Julian Andres Klode Mon, 27 Apr 2020 12:49:56 +0200 + keyutils (1.6.1-2) unstable; urgency=medium * Update symbols file (3 symbols added) @@ -14,6 +22,13 @@ keyutils (1.6.1-1) unstable; urgency=med -- Christian Kastner Sun, 09 Feb 2020 21:15:07 +0100 +keyutils (1.6-6ubuntu1) focal; urgency=medium + + * d/patches/private-priv.patch: Rename arguments to dh_compute_kdf to + match dh_compute and avoid C++ keyword "private" (closes: #923011) + + -- Adam Conrad Sun, 20 Oct 2019 02:29:36 -0600 + keyutils (1.6-6) unstable; urgency=medium * d/tests: @@ -646,3 +661,4 @@ keyutils (1.2-1) unstable; urgency=low * Initial release (Closes: #401499). -- Daniel Baumann Mon, 04 Dec 2006 10:31:00 +0100 + diff -pruN 1.6.1-2/debian/control 1.6.1-2ubuntu1/debian/control --- 1.6.1-2/debian/control 2020-02-10 16:23:36.000000000 +0000 +++ 1.6.1-2ubuntu1/debian/control 2020-02-10 21:42:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: keyutils Section: admin Priority: optional -Maintainer: Christian Kastner +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christian Kastner Build-Depends: debhelper-compat (= 12), lsb-release, diff -pruN 1.6.1-2/debian/patches/private-priv.patch 1.6.1-2ubuntu1/debian/patches/private-priv.patch --- 1.6.1-2/debian/patches/private-priv.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.6.1-2ubuntu1/debian/patches/private-priv.patch 2019-10-20 08:29:36.000000000 +0000 @@ -0,0 +1,89 @@ +Description: Rename arguments to dh_compute_kdf to match dh_compute + and avoid using the C++ keyword "private", which breaks some rdeps +Author: Adam Conrad +Bug-Debian: https://bugs.debian.org/923011 +Last-Update: 2019-10-20 + +--- keyutils-1.6.orig/keyctl.c ++++ keyutils-1.6/keyctl.c +@@ -1703,7 +1703,7 @@ static void act_keyctl_dh_compute(int ar + + static void act_keyctl_dh_compute_kdf(int argc, char *argv[]) + { +- key_serial_t private, prime, base; ++ key_serial_t priv, prime, base; + char *buffer; + char *p; + int ret, sep, col; +@@ -1712,7 +1712,7 @@ static void act_keyctl_dh_compute_kdf(in + if (argc != 6) + format(); + +- private = get_key_id(argv[1]); ++ priv = get_key_id(argv[1]); + prime = get_key_id(argv[2]); + base = get_key_id(argv[3]); + +@@ -1724,7 +1724,7 @@ static void act_keyctl_dh_compute_kdf(in + if (!buffer) + error("dh_compute: cannot allocate memory"); + +- ret = keyctl_dh_compute_kdf(private, prime, base, argv[5], NULL, 0, ++ ret = keyctl_dh_compute_kdf(priv, prime, base, argv[5], NULL, 0, + buffer, buflen); + if (ret < 0) + error("keyctl_dh_compute_kdf"); +@@ -1763,7 +1763,7 @@ static void act_keyctl_dh_compute_kdf(in + + static void act_keyctl_dh_compute_kdf_oi(int argc, char *argv[]) + { +- key_serial_t private, prime, base; ++ key_serial_t priv, prime, base; + char *buffer; + char *p; + int ret, sep, col; +@@ -1774,7 +1774,7 @@ static void act_keyctl_dh_compute_kdf_oi + if (argc != 6) + format(); + +- private = get_key_id(argv[1]); ++ priv = get_key_id(argv[1]); + prime = get_key_id(argv[2]); + base = get_key_id(argv[3]); + +@@ -1788,7 +1788,7 @@ static void act_keyctl_dh_compute_kdf_oi + + oi = grab_stdin(&oilen); + +- ret = keyctl_dh_compute_kdf(private, prime, base, argv[5], oi, oilen, ++ ret = keyctl_dh_compute_kdf(priv, prime, base, argv[5], oi, oilen, + buffer, buflen); + if (ret < 0) + error("keyctl_dh_compute_kdf"); +--- keyutils-1.6.orig/keyutils.c ++++ keyutils-1.6/keyutils.c +@@ -244,11 +244,11 @@ long keyctl_dh_compute(key_serial_t priv + return keyctl(KEYCTL_DH_COMPUTE, ¶ms, buffer, buflen, 0); + } + +-long keyctl_dh_compute_kdf(key_serial_t private, key_serial_t prime, ++long keyctl_dh_compute_kdf(key_serial_t priv, key_serial_t prime, + key_serial_t base, char *hashname, char *otherinfo, + size_t otherinfolen, char *buffer, size_t buflen) + { +- struct keyctl_dh_params params = { .priv = private, ++ struct keyctl_dh_params params = { .priv = priv, + .prime = prime, + .base = base }; + struct keyctl_kdf_params kdfparams = { .hashname = hashname, +--- keyutils-1.6.orig/keyutils.h ++++ keyutils-1.6/keyutils.h +@@ -201,7 +201,7 @@ extern long keyctl_invalidate(key_serial + extern long keyctl_get_persistent(uid_t uid, key_serial_t id); + extern long keyctl_dh_compute(key_serial_t priv, key_serial_t prime, + key_serial_t base, char *buffer, size_t buflen); +-extern long keyctl_dh_compute_kdf(key_serial_t private, key_serial_t prime, ++extern long keyctl_dh_compute_kdf(key_serial_t priv, key_serial_t prime, + key_serial_t base, char *hashname, + char *otherinfo, size_t otherinfolen, + char *buffer, size_t buflen); diff -pruN 1.6.1-2/debian/patches/series 1.6.1-2ubuntu1/debian/patches/series --- 1.6.1-2/debian/patches/series 2020-02-10 16:23:36.000000000 +0000 +++ 1.6.1-2ubuntu1/debian/patches/series 2020-04-27 10:47:20.000000000 +0000 @@ -7,3 +7,4 @@ endianness-and-PIE.patch pkg-config-install-tweaks.patch man-page-fixes.patch Tests-for-KEYCTL_MOVE-require-kernel-5.3-or-above.patch +private-priv.patch