--- getstream-20081204.orig/debian/rules +++ getstream-20081204/debian/rules @@ -0,0 +1,54 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g + +build: build-stamp + +build-stamp: $(DPATCH_STAMPFN) + dh_testdir + + $(MAKE) + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) clean + rm -rf debian/getstream + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + install -D -m 0755 getstream debian/getstream/usr/bin/getstream + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs Changelog + dh_installdocs + dh_installexamples configs/ + dh_installman debian/getstream.8 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- getstream-20081204.orig/debian/watch +++ getstream-20081204/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://silicon-verl.de/home/flo/projects/streaming/download/getstream2-(.*)\.tgz debian update --- getstream-20081204.orig/debian/changelog +++ getstream-20081204/debian/changelog @@ -0,0 +1,87 @@ +getstream (20081204-1.2ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches: + + as-needed.dpatch: Fix link order to allow building with + 'ld --as-needed'. + + getopt-return.dpatch: Correctly cast getopt return to an int, solving + runtime issues on platforms with unsigned chars. + + -- Logan Rosen Fri, 24 May 2013 18:05:24 -0400 + +getstream (20081204-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "Including individual glib headers no longer supported": + add debian/patches/glib-single-include.dpatch from Michael Biebl: + don't include individual headers. + (Closes: #665530) + + -- gregor herrmann Sat, 18 May 2013 19:54:38 +0200 + +getstream (20081204-1.1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Fix link order to allow building with 'ld --as-needed'. + - debian/patches/getopt-return: Correctly cast getopt return to an int, + solving runtime issues on platforms with unsigned chars. + - debian/patches/glib-single-include: Fix FTBFS with newer glib versions. + + -- Logan Rosen Wed, 05 Dec 2012 16:38:14 -0500 + +getstream (20081204-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Use pkg-config to get compiler flags for glib-2.0. Thanks to Steve + Langasek for the patch. + (Closes: #622278, LP: #749147) + * Add dpatch targets in debian/rules to apply the patches during build. + + -- Ansgar Burchardt Sun, 11 Dec 2011 12:17:55 +0100 + +getstream (20081204-1ubuntu4) precise; urgency=low + + * debian/patches/glib-single-include: Fix FTBFS with newer glib versions. + + -- Adam Conrad Sat, 31 Mar 2012 20:51:09 -0600 + +getstream (20081204-1ubuntu3) precise; urgency=low + + * debian/patches/getopt-return: Correctly cast getopt return to an int, + solving runtime issues on platforms with unsigned chars (LP: #970520) + + -- Adam Conrad Sat, 31 Mar 2012 20:04:01 -0600 + +getstream (20081204-1ubuntu2) oneiric; urgency=low + + * Fix link order to allow building with 'ld --as-needed' + (LP: #706912, #770901). + + -- Colin Watson Fri, 19 Aug 2011 19:33:43 +0100 + +getstream (20081204-1ubuntu1) natty; urgency=low + + * debian/patches/use-pkgconfig: use pkg-config to query the correct header + path for glib-2.0 instead of hard-coding a path, fixing a build failure + under multiarch. LP: #749147. + + -- Steve Langasek Mon, 11 Apr 2011 10:21:12 -0700 + +getstream (20081204-1) unstable; urgency=low + + * New upstream release (LP: #365658) + * Added a patch to prevent a memleak in libhttp.c + + -- Herve Rousseau Fri, 21 Aug 2009 08:26:29 +0200 + +getstream (20080426-1) unstable; urgency=low + + * New upstream release (Closes: #481771) + + -- Herve Rousseau Fri, 01 Aug 2008 09:01:51 +0200 + +getstream (20070419-1) unstable; urgency=low + + * Initial release (Closes: #423396) + + -- Herve Rousseau Thu, 31 May 2007 17:23:59 +0200 --- getstream-20081204.orig/debian/compat +++ getstream-20081204/debian/compat @@ -0,0 +1 @@ +5 --- getstream-20081204.orig/debian/README.source +++ getstream-20081204/debian/README.source @@ -0,0 +1,2 @@ +The source code is being modified to prevent a memleak from appearing in libhttp.c +until upstream fixes it directly in the software. --- getstream-20081204.orig/debian/copyright +++ getstream-20081204/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Herve Rousseau on +Thu, 31 May 2007 17:23:59 +0200. + +It was downloaded from + +Copyright Holder(s): Florian Lohoff + Jean-Paul Saman + Laurent Aimar + Matt Domsch + +Upstream Author: Florian Lohoff + +License: + + Copyright 2007 by Florian Lohoff + + 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 St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL-2. + +The Debian packaging is Copyright 2007, Herve Rousseau and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- getstream-20081204.orig/debian/control +++ getstream-20081204/debian/control @@ -0,0 +1,18 @@ +Source: getstream +Section: net +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Herve Rousseau +Build-Depends: debhelper (>= 5), libevent-dev, libglib2.0-dev, dpatch, pkg-config +Vcs-Git: git://hydra.gt.owl.de/getstream.git +Standards-Version: 3.8.3 +Homepage: http://silicon-verl.de/home/flo/projects/streaming/ + +Package: getstream +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: DVB streaming application + getstream is a small utility which is able to pull a MPEG + transport stream from a DVB card and stream it to the local + area network. It is written to replace VLC, and uses much less + CPU and memory than VLC. --- getstream-20081204.orig/debian/docs +++ getstream-20081204/debian/docs @@ -0,0 +1,2 @@ +README +README.multiproto --- getstream-20081204.orig/debian/getstream.8 +++ getstream-20081204/debian/getstream.8 @@ -0,0 +1,30 @@ +.TH GETSTREAM 8 "2007-06-06" "20070419" "Lightweight DVB Streaming tool" + +.SH NAME +GETSTREAM \- Lightweight DVB Streaming tool + +.SH SYNOPSIS +.B getstream +.I [OPTION] + +.SH DESCRIPTION +.B GETSTREAM +is a lightweight tool that streams a full DVB-S transponder into individual Multicast +groups, one per program into the local area network. +symbol tables. + +.SH OPTIONS +.IP -d +Start GetStream in debug mode. +.IP "-c config-file" +Mandatory path to the configuration file. See the package documentation for examples. + +.SH SEE ALSO +.BR Website + + +.SH AUTHOR +GETSTREAM was writter by Florian Lohoff +.PP +This manual page was writter by Herve Rousseau , for the +Debian project (but may be used by others). --- getstream-20081204.orig/debian/patches/libhttp-memleak.dpatch +++ getstream-20081204/debian/patches/libhttp-memleak.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## libhttp-memleak.dpatch by Herve Rousseau +## +## DP: Fixes a memleak (danchev@spnet.net) + +@DPATCH@ +diff -urNad getstream_20081204~/libhttp.c getstream_20081204/libhttp.c +--- getstream_20081204~/libhttp.c 2008-12-04 15:21:07.000000000 +0100 ++++ getstream_20081204/libhttp.c 2009-08-23 18:05:47.000000000 +0200 +@@ -556,11 +556,15 @@ + hs->sin.sin_addr.s_addr=INADDR_ANY; + + if (bind(hs->fd, (struct sockaddr *) &hs->sin, +- sizeof(struct sockaddr_in))) ++ sizeof(struct sockaddr_in))) { ++ free(hs); + return NULL; ++ } + +- if (listen(hs->fd, 3)) ++ if (listen(hs->fd, 3)) { ++ free(hs); + return NULL; ++ } + + flags=fcntl(hs->fd, F_GETFL); + fcntl(hs->fd, F_GETFL, flags | O_NONBLOCK); --- getstream-20081204.orig/debian/patches/as-needed.dpatch +++ getstream-20081204/debian/patches/as-needed.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## as-needed.dpatch by Colin Watson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix link order to allow building with 'ld --as-needed'. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/Makefile getstream-20081204/Makefile +--- getstream-20081204~/Makefile 2011-08-19 18:10:03.000000000 +0100 ++++ getstream-20081204/Makefile 2011-08-19 18:11:25.000000000 +0100 +@@ -1,6 +1,6 @@ + CC=gcc + CFLAGS=-O0 -g -Wall -I. $(shell pkg-config --cflags glib-2.0) +-LDFLAGS=-levent $(shell pkg-config --libs glib-2.0) -lpthread ++LDLIBS=-levent $(shell pkg-config --libs glib-2.0) -lpthread + OBJ-getstream=getstream.o fe.o crc32.o \ + libhttp.o libconf.o config.o util.o logging.o \ + stream.o input.o \ +@@ -15,10 +15,10 @@ + all: getstream tsdecode + + tsdecode: $(OBJ-tsdecode) +- gcc $(LDFLAGS) -o $@ $+ ++ gcc -o $@ $+ $(LDLIBS) + + getstream: $(OBJ-getstream) +- gcc $(LDFLAGS) -o $@ $+ ++ gcc -o $@ $+ $(LDLIBS) + + clean: + -rm -f $(OBJ-getstream) $(OBJ-tsdecode) --- getstream-20081204.orig/debian/patches/use-pkgconfig.dpatch +++ getstream-20081204/debian/patches/use-pkgconfig.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## use-pkgconfig.dpatch by Steve Langasek +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use pkg-config instead of hard-coding a glib header path, to fix +## DP: build failure under multiarch. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/Makefile getstream-20081204/Makefile +--- getstream-20081204~/Makefile 2008-12-04 06:21:07.000000000 -0800 ++++ getstream-20081204/Makefile 2011-04-11 10:19:09.659399230 -0700 +@@ -1,6 +1,6 @@ + CC=gcc +-CFLAGS=-O0 -g -Wall -I. -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ +-LDFLAGS=-levent -lglib-2.0 -lpthread ++CFLAGS=-O0 -g -Wall -I. $(shell pkg-config --cflags glib-2.0) ++LDFLAGS=-levent $(shell pkg-config --libs glib-2.0) -lpthread + OBJ-getstream=getstream.o fe.o crc32.o \ + libhttp.o libconf.o config.o util.o logging.o \ + stream.o input.o \ --- getstream-20081204.orig/debian/patches/glib-single-include.dpatch +++ getstream-20081204/debian/patches/glib-single-include.dpatch @@ -0,0 +1,90 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## glib-single-include.dpatch by Michael Biebl +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix glib include headers + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/config.c getstream-20081204/config.c +--- getstream-20081204~/config.c 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/config.c 2012-12-16 05:46:06.690795825 +0100 +@@ -10,7 +10,7 @@ + #include + #include + +-#include ++#include + + #include "config.h" + #include "libconf.h" +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/config.h getstream-20081204/config.h +--- getstream-20081204~/config.h 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/config.h 2012-12-16 05:46:06.690795825 +0100 +@@ -1,5 +1,5 @@ + +-#include ++#include + + #include "getstream.h" + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/getstream.h getstream-20081204/getstream.h +--- getstream-20081204~/getstream.h 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/getstream.h 2012-12-16 05:46:06.690795825 +0100 +@@ -10,7 +10,7 @@ + #include + + #include +-#include ++#include + + #include "sap.h" + #include "psi.h" +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/libhttp.c getstream-20081204/libhttp.c +--- getstream-20081204~/libhttp.c 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/libhttp.c 2012-12-16 05:46:06.690795825 +0100 +@@ -13,7 +13,7 @@ + #include + #include + +-#include ++#include + + #include "libhttp.h" + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/libhttp.h getstream-20081204/libhttp.h +--- getstream-20081204~/libhttp.h 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/libhttp.h 2012-12-16 05:46:06.690795825 +0100 +@@ -7,8 +7,7 @@ + #include + #include + +-#include +-#include ++#include + + + #define MAX_HEADER_SIZE 3000 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/output.h getstream-20081204/output.h +--- getstream-20081204~/output.h 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/output.h 2012-12-16 05:46:06.690795825 +0100 +@@ -4,7 +4,7 @@ + #include "getstream.h" + #include "libhttp.h" + +-#include ++#include + + #include + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/output_http.c getstream-20081204/output_http.c +--- getstream-20081204~/output_http.c 2012-12-16 05:45:37.000000000 +0100 ++++ getstream-20081204/output_http.c 2012-12-16 05:46:06.694795868 +0100 +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + #include "output.h" + #include "simplebuffer.h" --- getstream-20081204.orig/debian/patches/getopt-return.dpatch +++ getstream-20081204/debian/patches/getopt-return.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## getopt-return.dpatch by Adam Conrad +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ch is used to store the return of getopt, which is an int, not a char + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' getstream-20081204~/getstream.c getstream-20081204/getstream.c +--- getstream-20081204~/getstream.c 2008-12-04 07:21:07.000000000 -0700 ++++ getstream-20081204/getstream.c 2012-03-31 20:03:06.097228429 -0600 +@@ -106,7 +106,7 @@ + + int main(int argc, char **argv) { + extern char *optarg; +- char ch; ++ int ch; + int timeout=0; + GList *al; + struct config_s *config=NULL; --- getstream-20081204.orig/debian/patches/00list +++ getstream-20081204/debian/patches/00list @@ -0,0 +1,5 @@ +libhttp-memleak +use-pkgconfig +glib-single-include +as-needed +getopt-return