svn commit: r411098 - in head/textproc: kibana42 kibana43 kibana44
Mark Felder
feld at FreeBSD.org
Mon Mar 14 16:10:28 UTC 2016
Author: feld
Date: Mon Mar 14 16:10:26 2016
New Revision: 411098
URL: https://svnweb.freebsd.org/changeset/ports/411098
Log:
textproc/kibana42, kibana43, kibana44: Fix ability to customize settings
Changes:
- Allows user to customize some Kibana's settings without interfering
with the deinstallation process of the package (bug #207209)
Drawbacks:
- Kibana takes couple of minutes to start for the first time after
package installation or settings' change (There's a warning in the log
about that)
- ${WWWDIR}/optimize folder is now writable, weakening the security.
Although, given the architecture of Kibana it's inevitable
PR: 207209
Modified:
head/textproc/kibana42/Makefile
head/textproc/kibana42/pkg-plist
head/textproc/kibana43/Makefile
head/textproc/kibana43/pkg-plist
head/textproc/kibana44/Makefile
head/textproc/kibana44/pkg-plist
Modified: head/textproc/kibana42/Makefile
==============================================================================
--- head/textproc/kibana42/Makefile Mon Mar 14 15:55:22 2016 (r411097)
+++ head/textproc/kibana42/Makefile Mon Mar 14 16:10:26 2016 (r411098)
@@ -4,6 +4,7 @@
PORTNAME= kibana
PORTVERSION?= 4.2.2
DISTVERSIONSUFFIX= -linux-x86
+PORTREVISION?= 1
CATEGORIES= textproc www
MASTER_SITES= https://download.elastic.co/kibana/kibana/ \
http://download.elastic.co/kibana/kibana/
@@ -26,6 +27,7 @@ do-install:
${MKDIR} ${STAGEDIR}${WWWDIR}
cd ${WRKSRC} && \
${RM} -r bin config node && \
+ ${RM} -r optimize/* && \
${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
.include <bsd.port.mk>
Modified: head/textproc/kibana42/pkg-plist
==============================================================================
--- head/textproc/kibana42/pkg-plist Mon Mar 14 15:55:22 2016 (r411097)
+++ head/textproc/kibana42/pkg-plist Mon Mar 14 16:10:26 2016 (r411098)
@@ -1,3 +1,4 @@
+ at preunexec rm -rf %D/%%WWWDIR%%/optimize/* 2>&1 >/dev/null || true
@sample etc/kibana.yml.sample
%%WWWDIR%%/LICENSE.txt
%%WWWDIR%%/README.txt
@@ -10932,33 +10933,6 @@
%%WWWDIR%%/node_modules/whatwg-fetch/README.md
%%WWWDIR%%/node_modules/whatwg-fetch/fetch.js
%%WWWDIR%%/node_modules/whatwg-fetch/package.json
-%%WWWDIR%%/optimize/bundles/commons.bundle.js
-%%WWWDIR%%/optimize/bundles/commons.style.css
-%%WWWDIR%%/optimize/bundles/kibana.bundle.js
-%%WWWDIR%%/optimize/bundles/kibana.entry.js
-%%WWWDIR%%/optimize/bundles/kibana.style.css
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.eot
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.svg
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.ttf
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff2
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.eot
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.svg
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.ttf
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.woff
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.woff2
-%%WWWDIR%%/optimize/bundles/src/ui/public/images/elk.ico
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/cv.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/de.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/go.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/ne.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/ni.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/stop.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/us.png
-%%WWWDIR%%/optimize/bundles/statusPage.bundle.js
-%%WWWDIR%%/optimize/bundles/statusPage.entry.js
-%%WWWDIR%%/optimize/bundles/statusPage.style.css
-%%WWWDIR%%/optimize/bundles/webpack.records
%%WWWDIR%%/package.json
%%WWWDIR%%/src/cli/Command.js
%%WWWDIR%%/src/cli/Log.js
@@ -11779,4 +11753,5 @@
%%WWWDIR%%/webpackShims/ui-bootstrap.js
@dir %%WWWDIR%%/installedPlugins
@dir %%WWWDIR%%/node_modules/rimraf/node_modules
+ at dir(www,www) %%WWWDIR%%/optimize
@dir %%WWWDIR%%/src/ui/public/factories
Modified: head/textproc/kibana43/Makefile
==============================================================================
--- head/textproc/kibana43/Makefile Mon Mar 14 15:55:22 2016 (r411097)
+++ head/textproc/kibana43/Makefile Mon Mar 14 16:10:26 2016 (r411098)
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTVERSION= 4.3.2
+PORTREVISION= 1
PKGNAMESUFFIX= 43
MASTERDIR= ${.CURDIR}/../kibana42
PKGDIR= ${.CURDIR}
Modified: head/textproc/kibana43/pkg-plist
==============================================================================
--- head/textproc/kibana43/pkg-plist Mon Mar 14 15:55:22 2016 (r411097)
+++ head/textproc/kibana43/pkg-plist Mon Mar 14 16:10:26 2016 (r411098)
@@ -1,3 +1,4 @@
+ at preunexec rm -rf %D/%%WWWDIR%%/optimize/* 2>&1 >/dev/null || true
@sample etc/kibana.yml.sample
%%WWWDIR%%/LICENSE.txt
%%WWWDIR%%/README.txt
@@ -10856,34 +10857,6 @@
%%WWWDIR%%/node_modules/whatwg-fetch/README.md
%%WWWDIR%%/node_modules/whatwg-fetch/fetch.js
%%WWWDIR%%/node_modules/whatwg-fetch/package.json
-%%WWWDIR%%/optimize/bundles/commons.bundle.js
-%%WWWDIR%%/optimize/bundles/commons.style.css
-%%WWWDIR%%/optimize/bundles/kibana.bundle.js
-%%WWWDIR%%/optimize/bundles/kibana.entry.js
-%%WWWDIR%%/optimize/bundles/kibana.style.css
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.eot
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.svg
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.ttf
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff2
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.eot
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.svg
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.ttf
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.woff
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.woff2
-%%WWWDIR%%/optimize/bundles/src/ui/public/images/elk.ico
-%%WWWDIR%%/optimize/bundles/src/ui/public/images/kibana.svg
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/cv.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/de.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/go.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/ne.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/ni.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/stop.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/us.png
-%%WWWDIR%%/optimize/bundles/statusPage.bundle.js
-%%WWWDIR%%/optimize/bundles/statusPage.entry.js
-%%WWWDIR%%/optimize/bundles/statusPage.style.css
-%%WWWDIR%%/optimize/bundles/webpack.records
%%WWWDIR%%/package.json
%%WWWDIR%%/src/cli/Command.js
%%WWWDIR%%/src/cli/Log.js
@@ -11711,4 +11684,5 @@
%%WWWDIR%%/webpackShims/ui-bootstrap.js
@dir %%WWWDIR%%/installedPlugins
@dir %%WWWDIR%%/node_modules/rimraf/node_modules
+ at dir(www,www) %%WWWDIR%%/optimize
@dir %%WWWDIR%%/src/ui/public/factories
Modified: head/textproc/kibana44/Makefile
==============================================================================
--- head/textproc/kibana44/Makefile Mon Mar 14 15:55:22 2016 (r411097)
+++ head/textproc/kibana44/Makefile Mon Mar 14 16:10:26 2016 (r411098)
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTVERSION= 4.4.1
+PORTREVISION= 1
PKGNAMESUFFIX= 44
MASTERDIR= ${.CURDIR}/../kibana42
PKGDIR= ${.CURDIR}
Modified: head/textproc/kibana44/pkg-plist
==============================================================================
--- head/textproc/kibana44/pkg-plist Mon Mar 14 15:55:22 2016 (r411097)
+++ head/textproc/kibana44/pkg-plist Mon Mar 14 16:10:26 2016 (r411098)
@@ -1,3 +1,4 @@
+ at preunexec rm -rf %D/%%WWWDIR%%/optimize/* 2>&1 >/dev/null || true
@sample etc/kibana.yml.sample
%%WWWDIR%%/LICENSE.txt
%%WWWDIR%%/README.txt
@@ -11066,34 +11067,6 @@
%%WWWDIR%%/node_modules/wreck/node_modules/hoek/lib/index.js
%%WWWDIR%%/node_modules/wreck/node_modules/hoek/package.json
%%WWWDIR%%/node_modules/wreck/package.json
-%%WWWDIR%%/optimize/bundles/commons.bundle.js
-%%WWWDIR%%/optimize/bundles/commons.style.css
-%%WWWDIR%%/optimize/bundles/kibana.bundle.js
-%%WWWDIR%%/optimize/bundles/kibana.entry.js
-%%WWWDIR%%/optimize/bundles/kibana.style.css
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.eot
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.svg
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.ttf
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff
-%%WWWDIR%%/optimize/bundles/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff2
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.eot
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.svg
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.ttf
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.woff
-%%WWWDIR%%/optimize/bundles/node_modules/font-awesome/fonts/fontawesome-webfont.woff2
-%%WWWDIR%%/optimize/bundles/src/ui/public/images/elk.ico
-%%WWWDIR%%/optimize/bundles/src/ui/public/images/kibana.svg
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/cv.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/de.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/go.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/ne.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/ni.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/stop.png
-%%WWWDIR%%/optimize/bundles/src/ui/public/stringify/icons/us.png
-%%WWWDIR%%/optimize/bundles/statusPage.bundle.js
-%%WWWDIR%%/optimize/bundles/statusPage.entry.js
-%%WWWDIR%%/optimize/bundles/statusPage.style.css
-%%WWWDIR%%/optimize/bundles/webpack.records
%%WWWDIR%%/package.json
%%WWWDIR%%/src/cli/Command.js
%%WWWDIR%%/src/cli/Log.js
@@ -11947,4 +11920,5 @@
%%WWWDIR%%/webpackShims/ui-bootstrap.js
@dir %%WWWDIR%%/installedPlugins
@dir %%WWWDIR%%/node_modules/rimraf/node_modules
+ at dir(www,www) %%WWWDIR%%/optimize
@dir %%WWWDIR%%/src/ui/public/factories
More information about the svn-ports-head
mailing list