[packages/rtmpdump] - updated to git archive tagged v2.6, release 2

[qboosh]

commit b6a498c126a6246c0ee53d01bfbd2d9949329b11
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 20 07:44:19 2026 +0200

    - updated to git archive tagged v2.6, release 2

 rtmpdump-nettle4.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 rtmpdump.spec          | 25 ++++++++++---------
 2 files changed, 80 insertions(+), 11 deletions(-)
---
diff --git a/rtmpdump.spec b/rtmpdump.spec
index 62edac0..94d2722 100644
--- a/rtmpdump.spec
+++ b/rtmpdump.spec
@@ -6,18 +6,20 @@ Summary:	A utility for getting files from RTMP servers
 Summary(pl.UTF-8):	Narzędzie do pobierania plików z sewerów RTMP
 Name:		rtmpdump
 Version:	2.6
-%define	gitref	6f6bb1353fc84f4cc37138baa99f586750028a01
-%define	snap	20240302
-%define	rel	1
-Release:	1.%{snap}.%{rel}
+Release:	2
 License:	GPL v2
 Group:		Applications/Networking
+# release tarballs, but the last was 2.3
 #Source0:	http://rtmpdump.mplayerhq.hu/download/%{name}-%{version}.tgz
+# snapshots, but are no longer supported by gitweb
 #Source0:	https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/%{gitref}.tar.gz#/%{name}-%{smap}.tar.gz
-# snapshots no longer allowed, use just git archive
-Source0:	%{name}-%{snap}.tar.gz
-# Source0-md5:	58095263a0dff40d8dcc374d8a15d6d7
+# ...so use clone:
+# git clone --depth 1 --branch v%{version} https://git.ffmpeg.org/rtmpdump.git
+# git -C rtmpdump archive --format=tar.gz --prefix=rtmpdump-%{version} --output=$PWD/rtmpdump-%{version}.tar.gz v%{version}
+Source0:	%{name}-%{version}.tar.gz
+# Source0-md5:	14fc4696924f076524c846ec16c10a11
 Patch0:		%{name}-libtool.patch
+Patch1:		%{name}-nettle4.patch
 URL:		http://rtmpdump.mplayerhq.hu/
 %if %{with gnutls}
 # nettle based
@@ -86,8 +88,9 @@ Static version of RTMP library.
 Statyczna wersja biblioteki RTMP.
 
 %prep
-%setup -q -n %{name}-%{snap}
+%setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__make} \
@@ -127,12 +130,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n librtmp
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/librtmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librtmp.so.1
+%{_libdir}/librtmp.so.*.*.*
+%ghost %{_libdir}/librtmp.so.1
 
 %files -n librtmp-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/librtmp.so
+%{_libdir}/librtmp.so
 %{_includedir}/librtmp
 %{_pkgconfigdir}/librtmp.pc
 %{_mandir}/man3/librtmp.3*
diff --git a/rtmpdump-nettle4.patch b/rtmpdump-nettle4.patch
new file mode 100644
index 0000000..068e5ba
--- /dev/null
+++ b/rtmpdump-nettle4.patch
@@ -0,0 +1,66 @@
+--- rtmpdump-2.6/librtmp/handshake.h.orig	2026-06-20 07:35:09.470754466 +0200
++++ rtmpdump-2.6/librtmp/handshake.h	2026-06-20 07:36:03.633794372 +0200
+@@ -45,6 +45,7 @@ typedef arc4_context *	RC4_handle;
+ #elif defined(USE_GNUTLS)
+ #include <nettle/hmac.h>
+ #include <nettle/arcfour.h>
++#include <nettle/version.h>
+ #ifndef SHA256_DIGEST_LENGTH
+ #define SHA256_DIGEST_LENGTH	32
+ #endif
+@@ -52,7 +53,11 @@ typedef arc4_context *	RC4_handle;
+ #define HMAC_CTX	struct hmac_sha256_ctx
+ #define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
+ #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
++#if NETTLE_VERSION_MAJOR >= 4
++#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, dig)
++#else
+ #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
++#endif
+ #define HMAC_close(ctx)
+ 
+ typedef struct arcfour_ctx*	RC4_handle;
+--- rtmpdump-2.6/librtmp/hashswf.c.orig	2026-06-20 07:36:17.973716686 +0200
++++ rtmpdump-2.6/librtmp/hashswf.c	2026-06-20 07:36:58.966827941 +0200
+@@ -44,6 +44,7 @@
+ #define HMAC_close(ctx)
+ #elif defined(USE_GNUTLS)
+ #include <nettle/hmac.h>
++#include <nettle/version.h>
+ #ifndef SHA256_DIGEST_LENGTH
+ #define SHA256_DIGEST_LENGTH	32
+ #endif
+@@ -51,7 +52,11 @@
+ #define HMAC_CTX	struct hmac_sha256_ctx
+ #define HMAC_setup(ctx, key, len)	hmac_sha256_set_key(&ctx, len, key)
+ #define HMAC_crunch(ctx, buf, len)	hmac_sha256_update(&ctx, len, buf)
++#if NETTLE_VERSION_MAJOR >= 4
++#define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, dig)
++#else
+ #define HMAC_finish(ctx, dig, dlen)	dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
++#endif
+ #define HMAC_close(ctx)
+ #else	/* USE_OPENSSL */
+ #include <openssl/ssl.h>
+--- rtmpdump-2.6/librtmp/rtmp.c.orig	2026-06-20 07:37:05.516792457 +0200
++++ rtmpdump-2.6/librtmp/rtmp.c	2026-06-20 07:39:19.416067062 +0200
+@@ -57,6 +57,7 @@ static const char *my_dhm_G = "4";
+ #define MD5_DIGEST_LENGTH 16
+ #include <nettle/base64.h>
+ #include <nettle/md5.h>
++#include <nettle/version.h>
+ #else	/* USE_OPENSSL */
+ #include <openssl/ssl.h>
+ #include <openssl/rc4.h>
+@@ -2492,7 +2493,11 @@ b64enc(const unsigned char *input, int l
+ typedef struct md5_ctx	MD5_CTX;
+ #define MD5_Init(ctx)	md5_init(ctx)
+ #define MD5_Update(ctx,data,len)	md5_update(ctx,len,data)
++#if NETTLE_VERSION_MAJOR >= 4
++#define MD5_Final(dig,ctx)	md5_digest(ctx,dig)
++#else
+ #define MD5_Final(dig,ctx)	md5_digest(ctx,MD5_DIGEST_LENGTH,dig)
++#endif
+ #else
+ #endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rtmpdump.git/commitdiff/b6a498c126a6246c0ee53d01bfbd2d9949329b11