banan-os/ports/openssh/patches/0001-fix-includes.patch

135 lines
4.1 KiB
Diff

diff -ruN openssh-10.2p1/defines.h openssh-10.2p1-banan_os/defines.h
--- openssh-10.2p1/defines.h 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/defines.h 2025-11-10 00:25:58.603474852 +0200
@@ -56,7 +56,9 @@
* Definitions for IP type of service (ip_tos)
*/
#include <netinet/in_systm.h>
+#ifndef __banan_os__
#include <netinet/ip.h>
+#endif
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
# define IPTOS_THROUGHPUT 0x08
diff -ruN openssh-10.2p1/hostfile.c openssh-10.2p1-banan_os/hostfile.c
--- openssh-10.2p1/hostfile.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/hostfile.c 2025-11-10 00:25:55.529325827 +0200
@@ -44,7 +44,9 @@
#include <netinet/in.h>
#include <errno.h>
+#ifndef __banan_os__
#include <resolv.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff -ruN openssh-10.2p1/misc.c openssh-10.2p1-banan_os/misc.c
--- openssh-10.2p1/misc.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/misc.c 2025-11-10 00:25:55.530335947 +0200
@@ -44,7 +44,9 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
+#ifndef __banan_os__
#include <netinet/ip.h>
+#endif
#include <netinet/tcp.h>
#include <arpa/inet.h>
diff -ruN openssh-10.2p1/openbsd-compat/getrrsetbyname.h openssh-10.2p1-banan_os/openbsd-compat/getrrsetbyname.h
--- openssh-10.2p1/openbsd-compat/getrrsetbyname.h 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/openbsd-compat/getrrsetbyname.h 2025-11-10 00:32:52.008821871 +0200
@@ -54,9 +54,13 @@
#include <sys/types.h>
#include <netinet/in.h>
+#ifndef __banan_os__
#include <arpa/nameser.h>
+#endif
#include <netdb.h>
+#ifndef __banan_os__
#include <resolv.h>
+#endif
#ifndef HFIXEDSZ
#define HFIXEDSZ 12
diff -ruN openssh-10.2p1/openbsd-compat/port-net.c openssh-10.2p1-banan_os/openbsd-compat/port-net.c
--- openssh-10.2p1/openbsd-compat/port-net.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/openbsd-compat/port-net.c 2025-11-10 00:32:48.609674523 +0200
@@ -21,7 +21,9 @@
#include <netinet/in.h>
#include <arpa/inet.h>
+#ifndef __banan_os__
#include <netinet/ip.h>
+#endif
#include <errno.h>
#include <fcntl.h>
diff -ruN openssh-10.2p1/packet.c openssh-10.2p1-banan_os/packet.c
--- openssh-10.2p1/packet.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/packet.c 2025-11-10 00:25:55.530874776 +0200
@@ -45,7 +45,9 @@
#include <sys/time.h>
#include <netinet/in.h>
+#ifndef __banan_os__
#include <netinet/ip.h>
+#endif
#include <arpa/inet.h>
#include <errno.h>
diff -ruN openssh-10.2p1/readconf.c openssh-10.2p1-banan_os/readconf.c
--- openssh-10.2p1/readconf.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/readconf.c 2025-11-10 00:25:55.531356125 +0200
@@ -23,7 +23,9 @@
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
+#ifndef __banan_os__
#include <netinet/ip.h>
+#endif
#include <arpa/inet.h>
#include <ctype.h>
diff -ruN openssh-10.2p1/servconf.c openssh-10.2p1-banan_os/servconf.c
--- openssh-10.2p1/servconf.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/servconf.c 2025-11-10 00:25:55.531957951 +0200
@@ -21,7 +21,9 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
+#ifndef __banan_os__
#include <netinet/ip.h>
+#endif
#ifdef HAVE_NET_ROUTE_H
#include <net/route.h>
#endif
diff -ruN openssh-10.2p1/sshbuf-misc.c openssh-10.2p1-banan_os/sshbuf-misc.c
--- openssh-10.2p1/sshbuf-misc.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/sshbuf-misc.c 2025-11-10 00:25:55.533313578 +0200
@@ -26,7 +26,9 @@
#include <stdio.h>
#include <limits.h>
#include <string.h>
+#ifndef __banan_os__
#include <resolv.h>
+#endif
#include <ctype.h>
#include <unistd.h>
diff -ruN openssh-10.2p1/sshkey.c openssh-10.2p1-banan_os/sshkey.c
--- openssh-10.2p1/sshkey.c 2025-10-10 05:38:31.000000000 +0300
+++ openssh-10.2p1-banan_os/sshkey.c 2025-11-10 00:25:55.558750345 +0200
@@ -45,7 +45,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifndef __banan_os__
#include <resolv.h>
+#endif
#include <time.h>
#include <util.h>