Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2015-08-13 18:10:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mksusecd" Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2015-08-11 08:27:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2015-08-13 18:10:52.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 12 14:21:04 CEST 2015 - [email protected] + +- move isozipl to /usr/bin +- make it work also with mkisofs from cdrtools +- 1.32 + +------------------------------------------------------------------- +Wed Aug 12 14:17:28 CEST 2015 - [email protected] + +- syslinux is no longer required + +------------------------------------------------------------------- Old: ---- mksusecd-1.31.tar.xz New: ---- mksusecd-1.32.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.UOqRV8/_old 2015-08-13 18:10:52.000000000 +0200 +++ /var/tmp/diff_new_pack.UOqRV8/_new 2015-08-13 18:10:52.000000000 +0200 @@ -18,7 +18,7 @@ Name: mksusecd -Version: 1.31 +Version: 1.32 Release: 0 Summary: Create SUSE Linux installation ISOs License: GPL-3.0+ @@ -33,7 +33,6 @@ Requires: gpg2 Requires: mtools Requires: squashfs -Requires: syslinux Requires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ mksusecd-1.31.tar.xz -> mksusecd-1.32.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.31/Makefile new/mksusecd-1.32/Makefile --- old/mksusecd-1.31/Makefile 2015-08-10 15:54:49.000000000 +0200 +++ new/mksusecd-1.32/Makefile 2015-08-12 14:12:35.000000000 +0200 @@ -38,7 +38,7 @@ @cp isozipl isozipl.tmp @perl -pi -e 's/0\.0/$(VERSION)/ if /VERSION = /' isozipl.tmp install -m 755 -D mksusecd.tmp $(DESTDIR)$(BINDIR)/mksusecd - install -m 755 -D isozipl.tmp $(DESTDIR)$(LIBDIR)/mksusecd/isozipl + install -m 755 -D isozipl.tmp $(DESTDIR)$(BINDIR)/isozipl install -m 755 -D isohybrid $(DESTDIR)$(LIBDIR)/mksusecd/isohybrid @rm -f mksusecd.tmp isozipl.tmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.31/VERSION new/mksusecd-1.32/VERSION --- old/mksusecd-1.31/VERSION 2015-08-10 15:54:49.000000000 +0200 +++ new/mksusecd-1.32/VERSION 2015-08-12 14:12:35.000000000 +0200 @@ -1 +1 @@ -1.31 +1.32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.31/changelog new/mksusecd-1.32/changelog --- old/mksusecd-1.31/changelog 2015-08-10 15:54:49.000000000 +0200 +++ new/mksusecd-1.32/changelog 2015-08-12 14:12:35.000000000 +0200 @@ -1,3 +1,7 @@ +2015-08-12: 1.32 + - move isozipl to /usr/bin + - make it work also with mkisofs from cdrtools + 2015-08-10: 1.31 - fix cpio unpacking bug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mksusecd-1.31/mksusecd new/mksusecd-1.32/mksusecd --- old/mksusecd-1.31/mksusecd 2015-08-10 15:54:49.000000000 +0200 +++ new/mksusecd-1.32/mksusecd 2015-08-12 14:12:35.000000000 +0200 @@ -314,7 +314,7 @@ my $boot; my $todo; my $iso_cnt = 0; -my $mkisofs = { command => 'genisoimage' }; +my $mkisofs = { command => '/usr/bin/mkisofs' }; my $iso_file; my $iso_fh; my $two_runs; @@ -337,6 +337,10 @@ my $progress_end = 100; my $progress_txt = 'building:'; +$mkisofs->{command} = "/usr/bin/genisoimage" if ! -x $mkisofs->{command}; + +die "mkisofs: command not found\n" if ! -x $mkisofs->{command}; + if($opt_create) { # if(@opt_kernel_rpms) { # die "Sorry, you must run mksusecd as root to replace kernel modules." if $>; @@ -1074,14 +1078,30 @@ my @entry; - for (my $i = 0; $i < $entries; $i++) { - push @entry, substr $boot_catalog, 32 * ($i + 1), 32; - substr($entry[-1], 12, 20) = pack "Ca19", 1, $mkisofs->{fix_catalog}[$i]; - if((unpack "C", $entry[-1])[0] != 0x88) { + # collect boot catalog entries + # depending on the mkisofs variant, the catalog may or may not be correct + # that is, have section headers (type 0x90, 0x91) or not + + for (my $i = my $j = 0; $i < $entries; $j++) { + my $ent = substr $boot_catalog, 32 * ($j + 1), 32; + my $t = (unpack "C", $ent)[0]; + + next if $t == 0x90 || $t == 0x91; + + if($t != 0x88) { die "$iso_file: boot entry $i: strange content\n"; } + + push @entry, $ent; + substr($entry[-1], 12, 20) = pack "Ca19", 1, $mkisofs->{fix_catalog}[$i]; + + $i++; } + # rewrite the boot catalog completely + + substr($boot_catalog, 32) = "\x00" x (length($boot_catalog) - 32); + substr($boot_catalog, 32 * 1, 32) = $entry[0]; for (my $i = 1; $i < $entries; $i++) {
