Hello community, here is the log from the commit of package checkmedia for openSUSE:Factory checked in at Thu Oct 14 00:46:22 CEST 2010. -------- --- checkmedia/checkmedia.changes 2009-08-25 14:57:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/checkmedia/checkmedia.changes 2010-10-12 12:06:15.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 12 12:05:28 CEST 2010 - snwint@suse.de + +- don't check the first 512 bytes to avoid problems with isohybrid + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- checkmedia-2.3.tar.bz2 New: ---- checkmedia-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ checkmedia.spec ++++++ --- /var/tmp/diff_new_pack.affGci/_old 2010-10-14 00:46:08.000000000 +0200 +++ /var/tmp/diff_new_pack.affGci/_new 2010-10-14 00:46:08.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package checkmedia (Version 2.3) +# spec file for package checkmedia (Version 2.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: checkmedia -License: GPL v2 or later +License: GPLv2+ Group: System/Management AutoReqProv: on Summary: Check Installation Media -Version: 2.3 +Version: 2.4 Release: 1 Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ checkmedia-2.3.tar.bz2 -> checkmedia-2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-2.3/README new/checkmedia-2.4/README --- old/checkmedia-2.3/README 2005-02-10 15:14:51.000000000 +0100 +++ new/checkmedia-2.4/README 2010-10-12 11:58:39.000000000 +0200 @@ -16,3 +16,6 @@ 0x8373-0x8572 of the iso image (iso header starts at 0x8000) and compares the result against the stored md5sum. +To avoid problems with isohybrid images, checkmedia also does not check the +first 512 bytes of the iso image (isohybrid writes an MBR there). + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-2.3/checkmedia.c new/checkmedia-2.4/checkmedia.c --- old/checkmedia-2.3/checkmedia.c 2008-10-06 17:03:10.000000000 +0200 +++ new/checkmedia-2.4/checkmedia.c 2010-10-12 11:44:59.000000000 +0200 @@ -130,8 +130,9 @@ /* * Calculate md5 sum. * - * Normal md5sum, except we assume the area 0x8373 - 0x8572 to be filled - * with spaces (' '). + * Normal md5sum, except that we assume + * - 0x0000 - 0x01ff is filled with zeros (0) + * - 0x8373 - 0x8572 is filled with spaces (' '). */ void do_md5(char *file) { @@ -164,7 +165,10 @@ md5_process_block(buffer, sizeof buffer, &full_ctx); - if(chunk == 0) memset(buffer + 0x8373, ' ', 0x200); + if(chunk == 0) { + memset(buffer, 0, 0x200); + memset(buffer + 0x8373, ' ', 0x200); + } md5_process_block(buffer, sizeof buffer, &ctx); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/checkmedia-2.3/tagmedia new/checkmedia-2.4/tagmedia --- old/checkmedia-2.3/tagmedia 2009-08-25 14:54:59.000000000 +0200 +++ new/checkmedia-2.4/tagmedia 2010-10-12 11:54:40.000000000 +0200 @@ -3,7 +3,8 @@ # Add/remove key=value pairs from iso application area (0x200 bytes at # 0x8373). Entries are separated by semicolons ';'. # -# md5sum is calculated assuming all spaces in that area. +# md5sum is calculated assuming all zeros in 0x0000-0x01ff (MBR) and all +# spaces in 0x8373-0x8572. use Getopt::Long; @@ -47,7 +48,9 @@ $iso_size = 2 * unpack("V", substr($buf0, 0x8050, 4)); # in kB $tag = substr($buf0, 0x8373, 0x200); -substr($buf0, 0x8373, 0x200) = ' ' x 0x200; + +substr($buf0, 0x0000, 0x200) = "\x00" x 0x200; +substr($buf0, 0x8373, 0x200) = " " x 0x200; if($opt_check) { unshift @opt_add_tag, "check=1"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org