diff --git a/net/vallumd/Makefile b/net/vallumd/Makefile index 583bf78d09..2057a48d91 100644 --- a/net/vallumd/Makefile +++ b/net/vallumd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vallumd -PKG_VERSION:=0.2.2 -PKG_RELEASE:=2 +PKG_VERSION:=0.2.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeberg.org/stintel/vallumd/archive/$(PKG_VERSION).tar.gz? -PKG_HASH:=f88cafce41cc118862869268b5e6c9b315a6f084aa8a498d4484e9dac49c575c +PKG_HASH:=9e055668d955194158f9d8f12f96d5065e055aefb2ad3b87d433c5a837d2be39 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_MAINTAINER:=Stijn Tintel diff --git a/net/vallumd/patches/001-CMake-skip-git-magic-if-no-.git-dir-exists.patch b/net/vallumd/patches/001-CMake-skip-git-magic-if-no-.git-dir-exists.patch deleted file mode 100644 index 82a659dfb9..0000000000 --- a/net/vallumd/patches/001-CMake-skip-git-magic-if-no-.git-dir-exists.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b70137d0cc62be7f43816a3ba33b7c3e6a2fbd4e Mon Sep 17 00:00:00 2001 -From: Stijn Tintel -Date: Fri, 18 Nov 2022 09:19:02 +0200 -Subject: [PATCH] CMake: skip git magic if no .git dir exists - -The checks to fail CMake if git describe isn't working break build when -building from source tarballs. - -Test if there is a git directory, and completely skip the git magic if -not. - -Fixes: f42e7beec46e ("CI: add explicit clone to fetch tags") -Signed-off-by: Stijn Tintel ---- - CMakeLists.txt | 51 +++++++++++++++++++++++++------------------------- - 1 file changed, 26 insertions(+), 25 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,35 +9,36 @@ set (VERSION_MAJOR 0) - set (VERSION_MINOR 2) - set (VERSION_PATCH 2) - --execute_process(COMMAND git describe --tags --dirty -- OUTPUT_VARIABLE GIT_DESCRIBE -- OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) --execute_process(COMMAND git describe --abbrev=0 -- OUTPUT_VARIABLE GIT_LAST_TAG -- OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -+if (EXISTS .git/) -+ execute_process(COMMAND git describe --tags --dirty -+ OUTPUT_VARIABLE GIT_DESCRIBE -+ OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -+ execute_process(COMMAND git describe --abbrev=0 -+ OUTPUT_VARIABLE GIT_LAST_TAG -+ OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) - --string(LENGTH "${GIT_DESCRIBE}" GIT_DESCRIBE_LEN) --string(LENGTH "${GIT_LAST_TAG}" GIT_LAST_TAG_LEN) -+ string(LENGTH "${GIT_DESCRIBE}" GIT_DESCRIBE_LEN) -+ string(LENGTH "${GIT_LAST_TAG}" GIT_LAST_TAG_LEN) - --if (GIT_DESCRIBE_LEN EQUAL 0 OR GIT_LAST_TAG_LEN EQUAL 0) -- message(FATAL_ERROR "git describe output empty") --endif () -+ if (GIT_DESCRIBE_LEN EQUAL 0 OR GIT_LAST_TAG_LEN EQUAL 0) -+ message(FATAL_ERROR "git describe output empty") -+ endif () - --string(REGEX REPLACE "^${GIT_LAST_TAG}-" "" GIT_DESCRIBE_NOTAG "${GIT_DESCRIBE}") -+ string(REGEX REPLACE "^${GIT_LAST_TAG}-" "" GIT_DESCRIBE_NOTAG "${GIT_DESCRIBE}") - --if (NOT "${GIT_DESCRIBE}" STREQUAL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -- if ("${GIT_LAST_TAG}" VERSION_LESS -- "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -- string(REGEX REPLACE "^${GIT_LAST_TAG}-" -- "" VERSION_TWEAK "0-pre-${GIT_DESCRIBE_NOTAG}") -- else () -- string(REGEX REPLACE -- "^${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-" -- "" VERSION_TWEAK "${GIT_DESCRIBE}") -+ if (NOT "${GIT_DESCRIBE}" STREQUAL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+ if ("${GIT_LAST_TAG}" VERSION_LESS -+ "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+ string(REGEX REPLACE "^${GIT_LAST_TAG}-" -+ "" VERSION_TWEAK "0-pre-${GIT_DESCRIBE_NOTAG}") -+ else () -+ string(REGEX REPLACE -+ "^${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-" -+ "" VERSION_TWEAK "${GIT_DESCRIBE}") -+ endif () - endif () - endif () - -- - configure_file ( - "${PROJECT_SOURCE_DIR}/src/config.h.in" - "${PROJECT_BINARY_DIR}/config.h" diff --git a/net/vallumd/patches/002-CMake-bump-minimum-required-version-to-3.10.patch b/net/vallumd/patches/002-CMake-bump-minimum-required-version-to-3.10.patch deleted file mode 100644 index 14971d670b..0000000000 --- a/net/vallumd/patches/002-CMake-bump-minimum-required-version-to-3.10.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d95b30a08a968e533fbfd2757ec6a1b2283d3706 Mon Sep 17 00:00:00 2001 -From: Stijn Tintel -Date: Sat, 15 Nov 2025 11:21:49 +0200 -Subject: [PATCH] CMake: bump minimum required version to 3.10 - -This was requested to fix build breakage in OpenWrt buildbot. Update the -CentOS/RHEL installation instructions and CI to install cmake3. - -Signed-off-by: Stijn Tintel ---- - .woodpecker/build.yml | 6 +++--- - CMakeLists.txt | 2 +- - README.md | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - ---- a/.woodpecker/build.yml -+++ b/.woodpecker/build.yml -@@ -49,9 +49,9 @@ pipeline: - image: ${distro}:${distro_version} - commands: - - yum -y install epel-release -- - yum -y install cmake ipset-devel make mosquitto-devel openssl-devel pkgconfig '@Development Tools' -- - cmake . -- - cpack -G RPM -+ - yum -y install cmake3 ipset-devel make mosquitto-devel openssl-devel pkgconfig '@Development Tools' -+ - cmake3 . -+ - cpack3 -G RPM - - yum -y localinstall ./build/*.rpm - when: - event: push ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-License-Identifier: GPL-3.0 */ - # Copyright (C) 2017-2021 Stijn Tintel - --cmake_minimum_required(VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.10) - - project(vallumd C) - ---- a/README.md -+++ b/README.md -@@ -51,7 +51,7 @@ Make sure you have the EPEL repository e - - #### CentOS 7 dependencies - ``` --sudo yum -y install cmake ipset-devel mosquitto-devel openssl-devel pkgconfig '@Development Tools' -+sudo yum -y install cmake3 ipset-devel mosquitto-devel openssl-devel pkgconfig '@Development Tools' - ``` - - #### Common -@@ -59,8 +59,8 @@ You can now generate an RPM package with - ``` - git clone https://codeberg.org/stintel/vallumd.git - cd vallumd --cmake . --cpack -G RPM -+cmake3 . -+cpack3 -G RPM - - sudo yum -y localinstall build/*.rpm - ```