1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-06 10:57:37 -04:00

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
This commit is contained in:
Alexey Dokuchaev 2025-04-17 14:27:38 +00:00
parent 00a2678a56
commit bcacfbf99b
3 changed files with 39 additions and 4 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= gdbm
PORTVERSION= 1.24
PORTVERSION= 1.25
CATEGORIES= databases
MASTER_SITES= GNU

View file

@ -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

View file

@ -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: