From 8635e9d8030f2c1377535e4ea0b3fe2dfc3f370f Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sat, 15 Jul 2023 21:38:56 +0200 Subject: [PATCH] net/turnserver: Fix build with libressl - Pet portclippy while I am here PR: 259735 Approved by: portmaster@bsdforge.com (maintainer) --- net/turnserver/Makefile | 38 ++++++++++++++++++++++---------------- net/turnserver/distinfo | 4 +++- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile index 2767a9444013d..e7a1c4085b8a5 100644 --- a/net/turnserver/Makefile +++ b/net/turnserver/Makefile @@ -6,6 +6,9 @@ MASTER_SITES= http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ PKGNAMEPREFIX= DISTFILES= turn.extra.docs-2.0.0.1.tar.gz:xdocs +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= eea46e0b8526c38f6219fe62569be53469932464.patch:-p1 # https://github.com/coturn/coturn/pull/1198 + MAINTAINER= portmaster@BSDforge.com COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 WWW= https://github.com/coturn/coturn @@ -16,19 +19,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:devel/libevent USES= gettext-runtime perl5 pkgconfig shebangfix ssl +USE_GITHUB= yes +GH_ACCOUNT= coturn +GH_PROJECT= coturn +USE_RC_SUBR= turnserver + SHEBANG_FILES= examples/scripts/restapi/shared_secret_maintainer.pl + HAS_CONFIGURE= yes CONFIGURE_ENV+= PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1 # MongoDB support is disabled until devel/mongo-c-driver is updated CONFIGURE_ENV+= TURN_NO_MONGO=1 -TEST_TARGET= test -USE_GITHUB= yes -GH_ACCOUNT= coturn -GH_PROJECT= coturn +TEST_TARGET= test SUB_FILES= pkg-message -USE_RC_SUBR= turnserver MANPAGES= turnserver.1 turnadmin.1 turnutils.1 turnutils_peer.1 \ turnutils_stunclient.1 turnutils_uclient.1 coturn.1 \ @@ -79,13 +84,14 @@ OPTIONS_DEFINE= DOCS EXAMPLES MYSQL PGSQL REDIS SQLITE OPTIONS_DEFAULT= MYSQL PGSQL REDIS SQLITE OPTIONS_SUB= yes +REDIS_DESC= Redis support for user database and for status and statistics reporting + MYSQL_USES= mysql MYSQL_CONFIGURE_ENV_OFF= TURN_NO_MYSQL=1 PGSQL_USES= pgsql PGSQL_CONFIGURE_ENV_OFF= TURN_NO_PQ=1 -REDIS_DESC= Redis support for user database and for status and statistics reporting REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_CONFIGURE_ENV_OFF= TURN_NO_HIREDIS=1 @@ -112,9 +118,13 @@ do-install: (cd ${WRKSRC}/include/turn && ${COPYTREE_SHARE} "client ns_turn_defs.h" \ ${STAGEDIR}${PREFIX}/include/turn) -do-install-SQLITE-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/var/db - ${INSTALL_DATA} ${WRKSRC}/sqlite/turndb ${STAGEDIR}${PREFIX}/var/db/turndb +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKDIR}/turndocs/docs && ${COPYTREE_SHARE} "${DOCS}" ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTREADMEDOCS} ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/postinstall.txt + (cd ${WRKSRC}/turndb && ${INSTALL_DATA} schema.sql schema.mongo.sh \ + schema.userdb.redis schema.stats.redis ${STAGEDIR}${DOCSDIR}) do-install-EXAMPLES-on: .for dir in basic loadbalance longtermsecure longtermsecuredb restapi selfloadbalance @@ -130,12 +140,8 @@ do-install-EXAMPLES-on: ${STAGEDIR}${EXAMPLESDIR}/scripts/${f} .endfor -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR}/turndocs/docs && ${COPYTREE_SHARE} "${DOCS}" ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTREADMEDOCS} ${STAGEDIR}${DOCSDIR}) - ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/postinstall.txt - (cd ${WRKSRC}/turndb && ${INSTALL_DATA} schema.sql schema.mongo.sh \ - schema.userdb.redis schema.stats.redis ${STAGEDIR}${DOCSDIR}) +do-install-SQLITE-on: + ${MKDIR} ${STAGEDIR}${PREFIX}/var/db + ${INSTALL_DATA} ${WRKSRC}/sqlite/turndb ${STAGEDIR}${PREFIX}/var/db/turndb .include diff --git a/net/turnserver/distinfo b/net/turnserver/distinfo index 4dfc4edff9d69..aa7afd0aa7089 100644 --- a/net/turnserver/distinfo +++ b/net/turnserver/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1683059015 +TIMESTAMP = 1689448098 SHA256 (turn.extra.docs-2.0.0.1.tar.gz) = 3a86600fd0a30ce7aeb547e80402ce68ea9959f7dd58697e5b47fda6e33ab9ce SIZE (turn.extra.docs-2.0.0.1.tar.gz) = 485379 SHA256 (coturn-coturn-4.6.2_GH0.tar.gz) = 13f2a38b66cffb73d86b5ed24acba4e1371d738d758a6039e3a18f0c84c176ad SIZE (coturn-coturn-4.6.2_GH0.tar.gz) = 506275 +SHA256 (eea46e0b8526c38f6219fe62569be53469932464.patch) = 4f64a123ab35a34cf565353353adc5d61720289c848a6bdb09684f7de1ec71ba +SIZE (eea46e0b8526c38f6219fe62569be53469932464.patch) = 3312