Page MenuHomeFreeBSD
Files F139394820

D17090.diff
No OneTemporary
Actions

D17090.diff
View Options

Index: head/www/owncloud/Makefile
===================================================================
--- head/www/owncloud/Makefile
+++ head/www/owncloud/Makefile
@@ -3,6 +3,7 @@
PORTNAME= owncloud
PORTVERSION= 10.0.10
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://download.owncloud.org/community/
Index: head/www/owncloud/files/pkg-message.in
===================================================================
--- head/www/owncloud/files/pkg-message.in
+++ head/www/owncloud/files/pkg-message.in
@@ -16,3 +16,19 @@
</Directory>
And restart Apache.
+
+********************************************************************
+The owncloud newsyslog.conf(5) filename has been changed:
+ OLD: ${PREFIX}/etc/newsyslog.conf.d/owncloud
+ NEW: ${PREFIX}/etc/newsyslog.conf.d/owncloud.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/www/owncloud/pkg-install
===================================================================
--- head/www/owncloud/pkg-install
+++ head/www/owncloud/pkg-install
@@ -0,0 +1,29 @@
+#! /bin/sh
+# ex:sw=4 sts=4
+
+move_newsyslog_conf() {
+ oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/owncloud
+ newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/owncloud.conf
+ samplefile=${PKG_PREFIX}/share/examples/owncloud/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
Index: head/www/owncloud/pkg-plist
===================================================================
--- head/www/owncloud/pkg-plist
+++ head/www/owncloud/pkg-plist
@@ -1,5 +1,5 @@
@dir etc/newsyslog.conf.d
-@sample %%EXAMPLESDIR%%/newsyslog etc/newsyslog.conf.d/owncloud
+@sample %%EXAMPLESDIR%%/newsyslog etc/newsyslog.conf.d/owncloud.conf
%%WWWDIR%%/.htaccess
%%WWWDIR%%/.user.ini
%%WWWDIR%%/AUTHORS

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 12, 3:43 PM (8 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26901072
Default Alt Text
D17090.diff (2 KB)

Event Timeline