svn commit: r485725 - head/net/ntpa
Ben Woods
woodsb02 at FreeBSD.org
Sat Nov 24 03:56:21 UTC 2018
Author: woodsb02
Date: Sat Nov 24 03:56:19 2018
New Revision: 485725
URL: https://svnweb.freebsd.org/changeset/ports/485725
Log:
net/ntpa: Use .conf suffix for /usr/local/etc/newsyslog.conf.d/
- Rename the files installed to /usr/local/etc/newsyslog.conf.d/ to end
with a '.conf' suffix.
- Add pkg-install script to automatically move any copies of the old
newsyslog file to the new location if it was modified from the default
or delete the old file if it is has not been modified.
- Add a note to UPDATING and pkg-message to warn users of this, in case
they are using provisioning/configuration management tools which need
to be modified. Note the UPDATING entry was committed in r485721.
Recent changes to /etc/newsyslog.conf (r340318) will only include files
from the /usr/local/etc/newsyslog.conf.d/ directory which end with
'.conf' and do not beginning with a '.' character.
Approved by: portmgr blanket
Added:
head/net/ntpa/pkg-install (contents, props changed)
Modified:
head/net/ntpa/Makefile
head/net/ntpa/pkg-message
head/net/ntpa/pkg-plist
Modified: head/net/ntpa/Makefile
==============================================================================
--- head/net/ntpa/Makefile Sat Nov 24 03:44:02 2018 (r485724)
+++ head/net/ntpa/Makefile Sat Nov 24 03:56:19 2018 (r485725)
@@ -3,7 +3,7 @@
PORTNAME= ntpa
PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://dist1.innolan.net/ \
http://dist2.innolan.net/
Added: head/net/ntpa/pkg-install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ntpa/pkg-install Sat Nov 24 03:56:19 2018 (r485725)
@@ -0,0 +1,28 @@
+#! /bin/sh
+# ex:sw=4 sts=4
+
+move_newsyslog_conf() {
+ oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/ntpa
+ newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/ntpa.conf
+ samplefile=${PKG_PREFIX}/etc/ntpa/ntpa.newsyslog
+ if [ -f ${oldfile} ]; then
+ echo "Configuration file found in old location: ${oldfile}"
+ if cmp -s ${samplefile} ${newfile} > /dev/null; then
+ echo "Configuration file in new location has not been modified from the default: ${newfile}"
+ echo " => Moving old configuration file to new location"
+ mv -f ${oldfile} ${newfile}
+ else
+ echo "Configuration file in new location has been modified from the default: ${newfile}"
+ echo " => Deleting old configuration file"
+ rm ${oldfile}
+ fi
+ fi
+}
+
+########################################################################
+
+case $2 in
+ POST-INSTALL)
+ move_newsyslog_conf
+ ;;
+esac
Modified: head/net/ntpa/pkg-message
==============================================================================
--- head/net/ntpa/pkg-message Sat Nov 24 03:44:02 2018 (r485724)
+++ head/net/ntpa/pkg-message Sat Nov 24 03:56:19 2018 (r485725)
@@ -7,3 +7,19 @@ If you are upgrading from a previous version of NTP An
take a backup of your database before starting ntpa in upgrade mode.
************************************************************************
+
+The ntpa newsyslog.conf(5) filename has been changed:
+ OLD: ${PREFIX}/etc/newsyslog.conf.d/ntpa
+ NEW: ${PREFIX}/etc/newsyslog.conf.d/ntpa.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.
+
+************************************************************************
Modified: head/net/ntpa/pkg-plist
==============================================================================
--- head/net/ntpa/pkg-plist Sat Nov 24 03:44:02 2018 (r485724)
+++ head/net/ntpa/pkg-plist Sat Nov 24 03:56:19 2018 (r485725)
@@ -23,7 +23,7 @@ man/man1/ntpa.1.gz
%%DOCSDIR%%/DATABASE
%%DOCSDIR%%/INSTALL
@dir etc/newsyslog.conf.d
- at sample %%ETCDIR%%/ntpa.newsyslog etc/newsyslog.conf.d/ntpa
+ at sample %%ETCDIR%%/ntpa.newsyslog etc/newsyslog.conf.d/ntpa.conf
@sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample
@owner www
@group www
More information about the svn-ports-all
mailing list