aboutsummaryrefslogtreecommitdiff
path: root/files/usr
diff options
context:
space:
mode:
authorCullum Smith <cullum@sacredheartsc.com>2024-11-22 17:02:18 -0500
committerCullum Smith <cullum@sacredheartsc.com>2024-11-22 17:02:18 -0500
commit432ca6019449d092c01ea18b874aa05ceb0d75f9 (patch)
treef97d9ef10b3a4f6be42baca7856dc1216e39c04b /files/usr
parentcc78ef5231b12a3f65224a2cb409259ae41c8195 (diff)
parent2e134967f1d4368ad37eeee676eadd536d916d10 (diff)
downloadinfrastructure-432ca6019449d092c01ea18b874aa05ceb0d75f9.tar.gz
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'files/usr')
-rw-r--r--files/usr/local/etc/poudriere.d/patches/postgresql16-gssapi.patch.pkg_repository14
-rw-r--r--files/usr/local/etc/poudriere.d/pkglist.pkg_repository1
2 files changed, 7 insertions, 8 deletions
diff --git a/files/usr/local/etc/poudriere.d/patches/postgresql16-gssapi.patch.pkg_repository b/files/usr/local/etc/poudriere.d/patches/postgresql16-gssapi.patch.pkg_repository
index 0cf4e61..6b9c807 100644
--- a/files/usr/local/etc/poudriere.d/patches/postgresql16-gssapi.patch.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/patches/postgresql16-gssapi.patch.pkg_repository
@@ -1,9 +1,9 @@
---- databases/postgresql16-server/Makefile 2024-10-03 10:26:11.600924000 -0400
-+++ databases/postgresql16-server/Makefile 2024-10-03 10:46:16.602335000 -0400
-@@ -119,12 +119,15 @@
+--- databases/postgresql16-server/Makefile 2024-11-21 20:15:39.008621000 -0500
++++ databases/postgresql16-server/Makefile 2024-11-21 20:19:16.406249000 -0500
+@@ -118,18 +118,26 @@
.if !defined(SLAVE_ONLY)
- OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS
+ OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS SSL
-KRB5_DESC= Build with kerberos provider support
+OPTIONS_SINGLE+= GSSAPI
+OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
@@ -18,9 +18,7 @@
-HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos
-GSSAPI_DESC= Build with GSSAPI support
OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3)
-
- OPTIONS_DEFINE+= SSL
-@@ -132,7 +135,12 @@
+ SSL_DESC= Build with OpenSSL support
OPTIONS_DEFAULT+= SSL
@@ -34,7 +32,7 @@
.endif # !SLAVE_ONLY
SSL_USES= ssl
-@@ -175,36 +183,7 @@
+@@ -172,36 +180,7 @@
.endif
.if !defined(SLAVE_ONLY)
diff --git a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
index 22c6285..1b46287 100644
--- a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
@@ -67,6 +67,7 @@ mail/rspamd
mail/sieve-connect
mail/thunderbird
misc/php${php_version}-calendar
+misc/terminfo-db
multimedia/audacious-plugins@qt5
multimedia/audacious@qt5
multimedia/libva-intel-media-driver