aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCullum Smith <cullum@sacredheartsc.com>2025-05-21 08:21:58 -0400
committerCullum Smith <cullum@sacredheartsc.com>2025-05-21 08:21:58 -0400
commit381df692639d196c63bc7258c5b1705af134c709 (patch)
tree6c69a215f150f3291ab7a756a270fe844b6397a5
parent7b7d5b48495985d724b52c7fc027100edbc07376 (diff)
downloadinfrastructure-381df692639d196c63bc7258c5b1705af134c709.tar.gz
fix chromium patch
-rw-r--r--files/usr/local/etc/poudriere.d/patches/chromium-gssapi.patch.pkg_repository19
-rw-r--r--vars/hostclass/pkg_repository2
-rw-r--r--vars/os/freebsd2
3 files changed, 13 insertions, 10 deletions
diff --git a/files/usr/local/etc/poudriere.d/patches/chromium-gssapi.patch.pkg_repository b/files/usr/local/etc/poudriere.d/patches/chromium-gssapi.patch.pkg_repository
index 7cb0372..c8bb241 100644
--- a/files/usr/local/etc/poudriere.d/patches/chromium-gssapi.patch.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/patches/chromium-gssapi.patch.pkg_repository
@@ -1,13 +1,13 @@
---- www/chromium/Makefile 2024-10-14 22:31:01.044557000 -0400
-+++ www/chromium/Makefile 2024-10-14 22:37:11.304192000 -0400
-@@ -144,19 +144,20 @@
+--- www/chromium/Makefile 2025-05-13 12:29:26.365339000 -0400
++++ www/chromium/Makefile 2025-05-13 12:33:29.151437000 -0400
+@@ -142,20 +142,22 @@
SUB_FILES= chromium-browser.desktop chrome
SUB_LIST+= COMMENT="${COMMENT}"
-OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
-OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO
+OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER LTO PIPEWIRE TEST WIDEVINE
-+OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO ALSA PULSEAUDIO GSSAPI_MIT
++OPTIONS_DEFAULT= CODECS CUPS DRIVER PIPEWIRE SNDIO ALSA PULSEAUDIO GSSAPI_MIT
OPTIONS_EXCLUDE_aarch64=LTO
OPTIONS_GROUP= AUDIO
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
@@ -24,11 +24,13 @@
+GSSAPI_NONE_DESC= Build without GSSAPI support
+GSSAPI_BASE_DESC= Use GSSAPI from base
+GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal
-+GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5
++GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5
++
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
-@@ -189,16 +190,19 @@
+ alsa-lib>=1.1.1_1:audio/alsa-lib
+@@ -189,17 +191,19 @@
DRIVER_MAKE_ARGS= chromedriver
@@ -45,9 +47,10 @@
LTO_VARS= GN_ARGS+=use_thin_lto=true \
GN_ARGS+=thin_lto_enable_optimizations=true \
- WANTSPACE="14 GB"
+ WANTSPACE="40 GB" \
+ WANTMEM="16 GB"
LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false
-
+-
-MIT_LIB_DEPENDS= libkrb.so.3:security/krb5
PIPEWIRE_DESC= Screen capture via PipeWire
diff --git a/vars/hostclass/pkg_repository b/vars/hostclass/pkg_repository
index 96279ce..e0edc03 100644
--- a/vars/hostclass/pkg_repository
+++ b/vars/hostclass/pkg_repository
@@ -3,4 +3,4 @@
allowed_tcp_ports='ssh http https'
nginx_redirect=false
-poudriere_patches=''
+poudriere_patches='chromium-gssapi'
diff --git a/vars/os/freebsd b/vars/os/freebsd
index 37dc712..e76fc35 100644
--- a/vars/os/freebsd
+++ b/vars/os/freebsd
@@ -20,7 +20,7 @@ nginx_user=www
nginx_conf_dir=/usr/local/etc/nginx
nslcd_user=nslcd
php_version=83
-postgresql_version=16
+postgresql_version=17
python_version=311
saslauthd_runtime_dir=/var/run/saslauthd
saslauthd_user=cyrus