Package: spamprobe Version: 1.4d-18 Severity: normal Tags: patch Just a few more patches to avoid warnings and problems during building on trixie (my followup to #1015294).
-- System Information: Debian Release: 13.4 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500, 'proposed-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 6.12.73+deb13-amd64 (SMP w/24 CPU threads; PREEMPT) Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages spamprobe depends on: ii debconf [debconf-2.0] 1.5.91 ii libc6 2.41-12+deb13u2 ii libdb5.3t64 5.3.28+dfsg2-9 ii libgcc-s1 14.2.0-19 ii libgif7 5.2.2-1+b1 ii libjpeg62-turbo 1:2.1.5-4 ii libpng16-16t64 1.6.48-1+deb13u3 ii libstdc++6 14.2.0-19 Versions of packages spamprobe recommends: ii procmail 3.24+really3.22-4 spamprobe suggests no packages. -- debconf information: spamprobe/db53_upgrade:
Description: Some patches to make spamprobe build without errors and warnings with gcc-14 Author: Frank Heckenbach <[email protected]> --- spamprobe-1.4d/src/includes/Ref.h +++ spamprobe-1.4d/src/includes/Ref.h @@ -228,7 +228,7 @@ { } - template<typename Z> explicit Ref<T>(Z *ptr) + template<typename Z> explicit Ref(Z *ptr) : CRef<T>(ptr) { } --- spamprobe-1.4d/src/database/FrequencyDBImpl_hash.cc +++ spamprobe-1.4d/src/database/FrequencyDBImpl_hash.cc @@ -30,6 +30,7 @@ #ifdef USE_MMAP +#include <cinttypes> #include <stdexcept> #include <stdio.h> #include <unistd.h> @@ -199,7 +200,7 @@ return FrequencyDB::COUNT_WORD; } else { char buffer[128]; - sprintf(buffer, "I0x%08lx", key); + sprintf(buffer, "I0x%08" PRIu32 "x", key); return buffer; } } @@ -210,7 +211,7 @@ if (word == FrequencyDB::COUNT_WORD) { // key not used for count } else if (starts_with(word, "I0x")) { - sscanf(word.c_str() + 3, "%lx", &key); + sscanf(word.c_str() + 3, "%" PRIu32 "x", &key); } else { key = hash_string(word); } --- spamprobe-1.4d/src/includes/LRUCache.h +++ spamprobe-1.4d/src/includes/LRUCache.h @@ -56,7 +56,7 @@ IterType currentPosition; }; - class LRUCacheNodeKeyCompare : public binary_function<const NodeType *, const NodeType *, bool> + class LRUCacheNodeKeyCompare { public: bool operator()(const NodeType *a, --- spamprobe-1.4d/src/database/Makefile.in +++ spamprobe-1.4d/src/database/Makefile.in @@ -47,7 +47,7 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar -ARFLAGS = cru +ARFLAGS = cr libdatabase_a_AR = $(AR) $(ARFLAGS) libdatabase_a_LIBADD = am_libdatabase_a_OBJECTS = CleanupManager.$(OBJEXT) \ --- spamprobe-1.4d/src/hdl/Makefile.in +++ spamprobe-1.4d/src/hdl/Makefile.in @@ -47,7 +47,7 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar -ARFLAGS = cru +ARFLAGS = cr libhdl_a_AR = $(AR) $(ARFLAGS) libhdl_a_LIBADD = am_libhdl_a_OBJECTS = HdlArgumentConstraint.$(OBJEXT) \ --- spamprobe-1.4d/src/input/Makefile.in +++ spamprobe-1.4d/src/input/Makefile.in @@ -47,7 +47,7 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar -ARFLAGS = cru +ARFLAGS = cr libinput_a_AR = $(AR) $(ARFLAGS) libinput_a_LIBADD = am_libinput_a_OBJECTS = IstreamCharReader.$(OBJEXT) \ --- spamprobe-1.4d/src/parser/Makefile.in +++ spamprobe-1.4d/src/parser/Makefile.in @@ -47,7 +47,7 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar -ARFLAGS = cru +ARFLAGS = cr libparser_a_AR = $(AR) $(ARFLAGS) libparser_a_LIBADD = am_libparser_a_OBJECTS = AutoTrainMailMessageReader.$(OBJEXT) \ --- spamprobe-1.4d/src/utility/Makefile.in +++ spamprobe-1.4d/src/utility/Makefile.in @@ -47,7 +47,7 @@ CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) AR = ar -ARFLAGS = cru +ARFLAGS = cr libutility_a_AR = $(AR) $(ARFLAGS) libutility_a_LIBADD = am_libutility_a_OBJECTS = AbstractMultiLineString.$(OBJEXT) \ @@ -61,7 +61,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
