pool/gcab
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 385365 from GNOME:Apps

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/385365
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gcab?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2016-04-12 16:57:12 +00:00 committed by Git OBS Bridge
commit 35bcf55f40
5 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcab-0.6.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb
size 316668

3
gcab-0.7.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a16e5ef88f1c547c6c8c05962f684ec127e078d302549f3dfd2291e167d4adef
size 332248

32
gcab-checksum.patch
View File

@ -1,32 +0,0 @@
Index: gcab-0.5/libgcab/cabinet.c
===================================================================
--- gcab-0.5.orig/libgcab/cabinet.c
+++ gcab-0.5/libgcab/cabinet.c
@@ -403,7 +403,12 @@ cdata_write (cdata_t *cd, GDataOutputStr
return FALSE;
CHECKSUM datacsum = compute_checksum(cd->in, cd->ncbytes, 0);
- cd->checksum = compute_checksum ((guint8*)&cd->ncbytes, 4, datacsum);
+ guint8 tmp[4];
+ tmp[0] = cd->ncbytes & 0xff;
+ tmp[1] = (cd->ncbytes >> 8) & 0xff;
+ tmp[2] = cd->nubytes & 0xff;
+ tmp[3] = (cd->nubytes >> 8) & 0xff;
+ cd->checksum = compute_checksum (tmp, 4, datacsum);
GOutputStream *stream = g_filter_output_stream_get_base_stream (G_FILTER_OUTPUT_STREAM (out));
*bytes_written = 0;
@@ -462,7 +467,12 @@ cdata_read (cdata_t *cd, u1 res_data, gi
RN (buf, cd->ncbytes);
datacsum = compute_checksum(buf, cd->ncbytes, 0);
- g_return_val_if_fail (cd->checksum == compute_checksum ((guint8*)&cd->ncbytes, 4, datacsum), FALSE);
+ guint8 tmp[4];
+ tmp[0] = cd->ncbytes & 0xff;
+ tmp[1] = (cd->ncbytes >> 8) & 0xff;
+ tmp[2] = cd->nubytes & 0xff;
+ tmp[3] = (cd->nubytes >> 8) & 0xff;
+ g_return_val_if_fail (cd->checksum == compute_checksum (tmp, 4, datacsum), FALSE);
if (g_getenv ("GCAB_DEBUG")) {
g_debug ("CDATA");

14
gcab.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sat Mar 12 16:10:10 UTC 2016 - zaitor@opensuse.org
- Update to version 0.7:
+ Learn to rewind if needed during extraction (bgo#763377).
+ Fix extraction of files without cdata (bgo#763376).
+ Do not abort with a critical warning if a file has an incorrect
checksum.
+ Set utf8 flag automatically (bgo#754091).
+ Fix wrong modification date (bgo#753040).
+ Build warning fixes.
+ Updated translations.
- Drop gcab-checksum.patch: Fixed in a different way upstream.
-------------------------------------------------------------------
Mon Mar 30 15:16:56 UTC 2015 - dimstar@opensuse.org

9
gcab.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gcab
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,13 @@
Name: gcab
Version: 0.6
Version: 0.7
Release: 0
Summary: Cabinet file library and tool
License: LGPL-2.1+
Group: Productivity/Archiving/Compression
Url: http://ftp.gnome.org/pub/GNOME/sources/gcab
Source: http://ftp.acc.umu.se/pub/GNOME/sources/gcab/%{version}/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gcab-checksum.patch bgo#746580 schwab@linux-m68k.org -- Fix checksum computation
Patch: gcab-checksum.patch
Source: http://download.gnome.org/sources/gcab/0.7/%{name}-%{version}.tar.xz
BuildRequires: gobject-introspection >= 0.9.4
BuildRequires: intltool >= 0.40.0
BuildRequires: vala >= 0.14
@ -68,7 +66,6 @@ This package provides development files to build code against libgcab
%lang_package
%prep
%setup -q
%patch -p1
%build
%configure \