rpms/rpm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- with the fd leak gone, let libmagic look into compressed files again

Browse Source 
(#491596)
This commit is contained in:
Panu Matilainen 2009-03-23 15:31:44 +00:00
parent 2a17871053
commit ba1a13e0a4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-4.7.0-extra-provides.patch
View File

@ -54,7 +54,7 @@ diff -up rpm-4.7.0-beta1/build/rpmfc.c.extra-prov rpm-4.7.0-beta1/build/rpmfc.c
int fcolor; int fcolor;
int xx; int xx;
- int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ - int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */
+ int msflags = MAGIC_CHECK; /* add MAGIC_COMPRESS eventually */ + int msflags = MAGIC_CHECK | MAGIC_COMPRESS;
magic_t ms = NULL; magic_t ms = NULL;
if (fc == NULL || argv == NULL) if (fc == NULL || argv == NULL)

5
rpm.spec
View File

@ -25,7 +25,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: 0.%{snapver}.5%{?dist} Release: 0.%{snapver}.6%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@ -400,6 +400,9 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Mon Mar 23 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.beta1.6
- with the fd leak gone, let libmagic look into compressed files again (#491596)
* Mon Mar 23 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.beta1.5 * Mon Mar 23 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.beta1.5
- fix font provide generation on filenames with whitespace (#491510) - fix font provide generation on filenames with whitespace (#491510)