svn commit: r390979 - in head/textproc/elasticsearch: . files

[Jimmy Olgeni]

Author: olgeni
Date: Tue Jun 30 18:13:50 2015
New Revision: 390979
URL: https://svnweb.freebsd.org/changeset/ports/390979

Log:
  Update to 1.6.0 and use @sample keyword in plist.
  
  PR:		201008
  Submitted by:	olgeni
  Approved by:	ports-secteam
  Security:	CVE-2015-4165

Modified:
  head/textproc/elasticsearch/Makefile
  head/textproc/elasticsearch/distinfo
  head/textproc/elasticsearch/files/pkg-message.in
  head/textproc/elasticsearch/pkg-plist   (contents, props changed)

Modified: head/textproc/elasticsearch/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile	Tue Jun 30 18:08:46 2015	(r390978)
+++ head/textproc/elasticsearch/Makefile	Tue Jun 30 18:13:50 2015	(r390979)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elasticsearch
-PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -96,9 +95,9 @@ post-patch:
 	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
 .for f in ${CONFIG_FILES}
-	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${DATADIR}/${f}.sample
+	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 	${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch

Modified: head/textproc/elasticsearch/distinfo
==============================================================================
--- head/textproc/elasticsearch/distinfo	Tue Jun 30 18:08:46 2015	(r390978)
+++ head/textproc/elasticsearch/distinfo	Tue Jun 30 18:13:50 2015	(r390979)
@@ -1,2 +1,2 @@
-SHA256 (elasticsearch-1.5.2.tar.gz) = efae7897367ac3fa8057d02fad31c72e215b6edef599b63e373d3ce0c1049a14
-SIZE (elasticsearch-1.5.2.tar.gz) = 28173132
+SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
+SIZE (elasticsearch-1.6.0.tar.gz) = 28401477

Modified: head/textproc/elasticsearch/files/pkg-message.in
==============================================================================
--- head/textproc/elasticsearch/files/pkg-message.in	Tue Jun 30 18:08:46 2015	(r390978)
+++ head/textproc/elasticsearch/files/pkg-message.in	Tue Jun 30 18:13:50 2015	(r390979)
@@ -1,6 +1,6 @@
 ======================================================================
 
-Please see %%DATADIR%% for sample versions of
+Please see %%ETCDIR%% for sample versions of
 elasticsearch.yml and logging.yml.
 
 ======================================================================

Modified: head/textproc/elasticsearch/pkg-plist
==============================================================================
--- head/textproc/elasticsearch/pkg-plist	Tue Jun 30 18:08:46 2015	(r390978)
+++ head/textproc/elasticsearch/pkg-plist	Tue Jun 30 18:13:50 2015	(r390979)
@@ -1,20 +1,12 @@
- at owner %%SEARCHUSER%%
- at group %%SEARCHGROUP%%
- at unexec if cmp  -s %D/%%DATADIR%%/elasticsearch.yml.sample %D/etc/elasticsearch/elasticsearch.yml; then rm -f %D/etc/elasticsearch/elasticsearch.yml; fi
-%%DATADIR%%/elasticsearch.yml.sample
- at exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/elasticsearch.yml; fi
- at unexec if cmp  -s %D/%%DATADIR%%/logging.yml.sample %D/etc/elasticsearch/logging.yml; then rm -f %D/etc/elasticsearch/logging.yml; fi
-%%DATADIR%%/logging.yml.sample
- at exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/logging.yml; fi
+ at sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
+ at sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
 @unexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
 @unexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi
- at owner root
- at group wheel
 bin/elasticsearch-plugin
 lib/elasticsearch/antlr-runtime-3.5.jar
+lib/elasticsearch/apache-log4j-extras-1.2.17.jar
 lib/elasticsearch/asm-4.1.jar
 lib/elasticsearch/asm-commons-4.1.jar
-lib/elasticsearch/apache-log4j-extras-1.2.17.jar
 lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
 lib/elasticsearch/groovy-all-2.4.0.jar
 lib/elasticsearch/jna-4.1.0.jar
@@ -40,4 +32,3 @@ lib/elasticsearch/sigar/%%SIGAR_LIBNAME%
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.textile
 @dir lib/elasticsearch/plugins
- at dir %%ETCDIR%%