- update to 4.9.1.1

This commit is contained in:
Panu Matilainen 2011-08-02 13:37:01 +03:00
parent c81abc1f8e
commit 541e4803c3
4 changed files with 7 additions and 50 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ rpm-4.8.1.tar.bz2
/rpm-4.9.0-rc1.tar.bz2
/rpm-4.9.0.tar.bz2
/rpm-4.9.1.tar.bz2
/rpm-4.9.1.1.tar.bz2

View File

@ -1,43 +0,0 @@
commit 27c56c58209ee7c890f34429e030bfdb39105084
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Mon Jun 27 12:41:39 2011 +0300
Remove ugly isDir recurse prevention hack on build
- We know if we're already fts-walking by the way addFile() gets called,
dont corrupt fl->isDir for no good reason.
(cherry picked from commit aedbf1d63f94cee312b283503c8deb1ede1895a1)
diff --git a/build/files.c b/build/files.c
index b4b893a..edba92a 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1394,8 +1394,8 @@ static rpmRC addFile(FileList fl, const char * diskPath,
}
}
- if ((! fl->isDir) && S_ISDIR(statp->st_mode)) {
-/* FIX: fl->buildRoot may be NULL */
+ /* Don't recurse into explicit %dir, don't double-recurse from fts */
+ if ((fl->isDir != 1) && (statp == &statbuf) && S_ISDIR(statp->st_mode)) {
return recurseDir(fl, diskPath);
}
@@ -1529,8 +1529,6 @@ static rpmRC recurseDir(FileList fl, const char * diskPath)
int myFtsOpts = (FTS_COMFOLLOW | FTS_NOCHDIR | FTS_PHYSICAL);
rpmRC rc = RPMRC_FAIL;
- fl->isDir = 1; /* Keep it from following myftw() again */
-
ftsSet[0] = (char *) diskPath;
ftsSet[1] = NULL;
ftsp = Fts_open(ftsSet, myFtsOpts, NULL);
@@ -1563,8 +1561,6 @@ static rpmRC recurseDir(FileList fl, const char * diskPath)
}
(void) Fts_close(ftsp);
- fl->isDir = 0;
-
return rc;
}

View File

@ -11,7 +11,7 @@
%define rpmhome /usr/lib/rpm
%define rpmver 4.9.1
%define rpmver 4.9.1.1
%define srcver %{rpmver}%{?snapver:-%{snapver}}
%define bdbname db4
@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}2%{?dist}
Release: %{?snapver:0.%{snapver}.}1%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@ -40,7 +40,6 @@ Patch3: rpm-4.8.0-no-man-dirs.patch
Patch4: rpm-4.8.1-use-gpg2.patch
# Patches already in upstream
Patch200: rpm-4.9.1-recurse-dir.patch
# These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch
@ -208,8 +207,6 @@ packages on a system.
%patch3 -p1 -b .no-man-dirs
%patch4 -p1 -b .use-gpg2
%patch200 -p1 -b .recurse-dir
%patch301 -p1 -b .niagara
%patch302 -p1 -b .geode
%patch303 -p1 -b .debuginfo-allnames
@ -426,6 +423,9 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
* Tue Aug 02 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.1-1
- update to 4.9.1.1
* Tue Jul 19 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1-2
- fix recursion of directories with trailing slash in file list (#722474)

View File

@ -1,2 +1 @@
9fb2bf03c697d719a9bfc72aafb723b9 rpm-4.9.0.tar.bz2
6d1eb8fbdb1cd11ab90420998c096a72 rpm-4.9.1.tar.bz2
529df3e2705d851e26a9d88d5bd2ddd3 rpm-4.9.1.1.tar.bz2