Attachment 183496 Details for Bug 220001 – Completed previous sent patch to remove the post install script

[patch] Completed previous sent patch to remove the post install script

apache-solr-set-permission-in-plist-and-not-in-post-install-script.diff (text/plain), 1.38 KB, created by Matthias Fechner on 2017-06-15 10:51:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Fechner

Created: 2017-06-15 10:51:11 UTC

Size: 1.38 KB

patch

obsolete

>diff --git a/Makefile b/Makefile
>index 9832422..c01584c 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	apache-solr
> PORTVERSION=	6.5.1
>+PORTREVISION=	1
> CATEGORIES=	textproc java
> MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
> DISTNAME=	solr-${PORTVERSION}
>@@ -23,7 +24,7 @@ JAVA_RUN=	yes
> NO_BUILD=	yes
> NO_ARCH=	yes
> PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
>-SUB_FILES=	pkg-message pkg-install
>+SUB_FILES=	pkg-message
> USE_RC_SUBR=	solr
> USERS=		solr
> GROUPS=		${USERS}
>diff --git a/files/pkg-install.in b/files/pkg-install.in
>deleted file mode 100644
>index f49b686..0000000
>--- a/files/pkg-install.in
>+++ /dev/null
>@@ -1,22 +0,0 @@
>-#! /bin/sh
>-#
>-PATH=/bin:/usr/bin:/usr/sbin
>-
>-set -e
>-case "$2" in
>-
>-POST-INSTALL)
>-	echo "---> Starting post-install script"
>-	LC_ALL=C
>-	export LC_ALL
>-
>-	echo "Fix permissions"
>-	/usr/sbin/chown -R solr /var/db/solr
>-	/usr/bin/chgrp -R solr /var/db/solr
>-	/usr/sbin/chown -R solr /var/log/solr
>-	/usr/bin/chgrp -R solr /var/log/solr
>-	echo "done."
>-	echo ""
>-
>-	;;
>-esac
>diff --git a/pkg-plist b/pkg-plist
>index 4fcb664..a3b93c4 100644
>--- a/pkg-plist
>+++ b/pkg-plist
>@@ -1829,5 +1829,5 @@ solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl
> solr/server/solr/solr.xml
> solr/server/solr/zoo.cfg
> solr/server/start.jar
>-@dir /var/db/solr
>-@dir /var/log/solr
>+@dir(solr,solr) /var/db/solr
>+@dir(solr,solr) /var/log/solr

Flags:

mfechner: maintainer-approval+

Actions: View | Diff

Attachments on bug 220001: 183489 | 183496 | 184036