From nobody Wed Jul 27 15:00:03 2022 X-Original-To: dev-commits-ports-all@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 4LtH4z38V2z4Xm4B; Wed, 27 Jul 2022 15:00:03 +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 4LtH4z2ktKz3mNb; Wed, 27 Jul 2022 15:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658934003; 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=ePIOiamkBk+nSdtvtZn3mOZ1ZhhSJ0ZNZtMtnbSH6q0=; b=PBdJwAV10aO85XfBUApVQ5C2D+PWDsYqjfMYCMIrygn1zYybRrPb5aunQcpT0jjB3k5Kx9 4lCzixYSCGfj31z9wG3/6jexmM/cdKxIXS/PTN/RPy40yn3zlS3La97lOU+Z/xEs9ONccD pK/qwDwUnKDr2ALe/ANAXZ4k/3aciH/Z49q4GcCwb662a/rElfd1GM3C6WK3g87pql69XY cj2bjYa0lMZlBr8GVnRDT0D+CAQKlPX7lY4NqcMlXlcDHZPDXD0i16xhQHujISq/Tv2QjI +9G1sZYf3ogRJIzDf9wXfUH5uRtgbGPVfgKFDuh8cm/LuI5HcXfiglFZAYS30g== 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 4LtH4z1QntzLSG; Wed, 27 Jul 2022 15:00:03 +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 26RF03wF008449; Wed, 27 Jul 2022 15:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RF03IU008446; Wed, 27 Jul 2022 15:00:03 GMT (envelope-from git) Date: Wed, 27 Jul 2022 15:00:03 GMT Message-Id: <202207271500.26RF03IU008446@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 7de4b07516bf - main - mail/postfix: remove interractive part of the script List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7de4b07516bfce49ce4dd9352bdddcc6ddec6ef7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658934003; 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=ePIOiamkBk+nSdtvtZn3mOZ1ZhhSJ0ZNZtMtnbSH6q0=; b=oQCkaXFzz7CvmWF6fJqDDUG9qhB/uUfCVYPH1LrRQ9S3aem31BK7psxS/17nBRIuwTdRya IwmWreYZTlgOg/IdlZmF22w59ib3BqEkaluWGBBvHJdILJVsdD8zwxr2K94bqUI07kSpVj ehS6gpzhqBaGer5Q/tOlYGpntkolKRemlAHpv33Wdi0ZmVikHx+qh+1UGmJyoSF/TsdHnj rJ8nPuA4FF+75Znvg5g/ezSvK5jgnu/KPMNlkzJUGNtLKC3dgo7AmCK5G84ry/wRhDztnr VLwWQoArcqfVIwmIArgYdAK4rhHGcamiG0IcV2o5YTKYQ2OPyVm/IjgLDfs1+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658934003; a=rsa-sha256; cv=none; b=kHDbc0t9Q5neYTjYJdUyhy1V7qByPp/ZspU4zTPqABpJcYUbGzt8BvT26yiJVNutvhJYb1 3+oyTG/+yTURNUqjy+k4PI+JoDBxDQ43rYzFnI9LwMdStdR8udHCdfgGKkHpMgbgdUFhuO 9pOeaLo9tGNV3hPBIfqI6QNYd7kTJpRWYJBorjPCSN1/qTrpCmsiM+pL+4cBlGrnL+0hS0 gRWhYoDFHPrC1vZ4Selp2CdMeBut/zpYDP/0sfP/GyG61Ru8j5xnbZ7qJQLJy8jkXLf44C /OKDLWq+/eis9Y4KdCxxkFly6ET2hrFLV5uC3wbjhR3IS9nc4rFaIe8WWo3SFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7de4b07516bfce49ce4dd9352bdddcc6ddec6ef7 commit 7de4b07516bfce49ce4dd9352bdddcc6ddec6ef7 Author: Baptiste Daroussin AuthorDate: 2022-07-27 14:56:52 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 14:59:48 +0000 mail/postfix: remove interractive part of the script pkg does not allow interractive script --- mail/postfix/Makefile | 2 +- mail/postfix/files/pkg-install.in | 37 +------------------------------------ 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index a4a357e08401..b4bfeeb1e26c 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,6 +1,6 @@ PORTNAME= postfix DISTVERSION= 3.7.2 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in index 340c1df561e7..f4e07fb3759c 100644 --- a/mail/postfix/files/pkg-install.in +++ b/mail/postfix/files/pkg-install.in @@ -28,35 +28,6 @@ else DEFAULT_REPLACE_MAILERCONF=y fi -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then - read -p "${question} [${default}]? " answer - fi - if [ -z "${answer}" ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - # ============================================================================== # Respect POSTFIX_DEFAULT_MTA, do not ask for confirmation! # (This helps tools like salt, ansible or puppet on new installations) @@ -67,13 +38,7 @@ install_choice(){ if [ "${DEFAULT_REPLACE_MAILERCONF}" = "y" ]; then install_mailer_conf ${mailerconf} - elif [ "${DEFAULT_REPLACE_MAILERCONF}" = "n" -a -t 0 ]; then - if yesno "Would you like to activate Postfix in ${mailerconf}" ${DEFAULT_REPLACE_MAILERCONF:="n"}; then - install_mailer_conf ${mailerconf} - else - show_not_activated_msg ${mailerconf} - fi - else + elif [ "${DEFAULT_REPLACE_MAILERCONF}" = "n" ]; then show_not_activated_msg ${mailerconf} fi }