Merge lp:~psusi/ubuntu/trusty/util-linux/fix-overflow into lp:ubuntu/trusty/util-linux

[Phillip Susi]

[Martin Pitt (pitti)]

I applied the patch to the current trusty-updates version (2.20.1-5.1ubuntu20.2), and uploaded. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-16 16:41:35 +0000
+++ debian/changelog	2014-11-05 16:51:11 +0000
@@ -1,3 +1,10 @@
+util-linux (2.20.1-5.1ubuntu20.1) trusty; urgency=medium
+
+  * partx/partx.h: Fix partx_add_partition to take 64 bit
+    offsets to avoid wrapping above 4 GB (LP: #1389321)
+
+ -- Phillip Susi <[e-mail]>  Wed, 05 Nov 2014 11:30:17 -0500
+
 util-linux (2.20.1-5.1ubuntu20) trusty; urgency=medium
 
   * Revert the previous change, as it subtly perturbs apt's unlooping
 
=== modified file 'partx/partx.h'
--- partx/partx.h	2013-02-04 15:40:51 +0000
+++ partx/partx.h	2014-11-05 16:51:11 +0000
@@ -35,7 +35,7 @@
 }
 
 static inline int partx_add_partition(int fd, int partno,
-			unsigned long start, unsigned long size)
+			unsigned long long start, unsigned long long size)
 {
 	struct blkpg_ioctl_arg a;
 	struct blkpg_partition p;