pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/coturn
Module Name: pkgsrc
Committed By: adam
Date: Thu Jan 23 16:24:02 UTC 2025
Modified Files:
pkgsrc/net/coturn: Makefile PLIST options.mk
pkgsrc/net/coturn/files: turnserver.sh
Log Message:
coturn: cleanup, fix options, fix rc.d file, bump revision
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/coturn/Makefile pkgsrc/net/coturn/PLIST \
pkgsrc/net/coturn/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/coturn/files/turnserver.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/coturn/Makefile
diff -u pkgsrc/net/coturn/Makefile:1.1 pkgsrc/net/coturn/Makefile:1.2
--- pkgsrc/net/coturn/Makefile:1.1 Wed Jan 15 14:13:39 2025
+++ pkgsrc/net/coturn/Makefile Thu Jan 23 16:24:02 2025
@@ -1,55 +1,42 @@
-# $NetBSD: Makefile,v 1.1 2025/01/15 14:13:39 manu Exp $
+# $NetBSD: Makefile,v 1.2 2025/01/23 16:24:02 adam Exp $
DISTNAME= coturn-4.6.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=coturn/}
-GITHUB_PROJECT= coturn
MAINTAINER= kethzer.dr%gmail.com@localhost
HOMEPAGE= https://github.com/coturn/coturn
COMMENT= VoIP media traffic NAT traversal server
LICENSE= modified-bsd
-USE_LANGUAGES= c c++
-
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= yes
-
-HAS_CONFIGURE= yes
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-rpath
+CONFIGURE_ARGS+= --localstatedir ${VARBASE}/turnserver
+CONFIGURE_ARGS+= --prefix ${PREFIX}
# Pass cflags/libs
-CONFIGURE_ENV+= PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1
CONFIGURE_ENV+= LIBEVENT_OPENSSL_CFLAGS="-I${BUILDLINK_PREFIX.libevent}/include"
CONFIGURE_ENV+= LIBEVENT_OPENSSL_LIBS="-L${BUILDLINK_PREFIX.libevent}/lib -levent_openssl -levent"
-# 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
-CONFIGURE_ENV+= TURN_NO_MYSQL=1
-
-CFLAGS+= -Wno-stringop-truncation
-
-COTURN_CONFIG= ${PKG_SYSCONFDIR}/turnserver.conf
-COTURN_EGDIR= ${PKG_SYSCONFDIR}
-CONF_FILES+= ${COTURN_EGDIR}/turnserver.conf.default ${COTURN_CONFIG}
-
-RCD_SCRIPTS= turnserver
+CFLAGS+= -Wno-stringop-truncation
-WRKSRC= ${WRKDIR}/${DISTNAME}
+COTURN_CONFIG= ${PKG_SYSCONFDIR}/turnserver.conf
+COTURN_EGDIR= ${PREFIX}/share/examples/turnserver
+CONF_FILES= ${COTURN_EGDIR}/turnserver.conf.default ${COTURN_CONFIG}
BUILD_DEFS+= VARBASE
+RCD_SCRIPTS= turnserver
.include "options.mk"
-.include "../../security/openssl/buildlink3.mk"
+post-install:
+ ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/turnserver.conf.default \
+ ${DESTDIR}${COTURN_EGDIR}/turnserver.conf.default
+
.include "../../devel/libevent/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/coturn/PLIST
diff -u pkgsrc/net/coturn/PLIST:1.1 pkgsrc/net/coturn/PLIST:1.2
--- pkgsrc/net/coturn/PLIST:1.1 Wed Jan 15 14:13:39 2025
+++ pkgsrc/net/coturn/PLIST Thu Jan 23 16:24:02 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/01/15 14:13:39 manu Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/01/23 16:24:02 adam Exp $
bin/turnadmin
bin/turnserver
bin/turnutils_natdiscovery
@@ -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,72 +23,73 @@ man/man1/turnutils_oauth.1
man/man1/turnutils_peer.1
man/man1/turnutils_stunclient.1
man/man1/turnutils_uclient.1
-share/doc/coturn/INSTALL
-share/doc/coturn/LICENSE
-share/doc/coturn/README.turnadmin
-share/doc/coturn/README.turnserver
-share/doc/coturn/README.turnutils
-share/doc/coturn/postinstall.txt
-share/doc/coturn/schema.mongo.sh
-share/doc/coturn/schema.sql
-share/doc/coturn/schema.stats.redis
-share/doc/coturn/schema.userdb.redis
-share/examples/coturn/etc/cacert.pem
-share/examples/coturn/etc/coturn.service
-share/examples/coturn/etc/turn_client_cert.pem
-share/examples/coturn/etc/turn_client_pkey.pem
-share/examples/coturn/etc/turn_server_cert.pem
-share/examples/coturn/etc/turn_server_pkey.pem
-share/examples/coturn/etc/turnserver.conf
-share/examples/coturn/scripts/basic/dos_attack.sh
-share/examples/coturn/scripts/basic/relay.sh
-share/examples/coturn/scripts/basic/tcp_client.sh
-share/examples/coturn/scripts/basic/tcp_client_c2c_tcp_relay.sh
-share/examples/coturn/scripts/basic/udp_c2c_client.sh
-share/examples/coturn/scripts/basic/udp_client.sh
-share/examples/coturn/scripts/loadbalance/master_relay.sh
-share/examples/coturn/scripts/loadbalance/slave_relay_1.sh
-share/examples/coturn/scripts/loadbalance/slave_relay_2.sh
-share/examples/coturn/scripts/loadbalance/tcp_c2c_tcp_relay.sh
-share/examples/coturn/scripts/loadbalance/udp_c2c.sh
-share/examples/coturn/scripts/longtermsecure/secure_dos_attack.sh
-share/examples/coturn/scripts/longtermsecure/secure_dtls_client.sh
-share/examples/coturn/scripts/longtermsecure/secure_dtls_client_cert.sh
-share/examples/coturn/scripts/longtermsecure/secure_relay.sh
-share/examples/coturn/scripts/longtermsecure/secure_relay_cert.sh
-share/examples/coturn/scripts/longtermsecure/secure_sctp_client.sh
-share/examples/coturn/scripts/longtermsecure/secure_tcp_client.sh
-share/examples/coturn/scripts/longtermsecure/secure_tcp_client_c2c_tcp_relay.sh
-share/examples/coturn/scripts/longtermsecure/secure_tls_client.sh
-share/examples/coturn/scripts/longtermsecure/secure_tls_client_c2c_tcp_relay.sh
-share/examples/coturn/scripts/longtermsecure/secure_tls_client_cert.sh
-share/examples/coturn/scripts/longtermsecure/secure_udp_c2c.sh
-share/examples/coturn/scripts/longtermsecure/secure_udp_client.sh
-share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_mongo.sh
-share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_mysql.sh
-share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_mysql_ssl.sh
-share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_psql.sh
-share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_redis.sh
-share/examples/coturn/scripts/longtermsecuredb/secure_relay_with_db_sqlite.sh
-share/examples/coturn/scripts/mobile/mobile_dtls_client.sh
-share/examples/coturn/scripts/mobile/mobile_relay.sh
-share/examples/coturn/scripts/mobile/mobile_tcp_client.sh
-share/examples/coturn/scripts/mobile/mobile_tls_client_c2c_tcp_relay.sh
-share/examples/coturn/scripts/mobile/mobile_udp_client.sh
-share/examples/coturn/scripts/oauth.sh
-share/examples/coturn/scripts/pack.sh
-share/examples/coturn/scripts/peer.sh
-share/examples/coturn/scripts/readme.txt
-share/examples/coturn/scripts/restapi/secure_relay_secret.sh
-share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_mongo.sh
-share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_mysql.sh
-share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_psql.sh
-share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_redis.sh
-share/examples/coturn/scripts/restapi/secure_relay_secret_with_db_sqlite.sh
-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/doc/turnserver/INSTALL
+share/doc/turnserver/LICENSE
+share/doc/turnserver/README.turnadmin
+share/doc/turnserver/README.turnserver
+share/doc/turnserver/README.turnutils
+share/doc/turnserver/postinstall.txt
+share/doc/turnserver/schema.mongo.sh
+share/doc/turnserver/schema.sql
+share/doc/turnserver/schema.stats.redis
+share/doc/turnserver/schema.userdb.redis
+share/examples/turnserver/etc/cacert.pem
+share/examples/turnserver/etc/coturn.service
+share/examples/turnserver/etc/turn_client_cert.pem
+share/examples/turnserver/etc/turn_client_pkey.pem
+share/examples/turnserver/etc/turn_server_cert.pem
+share/examples/turnserver/etc/turn_server_pkey.pem
+share/examples/turnserver/etc/turnserver.conf
+share/examples/turnserver/scripts/basic/dos_attack.sh
+share/examples/turnserver/scripts/basic/relay.sh
+share/examples/turnserver/scripts/basic/tcp_client.sh
+share/examples/turnserver/scripts/basic/tcp_client_c2c_tcp_relay.sh
+share/examples/turnserver/scripts/basic/udp_c2c_client.sh
+share/examples/turnserver/scripts/basic/udp_client.sh
+share/examples/turnserver/scripts/loadbalance/master_relay.sh
+share/examples/turnserver/scripts/loadbalance/slave_relay_1.sh
+share/examples/turnserver/scripts/loadbalance/slave_relay_2.sh
+share/examples/turnserver/scripts/loadbalance/tcp_c2c_tcp_relay.sh
+share/examples/turnserver/scripts/loadbalance/udp_c2c.sh
+share/examples/turnserver/scripts/longtermsecure/secure_dos_attack.sh
+share/examples/turnserver/scripts/longtermsecure/secure_dtls_client.sh
+share/examples/turnserver/scripts/longtermsecure/secure_dtls_client_cert.sh
+share/examples/turnserver/scripts/longtermsecure/secure_relay.sh
+share/examples/turnserver/scripts/longtermsecure/secure_relay_cert.sh
+share/examples/turnserver/scripts/longtermsecure/secure_sctp_client.sh
+share/examples/turnserver/scripts/longtermsecure/secure_tcp_client.sh
+share/examples/turnserver/scripts/longtermsecure/secure_tcp_client_c2c_tcp_relay.sh
+share/examples/turnserver/scripts/longtermsecure/secure_tls_client.sh
+share/examples/turnserver/scripts/longtermsecure/secure_tls_client_c2c_tcp_relay.sh
+share/examples/turnserver/scripts/longtermsecure/secure_tls_client_cert.sh
+share/examples/turnserver/scripts/longtermsecure/secure_udp_c2c.sh
+share/examples/turnserver/scripts/longtermsecure/secure_udp_client.sh
+share/examples/turnserver/scripts/longtermsecuredb/secure_relay_with_db_mongo.sh
+share/examples/turnserver/scripts/longtermsecuredb/secure_relay_with_db_mysql.sh
+share/examples/turnserver/scripts/longtermsecuredb/secure_relay_with_db_mysql_ssl.sh
+share/examples/turnserver/scripts/longtermsecuredb/secure_relay_with_db_psql.sh
+share/examples/turnserver/scripts/longtermsecuredb/secure_relay_with_db_redis.sh
+share/examples/turnserver/scripts/longtermsecuredb/secure_relay_with_db_sqlite.sh
+share/examples/turnserver/scripts/mobile/mobile_dtls_client.sh
+share/examples/turnserver/scripts/mobile/mobile_relay.sh
+share/examples/turnserver/scripts/mobile/mobile_tcp_client.sh
+share/examples/turnserver/scripts/mobile/mobile_tls_client_c2c_tcp_relay.sh
+share/examples/turnserver/scripts/mobile/mobile_udp_client.sh
+share/examples/turnserver/scripts/oauth.sh
+share/examples/turnserver/scripts/pack.sh
+share/examples/turnserver/scripts/peer.sh
+share/examples/turnserver/scripts/readme.txt
+share/examples/turnserver/scripts/restapi/secure_relay_secret.sh
+share/examples/turnserver/scripts/restapi/secure_relay_secret_with_db_mongo.sh
+share/examples/turnserver/scripts/restapi/secure_relay_secret_with_db_mysql.sh
+share/examples/turnserver/scripts/restapi/secure_relay_secret_with_db_psql.sh
+share/examples/turnserver/scripts/restapi/secure_relay_secret_with_db_redis.sh
+share/examples/turnserver/scripts/restapi/secure_relay_secret_with_db_sqlite.sh
+share/examples/turnserver/scripts/restapi/secure_udp_client_with_secret.sh
+share/examples/turnserver/scripts/restapi/shared_secret_maintainer.pl
+share/examples/turnserver/scripts/selfloadbalance/secure_dos_attack.sh
+share/examples/turnserver/scripts/selfloadbalance/secure_relay.sh
+share/examples/turnserver/turnserver.conf.default
share/turnserver/schema.mongo.sh
share/turnserver/schema.sql
share/turnserver/schema.stats.redis
Index: pkgsrc/net/coturn/options.mk
diff -u pkgsrc/net/coturn/options.mk:1.1 pkgsrc/net/coturn/options.mk:1.2
--- pkgsrc/net/coturn/options.mk:1.1 Wed Jan 15 14:13:39 2025
+++ pkgsrc/net/coturn/options.mk Thu Jan 23 16:24:02 2025
@@ -1,28 +1,31 @@
-# $NetBSD: options.mk,v 1.1 2025/01/15 14:13:39 manu Exp $
+# $NetBSD: options.mk,v 1.2 2025/01/23 16:24:02 adam Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.coturn
-PKG_SUPPORTED_OPTIONS= hiredis mysql pgsql sqlite redis
-
-PKG_SUGGESTED_OPTIONS= sqlite
+PKG_OPTIONS_VAR= PKG_OPTIONS.coturn
+PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite redis
+PKG_SUGGESTED_OPTIONS= sqlite
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mhiredis)
+.if !empty(PKG_OPTIONS:Mredis)
.include "../../databases/hiredis/buildlink3.mk"
+.else
+CONFIGURE_ENV+= TURN_NO_HIREDIS=1
.endif
.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
+.else
+CONFIGURE_ENV+= TURN_NO_MYSQL=1
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
+.else
+CONFIGURE_ENV+= TURN_NO_PQ=1
.endif
.if !empty(PKG_OPTIONS:Msqlite)
.include "../../databases/sqlite3/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mredis)
-DEPENDS+= redis-[0-9]*:../../databases/redis
+.else
+CONFIGURE_ENV+= TURN_NO_SQLITE=1
.endif
Index: pkgsrc/net/coturn/files/turnserver.sh
diff -u pkgsrc/net/coturn/files/turnserver.sh:1.1 pkgsrc/net/coturn/files/turnserver.sh:1.2
--- pkgsrc/net/coturn/files/turnserver.sh:1.1 Wed Jan 15 14:13:39 2025
+++ pkgsrc/net/coturn/files/turnserver.sh Thu Jan 23 16:24:02 2025
@@ -14,18 +14,39 @@
# turnserver_config (path): Set to @PREFIX@/etc/turnserver.conf
# by default.
-. /etc/rc.subr
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+ . @SYSCONFBASE@/rc.subr
+fi
name="turnserver"
-rcvar=$name
+rcvar=${name}
-load_rc_config $name
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+ load_rc_config $name
+elif [ -f @SYSCONFBASE@/rc.conf ]; then
+ . @SYSCONFBASE@/rc.conf
+fi
: ${turnserver:=no}
: ${turnserver_config=@PREFIX@/etc/turnserver.conf}
+pidfile="@VARBASE@/run/${name}.pid"
command="@PREFIX@/bin/${name}"
-command_args="--daemon -c ${turnserver_config}"
+command_args="--daemon -c ${turnserver_config} --pidfile ${pidfile}"
required_files=${turnserver_config}
-run_rc_command "$1"
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+ run_rc_command "$1"
+else
+ case "$1" in
+ stop)
+ if [ -r "${pidfile}" ]; then
+ @ECHO@ "Stopping ${name}."
+ kill `@CAT@ ${pidfile}`
+ fi
+ ;;
+ *)
+ ${command} ${command_args}
+ ;;
+ esac
+fi
Home |
Main Index |
Thread Index |
Old Index