- update to gdbm-1.10
tested in a bulk by landry@ ok aja@
This commit is contained in:
parent
6f87fdcef1
commit
4c84e7302c
@ -1,28 +1,31 @@
|
||||
# $OpenBSD: Makefile,v 1.29 2010/10/18 17:06:06 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2012/09/28 14:04:49 jasper Exp $
|
||||
|
||||
COMMENT= GNU dbm
|
||||
|
||||
VERSION= 1.8.3
|
||||
VERSION= 1.10
|
||||
DISTNAME= gdbm-${VERSION}
|
||||
REVISION= 0
|
||||
CATEGORIES= databases
|
||||
|
||||
SHARED_LIBS += gdbm 3.0 # .0.0
|
||||
SHARED_LIBS += gdbm 4.0 # 4.0
|
||||
|
||||
HOMEPAGE= http://www.gnu.org/software/gdbm/
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=gdbm/}
|
||||
|
||||
# GPL
|
||||
# GPLv3
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GROFF = Yes
|
||||
MODULES= devel/gettext
|
||||
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
WANTLIB += c
|
||||
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GROFF = Yes
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
@ -1,5 +1,2 @@
|
||||
MD5 (gdbm-1.8.3.tar.gz) = HRsdXAJFscAK/5LadR6aoQ==
|
||||
RMD160 (gdbm-1.8.3.tar.gz) = D1dBqzL5Xbchxdn0VIRHMBFx6Tg=
|
||||
SHA1 (gdbm-1.8.3.tar.gz) = oClrGYapnLnsDcOxfqma7Hbpt2A=
|
||||
SHA256 (gdbm-1.8.3.tar.gz) = zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck=
|
||||
SIZE (gdbm-1.8.3.tar.gz) = 228695
|
||||
SHA256 (gdbm-1.10.tar.gz) = I/gTTFuUu/sG11amt48HT7puYCjPL+ATQdQLJtt3NEE=
|
||||
SIZE (gdbm-1.10.tar.gz) = 655599
|
||||
|
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.5 2008/10/20 20:26:21 steven Exp $
|
||||
--- Makefile.in.orig Tue Oct 8 18:09:12 2002
|
||||
+++ Makefile.in Mon Oct 20 22:24:03 2008
|
||||
@@ -8,7 +8,7 @@ CC = @CC@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
|
||||
# GDBM 1.8.3 builds shared libraries version 3.0
|
||||
-SHLIB_VER = 3 0 0
|
||||
+SHLIB_VER = 3:0:0
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
@@ -24,7 +24,7 @@ TEXI2DVI = texi2dvi
|
||||
DEFS =
|
||||
|
||||
# Where the system [n]dbm routines are...
|
||||
-LIBS = @LIBS@ -lc
|
||||
+LIBS = @LIBS@
|
||||
|
||||
CFLAGS = @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
@@ -122,7 +122,7 @@ MSCFILES = COPYING ChangeLog Makefile.in README gdbm.3
|
||||
|
||||
DISTFILES = $(SRCS) $(HDRS) $(MSCFILES)
|
||||
|
||||
-all: libgdbm.la libgdbm_compat.la
|
||||
+all: libgdbm.la libgdbm_compat.la info
|
||||
|
||||
progs: $(PROGS)
|
||||
|
||||
@@ -156,7 +156,7 @@ install-compat:
|
||||
libgdbm.la: $(LOBJS) gdbm.h
|
||||
rm -f libgdbm.la
|
||||
$(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
|
||||
- -version-info $(SHLIB_VER) $(LOBJS)
|
||||
+ ${libgdbm_la_LDFLAGS} $(LOBJS)
|
||||
|
||||
libgdbm_compat.la: $(C_LOBJS) gdbm.h
|
||||
rm -f libgdbm_compat.la
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2002/11/05 05:31:18 brad Exp $
|
||||
--- configure.orig Mon Nov 4 12:36:05 2002
|
||||
+++ configure Mon Nov 4 12:36:45 2002
|
||||
@@ -5045,7 +5045,7 @@ else
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
@@ -5055,7 +5055,7 @@ else
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
;;
|
||||
esac
|
@ -1,35 +0,0 @@
|
||||
$OpenBSD: patch-dbminit_c,v 1.1 2005/05/18 20:08:35 sturm Exp $
|
||||
--- dbminit.c.orig Mon Apr 4 23:01:34 2005
|
||||
+++ dbminit.c Mon Apr 4 23:24:09 2005
|
||||
@@ -53,23 +53,24 @@ dbminit (file)
|
||||
char* dir_file; /* Used to construct "file.dir". */
|
||||
struct stat dir_stat; /* Stat information for "file.dir". */
|
||||
int ret;
|
||||
+ size_t bufsize;
|
||||
|
||||
-
|
||||
ret = 0; /* Default return value. */
|
||||
|
||||
/* Prepare the correct names of "file.pag" and "file.dir". */
|
||||
- pag_file = (char *) malloc (strlen (file)+5);
|
||||
- dir_file = (char *) malloc (strlen (file)+5);
|
||||
+ bufsize = strlen (file)+5;
|
||||
+ pag_file = (char *) malloc (bufsize);
|
||||
+ dir_file = (char *) malloc (bufsize);
|
||||
if ((pag_file == NULL) || (dir_file == NULL))
|
||||
{
|
||||
gdbm_errno = GDBM_MALLOC_ERROR; /* For the hell of it. */
|
||||
return -1;
|
||||
}
|
||||
|
||||
- strcpy (pag_file, file);
|
||||
- strcat (pag_file, ".pag");
|
||||
- strcpy (dir_file, file);
|
||||
- strcat (dir_file, ".dir");
|
||||
+ strlcpy (pag_file, file, bufsize);
|
||||
+ strlcat (pag_file, ".pag", bufsize);
|
||||
+ strlcpy (dir_file, file, bufsize);
|
||||
+ strlcat (dir_file, ".dir", bufsize);
|
||||
|
||||
if (_gdbm_file != NULL)
|
||||
gdbm_close (_gdbm_file);
|
@ -1,33 +0,0 @@
|
||||
$OpenBSD: patch-dbmopen_c,v 1.1 2005/05/18 20:08:35 sturm Exp $
|
||||
--- dbmopen.c.orig Mon Apr 4 23:20:41 2005
|
||||
+++ dbmopen.c Mon Apr 4 23:22:31 2005
|
||||
@@ -62,21 +62,22 @@ dbm_open (file, flags, mode)
|
||||
char* dir_file; /* Used to construct "file.dir". */
|
||||
struct stat dir_stat; /* Stat information for "file.dir". */
|
||||
gdbm_file_info *temp_dbf; /* Temporary file pointer storage. */
|
||||
+ size_t bufsize;
|
||||
|
||||
-
|
||||
/* Prepare the correct names of "file.pag" and "file.dir". */
|
||||
- pag_file = (char *) malloc (strlen (file)+5);
|
||||
- dir_file = (char *) malloc (strlen (file)+5);
|
||||
+ bufsize = strlen (file)+5;
|
||||
+ pag_file = (char *) malloc (bufsize);
|
||||
+ dir_file = (char *) malloc (bufsize);
|
||||
if ((pag_file == NULL) || (dir_file == NULL))
|
||||
{
|
||||
gdbm_errno = GDBM_MALLOC_ERROR; /* For the hell of it. */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- strcpy (pag_file, file);
|
||||
- strcat (pag_file, ".pag");
|
||||
- strcpy (dir_file, file);
|
||||
- strcat (dir_file, ".dir");
|
||||
+ strlcpy (pag_file, file, bufsize);
|
||||
+ strlcat (pag_file, ".pag", bufsize);
|
||||
+ strlcpy (dir_file, file, bufsize);
|
||||
+ strlcat (dir_file, ".dir", bufsize);
|
||||
|
||||
|
||||
/* Call the actual routine, saving the pointer to the file information. */
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gdbmopen_c,v 1.1 2005/05/18 20:08:35 sturm Exp $
|
||||
--- gdbmopen.c.orig Mon Apr 4 23:23:09 2005
|
||||
+++ gdbmopen.c Mon Apr 4 23:23:37 2005
|
||||
@@ -100,7 +100,7 @@ gdbm_open (file, block_size, flags, mode
|
||||
gdbm_errno = GDBM_MALLOC_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
- strcpy (dbf->name, file);
|
||||
+ strlcpy (dbf->name, file, len + 1);
|
||||
|
||||
/* Initialize the fatal error routine. */
|
||||
dbf->fatal_err = fatal_func;
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-gdbmreorg_c,v 1.1 2005/05/18 20:08:35 sturm Exp $
|
||||
--- gdbmreorg.c.orig Mon Oct 7 20:38:26 2002
|
||||
+++ gdbmreorg.c Mon Apr 4 23:25:52 2005
|
||||
@@ -100,7 +100,7 @@ gdbm_reorganize (dbf)
|
||||
gdbm_errno = GDBM_MALLOC_ERROR;
|
||||
return -1;
|
||||
}
|
||||
- strcpy (&new_name[0], dbf->name);
|
||||
+ strlcpy (new_name, dbf->name, len + 3);
|
||||
new_name[len+2] = 0;
|
||||
new_name[len+1] = '#';
|
||||
while ( (len > 0) && new_name[len-1] != '/')
|
@ -1,7 +1,13 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2004/08/08 16:50:45 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2012/09/28 14:04:49 jasper Exp $
|
||||
%%SHARED%%
|
||||
@bin bin/testgdbm
|
||||
include/gdbm.h
|
||||
@info info/gdbm.info
|
||||
lib/libgdbm.a
|
||||
lib/libgdbm.la
|
||||
@man man/man3/gdbm.3
|
||||
%%SHARED%%
|
||||
share/locale/de/LC_MESSAGES/gdbm.mo
|
||||
share/locale/fi/LC_MESSAGES/gdbm.mo
|
||||
share/locale/ja/LC_MESSAGES/gdbm.mo
|
||||
share/locale/pl/LC_MESSAGES/gdbm.mo
|
||||
share/locale/uk/LC_MESSAGES/gdbm.mo
|
||||
|
Loading…
Reference in New Issue
Block a user