git: bcacfbf99b61 - main - databases/gdbm: update GNU dbm port to version 1.25
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 17 Apr 2025 14:28:37 UTC
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcacfbf99b61f9b7600458478abdd0806b5282de commit bcacfbf99b61f9b7600458478abdd0806b5282de Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2025-04-17 14:27:38 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2025-04-17 14:27:38 +0000 databases/gdbm: update GNU dbm port to version 1.25 Pull upstream commit to not set `errno' to ETIME (which does not exist on FreeBSD) and preserve the original EINTR instead. Reported by: portscout --- databases/gdbm/Makefile | 2 +- databases/gdbm/distinfo | 6 +++--- databases/gdbm/files/patch-src_lock.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 653efc050c0d..0007fb121277 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,5 +1,5 @@ PORTNAME= gdbm -PORTVERSION= 1.24 +PORTVERSION= 1.25 CATEGORIES= databases MASTER_SITES= GNU 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: