pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to rpm-4.12.0.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=343
This commit is contained in:
Michael Schröder 2014-09-18 13:50:29 +00:00 committed by Git OBS Bridge
parent 1468c16952
commit df9abe086b
7 changed files with 9 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
archivesize.diff
View File

@ -1,50 +0,0 @@
Fix archive size tag missing cpio trailer size (RhBug:1142949)
- Fixes regression from commit 7f84a126ab43f2d0163911100b4432364d0952a6
which causes archive size to be determined before closing the archive
when closing actually writes the cpio trailer into the archive. Thus
RPMTAG_ARCHIVESIZE (and RPMTAG_LONGARCHIVESIZE) are off by the
cpio trailer size in all packages built with rpm 4.12.0 and
pre-releases :(
- Move rpmcpioFree() to rpmfiFree() to allow Tell() on the archive
after closing it, swap to original order of things on build-side.
index cfb24ef..28834dc 100644
--- build/pack.c
+++ build/pack.c
@@ -55,13 +55,13 @@ static int rpmPackageFilesArchive(rpmfiles fi, int isSrc,
if (rc == RPMERR_ITER_END)
rc = 0;
- if (archiveSize)
- *archiveSize = (rc == 0) ? rpmfiArchiveTell(archive) : 0;
-
/* Finish the payload stream */
if (!rc)
rc = rpmfiArchiveClose(archive);
+ if (archiveSize)
+ *archiveSize = (rc == 0) ? rpmfiArchiveTell(archive) : 0;
+
rpmfiFree(archive);
return rc;
index 49fc2c4..384a6c9 100644
--- lib/rpmfi.c
+++ lib/rpmfi.c
@@ -1199,6 +1199,7 @@ rpmfi rpmfiFree(rpmfi fi)
fi->fn = _free(fi->fn);
fi->ofn = _free(fi->ofn);
fi->found = _free(fi->found);
+ fi->archive = rpmcpioFree(fi->archive);
free(fi);
return NULL;
@@ -1734,7 +1735,6 @@ int rpmfiArchiveClose(rpmfi fi)
if (fi == NULL)
return -1;
int rc = rpmcpioClose(fi->archive);
- fi->archive = rpmcpioFree(fi->archive);
return rc;
}

2
python3-rpm.spec
View File

@ -17,7 +17,7 @@
Name: python3-rpm
Version: 4.12.0
Version: 4.12.0.1
Release: 0
Summary: Python Bindings for Manipulating RPM Packages
License: GPL-2.0+

3
rpm-4.12.0.1.tar.bz2 Normal file
View File

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

3
rpm-4.12.0.tar.bz2
View File

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

2
rpm-python.spec
View File

@ -17,7 +17,7 @@
Name: rpm-python
Version: 4.12.0
Version: 4.12.0.1
Release: 0
#!BuildIgnore: rpmlint-Factory
Summary: Python Bindings for Manipulating RPM Packages

4
rpm.changes
View File

@ -1,8 +1,8 @@
-------------------------------------------------------------------
Thu Sep 18 13:40:43 CEST 2014 - mls@suse.de
- cherry-pick archivesize fix from upstream
new patch: archivesize.diff
- update to rpm-4.12.0.1
* fixes archivesize being off a couple of bytes
-------------------------------------------------------------------
Tue Sep 16 13:55:09 CEST 2014 - mls@suse.de

5
rpm.spec
View File

@ -47,7 +47,7 @@ PreReq: %fillup_prereq
Summary: The RPM Package Manager
License: GPL-2.0+
Group: System/Packages
Version: 4.12.0
Version: 4.12.0.1
Release: 0
Source: http://rpm.org/releases/rpm-4.12.x/rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
@ -128,7 +128,6 @@ Patch85: brp-compress-no-img.patch
Patch92: find-lang-python.patch
Patch93: weakdepscompat.diff
Patch94: checksepwarn.diff
Patch95: archivesize.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@ -216,7 +215,7 @@ rm -f rpmdb/db.h
%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 85
%patch -P 92 -P 93 -P 94 -P 95
%patch -P 92 -P 93 -P 94
%ifarch aarch64 ppc64le
%patch6464