svn commit: r558195 - in head/security/zeek: . files

[Craig Leres]

Author: leres
Date: Wed Dec 16 01:05:01 2020
New Revision: 558195
URL: https://svnweb.freebsd.org/changeset/ports/558195

Log:
  security/zeek: Improve the pkg upgrade experience
  
  Don't remove %%PREFIX%%/spool/state.db otherwise when zeek is
  upgraded zeekctl doesn't detect the running instance and "restart"
  fails.
  
  Split uninstall related info in pkg-message.in to a new remove
  section (and fix some typos).

Modified:
  head/security/zeek/Makefile
  head/security/zeek/files/pkg-message.in
  head/security/zeek/pkg-plist

Modified: head/security/zeek/Makefile
==============================================================================
--- head/security/zeek/Makefile	Wed Dec 16 00:59:51 2020	(r558194)
+++ head/security/zeek/Makefile	Wed Dec 16 01:05:01 2020	(r558195)
@@ -3,6 +3,7 @@
 
 PORTNAME=	zeek
 PORTVERSION=	3.0.12
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://old.zeek.org/downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

Modified: head/security/zeek/files/pkg-message.in
==============================================================================
--- head/security/zeek/files/pkg-message.in	Wed Dec 16 00:59:51 2020	(r558194)
+++ head/security/zeek/files/pkg-message.in	Wed Dec 16 01:05:01 2020	(r558195)
@@ -1,12 +1,6 @@
 [
 { type: install
   message: <<EOM
-During deinstall of this package, the cfg files for broctl are not
-deleted if you have edited them. Instead the software will create
-a .sample file instead and the edited files will remain in place
-when you upgrade. If you want to delete them, you have to remove
-the %%PREFIX%%/etc directory manually.
-
 The rc.d script now honors the zeek_user rc.d variable.  To run as
 a user other than root (the default) you need to make a few changes.
 For example to run as the user zeek, add this to /etc/rc.conf:
@@ -34,6 +28,17 @@ offloading (the default when this feature is supported
 hardware) you will want to set ignore_checksums in site/local.zeek:
 
     redef ignore_checksums = T;
+EOM
+}
+{ type: remove
+  message: <<EOM
+During deinstall of this package, the cfg files for zeekctl are not
+deleted if you have edited them. Instead the software will create
+a .sample file and the edited files will remain in place when you
+upgrade. If you want to delete them, you have to remove the
+%%PREFIX%%/etc directory manually.
+
+You may also need to manually remove %%PREFIX%%/spool/state.db
 EOM
 }
 ]

Modified: head/security/zeek/pkg-plist
==============================================================================
--- head/security/zeek/pkg-plist	Wed Dec 16 00:59:51 2020	(r558194)
+++ head/security/zeek/pkg-plist	Wed Dec 16 01:05:01 2020	(r558195)
@@ -1759,7 +1759,6 @@ man/man8/zeek.8.gz
 %%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-proxy.bro
 %%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local-worker.bro
 %%ZEEKCTL%%@preunexec rm -f %D/spool/installed-scripts-do-not-touch/site/local.bro
-%%ZEEKCTL%%@preunexec rm -f %D/spool/state.db
 %%ZEEKCTL%%@dir spool/tmp
 %%ZEEKCTL%%@dir spool/installed-scripts-do-not-touch/site
 %%ZEEKCTL%%@dir spool/installed-scripts-do-not-touch/auto