Date: Sun, 12 Apr 2020 02:43:28 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r531479 - in branches/2020Q2: dns/dnsmasq dns/dnsmasq-devel/files dns/dnsmasq/files graphics/rawtherapee mail/mailman mail/mailman/files sysutils/e2fsprogs Message-ID: <202004120243.03C2hSom083003@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sun Apr 12 02:43:28 2020 New Revision: 531479 URL: https://svnweb.freebsd.org/changeset/ports/531479 Log: MFH: r531475 r531476 r531477 r531478 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. dns/dnsmasq-devel: synch non-UCL pkg-message.in e2fsprogs, rawtherapee: Repair more UCL pkg-message conversion errors. Both pkg-message texts are relevant for updates. Reverting this part of UNAUTHORIZED commits, and bump PORTREVISION. Clean up pkg-message. Failure-inducing commits: ------------------------------------------------------------------------ r508837 | mat | 2019-08-13 18:03:11 +0200 (Tue, 13 Aug 2019) | 2 lines Convert to UCL & cleanup pkg-message (categories e-g) ------------------------------------------------------------------------ r508909 | mat | 2019-08-14 14:16:12 +0200 (Wed, 14 Aug 2019) | 2 lines Convert to UCL & cleanup pkg-message (categories s) ------------------------------------------------------------------------ mail/mailman: repair incomplete UCL conversion of pkg-message.in There are parts of the install message that are also relevant on updates, but were missed. Add them, and bump PORTREVISION. Failure-inducing commit: ------------------------------------------------------------------------ r508882 | mat | 2019-08-14 00:29:42 +0200 (Wed, 14 Aug 2019) | 2 lines onvert to UCL & cleanup pkg-message (categories l-m) ------------------------------------------------------------------------ Approved by: ports-secteam@ (blanket, only changing pkg-message[.in]) Modified: branches/2020Q2/dns/dnsmasq-devel/files/pkg-message.in branches/2020Q2/dns/dnsmasq/Makefile branches/2020Q2/dns/dnsmasq/files/pkg-message.in branches/2020Q2/graphics/rawtherapee/Makefile branches/2020Q2/graphics/rawtherapee/pkg-message branches/2020Q2/mail/mailman/Makefile branches/2020Q2/mail/mailman/files/pkg-message.in branches/2020Q2/sysutils/e2fsprogs/Makefile branches/2020Q2/sysutils/e2fsprogs/pkg-message Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/dns/dnsmasq-devel/files/pkg-message.in ============================================================================== --- branches/2020Q2/dns/dnsmasq-devel/files/pkg-message.in Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/dns/dnsmasq-devel/files/pkg-message.in Sun Apr 12 02:43:28 2020 (r531479) @@ -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. Modified: branches/2020Q2/dns/dnsmasq/Makefile ============================================================================== --- branches/2020Q2/dns/dnsmasq/Makefile Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/dns/dnsmasq/Makefile Sun Apr 12 02:43:28 2020 (r531479) @@ -3,7 +3,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.80 -PORTREVISION= 4 # leave this in even if 0 to avoid PORTEPOCH bumps +PORTREVISION= 5 # leave this in even if 0 to avoid PORTEPOCH bumps PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ Modified: branches/2020Q2/dns/dnsmasq/files/pkg-message.in ============================================================================== --- branches/2020Q2/dns/dnsmasq/files/pkg-message.in Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/dns/dnsmasq/files/pkg-message.in Sun Apr 12 02:43:28 2020 (r531479) @@ -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. Modified: branches/2020Q2/graphics/rawtherapee/Makefile ============================================================================== --- branches/2020Q2/graphics/rawtherapee/Makefile Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/graphics/rawtherapee/Makefile Sun Apr 12 02:43:28 2020 (r531479) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 5.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ Modified: branches/2020Q2/graphics/rawtherapee/pkg-message ============================================================================== --- branches/2020Q2/graphics/rawtherapee/pkg-message Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/graphics/rawtherapee/pkg-message Sun Apr 12 02:43:28 2020 (r531479) @@ -1,6 +1,3 @@ -[ -{ type: install - message: <<EOM LENSFUN INFORMATION: This package uses lensfun to correct lens aberrations. In case @@ -16,6 +13,3 @@ remove older cache directories. Also, after configurations have been moved to the new version's directory, older $HOME/.config/RawTherapee* directories may be removed. -EOM -} -] Modified: branches/2020Q2/mail/mailman/Makefile ============================================================================== --- branches/2020Q2/mail/mailman/Makefile Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/mail/mailman/Makefile Sun Apr 12 02:43:28 2020 (r531479) @@ -3,7 +3,7 @@ PORTNAME= mailman DISTVERSION= 2.1.29 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ @@ -189,7 +189,6 @@ post-patch-HTDIG-on: ${REINPLACE_CMD} -E \ -e 's#/opt/www/htdig/bin#${LOCALBASE}/bin#' \ ${WRKSRC}/Mailman/Cgi/remote?mmsearch - .if ${PORT_OPTIONS:MPOSTFIX} pre-configure: Modified: branches/2020Q2/mail/mailman/files/pkg-message.in ============================================================================== --- branches/2020Q2/mail/mailman/files/pkg-message.in Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/mail/mailman/files/pkg-message.in Sun Apr 12 02:43:28 2020 (r531479) @@ -56,6 +56,24 @@ Refer to %%LOCALBASE%%/etc/namazu/namazurc.sample. EOM } { type: upgrade + message <<EOM +========================================== +WARNING ATTENTION DANGER ATTENTION WARNING +========================================== + +mail/mailman requires proper directory permissions to run; but due to +pkg 1.4.1 or libarchive bugs, directory permissions can not be created +properly. + +If you installed mailman with pkg -I, --no-script or --no-install-scripts, +you MUST(!) run the post-install script now, as root: + +env "PKG_PREFIX=%%PREFIX%%" sh \ + %%MAILMANDIR%%/bin/FreeBSD-post-install x POST-INSTALL + +EOM +} +{ type: upgrade maximum_version: 2.1.18 message <<EOM UPDATE INFORMATION FOR UPDATES OF 2.1.18/OLDER TO VERSION 2.1.19 AND NEWER: Modified: branches/2020Q2/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2020Q2/sysutils/e2fsprogs/Makefile Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/sysutils/e2fsprogs/Makefile Sun Apr 12 02:43:28 2020 (r531479) @@ -3,7 +3,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.45.6 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} Modified: branches/2020Q2/sysutils/e2fsprogs/pkg-message ============================================================================== --- branches/2020Q2/sysutils/e2fsprogs/pkg-message Sun Apr 12 02:39:52 2020 (r531478) +++ branches/2020Q2/sysutils/e2fsprogs/pkg-message Sun Apr 12 02:43:28 2020 (r531479) @@ -1,9 +1,3 @@ -[ -{ type: install - message: <<EOM Note: this is a modified version of the e2fsprogs package, not the official package. Report all building and run-time trouble that originates in the package to the port maintainer, mandree@FreeBSD.org. -EOM -} -]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004120243.03C2hSom083003>