From 8b8ac56fe55466ffb2c58c65a3de94fc62cb90fa Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 26 May 2009 14:13:22 +0000 Subject: [PATCH] update to 1.6 (rolling in several patches), and new MASTER_SITES. --- net/rtmpdump/Makefile | 10 +++++----- net/rtmpdump/distinfo | 10 +++++----- net/rtmpdump/patches/patch-bytes_cpp | 17 ----------------- net/rtmpdump/patches/patch-handshake_cpp | 12 ------------ net/rtmpdump/patches/patch-rtmp_h | 17 ----------------- 5 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 net/rtmpdump/patches/patch-bytes_cpp delete mode 100644 net/rtmpdump/patches/patch-handshake_cpp delete mode 100644 net/rtmpdump/patches/patch-rtmp_h diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile index 1623d7629ae..f9a6bcc4e5d 100644 --- a/net/rtmpdump/Makefile +++ b/net/rtmpdump/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2009/05/22 23:51:33 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2009/05/26 14:13:22 sthen Exp $ COMMENT = dump RTMP media streams -DISTNAME = rtmpdump-v1.5 -PKGNAME = ${DISTNAME:S/-v/-/}p1 +DISTNAME = rtmpdump-v1.6 +PKGNAME = ${DISTNAME:S/-v/-/} CATEGORIES = net @@ -15,8 +15,8 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB = c m stdc++ crypto ssl -MASTER_SITES = http://spacehopper.org/mirrors/ \ - ${MASTER_SITE_SOURCEFORGE:=rtmpdump/} +MASTER_SITES = http://lkcl.net/rtmp/ \ + http://downloads.sehe.nl/lkcl.net/rtmp/ WRKDIST = ${WRKDIR}/rtmpdump diff --git a/net/rtmpdump/distinfo b/net/rtmpdump/distinfo index 335dc18d82d..65c835716bb 100644 --- a/net/rtmpdump/distinfo +++ b/net/rtmpdump/distinfo @@ -1,5 +1,5 @@ -MD5 (rtmpdump-v1.5.tar.gz) = nKP6rknhG+G0vip8vdUQJQ== -RMD160 (rtmpdump-v1.5.tar.gz) = YkJmTK35dJ+sKp6SiagvKpE/lVg= -SHA1 (rtmpdump-v1.5.tar.gz) = sm6/sLAeM8VwUKQyUDCNV/ebGVE= -SHA256 (rtmpdump-v1.5.tar.gz) = xiWQb8AqE0IgP379iOfqSLH27u2WmMnyR/r3hue59Gc= -SIZE (rtmpdump-v1.5.tar.gz) = 415559 +MD5 (rtmpdump-v1.6.tar.gz) = j2y8n8PRATAhOtmgh+oE9w== +RMD160 (rtmpdump-v1.6.tar.gz) = qvwhNcr1D0ovBI3aaQdHlMUeP+E= +SHA1 (rtmpdump-v1.6.tar.gz) = SovwwBknbwJecD6zlZHzbjVbsXQ= +SHA256 (rtmpdump-v1.6.tar.gz) = qZ5prMppwAraXYNc/8g3AZE9XQXUZevvrfsDQICyk2Q= +SIZE (rtmpdump-v1.6.tar.gz) = 60403 diff --git a/net/rtmpdump/patches/patch-bytes_cpp b/net/rtmpdump/patches/patch-bytes_cpp deleted file mode 100644 index 46c4f98889a..00000000000 --- a/net/rtmpdump/patches/patch-bytes_cpp +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-bytes_cpp,v 1.3 2009/04/29 01:39:16 sthen Exp $ - -- unbreak strict alignment big-endian - ---- bytes.cpp.orig Fri Mar 20 11:32:48 2009 -+++ bytes.cpp Wed Apr 29 01:45:47 2009 -@@ -58,7 +58,9 @@ double ReadNumber(const char *data) - { - #if __FLOAT_WORD_ORDER == __BYTE_ORDER - #if __BYTE_ORDER == __BIG_ENDIAN -- return *((double *)data); -+ double val; -+ memcpy(&val, data, sizeof(double)); -+ return val; - #elif __BYTE_ORDER == __LITTLE_ENDIAN - uint64_t in = *((uint64_t*)data); - uint64_t res = __bswap_64(in); diff --git a/net/rtmpdump/patches/patch-handshake_cpp b/net/rtmpdump/patches/patch-handshake_cpp deleted file mode 100644 index f208c9f9d66..00000000000 --- a/net/rtmpdump/patches/patch-handshake_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-handshake_cpp,v 1.1 2009/04/29 00:51:23 sthen Exp $ ---- handshake.cpp.orig Tue Apr 28 12:09:26 2009 -+++ handshake.cpp Tue Apr 28 12:09:39 2009 -@@ -210,7 +210,7 @@ unsigned int GetDigestOffset1(char *handshake, unsigne - - void HMACsha256(const char *message, size_t messageLen, const char *key, size_t keylen, char *digest) - { -- size_t digestLen; -+ unsigned int digestLen; - - HMAC_CTX ctx; - HMAC_CTX_init(&ctx); diff --git a/net/rtmpdump/patches/patch-rtmp_h b/net/rtmpdump/patches/patch-rtmp_h deleted file mode 100644 index 0797c75b5f0..00000000000 --- a/net/rtmpdump/patches/patch-rtmp_h +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-rtmp_h,v 1.2 2009/04/29 00:51:23 sthen Exp $ ---- rtmp.h.orig Sun Apr 26 11:46:17 2009 -+++ rtmp.h Tue Apr 28 11:57:42 2009 -@@ -28,11 +28,11 @@ - #ifdef WIN32 - #include - #else --//#include -+#include - #include - #include - #include --//#include -+#include - #include - #include - #endif