aboutsummaryrefslogtreecommitdiffstats
path: root/main/tvheadend
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2013-10-06 10:46:41 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2013-10-06 10:46:41 +0000
commit15f43b1c73367833b9ffef099771d1ba4bb60de4 (patch)
tree950bbd60a6af44133be6a4c07590b743b3be0ea3 /main/tvheadend
parente8e0c4cbfed58d7fd44213861baea0eb8742c58e (diff)
downloadaports-15f43b1c73367833b9ffef099771d1ba4bb60de4.tar.bz2
aports-15f43b1c73367833b9ffef099771d1ba4bb60de4.tar.xz
main/tvheadend: disable caid 1817
Diffstat (limited to 'main/tvheadend')
-rw-r--r--main/tvheadend/APKBUILD12
-rw-r--r--main/tvheadend/disable-caid-1817.patch15
2 files changed, 23 insertions, 4 deletions
diff --git a/main/tvheadend/APKBUILD b/main/tvheadend/APKBUILD
index 409d1807df..fd21cfaaaa 100644
--- a/main/tvheadend/APKBUILD
+++ b/main/tvheadend/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <francesco.colista@gmail.com>
pkgname=tvheadend
pkgver=3.4.27
-pkgrel=0
+pkgrel=1
pkgdesc="TV Streaming server for linux"
url="http://www.lonelycoder.com/hts/tvheadend_overview.html"
arch="all"
@@ -17,6 +17,7 @@ subpackages="$pkgname-doc"
source="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz
tvheadend.initd
tvheadend.confd
+ disable-caid-1817.patch
"
_builddir="$srcdir/$pkgname-3.4patch1"
@@ -60,10 +61,13 @@ package() {
md5sums="86d1be0ad6e02bd2aecd3d529a026797 3.4patch1.tar.gz
c68694d41e7ce0d94913e4332c060618 tvheadend.initd
-17cf7dfaf27706409a004c246c1a2c3c tvheadend.confd"
+17cf7dfaf27706409a004c246c1a2c3c tvheadend.confd
+0f1bfa326772fefceeee982642e0caac disable-caid-1817.patch"
sha256sums="50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead 3.4patch1.tar.gz
58891cd106314b7cb61f0ce68b58ebf58fd0bfe8b0cce03949b828ae90f53ee9 tvheadend.initd
-4d4cb6071eac087d91858fedfaf1ce57bae78cab008658dc6b7a0d5c62d1762e tvheadend.confd"
+4d4cb6071eac087d91858fedfaf1ce57bae78cab008658dc6b7a0d5c62d1762e tvheadend.confd
+023b8001ea2ef07f60556524db44e315bd1700e3b27494b01d95bb3aa91ab4b2 disable-caid-1817.patch"
sha512sums="fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a 3.4patch1.tar.gz
7727ae66b8c6cb8f8348e05229622251270366c781ced57539490910275e190a052b9438ff5e0e0ed515896e01460d451866396400c99e9e519a4a1176657f18 tvheadend.initd
-20fa0004877d74e40e4e98023284f088432c3fec12ef8bfccde40a49a122669a8a6c2a6d5211517a8dd7fd3a9646b08c3296929360a20ad6683ba90a9086b734 tvheadend.confd"
+20fa0004877d74e40e4e98023284f088432c3fec12ef8bfccde40a49a122669a8a6c2a6d5211517a8dd7fd3a9646b08c3296929360a20ad6683ba90a9086b734 tvheadend.confd
+4b2d22a0ec72c1ca95c9499b523ed437abcb49f9e475e0e6b9be994a51e03330a87f02fd12a9f549e42278d11866c9a858efebeaf088b97c9f968a668282ffbd disable-caid-1817.patch"
diff --git a/main/tvheadend/disable-caid-1817.patch b/main/tvheadend/disable-caid-1817.patch
new file mode 100644
index 0000000000..db5f6e3b0e
--- /dev/null
+++ b/main/tvheadend/disable-caid-1817.patch
@@ -0,0 +1,15 @@
+diff --git a/src/capmt.c b/src/descrambler/capmt.c
+index 5d86c3d..0a1072c 100644
+--- a/src/capmt.c
++++ b/src/capmt.c
+@@ -778,7 +778,8 @@ capmt_table_input(struct th_descrambler *td, struct service *s,
+ pos += ecd.cad_length + 2;
+
+ LIST_FOREACH(cce2, &ct->ct_caid_ecm, cce_link) {
+- capmt_descriptor_t cad = {
++ if (cce2->cce_caid == 0x1817) continue;
++ capmt_descriptor_t cad = {
+ .cad_type = 0x09,
+ .cad_length = 0x04,
+ .cad_data = {
+