- rel .7

- build with private copy of libdb (BAD things happen when linked
	 with system db, like static programs suddenly sigsegving)
- added selinux support for makedb
- some bugfixes from FC (descriptions in patches)

Changed files:
    nss_db.spec -> 1.35

diff --git a/nss_db.spec b/nss_db.spec
index d82574ec20a9586e4ff91dc4ffa30d429df213f5..77f9c86ab21f9ff83356ac90e785f19b9cd83aee 100644 (file)
--- a/nss_db.spec
+++ b/nss_db.spec
@@ -1,25 +1,35 @@
+
+%define                db_version      4.6.21
+
 Summary:       Berkeley DB Name Service Switch Module
 Summary(pl.UTF-8):     Moduł NSS do baz db
 Name:          nss_db
 Version:       2.2.3
 %define        bver    pre1
-Release:       0.%{bver}.6
+Release:       0.%{bver}.7
 License:       LGPL
 Group:         Base
 Source0:       ftp://sources.redhat.com/pub/glibc/old-releases/%{name}-%{version}%{bver}.tar.gz
 # Source0-md5: b4440ba2865d28e9068e465426c19ede
+Source1:       http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
+# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
 Patch0:                %{name}-chmod_644.patch
 Patch1:                %{name}-amfix.patch
 Patch2:                %{name}-glibc23.patch
 Patch3:                %{name}-db41.patch
 Patch4:                %{name}-errno.patch
 Patch5:                %{name}-link.patch
+Patch6:                %{name}-enoent.patch
+Patch7:                %{name}-uniqdb.patch
+Patch8:                %{name}-initialize.patch
+Patch9:                %{name}-selinux.patch
 BuildRequires: autoconf
 BuildRequires: automake >= 1.4
 BuildRequires: db-devel >= 3.0
 BuildRequires: gettext-devel
 BuildRequires: glibc-devel >= 2.3
 BuildRequires: libtool
+BuildRequires: libselinux-devel
 Requires:      glibc >= 2.3
 Requires:      make
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,22 +43,59 @@ To jest nss_db, moduł do serwisu nazw, który może być używany z
 glibc-2.2.x.
 
 %prep
-%setup -q -n %{name}-%{version}%{bver}
+%setup -q -n %{name}-%{version}%{bver} -a1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+mkdir db-build
 
 %build
+dbdir=`pwd`/db-instroot
+cd db-build
+
+CC="%{__cc}"
+CXX="%{__cxx}"
+CFLAGS="%{rpmcflags}"
+CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"
+export CC CXX CFLAGS CXXFLAGS LDFLAGS
+
+echo db_cv_mutex=UNIX/fcntl > config.cache
+../db-%{db_version}/dist/configure -C \
+       --disable-compat185 \
+       --disable-cxx \
+       --disable-diagnostic \
+       --disable-dump185 \
+       --disable-java \
+       --disable-rpc \
+       --disable-tcl \
+       --disable-shared \
+       --with-pic \
+       --with-uniquename=_nssdb \
+       --prefix=$dbdir \
+       --libdir=$dbdir/lib
+%{__make}
+%{__make} install
+cd ..
+
 %{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --with-db=${dbdir} \
+       --with-selinux
+
 %{__make} \
        slibdir=/%{_lib}