summaryrefslogtreecommitdiff
path: root/databases/firebird30-server
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2025-03-25 13:56:59 +0100
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2025-03-25 19:11:10 +0100
commit0e409ffb2892e109eab6091d59a9db5a12ca5094 (patch)
tree9e9f97460bd4abdcde2b62763263b13d99e6d6c0 /databases/firebird30-server
parentdevel/rpc2: Remove defunct MASTER_SITES (diff)
databases/firebird30-server: Unbreak
- Update version 3.0.11=>3.0.12 Changelog: https://firebirdsql.org/file/documentation/release_notes/html/en/3_0/rlsnotes30.html Approved by: portmgr (just-fix-it)
Diffstat (limited to 'databases/firebird30-server')
-rw-r--r--databases/firebird30-server/Makefile6
-rw-r--r--databases/firebird30-server/distinfo6
-rw-r--r--databases/firebird30-server/files/patch-builds_posix_make.defaults23
-rw-r--r--databases/firebird30-server/files/patch-src_remote_inet.cpp4
4 files changed, 23 insertions, 16 deletions
diff --git a/databases/firebird30-server/Makefile b/databases/firebird30-server/Makefile
index 31ca0ea05725..dbe2740e02a7 100644
--- a/databases/firebird30-server/Makefile
+++ b/databases/firebird30-server/Makefile
@@ -1,9 +1,9 @@
PORTNAME= firebird
-PORTVERSION= 3.0.11
+DISTVERSION= 3.0.12
CATEGORIES?= databases
MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server
-DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.33703-0
+DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.33787-0
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= acm@FreeBSD.org
@@ -88,8 +88,6 @@ PKGINSTALL?= ${PKGDIR}/pkg-install-server
# Client part stuff
USES+= libedit
-BROKEN= Fails to build with ICU 76.1
-
CONFIGURE_ARGS+= --with-system-editline
CONFIGURE_ENV+= ac_cv_lib_edit_readline="yes"
diff --git a/databases/firebird30-server/distinfo b/databases/firebird30-server/distinfo
index 763e6ad40185..e03b88e83476 100644
--- a/databases/firebird30-server/distinfo
+++ b/databases/firebird30-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705644395
-SHA256 (firebird/Firebird-3.0.11.33703-0.tar.bz2) = c716fc1c788ed614050f5469e1ba0ff442c2f1f7b907a2c808a8bac1dc3d6f83
-SIZE (firebird/Firebird-3.0.11.33703-0.tar.bz2) = 13066796
+TIMESTAMP = 1742902536
+SHA256 (firebird/Firebird-3.0.12.33787-0.tar.bz2) = 85b2bf0dd8f71d4814e077fac3f4dcb3015f4b4eaa76ffa0e7549f216602811f
+SIZE (firebird/Firebird-3.0.12.33787-0.tar.bz2) = 13324704
diff --git a/databases/firebird30-server/files/patch-builds_posix_make.defaults b/databases/firebird30-server/files/patch-builds_posix_make.defaults
index 79982d81f157..5ac7fc1044dd 100644
--- a/databases/firebird30-server/files/patch-builds_posix_make.defaults
+++ b/databases/firebird30-server/files/patch-builds_posix_make.defaults
@@ -1,6 +1,15 @@
---- builds/posix/make.defaults.orig 2022-06-07 08:18:52 UTC
+--- builds/posix/make.defaults.orig 2024-08-08 09:26:44 UTC
+++ builds/posix/make.defaults
-@@ -134,7 +134,7 @@ CAS_OPTIONS=@CAS_OPTIONS@
+@@ -102,7 +102,7 @@ GLOB_OPTIONS:=
+ #____________________________________________________________________________
+
+ # Firebird needs no RTTI
+-RTTI_FLAG:= -fno-rtti
++RTTI_FLAG:= -fno-rtti -DU_SHOW_CPLUSPLUS_API=0 -DU_SHOW_CPLUSPLUS_HEADER_API=0
+
+ # If this is defined then we use special rules useful for developers only
+ IsDeveloper = @DEVEL_FLG@
+@@ -134,7 +134,7 @@ MATHLIB=@MATHLIB@
MATHLIB=@MATHLIB@
# switch to make sed edit files inplace
@@ -9,7 +18,7 @@
# Default programs and tools to be used in the build process
-@@ -144,7 +144,7 @@ RM_R= rm -rf
+@@ -144,7 +144,7 @@ CHMOD_7= chmod 777
CHMOD= chmod
CHMOD_6= chmod 666
CHMOD_7= chmod 777
@@ -18,7 +27,7 @@
MV= mv -f
TOUCH= touch
CP= cp
-@@ -219,7 +219,7 @@ vpath %.dll $(LIB)
+@@ -219,7 +219,7 @@ LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${Fir
#LibraryFileName=libfbclient
LibraryFileName=libfbclient
LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
@@ -27,7 +36,7 @@
LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
-@@ -240,7 +240,7 @@ LIBFBINTL_SO = $(FB_BUILD)/intl/$(LIB_PREFIX)fbintl.$(
+@@ -240,7 +240,7 @@ ifeq ($(EDITLINE_FLG),Y)
ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE), true)
@@ -36,7 +45,7 @@
else
LIBEDITLINE := $(LIB)/libedit.a
endif
-@@ -362,7 +362,7 @@ CREATE_DB = $(RBIN)/create_db$(EXEC_EXT)
+@@ -362,7 +362,7 @@ FBTRACEMGR = $(BIN)/fbtracemgr$(EXEC_EXT)
GDS_DROP = $(BIN)/gds_drop$(EXEC_EXT)
FBSVCMGR = $(BIN)/fbsvcmgr$(EXEC_EXT)
FBTRACEMGR = $(BIN)/fbtracemgr$(EXEC_EXT)
@@ -45,7 +54,7 @@
NBACKUP = $(BIN)/nbackup$(EXEC_EXT)
LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT)
GSEC = $(BIN)/gsec$(EXEC_EXT)
-@@ -383,13 +383,13 @@ SECURITY_FDB = $(FIREBIRD)/security3.fdb
+@@ -383,13 +383,13 @@ QLI = $(BIN)/qli$(EXEC_EXT)
QLI = $(BIN)/qli$(EXEC_EXT)
# From isql
diff --git a/databases/firebird30-server/files/patch-src_remote_inet.cpp b/databases/firebird30-server/files/patch-src_remote_inet.cpp
index 269a80fd8457..ab24e5fdb44f 100644
--- a/databases/firebird30-server/files/patch-src_remote_inet.cpp
+++ b/databases/firebird30-server/files/patch-src_remote_inet.cpp
@@ -1,4 +1,4 @@
---- src/remote/inet.cpp.orig 2022-06-07 08:18:52 UTC
+--- src/remote/inet.cpp.orig 2024-08-08 09:26:45 UTC
+++ src/remote/inet.cpp
@@ -960,7 +960,7 @@ rem_port* INET_connect(const TEXT* name,
gai_hints.ai_family = ((host.hasData() || !ipv6) ? AF_UNSPEC : AF_INET6);
@@ -9,7 +9,7 @@
gai_hints.ai_protocol = SOL_TCP;
#else
gai_hints.ai_protocol = IPPROTO_TCP;
-@@ -1174,6 +1174,12 @@ static rem_port* listener_socket(rem_port* port, USHOR
+@@ -1175,6 +1175,12 @@ static rem_port* listener_socket(rem_port* port, USHOR
setFastLoopbackOption(port);
inet_ports->registerPort(port);