Control: tags 884039 + patch
Control: tags 884039 + pending
Dear maintainer,
I've prepared an NMU for linuxtv-dvb-apps (versioned as
1.1.1+rev1500-1.2) and uploaded it to DELAYED/XX.
Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog
--- linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog 2016-04-07 19:12:57.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1+rev1500/debian/changelog 2018-01-23 19:52:14.000000000 +0200
@@ -1,3 +1,11 @@
+linuxtv-dvb-apps (1.1.1+rev1500-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove "dst_test -p", the functionality was never actually
+ implemented in the kernel and now caused a FTBFS. (Closes: #884039)
+
+ -- Adrian Bunk <[email protected]> Tue, 23 Jan 2018 19:52:14 +0200
+
linuxtv-dvb-apps (1.1.1+rev1500-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/apps_manpages.patch linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/apps_manpages.patch
--- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/apps_manpages.patch 2016-04-07 19:11:50.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/apps_manpages.patch 2018-01-23 19:49:20.000000000 +0200
@@ -252,7 +252,7 @@
+This manual page was written by Uwe Bugla <[email protected]>.
--- a/man/dst_test.1
+++ b/man/dst_test.1
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,38 @@
+.TH dst_test 1 "February 14, 2010"
+.SH NAME
+dst_test \- a Twinhan DST and clones test utility.
@@ -277,9 +277,6 @@
+.B \-r
+reset
+.TP
-+.B \-p
-+pid
-+.TP
+.B \-g
+get descr
+.TP
diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/dst_test-no-set-id.patch linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/dst_test-no-set-id.patch
--- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/dst_test-no-set-id.patch 1970-01-01 02:00:00.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/dst_test-no-set-id.patch 2018-01-23 19:51:51.000000000 +0200
@@ -0,0 +1,44 @@
+Description: Remove "dst_test -p"
+ The functionality was never actually implemented in the kernel,
+ and CA_SET_PID was removed from the kernel headers.
+Author: Adrian Bunk <@debian.org>
+Bug-Debian: https://bugs.debian.org/884039
+
+--- linuxtv-dvb-apps-1.1.1+rev1500.orig/util/dst-utils/dst_test.c
++++ linuxtv-dvb-apps-1.1.1+rev1500/util/dst-utils/dst_test.c
+@@ -111,16 +111,6 @@ static int dst_reset(int cafd)
+ return 0;
+ }
+
+-static int dst_set_pid(int cafd)
+-{
+- if ((ioctl(cafd, CA_SET_PID)) < 0) {
+- printf("%s: ioctl failed ..\n", __FUNCTION__);
+- return -1;
+- }
+-
+- return 0;
+-}
+-
+ static int dst_get_descr(int cafd)
+ {
+ if ((ioctl(cafd, CA_GET_DESCR_INFO)) < 0) {
+@@ -191,7 +181,6 @@ int main(int argc, char *argv[])
+ "\t -c capabilities\n"
+ "\t -i info\n"
+ "\t -r reset\n"
+- "\t -p pid\n"
+ "\t -g get descr\n"
+ "\t -s set_descr\n"
+ "\t -a app_info\n"
+@@ -229,10 +218,6 @@ int main(int argc, char *argv[])
+ printf("%s: Reset\n", __FUNCTION__);
+ dst_reset(cafd);
+ break;
+- case 'p':
+- printf("%s: PID\n", __FUNCTION__);
+- dst_set_pid(cafd);
+- break;
+ case 'g':
+ printf("%s: Get Desc\n", __FUNCTION__);
+ dst_get_descr(cafd);
diff -Nru linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series
--- linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series 2016-04-07 19:11:50.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1+rev1500/debian/patches/series 2018-01-23 19:50:35.000000000 +0200
@@ -8,3 +8,4 @@
dbug606728.diff
use-ldflags.patch
fix-build-libpng16.patch
+dst_test-no-set-id.patch
