Page MenuHomeFreeBSD
Files F111893995

D17089.id50317.diff
No OneTemporary
Actions

D17089.id50317.diff
View Options

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,22 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20181110:
+ AFFECTS: users of sysutils/munin-master, sysutils/munin-node, www/owncloud, mail/mailman
+ AUTHOR: woodsb02@FreeBSD.org
+
+ The newsyslog.conf(5) filename installed by the port has been changed:
+ OLD: ${PREFIX}/etc/newsyslog.conf.d/${PORTNAME}
+ NEW: ${PREFIX}/etc/newsyslog.conf.d/${PORTNAME}.conf
+
+ Any file found at the old location will be automatically moved to the new
+ location. This will ensure log rotation will continue to work after change
+ r340318 to FreeBSD base, where the default newsyslog configuration now only
+ includes filenames that end with '.conf' and do not begin with '.'.
+
+ If you use provisioning/configuration management tools to create or edit this
+ file, you will need to change their configuration to use the new filename.
+
20181111
AFFECTS: users of graphics/mesa-libs
AUTHOR: jbeich@FreeBSD.org
Index: sysutils/munin-master/Makefile
===================================================================
--- sysutils/munin-master/Makefile
+++ sysutils/munin-master/Makefile
@@ -3,6 +3,7 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -master
Index: sysutils/munin-master/files/pkg-message.in
===================================================================
--- sysutils/munin-master/files/pkg-message.in
+++ sysutils/munin-master/files/pkg-message.in
@@ -10,3 +10,13 @@
containing #BEGIN_MUNIN_MAIN and #END_MUNIN_MAIN, and add a line
with #MANUAL_MUNIN_CRONTAB.
********************************************************************
+The munin-master newsyslog.conf(5) filename has been changed:
+ OLD: ${PREFIX}/etc/newsyslog.conf.d/munin-master
+ NEW: ${PREFIX}/etc/newsyslog.conf.d/munin-master.conf
+
+Any file found at the old location has been automatically moved to
+the new location. This was done to ensure log rotation continued to
+work after change r340318 made to FreeBSD base, where the default
+newsyslog configuration now only includes filenames that end with
+'.conf' and do not begin with '.'.
+********************************************************************
Index: sysutils/munin-master/pkg-install
===================================================================
--- sysutils/munin-master/pkg-install
+++ sysutils/munin-master/pkg-install
@@ -60,7 +60,21 @@
fi
}
+move_newsyslog_conf() {
+ oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-master
+ newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-master.conf
+ samplefile=${PKG_PREFIX}/etc/munin/munin-master.newsyslog
+ if [ -f ${oldfile} ]; then
+ echo Migrating ${oldfile} to ${newfile}
+ if ! cmp -s ${samplefile} ${newfile}; then
+ echo Backing up a copy of ${newfile} to ${newfile}.bak first
+ mv -v ${newfile} ${newfile}.bak
+ fi
+ mv -v ${oldfile} ${newfile}
+ fi
+}
+
########################################################################
case $2 in
@@ -78,5 +92,6 @@
#END_MUNIN_MAIN
EOT
fi
+ move_newsyslog_conf
;;
esac
Index: sysutils/munin-master/pkg-plist
===================================================================
--- sysutils/munin-master/pkg-plist
+++ sysutils/munin-master/pkg-plist
@@ -37,7 +37,7 @@
@comment BSD.local.dist but if not registered here, it will not exist in PREFIX
@comment when the package is installed.
@dir etc/newsyslog.conf.d
-@sample %%ETCDIR%%/munin-master.newsyslog etc/newsyslog.conf.d/munin-master
+@sample %%ETCDIR%%/munin-master.newsyslog etc/newsyslog.conf.d/munin-master.conf
%%SITE_PERL%%/Munin/Master/Config.pm
%%SITE_PERL%%/Munin/Master/GraphOld.pm
%%SITE_PERL%%/Munin/Master/Group.pm
Index: sysutils/munin-node/Makefile
===================================================================
--- sysutils/munin-node/Makefile
+++ sysutils/munin-node/Makefile
@@ -3,6 +3,7 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -node
Index: sysutils/munin-node/files/pkg-message.in
===================================================================
--- sysutils/munin-node/files/pkg-message.in
+++ sysutils/munin-node/files/pkg-message.in
@@ -24,3 +24,19 @@
If this is a fresh install run
%%PREFIX%%/sbin/munin-node-configure --shell | sh -x
to install the plugins automatically
+
+********************************************************************
+The munin-node newsyslog.conf(5) filename has been changed:
+ OLD: ${PREFIX}/etc/newsyslog.conf.d/munin-node
+ NEW: ${PREFIX}/etc/newsyslog.conf.d/munin-node.conf
+
+Any file found at the old location has been automatically moved to
+the new location. This was done to ensure log rotation continued to
+work after change r340318 made to FreeBSD base, where the default
+newsyslog configuration now only includes filenames that end with
+'.conf' and do not begin with '.'.
+
+If you use provisioning/configuration management tools to create or
+edit this file, you will need to change their configuration to use
+the new filename.
+********************************************************************
Index: sysutils/munin-node/pkg-install
===================================================================
--- sysutils/munin-node/pkg-install
+++ sysutils/munin-node/pkg-install
@@ -12,7 +12,21 @@
echo "done."
}
+move_newsyslog_conf() {
+ oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-node
+ newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/munin-node.conf
+ samplefile=${PKG_PREFIX}/etc/munin/munin-node.newsyslog
+ if [ -f ${oldfile} ]; then
+ echo Migrating ${oldfile} to ${newfile}
+ if ! cmp -s ${samplefile} ${newfile}; then
+ echo Backing up a copy of ${newfile} to ${newfile}.bak first
+ mv -v ${newfile} ${newfile}.bak
+ fi
+ mv -v ${oldfile} ${newfile}
+ fi
+}
+
########################################################################
case $2 in
@@ -20,5 +34,6 @@
if [ -z "${PACKAGE_BUILDING}" ]; then
init_plugins
fi
+ move_newsyslog_conf
;;
esac
Index: sysutils/munin-node/pkg-plist
===================================================================
--- sysutils/munin-node/pkg-plist
+++ sysutils/munin-node/pkg-plist
@@ -6,7 +6,7 @@
@comment BSD.local.dist but if not registered here, it will not exist in PREFIX
@comment when the package is installed.
@dir etc/newsyslog.conf.d
-@sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node
+@sample %%ETCDIR%%/munin-node.newsyslog etc/newsyslog.conf.d/munin-node.conf
%%SITE_PERL%%/Munin/Node/Config.pm
%%SITE_PERL%%/Munin/Node/Configure/Debug.pm
%%SITE_PERL%%/Munin/Node/Configure/History.pm

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 10:22 PM (17 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17090147
Default Alt Text
D17089.id50317.diff (6 KB)

Event Timeline