Compare commits
20 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
574bd0e90b | ||
|
|
a416a64004 | ||
|
|
2be9544835 | ||
|
|
e3bffcd366 | ||
|
|
321c2680b6 | ||
|
|
976984775b | ||
|
|
f2ec6094c4 | ||
|
|
cd8018c869 | ||
|
|
81a2ae0f9d | ||
|
|
2b8efbe721 | ||
|
|
ec96dbabc3 | ||
|
|
b403332b43 | ||
|
|
6349eb7639 | ||
|
|
93ef69f355 | ||
|
|
887f483ef0 | ||
|
|
8cad18080d | ||
|
|
36801ad640 | ||
|
|
140de6af99 | ||
|
|
5c9216cb73 | ||
|
|
722d8cc838 |
4 changed files with 149 additions and 4 deletions
36
xbiso-c23.patch
Normal file
36
xbiso-c23.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
diff -up xbiso-0.6.1/xbiso.c.c23 xbiso-0.6.1/xbiso.c
|
||||
--- xbiso-0.6.1/xbiso.c.c23 2025-02-24 16:53:04.512018181 -0500
|
||||
+++ xbiso-0.6.1/xbiso.c 2025-02-24 16:56:34.622066472 -0500
|
||||
@@ -116,8 +116,8 @@ int main(int argc, char *argv[]) {
|
||||
xbfseek = fseeko;
|
||||
xbftell = ftello;
|
||||
#else
|
||||
- int (*xbfseek)();
|
||||
- OFFT (*xbftell)();
|
||||
+ int (*xbfseek)(FILE *, __off64_t, int);
|
||||
+ OFFT (*xbftell)(FILE *);
|
||||
xbfseek = fseeko64;
|
||||
xbftell = ftello64;
|
||||
#endif
|
||||
@@ -285,8 +285,8 @@ handlefile(OFFT offset, int dtable) {
|
||||
xbfseek = fseeko;
|
||||
xbftell = ftello;
|
||||
#else
|
||||
- int (*xbfseek)();
|
||||
- OFFT (*xbftell)();
|
||||
+ int (*xbfseek)(FILE *, __off64_t, int);
|
||||
+ OFFT (*xbftell)(FILE *);
|
||||
xbfseek = fseeko64;
|
||||
xbftell = ftello64;
|
||||
#endif
|
||||
@@ -455,8 +455,8 @@ void extract(TABLE *dirent) {
|
||||
xbfseek = fseeko;
|
||||
xbftell = ftello;
|
||||
#else
|
||||
- int (*xbfseek)();
|
||||
- off64_t (*xbftell)();
|
||||
+ int (*xbfseek)(FILE *, __off64_t, int);
|
||||
+ off64_t (*xbftell)(FILE *);
|
||||
xbfseek = fseeko64;
|
||||
xbftell = ftello64;
|
||||
|
||||
26
xbiso-c99.patch
Normal file
26
xbiso-c99.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
Add prototype for handlefile, so that it is possible to call it before it
|
||||
is defined. Future compilers are likely not to accept implicit function
|
||||
declarations by default.
|
||||
|
||||
Submitted upstream: <https://sourceforge.net/p/xbiso/patches/3/>
|
||||
|
||||
diff --git a/xbiso.c b/xbiso.c
|
||||
index 6372944f7ec91120..c472c040d96e48a9 100644
|
||||
--- a/xbiso.c
|
||||
+++ b/xbiso.c
|
||||
@@ -93,6 +93,7 @@ typedef off_t OFFT;
|
||||
typedef off64_t OFFT;
|
||||
#endif
|
||||
|
||||
+int handlefile(OFFT offset, int dtable);
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
char *dbuf,*fname;
|
||||
@@ -269,6 +270,7 @@ int main(int argc, char *argv[]) {
|
||||
exit(0);
|
||||
}
|
||||
|
||||
+int
|
||||
handlefile(OFFT offset, int dtable) {
|
||||
TABLE dirent;
|
||||
|
||||
21
xbiso-configure-c99.patch
Normal file
21
xbiso-configure-c99.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
Fix historic autoconf C99 incompatibility: avoid calling the undeclared
|
||||
exit function.
|
||||
|
||||
No need to upstream this because the issue goes away once autoconf
|
||||
is re-run.
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 93c5b8f92f3aefb4..7b0bfc3085462591 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2389,8 +2389,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
70
xbiso.spec
70
xbiso.spec
|
|
@ -1,12 +1,17 @@
|
|||
Name: xbiso
|
||||
Version: 0.6.1
|
||||
Release: 21%{?dist}
|
||||
Release: 39%{?dist}
|
||||
Summary: ISO extraction utility for xdvdfs images
|
||||
License: GPLv2+
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://sourceforge.net/projects/xbiso/
|
||||
Source0: http://downloads.sourceforge.net/xbiso/%{name}-%{version}.tar.gz
|
||||
Patch0: xbiso-0.6.1-destdir.patch
|
||||
Patch1: xbiso-0.6.1-ftplib4.patch
|
||||
Patch2: xbiso-configure-c99.patch
|
||||
Patch3: xbiso-c99.patch
|
||||
Patch4: xbiso-c23.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: ftplib-devel
|
||||
|
||||
|
|
@ -15,8 +20,11 @@ xbiso is an ISO extraction utility for xdvdfs images.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1 -b .ftplib4
|
||||
%patch -P0 -p1
|
||||
%patch -P1 -p1 -b .ftplib4
|
||||
%patch -P2 -p1
|
||||
%patch -P3 -p1
|
||||
%patch -P4 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -33,6 +41,60 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
|||
%{_bindir}/xbiso
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-38
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Feb 24 2025 Tom Callaway <spot@fedoraproject.org> - 0.6.1-36
|
||||
- fix empty function declarations to fix compile against C23 (gcc15)
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-35
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.6.1-34
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Dec 12 2022 Florian Weimer <fweimer@redhat.com> - 0.6.1-29
|
||||
- Port to C99
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue