Hello community, here is the log from the commit of package bluez for openSUSE:Leap:15.2 checked in at 2020-03-21 16:42:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/bluez (Old) and /work/SRC/openSUSE:Leap:15.2/.bluez.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez" Sat Mar 21 16:42:43 2020 rev:35 rq:755591 version:5.48 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/bluez/bluez.changes 2020-01-15 14:48:45.333354304 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.bluez.new.3160/bluez.changes 2020-03-21 16:42:45.349376689 +0100 @@ -1,0 +2,7 @@ +Thu Dec 5 03:08:47 UTC 2019 - Al Cho <[email protected]> + +- Add tools-Fix-build-after-y2038-changes-in-glibc.patch + * The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated + name to fix the build.(bsc#1156544) + +------------------------------------------------------------------- New: ---- tools-Fix-build-after-y2038-changes-in-glibc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.5H0BWw/_old 2020-03-21 16:42:46.465377833 +0100 +++ /var/tmp/diff_new_pack.5H0BWw/_new 2020-03-21 16:42:46.465377833 +0100 @@ -62,6 +62,8 @@ Patch120: 0010-btmon-fix-segfault-caused-by-buffer-overflow.patch Patch121: 0011-btmon-fix-segfault-caused-by-integer-underflow.patch Patch122: 0012-btmon-fix-segfault-caused-by-buffer-over-read.patch +# PATCH-FIX-UPSTREAM: bsc#1156544 +Patch123: tools-Fix-build-after-y2038-changes-in-glibc.patch # PATCH-FIX-UPSTREAM: boo#1101119 -- [email protected] Patch200: 0001-core-Fixes-order-InterfaceAdded.patch # RPi3 bluetooth support bsc#995059 bsc#1094902 @@ -192,6 +194,7 @@ %patch120 -p1 %patch121 -p1 %patch122 -p1 +%patch123 -p1 %patch200 -p1 %ifarch aarch64 %patch201 -p1 ++++++ tools-Fix-build-after-y2038-changes-in-glibc.patch ++++++ >From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Fri, 7 Jun 2019 09:51:33 +0200 Subject: [PATCH] tools: Fix build after y2038 changes in glibc The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name to fix the build. --- tools/l2test.c | 6 +++++- tools/rctest.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) Index: bluez-5.48/tools/l2test.c =================================================================== --- bluez-5.48.orig/tools/l2test.c +++ bluez-5.48/tools/l2test.c @@ -54,6 +54,10 @@ #define BREDR_DEFAULT_PSM 0x1011 #define LE_DEFAULT_PSM 0x0080 +#ifndef SIOCGSTAMP_OLD +#define SIOCGSTAMP_OLD SIOCGSTAMP +#endif + /* Test modes */ enum { SEND, @@ -906,7 +910,7 @@ static void recv_mode(int sk) if (timestamp) { struct timeval tv; - if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { + if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { timestamp = 0; memset(ts, 0, sizeof(ts)); } else { Index: bluez-5.48/tools/rctest.c =================================================================== --- bluez-5.48.orig/tools/rctest.c +++ bluez-5.48/tools/rctest.c @@ -49,6 +49,10 @@ #include "src/shared/util.h" +#ifndef SIOCGSTAMP_OLD +#define SIOCGSTAMP_OLD SIOCGSTAMP +#endif + /* Test modes */ enum { SEND, @@ -504,7 +508,7 @@ static void recv_mode(int sk) if (timestamp) { struct timeval tv; - if (ioctl(sk, SIOCGSTAMP, &tv) < 0) { + if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) { timestamp = 0; memset(ts, 0, sizeof(ts)); } else {
