[arch-commits] Commit in gdbm/repos (8 files)
Eric Bélanger
eric at nymeria.archlinux.org
Wed Jan 8 00:31:38 UTC 2014
Date: Wednesday, January 8, 2014 @ 01:31:37
Author: eric
Revision: 203309
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gdbm/repos/testing-i686/
gdbm/repos/testing-i686/PKGBUILD
(from rev 203308, gdbm/trunk/PKGBUILD)
gdbm/repos/testing-i686/gdbm-1.10-zeroheaders.patch
(from rev 203308, gdbm/trunk/gdbm-1.10-zeroheaders.patch)
gdbm/repos/testing-i686/gdbm.install
(from rev 203308, gdbm/trunk/gdbm.install)
gdbm/repos/testing-x86_64/
gdbm/repos/testing-x86_64/PKGBUILD
(from rev 203308, gdbm/trunk/PKGBUILD)
gdbm/repos/testing-x86_64/gdbm-1.10-zeroheaders.patch
(from rev 203308, gdbm/trunk/gdbm-1.10-zeroheaders.patch)
gdbm/repos/testing-x86_64/gdbm.install
(from rev 203308, gdbm/trunk/gdbm.install)
--------------------------------------------+
testing-i686/PKGBUILD | 55 +++++++++++++++++++++++++++
testing-i686/gdbm-1.10-zeroheaders.patch | 33 ++++++++++++++++
testing-i686/gdbm.install | 21 ++++++++++
testing-x86_64/PKGBUILD | 55 +++++++++++++++++++++++++++
testing-x86_64/gdbm-1.10-zeroheaders.patch | 33 ++++++++++++++++
testing-x86_64/gdbm.install | 21 ++++++++++
6 files changed, 218 insertions(+)
Copied: gdbm/repos/testing-i686/PKGBUILD (from rev 203308, gdbm/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-01-08 00:31:37 UTC (rev 203309)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer:
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=gdbm
+pkgver=1.11
+pkgrel=1
+pkgdesc="GNU database library"
+url="http://www.gnu.org/software/gdbm/gdbm.html"
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('glibc' 'sh')
+source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig}
+ gdbm-1.10-zeroheaders.patch)
+options=('!makeflags')
+install=gdbm.install
+md5sums=('72c832680cf0999caedbe5b265c8c1bd'
+ 'SKIP'
+ 'ac255b10452005237836cd2d3a470733')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Prevent gdbm from storing uninitialized memory content
+ # to database files. This patch improves security, as the
+ # uninitialized memory might contain sensitive informations
+ # from other applications.
+ # https://bugzilla.redhat.com/show_bug.cgi?id=4457
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927
+ patch -Np1 -i ../gdbm-1.10-zeroheaders.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-libgdbm-compat
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ # create symlinks for compatibility
+ install -dm755 "${pkgdir}"/usr/include/gdbm
+ ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h
+ ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h
+ ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h
+}
Copied: gdbm/repos/testing-i686/gdbm-1.10-zeroheaders.patch (from rev 203308, gdbm/trunk/gdbm-1.10-zeroheaders.patch)
===================================================================
--- testing-i686/gdbm-1.10-zeroheaders.patch (rev 0)
+++ testing-i686/gdbm-1.10-zeroheaders.patch 2014-01-08 00:31:37 UTC (rev 203309)
@@ -0,0 +1,33 @@
+diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c
+--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100
++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100
+@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf)
+
+
+ /* 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 -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c
+--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100
++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100
+@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s
+ (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);
+@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s
+ 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;
Copied: gdbm/repos/testing-i686/gdbm.install (from rev 203308, gdbm/trunk/gdbm.install)
===================================================================
--- testing-i686/gdbm.install (rev 0)
+++ testing-i686/gdbm.install 2014-01-08 00:31:37 UTC (rev 203309)
@@ -0,0 +1,21 @@
+infodir=/usr/share/info
+filelist=(gdbm.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
Copied: gdbm/repos/testing-x86_64/PKGBUILD (from rev 203308, gdbm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-01-08 00:31:37 UTC (rev 203309)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer:
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=gdbm
+pkgver=1.11
+pkgrel=1
+pkgdesc="GNU database library"
+url="http://www.gnu.org/software/gdbm/gdbm.html"
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('glibc' 'sh')
+source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig}
+ gdbm-1.10-zeroheaders.patch)
+options=('!makeflags')
+install=gdbm.install
+md5sums=('72c832680cf0999caedbe5b265c8c1bd'
+ 'SKIP'
+ 'ac255b10452005237836cd2d3a470733')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Prevent gdbm from storing uninitialized memory content
+ # to database files. This patch improves security, as the
+ # uninitialized memory might contain sensitive informations
+ # from other applications.
+ # https://bugzilla.redhat.com/show_bug.cgi?id=4457
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927
+ patch -Np1 -i ../gdbm-1.10-zeroheaders.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-libgdbm-compat
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make check
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ # create symlinks for compatibility
+ install -dm755 "${pkgdir}"/usr/include/gdbm
+ ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h
+ ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h
+ ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h
+}
Copied: gdbm/repos/testing-x86_64/gdbm-1.10-zeroheaders.patch (from rev 203308, gdbm/trunk/gdbm-1.10-zeroheaders.patch)
===================================================================
--- testing-x86_64/gdbm-1.10-zeroheaders.patch (rev 0)
+++ testing-x86_64/gdbm-1.10-zeroheaders.patch 2014-01-08 00:31:37 UTC (rev 203309)
@@ -0,0 +1,33 @@
+diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c
+--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100
++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100
+@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf)
+
+
+ /* 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 -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c
+--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100
++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100
+@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s
+ (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);
+@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s
+ 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;
Copied: gdbm/repos/testing-x86_64/gdbm.install (from rev 203308, gdbm/trunk/gdbm.install)
===================================================================
--- testing-x86_64/gdbm.install (rev 0)
+++ testing-x86_64/gdbm.install 2014-01-08 00:31:37 UTC (rev 203309)
@@ -0,0 +1,21 @@
+infodir=/usr/share/info
+filelist=(gdbm.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
More information about the arch-commits
mailing list