From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 13 May 2024 22:44:04 +0000 (-0700)
Subject: eoip: fix compilation with gcc14
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=539858ad756c751db252689644ad1125d795d2db;p=feed%2Fpackages.git

eoip: fix compilation with gcc14

Wrong pointer and missing header.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/net/eoip/Makefile b/net/eoip/Makefile
index ff7c832692..bc9847d132 100644
--- a/net/eoip/Makefile
+++ b/net/eoip/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=eoip
 PKG_VERSION:=0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Bogdan Shatik <bogdikxxx@mail.ru>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/eoip/patches/010-gcc14.patch b/net/eoip/patches/010-gcc14.patch
new file mode 100644
index 0000000000..8495a056bd
--- /dev/null
+++ b/net/eoip/patches/010-gcc14.patch
@@ -0,0 +1,19 @@
+--- a/eoip.c
++++ b/eoip.c
+@@ -44,6 +44,7 @@
+ #include <signal.h>
+ #include <assert.h>
+ #include <pthread.h>
++#include <libgen.h>
+ #include <limits.h>
+ #include <asm/byteorder.h>
+ #include "minIni.h"
+@@ -205,7 +206,7 @@ static void *thr_rx(void *threadid)
+ 	    ret = select(raw_socket+1, &rfds, NULL, NULL, NULL);
+ 	    assert(rxringbufused == 0);
+ 	    while (rxringbufused < MAXRINGBUF) {
+-		rxringpayload[rxringbufused] = recvfrom(raw_socket, rxringbufptr[rxringbufused], MAXPAYLOAD, 0, &saddr[rxringbufused], &saddr_size);
++		rxringpayload[rxringbufused] = recvfrom(raw_socket, rxringbufptr[rxringbufused], MAXPAYLOAD, 0, (struct sockaddr *)&saddr[rxringbufused], &saddr_size);
+ 		if (rxringpayload[rxringbufused] < 0)
+ 		    break;
+ 		if (rxringpayload[rxringbufused] >= 28)
diff --git a/net/eoip/patches/100-add_LF_to_pidfile.patch b/net/eoip/patches/100-add_LF_to_pidfile.patch
index 66278d4651..08e7a77537 100644
--- a/net/eoip/patches/100-add_LF_to_pidfile.patch
+++ b/net/eoip/patches/100-add_LF_to_pidfile.patch
@@ -1,6 +1,6 @@
 --- a/eoip.c
 +++ b/eoip.c
-@@ -430,7 +430,7 @@ int main(int argc, char **argv)
+@@ -431,7 +431,7 @@ int main(int argc, char **argv)
  	exit(1);
  
      mfd = fopen(pidfile, "w");