sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 1.6.0 and use @sample keyword in plist.

Browse source 
PR:		201008
Submitted by:	olgeni
Approved by:	ports-secteam
Security:	CVE-2015-4165
This commit is contained in:
Jimmy Olgeni 2015-06-30 18:13:50 +00:00
parent 28fc356d8d
commit c5ea0b4e08
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=390979
4 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
textproc/elasticsearch/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= elasticsearch PORTNAME= elasticsearch
PORTVERSION= 1.5.2 PORTVERSION= 1.6.0
PORTREVISION= 1
CATEGORIES= textproc java devel CATEGORIES= textproc java devel
MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \ MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
http://mirrors.rit.edu/zi/ http://mirrors.rit.edu/zi/
@ -96,9 +95,9 @@ post-patch:
${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml ${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
do-install: do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
.for f in ${CONFIG_FILES} .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 .endfor
${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin ${INSTALL_SCRIPT} ${WRKDIR}/elasticsearch-plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch ${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch

4
textproc/elasticsearch/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (elasticsearch-1.5.2.tar.gz) = efae7897367ac3fa8057d02fad31c72e215b6edef599b63e373d3ce0c1049a14 SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
SIZE (elasticsearch-1.5.2.tar.gz) = 28173132 SIZE (elasticsearch-1.6.0.tar.gz) = 28401477

2
textproc/elasticsearch/files/pkg-message.in
View file

@ -1,6 +1,6 @@
====================================================================== ======================================================================
Please see %%DATADIR%% for sample versions of Please see %%ETCDIR%% for sample versions of
elasticsearch.yml and logging.yml. elasticsearch.yml and logging.yml.
====================================================================== ======================================================================

15
textproc/elasticsearch/pkg-plist
View file

@ -1,20 +1,12 @@
@owner %%SEARCHUSER%% @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
@group %%SEARCHGROUP%% @sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
@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
@exec if [ ! -f %D/etc/elasticsearch/elasticsearch.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/elasticsearch.yml; fi
@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
@exec if [ ! -f %D/etc/elasticsearch/logging.yml ] ; then cp -p %D/%F %D/etc/elasticsearch/logging.yml; fi
@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_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 @unexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi
@owner root
@group wheel
bin/elasticsearch-plugin bin/elasticsearch-plugin
lib/elasticsearch/antlr-runtime-3.5.jar 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-4.1.jar
lib/elasticsearch/asm-commons-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/elasticsearch-%%PORTVERSION%%.jar
lib/elasticsearch/groovy-all-2.4.0.jar lib/elasticsearch/groovy-all-2.4.0.jar
lib/elasticsearch/jna-4.1.0.jar lib/elasticsearch/jna-4.1.0.jar
@ -40,4 +32,3 @@ lib/elasticsearch/sigar/%%SIGAR_LIBNAME%%
%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
%%PORTDOCS%%%%DOCSDIR%%/README.textile %%PORTDOCS%%%%DOCSDIR%%/README.textile
@dir lib/elasticsearch/plugins @dir lib/elasticsearch/plugins
@dir %%ETCDIR%%