Bug#862295: unblock: v4l-utils/1.12.5-1

2017-06-03 Thread Niels Thykier 
Niels Thykier:
> Control: tags -1 moreinfo
> 
> Gregor Jasny:
>> Package: release.debian.org
>> Severity: normal
>> User: release.debian@packages.debian.org
>> Usertags: unblock
>>
>> Please unblock package v4l-utils
>>
>> Hello,
>>
>> please unblock the latest stable version of v4l-utils 1.12. It fixes
>> a crash in the Digital Video Broadcasting (DVB) library that occurs
>> when a German DVB-T2 transport stream is parsed. Additionally it fixes
>> a bug where identical transport streams were not detected as such.
>>
>> Thanks,
>> Gregor
>>
>> [...]
> 
> Please clarify the possible ABI breakage situation and resolve the above
> issues.
> 
> Thanks,
> ~Niels
> 

Hi Gregor,

We haven't heard back from you in a while.

Unfortunately, the release is now just around the corner and this
changeset is a bit more than what we are happy with just up to the
upload deadline.

Thanks,
~Niels

Bug#862295: unblock: v4l-utils/1.12.5-1

2017-05-12 Thread Niels Thykier 
Control: tags -1 moreinfo

Gregor Jasny:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> 
> Please unblock package v4l-utils
> 
> Hello,
> 
> please unblock the latest stable version of v4l-utils 1.12. It fixes
> a crash in the Digital Video Broadcasting (DVB) library that occurs
> when a German DVB-T2 transport stream is parsed. Additionally it fixes
> a bug where identical transport streams were not detected as such.
> 
> Thanks,
> Gregor
> 
> [...]
> diff -Nru v4l-utils-1.12.3/lib/include/libdvbv5/desc_t2_delivery.h 
> v4l-utils-1.12.5/lib/include/libdvbv5/desc_t2_delivery.h
> --- v4l-utils-1.12.3/lib/include/libdvbv5/desc_t2_delivery.h  2017-01-22 
> 18:33:34.0 +0100
> +++ v4l-utils-1.12.5/lib/include/libdvbv5/desc_t2_delivery.h  2017-05-10 
> 20:21:39.0 +0200
> @@ -45,10 +45,14 @@
>   *
>   * @param cell_id_extension  cell id extension
>   * @param transposer_frequency   transposer frequency
> + *
> + * NOTE: This struct is deprecated and will never be filled. All
> + * subcell transposer frequencies will be added to
> + * dvb_desc_t2_delivery::centre_frequency array.
>   */
>  struct dvb_desc_t2_delivery_subcell {
>   uint8_t cell_id_extension;
> - uint16_t transposer_frequency;
> + uint16_t transposer_frequency;  // Should be 32 bits, instead
>  } __attribute__((packed));
>  
>  /**
> @@ -65,7 +69,8 @@
>   * @param other_frequency_flag   other frequency flag
>   * @param tfs_flag   tfs flag
>   *
> - * @param centre_frequency   centre frequency vector
> + * @param centre_frequency   centre frequency vector, for all cell and
> + *   subcel ID's
>   * @param frequency_loop_length  size of the 
> dvb_desc_t2_delivery::centre_frequency
>   *   vector
>   *
> @@ -86,13 +91,15 @@
>   uint16_t transmission_mode:3;
>   uint16_t guard_interval:3;
>   uint16_t reserved:2;
> - uint16_t bandwidth:3;
> + uint16_t bandwidth:4;
>   uint16_t SISO_MISO:2;
>   } __attribute__((packed));

Doesn't this change break the ABI?

> [...]
> diff -Nru v4l-utils-1.12.3/lib/libdvbv5/descriptors/desc_t2_delivery.c 
> v4l-utils-1.12.5/lib/libdvbv5/descriptors/desc_t2_delivery.c
> --- v4l-utils-1.12.3/lib/libdvbv5/descriptors/desc_t2_delivery.c  
> 2017-01-22 18:33:34.0 +0100
> +++ v4l-utils-1.12.5/lib/libdvbv5/descriptors/desc_t2_delivery.c  
> 2017-05-10 20:21:39.0 +0200
> [...]
> @@ -40,53 +40,76 @@
> [...]
> + d->frequency_loop_length += n;
> + d->centre_frequency = realloc(d->centre_frequency,
^^

Smells very much like the common "realloc memory leak on error" bug
(Usually cppcheck can spot this kind of bug).  Not sure how long lived
that leak is, but fixing it might be faster than figuring it out.

> +   d->frequency_loop_length * 
> sizeof(*d->centre_frequency));
> + if (!d->centre_frequency) {
> + dvb_logerr("%s: out of memory", __func__);
> + return -3;
> + }
> [...]
> + // Add transposer_frequency at centre_frequency table
> + d->frequency_loop_length++;
> + d->centre_frequency = realloc(d->centre_frequency,


Same, except ...

> +   d->frequency_loop_length 
> * sizeof(*d->centre_frequency));
> + memcpy(>centre_frequency[pos], p, 
> sizeof(*d->centre_frequency));
   ^

No check for an error (inconsistent with the previous realloc of same field)

> [...]
> 
> unblock v4l-utils/1.12.5-1
> 
> [...]
> 

Please clarify the possible ABI breakage situation and resolve the above
issues.

Thanks,
~Niels

Bug#862295: unblock: v4l-utils/1.12.5-1

2017-05-10 Thread Gregor Jasny 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package v4l-utils

Hello,

please unblock the latest stable version of v4l-utils 1.12. It fixes
a crash in the Digital Video Broadcasting (DVB) library that occurs
when a German DVB-T2 transport stream is parsed. Additionally it fixes
a bug where identical transport streams were not detected as such.

Thanks,
Gregor

diff -Nru v4l-utils-1.12.3/ChangeLog v4l-utils-1.12.5/ChangeLog
--- v4l-utils-1.12.3/ChangeLog  2017-02-17 20:07:58.0 +0100
+++ v4l-utils-1.12.5/ChangeLog  2017-05-10 20:23:45.0 +0200
@@ -1,3 +1,27 @@
+v4l-utils-1.12.5
+
+
+Mauro Carvalho Chehab (1):
+  dvb-scan: fix the logic for multi-section handling
+
+
+v4l-utils-1.12.4
+
+
+Clemens Ladisch (1):
+  libdvbv5: T2 delivery descriptor: fix wrong size of bandwidth field
+
+Mauro Carvalho Chehab (5):
+  desc_t2_delivery: consider valid to have a short T2 descriptor
+  desc_t2_delivery: properly handle cell and subcell tables
+  desc_t2_delivery: improve print dumps of T2 delivery
+  desc_t2_delivery: resize frequency array for subcel freqs
+  libdvbv5: add support for more PMT descriptors
+
+Reinhard Speyerer (1):
+  libdvbv5: fix T2 delivery descriptor parsing in 
dvb_desc_t2_delivery_init()
+
+
 v4l-utils-1.12.3
 
 
diff -Nru v4l-utils-1.12.3/configure v4l-utils-1.12.5/configure
--- v4l-utils-1.12.3/configure.ac   2017-02-17 20:05:46.0 +0100
+++ v4l-utils-1.12.5/configure.ac   2017-05-10 20:24:05.0 +0200
@@ -3,7 +3,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([v4l-utils],[1.12.3])
+AC_INIT([v4l-utils],[1.12.5])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
diff -Nru v4l-utils-1.12.3/contrib/cobalt-ctl/Makefile 
v4l-utils-1.12.5/contrib/cobalt-ctl/Makefile
diff -Nru v4l-utils-1.12.3/debian/changelog v4l-utils-1.12.5/debian/changelog
--- v4l-utils-1.12.3/debian/changelog   2017-02-17 20:14:26.0 +0100
+++ v4l-utils-1.12.5/debian/changelog   2017-05-10 20:29:42.0 +0200
@@ -1,3 +1,22 @@
+v4l-utils (1.12.5-1) unstable; urgency=medium
+
+  * Imported Upstream version 1.12.5 (Closes: #859008)
+
+ -- Gregor Jasny   Wed, 10 May 2017 20:29:42 +0200
+
+v4l-utils (1.12.4-1) unstable; urgency=medium
+
+  * Imported Upstream version 1.12.4 (Closes: #859008)
+  * Remove patches applied upstream
+
+ -- Gregor Jasny   Sat, 06 May 2017 19:29:03 +0200
+
+v4l-utils (1.12.3-2) unstable; urgency=medium
+
+  * Fix DVB descriptor parsing (Closes: #859008)
+
+ -- Gregor Jasny   Tue, 02 May 2017 22:12:52 +0200
+
 v4l-utils (1.12.3-1) unstable; urgency=medium
 
   * Imported Upstream version 1.12.3 (Closes: #854100)
diff -Nru v4l-utils-1.12.3/debian/control v4l-utils-1.12.5/debian/control
--- v4l-utils-1.12.3/debian/control 2017-01-22 21:28:14.0 +0100
+++ v4l-utils-1.12.5/debian/control 2017-05-06 19:27:07.0 +0200
@@ -21,7 +21,7 @@
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libv4l.git
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/libv4l.git
-Homepage: http://linuxtv.org/downloads/v4l-utils/
+Homepage: https://linuxtv.org/downloads/v4l-utils/
 
 Package: libv4l-0
 Section: libs
diff -Nru v4l-utils-1.12.3/debian/libdvbv5-0.symbols 
v4l-utils-1.12.5/debian/libdvbv5-0.symbols
--- v4l-utils-1.12.3/debian/libdvbv5-0.symbols  2017-01-22 19:33:15.0 
+0100
+++ v4l-utils-1.12.5/debian/libdvbv5-0.symbols  2017-05-06 19:43:11.0 
+0200
@@ -271,6 +271,7 @@
  isdbt_interval@Base 1.4.0
  isdbt_mode@Base 1.4.0
  pmt_stream_name@Base 1.4.0
+ siso_miso@Base 1.12.4
  stack_dump@Base 1.12.1
  sys_atsc_props@Base 1.4.0
  sys_atscmh_props@Base 1.4.0
diff -Nru v4l-utils-1.12.3/debian/watch v4l-utils-1.12.5/debian/watch
--- v4l-utils-1.12.3/debian/watch   2016-06-15 21:34:30.0 +0200
+++ v4l-utils-1.12.5/debian/watch   2017-05-06 19:26:55.0 +0200
@@ -1,3 +1,3 @@
 version=4
-opts=pgpsigurlmangle=s/$/.asc/ http://linuxtv.org/downloads/@PACKAGE@/ 
@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate
+opts=pgpsigurlmangle=s/$/.asc/ https://linuxtv.org/downloads/@PACKAGE@/ 
@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate
 
diff -Nru v4l-utils-1.12.3/lib/include/libdvbv5/desc_t2_delivery.h 
v4l-utils-1.12.5/lib/include/libdvbv5/desc_t2_delivery.h
--- v4l-utils-1.12.3/lib/include/libdvbv5/desc_t2_delivery.h2017-01-22 
18:33:34.0 +0100
+++ v4l-utils-1.12.5/lib/include/libdvbv5/desc_t2_delivery.h2017-05-10 
20:21:39.0 +0200
@@ -45,10 +45,14 @@
  *
  * @param cell_id_extensioncell id extension
  * @param transposer_frequency transposer frequency
+ *
+ * NOTE: This struct is deprecated and will never be filled. All
+ * subcell transposer frequencies will be added to
+ *