From bc0657f7159d0b01373ecb59afc426b98a172b1e Mon Sep 17 00:00:00 2001 From: Parabola Date: Thu, 1 Dec 2011 14:10:29 +0000 Subject: Thu Dec 1 14:10:27 UTC 2011 --- core/gdbm/gdbm-1.8.3-fhs.patch | 138 --------------------------------- core/gdbm/gdbm-1.8.3-zeroheaders.patch | 44 ----------- 2 files changed, 182 deletions(-) delete mode 100644 core/gdbm/gdbm-1.8.3-fhs.patch delete mode 100644 core/gdbm/gdbm-1.8.3-zeroheaders.patch (limited to 'core/gdbm') diff --git a/core/gdbm/gdbm-1.8.3-fhs.patch b/core/gdbm/gdbm-1.8.3-fhs.patch deleted file mode 100644 index 58ce4de0b..000000000 --- a/core/gdbm/gdbm-1.8.3-fhs.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in ---- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200 -+++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100 -@@ -1,7 +1,7 @@ - #### Start of system configuration section. #### - - srcdir = @srcdir@ --top_builddir = . -+top_builddir = @top_builddir@ - VPATH = @srcdir@ - - CC = @CC@ -@@ -14,17 +14,13 @@ INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - --# File ownership and group --BINOWN = bin --BINGRP = bin -- - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - --DEFS = -+DEFS = @DEFS@ - - # Where the system [n]dbm routines are... --LIBS = @LIBS@ -lc -+LIBS = @LIBS@ - - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ -@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@ - # Common prefix for installation directories - prefix = @prefix@ - exec_prefix = @exec_prefix@ --binprefix = $(exec_prefix) --manprefix = $(prefix) -+datarootdir = @datarootdir@ - - # Directory in which to put libgdbm.a. - libdir = @libdir@ - # The include directory for gdbm.h and dbm.h. - includedir = @includedir@ -+pkgincludedir = $(includedir)/gdbm - # Info and man directories. - infodir = @infodir@ --man3dir = @mandir@/man3 -+mandir = @mandir@ -+man3dir = $(mandir)/man3 - manext = 3 - - #### End of system configuration section. #### -@@ -57,7 +54,7 @@ manext = 3 - - SHELL = /bin/sh - --PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm -+PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm - - DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c - -@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la - progs: $(PROGS) - - install: libgdbm.la gdbm.h gdbm.info -- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ -- $(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 -+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir) -+ $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la -+ $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 -+ $(INSTALL_DATA) $(srcdir)/gdbm.info $(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 -+ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) -+ $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la -+ $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h -+ $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h - # rm -f libgdbm.a -@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h - libgdbm_compat.la: $(C_LOBJS) gdbm.h - 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) -lgdbm - - gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 - rm -f gdbm.h -@@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot - chmod -w gdbm.h - - testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ - - testdbm: testdbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la - - tdbm: testdbm.o - $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) -@@ -184,7 +172,7 @@ testndbm.o: testndbm.c - $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c - - testndbm: testndbm.o libgdbm.la libgdbm_compat.la -- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la - - tndbm.o: testndbm.c - cp $(srcdir)/testndbm.c ./tndbm.c -@@ -195,7 +183,7 @@ tndbm: tndbm.o - $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) - - conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ -- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ -+ $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@ - - lintgdbm: - lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c diff --git a/core/gdbm/gdbm-1.8.3-zeroheaders.patch b/core/gdbm/gdbm-1.8.3-zeroheaders.patch deleted file mode 100644 index 088956aef..000000000 --- a/core/gdbm/gdbm-1.8.3-zeroheaders.patch +++ /dev/null @@ -1,44 +0,0 @@ -02_zero-headers.patch by Jeff Johnson and Colin Watson - -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; -- cgit v1.2.3-54-g00ecf