diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
| commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
| tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /net-dialup/linux-atm | |
| parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) | |
gentoo resync : 02.08.2019
Diffstat (limited to 'net-dialup/linux-atm')
| -rw-r--r-- | net-dialup/linux-atm/Manifest | 3 | ||||
| -rw-r--r-- | net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch | 41 | ||||
| -rw-r--r-- | net-dialup/linux-atm/linux-atm-2.5.2.ebuild | 1 |
3 files changed, 44 insertions, 1 deletions
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest index 78dbf4dc40a4..a456e2993cf5 100644 --- a/net-dialup/linux-atm/Manifest +++ b/net-dialup/linux-atm/Manifest @@ -1,4 +1,5 @@ AUX linux-atm-2.5.2-headers.patch 646 BLAKE2B 1a1280f70c9232ddc39b664e1a533258c6bf7a05017f471544d442b69a9f9b73775d914b1433359adbcc571218207ec7413e2a64e67432489a8b417251b32e3d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113 +AUX linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch 1204 BLAKE2B 26fb42c7c49a56cdb238d22ab65096e7db684550f0f27c208262a2b2b73f790aa3bf4cea65bab176317c444deaf58a4a717e8a83cdb5d2f59474aa6cec814a23 SHA512 0ded21ca8f7f49522611c76d2c161d5f5e2dceeeccf29241d97b57154addd53e0e0101a7ecea648251e264ee88096313dff608b0bd46c53b140be02a4f2cedff DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08 -EBUILD linux-atm-2.5.2.ebuild 894 BLAKE2B b4a72b006f9e74060f9333138d17e2c478067b7a8709cd354cc117de78b8e2678003f0989c39fe32ce6ea0e03f109214ec95f616c667569455e6c97e93607d80 SHA512 e18e129a2cd74c915626fc8b40ae7daf55fc657dec80a21df2ddef94a4a375f7fa2297e8165984264eb0e65f343d7a8aeae6d41c77cbd0c9d1364b19eb3e47ab +EBUILD linux-atm-2.5.2.ebuild 948 BLAKE2B 5a999204b62fc0bb6699d6233e7f190ca94ba16251fb9b989623b66decfe7cb5943100720e0fe91cf1e38badde5cb205d60f3569c416f261e34e46c20b4b9711 SHA512 ca32fe9dc2e1b050a1034128ac438fe6de88b4ccbd1a6ca1d02d2305c7a763b20a1c382f214d7e0c7bd03b9441d7de61155f69d9c1b81b1e7f72214fc1632800 MISC metadata.xml 303 BLAKE2B 064756eecade63aaa1040f2712c005a677f365f7c6e6bb5743c4cf8deb59bee599f42b3b38160e5e2a04402a9b2167e618b4f891cc80a30a3e48b2f7851813ac SHA512 86ae1e28bb9f9d2db0a9607d58dd8cb48f96e76c4aaf5e7027f9ae792ef41ca6ac8da92adf13a40c4bcc1bd2cbea67cd4535232116616f687011c777789bc79b 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 000000000000..ff91c7f16e06 --- /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 <netinet/in.h> /* for htonl and ntohl */ + #include <atm.h> + ++#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 <linux/sockios.h> ++#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 <linux/sockios.h> ++#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 3ea9f3d5e198..7bc4fa72eed5 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" |