extract packaging changes from 4.9.30-2+deb9u2+rpi1+stretch+buster (b90c499a424ec39fd...

diff --git a/debian/changelog b/debian/changelog
index 32b47c9e37e5379e40cd7ae9b2b636bcadd509c0..c354ab844d8925235dfe627bb6c1ad23215e13d4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux-4.9 (4.9.30-2+deb9u2+rpi1+stretch+buster) buster-staging; urgency=medium
+
+  * Rebuild under buster
+  * Fix linux-compiler package generation.
+  * Fix usbip "format-overflow" failure.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Oct 2017 02:53:12 +0000
+
 linux-4.9 (4.9.30-2+deb9u2+rpi1+stretch) stretch-staging; urgency=medium
 
   * Rebuild under stretch.

diff --git a/debian/patches/rpmanualusbip-format-overflow.patch b/debian/patches/rpmanualusbip-format-overflow.patch
new file mode 100644 (file)
index 0000000..4e86139
--- /dev/null
+++ b/debian/patches/rpmanualusbip-format-overflow.patch
@@ -0,0 +1,49 @@
+Description:  Fix usbip "format-overflow" failure.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+
+Index: linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_common.c
+===================================================================
+--- linux-4.9-4.9.30.orig/tools/usb/usbip/libsrc/usbip_common.c
++++ linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_common.c
+@@ -214,10 +214,11 @@ int read_usb_device(struct udev_device *
+ int read_usb_interface(struct usbip_usb_device *udev, int i,
+                      struct usbip_usb_interface *uinf)
+ {
+-      char busid[SYSFS_BUS_ID_SIZE];
++      char busid[SYSFS_BUS_ID_SIZE*2];
+       struct udev_device *sif;
+ 
+-      sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i);
++      snprintf(busid,SYSFS_BUS_ID_SIZE*2, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i);
++      busid[SYSFS_BUS_ID_SIZE-1] = 0;
+ 
+       sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid);
+       if (!sif) {
+Index: linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_host_common.c
+===================================================================
+--- linux-4.9-4.9.30.orig/tools/usb/usbip/libsrc/usbip_host_common.c
++++ linux-4.9-4.9.30/tools/usb/usbip/libsrc/usbip_host_common.c
+@@ -21,6 +21,8 @@
+  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#pragma GCC diagnostic warning "-Wformat-truncation"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+Index: linux-4.9-4.9.30/tools/usb/usbip/src/usbip.c
+===================================================================
+--- linux-4.9-4.9.30.orig/tools/usb/usbip/src/usbip.c
++++ linux-4.9-4.9.30/tools/usb/usbip/src/usbip.c
+@@ -176,6 +176,9 @@ int main(int argc, char *argv[])
+                       break;
+               case '?':
+                       printf("usbip: invalid option\n");
++                      usbip_usage();
++                      goto out;
++                      break;
+               default:
+                       usbip_usage();
+                       goto out;

diff --git a/debian/patches/series b/debian/patches/series
index 9cc6641cded18cb4b67c34281172f1e84b9e4dd5..e9a34bf9b296251c11d81709cee84d53baaa40e7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1112,3 +1112,4 @@ rpi/rpi_1966_a5d104e0d646f5acb7f68311ee840839b00e36e5.patch
 rpi/rpi_1967_7b5897e889d8acb181b61ff09eeb22fb14eb04da.patch
 rpi/rpi_9999_other_changes.patch
 #rpi/rpi_9999_other_changes.patch
+rpmanualusbip-format-overflow.patch

diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index 1067de796df71ebf07404ffd375ace618ff9620f..70a7f1899d8d3b537ffc769412095f5af017f33e 100644 (file)
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,4 +1,4 @@
-Package: linux-compiler-gcc-6-arm
+Package: linux-compiler-gcc-4.9-arm
 Build-Profiles: <!stage1>
 Depends: gcc-4.9, ${misc:Depends}
 Architecture: armel armhf