jicofo: register logging.properties as a configuration file

[Pierre Pronchery <khorben%defora.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Wed Nov 10 21:10:31 2021 +0100
Changeset:	5b1b07e588fcd28b2f97ffd2f147cc7fdf92ce6f

Modified Files:
	jicofo/Makefile
	jicofo/PLIST
	jicofo/distinfo
Added Files:
	jicofo/patches/patch-resources_jicofo.sh

Log Message:
jicofo: register logging.properties as a configuration file

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5b1b07e588fcd28b2f97ffd2f147cc7fdf92ce6f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 jicofo/Makefile                          | 14 ++++++++++++--
 jicofo/PLIST                             |  2 +-
 jicofo/distinfo                          |  1 +
 jicofo/patches/patch-resources_jicofo.sh | 12 ++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diffs:
diff --git a/jicofo/Makefile b/jicofo/Makefile
index 7f092a1b12..d81000f515 100644
--- a/jicofo/Makefile
+++ b/jicofo/Makefile
@@ -2,6 +2,7 @@
 
 GITHUB_PROJECT=	jicofo
 PKGNAME=	${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
+PKGREVISION=	1
 
 HOMEPAGE=	https://github.com/jitsi/jicofo/
 COMMENT=	Server side focus component used in Jitsi Meet conferences
@@ -20,13 +21,20 @@ MAVEN_FLAGS+=	-Dassembly.skipAssembly=false
 MAVEN_FLAGS+=	-Djavax.net.ssl.trustStore=${WRKDIR}/keystore
 MAVEN_FLAGS+=	-Djavax.net.ssl.trustStorePassword=password
 
+EGDIR=		share/examples/jicofo
+CONF_FILES=	${EGDIR}/logging.properties \
+		${PKG_SYSCONFDIR}/jitsi/jicofo/logging.properties
+
 INSTALLATION_DIRS+=	bin
-INSTALLATION_DIRS+=	share
+INSTALLATION_DIRS+=	${EGDIR}
 
-SUBST_CLASSES+=		java
+SUBST_CLASSES+=		java logging
 SUBST_STAGE.java=	post-configure
 SUBST_FILES.java=	resources/jicofo.sh
 SUBST_SED.java=		-e 's,^exec java,exec ${JAVA_BINPREFIX}-java,'
+SUBST_STAGE.logging=	post-configure
+SUBST_FILES.logging=	resources/jicofo.sh
+SUBST_SED.logging=	-e 's,$$SCRIPT_DIR/lib/logging\.properties,${PKG_SYSCONFDIR}/jitsi/jicofo/logging.properties,'
 
 do-configure:
 	#XXX this assumes trusted CA certificates are in /etc/openssl/certs
@@ -49,6 +57,8 @@ do-install:
 		${UNZIP_CMD} ${WRKSRC}/target/jicofo-1.1-SNAPSHOT-archive.zip
 	${MV} ${DESTDIR}${PREFIX}/share/jicofo-1.1-SNAPSHOT \
 		${DESTDIR}${PREFIX}/share/jicofo
+	${MV} ${DESTDIR}${PREFIX}/share/jicofo/lib/logging.properties \
+		${DESTDIR}${PREFIX}/share/examples/jicofo/logging.properties
 	${LN} -sf ../share/jicofo/jicofo.sh \
 		${DESTDIR}${PREFIX}/bin/jicofo
 
diff --git a/jicofo/PLIST b/jicofo/PLIST
index db4b5b8759..26a8818055 100644
--- a/jicofo/PLIST
+++ b/jicofo/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD$
 bin/jicofo
+share/examples/jicofo/logging.properties
 share/jicofo/jicofo.bat
 share/jicofo/jicofo.jar
 share/jicofo/jicofo.sh
@@ -74,7 +75,6 @@ share/jicofo/lib/kotlin-stdlib-common-1.5.20.jar
 share/jicofo/lib/kotlin-stdlib-jdk7-1.5.20.jar
 share/jicofo/lib/kotlin-stdlib-jdk8-1.5.20.jar
 share/jicofo/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-share/jicofo/lib/logging.properties
 share/jicofo/lib/object-cloner-0.1.jar
 share/jicofo/lib/objenesis-2.6.jar
 share/jicofo/lib/org.osgi.core-4.3.1.jar
diff --git a/jicofo/distinfo b/jicofo/distinfo
index d7f40a0772..9627cb4d85 100644
--- a/jicofo/distinfo
+++ b/jicofo/distinfo
@@ -4,3 +4,4 @@ SHA1 (jicofo/jitsi-meet_6293.tar.gz) = 971e5e069190d74795d95b2a4abe30bafe710659
 RMD160 (jicofo/jitsi-meet_6293.tar.gz) = cd7eaa9c34a69fe1e3e47d6251a064de3c8310b2
 SHA512 (jicofo/jitsi-meet_6293.tar.gz) = 8953d8a67bc35a3fe33990d604a8a495982464211884cb68021375d6d4dbdeba3cca9bf1d45bd418d1612ad2749110650b990ff4951093c1ad99a7bb05dc10ba
 Size (jicofo/jitsi-meet_6293.tar.gz) = 241103 bytes
+SHA1 (patch-resources_jicofo.sh) = 986445ede72ec0333bb56a52bc3c57030eca8383
diff --git a/jicofo/patches/patch-resources_jicofo.sh b/jicofo/patches/patch-resources_jicofo.sh
new file mode 100644
index 0000000000..b9ada75fd4
--- /dev/null
+++ b/jicofo/patches/patch-resources_jicofo.sh
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Fix quoting for additional command-line parameters
+
+--- resources/jicofo.sh.orig	2021-11-10 19:11:46.070570369 +0000
++++ resources/jicofo.sh
+@@ -29,4 +29,4 @@ fi
+ 
+ if [ -z "$JICOFO_MAX_MEMORY" ]; then JICOFO_MAX_MEMORY=3072m; fi
+ 
+-exec java -Xmx$JICOFO_MAX_MEMORY -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djdk.tls.ephemeralDHKeySize=2048 $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
++exec java -Xmx$JICOFO_MAX_MEMORY -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djdk.tls.ephemeralDHKeySize=2048 $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass "$@"