rpms/nss_db/devel .cvsignore, 1.7, 1.8 nss_db.spec, 1.45, 1.46 sources, 1.7, 1.8

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/nss_db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10520

Modified Files:
	.cvsignore nss_db.spec sources 
Log Message:
- update to DB 4.6.21, which you can still get from upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nss_db/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	13 Aug 2007 22:21:18 -0000	1.7
+++ .cvsignore	25 Jan 2010 18:10:38 -0000	1.8
@@ -4,3 +4,15 @@ db-4.3.27.tar.gz
 db-4.3.28.tar.gz
 db-4.5.20.tar.gz
 db-4.6.18.tar.gz
+db-4.8.26.tar.gz
+db-4.8.26.NC.tar.gz
+db-4.7.25.NC.tar.gz
+patch.4.7.25.1
+patch.4.7.25.2
+patch.4.7.25.3
+patch.4.7.25.4
+patch.4.6.21.1
+patch.4.6.21.3
+patch.4.6.21.2
+patch.4.6.21.4
+db-4.6.21.NC.tar.gz


Index: nss_db.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- nss_db.spec	25 Jul 2009 19:36:24 -0000	1.45
+++ nss_db.spec	25 Jan 2010 18:10:38 -0000	1.46
@@ -1,8 +1,10 @@
-%define db_version 4.6.18
+# 4.8 makes libpthread a hard requirement
+# 4.7 has a heavier footprint
+%define db_version 4.6.21.NC
 Summary: An NSS library for the Berkeley DB
 Name: nss_db
 Version: 2.2
-Release: 45%{?dist}
+Release: 46%{?dist}
 Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source2: db-getent-Makefile
@@ -20,6 +22,10 @@ Patch9: nss_db-2.2-lib64.patch
 Patch10: nss_db-2.2-glibc.patch
 Patch11: nss_db-2.2-makedb-atomic.patch
 Patch100: db-4.6.18-glibc.patch
+Patch101: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.6.21.1
+Patch102: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.6.21.2
+Patch103: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.6.21.3
+Patch104: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.6.21.4
 # DB is under the Sleepycat (Oracle) license.
 # nss_db is under the LGPLv2+ license.
 License: Sleepycat and LGPLv2+
@@ -59,6 +65,10 @@ autoreconf -i
 
 pushd db-%{db_version}
 %patch100 -p1 -b .glibc
+%patch101 -p0 -b .1
+%patch102 -p0 -b .2
+%patch103 -p0 -b .3
+%patch104 -p0 -b .4
 popd
 
 mkdir db-build
@@ -80,8 +90,8 @@ echo db_cv_mutex=UNIX/fcntl > config.cac
 	--disable-queue \
 	--disable-replication \
 	--disable-rpc \
-	--disable-tcl \
 	--disable-shared \
+	--disable-tcl \
 	--with-pic \
 	--with-uniquename=_nssdb \
 	--prefix=$dbdir \
@@ -121,6 +131,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) /var/db/Makefile
 
 %changelog
+* Mon Jan 25 2010 Nalin Dahyabhai <nalin at redhat.com> - 2.2-46
+- update to DB 4.6.21, which you can still get from upstream
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-45
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nss_db/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	13 Aug 2007 22:21:18 -0000	1.7
+++ sources	25 Jan 2010 18:10:38 -0000	1.8
@@ -1,2 +1,6 @@
 c2565cbd4a941ba70e41391693c3252d  nss_db-2.2.tar.gz
-95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+0bcbf588e5e18bf88ba3ea8df4807c97  db-4.6.21.NC.tar.gz
+4878872edfc53c6ecb871b1062a4bdaf  patch.4.6.21.1
+7a6e11b54712caf752f9c4a52babe60c  patch.4.6.21.3
+55074e53d3acae2dcbeae8322f96e522  patch.4.6.21.2
+ae7d3d587355fe85b512ef09b9a77d19  patch.4.6.21.4