From owner-svn-ports-all@freebsd.org Fri Sep 1 22:03:05 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E9D80E09ED2; Fri, 1 Sep 2017 22:03:05 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAFAD65D8C; Fri, 1 Sep 2017 22:03:05 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81M34YD037402; Fri, 1 Sep 2017 22:03:04 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81M34QB037400; Fri, 1 Sep 2017 22:03:04 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201709012203.v81M34QB037400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 1 Sep 2017 22:03:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449108 - head/mail/spamd X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/mail/spamd X-SVN-Commit-Revision: 449108 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 22:03:06 -0000 Author: adamw Date: Fri Sep 1 22:03:04 2017 New Revision: 449108 URL: https://svnweb.freebsd.org/changeset/ports/449108 Log: Disable the pkg-deinstall script. spamd's pkg-install adds spamd stuff to /etc/services, and pkg-deinstall removed it. The problem is that pkg doesn't run DEINSTALL before INSTALL when upgrading/reinstalling. As a result, when spamd is restarted, /etc/services winds up lacking the spamd entries, causing spamd to fail to start. The ideal solution is pkg running those targets in the predicted order, or pkg gaining a @services keyword. In the meantime, this commit just disables the pkg-deinstall. If you are uninstalling spamd you can remove those /etc/services entries by hand. PR: 212335 Approved by: maintainer timeout (~ 1 yr) MFH: 2017Q3 Modified: head/mail/spamd/Makefile head/mail/spamd/pkg-deinstall Modified: head/mail/spamd/Makefile ============================================================================== --- head/mail/spamd/Makefile Fri Sep 1 21:51:10 2017 (r449107) +++ head/mail/spamd/Makefile Fri Sep 1 22:03:04 2017 (r449108) @@ -3,7 +3,7 @@ PORTNAME= spamd PORTVERSION= 4.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SF/freebsdspamd/spamd Modified: head/mail/spamd/pkg-deinstall ============================================================================== --- head/mail/spamd/pkg-deinstall Fri Sep 1 21:51:10 2017 (r449107) +++ head/mail/spamd/pkg-deinstall Fri Sep 1 22:03:04 2017 (r449108) @@ -5,7 +5,9 @@ # # $FreeBSD$ -if [ "$2" = "DEINSTALL" ]; then +#if [ "$2" = "DEINSTALL" ]; then +# Disabled until pkg runs DEINSTALL before INSTALL in upgrades +if false; then FILE="/etc/services" echo "===> Removing spamd entries from ${FILE}" sed -i '' \