From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 767E5138334 for ; Sat, 20 Jul 2019 11:45:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9065CE069C; Sat, 20 Jul 2019 11:45:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 650D9E069C for ; Sat, 20 Jul 2019 11:45:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6D7F3481ED for ; Sat, 20 Jul 2019 11:45:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D1E755B for ; Sat, 20 Jul 2019 11:45:24 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1563623119.408621819a85bf67a73efd33a06ea371c20ea5a2.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/linux-atm/, net-dialup/linux-atm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch net-dialup/linux-atm/linux-atm-2.5.2.ebuild X-VCS-Directories: net-dialup/linux-atm/files/ net-dialup/linux-atm/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 408621819a85bf67a73efd33a06ea371c20ea5a2 X-VCS-Branch: master Date: Sat, 20 Jul 2019 11:45:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0d52a874-e788-477c-94bb-6a5ba200a4c8 X-Archives-Hash: 55b3bf8a221f1722659f3aee3338d943 commit: 408621819a85bf67a73efd33a06ea371c20ea5a2 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jul 20 11:45:09 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jul 20 11:45:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40862181 net-dialup/linux-atm: tweak for linux-headers-5.2 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Sergei Trofimovich gentoo.org> .../linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch | 41 ++++++++++++++++++++++ net-dialup/linux-atm/linux-atm-2.5.2.ebuild | 1 + 2 files changed, 42 insertions(+) diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch new file mode 100644 index 00000000000..ff91c7f16e0 --- /dev/null +++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch @@ -0,0 +1,41 @@ +Fix build failure against linux-5.2+: + https://www.spinics.net/lists/linux-sh/msg53430.html + +--- a/src/maint/atmdump.c ++++ b/src/maint/atmdump.c +@@ -17,6 +17,16 @@ + #include /* for htonl and ntohl */ + #include + ++#ifndef SIOCGSTAMP ++/* linux-5.2+ added support for 64-bit time_t into ioctls ++ that support 'struct timeval' and removed 'SIOCGSTAMP' ++ define. ++ ++ Include 'SIOCGSTAMP' wrapper via linux/sockios.h ++ if does not exist. ++ */ ++# include ++#endif + + static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE", + "Data SDU 1, CE","Segment OAM F5","End-to-end OAM F5","Reserved (RM)", +--- a/src/maint/saaldump.c ++++ b/src/maint/saaldump.c +@@ -24,6 +24,16 @@ + + #define MAX_ITEM 2048 /* longest string emitted by q.dump */ + ++#ifndef SIOCGSTAMP ++/* linux-5.2+ added support for 64-bit time_t into ioctls ++ that support 'struct timeval' and removed 'SIOCGSTAMP' ++ define. ++ ++ Include 'SIOCGSTAMP' wrapper via linux/sockios.h ++ if does not exist. ++ */ ++# include ++#endif + + static int interval = 0; /* display absolute time by default */ + static int quiet = 0; /* decode Q.2931 messages by default */ diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild index 3ea9f3d5e19..7bc4fa72eed 100644 --- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild +++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild @@ -25,6 +25,7 @@ CONFIG_CHECK="~ATM" src_prepare() { epatch "${FILESDIR}"/${P}-headers.patch + epatch "${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch sed -i '/#define _LINUX_NETDEVICE_H/d' \ src/arpd/*.c || die "sed command on arpd/*.c files failed"