testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

delete fix-fd-leak patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=246
This commit is contained in:
Michael Schröder 2013-01-09 16:05:18 +00:00 committed by Git OBS Bridge
parent 0a1fcefb6d
commit a8f8f052cb
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fix-fd-leak.diff
View File

@ -1,18 +0,0 @@
Summary: Do not leak file descriptors
Author: Stephan Kulow <coolo@suse.de>
There is nothing closing the file, the notify callback tries to,
but gets passed a 0 pointer, so this is the easiest solution.
Michael contacts upstream to find out what the real solution is
--- lib/rpmte.c
+++ lib/rpmte.c
@@ -717,6 +717,8 @@ static int rpmteClose(rpmte te, int rese
case TR_ADDED:
if (te->fd) {
rpmtsNotify(te->ts, te, RPMCALLBACK_INST_CLOSE_FILE, 0, 0);
+ if (te->fd) /* not yet closed */
+ Fclose(te->fd);
te->fd = NULL;
}
break;

5
rpm.spec
View File

@ -66,7 +66,6 @@ Patch2: db.diff
Patch10: rpm-beecrypt.diff Patch10: rpm-beecrypt.diff
Patch11: debugedit.diff Patch11: debugedit.diff
Patch12: localetag.diff Patch12: localetag.diff
Patch13: fix-fd-leak.diff
Patch14: nameversioncompare.diff Patch14: nameversioncompare.diff
Patch15: dbfsync.diff Patch15: dbfsync.diff
Patch16: dbrointerruptable.diff Patch16: dbrointerruptable.diff
@ -149,7 +148,6 @@ all installed packages. RPM also supports database queries.
%package devel %package devel
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
Group: System/Packages
Requires: rpm = %{version} Requires: rpm = %{version}
# for people confusing the one with the other # for people confusing the one with the other
Recommends: rpm-build = %{version} Recommends: rpm-build = %{version}
@ -164,7 +162,6 @@ need an intimate knowledge of RPM packages in order to function.
%package build %package build
Summary: Tools and Scripts to create rpm packages Summary: Tools and Scripts to create rpm packages
Group: System/Packages
Requires: rpm = %{version} Requires: rpm = %{version}
Provides: rpm:%_bindir/rpmbuild Provides: rpm:%_bindir/rpmbuild
Provides: rpmbuild Provides: rpmbuild
@ -212,7 +209,7 @@ chmod -R u+w db/*
# will get linked from db3 # will get linked from db3
rm -f rpmdb/db.h rm -f rpmdb/db.h
%patch -P 1 -P 2 %patch -P 1 -P 2
%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 10 -P 11 -P 12 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49