Compare commits
No commits in common. "c8" and "befbfce7808eb7745d225ad6a105c75da0ec51e8" have entirely different histories.
c8
...
befbfce780
@ -1 +1 @@
|
|||||||
4d11e37c84a41b43ca9caeff05844fe1fde6a872 SOURCES/gcab-1.1.tar.xz
|
a7d88dc6da46ade0d4e4bb70e7350690692283a1 gcab-1.4.tar.xz
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/gcab-1.1.tar.xz
|
/gcab-*.tar.xz
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
From 3365b4bd58dd7f13e786caf3c7234cf8116263d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||||
|
Date: Wed, 25 Jul 2018 12:45:24 +0200
|
||||||
|
Subject: [PATCH] gcab: Fix regression from commit a15d91073fd5d6be25
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Apparently, rewinding should reset the CDATA state.
|
||||||
|
|
||||||
|
See also:
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1608301
|
||||||
|
|
||||||
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
---
|
||||||
|
libgcab/gcab-folder.c | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libgcab/gcab-folder.c b/libgcab/gcab-folder.c
|
||||||
|
index 1b09fa3..c0d6600 100644
|
||||||
|
--- a/libgcab/gcab-folder.c
|
||||||
|
+++ b/libgcab/gcab-folder.c
|
||||||
|
@@ -423,6 +423,7 @@ gcab_folder_extract (GCabFolder *self,
|
||||||
|
g_autoptr(GSList) files = NULL;
|
||||||
|
g_autoptr(cdata_t) cdata = g_new0 (cdata_t, 1);
|
||||||
|
guint32 nubytes = 0;
|
||||||
|
+ guint8 *reserved;
|
||||||
|
|
||||||
|
/* never loaded from a stream */
|
||||||
|
g_assert (self->cfolder != NULL);
|
||||||
|
@@ -433,7 +434,7 @@ gcab_folder_extract (GCabFolder *self,
|
||||||
|
files = g_slist_sort (g_slist_copy (self->files), (GCompareFunc)sort_by_offset);
|
||||||
|
|
||||||
|
/* this is allocated for every block, but currently unused */
|
||||||
|
- cdata->reserved = g_malloc (res_data);
|
||||||
|
+ cdata->reserved = reserved = g_malloc (res_data);
|
||||||
|
|
||||||
|
for (f = files; f != NULL; f = f->next) {
|
||||||
|
GCabFile *file = f->data;
|
||||||
|
@@ -454,6 +455,8 @@ gcab_folder_extract (GCabFolder *self,
|
||||||
|
if (!g_seekable_seek (G_SEEKABLE (data), self->cfolder->offsetdata,
|
||||||
|
G_SEEK_SET, cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
+ bzero(cdata, sizeof(cdata_t));
|
||||||
|
+ cdata->reserved = reserved;
|
||||||
|
nubytes = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.18.0.321.gffc6fa0e39
|
||||||
|
|
52
0002-Revert-decomp-fix-gcc-warning-strict-overflow.patch
Normal file
52
0002-Revert-decomp-fix-gcc-warning-strict-overflow.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 5619f4cd2ca3108c8dea17ba656b5ce44a60ca29 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||||
|
Date: Fri, 11 Jan 2019 19:42:40 +0400
|
||||||
|
Subject: [PATCH] Revert "decomp: fix gcc warning strict-overflow"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
The warning doesn't happen with current build-sys.
|
||||||
|
|
||||||
|
The overlapping behaviour is undefined with memcpy. memmove doesn't
|
||||||
|
have the same semantic either than the loop. Let's revert!
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
https://gitlab.gnome.org/GNOME/gcab/issues/12
|
||||||
|
|
||||||
|
This reverts commit e48074952743f53d8ac529d4debc421e7e0f6937.
|
||||||
|
|
||||||
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||||
|
---
|
||||||
|
libgcab/decomp.c | 8 ++------
|
||||||
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libgcab/decomp.c b/libgcab/decomp.c
|
||||||
|
index 64d97f8..0c2b184 100644
|
||||||
|
--- a/libgcab/decomp.c
|
||||||
|
+++ b/libgcab/decomp.c
|
||||||
|
@@ -1015,9 +1015,7 @@ int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) {
|
||||||
|
window_posn += match_length;
|
||||||
|
|
||||||
|
/* copy match data - no worries about destination wraps */
|
||||||
|
- memcpy(rundest, runsrc, match_length);
|
||||||
|
- rundest += match_length;
|
||||||
|
- runsrc += match_length;
|
||||||
|
+ while (match_length-- > 0) *rundest++ = *runsrc++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -1106,9 +1104,7 @@ int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) {
|
||||||
|
window_posn += match_length;
|
||||||
|
|
||||||
|
/* copy match data - no worries about destination wraps */
|
||||||
|
- memcpy(rundest, runsrc, match_length);
|
||||||
|
- rundest += match_length;
|
||||||
|
- runsrc += match_length;
|
||||||
|
+ while (match_length-- > 0) *rundest++ = *runsrc++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
--
|
||||||
|
2.20.1.98.gecbdaf0899
|
||||||
|
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
@ -1,6 +1,6 @@
|
|||||||
Name: gcab
|
Name: gcab
|
||||||
Version: 1.1
|
Version: 1.4
|
||||||
Release: 1%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Cabinet file library and tool
|
Summary: Cabinet file library and tool
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -8,9 +8,10 @@ License: LGPLv2+
|
|||||||
URL: http://ftp.gnome.org/pub/GNOME/sources/gcab
|
URL: http://ftp.gnome.org/pub/GNOME/sources/gcab
|
||||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/gcab/%{version}/%{name}-%{version}.tar.xz
|
Source0: http://ftp.gnome.org/pub/GNOME/sources/gcab/%{version}/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
BuildRequires: git-core
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
BuildRequires: vala-tools
|
BuildRequires: vala
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
@ -40,7 +41,7 @@ libgcab is a library to manipulate Cabinet archive.
|
|||||||
Libraries, includes, etc. to compile with the gcab library.
|
Libraries, includes, etc. to compile with the gcab library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -S git_am
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson
|
%meson
|
||||||
@ -76,6 +77,46 @@ Libraries, includes, etc. to compile with the gcab library.
|
|||||||
%{_libdir}/pkgconfig/libgcab-1.0.pc
|
%{_libdir}/pkgconfig/libgcab-1.0.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-6
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-5
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 06 2020 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.4-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Tue Oct 08 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.3-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 1.1-6
|
||||||
|
- Update BRs for vala packaging changes
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 11 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.1-4
|
||||||
|
- Fix LZX decompression corruption regression.
|
||||||
|
|
||||||
|
* Thu Aug 2 2018 Marc-André Lureau <marcandre.lureau@redhat.com> - 1.1-3
|
||||||
|
- fix 'rewind' regression rhbz#1608301
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Feb 09 2018 Richard Hughes <richard@hughsie.com> - 1.1-1
|
* Fri Feb 09 2018 Richard Hughes <richard@hughsie.com> - 1.1-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
- Add git version in --version
|
- Add git version in --version
|
Loading…
Reference in New Issue
Block a user