From nobody Sun Oct 08 23:54:47 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 4S3fCq3RLtz4wJRK; Sun, 8 Oct 2023 23:54:47 +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 4S3fCq2xbsz3CqV; Sun, 8 Oct 2023 23:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696809287; 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=y74e/oZzE/FZf1Tz1VrNY27OqrZ5cVSlEp61Ney6X8w=; b=gqUCluZtHBlPeLuh6JvwmGMblC3aHGWtXNfg06ijkcppOVuNH7PvFwvS3p1P+kpkbI5y2h zGrXuJmXIJNwxLOondO2WbS6hjW0OtHJ4BsYxJF1BaCo0FscZvflmbNhOvx931ghNWpbAD LIrOj26ETqbgj+a+jquBwvO1Ei6Iaom/7xkXubUEmZVro626SatMWeC/ZLHG89EmzhUO03 ggG8p5o3ZDlAWfoVGxbjthnarPDaj2gAG2JCzXWV74n3p7ziMyFfP0webnFh/ky3QkNu/4 aM48Lx9DtBcCNOFIEgMFaD8+c0xitz9pPSlH9Nr+gcx2n7EV2J2e6cHOfNvRbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696809287; a=rsa-sha256; cv=none; b=SaBLAbICW4Uba83pjK9vGYAu2Xy2DUBOjAZE+iS8oBUgjDZRRLLqOCzgpxCw53Ff5970Ac zmirT4dk3gIO2YiIAQ7YTYv+2oEFasYL0/kk6xG4wOMetI6QERDCGDLLAUtFGqbbRqncsj FWDy7kdzGqU325JcqyyTiUxb6uOopOuPCTB5pTa+o2J1jqwDHoxUA1F0fia8sZUVzPZa3H bE2BE+/HJpJcEWQZytTBzl30mdBlQAPLsnGxGZ0IbohrY2BLIc7PLsm5oQUtrftfP4okWn 2PdJTQVycwkyGuZUWpOP1lmVfsWFE/KaAYwUvcNjNwaFqJbLKDl0V/Xkauwd+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696809287; 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=y74e/oZzE/FZf1Tz1VrNY27OqrZ5cVSlEp61Ney6X8w=; b=wOseiJ7AKO5Mbwv+NdedxRa9xBqYVOI80rOJEAmAW7IL/vjvoSybz9/gQVu2h7UmI8Oz9B A3oo0OYXmAv4Y8czbnFrEQ4M7SYn573kgYfDIcCihUxsH39yVIiFVRpnB4TreyWW3FC2o9 vFsRCOTWPh1XQ8ejOvMYWbu0rKpQikpu04SiPi0OWj1tQUByvfEsMBErUb+vjygiYTD/G4 IBao1vdvHukr83MChsYWn1OER3e6eu5lwwAmy5m2xGKuyr9O1IUssu9XQqV8/UkcflsqyR SPkqAHDGJZyXx8WjZTy1buMjwSaONb4+hSgnJSvC2o4WbyTJ85s+AUMm7OfmlQ== 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 4S3fCq1vS4zYRd; Sun, 8 Oct 2023 23:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 398Nsl8w040500; Sun, 8 Oct 2023 23:54:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 398Nslih040497; Sun, 8 Oct 2023 23:54:47 GMT (envelope-from git) Date: Sun, 8 Oct 2023 23:54:47 GMT Message-Id: <202310082354.398Nslih040497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Romain =?utf-8?Q?Tarti=C3=A8re?= Subject: git: 9ce8c29b90c7 - main - mail/postsrsd: Fix `service postsrsd stop` exit code 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: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ce8c29b90c7d8a5f62fd3dcc8afd48c6aede960 Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ce8c29b90c7d8a5f62fd3dcc8afd48c6aede960 commit 9ce8c29b90c7d8a5f62fd3dcc8afd48c6aede960 Author: Krzysztof AuthorDate: 2023-10-08 23:51:42 +0000 Commit: Romain Tartière CommitDate: 2023-10-08 23:51:42 +0000 mail/postsrsd: Fix `service postsrsd stop` exit code Also improve integration with the sample configuration file. PR: 274168 Approved by: Krzysztof (maintainer) --- mail/postsrsd/Makefile | 9 +++++++-- mail/postsrsd/files/postsrsd.in | 7 ------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mail/postsrsd/Makefile b/mail/postsrsd/Makefile index bf7cd417785b..387d4b2245c3 100644 --- a/mail/postsrsd/Makefile +++ b/mail/postsrsd/Makefile @@ -1,6 +1,6 @@ PORTNAME= postsrsd DISTVERSION= 2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail @@ -34,7 +34,8 @@ SUB_FILES= pkg-message PLIST_FILES= \ sbin/postsrsd \ "@sample ${ETCDIR}.conf.sample" \ - "@dir /var/db/${PORTNAME}" + "@dir /var/db/${PORTNAME}" \ + "@dir /var/run/${PORTNAME}" PORTDOCS= CHANGELOG.rst README.rst postsrsd.conf @@ -50,7 +51,11 @@ SQLITE_DESC= Use sqlite3 backebd for storing envelope senders SQLITE_USES= sqlite SQLITE_CMAKE_BOOL= WITH_SQLITE +post-patch: + ${REINPLACE_CMD} -e '/^chroot-dir/ s/^/#/' ${WRKSRC}/doc/postsrsd.conf + post-install: ${INSTALL_DATA} ${WRKSRC}/doc/postsrsd.conf ${STAGEDIR}${PREFIX}/etc/postsrsd.conf.sample + ${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} .include diff --git a/mail/postsrsd/files/postsrsd.in b/mail/postsrsd/files/postsrsd.in index 1e0617568447..29a89b8bdefa 100644 --- a/mail/postsrsd/files/postsrsd.in +++ b/mail/postsrsd/files/postsrsd.in @@ -22,7 +22,6 @@ name="postsrsd" rcvar=postsrsd_enable start_precmd="postsrsd_prepcmd" -stop_postcmd="postsrsd_postcmd" command="%%PREFIX%%/sbin/postsrsd" _piddir="/var/run/postsrsd" pidfile="${_piddir}/${name}.pid" @@ -56,12 +55,6 @@ postsrsd_prepcmd () fi } -postsrsd_postcmd() -{ - # just if the directory is empty - rmdir ${_piddir} > /dev/null 2>&1 -} - # to let rc.subr kill them all unset pidfile