svn commit: r531475 - in head/dns/dnsmasq: . files

[Matthias Andree]

Author: mandree
Date: Sun Apr 12 02:16:10 2020
New Revision: 531475
URL: https://svnweb.freebsd.org/changeset/ports/531475

Log:
  dns/dnsmasq: repair damage from UNAUTHORIZED UCL conversion of pkg-message
  
  The pkg-message contains a security note that is necessary on
  new installs and on updates alike.
  
  Since per the porter's handbook, the UCL does not support enumeration
  of types, and this is not relevant on removal, the UCL change must be
  reverted.  While here, remove formatting.
  
  Failure inducing commit:
  |------------------------------------------------------------------------
  |r508835 | mat | 2019-08-13 18:01:59 +0200 (Tue, 13 Aug 2019) | 2 lines
  |
  |Convert to UCL & cleanup pkg-message (categories d)
  |
  |------------------------------------------------------------------------
  
  NOTE: The UCL conversion of files/pkg-message.in was not authorized
  and damaging and no heads-up was sent to the maintainer.
  
  portmgr@ MUST act more carefully with sweeping changes and hand them out
  for review first.

Modified:
  head/dns/dnsmasq/Makefile
  head/dns/dnsmasq/files/pkg-message.in

Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile	Sun Apr 12 02:00:35 2020	(r531474)
+++ head/dns/dnsmasq/Makefile	Sun Apr 12 02:16:10 2020	(r531475)
@@ -4,7 +4,7 @@
 PORTNAME=	dnsmasq
 DISTVERSION=	2.81
 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/ \

Modified: head/dns/dnsmasq/files/pkg-message.in
==============================================================================
--- head/dns/dnsmasq/files/pkg-message.in	Sun Apr 12 02:00:35 2020	(r531474)
+++ head/dns/dnsmasq/files/pkg-message.in	Sun Apr 12 02:16:10 2020	(r531475)
@@ -1,18 +1,12 @@
-[
-{ type: install
-  message: <<EOM
- To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
- set dnsmasq_enable="YES" in /etc/rc.conf[.local]
+To enable dnsmasq, edit %%PREFIX%%/etc/dnsmasq.conf and
+set dnsmasq_enable="YES" in /etc/rc.conf[.local]
 
- Further options and actions are documented inside
- %%PREFIX%%/etc/rc.d/dnsmasq
+Further options and actions are documented inside
+%%PREFIX%%/etc/rc.d/dnsmasq
 
- SECURITY RECOMMENDATION
- ~~~~~~~~~~~~~~~~~~~~~~~
- It is recommended to enable the wpad-related options
- at the end of the configuration file (you may need to
- copy them from the example file to yours) to fix
- CERT Vulnerability VU#598349.
-EOM
-}
-]
+SECURITY RECOMMENDATION
+~~~~~~~~~~~~~~~~~~~~~~~
+It is recommended to enable the wpad-related options
+at the end of the configuration file (you may need to
+copy them from the example file to yours) to fix
+CERT Vulnerability VU#598349.