[Parted-maintainers] Bug#376937: diff for 1.7.1-2.1 NMU

[Steinar H. Gunderson]

Package: parted
Version: 1.7.1-2
Severity: normal
Tags: patch

Hi,

Attached is the diff for my parted 1.7.1-2.1 NMU.
-------------- next part --------------
diff -u parted-1.7.1/debian/patches/00list parted-1.7.1/debian/patches/00list
--- parted-1.7.1/debian/patches/00list
+++ parted-1.7.1/debian/patches/00list
@@ -6,6 +6,7 @@
 errors-to-stderr
 devfs
 kfreebsd-gnu
+gpt
 
 # Will also stay debian specific, but depends on some of the above :/
 lvm2
@@ -21 +22 @@
-baseline-symbols-update
\ No newline at end of file
+baseline-symbols-update
diff -u parted-1.7.1/debian/changelog parted-1.7.1/debian/changelog
--- parted-1.7.1/debian/changelog
+++ parted-1.7.1/debian/changelog
@@ -1,3 +1,12 @@
+parted (1.7.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * gpt.dpatch: Put the alternative GPT partition table one sector further
+    out, to avoid having it overlap with the last sector of one partition.
+    (Closes: #349718)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Wed,  5 Jul 2006 21:13:07 +0200
+
 parted (1.7.1-2) unstable; urgency=low
 
   [ Bastian Blank ]
only in patch2:
unchanged:
--- parted-1.7.1.orig/debian/patches/gpt.dpatch
+++ parted-1.7.1/debian/patches/gpt.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh -e
+## gpt.dpatch by Steinar H. Gunderson <sesse at debian.org>
+##
+## DP: Put the alternative GPT partition table one sector further out,
+## DP: to avoid having it overlap with the last sector of one partition.
+## DP: Closes: #349718
+
+. `dirname $0`/DPATCH
+
+ at DPATCH@
+--- parted-1.7.1.orig/libparted/labels/gpt.c	2006-05-25 19:28:55.000000000 +0200
++++ parted-1.7.1/libparted/labels/gpt.c	2006-06-09 22:10:19.000000000 +0200
+@@ -893,7 +893,7 @@
+ 		gpt->MyLBA = PED_CPU_TO_LE64 (disk->dev->length - 1);
+ 		gpt->AlternateLBA = PED_CPU_TO_LE64 (1);
+ 		gpt->PartitionEntryLBA
+-			= PED_CPU_TO_LE64 (disk->dev->length - 2 - ptes_size);
++			= PED_CPU_TO_LE64 (disk->dev->length - 1 - ptes_size);
+ 	} else {
+ 		gpt->MyLBA = PED_CPU_TO_LE64 (1);
+ 		gpt->AlternateLBA = PED_CPU_TO_LE64 (disk->dev->length - 1);
+@@ -984,7 +984,7 @@
+ 	if (!ped_device_write (disk->dev, pth_raw, disk->dev->length - 1, 1))
+ 		goto error_free_ptes;
+ 	if (!ped_device_write (disk->dev, ptes,
+-			       disk->dev->length - 2 - ptes_size / disk->dev->sector_size,
++			       disk->dev->length - 1 - ptes_size / disk->dev->sector_size,
+ 			       ptes_size / disk->dev->sector_size))
+ 		goto error_free_ptes;
+