--- rtmpdump-2.2e.orig/debian/rtmpdump.manpages +++ rtmpdump-2.2e/debian/rtmpdump.manpages @@ -0,0 +1,2 @@ +rtmpdump.1 +rtmpgw.8 --- rtmpdump-2.2e.orig/debian/rtmpdump.install +++ rtmpdump-2.2e/debian/rtmpdump.install @@ -0,0 +1,2 @@ +usr/bin/* +usr/sbin/* --- rtmpdump-2.2e.orig/debian/clean +++ rtmpdump-2.2e/debian/clean @@ -0,0 +1 @@ +librtmp/librtmp.pc --- rtmpdump-2.2e.orig/debian/README.source +++ rtmpdump-2.2e/debian/README.source @@ -0,0 +1,13 @@ +rtmpdump for Debian +------------------- + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. Please see: + + /usr/share/doc/quilt/README.source + +for more information on how to apply the patches, modify patches, or +remove a patch. + + -- Reinhard Tartler , Sun, 30 May 2010 20:47:32 +0200 --- rtmpdump-2.2e.orig/debian/rules +++ rtmpdump-2.2e/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +MAKEVARS=prefix=/usr CRYPTO=GNUTLS + +override_dh_auto_build: + $(MAKE) $(MAKEVARS) + +override_dh_auto_install: + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp $(MAKEVARS) + +%: + dh --with quilt $@ --- rtmpdump-2.2e.orig/debian/compat +++ rtmpdump-2.2e/debian/compat @@ -0,0 +1 @@ +7 --- rtmpdump-2.2e.orig/debian/watch +++ rtmpdump-2.2e/debian/watch @@ -0,0 +1,3 @@ +# See uscan(1) for format +version=3 +http://rtmpdump.mplayerhq.hu/download/rtmpdump-(.*)\.tar\.gz --- rtmpdump-2.2e.orig/debian/control +++ rtmpdump-2.2e/debian/control @@ -0,0 +1,29 @@ +Source: rtmpdump +Priority: extra +Maintainer: Debian multimedia packages maintainers +Uploaders: Reinhard Tartler +Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~), libgnutls-dev +Standards-Version: 3.8.4 +Section: web +Homepage: http://rtmpdump.mplayerhq.hu/ + +Package: rtmpdump +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: ffmpeg, mplayer +Description: A small dumper for media content streamed over the RTMP protocol + A small dumper for media content streamed over the RTMP protocol (like BBC's + iPlayer high quality streams). Supplying an rtmp url will result in a dumped + flv file, which can be played/transcoded using ffmpeg/mplayer, etc. + +Package: librtmp-dev +Section: libdevel +Depends: ${misc:Depends} +Architecture: any +Description: toolkit for RTMP streams (development files) + A small dumper for media content streamed over the RTMP protocol (like BBC's + iPlayer high quality streams). Supplying an rtmp url will result in a dumped + flv file, which can be played/transcoded using ffmpeg/mplayer, etc. + . + This package contains the development libraries, header files needed by + programs that want to compile with libvpx. --- rtmpdump-2.2e.orig/debian/copyright +++ rtmpdump-2.2e/debian/copyright @@ -0,0 +1,73 @@ +This work was packaged for Debian by: + + Reinhard Tartler on Sun, 30 May 2010 17:07:16 +0200 + +It was downloaded from http://rtmpdump.mplayerhq.hu/ + +Upstream Authors and Copyright: + +RTMP Dump +(C) 2009 Andrej Stepanchuk +(C) 2009-2010 Howard Chu +(C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090 + + +License of the programs in the rtmpdump package: + + rtmpdump - small dumper for media content streamed over the RTMP protocol + Copyright (C) 2009 Andrej Stepanchuk + Copyright (C) 2009-2010 Howard Chu + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +License of the librtmp library (included in the librtmp-dev package and in the +librmtp/ subdirectory in the source tree): + + Copyright (C) 2005-2008 Team XBMC + http://www.xbmc.org + Copyright (C) 2008-2009 Andrej Stepanchuk + Copyright (C) 2009-2010 Howard Chu + + + librtmp is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1, + or (at your option) any later version. + + librtmp is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with librtmp see the file COPYING. If not, write to + the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + http://www.gnu.org/copyleft/lgpl.html + + +The Debian packaging is: + + Copyright (C) 2010 Reinhard Tartler + +and is licensed under the GNU Lesser General Public License. + + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL-2' and the text of the +GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL-2.1'. + + + --- rtmpdump-2.2e.orig/debian/librtmp-dev.install +++ rtmpdump-2.2e/debian/librtmp-dev.install @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/pkgconfig/* --- rtmpdump-2.2e.orig/debian/docs +++ rtmpdump-2.2e/debian/docs @@ -0,0 +1 @@ +README --- rtmpdump-2.2e.orig/debian/changelog +++ rtmpdump-2.2e/debian/changelog @@ -0,0 +1,17 @@ +rtmpdump (2.2e-2) unstable; urgency=low + + * update debian/copyright after consulting upstream + + -- Reinhard Tartler Thu, 03 Jun 2010 20:53:02 +0200 + +rtmpdump (2.2e-1) unstable; urgency=low + + * New upstream release. + + -- Reinhard Tartler Sun, 30 May 2010 21:41:50 +0200 + +rtmpdump (2.2d-1) unstable; urgency=low + + * Initial release (Closes: #529974) + + -- Reinhard Tartler Sun, 30 May 2010 17:07:16 +0200 --- rtmpdump-2.2e.orig/debian/source/format +++ rtmpdump-2.2e/debian/source/format @@ -0,0 +1 @@ +1.0 --- rtmpdump-2.2e.orig/debian/patches/01_unbreak_makefile.diff +++ rtmpdump-2.2e/debian/patches/01_unbreak_makefile.diff @@ -0,0 +1,32 @@ +From: siretart@tauware.de +Subject: allow package to build via debian/rules +Forwarded: not-needed + +Upstream objects to this: + +13:57 hyc: this allows building rtmpdump when your makefile is executed via + another makefile +13:57 siretart: the BSD guys will object +13:57 hyc: this is the case for debian packages, debian/rules, the main + buildscript, is implementd in make +13:57 make -C only works with gnumake +13:57 look in the svn history, you'll see that it used to use make -C +13:57 hm, then I'll probably need to carry a local distro patch +13:59 and why doesn't $(MAKE) $(MAKEFLAGS) work? +14:00 symptom: 'no rule to make target "w"' +14:01 that's a gmake bug +14:04 hm. probably. the use of MAKEFLAGS is at least described in the gmake manual + 5.7.3 + + +diff --git a/Makefile b/Makefile +index 3618dcc..9984ced 100644 +--- a/Makefile ++++ b/Makefile +@@ -57,7 +57,7 @@ install: progs + cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) + cp rtmpdump.1 $(MANDIR)/man1 + cp rtmpgw.8 $(MANDIR)/man8 +- @cd librtmp; $(MAKE) install $(MAKEFLAGS) ++ $(MAKE) -C librtmp install + --- rtmpdump-2.2e.orig/debian/patches/series +++ rtmpdump-2.2e/debian/patches/series @@ -0,0 +1,2 @@ +01_unbreak_makefile.diff +02_fix_gnutls_teardown.diff --- rtmpdump-2.2e.orig/debian/patches/02_fix_gnutls_teardown.diff +++ rtmpdump-2.2e/debian/patches/02_fix_gnutls_teardown.diff @@ -0,0 +1,78 @@ +From: Howard Chu +Subject: Fix RC4 teardown for GnuTLS/gcrypt +Applied-Upstream: r498 + + +Index: trunk/librtmp/rtmp.c +=================================================================== +--- trunk/librtmp/rtmp.c (Revision 497) ++++ trunk/librtmp/rtmp.c (Revision 498) +@@ -3384,12 +3384,12 @@ + } + if (r->Link.rc4keyIn) + { +- free(r->Link.rc4keyIn); ++ RC4_free(r->Link.rc4keyIn); + r->Link.rc4keyIn = NULL; + } + if (r->Link.rc4keyOut) + { +- free(r->Link.rc4keyOut); ++ RC4_free(r->Link.rc4keyOut); + r->Link.rc4keyOut = NULL; + } + #endif +Index: trunk/librtmp/handshake.h +=================================================================== +--- trunk/librtmp/handshake.h (Revision 497) ++++ trunk/librtmp/handshake.h (Revision 498) +@@ -35,10 +35,11 @@ + #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) + + typedef arc4_context * RC4_handle; +-#define RC4_setup(h) *h = malloc(sizeof(arc4_context)) ++#define RC4_alloc(h) *h = malloc(sizeof(arc4_context)) + #define RC4_setkey(h,l,k) arc4_setup(h,k,l) + #define RC4_encrypt(h,l,d) arc4_crypt(h,l,(unsigned char *)d,(unsigned char *)d) + #define RC4_encrypt2(h,l,s,d) arc4_crypt(h,l,(unsigned char *)s,(unsigned char *)d) ++#define RC4_free(h) free(h) + + #elif defined(USE_GNUTLS) + #include +@@ -51,10 +52,11 @@ + #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen); gcry_md_close(ctx) + + typedef gcry_cipher_hd_t RC4_handle; +-#define RC4_setup(h) gcry_cipher_open(h, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0) ++#define RC4_alloc(h) gcry_cipher_open(h, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0) + #define RC4_setkey(h,l,k) gcry_cipher_setkey(h,k,l) + #define RC4_encrypt(h,l,d) gcry_cipher_encrypt(h,(void *)d,l,NULL,0) + #define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void *)d,l,(void *)s,l) ++#define RC4_free(h) gcry_cipher_close(h) + + #else /* USE_OPENSSL */ + #include +@@ -68,10 +70,11 @@ + #define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx) + + typedef RC4_KEY * RC4_handle; +-#define RC4_setup(h) *h = malloc(sizeof(RC4_KEY)) ++#define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY)) + #define RC4_setkey(h,l,k) RC4_set_key(h,l,k) + #define RC4_encrypt(h,l,d) RC4(h,l,(uint8_t *)d,(uint8_t *)d) + #define RC4_encrypt2(h,l,s,d) RC4(h,l,(uint8_t *)s,(uint8_t *)d) ++#define RC4_free(h) free(h) + #endif + + #define FP10 +@@ -112,8 +115,8 @@ + unsigned int digestLen = 0; + HMAC_CTX ctx; + +- RC4_setup(rc4keyIn); +- RC4_setup(rc4keyOut); ++ RC4_alloc(rc4keyIn); ++ RC4_alloc(rc4keyOut); + + HMAC_setup(ctx, secretKey, 128); + HMAC_crunch(ctx, pubKeyIn, 128);