- disable fcntl(2) lock on Packages until glibc+nptl is fixed.

- make cdb locks "private" for pthreads compatibility w/o NPTL.
- add --enable-posixmutexes to use NPTL.
- make dependency generation "opt-out" everywhere.

CVS patchset: 5943
CVS date: 2002/12/15 18:30:44

diff --git a/CHANGES b/CHANGES
index 4ce34bb..7daa88a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -49,6 +49,10 @@
        - make dependency generation "opt-in" in order to build in distro.
        - fix: make sure each library has DT_NEEDED for all unresolved syms.
        - generate Elf provides even if file is not executable.
+       - disable fcntl(2) lock on Packages until glibc+nptl is fixed.
+       - make cdb locks "private" for pthreads compatibility w/o NPTL.
+       - add --enable-posixmutexes to use NPTL.
+       - make dependency generation "opt-out" everywhere.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/db3/configure b/db3/configure
index 3c2f6f8..5f287fc 100755 (executable)
--- a/db3/configure
+++ b/db3/configure
@@ -8,7 +8,7 @@ rm -f config.cache
 ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`"
 
 CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
-       --enable-shared --enable-static --enable-rpc \
+       --enable-shared --enable-static --enable-rpc --enable-posixmutexes \
        --with-uniquename=_rpmdb --srcdir=$db_dist
 
 mv Makefile Makefile.orig

diff --git a/macros.in b/macros.in
index 2c2d4c4..7f16bd8 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.131 2002/12/13 23:34:40 jbj Exp $
+# $Id: macros.in,v 1.132 2002/12/15 18:30:45 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -319,8 +319,8 @@ package or when debugging this package.\
 %_missing_doc_files_terminate_build    1
 
 #
-# Use internal dependency generator rather than external helpers.
-%_use_internal_dependency_generator    0
+# Use internal dependency generator rather than external helpers?
+%_use_internal_dependency_generator    1
 
 #
 # Path to scripts to autogenerate package dependencies,
@@ -445,7 +445,8 @@ package or when debugging this package.\
 #                              mp_mmapsize=8Mb mp_size=512Kb
 
 # Use a CDB database model for concurrent access.
-%__dbi_cdb                     create cdb mpool mp_mmapsize=16Mb mp_size=1Mb
+# XXX "private" cdb locks for legacy interoperation transiting to glibc+nptl
+%__dbi_cdb                     create private cdb mpool mp_mmapsize=16Mb mp_size=1Mb
 
 %__dbi_other                   %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}
 
@@ -490,7 +491,9 @@ package or when debugging this package.\
 %_dbi_tags     Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys
 
 # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
-%_dbi_config_Packages          %{_dbi_htconfig} lockdbfd
+# XXX disable legacy fcntl lock until glibc+nptl fixes fcntl
+#%_dbi_config_Packages         %{_dbi_htconfig} lockdbfd
+%_dbi_config_Packages          %{_dbi_htconfig}
 
 # "Depends" is a per-transaction cache of known dependency resolutions.
 %_dbi_config_Depends           %{_dbi_htconfig} temporary private

diff --git a/rpm.spec.in b/rpm.spec.in
index c34421c..a26d05b 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.25
+Release: 0.26+nptl
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -460,6 +460,12 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Sun Dec 15 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.26
+- disable fcntl(2) lock on Packages until glibc+nptl is fixed.
+- make cdb locks "private" for pthreads compatibility w/o NPTL.
+- add --enable-posixmutexes to use NPTL.
+- make dependency generation "opt-out" everywhere.
+
 * Sat Dec 14 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.25
 - rebuild rpm with internal dependency generation enabled.
 - fix: make sure each library has DT_NEEDED for all unresolved syms.