3 files changed, 115 insertions, 6 deletions

diff --git a/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch b/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch
new file mode 100644
index 0000000000..98ba4d5283
--- /dev/null
+++ b/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch
@@ -0,0 +1,39 @@
+From fa6227d92725af5ae17b8435c0d50d92ff7a575c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 14 Aug 2024 19:32:25 -0700
+Subject: [PATCH] bison/flex: Add flags for carrying user specified parameters
+
+This helps in passing cmdline to flex and bison e.g. to remove lines
+from generated output to avoid absolute paths
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ cmake/Modules/CMakeUserUseBison.cmake | 1 +
+ cmake/Modules/CMakeUserUseFlex.cmake  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/cmake/Modules/CMakeUserUseBison.cmake b/cmake/Modules/CMakeUserUseBison.cmake
+index 9257545..b61bd0e 100644
+--- a/cmake/Modules/CMakeUserUseBison.cmake
++++ b/cmake/Modules/CMakeUserUseBison.cmake
+@@ -52,6 +52,7 @@ IF(BISON_EXECUTABLE)
+        OUTPUT "${OUTFILE}" "${HEADER}"
+        COMMAND "${BISON_EXECUTABLE}"
+        ARGS "--name-prefix=${PREFIX}"
++       "${BISON_TARGET_ARG_COMPILE_FLAGS}"
+        "--defines"
+        "--output-file=${OUTFILE}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
+diff --git a/cmake/Modules/CMakeUserUseFlex.cmake b/cmake/Modules/CMakeUserUseFlex.cmake
+index 7d0394f..1221dca 100644
+--- a/cmake/Modules/CMakeUserUseFlex.cmake
++++ b/cmake/Modules/CMakeUserUseFlex.cmake
+@@ -39,6 +39,7 @@ IF(FLEX_EXECUTABLE)
+       OUTPUT "${OUTFILE}"
+       COMMAND "${FLEX_EXECUTABLE}"
+       ARGS "-P${PREFIX}"
++      "${FLEX_TARGET_ARG_COMPILE_FLAGS}"
+       "-o${OUTFILE}"
+       "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
+       DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
diff --git a/meta-networking/recipes-protocols/freediameter/files/0001-fixes-for-gcc-15.patch b/meta-networking/recipes-protocols/freediameter/files/0001-fixes-for-gcc-15.patch
new file mode 100644
index 0000000000..41aeec4ee0
--- /dev/null
+++ b/meta-networking/recipes-protocols/freediameter/files/0001-fixes-for-gcc-15.patch
@@ -0,0 +1,69 @@
+From a54f10082f819dadfa6931166e71edffadb565dd Mon Sep 17 00:00:00 2001
+From: Victor Seva <vseva@debian.org>
+Date: Sun, 23 Feb 2025 13:38:48 +0100
+Subject: [PATCH] fixes for gcc-15
+
+fixes #72
+
+Upstream-Status: Backport [https://github.com/freeDiameter/freeDiameter/commit/a54f10082f819dadfa6931166e71edffadb565dd]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ libfdcore/sctp.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/libfdcore/sctp.c b/libfdcore/sctp.c
+index 95e822e..a4a7f40 100644
+--- a/libfdcore/sctp.c
++++ b/libfdcore/sctp.c
+@@ -532,29 +532,29 @@ static int fd_setsockopt_prebind(int sk)
+        /* SCTP_EXPLICIT_EOR: we assume implicit EOR in freeDiameter, so let's ensure this is known by the stack */
+        #ifdef SCTP_EXPLICIT_EOR
+        {
+-               int bool;
++               int _bool;
+                
+                if (TRACE_BOOL(ANNOYING)) {
+                        sz = sizeof(bool);
+                        /* Read socket defaults */
+-                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, &sz)  );
+-                       if (sz != sizeof(bool))
++                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &_bool, &sz)  );
++                       if (sz != sizeof(_bool))
+                        {
+-                               TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %d", sz, (socklen_t)sizeof(bool));
++                               TRACE_DEBUG(INFO, "Invalid size of socket option: %d / %d", sz, (socklen_t)sizeof(_bool));
+                                return ENOTSUP;
+                        }
+-                       fd_log_debug( "Def SCTP_EXPLICIT_EOR value : %s", bool ? "true" : "false");
++                       fd_log_debug( "Def SCTP_EXPLICIT_EOR value : %s", _bool ? "true" : "false");
+                }
+ 
+-               bool = 0;
++               _bool = 0;
+                
+                /* Set the option to the socket */
+-               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, sizeof(bool))  );
++               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &_bool, sizeof(_bool))  );
+                
+                if (TRACE_BOOL(ANNOYING)) {
+                        /* Check new values */
+-                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &bool, &sz)  );
+-                       fd_log_debug( "New SCTP_EXPLICIT_EOR value : %s", bool ? "true" : "false");
++                       CHECK_SYS(  getsockopt(sk, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &_bool, &sz)  );
++                       fd_log_debug( "New SCTP_EXPLICIT_EOR value : %s", _bool ? "true" : "false");
+                }
+        }
+        #else /* SCTP_EXPLICIT_EOR */
+@@ -619,10 +619,10 @@ static int fd_setsockopt_prebind(int sk)
+        
+        #ifdef SCTP_RECVRCVINFO /* Replaces SCTP_SNDRCV */
+        {
+-               int bool = 1;
++               int _bool = 1;
+                
+                /* Set the option to the socket */
+-               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_RECVRCVINFO, &bool, sizeof(bool))  );
++               CHECK_SYS(  setsockopt(sk, IPPROTO_SCTP, SCTP_RECVRCVINFO, &_bool, sizeof(_bool))  );
+                
+        }
+        #else /* SCTP_RECVRCVINFO */
diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
index c7c329a5d4..89b2572c04 100644
--- a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
+++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb
@@ -7,7 +7,7 @@ Accounting needs."
 
 HOMEPAGE = "http://www.freediameter.net"
 
-DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native"
+DEPENDS = "flex-native bison-native cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -23,9 +23,10 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast
     file://freeDiameter.conf \
     file://install_test.patch \
     file://0001-tests-use-EXTENSIONS_DIR.patch \
+    file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \
+    file://0001-fixes-for-gcc-15.patch \
     "
 
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=868c059b6147748b1d621e500feeac4f"
@@ -49,6 +50,8 @@ EXTRA_OECMAKE = " \
     -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \
     -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \
     -DCMAKE_SKIP_RPATH:BOOL=ON \
+    -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
+    -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \
 "
 # INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX
 # specify it on cmd line will fix the SET bug in CMakeList.txt
@@ -62,7 +65,7 @@ EXTRA_OECMAKE = " \
 
 # -DALL_EXTENSIONS=ON will enable all
 
-FD_KEY ?="${BPN}.key"
+FD_KEY ?= "${BPN}.key"
 FD_PEM ?= "${BPN}.pem"
 FD_CA ?= "${BPN}.pem"
 FD_DH_PEM ?= "${BPN}-dh.pem"
@@ -107,15 +110,13 @@ EOF
     # create self cert
     openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}'
     openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024
-
-    find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \;
 }
 
 do_install_ptest() {
     mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/
     rmdir ${D}${PTEST_PATH}-tests
     install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/
-    sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake
+    sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake
     sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake
 }