From d0deac49ff7c5781dcdc000b9e9caf5f94548727 Mon Sep 17 00:00:00 2001 From: Austin Lane Date: Mon, 23 Jun 2025 09:12:55 -0400 Subject: [PATCH] libulfius: Update to v2.7.15 This library is tightly coupled with liborcania and libyder, they must be updated together. * Update libulfius to v2.7.15 * Patch libulfius to fix FTBFS on 32-bit architectures with 64-bit time_t - Backported from upstream commit: 9457809a5321ca4a87f19fdc3f7f4af68e72afa8 * Remove obsolete CMAKE options for libulfius Signed-off-by: Austin Lane --- libs/libulfius/Makefile | 15 ++++++++------- .../patches/0001-cmake-pc-orcania-found.patch | 11 ----------- .../001-fix-ftbfs-32bit-arches-64bit-time_t.patch | 11 +++++++++++ 3 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 libs/libulfius/patches/0001-cmake-pc-orcania-found.patch create mode 100644 libs/libulfius/patches/001-fix-ftbfs-32bit-arches-64bit-time_t.patch diff --git a/libs/libulfius/Makefile b/libs/libulfius/Makefile index e08761d70b..274ff28b9e 100644 --- a/libs/libulfius/Makefile +++ b/libs/libulfius/Makefile @@ -1,12 +1,17 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + include $(TOPDIR)/rules.mk PKG_NAME:=libulfius -PKG_VERSION:=2.7.10 -PKG_RELEASE:=2 +PKG_VERSION:=2.7.15 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/babelouest/ulfius/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=616c5df99584071461a1285dd7155883f7d2b94abf0931038feeebd3da3a6def +PKG_HASH:=19cf789b2af1919b69f77c7701237bfc318a9781ec657b68fd4b6ffa9d53f111 PKG_MAINTAINER:=Toni Uhlig PKG_LICENSE:=LGPL-2.1-or-later @@ -44,14 +49,10 @@ endef CMAKE_OPTIONS += \ -D_GNU_SOURCE=ON \ - -DDOWNLOAD_DEPENDENCIES=OFF \ -DBUILD_WEBSOCKET=OFF \ - -DSEARCH_ORCANIA_U=ON \ -DWITH_CURL=ON \ -DWITH_JANSSON=OFF \ - -DWITH_STRSTR=ON \ -DWITH_YDER=OFF \ - -DSEARCH_YDER=OFF \ -DCMAKE_BUILD_TYPE=Release ifeq ($(BUILD_VARIANT),gnutls) diff --git a/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch b/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch deleted file mode 100644 index b95b8c0709..0000000000 --- a/libs/libulfius/patches/0001-cmake-pc-orcania-found.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -257,7 +257,7 @@ if (SEARCH_ORCANIA_U) - set(Orcania_FIND_QUIETLY ON) # force to find Orcania quietly - include(FindOrcania) - find_package(Orcania ${ORCANIA_VERSION_REQUIRED} QUIET) # try to find orcania -- if (NOT ORCANIA_FOUND) -+ if (NOT ORCANIA_FOUND AND NOT PC_ORCANIA_FOUND) - if (DOWNLOAD_DEPENDENCIES) - include(DownloadProject) - download_project(PROJ orcania # ... otherwise, download archive diff --git a/libs/libulfius/patches/001-fix-ftbfs-32bit-arches-64bit-time_t.patch b/libs/libulfius/patches/001-fix-ftbfs-32bit-arches-64bit-time_t.patch new file mode 100644 index 0000000000..f420ad0e13 --- /dev/null +++ b/libs/libulfius/patches/001-fix-ftbfs-32bit-arches-64bit-time_t.patch @@ -0,0 +1,11 @@ +--- a/src/u_websocket.c ++++ b/src/u_websocket.c +@@ -2313,7 +2313,7 @@ int ulfius_websocket_wait_close(struct _ + if (timeout) { + clock_gettime(CLOCK_REALTIME, &abstime); + abstime.tv_sec += ((time_t)timeout / 1000); +- abstime.tv_nsec += (((time_t)timeout%1000) * 1000000); ++ abstime.tv_nsec += ((((long int)timeout)%1000) * 1000000); + if (abstime.tv_nsec > 999999999) { + abstime.tv_nsec %= 1000000000; + abstime.tv_sec ++; -- 2.30.2