svn commit: r495326 - in head/textproc/kibana6: . files

Tobias Kortkamp tobik at freebsd.org
Mon Mar 11 06:32:38 UTC 2019


On Mon, Mar 11, 2019 at 05:43:20AM +0000, Koichiro Iwao wrote:
> Author: meta
> Date: Mon Mar 11 05:43:19 2019
> New Revision: 495326
> URL: https://svnweb.freebsd.org/changeset/ports/495326
> 
> Log:
>   textproc/kibana6: Update to 6.5.4
>   
>   While here,
>   - Quit using ${CHMOD} during do-install, handle permissions in pkg-plist
>   
>   PR:		236243
>   Submitted by:	gettoknowmi <gettoknowmi at yahoo.com>
>   Reported by:	Yuta MASUMOTO <owata at owatan.jp> (plist issue)
> 
> Deleted:
>   head/textproc/kibana6/files/patch-config_kibana.yml
> Modified:
>   head/textproc/kibana6/Makefile
>   head/textproc/kibana6/distinfo
> 
> Modified: head/textproc/kibana6/Makefile
> ==============================================================================
> --- head/textproc/kibana6/Makefile	Mon Mar 11 02:32:04 2019	(r495325)
> +++ head/textproc/kibana6/Makefile	Mon Mar 11 05:43:19 2019	(r495326)
> @@ -2,7 +2,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	kibana
> -PORTVERSION=	6.4.2
> +PORTVERSION=	6.5.4
>  DISTVERSIONSUFFIX=	-linux-x86_64
>  PORTREVISION=	0
>  CATEGORIES=	textproc www
> @@ -35,14 +35,17 @@ do-install:
>  		${RM} -r config node optimize && \
>  		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
>  	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config
> -	${CHMOD} +x ${STAGEDIR}${WWWDIR}/bin/*
>  
>  post-install:
>  	${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}
>  	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
>  		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
> +	${REINPLACE_CMD} -e "s|\(${WWWDIR}/bin/.*\)|@mode 0755 \1|" ${TMPPLIST}

I'm sorry, but this is probably wrong and a noop.  There are no
entries starting with WWWDIR in TMPPLIST (${PREFIX} is stripped
from entries in the ${FIND} line above it).  I guess it should be
WWWDIR_REL here.  @mode also does not take a file argument.  Though
that problem is of course never triggered.  See pkg-create(8):

@mode mode
Set default permission for all subsequently extracted files to mode.
Format is the same as that used by the chmod command.  Use without
an arg to set back to default (mode of the file while being packed)
permissions.

As a consequence the scripts no longer have an executable bit set
and the package is probably broken at runtime as a result.

What was wrong with using CHMOD?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20190311/7b1c31e0/attachment-0001.sig>


More information about the svn-ports-all mailing list