Page MenuHomeFreeBSD
Files F139583700

D17088.diff
No OneTemporary
Actions

D17088.diff
View Options

Index: head/mail/mailman/Makefile
===================================================================
--- head/mail/mailman/Makefile
+++ head/mail/mailman/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mailman
DISTVERSION= 2.1.29
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= GNU \
SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
Index: head/mail/mailman/files/pkg-install.in
===================================================================
--- head/mail/mailman/files/pkg-install.in
+++ head/mail/mailman/files/pkg-install.in
@@ -30,6 +30,23 @@
_EOF
}
+move_newsyslog_conf() {
+ oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/mailman.newsyslog
+ newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/mailman.conf
+ samplefile=${PKG_PREFIX}/share/examples/mailman/mailman.newsyslog.sample
+ 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 " => You should either delete the old file, or move it to the new location"
+ fi
+ fi
+}
+
set -e
MYTMP="$(mktemp -d "${TMPDIR-/tmp}/mminstall.XXXXXXXXXX")"
trap "rm -rf \"$MYTMP\"" EXIT
@@ -39,6 +56,8 @@
echo "---> Starting post-install script"
LC_ALL=C
export LC_ALL
+
+ move_newsyslog_conf
# fix up permissions - this is under investigation; pkg or libarchive
# goof up the group writable and/or setgid bits
Index: head/mail/mailman/files/pkg-message.in
===================================================================
--- head/mail/mailman/files/pkg-message.in
+++ head/mail/mailman/files/pkg-message.in
@@ -63,3 +63,19 @@
have a logrotate process that creates new log files instead of letting
Mailman create them, you will need to address that. (LP: #1327404)
----------------------------------------------------------------------------
+
+********************************************************************
+The mailman newsyslog.conf(5) filename has been changed:
+ OLD: ${PREFIX}/etc/newsyslog.conf.d/mailman.newsyslog
+ NEW: ${PREFIX}/etc/newsyslog.conf.d/mailman.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: head/mail/mailman/pkg-plist
===================================================================
--- head/mail/mailman/pkg-plist
+++ head/mail/mailman/pkg-plist
@@ -1,7 +1,7 @@
@postunexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py %D/%%MMDIR%%/Mailman/mm_cfg.py.dist; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi
@postunexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc
@dir etc/newsyslog.conf.d
-@sample %%EXAMPLESDIR%%/mailman.newsyslog.sample etc/newsyslog.conf.d/mailman.newsyslog
+@sample %%EXAMPLESDIR%%/mailman.newsyslog.sample etc/newsyslog.conf.d/mailman.conf
%%IMGDIR%%/mailman-large.jpg
%%IMGDIR%%/gnu-head-tiny.jpg
%%IMGDIR%%/mailman.jpg

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 14, 7:49 PM (13 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26965787
Default Alt Text
D17088.diff (3 KB)

Event Timeline