| 1 |
commit: fd46bbdf9eb4b697be0aeb4edec179434568dec7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 25 02:30:51 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 25 02:30:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd46bbdf |
| 7 |
|
| 8 |
net-misc/netkit-talk: cleanup obsolete patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../netkit-talk/files/netkit-talk-0.17-ipv6.diff | 56 ---------------------- |
| 13 |
1 file changed, 56 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff b/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff |
| 16 |
deleted file mode 100644 |
| 17 |
index f426bf7dfad..00000000000 |
| 18 |
--- a/net-misc/netkit-talk/files/netkit-talk-0.17-ipv6.diff |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,56 +0,0 @@ |
| 21 |
---- a/talkd/talkd.c |
| 22 |
-+++ b/talkd/talkd.c |
| 23 |
-@@ -164,13 +164,14 @@ |
| 24 |
- const char *theirip; |
| 25 |
- |
| 26 |
- struct hostent *hp; |
| 27 |
-+ struct sockaddr_in6 addr; |
| 28 |
- struct sockaddr_in sn; |
| 29 |
- int cc, i, ok; |
| 30 |
- socklen_t addrlen; |
| 31 |
- |
| 32 |
-- addrlen = sizeof(sn); |
| 33 |
-+ addrlen = sizeof(addr); |
| 34 |
- cc = recvfrom(0, inbuf, sizeof(inbuf), 0, |
| 35 |
-- (struct sockaddr *)&sn, &addrlen); |
| 36 |
-+ (struct sockaddr *)&addr, &addrlen); |
| 37 |
- if (cc<0) { |
| 38 |
- if (errno==EINTR || errno==EAGAIN) { |
| 39 |
- return; |
| 40 |
-@@ -185,14 +186,30 @@ |
| 41 |
- */ |
| 42 |
- lastmsgtime = time(NULL); |
| 43 |
- |
| 44 |
-- if (addrlen!=sizeof(sn)) { |
| 45 |
-- syslog(LOG_WARNING, "recvfrom: bogus address length"); |
| 46 |
-- return; |
| 47 |
-- } |
| 48 |
-- if (sn.sin_family!=AF_INET) { |
| 49 |
-+ sn.sin_family = AF_INET; |
| 50 |
-+ switch (addr.sin6_family) |
| 51 |
-+ { |
| 52 |
-+ case AF_INET: |
| 53 |
-+ sn.sin_addr=((struct sockaddr_in*)&addr)->sin_addr; |
| 54 |
-+ sn.sin_port=((struct sockaddr_in*)&addr)->sin_port; |
| 55 |
-+ break; |
| 56 |
-+ case AF_INET6: |
| 57 |
-+ // addr must be ::FFFF:x.x.x.x |
| 58 |
-+ if (addr.sin6_addr.s6_addr32[0]!=0 || |
| 59 |
-+ addr.sin6_addr.s6_addr32[1]!=0 || |
| 60 |
-+ addr.sin6_addr.s6_addr16[5]!=0xffff || |
| 61 |
-+ addr.sin6_addr.s6_addr16[4]!=0) |
| 62 |
-+ { |
| 63 |
-+ syslog(LOG_WARNING, "IPv6 address family not supported by talkd"); |
| 64 |
-+ return; |
| 65 |
-+ } |
| 66 |
-+ sn.sin_port=addr.sin6_port; |
| 67 |
-+ sn.sin_addr.s_addr=addr.sin6_addr.s6_addr32[3]; |
| 68 |
-+ break; |
| 69 |
-+ default: |
| 70 |
- syslog(LOG_WARNING, "recvfrom: bogus address family"); |
| 71 |
- return; |
| 72 |
-- } |
| 73 |
-+ } |
| 74 |
- |
| 75 |
- /* |
| 76 |
- * If we get here we have an address we can reply to, although |
Archives