Control: tags 1096585 + patch Control: tags 1096585 + pending Dear maintainer,
I've prepared an NMU for epics-base (versioned as 7.0.8.1+dfsg1-7.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. The C++ fix is a backport from 7.0.9. C23 fixes are missing in 7.0.9, and there are too many on the 7.0 branch for fixing the build with reasonable effort through backports. cu Adrian
diffstat for epics-base-7.0.8.1+dfsg1 epics-base-7.0.8.1+dfsg1 changelog | 8 +++++ patches/0001-Fix-compile-error-in-tsSLList.h.patch | 32 +++++++++++++++++++++ patches/series | 1 rules | 2 + 4 files changed, 43 insertions(+) diff -Nru epics-base-7.0.8.1+dfsg1/debian/changelog epics-base-7.0.8.1+dfsg1/debian/changelog --- epics-base-7.0.8.1+dfsg1/debian/changelog 2025-01-03 13:10:00.000000000 +0200 +++ epics-base-7.0.8.1+dfsg1/debian/changelog 2025-10-05 16:37:51.000000000 +0300 @@ -1,3 +1,11 @@ +epics-base (7.0.8.1+dfsg1-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix and build with -std=gnu17 to fix FTBFS + with GCC 15. (Closes: #1096585) + + -- Adrian Bunk <[email protected]> Sun, 05 Oct 2025 16:37:51 +0300 + epics-base (7.0.8.1+dfsg1-7) unstable; urgency=medium * Team upload. diff -Nru epics-base-7.0.8.1+dfsg1/debian/patches/0001-Fix-compile-error-in-tsSLList.h.patch epics-base-7.0.8.1+dfsg1/debian/patches/0001-Fix-compile-error-in-tsSLList.h.patch --- epics-base-7.0.8.1+dfsg1/debian/patches/0001-Fix-compile-error-in-tsSLList.h.patch 1970-01-01 02:00:00.000000000 +0200 +++ epics-base-7.0.8.1+dfsg1/debian/patches/0001-Fix-compile-error-in-tsSLList.h.patch 2025-10-05 16:37:51.000000000 +0300 @@ -0,0 +1,32 @@ +From 902235520f776d09db3711ac16e9dace92d7f813 Mon Sep 17 00:00:00 2001 +From: Jeremy Lorelli <[email protected]> +Date: Sun, 22 Dec 2024 12:20:39 -0800 +Subject: Fix compile error in tsSLList.h + +--- + modules/libcom/src/cxxTemplates/tsSLList.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/libcom/src/cxxTemplates/tsSLList.h b/modules/libcom/src/cxxTemplates/tsSLList.h +index 6d375af55..895ec7dde 100644 +--- a/modules/libcom/src/cxxTemplates/tsSLList.h ++++ b/modules/libcom/src/cxxTemplates/tsSLList.h +@@ -311,13 +311,13 @@ inline bool tsSLIterConst<T>::valid () const + template < class T > + inline bool tsSLIterConst<T>::operator == ( const tsSLIterConst<T> &rhs ) const + { +- return this->pEntry == rhs.pConstEntry; ++ return this->pEntry == rhs.pEntry; + } + + template < class T > + inline bool tsSLIterConst<T>::operator != (const tsSLIterConst<T> &rhs) const + { +- return this->pEntry != rhs.pConstEntry; ++ return this->pEntry != rhs.pEntry; + } + + template < class T > +-- +2.30.2 + diff -Nru epics-base-7.0.8.1+dfsg1/debian/patches/series epics-base-7.0.8.1+dfsg1/debian/patches/series --- epics-base-7.0.8.1+dfsg1/debian/patches/series 2025-01-03 12:17:39.000000000 +0200 +++ epics-base-7.0.8.1+dfsg1/debian/patches/series 2025-10-05 16:37:51.000000000 +0300 @@ -1,3 +1,4 @@ verbose-install.patch 0002-skip-expected-failing-test.patch fix-epics-header-path.patch +0001-Fix-compile-error-in-tsSLList.h.patch diff -Nru epics-base-7.0.8.1+dfsg1/debian/rules epics-base-7.0.8.1+dfsg1/debian/rules --- epics-base-7.0.8.1+dfsg1/debian/rules 2025-01-03 13:10:00.000000000 +0200 +++ epics-base-7.0.8.1+dfsg1/debian/rules 2025-10-05 16:37:51.000000000 +0300 @@ -4,6 +4,8 @@ DEB_BUILD_MAINT_OPTIONS = hardening=+all include /usr/share/dpkg/buildflags.mk +export DEB_CFLAGS_MAINT_APPEND = -std=gnu17 + # extract the library versions include $(CURDIR)/configure/CONFIG_CA_VERSION include $(CURDIR)/configure/CONFIG_LIBCOM_VERSION
