From f0f041da97d095bb38e7be7c3b9f227e82f2eea3a51d9d1f9eb9244c1424c0ae Mon Sep 17 00:00:00 2001 From: Jiri Bohac Date: Thu, 11 Jul 2019 08:47:16 +0000 Subject: [PATCH] Accepting request 714567 from home:jirislaby:branches:Base:System - add fix-build-after-y2038-changes-in-glibc.patch OBS-URL: https://build.opensuse.org/request/show/714567 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-atm?expand=0&rev=21 --- fix-build-after-y2038-changes-in-glibc.patch | 34 ++++++++++++++++++++ linux-atm.changes | 5 +++ linux-atm.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 fix-build-after-y2038-changes-in-glibc.patch diff --git a/fix-build-after-y2038-changes-in-glibc.patch b/fix-build-after-y2038-changes-in-glibc.patch new file mode 100644 index 0000000..1045820 --- /dev/null +++ b/fix-build-after-y2038-changes-in-glibc.patch @@ -0,0 +1,34 @@ +From: Bastien Nocera +Date: Fri, 7 Jun 2019 09:51:33 +0200 +Subject: fix build after y2038 changes in glibc +Patch-mainline: upstream seems to be dead + +SIOCGSTAMP is now defined in linux/sockios.h. Include that file wherever +needed. + +Signed-off-by: Jiri Slaby +--- + src/maint/atmdump.c | 1 + + src/maint/saaldump.c | 1 + + 2 files changed, 2 insertions(+) + +--- a/src/maint/atmdump.c ++++ b/src/maint/atmdump.c +@@ -16,6 +16,7 @@ + #include + #include /* for htonl and ntohl */ + #include ++#include + + + static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE", +--- a/src/maint/saaldump.c ++++ b/src/maint/saaldump.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "pdu.h" + #define DUMP_MODE diff --git a/linux-atm.changes b/linux-atm.changes index 56cbd75..1506e96 100644 --- a/linux-atm.changes +++ b/linux-atm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 11 06:03:18 UTC 2019 - Jiri Slaby + +- add fix-build-after-y2038-changes-in-glibc.patch + ------------------------------------------------------------------- Wed Jan 9 08:45:59 UTC 2019 - Jiri Slaby diff --git a/linux-atm.spec b/linux-atm.spec index fa1266f..a3fc44f 100644 --- a/linux-atm.spec +++ b/linux-atm.spec @@ -34,6 +34,8 @@ Patch1: linux-atm-2.5.2_implicit-fortify-decl.patch Patch2: linux-atm-2.5.2-fix-header-conflict.patch # PATCH-FIX-UPSTREAM linux-atm-2.5.2-remove-headers-crude-hack.patch -- Remove headers crude hack Patch3: linux-atm-2.5.2-remove-headers-crude-hack.patch +# PATCH-FIX-UPSTREAM fix-build-after-y2038-changes-in-glibc.patch -- fix build after y2038 changes in glibc +Patch4: fix-build-after-y2038-changes-in-glibc.patch BuildRequires: bison BuildRequires: flex