* [gentoo-commits] proj/musl:master commit in: net-dialup/linux-atm/, net-dialup/linux-atm/files/
@ 2016-07-15 5:35 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2016-07-15 5:35 UTC (permalink / raw
To: gentoo-commits
commit: 73da31ad02e1568ab43beb04ae8bb38f8f1a172c
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Jul 10 19:39:27 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 05:38:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=73da31ad
net-dialup/linux-atm: improve mask-on_exit.patch
net-dialup/linux-atm/Manifest | 2 +-
.../linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch | 16 ++++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 75fe12c..ff5f496 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1,5 +1,5 @@
AUX linux-atm-2.5.2-headers.patch 646 SHA256 1af9ad2106d0a6e53cc360e1f052db1437c8286481c9b4cd4166018e9413e26d SHA512 4248a0063de9723ca6a3abdd07c5c3f4bda5a43f21bb5d19f931e898abd3e10f52b20c9d1a21415a17bee70ac6bdba83e13704f2a7c5489fb12d6e93a5a8e113 WHIRLPOOL 1897069af35688e102c4ff957b098720a5b659beeb06eb4fcf9d754286677b6677e50149b2a59e25357ad9fc903fc25a5e0ea817d0580c7041f293a526b6e6d7
-AUX linux-atm-2.5.2-mask-on_exit.patch 486 SHA256 4daf19533f682b93c1040b90d80540ce7868474475a687a850693637a2eb659e SHA512 c5fa90cba6e322e2c779e8176007338d0d3f8e844b66f52e4a19523f7f1d0a406f7d32c4870d2670d207a76149621ebcfc3fec34f53ec844e0976bb01cef192e WHIRLPOOL 402bbc5e2c1f3e46fe40dfb778ead29fb0b61cae0d645b38f6cb5a1d674619399023439c7ad2e6151dc616003a0825cb456cdcb7db0d423da6dcd81ee9cb2037
+AUX linux-atm-2.5.2-mask-on_exit.patch 679 SHA256 46d5dfb57b99fa127d19eae871e63925fca32ebf7a4ead4f3f1da8460e133111 SHA512 cf36d15271c02924893fa52c255e8364caf9904b5a644c4850c7b716a33137763ed2f7512f74a713a8f30e063c9029ec94b2f2b5454b30b6e32f0f1ef0d45a5b WHIRLPOOL d1f697a272794615935e2f69afa2492a887013ff9a1903fd5e44b55aab2aa3869bbb71b320bd141b190fcd363d1f1966db718523bb4d265ce97d852dcefae024
AUX linux-atm-2.5.2-remove-SYS_poll-hack.patch 654 SHA256 5d167f63b7d57b4165cac106b83568bc8bc9a540cf25f79f8f071b0b36fbab2c SHA512 6347356b3f160e62fd8b2578503c29f920bfa404a73553f9cde35f2bdde2d001aa5df490c3a348decff1e915ab34e99989aa0ea517a8c31fb097e108d51ab0e8 WHIRLPOOL b818c13ffa1d44ebb06d6484f0497dff914fa4570b5c15a07b3d83efa16faf60a311195bb46e6e5802fac65d639d7758b67ce8296b955e6222ded6d92b41055e
DIST linux-atm-2.5.2.tar.gz 1082256 SHA256 9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08 WHIRLPOOL ddff2b022bd94a64662e2feb8588b0b7a1d33380aaca91888d57c90602ec777f8db308f62b33846f9b2f40dfd7d6b40ca4ddd9d430e1c6bc8a36cdbb4e370771
EBUILD linux-atm-2.5.2-r99.ebuild 949 SHA256 9c3c40796767af252d7be86c59c8cf9cb5b6a2c35d31f7776d82e132a09ac8c8 SHA512 8a6729fbd67b76ed627c4c161f20822d03650ee76287f6548a4cc7ca4db4045119337380b32070810d56dfc2424ca1b40e8ce3201c09a646193847da5cc2a57a WHIRLPOOL c2df73ff95fb26201c535b2bd83fe5688d969c9ef6c6321900a515611121c3c56e415d16987267b7387ce88b1e80a248eeda5eed6738415565841a0613174d0c
diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
index db1e1c0..7e526f1 100644
--- a/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
@@ -2,13 +2,21 @@ diff --git a/linux-atm-2.5.2.orig/src/sigd/atmsigd.c b/linux-atm-2.5.2/src/sigd/
index 52e41c7..3546f65 100644
--- a/linux-atm-2.5.2.orig/src/sigd/atmsigd.c
+++ b/linux-atm-2.5.2/src/sigd/atmsigd.c
-@@ -517,7 +517,9 @@ int main(int argc,char **argv)
+@@ -283,7 +283,7 @@
+ /* ------------------------------- main ... ------------------------------- */
+
+
+-static void trace_on_exit(int status,void *dummy)
++static void trace_on_exit(int status)
+ {
+ char path[PATH_MAX+1];
+ FILE *file;
+@@ -517,7 +517,7 @@
exit(0);
}
}
-+ /* on_exit() is not implemented on musl.
- (void) on_exit(trace_on_exit,NULL);
-+ */
+- (void) on_exit(trace_on_exit,NULL);
++ (void) atexit(trace_on_exit);
poll_loop();
close_all();
for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-dialup/linux-atm/, net-dialup/linux-atm/files/
@ 2022-07-18 19:01 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-07-18 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 1f5c10972c33f1b5fb4f5e2b3224a499c08d9cc9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 19:00:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:00:15 2022 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1f5c1097
net-dialup/linux-atm: sync with ::gentoo
Bug: https://bugs.gentoo.org/859040
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dialup/linux-atm/Manifest | 2 +-
.../linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch | 41 ++++++++++++++++++++++
.../files/linux-atm-2.5.2-mask-on_exit.patch | 6 ++--
.../linux-atm-2.5.2-remove-SYS_poll-hack.patch | 5 ++-
...-atm-2.5.2.ebuild => linux-atm-2.5.2-r1.ebuild} | 33 ++++++++---------
5 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 95349ed8..36616ee5 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1 +1 @@
-DIST linux-atm-2.5.2.tar.gz 1082256 SHA256 9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08 WHIRLPOOL ddff2b022bd94a64662e2feb8588b0b7a1d33380aaca91888d57c90602ec777f8db308f62b33846f9b2f40dfd7d6b40ca4ddd9d430e1c6bc8a36cdbb4e370771
+DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
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 00000000..ff91c7f1
--- /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/files/linux-atm-2.5.2-mask-on_exit.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
index 7e526f1e..f3ff24a3 100644
--- a/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
@@ -1,7 +1,5 @@
-diff --git a/linux-atm-2.5.2.orig/src/sigd/atmsigd.c b/linux-atm-2.5.2/src/sigd/atmsigd.c
-index 52e41c7..3546f65 100644
---- a/linux-atm-2.5.2.orig/src/sigd/atmsigd.c
-+++ b/linux-atm-2.5.2/src/sigd/atmsigd.c
+--- a/src/sigd/atmsigd.c
++++ b/src/sigd/atmsigd.c
@@ -283,7 +283,7 @@
/* ------------------------------- main ... ------------------------------- */
diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch
index 8a00b674..49d74b1f 100644
--- a/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch
@@ -1,6 +1,5 @@
-diff -Naur linux-atm-2.5.2.orig/src/mpoad/io.c linux-atm-2.5.2/src/mpoad/io.c
---- linux-atm-2.5.2.orig/src/mpoad/io.c 2007-12-31 19:14:51.000000000 -0500
-+++ linux-atm-2.5.2/src/mpoad/io.c 2015-07-15 13:25:41.500014905 -0400
+--- a/src/mpoad/io.c 2007-12-31 19:14:51.000000000 -0500
++++ b/src/mpoad/io.c 2015-07-15 13:25:41.500014905 -0400
@@ -10,14 +10,7 @@
#include <errno.h>
#include <sys/ioctl.h>
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
similarity index 51%
rename from net-dialup/linux-atm/linux-atm-2.5.2.ebuild
rename to net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
index cf5651dc..b5ee36db 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
-inherit eutils flag-o-matic libtool linux-info
+inherit autotools flag-o-matic linux-info
DESCRIPTION="Tools for ATM"
HOMEPAGE="http://linux-atm.sourceforge.net/"
@@ -11,37 +11,38 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="static-libs"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-RDEPEND=""
-DEPEND="virtual/yacc"
+BDEPEND="virtual/yacc"
RESTRICT="test"
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS )
-
CONFIG_CHECK="~ATM"
+PATCHES=(
+ "${FILESDIR}"/${P}-headers.patch
+ "${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
+
+ "${FILESDIR}"/${P}-mask-on_exit.patch
+ "${FILESDIR}"/${P}-remove-SYS_poll-hack.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-headers.patch
- epatch "${FILESDIR}"/${P}-mask-on_exit.patch
- epatch "${FILESDIR}"/${P}-remove-SYS_poll-hack.patch
+ default
sed -i '/#define _LINUX_NETDEVICE_H/d' \
src/arpd/*.c || die "sed command on arpd/*.c files failed"
- elibtoolize
+ eautoreconf
}
src_configure() {
append-flags -fno-strict-aliasing
-
- econf $(use_enable static-libs static)
+ econf
}
src_install() {
default
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
dodoc doc/README* doc/atm*
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-18 19:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-18 19:01 [gentoo-commits] proj/musl:master commit in: net-dialup/linux-atm/, net-dialup/linux-atm/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-07-15 5:35 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox