diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2017-09-02 15:03:53 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2017-09-02 15:03:53 +0000 |
| commit | f600cc23ee89aa48b33d06147ffc764f883cad4a (patch) | |
| tree | 6392b0d00e05cbfce3e3dea009a9203257293636 | |
| parent | 06fbf47b96988440821d7cf411647924a5761433 (diff) | |
| download | ports-f600cc23ee89aa48b33d06147ffc764f883cad4a.tar.gz ports-f600cc23ee89aa48b33d06147ffc764f883cad4a.zip | |
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)
Notes
Notes:
svn path=/branches/2017Q3/; revision=449149
| -rw-r--r-- | mail/spamd/Makefile | 2 | ||||
| -rw-r--r-- | mail/spamd/pkg-deinstall | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile index 0a3672d65aaf..d0b987e12592 100644 --- a/mail/spamd/Makefile +++ b/mail/spamd/Makefile @@ -3,7 +3,7 @@ PORTNAME= spamd PORTVERSION= 4.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SF/freebsdspamd/spamd diff --git a/mail/spamd/pkg-deinstall b/mail/spamd/pkg-deinstall index 5de9b4dd3965..a1ec02684934 100644 --- a/mail/spamd/pkg-deinstall +++ b/mail/spamd/pkg-deinstall @@ -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 '' \ |