Control: tags 1112933 + patch Control: tags 1112933 + pending Dear maintainer,
I've prepared an NMU for freediameter (versioned as 1.5.0-2.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for freediameter-1.5.0 freediameter-1.5.0 changelog | 7 + patches/0001-Require-cmake-2.8.12-from-2013-since-current-cmake-w.patch | 62 +++++++++ patches/0002-Bump-minimum-required-cmake-version-to-3.10-from-201.patch | 64 ++++++++++ patches/series | 2 4 files changed, 135 insertions(+) diff -Nru freediameter-1.5.0/debian/changelog freediameter-1.5.0/debian/changelog --- freediameter-1.5.0/debian/changelog 2025-09-11 22:26:29.000000000 +0300 +++ freediameter-1.5.0/debian/changelog 2025-10-24 16:20:04.000000000 +0300 @@ -1,3 +1,10 @@ +freediameter (1.5.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fixes for FTBFS with CMake 4. (Closes: #1112933) + + -- Adrian Bunk <[email protected]> Fri, 24 Oct 2025 16:20:04 +0300 + freediameter (1.5.0-2) unstable; urgency=medium * fix gcc15 build (Closes: #1096650) diff -Nru freediameter-1.5.0/debian/patches/0001-Require-cmake-2.8.12-from-2013-since-current-cmake-w.patch freediameter-1.5.0/debian/patches/0001-Require-cmake-2.8.12-from-2013-since-current-cmake-w.patch --- freediameter-1.5.0/debian/patches/0001-Require-cmake-2.8.12-from-2013-since-current-cmake-w.patch 1970-01-01 02:00:00.000000000 +0200 +++ freediameter-1.5.0/debian/patches/0001-Require-cmake-2.8.12-from-2013-since-current-cmake-w.patch 2025-10-24 16:20:04.000000000 +0300 @@ -0,0 +1,62 @@ +From 9be6c7420195b374b90b8e672393757948744b4f Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <[email protected]> +Date: Wed, 16 Jun 2021 18:05:27 +0200 +Subject: Require cmake 2.8.12 (from 2013) since current cmake warns about + older versions. + +Remove policy check for CMP0022. The variable INTERFACE_LINK_LIBRARIES it +affects is not used. +--- + CMakeLists.txt | 2 +- + libfdcore/CMakeLists.txt | 5 +---- + libfdproto/CMakeLists.txt | 5 +---- + 3 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b0396c8..a72c678 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ SET(FD_PROJECT_VERSION_API 6) + INCLUDE(CTest) + + # CMake version +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) + + # Location of additional CMake modules + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") +diff --git a/libfdcore/CMakeLists.txt b/libfdcore/CMakeLists.txt +index 503437d..b1bc0f1 100644 +--- a/libfdcore/CMakeLists.txt ++++ b/libfdcore/CMakeLists.txt +@@ -2,10 +2,7 @@ + Project("freeDiameter core library" C) + + # Configuration for newer cmake +-cmake_policy(VERSION 2.6) +-if (POLICY CMP0022) +- cmake_policy(SET CMP0022 OLD) +-endif (POLICY CMP0022) ++cmake_policy(VERSION 2.8.12) + + # Configuration parser + BISON_FILE(fdd.y) +diff --git a/libfdproto/CMakeLists.txt b/libfdproto/CMakeLists.txt +index 3650719..4943beb 100644 +--- a/libfdproto/CMakeLists.txt ++++ b/libfdproto/CMakeLists.txt +@@ -2,10 +2,7 @@ + Project("libfdproto" C) + + # Configuration for newer cmake +-cmake_policy(VERSION 2.6) +-if (POLICY CMP0022) +- cmake_policy(SET CMP0022 OLD) +-endif (POLICY CMP0022) ++cmake_policy(VERSION 2.8.12) + + # List of source files for the library + SET(LFDPROTO_SRC +-- +2.30.2 + diff -Nru freediameter-1.5.0/debian/patches/0002-Bump-minimum-required-cmake-version-to-3.10-from-201.patch freediameter-1.5.0/debian/patches/0002-Bump-minimum-required-cmake-version-to-3.10-from-201.patch --- freediameter-1.5.0/debian/patches/0002-Bump-minimum-required-cmake-version-to-3.10-from-201.patch 1970-01-01 02:00:00.000000000 +0200 +++ freediameter-1.5.0/debian/patches/0002-Bump-minimum-required-cmake-version-to-3.10-from-201.patch 2025-10-24 16:20:04.000000000 +0300 @@ -0,0 +1,64 @@ +From 94edb3f9d01f5b4cf7927fcd8cfce469ec1ac06b Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <[email protected]> +Date: Mon, 25 Nov 2024 12:55:19 +0100 +Subject: Bump minimum required cmake version to 3.10 (from 2017). + +Current cmake versions complain about requiring older versions. +--- + CMakeLists.txt | 6 +++--- + libfdcore/CMakeLists.txt | 2 +- + libfdproto/CMakeLists.txt | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a72c678..54009ad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,8 @@ + # This file is the source for generating the Makefile for the project, using cmake tool (cmake.org) + ++# CMake version ++CMAKE_MINIMUM_REQUIRED(VERSION 3.10) ++ + # Name of the project + PROJECT("freeDiameter") + +@@ -19,9 +22,6 @@ SET(FD_PROJECT_VERSION_API 6) + # The test framework, using CTest and CDash. + INCLUDE(CTest) + +-# CMake version +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) +- + # Location of additional CMake modules + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + +diff --git a/libfdcore/CMakeLists.txt b/libfdcore/CMakeLists.txt +index b1bc0f1..4fefcb7 100644 +--- a/libfdcore/CMakeLists.txt ++++ b/libfdcore/CMakeLists.txt +@@ -2,7 +2,7 @@ + Project("freeDiameter core library" C) + + # Configuration for newer cmake +-cmake_policy(VERSION 2.8.12) ++cmake_policy(VERSION 3.10) + + # Configuration parser + BISON_FILE(fdd.y) +diff --git a/libfdproto/CMakeLists.txt b/libfdproto/CMakeLists.txt +index 4943beb..5cde0bd 100644 +--- a/libfdproto/CMakeLists.txt ++++ b/libfdproto/CMakeLists.txt +@@ -2,7 +2,7 @@ + Project("libfdproto" C) + + # Configuration for newer cmake +-cmake_policy(VERSION 2.8.12) ++cmake_policy(VERSION 3.10) + + # List of source files for the library + SET(LFDPROTO_SRC +-- +2.30.2 + diff -Nru freediameter-1.5.0/debian/patches/series freediameter-1.5.0/debian/patches/series --- freediameter-1.5.0/debian/patches/series 2025-09-11 22:26:29.000000000 +0300 +++ freediameter-1.5.0/debian/patches/series 2025-10-24 16:20:04.000000000 +0300 @@ -3,3 +3,5 @@ 0003-Set-default-debian-location-for-freeDiameter-configu.patch 0004-Disable-running-tests-that-require-the-kernel-module.patch 0005-fixes-for-gcc-15.patch +0001-Require-cmake-2.8.12-from-2013-since-current-cmake-w.patch +0002-Bump-minimum-required-cmake-version-to-3.10-from-201.patch
