forked from pool/schily
Accepting request 809032 from utilities
- Update to release 2020.05.25 OBS-URL: https://build.opensuse.org/request/show/809032 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/schily?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7d358155e9
@ -1,39 +0,0 @@
|
||||
From: Adam Majer <amajer@suse.com>
|
||||
Date: 2020-05-11 11:47:23+0000
|
||||
|
||||
Fix an integer overflow in partition table calculation when chrp-boot
|
||||
is enabled and a large ISO image is created.
|
||||
|
||||
Index: cdrtools-3.02/mkisofs/mac_label.c
|
||||
===================================================================
|
||||
--- cdrtools-3.02.orig/mkisofs/mac_label.c
|
||||
+++ cdrtools-3.02/mkisofs/mac_label.c
|
||||
@@ -67,8 +67,8 @@ gen_prepboot_label(ml)
|
||||
{
|
||||
struct directory_entry *de;
|
||||
int i = 0;
|
||||
- int block;
|
||||
- int size;
|
||||
+ unsigned block;
|
||||
+ unsigned size;
|
||||
MacLabel *mac_label = (MacLabel *) ml;
|
||||
|
||||
if (verbose > 1) {
|
||||
@@ -98,7 +98,7 @@ gen_prepboot_label(ml)
|
||||
mac_label->image[i].startSect[2] = 0;
|
||||
mac_label->image[i].startSect[3] = 0;
|
||||
|
||||
- size = (last_extent - session_start) * 2048 / 512;
|
||||
+ size = (unsigned)(last_extent - session_start) * (2048 / 512);
|
||||
mac_label->image[i].size[0] = size & 0xff;
|
||||
mac_label->image[i].size[1] = (size >> 8) & 0xff;
|
||||
mac_label->image[i].size[2] = (size >> 16) & 0xff;
|
||||
@@ -115,7 +115,7 @@ gen_prepboot_label(ml)
|
||||
/* NOTREACHED */
|
||||
}
|
||||
/* get size and block in 512-byte blocks */
|
||||
- block = get_733(de->isorec.extent) * 2048 / 512;
|
||||
+ block = get_733(de->isorec.extent) * (2048 / 512);
|
||||
size = get_733(de->isorec.size) / 512 + 1;
|
||||
fprintf(stderr, _("PReP boot partition %d is \"%s\"\n"),
|
||||
i + 1, prep_boot_image[i - use_chrp_boot]);
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:463d93b1f8c20a6cba703c1ada846904f24acf03ec7f3b26c36ee8453c618081
|
||||
size 4783976
|
||||
3
schily-2020-05-25.tar.bz2
Normal file
3
schily-2020-05-25.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf8f517dd82bf0e38ab528be1d37e2358a1dcc5d374c031d0de21ea496462aa9
|
||||
size 4794851
|
||||
@ -1,3 +1,31 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 26 11:32:10 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 2020.05.25
|
||||
* mkisofs: Fixed an integer overflow bug in mac_label.c with
|
||||
Apple -chrp boot.
|
||||
* star: The subst command for pax now supports the \1, \2, ...
|
||||
escapes for \(...\) selections in the from pattern, like it
|
||||
is used by sed(1).
|
||||
* star: A new subst option -pax-s has been added that supports
|
||||
sed(1) like substitutions. The old option -s continues to
|
||||
support change(1) like substititions.
|
||||
* SCCS: A new option -X0 has been introduced to allow to use
|
||||
nul byte separated file names on stdin when using the file
|
||||
argument "-".
|
||||
* SCCS: The commands sccslog and sccscvt now also support the
|
||||
argument "-" as a directive to read filenames from stdin.
|
||||
* SCCS: `sccs init` now by default creates an empty changeset
|
||||
history file with release 1.0 as
|
||||
$SRC_ROOT/.sccs/SCCS/s.changeset This signals SCCS to work in
|
||||
project mode where a group of files is managed together and
|
||||
the version 1.0 allows the first proect release to become
|
||||
1.1.
|
||||
* SCCS: `sccs init -s` now allows to initialize a directory
|
||||
tree without creating a $SRC_ROOT/.sccs/SCCS/s.changeset
|
||||
history file. This signals SCCS to work in single file mode.
|
||||
- Drop large_mac_iso.patch (merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 13 09:21:22 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
30
schily.spec
30
schily.spec
@ -17,14 +17,14 @@
|
||||
|
||||
|
||||
# grep -Pir 'define\s+VERSION|strvers'
|
||||
%global box_version 2020.05.11
|
||||
%global box_version 2020.05.25
|
||||
%global cdr_version 3.02~a10
|
||||
%global sccs_version 5.09
|
||||
%global smake_version 1.3
|
||||
%global star_version 1.6.1
|
||||
%global libfind_version 1.7
|
||||
%global ved_version 1.7
|
||||
%define rver 2020-05-11
|
||||
%define rver 2020-05-25
|
||||
|
||||
Name: schily
|
||||
Version: %box_version
|
||||
@ -41,7 +41,6 @@ Source1: README-FIRST
|
||||
# and submit patches upstream FIRST (cc to the bspkg maintainer perhaps).
|
||||
Patch1: iconv-name.diff
|
||||
Patch2: schily-2018-05-25_star_configuration.patch
|
||||
Patch3: large_mac_iso.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
@ -970,34 +969,13 @@ fi
|
||||
%_mandir/man1/rcs2sccs.1*
|
||||
%_mandir/man1/rmdel.1*
|
||||
%_mandir/man1/sact.1*
|
||||
%_mandir/man1/sccs-admin.1*
|
||||
%_mandir/man1/sccs-cdc.1*
|
||||
%_mandir/man1/sccs-comb.1*
|
||||
%_mandir/man1/sccs-cvt.1*
|
||||
%_mandir/man1/sccs-delta.1*
|
||||
%_mandir/man1/sccs-get.1*
|
||||
%_mandir/man1/sccs-help.1*
|
||||
%_mandir/man1/sccs-log.1*
|
||||
%_mandir/man1/sccs-prs.1*
|
||||
%_mandir/man1/sccs-prt.1*
|
||||
%_mandir/man1/sccs-rcs2sccs.1*
|
||||
%_mandir/man1/sccs-rmdel.1*
|
||||
%_mandir/man1/sccs-sact.1*
|
||||
%_mandir/man1/sccs-sccsdiff.1*
|
||||
%_mandir/man1/sccs-unget.1*
|
||||
%_mandir/man1/sccs-val.1*
|
||||
%_mandir/man1/sccs.1*
|
||||
%_mandir/man1/sccscvt.1*
|
||||
%_mandir/man1/sccsdiff.1*
|
||||
%_mandir/man1/sccslog.1*
|
||||
%_mandir/man1/sccspatch.1*
|
||||
%_mandir/man1/sccs*.1*
|
||||
%_mandir/man1/unget.1*
|
||||
%_mandir/man1/val.1*
|
||||
%_mandir/man1/vc.1*
|
||||
%_mandir/man1/what.1*
|
||||
%_mandir/man5/changeset.5*
|
||||
%_mandir/man5/sccschangeset.5*
|
||||
%_mandir/man5/sccsfile.5*
|
||||
%_mandir/man5/sccs*.5*
|
||||
|
||||
%files -n schily-mt
|
||||
%license CDDL.Schily.txt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user