diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 653efc050c0d..0007fb121277 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,29 +1,29 @@ PORTNAME= gdbm -PORTVERSION= 1.24 +PORTVERSION= 1.25 CATEGORIES= databases MASTER_SITES= GNU MAINTAINER= danfe@FreeBSD.org COMMENT= GNU database manager WWW= https://www.gnu.org.ua/software/gdbm/ LICENSE= GPLv3+ USES= gmake libtool:keepla readline GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes INFO= gdbm OPTIONS_DEFINE= COMPAT NLS OPTIONS_SUB= yes COMPAT_DESC= Enable dbm/ndbm compatibility COMPAT_CONFIGURE_ENABLE= libgdbm-compat NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext .include diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo index 64d6833f78e0..6d80f4341c96 100644 --- a/databases/gdbm/distinfo +++ b/databases/gdbm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1719928583 -SHA256 (gdbm-1.24.tar.gz) = 695e9827fdf763513f133910bc7e6cfdb9187943a4fec943e57449723d2b8dbf -SIZE (gdbm-1.24.tar.gz) = 1195931 +TIMESTAMP = 1742653915 +SHA256 (gdbm-1.25.tar.gz) = d02db3c5926ed877f8817b81cd1f92f53ef74ca8c6db543fbba0271b34f393ec +SIZE (gdbm-1.25.tar.gz) = 1224180 diff --git a/databases/gdbm/files/patch-src_lock.c b/databases/gdbm/files/patch-src_lock.c new file mode 100644 index 000000000000..65913f3d5b7c --- /dev/null +++ b/databases/gdbm/files/patch-src_lock.c @@ -0,0 +1,35 @@ +--- src/lock.c.orig 2025-03-06 16:24:09 UTC ++++ src/lock.c +@@ -73,15 +73,10 @@ try_lock_flock (GDBM_FILE dbf, int nb) + { + return TRY_LOCK_OK; + } +- else if (errno == EWOULDBLOCK) ++ else if (errno == EWOULDBLOCK || errno == EINTR) + { + return TRY_LOCK_FAIL; + } +- else if (errno == EINTR) +- { +- errno = ETIME; +- return TRY_LOCK_FAIL; +- } + #endif + return TRY_LOCK_NEXT; + } +@@ -116,7 +111,6 @@ try_lock_lockf (GDBM_FILE dbf, int nb) + switch (errno) + { + case EINTR: +- errno = ETIME; + case EACCES: + case EAGAIN: + case EDEADLK: +@@ -162,7 +156,6 @@ try_lock_fcntl (GDBM_FILE dbf, int nb) + switch (errno) + { + case EINTR: +- errno = ETIME; + case EACCES: + case EAGAIN: + case EDEADLK: