Hello community, here is the log from the commit of package canutils for openSUSE:Factory checked in at 2019-08-27 10:24:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/canutils (Old) and /work/SRC/openSUSE:Factory/.canutils.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "canutils" Tue Aug 27 10:24:57 2019 rev:9 rq:726104 version:2018.02.0 Changes: -------- --- /work/SRC/openSUSE:Factory/canutils/canutils.changes 2018-08-31 10:44:12.787185940 +0200 +++ /work/SRC/openSUSE:Factory/.canutils.new.7948/canutils.changes 2019-08-27 10:25:02.843924935 +0200 @@ -1,0 +2,6 @@ +Mon Aug 26 08:48:53 UTC 2019 - Jan Engelhardt <[email protected]> + +- Add 0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch + to unbreak build with modern linux-glibc-devel. + +------------------------------------------------------------------- Old: ---- can-utils-2018.02.0.tar.gz New: ---- 0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch v2018.02.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ canutils.spec ++++++ --- /var/tmp/diff_new_pack.RUTh3z/_old 2019-08-27 10:25:03.603924878 +0200 +++ /var/tmp/diff_new_pack.RUTh3z/_new 2019-08-27 10:25:03.603924878 +0200 @@ -22,10 +22,10 @@ Group: Hardware/Other Version: 2018.02.0 Release: 0 -Url: https://github.com/linux-can/can-utils +URL: https://github.com/linux-can/can-utils -Source: can-utils-%version.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: https://github.com/linux-can/can-utils/archive/v%version.tar.gz +Patch1: 0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch BuildRequires: libtool BuildRequires: pkg-config Obsoletes: canutils-linuxcan @@ -47,7 +47,7 @@ slcan_attach, slcand and slcanpty. %prep -%setup -q -n can-utils-%version +%autosetup -n can-utils-%version -p1 %build ./autogen.sh @@ -59,7 +59,6 @@ %make_install %files -%defattr(-,root,root) %_bindir/* %changelog ++++++ 0001-fix-include-to-find-SIOCGSTAMP-with-latest-kernel.patch ++++++ >From e9590b1ca75d360eaf3211bebd86058214d48064 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <[email protected]> Date: Sun, 14 Jul 2019 21:50:43 +0200 Subject: [PATCH] fix include to find SIOCGSTAMP with latest kernel In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 the asm-generic/sockios.h header no longer defines SIOCGSTAMP. Instead it provides only SIOCGSTAMP_OLD. The linux/sockios.h header now defines SIOCGSTAMP using either SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only header file is not pulled so we get a build failure. canlogserver.c: In function 'main': canlogserver.c:404:21: error: 'SIOCGSTAMP' undeclared (first use in this function); did you mean 'SIOCGRARP'? if (ioctl(s[i], SIOCGSTAMP, &tv) < 0) ^~~~~~~~~~ SIOCGRARP canlogserver.c:404:21: note: each undeclared identifier is reported only once for each function it appears in Fixes: - http://autobuild.buildroot.org/results/363de7d9bf433be8bc47ba4ee52ae0bb80fa9021 Signed-off-by: Fabrice Fontaine <[email protected]> --- canlogserver.c | 1 + cansniffer.c | 1 + isotpdump.c | 1 + isotpperf.c | 1 + isotpsniffer.c | 1 + slcanpty.c | 1 + 6 files changed, 6 insertions(+) diff --git a/canlogserver.c b/canlogserver.c index f9ae159..4429ccd 100644 --- a/canlogserver.c +++ b/canlogserver.c @@ -62,6 +62,7 @@ #include <linux/can.h> #include <linux/can/raw.h> +#include <linux/sockios.h> #include <signal.h> #include <errno.h> diff --git a/cansniffer.c b/cansniffer.c index b710058..0ff29b4 100644 --- a/cansniffer.c +++ b/cansniffer.c @@ -62,6 +62,7 @@ #include <linux/can.h> #include <linux/can/bcm.h> +#include <linux/sockios.h> #include "terminal.h" diff --git a/isotpdump.c b/isotpdump.c index 1ab9416..97baeca 100644 --- a/isotpdump.c +++ b/isotpdump.c @@ -57,6 +57,7 @@ #include <linux/can.h> #include <linux/can/raw.h> +#include <linux/sockios.h> #include "terminal.h" #define NO_CAN_ID 0xFFFFFFFFU diff --git a/isotpperf.c b/isotpperf.c index 6ee6ede..5ad302a 100644 --- a/isotpperf.c +++ b/isotpperf.c @@ -57,6 +57,7 @@ #include <linux/can.h> #include <linux/can/raw.h> +#include <linux/sockios.h> #define NO_CAN_ID 0xFFFFFFFFU #define PERCENTRES 2 /* resolution in percent for bargraph */ diff --git a/isotpsniffer.c b/isotpsniffer.c index 6c19c8b..5d61872 100644 --- a/isotpsniffer.c +++ b/isotpsniffer.c @@ -56,6 +56,7 @@ #include <linux/can.h> #include <linux/can/isotp.h> +#include <linux/sockios.h> #include "terminal.h" #define NO_CAN_ID 0xFFFFFFFFU diff --git a/slcanpty.c b/slcanpty.c index e90b32a..5fdfa55 100644 --- a/slcanpty.c +++ b/slcanpty.c @@ -37,6 +37,7 @@ #include <linux/can.h> #include <linux/can/raw.h> +#include <linux/sockios.h> /* maximum rx buffer len: extended CAN frame with timestamp */ #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) -- 2.22.1
