Bug#751962: cdrkit: diff for NMU version 9:1.1.11-2.1

2014-06-23 Thread Steve McIntyre
On Wed, Jun 18, 2014 at 12:13:19PM +0200, Stefano Zacchiroli wrote:
Package: cdrkit
Version: 9:1.1.11-2
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for cdrkit (versioned as 9:1.1.11-2.1) and I'm
about to upload it to DELAYED/15. The only change I've applied in it is
to upgrade the 3rd party geteltorito utility from version 0.4 to 0.5,
fixing bug #648935 (and friends), filed in 2011.

The fix makes geteltorito usable with HDD images, which are a popular
way to publish BIOS upgrade, e.g., for Lenovo laptops.

Feel free to override my NMU, anticipate it, or advise me otherwise.

Thanks for this - been struggling to find time for it... :-/


-- 
Steve McIntyre, Cambridge, UK.st...@einval.com
You raise the blade, you make the change... You re-arrange me 'til I'm sane...


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#751962: cdrkit: diff for NMU version 9:1.1.11-2.1

2014-06-18 Thread Stefano Zacchiroli
Package: cdrkit
Version: 9:1.1.11-2
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for cdrkit (versioned as 9:1.1.11-2.1) and I'm
about to upload it to DELAYED/15. The only change I've applied in it is
to upgrade the 3rd party geteltorito utility from version 0.4 to 0.5,
fixing bug #648935 (and friends), filed in 2011.

The fix makes geteltorito usable with HDD images, which are a popular
way to publish BIOS upgrade, e.g., for Lenovo laptops.

Feel free to override my NMU, anticipate it, or advise me otherwise.

With many thanks for maintaining cdrkit in Debian,
Cheers,
-- 
Stefano Zacchiroli  . . . . . . .  z...@upsilon.cc . . . . o . . . o . o
Maître de conférences . . . . . http://upsilon.cc/zack . . . o . . . o o
Former Debian Project Leader  . . @zack on identi.ca . . o o o . . . o .
« the first rule of tautology club is the first rule of tautology club »
diff -u cdrkit-1.1.11/debian/changelog cdrkit-1.1.11/debian/changelog
--- cdrkit-1.1.11/debian/changelog
+++ cdrkit-1.1.11/debian/changelog
@@ -1,3 +1,11 @@
+cdrkit (9:1.1.11-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * geteltorito.pl: update to version 0.5, fixing the bug that prevent it
+to work with hdd images (Closes: #648935, #611784)
+
+ -- Stefano Zacchiroli z...@debian.org  Wed, 18 Jun 2014 12:02:31 +0200
+
 cdrkit (9:1.1.11-2) unstable; urgency=low
 
   * Modify build-dependencies to better support kFreeBSD folks. Thanks to
only in patch2:
unchanged:
--- cdrkit-1.1.11.orig/3rd-party/geteltorito/README.geteltorito
+++ cdrkit-1.1.11/3rd-party/geteltorito/README.geteltorito
@@ -3,8 +3,8 @@
 
 Author: Rainer Krienke
 Email:  krie...@uni-koblenz.de
-License: GPL
-Version: 0.4
+License: GPL v2
+Version: 0.5
 Description: A El Torito boot image extractor
 
 call: 	geteltorito CD-image  toritoimagefile
only in patch2:
unchanged:
--- cdrkit-1.1.11.orig/3rd-party/geteltorito/geteltorito.pl
+++ cdrkit-1.1.11/3rd-party/geteltorito/geteltorito.pl
@@ -11,10 +11,16 @@
 # License: GPL
 #
 # Get latest version from:
-# http://www.uni-koblenz.de/~krienke/ftp/noarch/geteltorito
+# http://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito
 #
-$utilVersion=0.4; 
+$utilVersion=0.5; 
 #
+# Version 0.5
+#2009/06/22
+#A patch for harddisk emulation images from coli...@gmail.com.
+#For BootMediaType=4 (harddisk emulation) SectorCount is always 1, and geteltorito.pl
+#returns just MBR. This patch guesses the correct bootimage size
+#from MBR (offset+size of the first partitition).
 # Version 0.4
 #2007/02/01
 #A patch from Santiago Garcia ma...@debian.org to use a virtual sector
@@ -31,9 +37,7 @@
 #Initial release
 #
 # For information on El Torito see 
-# http://wikipedia.org/
-# or try this link directly:
-# http://www.phoenix.com/en/Customer+Services/White+Papers-Specs/Platform+System+Software+Documents/default.htm
+# http://en.wikipedia.org/wiki/El_torito
 
 $vSecSize=512;
 $secSize=2048;
@@ -179,19 +183,22 @@
 }
 if( $media == 1 ){
 	print STDERR 1.2meg floppy;
-   $count=1200*1024/$vSecSize;  
+$count=1200*1024/$vSecSize;  
 }
 if( $media == 2 ){
 	print STDERR 1.44meg floppy;
-   $count=1440*1024/$vSecSize;  
+$count=1440*1024/$vSecSize;  
 }
 if( $media == 3 ){
 	print STDERR 2.88meg floppy;
-   $count=2880*1024/$vSecSize;  
+$count=2880*1024/$vSecSize;  
 }
 if( $media == 4 ){
 	print STDERR harddisk;
-	$count=0;
+	$MBR=getSector($imgStart, 1, $imageFile );
+	$partition1=substr($MBR, 446, 16);
+	($unUsed, $firstSector, $partitionSize) = unpack( A8VV, $partition1);
+	$count=$firstSector + $partitionSize;
 }
 print STDERR \n;
 


signature.asc
Description: Digital signature