continued glibc updates/rebuilds gdbm, apr, apr-util

apr-util/PKGBUILD

@@ -8,8 +8,8 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=apr-util
-pkgver=1.3.9
-pkgrel=4
+pkgver=1.3.11
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
@@ -17,7 +17,7 @@ depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('29dd557f7bd891fc2bfdffcfa081db59')
+md5sums=('2aeddb384b03f3f73107770724d5c97b')
 
 build() {
 	cd "${srcdir}/apr-util-${pkgver}"

apr/PKGBUILD

@@ -8,7 +8,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=apr
-pkgver=1.4.2
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ depends=('util-linux-ng>=2.16')
 options=('!libtool')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('4b00e8f70c067893d075577962656b35')
+md5sums=('daf5487c82dd7bec9c005c96f8cb01b1')
 
 build() {
   cd "${srcdir}/apr-${pkgver}"

gdbm/PKGBUILD

@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 73046 2010-03-22 00:42:44Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=gdbm
 pkgver=1.8.3
-pkgrel=7
+pkgrel=8
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('glibc' 'sh')
 source=(ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz
+        gdbm-1.8.3-zeroheaders.patch
 	gdbm-1.8.3-fhs.patch)
 options=('!libtool' '!makeflags')
 install=gdbm.install
 md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1'
+         'a2ed344be9258775bd718074cf2e4ec6'
          '66a7c235416c136dc89efc7d03352514')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i ../gdbm-1.8.3-zeroheaders.patch
   patch -Np1 -i $srcdir/gdbm-1.8.3-fhs.patch
   
   libtoolize --force --copy
@@ -26,6 +30,11 @@ build() {
   autoconf 
   
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+
+  # https://bugzilla.redhat.com/show_bug.cgi?id=477300
+  echo "/* We use fcntl locking (POSIX) instead of flock (BSD) */" >> autoconf.h
+  echo "#undef HAVE_FLOCK" >> autoconf.h
+
   make prefix=/usr || return 1
 
   make prefix=$pkgdir/usr \

gdbm/gdbm-1.8.3-zeroheaders.patch

@@ -0,0 +1,44 @@
+02_zero-headers.patch by Jeff Johnson <jbj@redhat.com> and Colin Watson <cjwatson@debian.org>
+
+diff -urNad a/falloc.c b/falloc.c
+--- a/falloc.c	2001-02-28 06:52:33.000000000 +0000
++++ b/falloc.c	2003-09-08 23:58:43.000000000 +0100
+@@ -272,7 +272,7 @@
+ 
+ 
+   /* Split the header block. */
+-  temp = (avail_block *) malloc (av_size);
++  temp = (avail_block *) calloc (1, av_size);
+   if (temp == NULL) _gdbm_fatal (dbf, "malloc error");
+   /* Set the size to be correct AFTER the pop_avail_block. */
+   temp->size = dbf->header->avail.size;
+diff -urNad a/gdbmopen.c b/gdbmopen.c
+--- a/gdbmopen.c	2003-09-08 23:58:01.000000000 +0100
++++ b/gdbmopen.c	2003-09-08 23:58:43.000000000 +0100
+@@ -212,7 +212,7 @@
+ 	file_block_size = block_size;
+ 
+       /* Get space for the file header. */
+-      dbf->header = (gdbm_file_header *) malloc (file_block_size);
++      dbf->header = (gdbm_file_header *) calloc (1, file_block_size);
+       if (dbf->header == NULL)
+ 	{
+ 	  gdbm_close (dbf);
+@@ -256,7 +256,7 @@
+ 	(dbf->header->block_size - sizeof (hash_bucket))
+ 	/ sizeof (bucket_element) + 1;
+       dbf->header->bucket_size  = dbf->header->block_size;
+-      dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size);
++      dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size);
+       if (dbf->bucket == NULL)
+ 	{
+ 	  gdbm_close (dbf);
+@@ -420,7 +420,7 @@
+       for(index = 0; index < size; index++)
+         {
+           (dbf->bucket_cache[index]).ca_bucket
+-            = (hash_bucket *) malloc (dbf->header->bucket_size);
++            = (hash_bucket *) calloc (1, dbf->header->bucket_size);
+           if ((dbf->bucket_cache[index]).ca_bucket == NULL)
+ 	    {
+               gdbm_errno = GDBM_MALLOC_ERROR;