--- poc-streamer-0.4.2.orig/Makefile +++ poc-streamer-0.4.2/Makefile @@ -7,14 +7,14 @@ CFLAGS += -Wall -O2 # Uncomment these flags to add id3 support to mp3cue and mp3cut -#CFLAGS += -DWITH_ID3TAG -#LDFLAGS += -lid3tag +CFLAGS += -DWITH_ID3TAG +LDFLAGS += -lid3tag # On MacOSX using fink #CFLAGS += -I/sw/include #LDFLAGS += -L/sw/lib # Uncomment this flag to add ipv6 support to poc -#CFLAGS+=-DWITH_IPV6 +CFLAGS+=-DWITH_IPV6 # Uncomment these flags to add SSL support to poc #CFLAGS+=-DWITH_OPENSSL --- poc-streamer-0.4.2.orig/debian/changelog +++ poc-streamer-0.4.2/debian/changelog @@ -0,0 +1,64 @@ +poc-streamer (0.4.2-4build1) bionic; urgency=medium + + * No-change rebuild to pick up the shared flex library. + + -- Matthias Klose Tue, 20 Feb 2018 07:10:23 +0000 + +poc-streamer (0.4.2-4) unstable; urgency=low + + * Set maintainer to Debian QA Group, as this package is now orphaned. + + -- Mike Gerber Fri, 23 Dec 2016 17:12:36 +0100 + +poc-streamer (0.4.2-3.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Joao Eriberto Mota Filho ] + + * Bumped DH level to 10. (Closes: #817623) + * debian/control: + - Added a Homepage field. + - Added the libfl-dev to Build-Depends field to avoid a FTBFS. + - Bumped Standards-Version to 3.9.8. + * debian/rules: + - After conversion made by Logan: + ~ Added DEB_BUILD_MAINT_OPTIONS variable to improve the GCC hardening. + ~ Added DEB_LDFLAGS_MAINT_APPEND variable to avoid unneeded linking + against libraries. + + [ Logan Rosen ] + + * debian/control: remove article from beginning of synopsis. + * debian/rules: + - Convert to dh sequencer. + - Disable dh_auto_test since test.sh in test target doesn't exist. + + -- Joao Eriberto Mota Filho Wed, 21 Dec 2016 01:50:09 -0200 + +poc-streamer (0.4.2-3) unstable; urgency=low + + * Remove Joachim Breitner from "Uploaders", as he requested + * Apply patches from upstream's svn repository: + * Fix problems with MP3s with faulty frame sizes (possible buffer overflow) + * Fix time formatting + * Fix typo in manpage + + -- Mike Gerber Fri, 29 Apr 2005 21:59:54 +0200 + +poc-streamer (0.4.2-2) unstable; urgency=low + + * Add flex and build-dependencies to fix FTBFS bugs + * Fix FTBFS on 64-bit platforms: as ssize_t is not an int there, + fec-pkt.c failed to build due to incompatible types + + -- Mike Gerber Fri, 29 Apr 2005 02:38:53 +0200 + +poc-streamer (0.4.2-1) unstable; urgency=low + + * Initial upload (Closes: #296448) + * Rename source-package from poc to poc-streamer to avoid a conflict + with objc-poc which was formerly known as poc + + -- Mike Gerber Mon, 18 Apr 2005 18:34:43 +0200 + --- poc-streamer-0.4.2.orig/debian/compat +++ poc-streamer-0.4.2/debian/compat @@ -0,0 +1 @@ +10 --- poc-streamer-0.4.2.orig/debian/control +++ poc-streamer-0.4.2/debian/control @@ -0,0 +1,23 @@ +Source: poc-streamer +Section: sound +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 10), libid3tag0-dev, flex, bison, libfl-dev +Standards-Version: 3.9.8 +Homepage: https://bl0rg.net/software/poc/ + +Package: poc-streamer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MP3/Ogg multicast/HTTP streamer and MP3 cutting tool + poc is a suite of MP3 tools and MP3 streaming programs. It can stream + MP3s over HTTP, RTP multicast (RFC 2250 and RFC 3119) and a special + multicast protocol to enable the use of Forward Error Correction to + protect the MP3 stream against packet loss. It can also stream OGGs + over HTTP. + In addition to the streaming programs, poc contains two MP3 tools: + mp3cue and mp3cut. mp3cue can cut a big MP3 file according to a + tracklisting contained in a .cue file. mp3cut can split and + concatenate MP3 files according to time slices given on the command + line. mp3cut cuts MP3 files on ADU (autonomous data units) frames + to ensure best quality. --- poc-streamer-0.4.2.orig/debian/copyright +++ poc-streamer-0.4.2/debian/copyright @@ -0,0 +1,19 @@ +This package was debianized by Mike Gerber on +Sun, 13 Feb 2005 21:51:39 +0100. + +It was downloaded from http://bl0rg.net/software/poc/ + +Upstream Authors: Manuel Odendahl + Florian Wesch + +Copyright: + + Copyright (c) 2005, Manuel Odendahl, Florian Wesch + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: ... + +On Debian systems the complete text of the BSD License can be found +in `/usr/share/common-licenses/BSD'. --- poc-streamer-0.4.2.orig/debian/dirs +++ poc-streamer-0.4.2/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1 --- poc-streamer-0.4.2.orig/debian/docs +++ poc-streamer-0.4.2/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- poc-streamer-0.4.2.orig/debian/rules +++ poc-streamer-0.4.2/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +%: + dh $@ + +override_dh_auto_install: + dh_auto_install -- PREFIX=/usr + +override_dh_auto_test: --- poc-streamer-0.4.2.orig/debian/watch +++ poc-streamer-0.4.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://bl0rg.net/software/poc/poc-(.*).tar.gz --- poc-streamer-0.4.2.orig/fec-pkt.h +++ poc-streamer-0.4.2/fec-pkt.h @@ -62,6 +62,6 @@ ssize_t fec_pkt_send(fec_pkt_t *pkt, int fd); ssize_t fec_pkt_sendto(fec_pkt_t *pkt, int fd, struct sockaddr *to, socklen_t tolen); -ssize_t fec_pkt_read(fec_pkt_t *pkt, int fd); +int fec_pkt_read(fec_pkt_t *pkt, int fd); #endif /* FEC_PKT_H__ */ --- poc-streamer-0.4.2.orig/man/man1/mp3cut.1 +++ poc-streamer-0.4.2/man/man1/mp3cut.1 @@ -69,7 +69,7 @@ from input.mp3 and write the output to output.mp3. .IP "mp3cut -t 00:01-00:02 input1.mp3 -t -15:23 input2.mp3 -t 9:87+500- input3.mp3" -Append the segments from input1.mp3, input2.mpt and input3.mp3 and +Append the segments from input1.mp3, input2.mp3 and input3.mp3 and write the output to input1.output.mp3. .SH AUTHORS --- poc-streamer-0.4.2.orig/misc.c +++ poc-streamer-0.4.2/misc.c @@ -58,5 +58,15 @@ return len; } +void format_time(unsigned long time, char *str, unsigned int len) { + unsigned long ms = time % 1000; + time /= 1000; + unsigned long secs = time % 60; + time /= 60; + unsigned long minutes = time % 60; + time /= 60; + unsigned long hours = time; + + snprintf(str, len, "%.2lu:%.2lu:%.2lu+%.3lu", hours, minutes, secs, ms); +} - --- poc-streamer-0.4.2.orig/misc.h +++ poc-streamer-0.4.2/misc.h @@ -11,5 +11,6 @@ int unix_write(int fd, unsigned char *buf, size_t size); int unix_read(int fd, unsigned char *buf, size_t size); +void format_time(unsigned long time, char *str, unsigned int len); #endif /* MISC_H__ */ --- poc-streamer-0.4.2.orig/mp3-read.c +++ poc-streamer-0.4.2/mp3-read.c @@ -779,6 +779,9 @@ goto resync; } + if (frame->frame_size > MP3_RAW_SIZE) + goto resync; + if (file_read(mp3, frame->raw + 4, frame->frame_size - 4) <= 0) return EEOF; --- poc-streamer-0.4.2.orig/mp3cue-main.c +++ poc-streamer-0.4.2/mp3cue-main.c @@ -19,6 +19,7 @@ #include "mp3cue.h" #include "mp3.h" #include "id3.h" +#include "misc.h" /*M MP3 Cue structure that will get filled by the parser. @@ -32,18 +33,6 @@ printf("-c cuefile: cut according to cue file\n"); } -static void format_time(unsigned long time, char *str, unsigned int len) { - unsigned long ms = time % 1000; - time /= 1000; - unsigned long secs = time % 60; - time /= 60; - unsigned long minutes = time; - time /= 60; - unsigned long hours = time; - - snprintf(str, len, "%.2lu:%.2lu:%.2lu+%.3lu", hours, minutes, secs, ms); -} - int mp3cue_write_id3(file_t *outfile, mp3cue_file_t *cuefile, mp3cue_track_t *track) { return id3_write_tag(outfile, --- poc-streamer-0.4.2.orig/mp3cut.c +++ poc-streamer-0.4.2/mp3cut.c @@ -10,6 +10,7 @@ #include "file.h" #include "mp3.h" #include "id3.h" +#include "misc.h" #define min(a, b) ((a) < (b) ? (a) : (b)) @@ -99,18 +100,6 @@ return 0; } -static void format_time(unsigned long time, char *str, unsigned int len) { - unsigned long ms = time % 1000; - time /= 1000; - unsigned long secs = time % 60; - time /= 60; - unsigned long minutes = time; - time /= 60; - unsigned long hours = time; - - snprintf(str, len, "%.2lu:%.2lu:%.2lu+%.3lu", hours, minutes, secs, ms); -} - typedef struct mp3cut_s { char filename[256]; unsigned long from, to; --- poc-streamer-0.4.2.orig/mp3length.c +++ poc-streamer-0.4.2/mp3length.c @@ -9,23 +9,12 @@ #include "file.h" #include "mp3.h" #include "aq.h" +#include "misc.h" static void usage(void) { fprintf(stderr, "Usage: mp3length mp3file\n"); } -static void format_time(unsigned long time, char *str, unsigned int len) { - unsigned long ms = time % 1000; - time /= 1000; - unsigned long secs = time % 60; - time /= 60; - unsigned long minutes = time; - time /= 60; - unsigned long hours = time; - - snprintf(str, len, "%.2lu:%.2lu:%.2lu+%.3lu", hours, minutes, secs, ms); -} - int main(int argc, char *argv[]) { int retval = EXIT_SUCCESS;