From 3e0f7d433c6b0cec04880dbd7e2c75df578dfdb4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Tue, 3 Dec 2024 16:12:25 -0500 Subject: [PATCH] some initial modifications --- Makefile | 4 ++-- README.md | 22 +++++++++---------- contriborbase | 1 - createlinks | 8 +++---- ...er-qmail.spec => smeserver-mini-qmail.spec | 21 +++++++++++------- 5 files changed, 30 insertions(+), 26 deletions(-) delete mode 100644 contriborbase rename smeserver-qmail.spec => smeserver-mini-qmail.spec (96%) diff --git a/Makefile b/Makefile index 18544c6..928e24e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -# Makefile for source rpm: smeserver-qmail +# Makefile for source rpm: smeserver-mini-qmail # $Id: Makefile,v 1.1 2016/02/05 21:46:43 stephdl Exp $ -NAME := smeserver-qmail +NAME := smeserver-mini-qmail SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common diff --git a/README.md b/README.md index fa2387d..04199ce 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -# smeserver-qmail +# smeserver-mini-qmail -SMEServer Koozali developed git repo for smeserver-qmail smeserver +SMEServer Koozali developed git repo for smeserver-mini-qmail smeserver ## Wiki
https://wiki.koozali.org/ ## Bugzilla Show list of outstanding bugs: -[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-qmail&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) -[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) -[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) -[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) -[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) -[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) -[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-mini-qmail&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-mini-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-mini-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-mini-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-mini-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-mini-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) +[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-mini-qmail&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced) And a list of outstanding Legacy bugs: (e-smith-qmail) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-qmail&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED) ## Description @@ -21,5 +21,5 @@ And a list of outstanding Legacy bugs: (e-smith-qmail) [here](https://bugs.kooza
*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.* *Once it has been checked, then this comment will be deleted*
- -E-smith-qmail is an open source email server software designed to facilitate email communication for small- and medium-sized businesses. It is highly customizable, with support for multiple domains, virtual domains, forwarding, aliases, and mailing lists, and its features can be adapted to meet the specific communication needs of any organization. With its straightforward web-based administration interface, smeserver-qmail can be easily configured for optimal security and performance. Additionally, its advanced spam filtering technology helps to ensure that email communication remains safe and secure for both senders and recipients. +smeserver-mini-qmail is wrapper to configure qmail for final deivery only and send external email to a qmp server handle by another service. +qmail is an open source email server software designed to facilitate email communication for small- and medium-sized businesses. It is highly customizable, with support for multiple domains, virtual domains, forwarding, aliases, and mailing lists, and its features can be adapted to meet the specific communication needs of any organization. With its straightforward web-based administration interface, smeserver-mini-qmail can be easily configured for optimal security and performance. Additionally, its advanced spam filtering technology helps to ensure that email communication remains safe and secure for both senders and recipients. diff --git a/contriborbase b/contriborbase deleted file mode 100644 index ef36a67..0000000 --- a/contriborbase +++ /dev/null @@ -1 +0,0 @@ -sme10 diff --git a/createlinks b/createlinks index 19a4801..a56ac44 100755 --- a/createlinks +++ b/createlinks @@ -40,7 +40,7 @@ foreach (qw( host-delete host-modify post-upgrade - smeserver-qmail-update + smeserver-mini-qmail-update )); } @@ -75,7 +75,7 @@ foreach (qw( host-delete host-modify post-upgrade - smeserver-qmail-update + smeserver-mini-qmail-update )); } @@ -228,9 +228,9 @@ $event = "ip-change"; safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/qmail"); #-------------------------------------------------- -# actions for smeserver-qmail-update event: +# actions for smeserver-mini-qmail-update event: #-------------------------------------------------- -$event = "smeserver-qmail-update"; +$event = "smeserver-mini-qmail-update"; safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/qmail"); event_link("systemd-reload", $event, "89"); diff --git a/smeserver-qmail.spec b/smeserver-mini-qmail.spec similarity index 96% rename from smeserver-qmail.spec rename to smeserver-mini-qmail.spec index 6dd7096..c3f8a7a 100644 --- a/smeserver-qmail.spec +++ b/smeserver-mini-qmail.spec @@ -1,10 +1,10 @@ # $Id: e-smith-qmail.spec,v 1.17 2022/04/06 04:38:59 jpp Exp $ Summary: startup scripts for Dan Bernstein's qmail package -%define name smeserver-qmail +%define name smeserver-mini-qmail Name: %{name} -%define version 11.0.0 -%define release 8 +%define version 11.0.1 +%define release 1 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -14,21 +14,26 @@ Source: %{name}-%{version}.tar.xz BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: smeserver-devtools >= 1.13.0-04 BuildArchitectures: noarch -Requires: qmail -Requires: dot-forward +Requires: mini-qmail +#those two one will requires qmail rpm, should either change their requirement to a binary +# or make this rpm or mini-qmail provides qmail +# first option is cleaner +Requires: dot-forward Requires: fastforward -Requires: runit Requires: smeserver-email -Requires: qmail >= 1.03-17 Provides: smeserver-mta Provides: e-smith-mta -Conflicts: runit < 1.7 Obsoletes: qmail-initscripts Obsoletes: qmail-workaround +Provides: smeserver-qmail = %{version}-%{release} +Obsoletes: smeserver-qmail < %{version}-%{release} Provides: e-smith-qmail AutoReqProv: no %changelog +* Tue Dec 03 2024 Jean-Philippe Pialasse 11.0.1-1.sme +- initial release of smeserver-mini-qmail from former smeserver-qmail [SME: ] + * Thu Apr 25 2024 Jean-Philippe Pialasse 11.0.0-8.sme - move qmail template from qpsmtpd [SME: 9492] badrcptto,badmailfrom,rcpthosts are for qmail-smtpd, they were used by qpsmtpd