From nobody Sun Jan 28 13:40:04 2024 X-Original-To: dev-commits-ports-main@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 4TNCGr4tWPz58c6L; Sun, 28 Jan 2024 13:40:04 +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 4TNCGr4FN6z53XK; Sun, 28 Jan 2024 13:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706449204; 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=vjk5yocNqqyE4/ggfdAhKCSYKEEUBgaLhUborTXPtIM=; b=w7gRmRODvRyrLNC/+rFKzXA0yklrOyrqvEYNI7mW9IPlN/TyW1ip0nv6X+GlNd00nTbjLb h/SeCZKRSMM6gkhET3Zwbn0flEq/SRRDlzylgSW47gdgfIx0SU+kpvNAV/GDAeNOWncGyh FlrlWJxClknfSSJ7+BwjCAL3GmUU9on2Wh55pPwTaSChek7htAVxNmJRhejk7MhOSkNg6a M26A847BTbMsb+TeYmtEzQEiDehvbYzK/lYk6L9eXF65MZKJSGARF2x/r3tCrwP49TgEG6 iyBRdv3e5lloCbNpCCylnBDUC4f+UwwUNG5tjjY+Ma2wo662zCnXlWWeFyPmCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706449204; 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=vjk5yocNqqyE4/ggfdAhKCSYKEEUBgaLhUborTXPtIM=; b=iV+BbUGR/HQmXxnTKK1eb2q+S0WcvEhAPd67z8LyPjWdy+B5uEOkRNVCJBq/dN9LqCe9qW n2fW1x3UbMLTdISHDlLCBQH1zbo1lgLXNciwShMPNWO0czmieTTM7YRcdVQ5XEdht92xSN urG/uwFPSjT78oFPqsDUwZc9XyxCHmguGs88MzL1XUFnV1yGHWQ0zjdtukeYxm3q2ZmJZG mVf5IqrpbTQvdg3jfKFtaQcE8P0Q6S9VkxLCvB9IR5HE3VQIsIcLz+MsezTbRQ7eAIFc19 gXDZ5Lgm7ypXhEGEa77TH5KDHpHQEB4aXYHEjbgsEC2Mti5PamDQ15In7f2lgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706449204; a=rsa-sha256; cv=none; b=DMKP1LHRbpVOtLhmBoPgoTOh99mId2R453EJ0dbEOSoJx+g54XnAeLTD41v8vxZLyCXXcE E8lUJSCRSB+8teveFw8o+KQ+TSEQ+k0sP/6UNA6PZEwYIXLX1kdBZjZ8H48LXfxrFKsQiZ q4QBYoP9cR50gzGlc1kwtEDEGFiS5ZGY8KZClnO/cglGyk8SGmW0DU3XHEWRweG3Q7bXSX MN8dpMMl5/zmdk5phBq+7U9rkEx+7gtLfefwjE2ibWO6bOgugGNjKWyC5YEDEBCwWur9/w bhhY9D/er2y+PkgONF4NpYdjEaYGZgoPHnBYhIgSR/etDjwS8FNrHzkvrmznVA== 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 4TNCGr34HCz18D3; Sun, 28 Jan 2024 13:40:04 +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 40SDe48l077750; Sun, 28 Jan 2024 13:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SDe4eF077745; Sun, 28 Jan 2024 13:40:04 GMT (envelope-from git) Date: Sun, 28 Jan 2024 13:40:04 GMT Message-Id: <202401281340.40SDe4eF077745@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: ed4539d1ff2b - main - multimedia/librtmp: Moved man to share/man List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed4539d1ff2bfc5d5b4c903e62d167420108b1a7 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed4539d1ff2bfc5d5b4c903e62d167420108b1a7 commit ed4539d1ff2bfc5d5b4c903e62d167420108b1a7 Author: Muhammad Moinur Rahman AuthorDate: 2024-01-28 13:31:12 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-28 13:39:35 +0000 multimedia/librtmp: Moved man to share/man - Refresh patches Approved by: portmgr (blanket) --- multimedia/librtmp/Makefile | 1 + multimedia/librtmp/files/patch-librtmp-Makefile | 11 ++++++----- multimedia/librtmp/files/patch-librtmp-hashswf.c | 11 ++++++----- multimedia/librtmp/pkg-plist | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/multimedia/librtmp/Makefile b/multimedia/librtmp/Makefile index 0e4c073c5d4e..b9ad44ef5bb3 100644 --- a/multimedia/librtmp/Makefile +++ b/multimedia/librtmp/Makefile @@ -1,5 +1,6 @@ PORTNAME= librtmp PORTVERSION= 2.4.20190330 +PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/c5f04a58fc2aeea6296ca7c44ee4734c18401aa3.tar.gz?/ DISTNAME= rtmpdump-${PORTVERSION} diff --git a/multimedia/librtmp/files/patch-librtmp-Makefile b/multimedia/librtmp/files/patch-librtmp-Makefile index a3fdb32d2c96..c3337a8b97ed 100644 --- a/multimedia/librtmp/files/patch-librtmp-Makefile +++ b/multimedia/librtmp/files/patch-librtmp-Makefile @@ -1,6 +1,6 @@ ---- librtmp/Makefile.orig 2016-02-29 01:15:13 UTC +--- librtmp/Makefile.orig 2019-03-30 21:33:00 UTC +++ librtmp/Makefile -@@ -1,19 +1,21 @@ +@@ -1,19 +1,21 @@ VERSION=v2.4 VERSION=v2.4 -prefix=/usr/local @@ -9,8 +9,9 @@ incdir=$(prefix)/include/librtmp bindir=$(prefix)/bin libdir=$(prefix)/lib +-mandir=$(prefix)/man +libdatadir=$(prefix)/libdata - mandir=$(prefix)/man ++mandir=$(prefix)/share/man BINDIR=$(DESTDIR)$(bindir) INCDIR=$(DESTDIR)$(incdir) LIBDIR=$(DESTDIR)$(libdir) @@ -26,7 +27,7 @@ SYS=posix CRYPTO=OPENSSL -@@ -23,14 +25,14 @@ DEF_OPENSSL=-DUSE_OPENSSL +@@ -23,14 +25,14 @@ REQ_GNUTLS=gnutls,hogweed,nettle DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO REQ_GNUTLS=gnutls,hogweed,nettle @@ -43,7 +44,7 @@ LIB_POLARSSL=-lpolarssl $(LIBZ) PRIVATE_LIBS=$(LIBS_$(SYS)) CRYPTO_LIB=$(LIB_$(CRYPTO)) $(PRIVATE_LIBS) -@@ -74,8 +76,9 @@ SO_INST=$(SOINST_$(SHARED)) +@@ -74,8 +76,9 @@ OPT=-O2 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 diff --git a/multimedia/librtmp/files/patch-librtmp-hashswf.c b/multimedia/librtmp/files/patch-librtmp-hashswf.c index 6973abfd8968..2ee5b412ab45 100644 --- a/multimedia/librtmp/files/patch-librtmp-hashswf.c +++ b/multimedia/librtmp/files/patch-librtmp-hashswf.c @@ -1,4 +1,4 @@ ---- librtmp/hashswf.c.orig 2016-02-29 01:15:13 UTC +--- librtmp/hashswf.c.orig 2019-03-30 21:33:00 UTC +++ librtmp/hashswf.c @@ -37,10 +37,17 @@ #define SHA256_DIGEST_LENGTH 32 @@ -22,7 +22,7 @@ #elif defined(USE_GNUTLS) #include #ifndef SHA256_DIGEST_LENGTH -@@ -48,19 +55,51 @@ +@@ -48,20 +55,52 @@ #endif #undef HMAC_CTX #define HMAC_CTX struct hmac_sha256_ctx @@ -63,7 +63,7 @@ + ctx = HMAC_CTX_new(); \ + HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0); \ + } while (0); -+#endif + #endif +#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len) +#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen); +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) @@ -79,10 +79,11 @@ + ctx = NULL; \ + } while (0) +#endif - #endif ++#endif extern void RTMP_TLS_Init(); -@@ -289,7 +328,7 @@ leave: + extern TLS_CTX RTMP_TLS_ctx; +@@ -298,7 +337,7 @@ struct info struct info { z_stream *zs; diff --git a/multimedia/librtmp/pkg-plist b/multimedia/librtmp/pkg-plist index 8c6e7dd7c06b..692f847a7e43 100644 --- a/multimedia/librtmp/pkg-plist +++ b/multimedia/librtmp/pkg-plist @@ -6,4 +6,4 @@ lib/librtmp.a lib/librtmp.so lib/librtmp.so.1 libdata/pkgconfig/librtmp.pc -man/man3/librtmp.3.gz +share/man/man3/librtmp.3.gz