~mamarley/tvheadend/+git/trunk:release/3.4

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

fbda802... by Adam Sutton on 2013-07-05

filebundle: reverse changes made in PR283

The zlib input buffer is not defined const, therefore the extra malloc/memcpy
is required.
(cherry picked from commit 595623391773378659dadd4243994c88e831289f)

5505c30... by Benny Morgan <email address hidden> on 2013-07-02

- Fix - finally I remember what the purpose of that assert was.
(cherry picked from commit 5ddd07362128864b87c2e64fa594817457c624f6)

48fbfe2... by Benny Morgan <email address hidden> on 2013-07-02

- Remove assert - don't see why that assert should be - it only makes tvheadend crash for me
(cherry picked from commit 360ca58ad1335629afb5dc80eca0330d6cc382e3)

d5bfe18... by Benny Morgan <email address hidden> on 2013-06-30

- Move dvb_charset_list from dvb_charset.h to dvb_charset.c, and make it static
(cherry picked from commit e47ddddb7c761647810f83ff7dcbb7008c02aa67)

6fb9a8f... by Benny Morgan <email address hidden> on 2013-06-30

- Fix - allocate space for the '\0' character for tvheadend_webroot
(cherry picked from commit 3b38a9e0128fb88f14a6e52c3fc83853e5cc03ed)

4c61110... by Benny Morgan <email address hidden> on 2013-06-30

- Fix - In case that num parameter was NULL, epg_episode_num_deserialize funcion would return newly calloc'd
  epg_episode_num_t, but it's never used like this, so better remove the calloc, and make it void return.
(cherry picked from commit 4f3cf8e695114ff70079ec92fdf81352525d0904)

097c081... by Benny Morgan <email address hidden> on 2013-06-30

- Fix - exchange a fixed malloc(50) to char addrstr[50] - no need for malloc here
(cherry picked from commit e894b0130655baf67972af01105d04ace2dd5e16)

793575c... by Benny Morgan <email address hidden> on 2013-06-30

- Fix - exchange char* portBuf = malloc(6) to char* port_buf[6] - no need for malloc here
(cherry picked from commit 6fc536e01423bc132c6b97c94286375cb97044c3)

Conflicts:

 src/tcp.c

879f0c1... by Benny Morgan <email address hidden> on 2013-06-30

- Fix - buf is assigned to to cm->cm_data with is defined 'uint8_t cm_data[CWS_NETMSGSIZE];' part of the cwc_message_t, never malloc'd and should be free'd
(cherry picked from commit 61491f394a92bfe20b18b61d2a130bf3a670efdc)

2b8c6d6... by Benny Morgan <email address hidden> on 2013-06-30

- Fix - instead of make a fixed malloc(50), just do a char addrstr[50]
(cherry picked from commit 97af8f63e31e9c17f74994c053a7dd216707c62b)