svn commit: r449149 - branches/2017Q3/mail/spamd

[Adam Weinberger]

Author: adamw
Date: Sat Sep  2 15:03:53 2017
New Revision: 449149
URL: https://svnweb.freebsd.org/changeset/ports/449149

Log:
  MFH: r449108
  
  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)
  
  Approved by:	ports-secteam (delphij)

Modified:
  branches/2017Q3/mail/spamd/Makefile
  branches/2017Q3/mail/spamd/pkg-deinstall
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/mail/spamd/Makefile
==============================================================================
--- branches/2017Q3/mail/spamd/Makefile	Sat Sep  2 14:24:32 2017	(r449148)
+++ branches/2017Q3/mail/spamd/Makefile	Sat Sep  2 15:03:53 2017	(r449149)
@@ -3,7 +3,7 @@
 
 PORTNAME=	spamd
 PORTVERSION=	4.9.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/freebsdspamd/spamd
 

Modified: branches/2017Q3/mail/spamd/pkg-deinstall
==============================================================================
--- branches/2017Q3/mail/spamd/pkg-deinstall	Sat Sep  2 14:24:32 2017	(r449148)
+++ branches/2017Q3/mail/spamd/pkg-deinstall	Sat Sep  2 15:03:53 2017	(r449149)
@@ -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 '' \