From 697a17285e4caf47b55c6dcd7f9e3138a935296a2929b002cc1ba42ba5ece112 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Nov 2018 07:46:22 +0000 Subject: [PATCH 1/3] Accepting request 644351 from home:jirislaby:branches:devel:tools - fix build with kernel 4.19 * add 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch * add 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch OBS-URL: https://build.opensuse.org/request/show/644351 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=97 --- ...V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch | 97 ++++++++++++ ...pdate-V4L2_CID_USER_-_BASE-constants.patch | 148 ++++++++++++++++++ strace.changes | 7 + strace.spec | 3 + 4 files changed, 255 insertions(+) create mode 100644 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch create mode 100644 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch diff --git a/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch b/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch new file mode 100644 index 0000000..d7d380b --- /dev/null +++ b/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch @@ -0,0 +1,97 @@ +From: "Dmitry V. Levin" +Date: Sat, 18 Aug 2018 07:22:47 +0000 +Subject: xlat: workaround V4L2_CID_USER_IMX_BASE Linux kernel ABI breakage +Patch-mainline: yes +Git-commit: b89a69dec27cf638df0e17db80ed937c3e1abf77 + +Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 +has changed the value of V4L2_CID_USER_IMX_BASE constant introduced +by commit v4.13-rc1~141^2~121 because the old value was already used +by V4L2_CID_USER_MAX217X_BASE. + +This is of course an ABI breakage that affects Linux kernels starting +with 4.13 and up to 4.18, as well as their LTS derivatives. + +Since the imx driver didn't provide any public control ID definitions, +it looks like the best way to handle this situation is to pretend that +the old value of V4L2_CID_USER_IMX_BASE didn't exist. + +* xlat/v4l2_control_id_bases.in (V4L2_CID_USER_IMX_BASE): Redefine. + +Co-Authored-by: Eugene Syromyatnikov +Signed-off-by: Jiri Slaby +--- + xlat/v4l2_control_id_bases.in | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in +index a0359be9..f3fd9255 100644 +--- a/xlat/v4l2_control_id_bases.in ++++ b/xlat/v4l2_control_id_bases.in +@@ -2,7 +2,22 @@ V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) + V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) + V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) + V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) +-V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090) ++#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE ++# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE ++/* ++ * Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 ++ * has changed the value of V4L2_CID_USER_IMX_BASE constant introduced ++ * by commit v4.13-rc1~141^2~121 because the old value was already used ++ * by V4L2_CID_USER_MAX217X_BASE. ++ * This is of course an ABI breakage that affects Linux kernels starting ++ * with 4.13 and up to 4.18, as well as their LTS derivatives. ++ * Since the imx driver didn't provide any public control ID definitions, ++ * it looks like the best way to handle this situation is to pretend that ++ * the old value of V4L2_CID_USER_IMX_BASE didn't exist. ++ */ ++# undef V4L2_CID_USER_IMX_BASE ++#endif ++V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) + V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) + V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) + V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) +--- a/xlat/v4l2_control_id_bases.h.old 2018-08-14 02:44:25.000000000 +0200 ++++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:36:26.090699789 +0200 +@@ -31,12 +31,16 @@ + #else + # define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) + #endif ++#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE ++# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE ++# undef V4L2_CID_USER_IMX_BASE ++#endif + #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x1090)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x1090)"); ++static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090) ++# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) + #endif + #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +@@ -146,6 +150,21 @@ + XLAT(V4L2_CID_USER_MEYE_BASE), + XLAT(V4L2_CID_USER_BTTV_BASE), + XLAT(V4L2_CID_USER_TI_VPE_BASE), ++#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE ++# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE ++/* ++* Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 ++* has changed the value of V4L2_CID_USER_IMX_BASE constant introduced ++* by commit v4.13-rc1~141^2~121 because the old value was already used ++* by V4L2_CID_USER_MAX217X_BASE. ++* This is of course an ABI breakage that affects Linux kernels starting ++* with 4.13 and up to 4.18, as well as their LTS derivatives. ++* Since the imx driver didn't provide any public control ID definitions, ++* it looks like the best way to handle this situation is to pretend that ++* the old value of V4L2_CID_USER_IMX_BASE didn't exist. ++*/ ++# undef V4L2_CID_USER_IMX_BASE ++#endif + XLAT(V4L2_CID_USER_IMX_BASE), + XLAT(V4L2_CID_MPEG_BASE), + XLAT(V4L2_CID_MPEG_CX2341X_BASE), diff --git a/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch b/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch new file mode 100644 index 0000000..7c288fc --- /dev/null +++ b/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch @@ -0,0 +1,148 @@ +From: "Dmitry V. Levin" +Date: Sat, 18 Aug 2018 07:22:47 +0000 +Subject: xlat: update V4L2_CID_USER_*_BASE constants +Patch-mainline: yes +Git-commit: 0f09267db00468b9204395c6990fc8816fd3c0e5 + +* xlat/v4l2_control_id_bases.in (V4L2_CID_USER_S2255_BASE, +V4L2_CID_USER_SI476X_BASE, V4L2_CID_USER_SAA7134_BASE, +V4L2_CID_USER_ADV7180_BASE, V4L2_CID_USER_TC358743_BASE, +V4L2_CID_USER_MAX217X_BASE): New constants. + +Signed-off-by: Jiri Slaby +--- + xlat/v4l2_control_id_bases.in | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in +index f3fd9255..a0f9ccae 100644 +--- a/xlat/v4l2_control_id_bases.in ++++ b/xlat/v4l2_control_id_bases.in +@@ -1,7 +1,13 @@ + V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) +-V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) +-V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) +-V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) ++V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) ++V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) ++V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) ++V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) ++V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) ++V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) ++V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) ++V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) ++V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) + #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE + # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE + /* +@@ -17,7 +23,7 @@ V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) + */ + # undef V4L2_CID_USER_IMX_BASE + #endif +-V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) ++V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) + V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) + V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) + V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) +--- a/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:06.020604843 +0200 ++++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:21.752904814 +0200 +@@ -12,24 +12,66 @@ + #endif + #if defined(V4L2_CID_USER_MEYE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MEYE_BASE) && HAVE_DECL_V4L2_CID_USER_MEYE_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE + 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE + 0x1000)"); ++static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE | 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE | 0x1000)"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) ++# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) + #endif + #if defined(V4L2_CID_USER_BTTV_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_BTTV_BASE) && HAVE_DECL_V4L2_CID_USER_BTTV_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE + 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE + 0x1010)"); ++static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE | 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE | 0x1010)"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) ++# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) ++#endif ++#if defined(V4L2_CID_USER_S2255_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_S2255_BASE) && HAVE_DECL_V4L2_CID_USER_S2255_BASE) ++DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE ++static_assert((V4L2_CID_USER_S2255_BASE) == ((V4L2_CID_BASE | 0x1030)), "V4L2_CID_USER_S2255_BASE != (V4L2_CID_BASE | 0x1030)"); ++DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE ++#else ++# define V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) ++#endif ++#if defined(V4L2_CID_USER_SI476X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SI476X_BASE) && HAVE_DECL_V4L2_CID_USER_SI476X_BASE) ++DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE ++static_assert((V4L2_CID_USER_SI476X_BASE) == ((V4L2_CID_BASE | 0x1040)), "V4L2_CID_USER_SI476X_BASE != (V4L2_CID_BASE | 0x1040)"); ++DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE ++#else ++# define V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) + #endif + #if defined(V4L2_CID_USER_TI_VPE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) && HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE + 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE + 0x1050)"); ++static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE | 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE | 0x1050)"); ++DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE ++#else ++# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) ++#endif ++#if defined(V4L2_CID_USER_SAA7134_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) && HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) ++DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE ++static_assert((V4L2_CID_USER_SAA7134_BASE) == ((V4L2_CID_BASE | 0x1060)), "V4L2_CID_USER_SAA7134_BASE != (V4L2_CID_BASE | 0x1060)"); ++DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE ++#else ++# define V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) ++#endif ++#if defined(V4L2_CID_USER_ADV7180_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) && HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) ++DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE ++static_assert((V4L2_CID_USER_ADV7180_BASE) == ((V4L2_CID_BASE | 0x1070)), "V4L2_CID_USER_ADV7180_BASE != (V4L2_CID_BASE | 0x1070)"); ++DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE ++#else ++# define V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) ++#endif ++#if defined(V4L2_CID_USER_TC358743_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TC358743_BASE) && HAVE_DECL_V4L2_CID_USER_TC358743_BASE) ++DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE ++static_assert((V4L2_CID_USER_TC358743_BASE) == ((V4L2_CID_BASE | 0x1080)), "V4L2_CID_USER_TC358743_BASE != (V4L2_CID_BASE | 0x1080)"); ++DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE ++#else ++# define V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) ++#endif ++#if defined(V4L2_CID_USER_MAX217X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) && HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) ++DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE ++static_assert((V4L2_CID_USER_MAX217X_BASE) == ((V4L2_CID_BASE | 0x1090)), "V4L2_CID_USER_MAX217X_BASE != (V4L2_CID_BASE | 0x1090)"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) ++# define V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) + #endif + #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE + # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE +@@ -37,10 +79,10 @@ + #endif + #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +-static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); ++static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE | 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE | 0x10b0)"); + DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE + #else +-# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) ++# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) + #endif + #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) + DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE +@@ -149,7 +191,13 @@ + XLAT(V4L2_CID_BASE), + XLAT(V4L2_CID_USER_MEYE_BASE), + XLAT(V4L2_CID_USER_BTTV_BASE), ++ XLAT(V4L2_CID_USER_S2255_BASE), ++ XLAT(V4L2_CID_USER_SI476X_BASE), + XLAT(V4L2_CID_USER_TI_VPE_BASE), ++ XLAT(V4L2_CID_USER_SAA7134_BASE), ++ XLAT(V4L2_CID_USER_ADV7180_BASE), ++ XLAT(V4L2_CID_USER_TC358743_BASE), ++ XLAT(V4L2_CID_USER_MAX217X_BASE), + #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE + # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE + /* diff --git a/strace.changes b/strace.changes index 8cb5217..6580f2f 100644 --- a/strace.changes +++ b/strace.changes @@ -21,6 +21,13 @@ Tue Oct 30 18:56:17 UTC 2018 - schwab@linux-m68k.org * Fixed test suite for the case when mlockall and unimplemented syscalls are explicitly disabled by a seccomp filter. +------------------------------------------------------------------- +Wed Oct 24 14:41:50 UTC 2018 - Jiri Slaby + +- fix build with kernel 4.19 + * add 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch + * add 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch + ------------------------------------------------------------------- Tue Aug 14 06:49:56 UTC 2018 - jslaby@suse.com diff --git a/strace.spec b/strace.spec index 2bd654c..595f376 100644 --- a/strace.spec +++ b/strace.spec @@ -29,6 +29,8 @@ Source: https://github.com/strace/strace/releases/download/v%{version}/% Source2: https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc Source3: %{name}.keyring Source4: baselibs.conf +Patch0: 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch +Patch1: 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch BuildRequires: haveged BuildRequires: libacl-devel BuildRequires: libaio-devel @@ -58,6 +60,7 @@ and processes can be seen. Child processes can also be tracked. %prep %setup -q +%autopatch -p1 %build %configure \ From b85968fed9abad9eda8388b4f70e175d33ba8cc6d66634c67eb98172f7e1f726 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 7 Nov 2018 08:19:17 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:tools package:strace revision:96 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=98 --- ...V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch | 97 ------------ ...pdate-V4L2_CID_USER_-_BASE-constants.patch | 148 ------------------ strace.changes | 7 - strace.spec | 3 - 4 files changed, 255 deletions(-) delete mode 100644 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch delete mode 100644 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch diff --git a/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch b/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch deleted file mode 100644 index d7d380b..0000000 --- a/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From: "Dmitry V. Levin" -Date: Sat, 18 Aug 2018 07:22:47 +0000 -Subject: xlat: workaround V4L2_CID_USER_IMX_BASE Linux kernel ABI breakage -Patch-mainline: yes -Git-commit: b89a69dec27cf638df0e17db80ed937c3e1abf77 - -Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 -has changed the value of V4L2_CID_USER_IMX_BASE constant introduced -by commit v4.13-rc1~141^2~121 because the old value was already used -by V4L2_CID_USER_MAX217X_BASE. - -This is of course an ABI breakage that affects Linux kernels starting -with 4.13 and up to 4.18, as well as their LTS derivatives. - -Since the imx driver didn't provide any public control ID definitions, -it looks like the best way to handle this situation is to pretend that -the old value of V4L2_CID_USER_IMX_BASE didn't exist. - -* xlat/v4l2_control_id_bases.in (V4L2_CID_USER_IMX_BASE): Redefine. - -Co-Authored-by: Eugene Syromyatnikov -Signed-off-by: Jiri Slaby ---- - xlat/v4l2_control_id_bases.in | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in -index a0359be9..f3fd9255 100644 ---- a/xlat/v4l2_control_id_bases.in -+++ b/xlat/v4l2_control_id_bases.in -@@ -2,7 +2,22 @@ V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) - V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) - V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) - V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) --V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090) -+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+/* -+ * Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 -+ * has changed the value of V4L2_CID_USER_IMX_BASE constant introduced -+ * by commit v4.13-rc1~141^2~121 because the old value was already used -+ * by V4L2_CID_USER_MAX217X_BASE. -+ * This is of course an ABI breakage that affects Linux kernels starting -+ * with 4.13 and up to 4.18, as well as their LTS derivatives. -+ * Since the imx driver didn't provide any public control ID definitions, -+ * it looks like the best way to handle this situation is to pretend that -+ * the old value of V4L2_CID_USER_IMX_BASE didn't exist. -+ */ -+# undef V4L2_CID_USER_IMX_BASE -+#endif -+V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) - V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) - V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) - V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) ---- a/xlat/v4l2_control_id_bases.h.old 2018-08-14 02:44:25.000000000 +0200 -+++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:36:26.090699789 +0200 -@@ -31,12 +31,16 @@ - #else - # define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) - #endif -+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# undef V4L2_CID_USER_IMX_BASE -+#endif - #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x1090)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x1090)"); -+static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090) -+# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) - #endif - #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -@@ -146,6 +150,21 @@ - XLAT(V4L2_CID_USER_MEYE_BASE), - XLAT(V4L2_CID_USER_BTTV_BASE), - XLAT(V4L2_CID_USER_TI_VPE_BASE), -+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+/* -+* Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 -+* has changed the value of V4L2_CID_USER_IMX_BASE constant introduced -+* by commit v4.13-rc1~141^2~121 because the old value was already used -+* by V4L2_CID_USER_MAX217X_BASE. -+* This is of course an ABI breakage that affects Linux kernels starting -+* with 4.13 and up to 4.18, as well as their LTS derivatives. -+* Since the imx driver didn't provide any public control ID definitions, -+* it looks like the best way to handle this situation is to pretend that -+* the old value of V4L2_CID_USER_IMX_BASE didn't exist. -+*/ -+# undef V4L2_CID_USER_IMX_BASE -+#endif - XLAT(V4L2_CID_USER_IMX_BASE), - XLAT(V4L2_CID_MPEG_BASE), - XLAT(V4L2_CID_MPEG_CX2341X_BASE), diff --git a/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch b/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch deleted file mode 100644 index 7c288fc..0000000 --- a/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch +++ /dev/null @@ -1,148 +0,0 @@ -From: "Dmitry V. Levin" -Date: Sat, 18 Aug 2018 07:22:47 +0000 -Subject: xlat: update V4L2_CID_USER_*_BASE constants -Patch-mainline: yes -Git-commit: 0f09267db00468b9204395c6990fc8816fd3c0e5 - -* xlat/v4l2_control_id_bases.in (V4L2_CID_USER_S2255_BASE, -V4L2_CID_USER_SI476X_BASE, V4L2_CID_USER_SAA7134_BASE, -V4L2_CID_USER_ADV7180_BASE, V4L2_CID_USER_TC358743_BASE, -V4L2_CID_USER_MAX217X_BASE): New constants. - -Signed-off-by: Jiri Slaby ---- - xlat/v4l2_control_id_bases.in | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in -index f3fd9255..a0f9ccae 100644 ---- a/xlat/v4l2_control_id_bases.in -+++ b/xlat/v4l2_control_id_bases.in -@@ -1,7 +1,13 @@ - V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) --V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) --V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) --V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) -+V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) -+V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) -+V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) -+V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) -+V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) -+V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) -+V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) -+V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) -+V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) - #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - /* -@@ -17,7 +23,7 @@ V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) - */ - # undef V4L2_CID_USER_IMX_BASE - #endif --V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) -+V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) - V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) - V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) - V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) ---- a/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:06.020604843 +0200 -+++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:21.752904814 +0200 -@@ -12,24 +12,66 @@ - #endif - #if defined(V4L2_CID_USER_MEYE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MEYE_BASE) && HAVE_DECL_V4L2_CID_USER_MEYE_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE + 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE + 0x1000)"); -+static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE | 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE | 0x1000)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) -+# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) - #endif - #if defined(V4L2_CID_USER_BTTV_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_BTTV_BASE) && HAVE_DECL_V4L2_CID_USER_BTTV_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE + 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE + 0x1010)"); -+static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE | 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE | 0x1010)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) -+# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) -+#endif -+#if defined(V4L2_CID_USER_S2255_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_S2255_BASE) && HAVE_DECL_V4L2_CID_USER_S2255_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_S2255_BASE) == ((V4L2_CID_BASE | 0x1030)), "V4L2_CID_USER_S2255_BASE != (V4L2_CID_BASE | 0x1030)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) -+#endif -+#if defined(V4L2_CID_USER_SI476X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SI476X_BASE) && HAVE_DECL_V4L2_CID_USER_SI476X_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_SI476X_BASE) == ((V4L2_CID_BASE | 0x1040)), "V4L2_CID_USER_SI476X_BASE != (V4L2_CID_BASE | 0x1040)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) - #endif - #if defined(V4L2_CID_USER_TI_VPE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) && HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE + 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE + 0x1050)"); -+static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE | 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE | 0x1050)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) -+#endif -+#if defined(V4L2_CID_USER_SAA7134_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) && HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_SAA7134_BASE) == ((V4L2_CID_BASE | 0x1060)), "V4L2_CID_USER_SAA7134_BASE != (V4L2_CID_BASE | 0x1060)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) -+#endif -+#if defined(V4L2_CID_USER_ADV7180_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) && HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_ADV7180_BASE) == ((V4L2_CID_BASE | 0x1070)), "V4L2_CID_USER_ADV7180_BASE != (V4L2_CID_BASE | 0x1070)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) -+#endif -+#if defined(V4L2_CID_USER_TC358743_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TC358743_BASE) && HAVE_DECL_V4L2_CID_USER_TC358743_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_TC358743_BASE) == ((V4L2_CID_BASE | 0x1080)), "V4L2_CID_USER_TC358743_BASE != (V4L2_CID_BASE | 0x1080)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) -+#endif -+#if defined(V4L2_CID_USER_MAX217X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) && HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_MAX217X_BASE) == ((V4L2_CID_BASE | 0x1090)), "V4L2_CID_USER_MAX217X_BASE != (V4L2_CID_BASE | 0x1090)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) -+# define V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) - #endif - #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -@@ -37,10 +79,10 @@ - #endif - #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); -+static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE | 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE | 0x10b0)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) -+# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) - #endif - #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -@@ -149,7 +191,13 @@ - XLAT(V4L2_CID_BASE), - XLAT(V4L2_CID_USER_MEYE_BASE), - XLAT(V4L2_CID_USER_BTTV_BASE), -+ XLAT(V4L2_CID_USER_S2255_BASE), -+ XLAT(V4L2_CID_USER_SI476X_BASE), - XLAT(V4L2_CID_USER_TI_VPE_BASE), -+ XLAT(V4L2_CID_USER_SAA7134_BASE), -+ XLAT(V4L2_CID_USER_ADV7180_BASE), -+ XLAT(V4L2_CID_USER_TC358743_BASE), -+ XLAT(V4L2_CID_USER_MAX217X_BASE), - #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - /* diff --git a/strace.changes b/strace.changes index 6580f2f..8cb5217 100644 --- a/strace.changes +++ b/strace.changes @@ -21,13 +21,6 @@ Tue Oct 30 18:56:17 UTC 2018 - schwab@linux-m68k.org * Fixed test suite for the case when mlockall and unimplemented syscalls are explicitly disabled by a seccomp filter. -------------------------------------------------------------------- -Wed Oct 24 14:41:50 UTC 2018 - Jiri Slaby - -- fix build with kernel 4.19 - * add 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch - * add 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch - ------------------------------------------------------------------- Tue Aug 14 06:49:56 UTC 2018 - jslaby@suse.com diff --git a/strace.spec b/strace.spec index 595f376..2bd654c 100644 --- a/strace.spec +++ b/strace.spec @@ -29,8 +29,6 @@ Source: https://github.com/strace/strace/releases/download/v%{version}/% Source2: https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc Source3: %{name}.keyring Source4: baselibs.conf -Patch0: 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch -Patch1: 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch BuildRequires: haveged BuildRequires: libacl-devel BuildRequires: libaio-devel @@ -60,7 +58,6 @@ and processes can be seen. Child processes can also be tracked. %prep %setup -q -%autopatch -p1 %build %configure \ From cb3dc5b12e820481745854aacffa11422b1b298daf75e0bf663f3303dfbe2ac7 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 27 Dec 2018 10:54:54 +0000 Subject: [PATCH 3/3] Accepting request 661648 from home:AndreasSchwab - Update to strace 4.26 * Changes in behavior * If strace is interrupted by a signal it handles (currently one of HUP, INT, QUIT, PIPE, or TERM), strace terminates itself with this signal. * Improvements * Implemented obtainment of system call information using PTRACE_GET_SYSCALL_INFO ptrace API. * Implemented decoding of PTRACE_GET_SYSCALL_INFO ptrace request. * Implemented decoding of BLKGETZONESZ, BLKGETNRZONES, and RND* ioctl commands. * Enhanced xlat styles support configured by -X option. * Enhanced internet address formatting in structureless contexts. * Enhanced decoding of getsockopt SO_ERROR option. * Enhanced error diagnostics when the first exec fails. * Added %net as a short form of %network in syscall specifications. * Updated lists of ABS_*, BPF_*, FAN_*, IFA_*, IFLA_*, KVM_CAP_*, NETLINK_*, NTF_*, PR_SPEC_*, REL_*, SOL_*, TCA_*, and V4L2_* constants. * Updated lists of ioctl commands from Linux 4.20. * Enhanced manual page. * Bug fixes * Fixed "xlat_idx: Unexpected xlat value 0" warnings. * Fixed sthyi output format on s390. * Documented -X option in strace -h output. OBS-URL: https://build.opensuse.org/request/show/661648 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=99 --- strace-4.25.tar.xz | 3 --- strace-4.25.tar.xz.asc | 16 ---------------- strace-4.26.tar.xz | 3 +++ strace-4.26.tar.xz.asc | 16 ++++++++++++++++ strace.changes | 28 ++++++++++++++++++++++++++++ strace.spec | 2 +- 6 files changed, 48 insertions(+), 20 deletions(-) delete mode 100644 strace-4.25.tar.xz delete mode 100644 strace-4.25.tar.xz.asc create mode 100644 strace-4.26.tar.xz create mode 100644 strace-4.26.tar.xz.asc diff --git a/strace-4.25.tar.xz b/strace-4.25.tar.xz deleted file mode 100644 index 8f00294..0000000 --- a/strace-4.25.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d685f8e65470b7832c3aff60c57ab4459f26ff89f07c10f92bd70ee89efac701 -size 1425268 diff --git a/strace-4.25.tar.xz.asc b/strace-4.25.tar.xz.asc deleted file mode 100644 index 1d22785..0000000 --- a/strace-4.25.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCAAGBQJb2BjgAAoJEKgEH6g54W42BJ4P/iLZEayYJIg1sDjEBx8n/aZh -wrVRTMnwXAi1pG18RDESvQLWEeJAua94yl989kKc5Kp/OhEHaoxCkYNQliV3CAhJ -3A81Nw+T+bQGgLIT4Fyi//2r3xk1NQk9GWQou/T0x5jupf1ecLOVEoSKWPMHvRdi -Brks4shVMeT57K8AdGQfWob70Y+td6LopAeu2dufiMkILXTUrYuf8IwnP/tBE4j0 -xdGEffXeo1Q/7Qg6mN4oKAK9xrJr1tATfW5DcEWCzWx/ohOONZ9oy9GrIGJy04Ib -Gdr1pC5LLR/3qIgJXWBF51YaeAstjTXb1mH7To7U6izRNSFbQlIPeGwfH0LbHDJe -mtSsyNOh2KgxmYYZpzEx/ux/56hXCgU66nfWOz47XIxPgrRP869eXaVZMw03BAOF -3gXXwDm+ccdQfi7Ur+dhuS32ieRMfi/J+v3yKsYG1sDtLgcdcdqQ9lf60d1nCE4A -eWI2D4sDtkKbYc1/nyKb/4lINXiDhG7jFRYGAdtA3LogmCSNJHKJiDw4DIW+rNi0 -qLs43/KEca4HitH+XpaZ98TIVky99DK2PJOaP7olu0q4Ge5g6fqwpVIZFsIeWQCb -SWRGt6wSEz4LJwO4NOAbAGxDszoXPXM1E6/8yHJHI4L/ixJZ+CuFCcpnxONLa1GM -4utI2EkWp2CLt7Qg4AdA -=z4w0 ------END PGP SIGNATURE----- diff --git a/strace-4.26.tar.xz b/strace-4.26.tar.xz new file mode 100644 index 0000000..60b31f0 --- /dev/null +++ b/strace-4.26.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c +size 1444216 diff --git a/strace-4.26.tar.xz.asc b/strace-4.26.tar.xz.asc new file mode 100644 index 0000000..4bee14c --- /dev/null +++ b/strace-4.26.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJcJChIAAoJEKgEH6g54W42T9YP/0OWxjmiQfvIN05Nek6KZhQe +gbullqOFvigSH/7GoEISBcjPJ5owdfWS//rRwOAtJQchJy0N7naut4SiaASqHJOl +qP36xNznkbJ6zILs+pMu6a1v0zQ082x+fI8qOwtQOrsJYOUUe1VwH7yvSIxZNCmi +QJVYw7JQLae696LQ+gz5rOlRPAli88ZkqLGYabjIwdHlptzcy666PKqyu1vBSUW0 +vOdLEwwXYhb86WanBy5vdVxYMhA6AOHdR53Q+/O12XThZTRRYhQcVqNHTEJEuC62 +kqZSCARQCCF1OeIxkGsU8occekkBnv2pSF84dnV7phor/IebxrX6eHlmU/O5vRli +LFqrnC1SsBhOUiNFlqhx735rZp0okZBdwZEBBU3ymME6THdZ120qCdyZjqeoNtfp +1ml62C2eiAtGQY/cTUBlytWPiLAkqPzGzN2i8UVLQCzxkZ1nZsCkOe35xKEij8of +vKw73DID/T3Jrdzo8/c+TENANpnccx9W36j5P9TuK0htEFmqhNtHrkGnZ5CyrYiJ +I18bwQEF/qaAOcV2WJzMWj2vwqvEa0AvpX8oWGxOk2rNJIjyBFBpL7ZRAKggvuuN +OKUsgUFd7K/hTbAixNpsO55asmD/uCIFOZZrZBFIU/C3JJ5A0J9wWU9JKhnaSPTs +vuKHn2KQqSOqwN8LPdQf +=bnE3 +-----END PGP SIGNATURE----- diff --git a/strace.changes b/strace.changes index 8cb5217..5557e62 100644 --- a/strace.changes +++ b/strace.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Thu Dec 27 10:29:58 UTC 2018 - schwab@linux-m68k.org + +- Update to strace 4.26 + * Changes in behavior + * If strace is interrupted by a signal it handles (currently + one of HUP, INT, QUIT, PIPE, or TERM), strace terminates + itself with this signal. + * Improvements + * Implemented obtainment of system call information using + PTRACE_GET_SYSCALL_INFO ptrace API. + * Implemented decoding of PTRACE_GET_SYSCALL_INFO ptrace request. + * Implemented decoding of BLKGETZONESZ, BLKGETNRZONES, and RND* ioctl + commands. + * Enhanced xlat styles support configured by -X option. + * Enhanced internet address formatting in structureless contexts. + * Enhanced decoding of getsockopt SO_ERROR option. + * Enhanced error diagnostics when the first exec fails. + * Added %net as a short form of %network in syscall specifications. + * Updated lists of ABS_*, BPF_*, FAN_*, IFA_*, IFLA_*, KVM_CAP_*, NETLINK_*, + NTF_*, PR_SPEC_*, REL_*, SOL_*, TCA_*, and V4L2_* constants. + * Updated lists of ioctl commands from Linux 4.20. + * Enhanced manual page. + * Bug fixes + * Fixed "xlat_idx: Unexpected xlat value 0" warnings. + * Fixed sthyi output format on s390. + * Documented -X option in strace -h output. + ------------------------------------------------------------------- Tue Oct 30 18:56:17 UTC 2018 - schwab@linux-m68k.org diff --git a/strace.spec b/strace.spec index 2bd654c..88e558a 100644 --- a/strace.spec +++ b/strace.spec @@ -17,7 +17,7 @@ Name: strace -Version: 4.25 +Version: 4.26 Release: 0 Summary: A utility to trace the system calls of a program License: BSD-3-Clause