packages: db4.3/db4.3.spec, db4.3/patch.4.3.29.1 (NEW) - updated URLs - add...

[qboosh]

Author: qboosh                       Date: Fri Dec  9 19:05:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated URLs
- added 4.3.29.1 patch
- updated for libtool 2.x
- java enabled by default

---- Files affected:
packages/db4.3:
   db4.3.spec (1.19 -> 1.20) , patch.4.3.29.1 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/db4.3/db4.3.spec
diff -u packages/db4.3/db4.3.spec:1.19 packages/db4.3/db4.3.spec:1.20
--- packages/db4.3/db4.3.spec:1.19	Sun Dec  9 02:27:55 2007
+++ packages/db4.3/db4.3.spec	Fri Dec  9 20:04:59 2011
@@ -1,33 +1,36 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	java	# build db-java
-%bcond_without	tcl	# don't build Tcl bindings
-%bcond_with	pmutex	# use POSIX mutexes (only process-private with linuxthreads)
-%bcond_without	nptl	# don't use process-shared POSIX mutexes (NPTL provides full interface)
+%bcond_without	java		# don't build Java library
+%bcond_without	tcl		# don't build Tcl bindings
+%bcond_with	pmutex		# use POSIX mutexes (only process-private with linuxthreads)
+%bcond_without	nptl		# don't use process-shared POSIX mutexes (NPTL provides full interface)
 %bcond_without	static_libs	# don't build static libraries
 #
+%define		ver		4.3.29
+%define		patchlevel	1
 %{?with_nptl:%define	with_pmutex	1}
 Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db4.3
-Version:	4.3.29
+Version:	%{ver}.%{patchlevel}
 Release:	1
 Epoch:		0
 License:	Sleepycat public license (GPL-like, see LICENSE)
 Group:		Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
-#Source0Download: http://dev.sleepycat.com/downloads/releasehistorybdb.html
-Source0:	http://downloads.sleepycat.com/db-%{version}.tar.gz
+#Source0Download: http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
+Source0:	http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
 # Source0-md5:	13585a20ce32f113b8e8cdb57f52e3bb
-URL:		http://www.sleepycat.com/
+%patchset_source -f http://download.oracle.com/berkeley-db/patches/db/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
+URL:		http://www.oracle.com/technetwork/database/berkeleydb/downloads/index.html
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cpp
 BuildRequires:	ed
 %{?with_java:BuildRequires:	jdk}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	sed >= 4.0
 %{?with_tcl:BuildRequires:	tcl-devel >= 8.4.0}
 Provides:	db = %{version}-%{release}
@@ -236,17 +239,24 @@
 poleceń.
 
 %prep
-%setup -q -n db-%{version}
+%setup -q -n db-%{ver}
+# official patches
+%patchset_patch 1 %{patchlevel}
 
-%if !%{with nptl}
+%if %{without nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
+sed -i -e '/AC_PROG_LIBTOOL/aLT_OUTPUT' dist/configure.ac
+
 %build
 cd dist
 cp -f /usr/share/aclocal/libtool.m4 aclocal/libtool.ac
+cp -f /usr/share/aclocal/ltoptions.m4 aclocal/ltoptions.ac
+cp -f /usr/share/aclocal/ltsugar.m4 aclocal/ltsugar.ac
+cp -f /usr/share/aclocal/ltversion.m4 aclocal/ltversion.ac
 cp -f /usr/share/automake/config.sub .
-cp -f /usr/share/libtool/ltmain.sh .
+cp -f /usr/share/libtool/config/ltmain.sh .
 sh s_config
 cd ..
 
@@ -478,6 +488,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/12/09 19:04:59  qboosh
+- updated URLs
+- added 4.3.29.1 patch
+- updated for libtool 2.x
+- java enabled by default
+
 Revision 1.19  2007/12/09 01:27:55  glen
 - R: jpackage-utils for %{_javadir}
 

================================================================
Index: packages/db4.3/patch.4.3.29.1
diff -u /dev/null packages/db4.3/patch.4.3.29.1:1.1
--- /dev/null	Fri Dec  9 20:05:05 2011
+++ packages/db4.3/patch.4.3.29.1	Fri Dec  9 20:04:59 2011
@@ -0,0 +1,24 @@
+*** mp/mp_fget.c.orig	2006-05-30 20:44:11.000000000 -0700
+--- mp/mp_fget.c	2006-05-30 20:44:22.000000000 -0700
+***************
+*** 577,584 ****
+  	 */
+  	if (state != SECOND_MISS && bhp->ref == 1) {
+  		bhp->priority = UINT32_MAX;
+! 		SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
+! 		SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
+  		hp->hash_priority =
+  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
+  	}
+--- 577,587 ----
+  	 */
+  	if (state != SECOND_MISS && bhp->ref == 1) {
+  		bhp->priority = UINT32_MAX;
+! 		if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
+! 		     SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
+! 			SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
+! 			SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
+! 		}
+  		hp->hash_priority =
+  		    SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
+  	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.3/db4.3.spec?r1=1.19&r2=1.20&f=u