1 |
commit: aca1eba3dca5d534284f38d850bb6733d961fcc0 |
2 |
Author: Matt Smith <matt <AT> offtopica <DOT> uk> |
3 |
AuthorDate: Sat Aug 21 17:24:43 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 25 02:30:29 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca1eba3 |
7 |
|
8 |
net-misc/netkit-talk: EAPI 7 |
9 |
|
10 |
Migrate away from epatch and bump to EAPI 7. |
11 |
|
12 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
13 |
Signed-off-by: Matt Smith <matt <AT> offtopica.uk> |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
.../netkit-talk/files/netkit-talk-0.17-ipv6.patch | 56 ++++++++++++++++++++++ |
17 |
...k-0.17-r6.ebuild => netkit-talk-0.17-r7.ebuild} | 21 ++++---- |
18 |
2 files changed, 66 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..f426bf7dfad |
23 |
--- /dev/null |
24 |
+++ b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.patch |
25 |
@@ -0,0 +1,56 @@ |
26 |
+--- a/talkd/talkd.c |
27 |
++++ b/talkd/talkd.c |
28 |
+@@ -164,13 +164,14 @@ |
29 |
+ const char *theirip; |
30 |
+ |
31 |
+ struct hostent *hp; |
32 |
++ struct sockaddr_in6 addr; |
33 |
+ struct sockaddr_in sn; |
34 |
+ int cc, i, ok; |
35 |
+ socklen_t addrlen; |
36 |
+ |
37 |
+- addrlen = sizeof(sn); |
38 |
++ addrlen = sizeof(addr); |
39 |
+ cc = recvfrom(0, inbuf, sizeof(inbuf), 0, |
40 |
+- (struct sockaddr *)&sn, &addrlen); |
41 |
++ (struct sockaddr *)&addr, &addrlen); |
42 |
+ if (cc<0) { |
43 |
+ if (errno==EINTR || errno==EAGAIN) { |
44 |
+ return; |
45 |
+@@ -185,14 +186,30 @@ |
46 |
+ */ |
47 |
+ lastmsgtime = time(NULL); |
48 |
+ |
49 |
+- if (addrlen!=sizeof(sn)) { |
50 |
+- syslog(LOG_WARNING, "recvfrom: bogus address length"); |
51 |
+- return; |
52 |
+- } |
53 |
+- if (sn.sin_family!=AF_INET) { |
54 |
++ sn.sin_family = AF_INET; |
55 |
++ switch (addr.sin6_family) |
56 |
++ { |
57 |
++ case AF_INET: |
58 |
++ sn.sin_addr=((struct sockaddr_in*)&addr)->sin_addr; |
59 |
++ sn.sin_port=((struct sockaddr_in*)&addr)->sin_port; |
60 |
++ break; |
61 |
++ case AF_INET6: |
62 |
++ // addr must be ::FFFF:x.x.x.x |
63 |
++ if (addr.sin6_addr.s6_addr32[0]!=0 || |
64 |
++ addr.sin6_addr.s6_addr32[1]!=0 || |
65 |
++ addr.sin6_addr.s6_addr16[5]!=0xffff || |
66 |
++ addr.sin6_addr.s6_addr16[4]!=0) |
67 |
++ { |
68 |
++ syslog(LOG_WARNING, "IPv6 address family not supported by talkd"); |
69 |
++ return; |
70 |
++ } |
71 |
++ sn.sin_port=addr.sin6_port; |
72 |
++ sn.sin_addr.s_addr=addr.sin6_addr.s6_addr32[3]; |
73 |
++ break; |
74 |
++ default: |
75 |
+ syslog(LOG_WARNING, "recvfrom: bogus address family"); |
76 |
+ return; |
77 |
+- } |
78 |
++ } |
79 |
+ |
80 |
+ /* |
81 |
+ * If we get here we have an address we can reply to, although |
82 |
|
83 |
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild |
84 |
similarity index 77% |
85 |
rename from net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild |
86 |
rename to net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild |
87 |
index c76f72b3442..585a64aabea 100644 |
88 |
--- a/net-misc/netkit-talk/netkit-talk-0.17-r6.ebuild |
89 |
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r7.ebuild |
90 |
@@ -1,12 +1,12 @@ |
91 |
# Copyright 1999-2021 Gentoo Authors |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
|
94 |
-EAPI=5 |
95 |
+EAPI=7 |
96 |
|
97 |
-inherit epatch toolchain-funcs |
98 |
+inherit toolchain-funcs |
99 |
|
100 |
MY_P=netkit-ntalk-${PV} |
101 |
-S=${WORKDIR}/netkit-ntalk-${PV} |
102 |
+S="${WORKDIR}"/netkit-ntalk-${PV} |
103 |
|
104 |
DESCRIPTION="Netkit - talkd" |
105 |
HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" |
106 |
@@ -17,19 +17,18 @@ SLOT="0" |
107 |
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" |
108 |
IUSE="ipv6" |
109 |
|
110 |
-COMMON_DEPEND=">=sys-libs/ncurses-5.2:=" |
111 |
-DEPEND=" |
112 |
- ${COMMON_DEPEND} |
113 |
- virtual/pkgconfig |
114 |
-" |
115 |
+DEPEND=">=sys-libs/ncurses-5.2:=" |
116 |
+BDEPEND="virtual/pkgconfig" |
117 |
RDEPEND=" |
118 |
- ${COMMON_DEPEND} |
119 |
+ ${DEPEND} |
120 |
virtual/inetd |
121 |
" |
122 |
|
123 |
+PATCHES=( "${FILESDIR}"/${P}-time.patch ) |
124 |
+ |
125 |
src_prepare() { |
126 |
- epatch "${FILESDIR}"/${P}-time.patch |
127 |
- use ipv6 && epatch "${FILESDIR}"/${P}-ipv6.diff |
128 |
+ default |
129 |
+ use ipv6 && eapply "${FILESDIR}"/${P}-ipv6.patch |
130 |
sed -i configure -e '/^LDFLAGS=/d' || die |
131 |
} |