import cdrkit-1.1.11-57.el10

i10ce changed/i10ce/cdrkit-1.1.11-57.el10
Arkady L. Shane 6 days ago
parent 84661e8f17
commit 97a1d1b5d8
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -1 +1 @@
3f7ddc06db0272942e1a4cd98c3c96462df77387 SOURCES/cdrkit-1.1.11.tar.gz
3f7ddc06db0272942e1a4cd98c3c96462df77387 SOURCES/cdrkit-1.1.11.tar.gz

@ -1,40 +0,0 @@
From 05c639c8a0f61da73ca8f1f725f8f5394d8bf15f Mon Sep 17 00:00:00 2001
From: Jakub Martisko <jamartis@redhat.com>
Date: Thu, 2 Aug 2018 09:34:18 +0200
Subject: [PATCH] fix: file name buffer overflow in isoinfo
---
genisoimage/diag/isoinfo.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/genisoimage/diag/isoinfo.c b/genisoimage/diag/isoinfo.c
index 3cc2678..a08141d 100644
--- a/genisoimage/diag/isoinfo.c
+++ b/genisoimage/diag/isoinfo.c
@@ -763,6 +763,11 @@ parse_dir(char *rootname, int extent, int len)
strcat(td->name, name_buf);
strcat(td->name, "/");
} else {
+ if ( (PATH_MAX - strlen(rootname)) < strlen(name_buf))
+ {
+ fprintf(stderr, "Name too long: %s%s\n", rootname, name_buf);
+ exit(1);
+ }
strcpy(testname, rootname);
strcat(testname, name_buf);
if (xtract && strcmp(xtract, testname) == 0) {
@@ -772,6 +777,11 @@ parse_dir(char *rootname, int extent, int len)
if (do_find &&
(idr->name_len[0] != 1 ||
(idr->name[0] != 0 && idr->name[0] != 1))) {
+ if ( (PATH_MAX - strlen(rootname)) < strlen(name_buf))
+ {
+ fprintf(stderr, "Name too long: %s%s\n", rootname, name_buf);
+ exit(1);
+ }
strcpy(testname, rootname);
strcat(testname, name_buf);
printf("%s\n", testname);
--
2.14.4

@ -0,0 +1,12 @@
diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h
--- cdrkit-1.1.11/genisoimage/genisoimage.h.me 2020-02-24 15:10:35.542998992 +0100
+++ cdrkit-1.1.11/genisoimage/genisoimage.h 2020-02-24 15:10:50.011130450 +0100
@@ -377,7 +377,7 @@ extern int use_fileversion;
extern int split_SL_component;
extern int split_SL_field;
extern char *trans_tbl;
-char *outfile;
+extern char *outfile;
#define JMAX 64 /* maximum Joliet file name length (spec) */
#define JLONGMAX 103 /* out of spec Joliet file name length */

@ -1,11 +1,11 @@
Summary: A collection of CD/DVD utilities
Name: cdrkit
Name: cdrkit
Version: 1.1.11
Release: 39%{?dist}
License: GPLv2
Group: Applications/System
URL: http://cdrkit.org/
Source: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz
Release: 57%{?dist}
Summary: A collection of CD/DVD utilities
# Automatically converted from old format: GPLv2 - review is highly recommended.
License: GPL-2.0-only
URL: http://cdrkit.org/
Source: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz
Patch1: cdrkit-1.1.8-werror.patch
Patch2: cdrkit-1.1.9-efi-boot.patch
@ -27,9 +27,8 @@ Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
Patch20: cdrkit-1.1.11-werror_gcc5.patch
Patch21: cdrkit-1.1.11-devname.patch
Patch22: cdrkit-1.1.11-sysmacros.patch
Patch23: 0001-fix-file-name-buffer-overflow-in-isoinfo.patch
Patch23: cdrkit-1.1.11-gcc10.patch
BuildRequires: gcc
BuildRequires: cmake libcap-devel zlib-devel perl-interpreter perl-generators file-devel bzip2-devel
%description
@ -37,14 +36,9 @@ cdrkit is a collection of CD/DVD utilities.
%package -n wodim
Summary: A command line CD/DVD recording program
Group: Applications/Archiving
Obsoletes: dvdrecord <= 0:0.1.5
Provides: dvdrecord = 0:0.1.5.1
Obsoletes: cdrecord < 9:2.01-12
Provides: cdrecord = 9:2.01-12
Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives coreutils
Requires(post): %{_sbindir}/alternatives coreutils
Requires: libusal%{?_isa} = %{version}-%{release}
Requires(preun): /usr/sbin/alternatives coreutils
Requires(post): /usr/sbin/alternatives coreutils
%description -n wodim
Wodim is an application for creating audio and data CDs. Wodim
@ -53,12 +47,9 @@ multi-sessions and provides human-readable error messages.
%package -n genisoimage
Summary: Creates an image of an ISO9660 file-system
Group: Applications/System
Obsoletes: mkisofs < 9:2.01-12
Provides: mkisofs = 9:2.01-12
Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives coreutils
Requires(post): %{_sbindir}/alternatives coreutils
Requires: libusal%{?_isa} = %{version}-%{release}
Requires(preun): /usr/sbin/alternatives coreutils
Requires(post): /usr/sbin/alternatives coreutils
%description -n genisoimage
The genisoimage program is used as a pre-mastering program; i.e., it
@ -73,22 +64,18 @@ CD-ROMs.
%package -n dirsplit
Summary: Utility to split directories
Group: Applications/System
Requires: perl-interpreter >= 4:5.8.1
Requires: genisoimage = %{version}-%{release}
Requires: genisoimage%{?_isa} = %{version}-%{release}
%description -n dirsplit
This utility is used to split directories into chunks before burning.
Chunk size is usually set to fit to a CD/DVD.
%package -n icedax
Group: Applications/Multimedia
Summary: A utility for sampling/copying .wav files from digital audio CDs
Obsoletes: cdda2wav < 9:2.01-12
Provides: cdda2wav = 9:2.01-12
Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
Requires(post): %{_sbindir}/alternatives chkconfig coreutils
Requires: libusal%{?_isa} = %{version}-%{release}
Requires(preun): /usr/sbin/alternatives coreutils
Requires(post): /usr/sbin/alternatives coreutils
Requires: vorbis-tools
Requires: cdparanoia
BuildRequires: cdparanoia-devel
@ -102,7 +89,6 @@ rates. Icedax can also be used as a CD player.
%package -n libusal
Summary: Library to communicate with SCSI devices
Group: Development/Libraries
%description -n libusal
The libusal package contains C libraries that allows applications
@ -111,8 +97,7 @@ CD-R media.
%package -n libusal-devel
Summary: Development files for libusal
Group: Development/Libraries
Requires: libusal = %{version}-%{release}
Requires: libusal%{?_isa} = %{version}-%{release}
%description -n libusal-devel
The libusal-devel package contains C libraries and header files
@ -121,29 +106,28 @@ SCSI devices.
%prep
%setup -q
%patch1 -p1 -b .werror
%patch2 -p1 -b .efi
%patch4 -p1 -b .no_mp3
%patch5 -p1 -b .buffer_overflow
%patch6 -p1 -b .build-fix
%patch7 -p1 -b .manpagefix
%patch8 -p1 -b .rootstat
%patch9 -p1 -b .usalinst
%patch10 -p1 -b .readsegfault
%patch11 -p1 -b .format
%patch12 -p1 -b .handler
%patch13 -p1 -b .dvdman
%patch14 -p1 -b .paranoiacdda
%patch -P1 -p1 -b .werror
%patch -P2 -p1 -b .efi
%patch -P4 -p1 -b .no_mp3
%patch -P5 -p1 -b .buffer_overflow
%patch -P6 -p1 -b .build-fix
%patch -P7 -p1 -b .manpagefix
%patch -P8 -p1 -b .rootstat
%patch -P9 -p1 -b .usalinst
%patch -P10 -p1 -b .readsegfault
%patch -P11 -p1 -b .format
%patch -P12 -p1 -b .handler
%patch -P13 -p1 -b .dvdman
%patch -P14 -p1 -b .paranoiacdda
# not using -b since otherwise backup files would be included into rpm
%patch15 -p1
%patch16 -p1 -b .cmakewarn
%patch17 -p1 -b .edcspeed
%patch19 -p1 -b .elfheader
%patch20 -p1 -b .werror_gcc5
%patch21 -p1 -b .devname
%patch22 -p1 -b .sysmacros
%patch23 -p1 -b .namesize
%patch -P15 -p1
%patch -P16 -p1 -b .cmakewarn
%patch -P17 -p1 -b .edcspeed
%patch -P19 -p1 -b .elfheader
%patch -P20 -p1 -b .werror_gcc5
%patch -P21 -p1 -b .devname
%patch -P22 -p1 -b .sysmacros
%patch -P23 -p1 -b .gcc10
# we do not want bundled paranoia library
rm -rf libparanoia
@ -153,21 +137,18 @@ find doc -type f -print0 | xargs -0 chmod a-x
%build
mkdir fedora
cd fedora
export CFLAGS="$RPM_OPT_FLAGS -Wno-error=format-security -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
export FFLAGS="$CFLAGS"
%cmake CMAKE_VERBOSE=1 \
%cmake \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS:BOOL=ON \
..
-DBUILD_SHARED_LIBS:BOOL=ON
make VERBOSE=1 %{?_smp_mflags}
%cmake_build
%install
cd fedora
make install DESTDIR=$RPM_BUILD_ROOT
%cmake_install
perl -pi -e 's#^require v5.8.1;##g' $RPM_BUILD_ROOT%{_bindir}/dirsplit
ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkisofs
ln -s genisoimage $RPM_BUILD_ROOT%{_bindir}/mkhybrid
@ -175,10 +156,6 @@ ln -s icedax $RPM_BUILD_ROOT%{_bindir}/cdda2wav
ln -s wodim $RPM_BUILD_ROOT%{_bindir}/cdrecord
ln -s wodim $RPM_BUILD_ROOT%{_bindir}/dvdrecord
#do not include empty fedora/* directories in debuginfo package
cd ..
rm -rf fedora
# missing man page. Do symlink like in debian
ln -sf wodim.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/netscsid.1.gz
@ -195,7 +172,7 @@ if [ "$link" == "wodim" ]; then
rm -f %{_bindir}/dvdrecord
fi
%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
/usr/sbin/alternatives --install %{_bindir}/cdrecord cdrecord \
%{_bindir}/wodim 50 \
--slave %{_mandir}/man1/cdrecord.1.gz cdrecord-cdrecordman \
%{_mandir}/man1/wodim.1.gz \
@ -208,7 +185,7 @@ fi
%preun -n wodim
if [ $1 = 0 ]; then
%{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
/usr/sbin/alternatives --remove cdrecord %{_bindir}/wodim
fi
%post -n genisoimage
@ -217,7 +194,7 @@ if [ "$link" == "genisoimage" ]; then
rm -f %{_bindir}/mkisofs
fi
%{_sbindir}/alternatives --install %{_bindir}/mkisofs mkisofs \
/usr/sbin/alternatives --install %{_bindir}/mkisofs mkisofs \
%{_bindir}/genisoimage 50 \
--slave %{_mandir}/man1/mkisofs.1.gz mkisofs-mkisofsman \
%{_mandir}/man1/genisoimage.1.gz \
@ -227,7 +204,7 @@ fi
%preun -n genisoimage
if [ $1 = 0 ]; then
%{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
/usr/sbin/alternatives --remove mkisofs %{_bindir}/genisoimage
fi
%post -n icedax
@ -235,22 +212,21 @@ link=`readlink %{_bindir}/cdda2wav`
if [ "$link" == "icedax" ]; then
rm -f %{_bindir}/cdda2wav
fi
%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
/usr/sbin/alternatives --install %{_bindir}/cdda2wav cdda2wav \
%{_bindir}/icedax 50 \
--slave %{_mandir}/man1/cdda2wav.1.gz cdda2wav-cdda2wavman \
%{_mandir}/man1/icedax.1.gz
%preun -n icedax
if [ $1 = 0 ]; then
%{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
/usr/sbin/alternatives --remove cdda2wav %{_bindir}/icedax
fi
%post -n libusal -p /sbin/ldconfig
%postun -n libusal -p /sbin/ldconfig
%ldconfig_scriptlets -n libusal
%files -n wodim
%doc Changelog COPYING FAQ FORK START
%license COPYING
%doc Changelog FAQ FORK START
%doc doc/READMEs doc/wodim
%{_bindir}/devdump
%{_bindir}/wodim
@ -264,7 +240,8 @@ fi
%{_mandir}/man1/readom.*
%files -n icedax
%doc doc/icedax COPYING
%license COPYING
%doc doc/icedax
%{_bindir}/icedax
%ghost %{_bindir}/cdda2wav
%{_bindir}/cdda2ogg
@ -273,7 +250,8 @@ fi
%{_mandir}/man1/list_audio_tracks.*
%files -n genisoimage
%doc doc/genisoimage COPYING
%license COPYING
%doc doc/genisoimage
%{_bindir}/genisoimage
%ghost %{_bindir}/mkisofs
%ghost %{_bindir}/mkhybrid
@ -293,24 +271,83 @@ fi
%{_mandir}/man1/readmult.*
%files -n dirsplit
%license COPYING
%{_bindir}/dirsplit
%{_mandir}/man1/dirsplit.*
%files -n libusal
%doc doc/plattforms/README.linux Changelog COPYING FAQ FORK START
%license COPYING
%doc doc/plattforms/README.linux Changelog FAQ FORK START
%{_libdir}/libusal.so.*
%{_libdir}/librols.so.*
%files -n libusal-devel
%doc COPYING
%license COPYING
%{_libdir}/libusal.so
%{_libdir}/librols.so
%{_includedir}/usal
%changelog
* Thu Aug 02 2018 Jakub Martisko <jamartis@redhat.com> - 1.1.11-39
- Fix buffer overflow erro in isoinfo caused by long names
- Resolves: 1533004
* Wed Jan 01 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 1.1.11-57
- Rebuilt for MSVSphere 10
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1.11-57
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-56
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.1.11-55
- Fix alternatives usage
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-54
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-53
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-49
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-46
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Feb 24 2020 Than Ngo <than@redhat.com> - 1.1.11-44
- Fixed FTBFS
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 4 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.11-39
- Spec cleanup and modernise, use %%license
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.11-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save