diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rwxr-xr-x | expat/autogen.sh | 4 | ||||
| -rwxr-xr-x | file/autogen.sh | 4 | ||||
| -rw-r--r-- | lib/fsm.c | 5 | ||||
| -rw-r--r-- | rpm.spec.in | 13 |
6 files changed, 23 insertions, 9 deletions
@@ -13,6 +13,8 @@ - use -fPIC -DPIC on all platforms, not just mandatory (#112713). - python: return None for NEVRAO, [] for everything else. - python: throw exception on bad arg to labelCompare (#113661). + - re-add --enable-posixmutexes to build. + - fix: set fcontext from pkg when file_contexts doesn't exist (#114040). 4.2.1 -> 4.2.2: - unify signal handling in librpmio, use condvar to deliver signal. diff --git a/autogen.sh b/autogen.sh index 669e3f53f..ec524ac31 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,12 +3,12 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.5" +LTV="libtoolize (GNU libtool) 1.5.2" ACV="autoconf (GNU Autoconf) 2.59" AMV="automake (GNU automake) 1.8.2" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.5 + libtool-1.5.2 autoconf-2.59 automake-1.8.2 Simply edit this script to change the libtool/autoconf/automake versions diff --git a/expat/autogen.sh b/expat/autogen.sh index c82ddf228..5d587d309 100755 --- a/expat/autogen.sh +++ b/expat/autogen.sh @@ -3,12 +3,12 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.5" +LTV="libtoolize (GNU libtool) 1.5.2" ACV="autoconf (GNU Autoconf) 2.59" AMV="automake (GNU automake) 1.8.2" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.5 + libtool-1.5.2 autoconf-2.59 automake-1.8.2 Simply edit this script to change the libtool/autoconf/automake versions diff --git a/file/autogen.sh b/file/autogen.sh index c82ddf228..5d587d309 100755 --- a/file/autogen.sh +++ b/file/autogen.sh @@ -3,12 +3,12 @@ export CFLAGS export LDFLAGS -LTV="libtoolize (GNU libtool) 1.5" +LTV="libtoolize (GNU libtool) 1.5.2" ACV="autoconf (GNU Autoconf) 2.59" AMV="automake (GNU automake) 1.8.2" USAGE=" This script documents the versions of the tools I'm using to build rpm: - libtool-1.5 + libtool-1.5.2 autoconf-2.59 automake-1.8.2 Simply edit this script to change the libtool/autoconf/automake versions @@ -641,8 +641,11 @@ static int fsmMapFContext(FSM_t fsm) fsm->fcontext = rpmsxFContext(sx, fsm->path, st->st_mode); sx = rpmsxFree(sx); } else { + int i = fsm->ix; + /* Get file security context from package. */ - fsm->fcontext = rpmfiFContext(fi); + if (fi && i >= 0 && i < fi->fc) + fsm->fcontext = (fi->fcontexts ? fi->fcontexts[i] : NULL); } } return 0; diff --git a/rpm.spec.in b/rpm.spec.in index a1a459f33..4a0e76d35 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -134,7 +134,7 @@ CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS ./configure --prefix=%{__prefix} --sysconfdir=/etc \ --localstatedir=/var --infodir='${prefix}%{__share}/info' \ --mandir='${prefix}%{__share}/man' \ - $WITH_PYTHON --without-javaglue + $WITH_PYTHON --enable-posixmutexes --without-javaglue %else CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} $WITH_PYTHON \ --without-javaglue @@ -482,7 +482,16 @@ exit 0 %{__includedir}/popt.h %changelog -* Mon Jan 19 2004 Jeff Johnson <jbj@jbj.org> 4.2-0.8 +* Sun Feb 15 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.11 +- fix: set fcontext from pkg when file_contexts doesn't exist (#114040). + +* Wed Feb 11 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.10 +- re-add --enable-posixmutexes to build. + +* Mon Jan 19 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.9 +- python: return None for NEVRAO, [] for everything else. + +* Mon Jan 19 2004 Jeff Johnson <jbj@jbj.org> 4.3-0.8 - python: return None for NEVRAO, [] for everything else. * Mon Jan 12 2004 Jeff Johnson <jbj@redhat.com> 4.3-0.7 |