main/gdbm: upgrade to 1.13

5 files changed, 6 insertions, 139 deletions

diff --git a/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch b/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
deleted file mode 100644
index 139ef99d7ee..00000000000
--- a/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Install with proper ownership.
-
-http://bugs.gentoo.org/24178
-
---- Makefile.in
-+++ Makefile.in
-@@ -14,10 +14,6 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
-@@ -131,22 +127,17 @@
- 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- 		$(INSTALL_ROOT)$(infodir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
--		$(INSTALL_ROOT)$(includedir)/gdbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
--		$(INSTALL_ROOT)$(man3dir)/gdbm.3
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
--		$(INSTALL_ROOT)$(infodir)/gdbm.info
-+	$(INSTALL_DATA) gdbm.h $(INSTALL_ROOT)$(includedir)/gdbm.h
-+	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(INSTALL_ROOT)$(man3dir)/gdbm.3
-+	$(INSTALL_DATA) $(srcdir)/gdbm.info $(INSTALL_ROOT)$(infodir)/gdbm.info
- 
- install-compat:
- 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- 		$(INSTALL_ROOT)$(includedir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
- 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
--		$(INSTALL_ROOT)$(includedir)/dbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
--		$(INSTALL_ROOT)$(includedir)/ndbm.h
-+	$(INSTALL_DATA) $(srcdir)/dbm.h $(INSTALL_ROOT)$(includedir)/dbm.h
-+	$(INSTALL_DATA) $(srcdir)/ndbm.h $(INSTALL_ROOT)$(includedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h
- #	rm -f libgdbm.a
diff --git a/main/gdbm/20-gdbm-1.8.3-compat-linking.patch b/main/gdbm/20-gdbm-1.8.3-compat-linking.patch
deleted file mode 100644
index 1337d08f5b2..00000000000
--- a/main/gdbm/20-gdbm-1.8.3-compat-linking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Since libgdbm_compat uses libgdbm, make sure we link it in.
-
-http://bugs.gentoo.org/165263
-
---- Makefile.in
-+++ Makefile.in
-@@ -161,10 +161,10 @@
- 	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
- 		-version-info $(SHLIB_VER) $(LOBJS)
- 
--libgdbm_compat.la: $(C_LOBJS) gdbm.h
-+libgdbm_compat.la: $(C_LOBJS) gdbm.h libgdbm.la
- 	rm -f libgdbm_compat.la
- 	$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
--		-version-info $(SHLIB_VER) $(C_LOBJS)
-+		-version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la
- 
- gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
- 	rm -f gdbm.h
diff --git a/main/gdbm/30-gdbm-1.8.3-build.patch b/main/gdbm/30-gdbm-1.8.3-build.patch
deleted file mode 100644
index 084f5a1d247..00000000000
--- a/main/gdbm/30-gdbm-1.8.3-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Respect system LDFLAGS when generating gdbm libs
-
-http://bugs.gentoo.org/209730
-
---- Makefile.in
-+++ Makefile.in
-@@ -146,12 +146,12 @@
- 
- libgdbm.la: $(LOBJS) gdbm.h
- 	rm -f libgdbm.la
--	$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \
- 		-version-info $(SHLIB_VER) $(LOBJS)
- 
- libgdbm_compat.la: $(C_LOBJS) gdbm.h libgdbm.la
- 	rm -f libgdbm_compat.la
--	$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \
- 		-version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la
- 
- gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index 8137e9bbdb8..632bceb5fb9 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdbm
-pkgver=1.12
+pkgver=1.13
 pkgrel=0
 pkgdesc="GNU dbm is a set of database routines that use extensible hashing"
 url="http://www.gnu.org/software/gdbm/"
@@ -11,21 +11,11 @@ depends=""
 makedepends=""
 install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.nluug.nl/pub/gnu/gdbm/gdbm-$pkgver.tar.gz
-	gdbm-1.10-zeroheaders.patch"
-
-_builddir="$srcdir"/gdbm-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+source="ftp://ftp.nluug.nl/pub/gnu/gdbm/gdbm-$pkgver.tar.gz"
 
+builddir="$srcdir"/gdbm-$pkgver
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	# we disable large-file due to it makes the db file non-compat
 	# with gdbm-1.8.3
 	./configure \
@@ -41,14 +31,9 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 
 }
 
-md5sums="9ce96ff4c99e74295ea19040931c8fb9  gdbm-1.12.tar.gz
-ac255b10452005237836cd2d3a470733  gdbm-1.10-zeroheaders.patch"
-sha256sums="d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea  gdbm-1.12.tar.gz
-ff33700f7919039037e5f56452c56ca00e968637f6f38485c9b8ae586770ee5a  gdbm-1.10-zeroheaders.patch"
-sha512sums="25e03dceed6986f1977d304a5ad059ac6c603a88ad4aa18c831ec42df82d68006f2e04b8a3cc400d0a4970750c78ba24a3f84cdff70de9f278cfd854c059699e  gdbm-1.12.tar.gz
-48e41ba3b3b3d6b1c0a0931324fe6341fddbaa1de64aaf8dcdda8adba447e3d72fa8c9e9aff9c6701cc13c6dc57287567aa992e78d5f398d38eb656564137974  gdbm-1.10-zeroheaders.patch"
+sha512sums="fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad  gdbm-1.13.tar.gz"
diff --git a/main/gdbm/gdbm-1.10-zeroheaders.patch b/main/gdbm/gdbm-1.10-zeroheaders.patch
deleted file mode 100644
index a268f6bdfa0..00000000000
--- a/main/gdbm/gdbm-1.10-zeroheaders.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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;