pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coturn: Simplify path configuration and fix CONF_FILE
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Sun Jan 19 12:26:07 2025 -0500
Changeset: 72f9677ce5eb6fe55948709fc7b496467f5429d7
Modified Files:
coturn/Makefile
coturn/PLIST
coturn/TODO
Log Message:
coturn: Simplify path configuration and fix CONF_FILE
Greatly reduce the code for configuring paths by defining --prefix and
letting defaults happen when that's correct.
Set up CONF_FILE for the config file (and remediate upstream's
installation of an example in $etcdir).
Note myself as co-maintainer.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=72f9677ce5eb6fe55948709fc7b496467f5429d7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coturn/Makefile | 35 ++++++++++++++++-------------------
coturn/PLIST | 16 +++++++---------
coturn/TODO | 6 +++---
3 files changed, 26 insertions(+), 31 deletions(-)
diffs:
diff --git a/coturn/Makefile b/coturn/Makefile
index 2bd3e59f91..80550a6320 100644
--- a/coturn/Makefile
+++ b/coturn/Makefile
@@ -1,11 +1,13 @@
# $NetBSD$
DISTNAME= coturn-4.6.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=coturn/}
GITHUB_PROJECT= coturn
MAINTAINER= kethzer.dr%gmail.com@localhost
+#MAINTAINER+= gdt%NetBSD.org@localhost
HOMEPAGE= https://github.com/coturn/coturn
COMMENT= TURN and STUN server (for VoIP/webrtc)
LICENSE= modified-bsd
@@ -24,25 +26,20 @@ CONFIGURE_ENV+= LIBEVENT_OPENSSL_LIBS="-L${BUILDLINK_PREFIX.libevent}/lib -leve
BUILD_DEFS+= VARBASE
-# Configure installation paths.
-# \todo Why is this not setting PREFIX?
-CONFIGURE_ENV+= BINDIR=${PREFIX}/bin
-CONFIGURE_ENV+= LIBDIR=${PREFIX}/lib
-CONFIGURE_ENV+= MANPREFIX=${PREFIX}
-CONFIGURE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= INCLUDEDIR=${PREFIX}/include
-CONFIGURE_ENV+= LOCALSTATEDIR=${PREFIX}/var/turnserver
-CONFIGURE_ENV+= DOCSDIR=${PREFIX}/share/doc/coturn
-CONFIGURE_ENV+= EXAMPLESDIR=${PREFIX}/share/examples/coturn
-CONFIGURE_ENV+= TURNDBDIR=${VARBASE}/turnserver
-CONFIGURE_ENV+= TURNINCLUDEDIR=${PREFIX}/include/turn
-
-# \todo Does the package really not make these?
-INSTALLATION_DIRS+= bin lib ${PKGMANDIR}/man1
-INSTALLATION_DIRS+= ${PREFIX}/var/turnserver
-INSTALLATION_DIRS+= share/doc/coturn share/examples/coturn
-
-#CONF_FILES+= ${PREFIX}/etc/turnserver.conf.default
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+# Use coturn as docs/examples subdir name. \todo No command-line argument?
+CONFIGURE_ENV+= PORTNAME=coturn
+# Defaults to ${PREFIX}/etc; respect pkgsrc tunable.
+CONFIGURE_ARGS+= --confdir=${PKG_SYSCONFDIR}
+# Defaults to ${PREFIX}/var; give it a subdirectory.
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}/coturn
+
+# \todo Why is there a db installed in /var? Won't that overwrite the user's database?
+
+post-install:
+ ${RM} ${DESTDIR}${PKG_SYSCONFDIR}/turnserver.conf.default
+
+CONF_FILES+= ${PREFIX}/share/examples/coturn/etc/turnserver.conf ${PKG_SYSCONFDIR}/turnserver.conf
#RCD_SCRIPTS= turnserver
.include "options.mk"
diff --git a/coturn/PLIST b/coturn/PLIST
index 576ce51ff9..dcb2be41c5 100644
--- a/coturn/PLIST
+++ b/coturn/PLIST
@@ -6,7 +6,6 @@ bin/turnutils_oauth
bin/turnutils_peer
bin/turnutils_stunclient
bin/turnutils_uclient
-etc/turnserver.conf.default
include/turn/client/TurnMsgLib.h
include/turn/client/ns_turn_ioaddr.h
include/turn/client/ns_turn_msg.h
@@ -24,6 +23,13 @@ man/man1/turnutils_oauth.1
man/man1/turnutils_peer.1
man/man1/turnutils_stunclient.1
man/man1/turnutils_uclient.1
+share/coturn/schema.mongo.sh
+share/coturn/schema.sql
+share/coturn/schema.stats.redis
+share/coturn/schema.userdb.redis
+share/coturn/testmongosetup.sh
+share/coturn/testredisdbsetup.sh
+share/coturn/testsqldbsetup.sql
share/doc/coturn/INSTALL
share/doc/coturn/LICENSE
share/doc/coturn/README.turnadmin
@@ -90,11 +96,3 @@ share/examples/coturn/scripts/restapi/secure_udp_client_with_secret.sh
share/examples/coturn/scripts/restapi/shared_secret_maintainer.pl
share/examples/coturn/scripts/selfloadbalance/secure_dos_attack.sh
share/examples/coturn/scripts/selfloadbalance/secure_relay.sh
-share/turnserver/schema.mongo.sh
-share/turnserver/schema.sql
-share/turnserver/schema.stats.redis
-share/turnserver/schema.userdb.redis
-share/turnserver/testmongosetup.sh
-share/turnserver/testredisdbsetup.sh
-share/turnserver/testsqldbsetup.sql
-@pkgdir var/turnserver
diff --git a/coturn/TODO b/coturn/TODO
index a528a0ac18..3382e88302 100644
--- a/coturn/TODO
+++ b/coturn/TODO
@@ -5,10 +5,10 @@ exhorts to read the upstream documentation.
Install upstream's postinstall as documentation.
-Fix path to examples.
-
-Fix detection of libevent2.
+Check if ccache is being avoided, which implies perhaps avoiding
+compilers wrappers.
+OLD: recheck with 4.6.3.
This package has known vulnerabilities, please investigate and fix if possible:
CVE-2018-4056, CVE-2018-4058, CVE-2018-4059, CVE-2020-4067, CVE-2020-6061,
CVE-2020-6062, CVE-2020-26262
Home |
Main Index |
Thread Index |
Old Index