diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-06-30 18:13:50 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-06-30 18:13:50 +0000 |
| commit | c5ea0b4e08e73e29635ce1c9dc6d24b4c2c6612c (patch) | |
| tree | a073626b4bbb0c195cc463401dc1c5b357842587 /textproc/elasticsearch | |
| parent | devel/p5-Test-Timer: update to 0.10 (diff) | |
Update to 1.6.0 and use @sample keyword in plist.
PR: 201008
Submitted by: olgeni
Approved by: ports-secteam
Security: CVE-2015-4165
Diffstat (limited to 'textproc/elasticsearch')
| -rw-r--r-- | textproc/elasticsearch/Makefile | 7 | ||||
| -rw-r--r-- | textproc/elasticsearch/distinfo | 4 | ||||
| -rw-r--r-- | textproc/elasticsearch/files/pkg-message.in | 2 | ||||
| -rw-r--r-- | textproc/elasticsearch/pkg-plist | 15 |
4 files changed, 9 insertions, 19 deletions
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile index e318652bc50e..67955f646849 100644 --- a/textproc/elasticsearch/Makefile +++ b/textproc/elasticsearch/Makefile @@ -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 diff --git a/textproc/elasticsearch/distinfo b/textproc/elasticsearch/distinfo index 0f14f6161fd5..dc374160bb96 100644 --- a/textproc/elasticsearch/distinfo +++ b/textproc/elasticsearch/distinfo @@ -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 diff --git a/textproc/elasticsearch/files/pkg-message.in b/textproc/elasticsearch/files/pkg-message.in index 94a939511b54..e7f3aecf52b8 100644 --- a/textproc/elasticsearch/files/pkg-message.in +++ b/textproc/elasticsearch/files/pkg-message.in @@ -1,6 +1,6 @@ ====================================================================== -Please see %%DATADIR%% for sample versions of +Please see %%ETCDIR%% for sample versions of elasticsearch.yml and logging.yml. ====================================================================== diff --git a/textproc/elasticsearch/pkg-plist b/textproc/elasticsearch/pkg-plist index 87accc7238d2..8cc6abd81f5d 100644 --- a/textproc/elasticsearch/pkg-plist +++ b/textproc/elasticsearch/pkg-plist @@ -1,20 +1,12 @@ -@owner %%SEARCHUSER%% -@group %%SEARCHGROUP%% -@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 +@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample +@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 -@owner root -@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 -@dir %%ETCDIR%% |