git: e4f35938f00c - main - news/inn: Ignore more domain/FQDN errors for poudriere

The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e4f35938f00c6dc25a2007807b7ff25fde0fedda

commit e4f35938f00c6dc25a2007807b7ff25fde0fedda
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2023-05-03 21:19:31 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2023-05-03 21:19:31 +0000

    news/inn: Ignore more domain/FQDN errors for poudriere
    
    The builder environment doesn't have a vaild FQDN so this is failing a
    downstream port build.
    
    Reported by:    thierry
---
 news/inn/files/patch-lib_innconf.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/news/inn/files/patch-lib_innconf.c b/news/inn/files/patch-lib_innconf.c
index 18a40d901864..360937494fe6 100644
--- a/news/inn/files/patch-lib_innconf.c
+++ b/news/inn/files/patch-lib_innconf.c
@@ -1,11 +1,23 @@
---- lib/innconf.c.orig	2015-09-12 15:25:22.000000000 +0200
-+++ lib/innconf.c	2015-09-21 21:15:18.446435000 +0200
-@@ -473,7 +473,7 @@ innconf_validate(struct config_group *gr
- 
-     if (GetFQDN(innconf->domain) == NULL) {
+--- lib/innconf.c.orig	2023-04-16 19:50:54 UTC
++++ lib/innconf.c
+@@ -447,17 +447,17 @@ innconf_validate(struct config_group *group)
+     fqdn = inn_getfqdn(innconf->domain);
+     if (fqdn == NULL) {
          warn("hostname does not resolve or domain not set in inn.conf");
 -        okay = false;
 +/*        okay = false; */
      }
-     if (innconf->mta == NULL) {
-         warn("must set mta in inn.conf");
+     if (innconf->domain != NULL && !IsValidDomain(innconf->domain)) {
+         warn("domain in inn.conf contains invalid characters not suitable for "
+              "Message-IDs");
+-        okay = false;
++/*        okay = false; */
+     }
+     if (innconf->domain == NULL && !IsValidDomain(fqdn)) {
+         warn("the FQDN of the server contains invalid characters not suitable "
+              "for Message-IDs");
+-        okay = false;
++/*        okay = false; */
+     }
+     free(fqdn);
+