- link makedb with libnss_db.so.2, instead of linking again with libdb.a, seems worki...

Changed files:
    nss_db-makedb-shared.patch -> 1.1
    nss_db.spec -> 1.43

diff --git a/nss_db-makedb-shared.patch b/nss_db-makedb-shared.patch
new file mode 100644 (file)
index 0000000..0eebf1d
--- /dev/null
+++ b/nss_db-makedb-shared.patch
@@ -0,0 +1,24 @@
+--- nss_db-2.2.3pre1/src/libnss_db.map~        2010-02-23 13:09:05.000000000 +0200
++++ nss_db-2.2.3pre1/src/libnss_db.map 2010-02-23 13:09:08.098884892 +0200
+@@ -14,6 +14,8 @@
+     _nss_db_setaliasent; _nss_db_setetherent; _nss_db_setgrent;
+     _nss_db_setnetgrent; _nss_db_setprotoent; _nss_db_setpwent;
+     _nss_db_setrpcent; _nss_db_setservent; _nss_db_setspent;
+-  local:
+-    *;
++};
++NSSDB_PRIVATE {
++  global:
++    *_nssdb;
+ };
+--- nss_db-2.2.3pre1/src/Makefile.am~  2010-02-23 13:11:23.000000000 +0200
++++ nss_db-2.2.3pre1/src/Makefile.am   2010-02-23 13:11:32.562202953 +0200
+@@ -30,7 +30,7 @@
+ 
+ bin_PROGRAMS = makedb
+ makedb_SOURCES = makedb.c
+-makedb_LDADD = db-compat.lo @DB_LIBS@ @SELINUX_LIBS@ @INTLLIBS@
++makedb_LDADD = db-compat.lo libnss_db.la @SELINUX_LIBS@ @INTLLIBS@
+ 
+ # To mimmick the old glibc installation as closely as possible, we
+ # shuffle the installed library and the links to it around a bit,

diff --git a/nss_db.spec b/nss_db.spec
index 53efe72aecd2fcb50bde29214834928539ebae76..52523d4db6008f974ad4dfde30ca3d785fb9c79c 100644 (file)
--- a/nss_db.spec
+++ b/nss_db.spec
@@ -28,6 +28,7 @@ Patch7:               %{name}-uniqdb.patch
 Patch8:                %{name}-initialize.patch
 Patch9:                %{name}-selinux.patch
 Patch10:       %{name}-makedb-atomic.patch
+Patch11:       %{name}-makedb-shared.patch
 Patch101:      http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1
 Patch102:      http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2
 Patch103:      http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3
@@ -70,6 +71,7 @@ glibc-2.2.x.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 mkdir db-build
 cd db-%{db_version}