From nobody Wed May 03 21:20:39 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QBVGv3tXFz49Glq; Wed, 3 May 2023 21:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBVGv3McJz3vvC; Wed, 3 May 2023 21:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683148839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV5rtNL1kIgfF8KENy9tFagkUeL9xSNFZxKh4o0zmfU=; b=pqDSlPHd/3CdMCjxADRutR2w/L1zDHl4d3iZxRoKBobnsnwOAvORcBNIZ+Mux7RVwDouSO tDmJV/cAs2+ngoEr09HBsa6ctFkJLHdhYtHX9jK+kSrIYijgO5Plm2eAJ+qD6nLQTMxZxe a9014qWMid2uVDnvpZrZuqAaZWbnq92Ju5yUkcUgxFBLLAs81ZHlDMqH0pB2n2IRyFworG Iajh7ZXqFnb579pBRr+VCub9MmipuPwyOA3h53kYhxnA4IaiuaDv/WG+q5eTB8yEXmTSuG gsHVNZvPN/vF/nPX5bUdBkbf4i+CJ5h7qikdJhYUhWpayUr5meWtP9c4O0lwvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683148839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV5rtNL1kIgfF8KENy9tFagkUeL9xSNFZxKh4o0zmfU=; b=bZgP6wRh4W7ccm4a/l+Yseu/YT8JTGRGvDXIKfZn3/7tKF93YY9DQy49k+CbSTM9+oUdaw p1e+CvRJgV06V3WJ9m1D1JIez8bw9mO713ttevtfuZnfOKtFSYjFd79an4eso8v8bWyprs PXh1WCrWbJIaaaKg99+MCKCvdSGCRaNVsjmuEqlUkQ+k08ye3lip8SOm6xtm/Z5FoTbZTm WZbS5Umi8JYkegejcwKDj4mz65TZ2/JjD2HVVO7UXV9ML5iYJIG23hGEJlcQIWD0/hz2Kn HhNGKTyYIZ0TacbyIfZ/8JIGeF4jSocUwx9MaX9hhDSC7yWF5bUuAvbDCSdklA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683148839; a=rsa-sha256; cv=none; b=NHrY2PlRygqCtNbpvssQZJu0sCtX/edw8QtIgH1rbbegKGXd1ZtmVesNXIQ6wIaEESxZAN LCOibQcNFWf4CechvXbRGF+G/aDC6/gw1Garot2OJcJ7hFcrOP276Pp4pvdmySZv/DuTmv W08R8MYSkHs3sX5PlMPjO0Vd6vCN2KBJmQ2weogXV51cic9gxDI9RRDodVmvFZ3icd0Nhi eVeTARcHabxL3xIQHocSqW+jVOcrV8Ng++V50Olh7MlOROw9TO81potvQqnEp8FT3Tar5X jG+NqVSdd7Pq0orkIhxyst/KECri+foOjhDRbdB7EZPSRyud6W/0ZMfhhlyTqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QBVGv2NVczlcW; Wed, 3 May 2023 21:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 343LKd64045796; Wed, 3 May 2023 21:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343LKduo045784; Wed, 3 May 2023 21:20:39 GMT (envelope-from git) Date: Wed, 3 May 2023 21:20:39 GMT Message-Id: <202305032120.343LKduo045784@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: e4f35938f00c - main - news/inn: Ignore more domain/FQDN errors for poudriere List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4f35938f00c6dc25a2007807b7ff25fde0fedda Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4f35938f00c6dc25a2007807b7ff25fde0fedda commit e4f35938f00c6dc25a2007807b7ff25fde0fedda Author: Kevin Bowling AuthorDate: 2023-05-03 21:19:31 +0000 Commit: Kevin Bowling 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); +