tvheadend: Update Tvheadend to 3.4patch1

Update Tvheadend v3.4.27 (patch1) in trunk.
I built it with success for mpc85xx and ar71xx but may need more testing.

This is a patch release that includes several important fixes:

	-Lots of memleak's fixed by user Benny Morgan
	-XMLTV series/episode number parsing bug fixed
	-DVB service discovery bugs fixed

Signed-off-by: Atanas Vladimirov <vlado@bsdbg.net>
git-svn-id: svn://svn.openwrt.org/openwrt/packages@40636 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index d1ce7f2..269aff7 100644 (file)
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tvheadend
-PKG_VERSION:=3.2
+PKG_VERSION:=3.4patch1
 PKG_RELEASE:=0.1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/downloads/tvheadend/tvheadend/
-PKG_MD5SUM:=4f7faa75c4ea24942c5a12a77ebdcdf0
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend/archive/
+PKG_MD5SUM:=86d1be0ad6e02bd2aecd3d529a026797
 
 PKG_USE_MIPS16:=0
 
@@ -23,8 +23,8 @@ define Package/tvheadend
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=Tvheadend is a TV streaming server for Linux
-  DEPENDS:=+libopenssl +librt +zlib +TVHEADEND_AVAHI_SUPPORT:libavahi-client
-  URL:=http://www.lonelycoder.com/hts/tvheadend_overview.html
+  DEPENDS:=+libcurl +libopenssl +librt +zlib +TVHEADEND_AVAHI_SUPPORT:libavahi-client
+  URL:=https://tvheadend.org/
 endef
 
 define Package/tvheadend/description

diff --git a/multimedia/tvheadend/patches/010-SHA1.patch b/multimedia/tvheadend/patches/010-SHA1.patch
deleted file mode 100644 (file)
index dc51ec7..0000000
--- a/multimedia/tvheadend/patches/010-SHA1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN tvheadend-3.2-orig/src/trap.c tvheadend-3.2/src/trap.c
---- tvheadend-3.2-orig/src/trap.c      2012-10-23 12:56:27.000000000 +0400
-+++ tvheadend-3.2/src/trap.c   2012-10-24 21:01:34.254818786 +0400
-@@ -243,9 +243,9 @@
-       char *m = malloc(st.st_size);
-       if(m != NULL) {
-       if(read(fd, m, st.st_size) == st.st_size) {
--        SHA_Init(&binsum);
--        SHA_Update(&binsum, (void *)m, st.st_size);
--        SHA_Final(digest, &binsum);
-+        SHA1_Init(&binsum);
-+        SHA1_Update(&binsum, (void *)m, st.st_size);
-+        SHA1_Final(digest, &binsum);
-       }
-       free(m);
-       }

diff --git a/multimedia/tvheadend/patches/020-Werror.patch b/multimedia/tvheadend/patches/020-Werror.patch
deleted file mode 100644 (file)
index 56acfac..0000000
--- a/multimedia/tvheadend/patches/020-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN tvheadend-3.2-orig/src/trap.c tvheadend-3.2/src/trap.c
---- tvheadend-3.2-orig/src/trap.c      2012-10-24 21:01:34.254818786 +0400
-+++ tvheadend-3.2/src/trap.c   2012-10-24 21:05:09.122437531 +0400
-@@ -67,6 +67,7 @@
- /**
-  *
-  */
-+#if ENABLE_EXECINFO
- static int
- add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
- {
-@@ -126,6 +127,7 @@
-   close(fd[0]);
-   return 0;
- }
-+#endif /* ENABLE_EXECINFO */
- 
- 
- 
-@@ -133,8 +135,8 @@
- traphandler(int sig, siginfo_t *si, void *UC)
- {
-   ucontext_t *uc = UC;
--  char buf[200];
- #if ENABLE_EXECINFO
-+  char buf[200];
-   static void *frames[MAXFRAMES];
-   int nframes = backtrace(frames, MAXFRAMES);
-   Dl_info dli;
-Binary files tvheadend-3.2-orig/src/.trap.c.swp and tvheadend-3.2/src/.trap.c.swp differ