14
0

Compare commits

5 Commits

3 changed files with 50 additions and 6 deletions

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Jul 30 04:59:43 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Add patch set-c-standard-17.patch:
* Set the C standard to c17 until libmilter is fixed.
-------------------------------------------------------------------
Tue Jun 10 09:04:00 UTC 2025 - Markéta Machová <mmachova@suse.com>
- Convert to pip-based build
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 5 18:22:42 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net> Tue Mar 5 18:22:42 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-pymilter # spec file for package python-pymilter
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# Copyright (c) 2018 Neal Gompa <ngompa13@gmail.com>. # Copyright (c) 2018 Neal Gompa <ngompa13@gmail.com>.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@@ -20,8 +20,6 @@
# we don't want to provide private python extension libs # we don't want to provide private python extension libs
%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$ %global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$
# Python 2 module isn't building properly and we don't really need it right now anyway... # Python 2 module isn't building properly and we don't really need it right now anyway...
%global skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pymilter Name: python-pymilter
Version: 1.0.5 Version: 1.0.5
Release: 0 Release: 0
@@ -32,9 +30,13 @@ Source0: https://github.com/sdgathman/pymilter/archive/pymilter-%{version
Source1: tmpfiles-python-pymilter.conf Source1: tmpfiles-python-pymilter.conf
# PATCH-FIX-UPSTREAM: https://github.com/sdgathman/pymilter/pull/57 # PATCH-FIX-UPSTREAM: https://github.com/sdgathman/pymilter/pull/57
Patch1: 0001-Remove-calls-to-the-deprecated-method-assertEquals.patch Patch1: 0001-Remove-calls-to-the-deprecated-method-assertEquals.patch
# PATCH-FIX-UPSTREAM https://github.com/sdgathman/pymilter/pull/70
Patch2: set-c-standard-17.patch
BuildRequires: %{python_module bsddb3} BuildRequires: %{python_module bsddb3}
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module wheel}
BuildRequires: %{pythons} BuildRequires: %{pythons}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
@@ -64,10 +66,10 @@ This package contains the common files used for pymilter.
%autosetup -n pymilter-pymilter-%{version} -p1 %autosetup -n pymilter-pymilter-%{version} -p1
%build %build
%python_build %pyproject_wheel
%install %install
%python_install %pyproject_install
mkdir -p %{buildroot}%{_localstatedir}/log/milter mkdir -p %{buildroot}%{_localstatedir}/log/milter
mkdir -p %{buildroot}%{_libexecdir}/milter mkdir -p %{buildroot}%{_libexecdir}/milter
@@ -84,7 +86,11 @@ rm test.py testpolicy.py
%files %{python_files} %files %{python_files}
%doc README.md ChangeLog NEWS TODO CREDITS sample.py template.py %doc README.md ChangeLog NEWS TODO CREDITS sample.py template.py
%license COPYING %license COPYING
%{python_sitearch}/* %{python_sitearch}/Milter
%{python_sitearch}/milter.cpython*
%{python_sitearch}/mime.py
%{python_sitearch}/pymilter-%{version}*-info
%pycache_only %{python_sitearch}/__pycache__/mime*
%files -n pymilter-common %files -n pymilter-common
%license COPYING %license COPYING

27
set-c-standard-17.patch Normal file
View File

@@ -0,0 +1,27 @@
From 050b3a15bc00a31968cbdcf627692c1eb2ca3219 Mon Sep 17 00:00:00 2001
From: Sandro <devel@penguinpee.nl>
Date: Wed, 12 Mar 2025 23:44:55 +0100
Subject: [PATCH] Set C standard to C17 explicitely
GCC 15 uses C23 by default. But `libmilter` is not compatible, yet.
This breaks the build as `bool` is a keyword in C23 (issue #68).
---
setup.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 958feee..a6fe2a0 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,10 @@
# set MAX_ML_REPLY to 1 for sendmail < 8.13
define_macros = [ ('MAX_ML_REPLY',32) ],
# save lots of debugging time testing rfc2553 compliance
- extra_compile_args = [ "-Werror=implicit-function-declaration" ]
+ extra_compile_args = [
+ "-Werror=implicit-function-declaration",
+ "-std=gnu17",
+ ]
),
],
keywords = ['sendmail','milter'],