From nobody Thu Feb 29 20:24:12 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tm2kN6BfNz5CrFJ; Thu, 29 Feb 2024 20:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tm2kN51Lfz4gn1; Thu, 29 Feb 2024 20:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709238252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JtCl3TGbwqCpP5s8K+7Rhe1O+NPXQSqjhEBxY2VBp3c=; b=ie0H4wf5MezOZC581i0xIh5IdgAfz27p6AFSJoAYL8AyQ1xTrXnszq197SxHq0iue9SJlS RddFm73OxeDlxbZ2W3inDMmitDpKotdxbkfp/HZDacpzBoPe/GxCnHwrDJqbw1PFdwotwM AvhXs43aEq3gdYeT4aawx4kwrelF3lpdCFqLpnB+JpmkdPRIuo1fwkiwkyB1/ig0Ar3X9o +p6St01UESwG1NIrTMav0iUVd+Hdv7d8k1+6KrpSxhHXeS7tVyG2L1APdOEHUu6QhRh9lm AAdb7V/I0a95OChDRNZrj1qSGQtfeKnZOh8du9P+mMhvl6WEtFkY7BWUKWHWOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709238252; a=rsa-sha256; cv=none; b=hxJGCW5Jm0qNgQP8AM0UtpG2TVSPVOtYXtkfCVnHiGrIsHULfORwBvgCVKT7omIxZcRaQx 4Xlq+QiW+ps7n6OfepqQRlRxwbHtYoepvAdIqhXlZenvI8lYI+y4qX22pAZ78bMCGFiIfp gMmjShbHoTpst52N85gcs/mpQ6j9axsVPaIz0U+eduJfPlk5PHuBJyVz+nG0Aqmup01Cfq TFOaYuXkONSCFH5lPE3uvCq6QYv6XTFG2p3Q2Qe7qxGCvkO7hOJKd/MbPMNnH0UIiTV7D3 lUeRmaUKe4bXLvTR1IpW0htPzzKl4mKGDCTYeWUwDMgDKUXoGhZRa4xknPtA3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709238252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JtCl3TGbwqCpP5s8K+7Rhe1O+NPXQSqjhEBxY2VBp3c=; b=ShHOIQQmC5Fm8M44w2NCwP5qnV/cByz+Yqb7eqxMwi9eQ/BunXCOZuhtGYf/6Bip12/n4A B31gT2dg9LpHcZCeGlBeSLst0ooGUs8dD029bB43GizUgkQD7K9464C2DiQG1S58P4mS1z 9B4VxppyBKkByQR5WzcMnu69G3gjY6GrMb3TNKO2vkcpO99A8LXwwDkXFIlgv/ZFiPCGN4 l3nsQStI4dBe12R59A+f35up8CfAKliAYccNSPFNuAPHU1WF8tE4icJ4LQSKASieFh578j RioEUo4hxSlNrGJzk6HUBlEsurb/2YkhJfk+OeWobJk1rfVYmz1nF89rMj39kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tm2kN4HVjzwn3; Thu, 29 Feb 2024 20:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41TKOCLl030896; Thu, 29 Feb 2024 20:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TKOCTf030893; Thu, 29 Feb 2024 20:24:12 GMT (envelope-from git) Date: Thu, 29 Feb 2024 20:24:12 GMT Message-Id: <202402292024.41TKOCTf030893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 552266cdfd51 - main - net/libsrtp2: Update to 2.6.0 and switch to meson List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 552266cdfd5186288320712f3b295211304faa5c Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=552266cdfd5186288320712f3b295211304faa5c commit 552266cdfd5186288320712f3b295211304faa5c Author: Tijl Coosemans AuthorDate: 2024-02-25 18:20:22 +0000 Commit: Tijl Coosemans CommitDate: 2024-02-29 20:21:38 +0000 net/libsrtp2: Update to 2.6.0 and switch to meson --- net/libsrtp2/Makefile | 23 ++------ net/libsrtp2/distinfo | 6 +- net/libsrtp2/files/patch-Makefile.in | 35 ----------- net/libsrtp2/files/patch-test_meson.build | 11 ++++ net/libsrtp2/files/patch-test_rtpw__test.sh | 38 ++++++++++++ net/libsrtp2/files/patch-test_rtpw__test__gcm.sh | 74 ++++++++++++++++++++++++ net/libsrtp2/pkg-plist | 1 - 7 files changed, 132 insertions(+), 56 deletions(-) diff --git a/net/libsrtp2/Makefile b/net/libsrtp2/Makefile index 165e75562f22..07483890e2d8 100644 --- a/net/libsrtp2/Makefile +++ b/net/libsrtp2/Makefile @@ -1,6 +1,6 @@ PORTNAME= libsrtp DISTVERSIONPREFIX= v -DISTVERSION= 2.5.0 +DISTVERSION= 2.6.0 CATEGORIES= net PKGNAMESUFFIX= 2 @@ -11,25 +11,14 @@ WWW= https://github.com/cisco/libsrtp LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= cpe meson pkgconfig ssl +CPE_VENDOR= cisco USE_GITHUB= yes GH_ACCOUNT= cisco - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-openssl \ - crypto_CFLAGS="-I${OPENSSLINC}" \ - crypto_LIBS="${OPENSSLLIB}/libcrypto.so" -USES= cpe gmake pkgconfig ssl -CPE_VENDOR= cisco USE_LDCONFIG= yes -ALL_TARGET= all shared_library -TEST_TARGET= runtest -TEST_ENV= LD_LIBRARY_PATH=${WRKSRC} - -post-patch: - @${REINPLACE_CMD} '/supported_cflags=.*-fPIC/d' ${WRKSRC}/configure - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsrtp2.so.1 +MESON_ARGS= -Dcrypto-library=openssl \ + -Dcrypto-library-kdf=disabled \ + -Ddoc=disabled .include diff --git a/net/libsrtp2/distinfo b/net/libsrtp2/distinfo index f14e8c49e761..f53305308a00 100644 --- a/net/libsrtp2/distinfo +++ b/net/libsrtp2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675429915 -SHA256 (cisco-libsrtp-v2.5.0_GH0.tar.gz) = 8a43ef8e9ae2b665292591af62aa1a4ae41e468b6d98d8258f91478735da4e09 -SIZE (cisco-libsrtp-v2.5.0_GH0.tar.gz) = 638704 +TIMESTAMP = 1708868825 +SHA256 (cisco-libsrtp-v2.6.0_GH0.tar.gz) = bf641aa654861be10570bfc137d1441283822418e9757dc71ebb69a6cf84ea6b +SIZE (cisco-libsrtp-v2.6.0_GH0.tar.gz) = 640699 diff --git a/net/libsrtp2/files/patch-Makefile.in b/net/libsrtp2/files/patch-Makefile.in deleted file mode 100644 index 84ad3a9e8727..000000000000 --- a/net/libsrtp2/files/patch-Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.in.orig 2018-05-15 19:33:24 UTC -+++ Makefile.in -@@ -82,12 +82,11 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libsrtp2.pc - - SHAREDLIBVERSION = 1 --ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@))) - SHAREDLIB_DIR = $(libdir) - SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ - SHAREDLIBSUFFIXNOVER = so - SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION) --else ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@))) -+ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@))) - SHAREDLIB_DIR = $(bindir) - SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp2.dll.a - SHAREDLIBVERSION = -@@ -106,6 +105,9 @@ endif - %.o: %.c - $(COMPILE) -c $< -o $@ - -+%.So: %.c -+ $(COMPILE) -DPIC -fPIC -c $< -o $@ -+ - %$(EXE): %.c - $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) - -@@ -137,7 +139,7 @@ libsrtp2.a: $(srtpobj) $(cryptobj) $(gdoi) - $(AR) cr libsrtp2.a $^ - $(RANLIB) libsrtp2.a - --libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj) $(cryptobj) $(gdoi) -+libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj:.o=.So) $(cryptobj:.o=.So) $(gdoi:.o=.So) - $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ - $^ $(LDFLAGS) $(LIBS) - if [ -n "$(SHAREDLIBVERSION)" ]; then \ diff --git a/net/libsrtp2/files/patch-test_meson.build b/net/libsrtp2/files/patch-test_meson.build new file mode 100644 index 000000000000..d3f3fe46e9b0 --- /dev/null +++ b/net/libsrtp2/files/patch-test_meson.build @@ -0,0 +1,11 @@ +--- test/meson.build.orig 2024-02-24 08:29:39 UTC ++++ test/meson.build +@@ -64,7 +64,7 @@ endif + endif + + # rtp_decoder +-pcap_dep = dependency('libpcap', required: get_option('pcap-tests')) ++pcap_dep = cc.find_library('pcap', required: get_option('pcap-tests')) + + if pcap_dep.found() + executable('rtp_decoder', diff --git a/net/libsrtp2/files/patch-test_rtpw__test.sh b/net/libsrtp2/files/patch-test_rtpw__test.sh new file mode 100644 index 000000000000..cce41c37ca8c --- /dev/null +++ b/net/libsrtp2/files/patch-test_rtpw__test.sh @@ -0,0 +1,38 @@ +--- test/rtpw_test.sh.orig 2024-02-24 08:29:39 UTC ++++ test/rtpw_test.sh +@@ -87,7 +87,7 @@ sleep 1 + sleep 1 + + # verify that the background job is running +-ps -e | grep -q $receiver_pid ++ps x | grep -q $receiver_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -104,7 +104,7 @@ echo $0 ": sender PID = $sender_pid" + echo $0 ": sender PID = $sender_pid" + + # verify that the background job is running +-ps -e | grep -q $sender_pid ++ps x | grep -q $sender_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -136,7 +136,7 @@ sleep 1 + sleep 1 + + # verify that the background job is running +-ps -e | grep -q $receiver_pid ++ps x | grep -q $receiver_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -153,7 +153,7 @@ echo $0 ": sender PID = $sender_pid" + echo $0 ": sender PID = $sender_pid" + + # verify that the background job is running +-ps -e | grep -q $sender_pid ++ps x | grep -q $sender_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then diff --git a/net/libsrtp2/files/patch-test_rtpw__test__gcm.sh b/net/libsrtp2/files/patch-test_rtpw__test__gcm.sh new file mode 100644 index 000000000000..c1241ed1f9fe --- /dev/null +++ b/net/libsrtp2/files/patch-test_rtpw__test__gcm.sh @@ -0,0 +1,74 @@ +--- test/rtpw_test_gcm.sh.orig 2024-02-24 08:29:39 UTC ++++ test/rtpw_test_gcm.sh +@@ -84,7 +84,7 @@ sleep 1 + sleep 1 + + # verify that the background job is running +-ps -e | grep -q $receiver_pid ++ps x | grep -q $receiver_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -101,7 +101,7 @@ echo $0 ": sender PID = $sender_pid" + echo $0 ": sender PID = $sender_pid" + + # verify that the background job is running +-ps -e | grep -q $sender_pid ++ps x | grep -q $sender_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -129,7 +129,7 @@ sleep 1 + sleep 1 + + # verify that the background job is running +-ps -e | grep -q $receiver_pid ++ps x | grep -q $receiver_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -146,7 +146,7 @@ echo $0 ": sender PID = $sender_pid" + echo $0 ": sender PID = $sender_pid" + + # verify that the background job is running +-ps -e | grep -q $sender_pid ++ps x | grep -q $sender_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -175,7 +175,7 @@ sleep 1 + sleep 1 + + # verify that the background job is running +-ps -e | grep -q $receiver_pid ++ps x | grep -q $receiver_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -192,7 +192,7 @@ echo $0 ": sender PID = $sender_pid" + echo $0 ": sender PID = $sender_pid" + + # verify that the background job is running +-ps -e | grep -q $sender_pid ++ps x | grep -q $sender_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -220,7 +220,7 @@ sleep 1 + sleep 1 + + # verify that the background job is running +-ps -e | grep -q $receiver_pid ++ps x | grep -q $receiver_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then +@@ -237,7 +237,7 @@ echo $0 ": sender PID = $sender_pid" + echo $0 ": sender PID = $sender_pid" + + # verify that the background job is running +-ps -e | grep -q $sender_pid ++ps x | grep -q $sender_pid + retval=$? + echo $retval + if [ $retval != 0 ]; then diff --git a/net/libsrtp2/pkg-plist b/net/libsrtp2/pkg-plist index 03d9286f49e4..9c49cb3211a9 100644 --- a/net/libsrtp2/pkg-plist +++ b/net/libsrtp2/pkg-plist @@ -2,7 +2,6 @@ include/srtp2/auth.h include/srtp2/cipher.h include/srtp2/crypto_types.h include/srtp2/srtp.h -lib/libsrtp2.a lib/libsrtp2.so lib/libsrtp2.so.1 libdata/pkgconfig/libsrtp2.pc